Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre4-r1

61 files changed, 444 insertions, 221 deletions

diff --git a/x11-plugins/wmhdplop/ChangeLog b/x11-plugins/wmhdplop/ChangeLog
index 27c483346dc9..3fe9fb6c744e 100644
--- a/x11-plugins/wmhdplop/ChangeLog
+++ b/x11-plugins/wmhdplop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmhdplop
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.8 2005/11/10 10:08:33 s4t4n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/ChangeLog,v 1.9 2006/01/31 19:25:21 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmhdplop-0.9.7.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmhdplop-0.9.7.ebuild:
   Make use of built_with_use() (from eutils eclass) to fail if imlib2
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild
index 591d18acc092..c49905cd9b40 100644
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.7.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/wmhdplop/wmhdplop-0.9.7.ebuild,v 1.5 2006/01/01 01:22:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmhdplop/wmhdplop-0.9.7.ebuild,v 1.6 2006/01/31 19:25:21 nelchael Exp $
 
 inherit eutils
 
@@ -14,7 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )
 	>=media-libs/imlib2-1.2.0-r2
 	gkrellm? ( >=app-admin/gkrellm-2.1.28-r1 )"
 
diff --git a/x11-plugins/wmifinfo/ChangeLog b/x11-plugins/wmifinfo/ChangeLog
index d5c3187d16f8..a90aab557226 100644
--- a/x11-plugins/wmifinfo/ChangeLog
+++ b/x11-plugins/wmifinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmifinfo
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/ChangeLog,v 1.14 2005/11/11 23:12:10 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/ChangeLog,v 1.15 2006/01/31 19:27:54 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmifinfo-0.08.ebuild,
+  wmifinfo-0.09.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> wmifinfo-0.09.ebuild:
   Stable on ppc.
diff --git a/x11-plugins/wmifinfo/files/digest-wmifinfo-0.08 b/x11-plugins/wmifinfo/files/digest-wmifinfo-0.08
deleted file mode 100644
index e4869dd26fa3..000000000000
--- a/x11-plugins/wmifinfo/files/digest-wmifinfo-0.08
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5bef0fb67c6bc6e5106bd141afee3a20 wmifinfo-0.08.tgz 16077
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild
deleted file mode 100644
index 34beccff1973..000000000000
--- a/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/wmifinfo-0.08.ebuild,v 1.3 2005/04/10 11:55:04 hansmi Exp $
-
-IUSE=""
-
-DESCRIPTION="WindowMaker Interface Monitor (dockapp)"
-HOMEPAGE="http://www.zevv.nl/wmifinfo/"
-SRC_URI="http://www.zevv.nl/wmifinfo/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
-
-DEPEND="virtual/x11
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Allow use of Gentoo CFLAGS
-	sed -i -e "s:-O2:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin wmifinfo
-	dodoc README Changelog
-}
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
index bd33d7a72518..edb8afab52ee 100644
--- a/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.09.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/wmifinfo/wmifinfo-0.09.ebuild,v 1.4 2005/11/11 23:12:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild,v 1.5 2006/01/31 19:27:54 nelchael Exp $
 
 IUSE=""
 
@@ -12,7 +12,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 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 )
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-plugins/wmifs/ChangeLog b/x11-plugins/wmifs/ChangeLog
index ea2aefb60447..dff238ed164a 100644
--- a/x11-plugins/wmifs/ChangeLog
+++ b/x11-plugins/wmifs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmifs
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/ChangeLog,v 1.17 2005/11/10 09:18:12 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/ChangeLog,v 1.18 2006/01/31 19:29:43 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmifs-1.3_beta1-r2.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmifs-1.3_beta1-r2.ebuild:
   Removed COPYING and INSTALL from dodoc.
diff --git a/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild b/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild
index 3abdcc653478..9f7b97cd55bb 100644
--- a/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild
+++ b/x11-plugins/wmifs/wmifs-1.3_beta1-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/wmifs/wmifs-1.3_beta1-r2.ebuild,v 1.5 2005/11/10 09:18:12 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmifs/wmifs-1.3_beta1-r2.ebuild,v 1.6 2006/01/31 19:29:43 nelchael Exp $
 
 inherit eutils
 
