diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-22 11:24:46 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-22 11:24:46 +0000 |
| commit | 77b55c0be5a290e5db0c457b651701dc6da31564 (patch) | |
| tree | 7e917a3363bac18a2dc3b64ea695156495baea62 /x11-plugins | |
| parent | Stable on ppc64 (diff) | |
| download | gentoo-2-77b55c0be5a290e5db0c457b651701dc6da31564.tar.gz gentoo-2-77b55c0be5a290e5db0c457b651701dc6da31564.tar.bz2 gentoo-2-77b55c0be5a290e5db0c457b651701dc6da31564.zip | |
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/allin1/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-plugins/allin1/Manifest | 4 | ||||
| -rw-r--r-- | x11-plugins/allin1/allin1-0.5.0.ebuild | 16 | ||||
| -rw-r--r-- | x11-plugins/cputnik/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-plugins/cputnik/cputnik-0.1.1.ebuild | 12 |
5 files changed, 34 insertions, 12 deletions
diff --git a/x11-plugins/allin1/ChangeLog b/x11-plugins/allin1/ChangeLog index 03e7b19995d0..a7252495356e 100644 --- a/x11-plugins/allin1/ChangeLog +++ b/x11-plugins/allin1/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/allin1 -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/ChangeLog,v 1.9 2004/09/05 22:17:38 s4t4n Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/ChangeLog,v 1.10 2006/01/22 11:21:15 nelchael Exp $ + + 22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> allin1-0.5.0.ebuild: + Fixed DEPEND for modular X. 06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> allin1-0.5.0.ebuild: Stable for x86. diff --git a/x11-plugins/allin1/Manifest b/x11-plugins/allin1/Manifest index 300f2b581261..629f679857d1 100644 --- a/x11-plugins/allin1/Manifest +++ b/x11-plugins/allin1/Manifest @@ -1,4 +1,4 @@ -MD5 9d82327fb1ab037426ce13a64d89a169 allin1-0.5.0.ebuild 687 MD5 bcbea075a9d340d53722ede26a0759af ChangeLog 1504 -MD5 51e4144050265a6597eea69affc33666 metadata.xml 486 +MD5 f9d3c2012464d1f0064b4f9a7b8bbec0 allin1-0.5.0.ebuild 838 MD5 0c2ec115af68196bad7c677c33d1d13e files/digest-allin1-0.5.0 63 +MD5 51e4144050265a6597eea69affc33666 metadata.xml 486 diff --git a/x11-plugins/allin1/allin1-0.5.0.ebuild b/x11-plugins/allin1/allin1-0.5.0.ebuild index cb6e20946de4..e56e6d9ed91b 100644 --- a/x11-plugins/allin1/allin1-0.5.0.ebuild +++ b/x11-plugins/allin1/allin1-0.5.0.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/allin1/allin1-0.5.0.ebuild,v 1.3 2004/09/05 22:17:38 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/allin1-0.5.0.ebuild,v 1.4 2006/01/22 11:21:15 nelchael Exp $ DESCRIPTION="All in one monitoring dockapp: RAM, CPU, Net, Power, df, seti" HOMEPAGE="http://ilpettegolo.altervista.org/linux_allin1.en.shtml" @@ -9,7 +9,17 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 ppc" IUSE="" -DEPEND="virtual/x11" + +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xproto + x11-libs/libX11 ) + virtual/x11 )" src_compile() { diff --git a/x11-plugins/cputnik/ChangeLog b/x11-plugins/cputnik/ChangeLog index 2480be4dd4bd..209688cff057 100644 --- a/x11-plugins/cputnik/ChangeLog +++ b/x11-plugins/cputnik/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/cputnik -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/ChangeLog,v 1.3 2005/06/12 19:24:11 josejx Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/ChangeLog,v 1.4 2006/01/22 11:24:46 nelchael Exp $ + + 22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> cputnik-0.1.1.ebuild: + Fixed DEPEND for modular X. 12 Jun 2005; Joseph Jezak <josejx@gentoo.org> cputnik-0.1.1.ebuild: Marked ~ppc for bug #95345. Tested by nixnut. diff --git a/x11-plugins/cputnik/cputnik-0.1.1.ebuild b/x11-plugins/cputnik/cputnik-0.1.1.ebuild index bc1ee1375e0d..1c168ca46849 100644 --- a/x11-plugins/cputnik/cputnik-0.1.1.ebuild +++ b/x11-plugins/cputnik/cputnik-0.1.1.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/cputnik/cputnik-0.1.1.ebuild,v 1.4 2005/07/14 23:07:43 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/cputnik-0.1.1.ebuild,v 1.5 2006/01/22 11:24:46 nelchael Exp $ IUSE="" @@ -12,7 +12,13 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~ppc x86" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( x11-proto/xextproto virtual/x11 )" src_compile() { |