Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

22 files changed, 151 insertions, 81 deletions

diff --git a/x11-plugins/wmbatppc/ChangeLog b/x11-plugins/wmbatppc/ChangeLog
index 7bb6863cf54b..6c3c04f5f34c 100644
--- a/x11-plugins/wmbatppc/ChangeLog
+++ b/x11-plugins/wmbatppc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbatppc
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.7 2004/07/25 19:02:06 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/ChangeLog,v 1.8 2006/01/24 22:13:04 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmbatppc-2.4.ebuild:
+  Fixed DEPEND for modular X.
 
   25 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbatppc-2.4.ebuild:
   OK, I should not be doing this since I own no ppc hardware, but I got
diff --git a/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild b/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild
index 40c15c309537..5199dafb0752 100644
--- a/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild
+++ b/x11-plugins/wmbatppc/wmbatppc-2.4.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/wmbatppc/wmbatppc-2.4.ebuild,v 1.2 2004/07/25 19:02:06 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatppc/wmbatppc-2.4.ebuild,v 1.3 2006/01/24 22:13:04 nelchael Exp $
 
 inherit eutils
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="-* ppc"
 IUSE=""
 
-DEPEND="virtual/x11
-	>=app-laptop/pmud-0.10.1-r2
+DEPEND=">=app-laptop/pmud-0.10.1-r2
 	>=x11-libs/xosd-2.2.5-r1"
 
 src_unpack()
diff --git a/x11-plugins/wmbatteries/ChangeLog b/x11-plugins/wmbatteries/ChangeLog
index 0dec8f0d12cb..2c1ca992fe57 100644
--- a/x11-plugins/wmbatteries/ChangeLog
+++ b/x11-plugins/wmbatteries/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmbatteries
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/ChangeLog,v 1.2 2004/09/05 22:20:00 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/ChangeLog,v 1.3 2006/01/24 22:15:05 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmbatteries-0.1.3.ebuild:
+  Fixed DEPEND for modular X.
 
   06 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbatteries-0.1.3.ebuild:
   Stable for x86.
diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild b/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
index dc48910bf03e..3f8196c846ef 100644
--- a/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild
+++ b/x11-plugins/wmbatteries/wmbatteries-0.1.3.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/wmbatteries/wmbatteries-0.1.3.ebuild,v 1.2 2004/09/05 22:20:00 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbatteries/wmbatteries-0.1.3.ebuild,v 1.3 2006/01/24 22:15:05 nelchael Exp $
 
 inherit eutils
 