@@ -12,7 +12,14 @@ HOMEPAGE="http://www.linux.tucows.com"
 SRC_URI="http://linux.tucows.tierra.net/files/x11/dock/${PN}-${MY_PV}.tar.gz
 	http://http.us.debian.org/debian/pool/main/w/wmifs/${PN}_${MY_PV}-11.diff.gz"
 
-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"
 KEYWORDS="x86 ppc sparc alpha hppa ~mips ia64 amd64"
diff --git a/x11-plugins/wminet/ChangeLog b/x11-plugins/wminet/ChangeLog
index 73fbebc164de..e845893a9c51 100644
--- a/x11-plugins/wminet/ChangeLog
+++ b/x11-plugins/wminet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wminet
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/ChangeLog,v 1.7 2004/09/02 18:22:40 pvdabeel Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/ChangeLog,v 1.8 2006/01/31 19:31:12 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wminet-2.0.3.ebuild:
+  Fixed DEPEND for modular X.
 
   02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   wminet-2.0.3.ebuild:
diff --git a/x11-plugins/wminet/wminet-2.0.3.ebuild b/x11-plugins/wminet/wminet-2.0.3.ebuild
index a87e64e9e2ba..1319c35c652f 100644
--- a/x11-plugins/wminet/wminet-2.0.3.ebuild
+++ b/x11-plugins/wminet/wminet-2.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/wminet/wminet-2.0.3.ebuild,v 1.11 2004/09/02 18:22:40 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wminet/wminet-2.0.3.ebuild,v 1.12 2006/01/31 19:31:12 nelchael Exp $
 
 S="${WORKDIR}/${PN}.app"
 IUSE=""
@@ -12,7 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ppc"
 
-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"
 
 src_unpack() {
diff --git a/x11-plugins/wmitime/ChangeLog b/x11-plugins/wmitime/ChangeLog
index b78330451b74..6d7a4481eab6 100644
--- a/x11-plugins/wmitime/ChangeLog
+++ b/x11-plugins/wmitime/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmitime
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/ChangeLog,v 1.10 2005/11/10 09:37:23 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/ChangeLog,v 1.11 2006/01/31 19:33:14 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmitime-0.3.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmitime-0.3.ebuild:
   Removed COPYING from dodoc.
diff --git a/x11-plugins/wmitime/wmitime-0.3.ebuild b/x11-plugins/wmitime/wmitime-0.3.ebuild
index 37cd8bbad5fa..34afa8cf9ccf 100644
--- a/x11-plugins/wmitime/wmitime-0.3.ebuild
+++ b/x11-plugins/wmitime/wmitime-0.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/wmitime/wmitime-0.3.ebuild,v 1.14 2005/11/10 09:37:23 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/wmitime-0.3.ebuild,v 1.15 2006/01/31 19:33:14 nelchael Exp $
 
 inherit eutils
 
@@ -14,8 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
 
-DEPEND="virtual/libc
-	virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/x11-plugins/wmix/ChangeLog b/x11-plugins/wmix/ChangeLog
index 96201f11e86f..ca29be0477ac 100644
--- a/x11-plugins/wmix/ChangeLog
+++ b/x11-plugins/wmix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmix
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.13 2005/11/10 09:39:32 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.14 2006/01/31 19:35:16 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmix-3.1-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmix-3.1-r1.ebuild:
   Removed COPYING and INSTALL from dodoc.
diff --git a/x11-plugins/wmix/wmix-3.1-r1.ebuild b/x11-plugins/wmix/wmix-3.1-r1.ebuild
index 512b0dd6d942..98de57e3616f 100644
--- a/x11-plugins/wmix/wmix-3.1-r1.ebuild
+++ b/x11-plugins/wmix/wmix-3.1-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/wmix/wmix-3.1-r1.ebuild,v 1.2 2005/11/10 09:39:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/wmix-3.1-r1.ebuild,v 1.3 2006/01/31 19:35:16 nelchael Exp $
 
 inherit eutils
 
@@ -13,7 +13,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 
-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 )
 	>=sys-apps/sed-4"
 
 src_unpack()
diff --git a/x11-plugins/wmjsql/ChangeLog b/x11-plugins/wmjsql/ChangeLog
index 5d4e1e6db6ca..06072bf0a2f4 100644
--- a/x11-plugins/wmjsql/ChangeLog
+++ b/x11-plugins/wmjsql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmjsql
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/ChangeLog,v 1.7 2005/11/10 09:42:37 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/ChangeLog,v 1.8 2006/01/31 19:36:49 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmjsql-0.5.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmjsql-0.5.ebuild:
   Removed INSTALL from dodoc.
