Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

6 files changed, 47 insertions, 16 deletions

diff --git a/x11-plugins/wmlaptop/ChangeLog b/x11-plugins/wmlaptop/ChangeLog
index 119bdfca21c6..4e363df2cbd0 100644
--- a/x11-plugins/wmlaptop/ChangeLog
+++ b/x11-plugins/wmlaptop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmlaptop
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.4 2005/12/01 20:43:48 metalgod Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.5 2006/01/31 19:38:33 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmlaptop-1.3.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Dec 2005; Luis Medinas <metalgod@gentoo.org> wmlaptop-1.3.ebuild:
   Added ~amd64 keyword. Closes bug #114143.
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
index bbe68768dc4a..9a9a836f6008 100644
--- a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
+++ b/x11-plugins/wmlaptop/wmlaptop-1.3.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/wmlaptop/wmlaptop-1.3.ebuild,v 1.4 2005/12/01 20:43:48 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild,v 1.5 2006/01/31 19:38:33 nelchael Exp $
 
 IUSE=""
 
@@ -11,8 +11,13 @@ DESCRIPTION="Dockapp for laptop users"
 SRC_URI="http://www.dockapps.org/download.php/id/474/${P}.tar.bz2"
 HOMEPAGE="http://www.dockapps.org/file.php/id/227"
 
-DEPEND="virtual/x11"
-RDEPEND=""
+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/wmload/ChangeLog b/x11-plugins/wmload/ChangeLog
index e1de105e6636..2b43071ad27f 100644
--- a/x11-plugins/wmload/ChangeLog
+++ b/x11-plugins/wmload/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmload
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.5 2004/11/24 23:16:45 weeve Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.6 2006/01/31 19:40:54 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmload-0.9.2.ebuild:
+  Fixed DEPEND for modular X.
 
   24 Nov 2004; Jason Wever <weeve@gentoo.org> wmload-0.9.2.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmload/wmload-0.9.2.ebuild b/x11-plugins/wmload/wmload-0.9.2.ebuild
index 58a0961a6bbd..8c64f8cbf3ca 100644
--- a/x11-plugins/wmload/wmload-0.9.2.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.2.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/wmload/wmload-0.9.2.ebuild,v 1.5 2004/11/24 23:16:45 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild,v 1.6 2006/01/31 19:40:54 nelchael Exp $
 
 inherit eutils
 
@@ -10,7 +10,17 @@ DESCRIPTION="yet another dock application showing a system load gauge"
 SRC_URI="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/${P}.tgz"
 HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/sys.html#wmload"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-misc/imake
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmlongrun/ChangeLog b/x11-plugins/wmlongrun/ChangeLog
index 245d5caa42b5..d527fc4c90ec 100644
--- a/x11-plugins/wmlongrun/ChangeLog
+++ b/x11-plugins/wmlongrun/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmlongrun
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/ChangeLog,v 1.3 2005/11/11 08:45:45 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/ChangeLog,v 1.4 2006/01/31 19:42:41 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmlongrun-0.2.0.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmlongrun-0.2.0.ebuild:
   removed COPYING from dodoc.
diff --git a/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild b/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild
index d0b028b588e3..e049e01bd0dd 100644
--- a/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild
+++ b/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild
@@ -1,15 +1,22 @@
-# 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/wmlongrun/wmlongrun-0.2.0.ebuild,v 1.3 2005/11/11 08:45:45 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlongrun/wmlongrun-0.2.0.ebuild,v 1.4 2006/01/31 19:42:41 nelchael Exp $
 
 DESCRIPTION="A dockapp to monitor LongRun on a Transmeta Crusoe processor"
 HOMEPAGE="http://www.sh.rim.or.jp/~ssato/dockapp/index.shtml"
 SRC_URI="http://www.sh.rim.or.jp/~ssato/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-DEPEND="virtual/x11"
 IUSE=""
 
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
+
 # Since this will only work with a Crusoe processor, it's safe to assume that
 # the functionality is only available on x86.
 KEYWORDS="x86 -*"