diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-24 22:15:05 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-24 22:15:05 +0000 |
| commit | 5d56d4119d8c8c034842f684e4d7d1ed8f152ba5 (patch) | |
| tree | 5fa5e54b8b147459f5361873ae4daeca896c6720 /x11-plugins | |
| parent | Firebird now uses user CFLAGS instead its own, bug #108275, thanks to vapier (diff) | |
| download | gentoo-2-5d56d4119d8c8c034842f684e4d7d1ed8f152ba5.tar.gz gentoo-2-5d56d4119d8c8c034842f684e4d7d1ed8f152ba5.tar.bz2 gentoo-2-5d56d4119d8c8c034842f684e4d7d1ed8f152ba5.zip | |
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmbatppc/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-plugins/wmbatppc/wmbatppc-2.4.ebuild | 7 | ||||
| -rw-r--r-- | x11-plugins/wmbatteries/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild | 13 |
4 files changed, 24 insertions, 11 deletions
diff --git a/x11-plugins/wmbatppc/ChangeLog b/x11-plugins/wmbatppc/ChangeLog index 7bb6863cf54b..6c3c04f5f34c 100644 --- a/x11-plugins/wmbatppc/ChangeLog +++ b/x11-plugins/wmbatppc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/wmbatppc -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.7 2004/07/25 19:02:06 s4t4n Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.8 2006/01/24 22:13:04 nelchael Exp $ + + 24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmbatppc-2.4.ebuild: + Fixed DEPEND for modular X. 25 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbatppc-2.4.ebuild: OK, I should not be doing this since I own no ppc hardware, but I got diff --git a/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild b/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild index 40c15c309537..5199dafb0752 100644 --- a/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild +++ b/x11-plugins/wmbatppc/wmbatppc-2.4.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/wmbatppc/wmbatppc-2.4.ebuild,v 1.2 2004/07/25 19:02:06 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild,v 1.3 2006/01/24 22:13:04 nelchael Exp $ inherit eutils @@ -13,8 +13,7 @@ SLOT="0" KEYWORDS="-* ppc" IUSE="" -DEPEND="virtual/x11 - >=app-laptop/pmud-0.10.1-r2 +DEPEND=">=app-laptop/pmud-0.10.1-r2 >=x11-libs/xosd-2.2.5-r1" src_unpack() diff --git a/x11-plugins/wmbatteries/ChangeLog b/x11-plugins/wmbatteries/ChangeLog index 0dec8f0d12cb..2c1ca992fe57 100644 --- a/x11-plugins/wmbatteries/ChangeLog +++ b/x11-plugins/wmbatteries/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmbatteries -# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/ChangeLog,v 1.2 2004/09/05 22:20:00 s4t4n Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/ChangeLog,v 1.3 2006/01/24 22:15:05 nelchael Exp $ + + 24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> + wmbatteries-0.1.3.ebuild: + Fixed DEPEND for modular X. 06 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbatteries-0.1.3.ebuild: Stable for x86. diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild index dc48910bf03e..3f8196c846ef 100644 --- a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild +++ b/x11-plugins/wmbatteries/wmbatteries-0.1.3.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/wmbatteries/wmbatteries-0.1.3.ebuild,v 1.2 2004/09/05 22:20:00 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild,v 1.3 2006/01/24 22:15:05 nelchael Exp $ inherit eutils @@ -12,7 +12,14 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="x86" -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_install() { einstall || die "Installation failed" |