diff --git a/x11-plugins/wmjsql/wmjsql-0.5.ebuild b/x11-plugins/wmjsql/wmjsql-0.5.ebuild
index fabf363bdbfb..b2f210ac4680 100644
--- a/x11-plugins/wmjsql/wmjsql-0.5.ebuild
+++ b/x11-plugins/wmjsql/wmjsql-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/wmjsql/wmjsql-0.5.ebuild,v 1.7 2005/11/10 09:42:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmjsql/wmjsql-0.5.ebuild,v 1.8 2006/01/31 19:36:49 nelchael Exp $
 
 IUSE=""
 
@@ -11,7 +11,16 @@ DESCRIPTION="MySQL monitor dockapp"
 SRC_URI="http://www.dockapps.org/download.php/id/73/${P}.tar.gz"
 HOMEPAGE="http://www.dockapps.org/file.php/id/42"
 
-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 )
 	>=dev-db/mysql-4.0.20"
 
 SLOT="0"
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 -*"
diff --git a/x11-plugins/wmmail/ChangeLog b/x11-plugins/wmmail/ChangeLog
index 8bf02deccee4..53974c2634fa 100644
--- a/x11-plugins/wmmail/ChangeLog
+++ b/x11-plugins/wmmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmail
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/ChangeLog,v 1.12 2005/11/11 08:48:23 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/ChangeLog,v 1.13 2006/01/31 19:45:08 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmmail-0.64-r3.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmail-0.64-r3.ebuild:
   Removed COPYING from dodoc.
diff --git a/x11-plugins/wmmail/wmmail-0.64-r3.ebuild b/x11-plugins/wmmail/wmmail-0.64-r3.ebuild
index d950c369ec06..e2cbc32d56f8 100644
--- a/x11-plugins/wmmail/wmmail-0.64-r3.ebuild
+++ b/x11-plugins/wmmail/wmmail-0.64-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/wmmail/wmmail-0.64-r3.ebuild,v 1.7 2005/11/11 08:48:23 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/wmmail-0.64-r3.ebuild,v 1.8 2006/01/31 19:45:08 nelchael Exp $
 
 IUSE=""
 MY_PN=WMMail.app
