Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

7 files changed, 59 insertions, 19 deletions

diff --git a/x11-plugins/wmnd/ChangeLog b/x11-plugins/wmnd/ChangeLog
index 72ec6a5cb012..c3ff57f2f08a 100644
--- a/x11-plugins/wmnd/ChangeLog
+++ b/x11-plugins/wmnd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmnd
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/ChangeLog,v 1.36 2005/11/11 10:10:08 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/ChangeLog,v 1.37 2006/01/31 20:03:49 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmnd-0.4.11.ebuild,
+  wmnd-0.4.11-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberaco <s4t4n@gentoo.org> wmnd-0.4.11-r1.ebuild,
   wmnd-0.4.11.ebuild:
diff --git a/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild b/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild
index f72adacf7146..5ee14cbbfb4e 100644
--- a/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.11-r1.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/wmnd/wmnd-0.4.11-r1.ebuild,v 1.5 2005/11/11 10:10:08 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.11-r1.ebuild,v 1.6 2006/01/31 20:03:49 nelchael Exp $
 
 IUSE="snmp"
 DESCRIPTION="WindowMaker Network Devices (dockapp)"
@@ -11,8 +11,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 
-DEPEND="virtual/x11
-	snmp?   ( >=net-analyzer/net-snmp-5.2.1 )"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )
+	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
 
 src_compile()
 {
diff --git a/x11-plugins/wmnd/wmnd-0.4.11.ebuild b/x11-plugins/wmnd/wmnd-0.4.11.ebuild
index 30b4721d6d04..cc6806f43f94 100644
--- a/x11-plugins/wmnd/wmnd-0.4.11.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.11.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/wmnd/wmnd-0.4.11.ebuild,v 1.6 2005/11/11 10:10:08 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.11.ebuild,v 1.7 2006/01/31 20:03:49 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="WindowMaker Network Devices (dockapp)"
@@ -11,7 +11,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
 
-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_compile() {
 	econf || die "configure failed"
diff --git a/x11-plugins/wmnet/ChangeLog b/x11-plugins/wmnet/ChangeLog
index ed9e71cfbb4e..a106d3507d14 100644
--- a/x11-plugins/wmnet/ChangeLog
+++ b/x11-plugins/wmnet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmnet
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/ChangeLog,v 1.20 2005/04/11 07:35:29 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/ChangeLog,v 1.21 2006/01/31 20:06:22 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmnet-1.06-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmnet-1.06.ebuild:
   Removed older revision.
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
index 60721abe8932..a3ac0479d2e8 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r1.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/wmnet/wmnet-1.06-r1.ebuild,v 1.7 2005/04/10 11:55:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnet/wmnet-1.06-r1.ebuild,v 1.8 2006/01/31 20:06:22 nelchael Exp $
 
 inherit eutils
 
@@ -10,7 +10,17 @@ SRC_URI="http://www.digitalkaos.net/linux/wmnet/download/${P}.tar.gz
 	mirror://gentoo/${P}-misc.patch.bz2"
 HOMEPAGE="http://www.digitalkaos.net/linux/wmnet/"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-misc/imake
+		app-text/rman )
+	virtual/x11 )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmnetmon/ChangeLog b/x11-plugins/wmnetmon/ChangeLog
index 3efc465316e1..dbacbd68ff6d 100644
--- a/x11-plugins/wmnetmon/ChangeLog
+++ b/x11-plugins/wmnetmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmnetmon
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/ChangeLog,v 1.6 2005/12/16 13:17:14 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/ChangeLog,v 1.7 2006/01/31 20:07:46 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmnetmon-0.2.ebuild:
+  Fixed DEPEND for modular X.
 
   16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> wmnetmon-0.2.ebuild:
   Replace root:root in root:0. Bug #103563.
diff --git a/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild b/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild
index 73c420364df4..e723e6bbdc7d 100644
--- a/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild
+++ b/x11-plugins/wmnetmon/wmnetmon-0.2.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/wmnetmon/wmnetmon-0.2.ebuild,v 1.9 2005/12/16 13:17:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetmon/wmnetmon-0.2.ebuild,v 1.10 2006/01/31 20:07:46 nelchael Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}p5/
@@ -12,7 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile() {
 	econf --prefix=${D}/usr/bin || die "Configure failed."