Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

7 files changed, 57 insertions, 18 deletions

diff --git a/x11-plugins/wmmixer/ChangeLog b/x11-plugins/wmmixer/ChangeLog
index 520c9836b71a..6c5b38284524 100644
--- a/x11-plugins/wmmixer/ChangeLog
+++ b/x11-plugins/wmmixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmixer
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.7 2005/11/11 09:23:17 s4t4n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/ChangeLog,v 1.8 2006/01/31 19:56:31 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmmixer-2.0_beta4.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmixer-2.0_beta4.ebuild:
   Removed COPYING from dodoc.
diff --git a/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild b/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild
index 72ee0d013e99..2bee2bed8e16 100644
--- a/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild
+++ b/x11-plugins/wmmixer/wmmixer-2.0_beta4.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/wmmixer/wmmixer-2.0_beta4.ebuild,v 1.8 2005/11/11 09:23:17 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmixer/wmmixer-2.0_beta4.ebuild,v 1.9 2006/01/31 19:56:31 nelchael Exp $
 
 inherit eutils
 
@@ -10,7 +10,16 @@ DESCRIPTION="The next generation of WMMixer with native ALSA and OSS support."
 SRC_URI="http://freakzone.net/gordon/src/${PN}-2.0b4.tar.gz"
 HOMEPAGE="http://freakzone.net/gordon/#wmmixer"
 
-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 )
 	alsa? ( media-libs/alsa-lib )
 	>=sys-apps/sed-4"
 
diff --git a/x11-plugins/wmmon+smp/ChangeLog b/x11-plugins/wmmon+smp/ChangeLog
index 34d93b5f8155..4c02d8f05e1b 100644
--- a/x11-plugins/wmmon+smp/ChangeLog
+++ b/x11-plugins/wmmon+smp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmon+smp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/ChangeLog,v 1.7 2005/03/07 16:47:06 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/ChangeLog,v 1.8 2006/01/31 20:00:36 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmmon+smp-1.0-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   07 Mar 2005; Markus Rothe <corsair@gentoo.org> wmmon+smp-1.0-r1.ebuild:
   Stable on ppc64
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild
index 2b44e8ab0051..1fae4e9f4b8d 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-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/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.9 2005/03/07 16:47:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.10 2006/01/31 20:00:36 nelchael Exp $
 
 IUSE=""
 
@@ -14,7 +14,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ppc64"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile() {
 	cd ${S2}
diff --git a/x11-plugins/wmmon/ChangeLog b/x11-plugins/wmmon/ChangeLog
index 990fcdac9bcb..048080316eaa 100644
--- a/x11-plugins/wmmon/ChangeLog
+++ b/x11-plugins/wmmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmon
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/ChangeLog,v 1.19 2005/11/11 09:25:33 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/ChangeLog,v 1.20 2006/01/31 19:58:51 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmmon-1.0_beta2-r2.ebuild, wmmon-1.0_beta2-r3.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmon-1.0_beta2-r3.ebuild,
   wmmon-1.0_beta2-r2.ebuild:
diff --git a/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild
index 0e1d07e08972..4ccb757ff159 100644
--- a/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2-r2.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/wmmon/wmmon-1.0_beta2-r2.ebuild,v 1.9 2005/11/11 09:25:33 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r2.ebuild,v 1.10 2006/01/31 19:58:51 nelchael Exp $
 
 inherit eutils
 
@@ -11,7 +11,13 @@ WMMON_VERSION=1_0b2
 SRC_URI="http://rpig.dyndns.org/~anstinus/Linux/${PN}-${WMMON_VERSION}.tar.gz"
 HOMEPAGE="http://www.bensinclair.com/dockapp/"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )
 	>=sys-apps/sed-4"
 
 SLOT="0"
diff --git a/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild b/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild
index d80797f3608f..4d27ad97bd9c 100644
--- a/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.0_beta2-r3.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/wmmon/wmmon-1.0_beta2-r3.ebuild,v 1.4 2005/11/11 09:25:33 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild,v 1.5 2006/01/31 19:58:51 nelchael Exp $
 
 inherit eutils
 
@@ -11,7 +11,13 @@ WMMON_VERSION=1_0b2
 SRC_URI="http://rpig.dyndns.org/~anstinus/Linux/${PN}-${WMMON_VERSION}.tar.gz"
 HOMEPAGE="http://www.bensinclair.com/dockapp/"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )
 	>=sys-apps/sed-4"
 
 SLOT="0"