Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 33 insertions, 19 deletions

diff --git a/x11-misc/xtoolwait/ChangeLog b/x11-misc/xtoolwait/ChangeLog
index 1b7c1fa7c903..0ed33cf93e51 100644
--- a/x11-misc/xtoolwait/ChangeLog
+++ b/x11-misc/xtoolwait/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xtoolwait
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/ChangeLog,v 1.23 2006/01/06 02:21:57 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/ChangeLog,v 1.24 2006/01/21 19:10:12 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xtoolwait-1.3.ebuild,
+  xtoolwait-1.3-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   06 Jan 2006; Olivier Crête <tester@gentoo.org> xtoolwait-1.3-r1.ebuild:
   Stable on amd64
diff --git a/x11-misc/xtoolwait/Manifest b/x11-misc/xtoolwait/Manifest
index 53102c0919bf..f017114122e2 100644
--- a/x11-misc/xtoolwait/Manifest
+++ b/x11-misc/xtoolwait/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 92fd34e65cb5c3e82c6dd39a2751bc6e ChangeLog 2618
+MD5 a9de8425ecf5df6d72443f57e1d3a424 ChangeLog 2753
 MD5 dec245eeb76cf36a886240aecdf41d1a files/digest-xtoolwait-1.3 64
 MD5 dec245eeb76cf36a886240aecdf41d1a files/digest-xtoolwait-1.3-r1 64
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 392516723bdfb37d1802eba666a79865 xtoolwait-1.3-r1.ebuild 989
-MD5 e3a76f73f099e4adf939d9fb220be9b1 xtoolwait-1.3.ebuild 944
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDvdRWmOfEJZHYOKcRAmrQAJ9o24bzSjWyXUSiek8KSIfbEmH4KQCgwmfe
-qSZ/BiwLRL1QVRTR+BOjM0M=
-=ogxZ
------END PGP SIGNATURE-----
+MD5 5137e7e86e0eff821d43ecab200b288e xtoolwait-1.3-r1.ebuild 1095
+MD5 c15c847c74d1d739daa38a379abfdade xtoolwait-1.3.ebuild 1092
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild
index 02739a9f86a6..c06803c97e79 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild
@@ -1,16 +1,26 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild,v 1.8 2006/01/06 02:21:57 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/xtoolwait-1.3-r1.ebuild,v 1.9 2006/01/21 19:10:12 nelchael Exp $
 
 SRC_URI="http://www.hacom.nl/~richard/software/${P}.tar.gz"
 HOMEPAGE="http://www.hacom.nl/~richard/software/xtoolwait.html"
 DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
-DEPEND="|| ( ( >=x11-misc/imake-1 app-text/rman ) virtual/x11 )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 IUSE=""
 
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-misc/imake
+		x11-proto/xproto
+		app-text/rman )
+	virtual/x11 )"
+
 src_compile() {
 	xmkmf || die "xmkmf failed"
 	emake || die "emake failed"
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3.ebuild
index bb1f844709c6..1e818ea0dc6c 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3.ebuild
@@ -1,16 +1,26 @@
-# 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-misc/xtoolwait/xtoolwait-1.3.ebuild,v 1.17 2005/11/01 10:34:04 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/xtoolwait-1.3.ebuild,v 1.18 2006/01/21 19:10:12 nelchael Exp $
 
 SRC_URI="http://www.hacom.nl/~richard/software/${P}.tar.gz"
 HOMEPAGE="http://www.hacom.nl/~richard/software/xtoolwait.html"
 DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
-DEPEND="virtual/x11"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc alpha ia64 ~amd64 ppc"
 IUSE=""
 
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-misc/imake
+		x11-proto/xproto
+		app-text/rman )
+	virtual/x11 )"
+
 src_compile() {
 	xmkmf || die "xmkmf failed"
 	emake || die "emake failed"