diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-31 19:54:16 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-31 19:54:16 +0000 |
| commit | 8711a68fe3facf3d53f8854f2a9c423896056a29 (patch) | |
| tree | fb9319cc58f23c6ea8aa3f10d55bc9083b2bfb5a /x11-plugins/wmmemload | |
| parent | Mark 0.7.1 stable on ia64 (diff) | |
| download | gentoo-2-8711a68fe3facf3d53f8854f2a9c423896056a29.tar.gz gentoo-2-8711a68fe3facf3d53f8854f2a9c423896056a29.tar.bz2 gentoo-2-8711a68fe3facf3d53f8854f2a9c423896056a29.zip | |
Fixed DEPEND for modular X.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-plugins/wmmemload')
| -rw-r--r-- | x11-plugins/wmmemload/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmmemload/files/digest-wmmemload-0.1.5 | 1 | ||||
| -rw-r--r-- | x11-plugins/wmmemload/wmmemload-0.1.5.ebuild | 29 | ||||
| -rw-r--r-- | x11-plugins/wmmemload/wmmemload-0.1.6.ebuild | 13 |
4 files changed, 16 insertions, 35 deletions
diff --git a/x11-plugins/wmmemload/ChangeLog b/x11-plugins/wmmemload/ChangeLog index 25ac96512cba..36526dabf1ff 100644 --- a/x11-plugins/wmmemload/ChangeLog +++ b/x11-plugins/wmmemload/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmmemload -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.14 2005/09/17 10:10:30 agriffis Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.15 2006/01/31 19:50:16 nelchael Exp $ + + 31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> + -wmmemload-0.1.5.ebuild, wmmemload-0.1.6.ebuild: + Fixed DEPEND for modular X. 17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wmmemload-0.1.6.ebuild: Mark 0.1.6 stable on alpha diff --git a/x11-plugins/wmmemload/files/digest-wmmemload-0.1.5 b/x11-plugins/wmmemload/files/digest-wmmemload-0.1.5 deleted file mode 100644 index c5833018beb7..000000000000 --- a/x11-plugins/wmmemload/files/digest-wmmemload-0.1.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 59af8d45aeaa1e9dfad5ba3d75140881 wmmemload-0.1.5.tar.gz 141543 diff --git a/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild deleted file mode 100644 index aa065cdf49ea..000000000000 --- a/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild,v 1.8 2005/02/05 16:43:47 kloeri Exp $ - -IUSE="" -DESCRIPTION="dockapp that displays memory and swap space usage." -SRC_URI="http://www.markstaggs.net/wmmemload/${P}.tar.gz" -HOMEPAGE="http://www.markstaggs.net/" - -SLOT="0" -KEYWORDS="x86 ~sparc amd64 ppc" -LICENSE="GPL-2" - -DEPEND="virtual/x11" - -src_compile() { - - econf || die "configure failed" - - emake || die "parallel make failed" - -} - -src_install () { - - einstall || die "make install failed" - -} - diff --git a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild index 54288a4b12aa..3c45d074815c 100644 --- a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild +++ b/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 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/wmmemload/wmmemload-0.1.6.ebuild,v 1.7 2005/09/17 10:10:30 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild,v 1.8 2006/01/31 19:50:16 nelchael Exp $ IUSE="" DESCRIPTION="dockapp that displays memory and swap space usage." @@ -11,7 +11,14 @@ SLOT="0" KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86" LICENSE="GPL-2" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( x11-proto/xextproto virtual/x11 )" src_compile() { |