@@ -12,7 +12,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-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_install() {
 	einstall || die "Installation failed"
diff --git a/x11-plugins/wmbattery/ChangeLog b/x11-plugins/wmbattery/ChangeLog
index b6d1b8fd40cd..b65c9b2fbf0a 100644
--- a/x11-plugins/wmbattery/ChangeLog
+++ b/x11-plugins/wmbattery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmbattery
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.15 2005/11/07 16:19:37 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.16 2006/01/24 22:18:27 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmbattery-2.19-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmbattery-2.19-r1.ebuild:
   Removed COPYING from doinstall.
diff --git a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild b/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
index 2b9ade191324..ccea38fb3a3f 100644
--- a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.19-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/wmbattery/wmbattery-2.19-r1.ebuild,v 1.5 2005/11/07 16:19:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild,v 1.6 2006/01/24 22:18:27 nelchael Exp $
 
 inherit eutils
 
@@ -16,8 +16,15 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 -sparc ~ppc"
 
-DEPEND="virtual/x11
-	sys-apps/apmd"
+RDEPEND="sys-apps/apmd
+	|| ( (
+		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 "Configuration failed"
diff --git a/x11-plugins/wmbinclock/ChangeLog b/x11-plugins/wmbinclock/ChangeLog
index e17fa0cca0a3..86ccd80b95ed 100644
--- a/x11-plugins/wmbinclock/ChangeLog
+++ b/x11-plugins/wmbinclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmbinclock
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/ChangeLog,v 1.8 2004/11/24 04:58:44 weeve Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/ChangeLog,v 1.9 2006/01/24 22:21:17 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmbinclock-0.1.ebuild,
+  wmbinclock-0.3.ebuild:
+  Fixed DEPEND for modular X.
 
   23 Nov 2004; Jason Wever <weeve@gentoo.org> wmbinclock-0.3.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmbinclock/files/digest-wmbinclock-0.1 b/x11-plugins/wmbinclock/files/digest-wmbinclock-0.1
deleted file mode 100644
index b8bf27201ae4..000000000000
--- a/x11-plugins/wmbinclock/files/digest-wmbinclock-0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83bc44148870b04a9d6588c7e0558058 wmbinclock-0.1.tar.gz 5698
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild
deleted file mode 100644
index ed284cc39356..000000000000
--- a/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild,v 1.8 2004/07/22 00:11:43 s4t4n Exp $
-
-IUSE=""
-
-S="${WORKDIR}/wmBinClock"
-HOMEPAGE="http://www.inxsoft.net/wmbinclock"
-DESCRIPTION="wmbinclock shows the actual system time as a binary clock"
-SRC_URI="http://www.inxsoft.net/wmbinclock/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="freedist"
-KEYWORDS="x86 amd64 ppc"
-
-DEPEND="virtual/x11"
-
-src_compile() {
-	myconf=""
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dodoc README
-	dodir /usr/bin
-	make DESTDIR=${D}/usr install || die
-}
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
index e656fdda7da3..ba5a1667990e 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.3.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/wmbinclock/wmbinclock-0.3.ebuild,v 1.5 2004/11/24 04:58:44 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild,v 1.6 2006/01/24 22:21:17 nelchael Exp $
 
 IUSE=""
 
@@ -12,7 +12,16 @@ SLOT="0"
 LICENSE="freedist"
 KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
 
-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()
 {
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()
 {
diff --git a/x11-plugins/wmbutton/ChangeLog b/x11-plugins/wmbutton/ChangeLog
index 588ab26a740f..5f5ea47c72cb 100644
--- a/x11-plugins/wmbutton/ChangeLog
+++ b/x11-plugins/wmbutton/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbutton
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.7 2005/09/25 17:29:14 metalgod Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.8 2006/01/24 22:29:38 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmbutton-0.5.ebuild:
+  Fixed DEPEND for modular X.
 
   25 Sep 2005; Luis Medinas <metalgod@gentoo.org> wmbutton-0.5.ebuild:
   Added ~amd64 keywords. Closes bug #107124
diff --git a/x11-plugins/wmbutton/wmbutton-0.5.ebuild b/x11-plugins/wmbutton/wmbutton-0.5.ebuild
index a058aea8ace7..f66553e03bcc 100644
--- a/x11-plugins/wmbutton/wmbutton-0.5.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.5.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/wmbutton/wmbutton-0.5.ebuild,v 1.7 2005/09/25 17:29:14 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/wmbutton-0.5.ebuild,v 1.8 2006/01/24 22:29:38 nelchael Exp $
 
 inherit eutils
 
@@ -10,7 +10,16 @@ DESCRIPTION="wmbutton is a dockapp application that displays nine configurable b
 SRC_URI="http://www.dockapps.org/download.php/id/454/${P}.tar.gz"
 HOMEPAGE="http://www.dockapps.org/file.php/id/241"
 
-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 )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmcalc/ChangeLog b/x11-plugins/wmcalc/ChangeLog
index d6192398cd97..94e92cfe14ed 100644
--- a/x11-plugins/wmcalc/ChangeLog
+++ b/x11-plugins/wmcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmcalc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.14 2005/11/10 08:44:13 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.15 2006/01/24 22:32:04 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmcalc-0.4.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmcalc-0.4.ebuild:
   Removed COPYING from dodoc.
diff --git a/x11-plugins/wmcalc/wmcalc-0.4.ebuild b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
index 77d05be73ffd..717bc4902bc6 100644
--- a/x11-plugins/wmcalc/wmcalc-0.4.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.4.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/wmcalc/wmcalc-0.4.ebuild,v 1.8 2005/11/10 08:44:13 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.9 2006/01/24 22:32:04 nelchael Exp $
 
 inherit eutils
 
@@ -10,7 +10,17 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
-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 )"
 
 IUSE=""
 
diff --git a/x11-plugins/wmcdplay/ChangeLog b/x11-plugins/wmcdplay/ChangeLog
index 2dccc0cb39b6..62265b9477aa 100644
--- a/x11-plugins/wmcdplay/ChangeLog
+++ b/x11-plugins/wmcdplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmcdplay
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/ChangeLog,v 1.3 2004/09/06 20:40:12 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/ChangeLog,v 1.4 2006/01/24 22:34:10 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmcdplay-1.0_beta1.ebuild:
+  Fixed DEPEND for modular X.
 
   06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> wmcdplay-1.0_beta1.ebuild:
   Stable for x86.
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
index af62c0c4e1c7..ab5b1a6743b7 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.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/wmcdplay/wmcdplay-1.0_beta1.ebuild,v 1.3 2004/09/06 20:40:12 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild,v 1.4 2006/01/24 22:34:10 nelchael Exp $
 
 inherit eutils
 
@@ -13,7 +13,16 @@ DESCRIPTION="CD player applet for WindowMaker"
 SRC_URI="http://www.geocities.com/SiliconValley/Vista/2471/files/${MY_P}.tgz"
 HOMEPAGE="http://www.geocities.com/SiliconValley/Vista/2471/"
 
-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 )"
 
 SLOT="0"
 LICENSE="GPL-2"