@@ -14,7 +14,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64 ppc"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )
 	x11-libs/libPropList"
 
 src_compile() {
diff --git a/x11-plugins/wmmaiload/ChangeLog b/x11-plugins/wmmaiload/ChangeLog
index 1af62d70ccca..e8c8a95f0a36 100644
--- a/x11-plugins/wmmaiload/ChangeLog
+++ b/x11-plugins/wmmaiload/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmaiload
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.19 2005/04/11 07:40:13 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.20 2006/01/31 19:46:38 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmmaiload-1.0.2.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmmaiload-1.0.1.ebuild:
   Wiped out older version.
diff --git a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild b/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
index 6f45959cef3a..22d3aa91366f 100644
--- a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-1.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/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.4 2005/04/10 11:55:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.5 2006/01/31 19:46:38 nelchael Exp $
 
 DESCRIPTION="dockapp that monitors one or more mailboxes."
 SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
@@ -10,8 +10,7 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc ~sparc"
 LICENSE="GPL-2"
 
-DEPEND="virtual/x11
-	>=x11-libs/gtk+-1.2.10-r11"
+DEPEND=">=x11-libs/gtk+-1.2.10-r11"
 IUSE=""
 
 src_compile() {
diff --git a/x11-plugins/wmmemfree/ChangeLog b/x11-plugins/wmmemfree/ChangeLog
index 38a2da3e3d10..91d219061f9b 100644
--- a/x11-plugins/wmmemfree/ChangeLog
+++ b/x11-plugins/wmmemfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmemfree
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.8 2005/11/11 09:08:44 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.9 2006/01/31 19:48:13 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmmemfree-0.7-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-r1.ebuild:
   Removed INSTALL and COPYING from dodoc.
diff --git a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild b/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
index d0cc01f17c71..8cf584c74fbf 100644
--- a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
+++ b/x11-plugins/wmmemfree/wmmemfree-0.7-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/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.6 2005/11/11 09:08:44 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.7 2006/01/31 19:48:13 nelchael Exp $
 
 inherit eutils
 
@@ -13,7 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ppc64 ~sparc"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_unpack()
 {
diff --git a/x11-plugins/wmmemload/ChangeLog b/x11-plugins/wmmemload/ChangeLog
index 25ac96512cba..36526dabf1ff 100644
--- a/x11-plugins/wmmemload/ChangeLog
+++ b/x11-plugins/wmmemload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmemload
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.14 2005/09/17 10:10:30 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.15 2006/01/31 19:50:16 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -wmmemload-0.1.5.ebuild, wmmemload-0.1.6.ebuild:
+  Fixed DEPEND for modular X.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wmmemload-0.1.6.ebuild:
   Mark 0.1.6 stable on alpha
diff --git a/x11-plugins/wmmemload/files/digest-wmmemload-0.1.5 b/x11-plugins/wmmemload/files/digest-wmmemload-0.1.5
deleted file mode 100644
index c5833018beb7..000000000000
--- a/x11-plugins/wmmemload/files/digest-wmmemload-0.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59af8d45aeaa1e9dfad5ba3d75140881 wmmemload-0.1.5.tar.gz 141543
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild
deleted file mode 100644
index aa065cdf49ea..000000000000
--- a/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.5.ebuild,v 1.8 2005/02/05 16:43:47 kloeri Exp $
-
-IUSE=""
-DESCRIPTION="dockapp that displays memory and swap space usage."
-SRC_URI="http://www.markstaggs.net/wmmemload/${P}.tar.gz"
-HOMEPAGE="http://www.markstaggs.net/"
-
-SLOT="0"
-KEYWORDS="x86 ~sparc amd64 ppc"
-LICENSE="GPL-2"
-
-DEPEND="virtual/x11"
-
-src_compile() {
-
-	econf || die "configure failed"
-
-	emake || die "parallel make failed"
-
-}
-
-src_install () {
-
-	einstall || die "make install failed"
-
-}
-
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
index 54288a4b12aa..3c45d074815c 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.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/wmmemload/wmmemload-0.1.6.ebuild,v 1.7 2005/09/17 10:10:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild,v 1.8 2006/01/31 19:50:16 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that displays memory and swap space usage."
@@ -11,7 +11,14 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 LICENSE="GPL-2"
 
-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()
 {
diff --git a/x11-plugins/wmmemmon/ChangeLog b/x11-plugins/wmmemmon/ChangeLog
index 76b096de41ff..3f1505020c7a 100644
--- a/x11-plugins/wmmemmon/ChangeLog
+++ b/x11-plugins/wmmemmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmemmon
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/ChangeLog,v 1.14 2005/09/17 10:10:54 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/ChangeLog,v 1.15 2006/01/31 19:52:24 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmmemmon-1.0.1.ebuild:
+  Fixed DEPEND for modular X.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wmmemmon-1.0.1.ebuild:
   Mark 1.0.1 stable on alpha
diff --git a/x11-plugins/wmmemmon/Manifest b/x11-plugins/wmmemmon/Manifest
index e0f820f3a95c..54711d655f07 100644
--- a/x11-plugins/wmmemmon/Manifest
+++ b/x11-plugins/wmmemmon/Manifest
@@ -1,4 +1,12 @@
-MD5 5fa4588139595046ad0fbf1623ddba40 metadata.xml 623
 MD5 e4be1c45582a6c2ef6349c268c8c10e9 ChangeLog 1569
-MD5 c14b42316a519e62b0dd99f1762a453d wmmemmon-1.0.1.ebuild 766
-MD5 857eb8c9ba9823482749d4e34f1d80aa files/digest-wmmemmon-1.0.1 66
+RMD160 4a5899a63529e442ed8c7528c84d3ca6be159dd5 ChangeLog 1569
+SHA256 19c45d2ccd00ca03b14cf17df231a87de782f5b23a58a285a87e2b51ff805be8 ChangeLog 1569
+MD5 c85a3335cd618dbd1b289c076c6ba4ab files/digest-wmmemmon-1.0.1 244
+RMD160 b9978843e1091732d05f7cb244576b5108796eef files/digest-wmmemmon-1.0.1 244
+SHA256 e04677b22bf256df4c78a8494fa59e86c8608a2d377e37d0fa8c06ef9f5fe7c8 files/digest-wmmemmon-1.0.1 244
+MD5 5fa4588139595046ad0fbf1623ddba40 metadata.xml 623
+RMD160 6e1e604fcf7fbf1050af18ef7ee4f6464a955673 metadata.xml 623
+SHA256 8175a867a176c7cecc141e825a2e1eda7aa785fe2c40a9b1565e1bde50f951be metadata.xml 623
+MD5 6b19d34976781b04484df1abc9621735 wmmemmon-1.0.1.ebuild 803
+RMD160 d88168d3435cd5d2e7b1dd3a65b8af70bed8f2ba wmmemmon-1.0.1.ebuild 803
+SHA256 71216c68a30b5bc58bd30c2cbc5f612d8ad4ffb508026656335b637ec9da9941 wmmemmon-1.0.1.ebuild 803
diff --git a/x11-plugins/wmmemmon/files/digest-wmmemmon-1.0.1 b/x11-plugins/wmmemmon/files/digest-wmmemmon-1.0.1
index d76918b4a350..414c6f53e140 100644
--- a/x11-plugins/wmmemmon/files/digest-wmmemmon-1.0.1
+++ b/x11-plugins/wmmemmon/files/digest-wmmemmon-1.0.1
@@ -1 +1,3 @@
 MD5 c4b0f93d0a3ebe2c90022c996b29371c wmmemmon-1.0.1.tar.gz 145287
+RMD160 8e120a5f039cf206163abfc1cf4287f3f8413a60 wmmemmon-1.0.1.tar.gz 145287
+SHA256 cfdf1fb58e60b0902c78e2b31335f4c33b18bdb57166d03012b6cf4b9883de37 wmmemmon-1.0.1.tar.gz 145287
diff --git a/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild b/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
index 354cad221edf..8dace08c743f 100644
--- a/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild
+++ b/x11-plugins/wmmemmon/wmmemmon-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/wmmemmon/wmmemmon-1.0.1.ebuild,v 1.11 2005/09/17 10:10:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemmon/wmmemmon-1.0.1.ebuild,v 1.12 2006/01/31 19:52:24 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="A program to monitor memory/swap usages."
@@ -11,25 +11,21 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 SLOT="0"
 
-DEPEND="virtual/libc virtual/x11"
-
-src_compile() {
-
-	econf || die "configure failed"
-
-	emake || die "parallel make failed"
-
-}
+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 "make install failed"
 
 	doman doc/wmmemmon.1
-
 	dodoc AUTHORS ChangeLog THANKS TODO README
-
 	dobin src/wmmemmon
 
 }
-
diff --git a/x11-plugins/wmmisc/ChangeLog b/x11-plugins/wmmisc/ChangeLog
index 0bd9ca16bf53..3a8c4e9eaccc 100644
--- a/x11-plugins/wmmisc/ChangeLog
+++ b/x11-plugins/wmmisc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmisc
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/ChangeLog,v 1.3 2005/04/28 20:55:51 wormo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/ChangeLog,v 1.4 2006/01/31 19:54:16 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmmisc-0.9.ebuild:
+  Fixed DEPEND for modular X.
 
   28 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> wmmisc-0.9.ebuild:
   mark ~ppc
diff --git a/x11-plugins/wmmisc/wmmisc-0.9.ebuild b/x11-plugins/wmmisc/wmmisc-0.9.ebuild
index e3f7020b7c10..3492ee1f5200 100644
--- a/x11-plugins/wmmisc/wmmisc-0.9.ebuild
+++ b/x11-plugins/wmmisc/wmmisc-0.9.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/wmmisc/wmmisc-0.9.ebuild,v 1.3 2005/04/28 20:55:51 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/wmmisc-0.9.ebuild,v 1.4 2006/01/31 19:54:16 nelchael Exp $
 
 IUSE=""
 
@@ -12,7 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile()
 {
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"
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."
diff --git a/x11-plugins/wmnetselect/ChangeLog b/x11-plugins/wmnetselect/ChangeLog
index 53c77458b2ac..7adeead8e3c5 100644
--- a/x11-plugins/wmnetselect/ChangeLog
+++ b/x11-plugins/wmnetselect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmnetselect
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/ChangeLog,v 1.10 2005/11/11 10:23:42 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/ChangeLog,v 1.11 2006/01/31 20:11:13 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmnetselect-0.8-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmnetselect-0.8.ebuild:
   Removed COPYING from dodoc.
diff --git a/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild b/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
index 9b1975e1b2a4..b5909a672742 100644
--- a/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild
+++ b/x11-plugins/wmnetselect/wmnetselect-0.8-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/wmnetselect/wmnetselect-0.8-r1.ebuild,v 1.11 2005/11/11 10:23:42 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetselect/wmnetselect-0.8-r1.ebuild,v 1.12 2006/01/31 20:11:13 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="WindowMaker browser launcher docklet"
@@ -11,7 +11,18 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64 ppc"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-misc/imake )
+	virtual/x11 )"
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-plugins/wmpiki/ChangeLog b/x11-plugins/wmpiki/ChangeLog
index d1195bd697ff..425d3631792d 100644
--- a/x11-plugins/wmpiki/ChangeLog
+++ b/x11-plugins/wmpiki/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmpiki
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/ChangeLog,v 1.5 2004/11/25 05:36:06 weeve Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/ChangeLog,v 1.6 2006/01/31 20:12:48 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmpiki-0.2.1.ebuild:
+  Fixed DEPEND for modular X.
 
   24 Nov 2004; Jason Wever <weeve@gentoo.org> wmpiki-0.2.1.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild b/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild
index ec170119064a..c82db1da2fd0 100644
--- a/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild
+++ b/x11-plugins/wmpiki/wmpiki-0.2.1.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/wmpiki/wmpiki-0.2.1.ebuild,v 1.5 2004/11/25 05:36:06 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpiki/wmpiki-0.2.1.ebuild,v 1.6 2006/01/31 20:12:48 nelchael Exp $
 
 inherit eutils
 
@@ -14,7 +14,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()
 {
diff --git a/x11-plugins/wmpinboard/ChangeLog b/x11-plugins/wmpinboard/ChangeLog
index d28c2421ab4b..11d7cbd2121c 100644
--- a/x11-plugins/wmpinboard/ChangeLog
+++ b/x11-plugins/wmpinboard/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmpinboard
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/ChangeLog,v 1.11 2004/09/02 18:22:40 pvdabeel Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/ChangeLog,v 1.12 2006/01/31 20:14:18 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmpinboard-1.0.ebuild:
+  Fixed DEPEND for modular X.
 
   02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   wmpinboard-1.0.ebuild:
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index 21a51edcf219..bec1c69c402a 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.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/wmpinboard/wmpinboard-1.0.ebuild,v 1.14 2005/07/11 23:34:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild,v 1.15 2006/01/31 20:14:18 nelchael Exp $
 
 inherit eutils
 
@@ -9,7 +9,16 @@ DESCRIPTION="Window Maker dock applet resembling a miniature pinboard."
 SRC_URI="http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/${P}.tar.bz2"
 HOMEPAGE="http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard"
 
-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/wmpop3lb/ChangeLog b/x11-plugins/wmpop3lb/ChangeLog
index 39016063c847..c05c687ca386 100644
--- a/x11-plugins/wmpop3lb/ChangeLog
+++ b/x11-plugins/wmpop3lb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmpop3lb
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/ChangeLog,v 1.7 2005/12/01 14:40:52 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/ChangeLog,v 1.8 2006/01/31 20:18:13 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmpop3lb-2.4.2.ebuild,
+  wmpop3lb-2.4.2-r1.ebuild:
+  Fixed DEPEND for modular X.
 
 *wmpop3lb-2.4.2-r1 (01 Dec 2005)
 
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r1.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r1.ebuild
index 541c2aa45f87..49fc435f634b 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r1.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-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/wmpop3lb/wmpop3lb-2.4.2-r1.ebuild,v 1.1 2005/12/01 14:40:52 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r1.ebuild,v 1.2 2006/01/31 20:18:13 nelchael Exp $
 
 inherit eutils
 
@@ -16,7 +16,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
-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"
 
 src_unpack() {
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
index 00ca49676068..e528c5e59f92 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.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/wmpop3lb/wmpop3lb-2.4.2.ebuild,v 1.8 2004/06/28 21:30:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/wmpop3lb-2.4.2.ebuild,v 1.9 2006/01/31 20:18:13 nelchael Exp $
 
 IUSE=""
 
@@ -14,7 +14,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
 
-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"
 
 src_unpack() {