summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-01-31 21:00:15 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-01-31 21:00:15 +0000
commitf1fa38cde582e228a461f3b20be374d785ff3dd9 (patch)
tree209f8c40b1ba8b06300b10cde495567009723b68 /x11-plugins/wmtop
parentversion bump (diff)
downloadgentoo-2-f1fa38cde582e228a461f3b20be374d785ff3dd9.tar.gz
gentoo-2-f1fa38cde582e228a461f3b20be374d785ff3dd9.tar.bz2
gentoo-2-f1fa38cde582e228a461f3b20be374d785ff3dd9.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-plugins/wmtop')
-rw-r--r--x11-plugins/wmtop/ChangeLog7
-rw-r--r--x11-plugins/wmtop/wmtop-0.84.ebuild17
2 files changed, 17 insertions, 7 deletions
diff --git a/x11-plugins/wmtop/ChangeLog b/x11-plugins/wmtop/ChangeLog
index c366fabf3005..da25dfa7e7f5 100644
--- a/x11-plugins/wmtop/ChangeLog
+++ b/x11-plugins/wmtop/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmtop
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/ChangeLog,v 1.6 2004/06/28 21:45:01 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/ChangeLog,v 1.7 2006/01/31 21:00:15 nelchael Exp $
+
+ 31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmtop-0.84.ebuild:
+ Fixed DEPEND for modular X.
28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmtop-0.84.ebuild:
glibc -> libc, add sed-4 dep
diff --git a/x11-plugins/wmtop/wmtop-0.84.ebuild b/x11-plugins/wmtop/wmtop-0.84.ebuild
index a6ea7d448540..033640b96511 100644
--- a/x11-plugins/wmtop/wmtop-0.84.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.84.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/wmtop-0.84.ebuild,v 1.10 2004/06/28 21:45:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/wmtop-0.84.ebuild,v 1.11 2006/01/31 21:00:15 nelchael Exp $
IUSE=""
DESCRIPTION="top in a dockapp"
@@ -11,15 +11,22 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86 ~sparc amd64 ppc"
-DEPEND="virtual/libc
- virtual/x11
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( (
+ x11-proto/xproto
+ x11-proto/xextproto )
+ virtual/x11 )
>=sys-apps/sed-4"
src_unpack() {
unpack ${A} ; cd ${S}
sed -i -e "s:-O3 -g -Wall:${CFLAGS}:" \
-e "s:/local::" Makefile
-
}
src_compile() {