Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

6 files changed, 39 insertions, 16 deletions

diff --git a/x11-plugins/wmbio/ChangeLog b/x11-plugins/wmbio/ChangeLog
index 3f61d098db50..04baefb18ee2 100644
--- a/x11-plugins/wmbio/ChangeLog
+++ b/x11-plugins/wmbio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbio
-# Copyright 2001-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.10 2004/11/24 05:00:21 weeve Exp $
+# Copyright 2001-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.11 2006/01/24 22:23:26 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmbio-1.02.ebuild:
+  Fixed DEPEND for modular X.
 
   23 Nov 2004; Jason Wever <weeve@gentoo.org> wmbio-1.02.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index 3a0fbb547ff3..83cc733b2407 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.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/wmbio/wmbio-1.02.ebuild,v 1.5 2004/11/24 05:00:21 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/wmbio-1.02.ebuild,v 1.6 2006/01/24 22:23:26 nelchael Exp $
 
 inherit eutils
 
@@ -10,7 +10,13 @@ DESCRIPTION="a Window Maker applet that shows your biorhythm"
 SRC_URI="http://wmbio.sourceforge.net/${P}.tar.gz"
 HOMEPAGE="http://wmbio.sourceforge.net/"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmblob/ChangeLog b/x11-plugins/wmblob/ChangeLog
index adfeb243857f..b3fa665fa00c 100644
--- a/x11-plugins/wmblob/ChangeLog
+++ b/x11-plugins/wmblob/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmblob
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/ChangeLog,v 1.6 2005/07/10 21:31:59 smithj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/ChangeLog,v 1.7 2006/01/24 22:24:55 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmblob-1.0.1.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Jul 2005; Jonathan Smith <smithj@gentoo.org>
   -files/gentoo-cflags.patch, +files/wmblob-configure-fixes.patch,
diff --git a/x11-plugins/wmblob/wmblob-1.0.1.ebuild b/x11-plugins/wmblob/wmblob-1.0.1.ebuild
index ea77dece80d4..2724fe15a4f9 100644
--- a/x11-plugins/wmblob/wmblob-1.0.1.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.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/wmblob/wmblob-1.0.1.ebuild,v 1.6 2005/07/10 21:31:59 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/wmblob-1.0.1.ebuild,v 1.7 2006/01/24 22:24:55 nelchael Exp $
 
 inherit eutils
 
@@ -10,8 +10,7 @@ DESCRIPTION="wmblob shows some blobs moving around"
 SRC_URI="http://dockapps.org/download.php/id/440/${P}.tar.bz2"
 HOMEPAGE="http://dockapps.org/file.php/id/155"
 
-DEPEND="virtual/x11
-	>=x11-libs/pango-1.4.0
+DEPEND=">=x11-libs/pango-1.4.0
 	>=x11-libs/gtk+-2.4.1
 	>=dev-util/pkgconfig-0.15.0"
 
diff --git a/x11-plugins/wmbluecpu/ChangeLog b/x11-plugins/wmbluecpu/ChangeLog
index 69185d4e8480..e7ef9ed8edc3 100644
--- a/x11-plugins/wmbluecpu/ChangeLog
+++ b/x11-plugins/wmbluecpu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbluecpu
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/ChangeLog,v 1.10 2005/11/07 16:07:23 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/ChangeLog,v 1.11 2006/01/24 22:27:37 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmbluecpu-0.6.ebuild:
+  Fixed DEPEND for modular X.
 
   07 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> wmbluecpu-0.6.ebuild:
   Removed INSTALL from dodoc.
diff --git a/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild b/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild
index 23c8b9fd3b31..11ef3bab9401 100644
--- a/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild
+++ b/x11-plugins/wmbluecpu/wmbluecpu-0.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/wmbluecpu/wmbluecpu-0.6.ebuild,v 1.4 2005/11/07 16:07:23 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbluecpu/wmbluecpu-0.6.ebuild,v 1.5 2006/01/24 22:27:37 nelchael Exp $
 
 IUSE=""
 
@@ -12,7 +12,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc ~sparc x86"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
 
 src_compile()
 {