Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

22 files changed, 103 insertions, 148 deletions

diff --git a/x11-plugins/wmcalendar/ChangeLog b/x11-plugins/wmcalendar/ChangeLog
index c5d38af12c78..a8a83b194269 100644
--- a/x11-plugins/wmcalendar/ChangeLog
+++ b/x11-plugins/wmcalendar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmcalendar
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.9 2005/11/29 15:49:35 s4t4n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.10 2006/01/24 23:27:32 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmcalendar-0.5.0.ebuild, wmcalendar-0.5.0-r1.ebuild:
+  Fixed DEPEND for modular X.
 
 *wmcalendar-0.5.0-r1 (29 Nov 2005)
 
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild
index 06cd77fb0873..8490ce3b96ed 100644
--- a/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.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/wmcalendar/wmcalendar-0.5.0-r1.ebuild,v 1.1 2005/11/29 15:49:35 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild,v 1.2 2006/01/24 23:27:32 nelchael Exp $
 
 inherit eutils
 
@@ -15,8 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 
-DEPEND="virtual/x11
-	>=dev-libs/libical-0.24_rc4
+DEPEND=">=dev-libs/libical-0.24_rc4
 	>=dev-util/pkgconfig-0.15.0
 	>=x11-libs/gtk+-2.2.1-r1
 	>=sys-apps/sed-4.0.9"
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild
index d6fe66dee19d..0e5a50270090 100644
--- a/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.0.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/wmcalendar/wmcalendar-0.5.0.ebuild,v 1.7 2005/11/07 16:04:20 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.0.ebuild,v 1.8 2006/01/24 23:27:32 nelchael Exp $
 
 inherit eutils
 
@@ -15,11 +15,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc"
 
-DEPEND="virtual/x11
-			>=dev-libs/libical-0.24_rc4
-			>=dev-util/pkgconfig-0.15.0
-			>=x11-libs/gtk+-2.2.1-r1
-			>=sys-apps/sed-4.0.9"
+DEPEND=">=dev-libs/libical-0.24_rc4
+	>=dev-util/pkgconfig-0.15.0
+	>=x11-libs/gtk+-2.2.1-r1
+	>=sys-apps/sed-4.0.9"
 
 S=${WORKDIR}/${P}/Src
 
diff --git a/x11-plugins/wmfire/ChangeLog b/x11-plugins/wmfire/ChangeLog
index 9b7c5a7b013b..f844d12c0db6 100644
--- a/x11-plugins/wmfire/ChangeLog
+++ b/x11-plugins/wmfire/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmfire
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.6 2005/11/10 09:06:59 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.7 2006/01/24 23:15:49 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmfire-0.0.3.9_pre4.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Nov 2004; Michele Noberasco <s4t4n@gentoo.org> wmfire-0.0.3.9_pre4.ebuild:
   Removed COPYING and INSTALL from dodoc.
diff --git a/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild b/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild
index ce6d19c16352..65ae8d015b35 100644
--- a/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild
+++ b/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.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/wmfire/wmfire-0.0.3.9_pre4.ebuild,v 1.9 2005/11/10 09:06:59 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/wmfire-0.0.3.9_pre4.ebuild,v 1.10 2006/01/24 23:15:49 nelchael Exp $
 
 IUSE=""
 
@@ -11,7 +11,13 @@ DESCRIPTION="WindowMaker dockapp that displays cpu usage as a dancing flame"
 SRC_URI="http://staff.xmms.org/zinx/misc/${MY_P}.tar.gz"
 HOMEPAGE="http://staff.xmms.org/zinx/misc"
 
-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"
@@ -23,6 +29,7 @@ src_compile() {
 	econf ${myconf} || die "configure failed"
 
 	emake CFLAGS="$CFLAGS"  || die "parallel make faile"
+
 }
 
 src_install () {
diff --git a/x11-plugins/wmfsm/ChangeLog b/x11-plugins/wmfsm/ChangeLog
index 5d112fa30981..50cb93ea65ef 100644
--- a/x11-plugins/wmfsm/ChangeLog
+++ b/x11-plugins/wmfsm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmfsm
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.8 2004/10/19 08:55:06 absinthe Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.9 2006/01/24 23:19:25 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmfsm-0.34.ebuild,
+  wmfsm-0.34-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmfsm-0.34-r1.ebuild:
   Stable on amd64.
diff --git a/x11-plugins/wmfsm/files/digest-wmfsm-0.34 b/x11-plugins/wmfsm/files/digest-wmfsm-0.34
deleted file mode 100644
index da68c8549153..000000000000
--- a/x11-plugins/wmfsm/files/digest-wmfsm-0.34
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ec81127146d8340a698cc5e26a66e43 wmfsm-0.34.tar.gz 105220
diff --git a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
index fc0360b6eb05..f7207edeaebe 100644
--- a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.34-r1.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/wmfsm/wmfsm-0.34-r1.ebuild,v 1.4 2004/10/19 08:55:06 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild,v 1.5 2006/01/24 23:19:25 nelchael Exp $
 
 inherit eutils
 
@@ -13,13 +13,23 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ppc"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
 
 src_unpack() {
 
 	unpack ${A}
 	cd ${S}/wmfsm
-	#einfo "Applying patch to hide virtual filesystems..."	
+	#einfo "Applying patch to hide virtual filesystems..."
 	epatch ${FILESDIR}/${P}.linux-fs.patch
 	#patch -p0 < ${FILES}/${P}.linux-fs.diff
 
diff --git a/x11-plugins/wmfsm/wmfsm-0.34.ebuild b/x11-plugins/wmfsm/wmfsm-0.34.ebuild
deleted file mode 100644
index 482d380bf5e6..000000000000
--- a/x11-plugins/wmfsm/wmfsm-0.34.ebuild
+++ /dev/null
@@ -1,28 +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/wmfsm/wmfsm-0.34.ebuild,v 1.9 2004/07/17 11:03:34 s4t4n Exp $
-
-IUSE=""
-DESCRIPTION="dockapp for monitoring filesystem usage"
-HOMEPAGE="http://www.cs.ubc.ca/~cmg/"
-SRC_URI="http://www.cs.ubc.ca/~cmg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc amd64 ppc"
-
-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/wmget/ChangeLog b/x11-plugins/wmget/ChangeLog
index bdf07fe9ed1f..fb6e7d2d6311 100644
--- a/x11-plugins/wmget/ChangeLog
+++ b/x11-plugins/wmget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmget
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/ChangeLog,v 1.10 2004/10/19 08:55:59 absinthe Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/ChangeLog,v 1.11 2006/01/24 23:22:38 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -files/makefile.diff,
+  -wmget-0.5.0.ebuild, wmget-0.6.0.ebuild:
+  Fixed DEPEND for modular X.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmget-0.6.0.ebuild:
   Stable on amd64.
diff --git a/x11-plugins/wmget/files/digest-wmget-0.5.0 b/x11-plugins/wmget/files/digest-wmget-0.5.0
deleted file mode 100644
index ef906f2e590c..000000000000
--- a/x11-plugins/wmget/files/digest-wmget-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d0b169c5bb51a7ad13325583f674be1 wmget-0.5.0-src.tar.gz 41208
diff --git a/x11-plugins/wmget/files/makefile.diff b/x11-plugins/wmget/files/makefile.diff
deleted file mode 100644
index be770071ab1f..000000000000
--- a/x11-plugins/wmget/files/makefile.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN wmget/Makefile wmget-modified/Makefile
---- wmget/Makefile	2002-06-19 17:22:57.000000000 -0500
-+++ wmget-modified/Makefile	2002-10-03 10:51:38.000000000 -0500
-@@ -46,7 +46,7 @@
- 
- # To specify a different prefix, you can override this on the command line
- #	make PREFIX=/opt/dockapps install
--PREFIX=		/usr/local
-+PREFIX=		/usr
- 
- INSTALLDIR=	install -d -m 755
- INSTALLBIN=	install -m 555
-@@ -86,12 +86,12 @@
- 			echo $(PREFIX) > install.prefix ; \
- 			$(INSTALLDIR) $(PREFIX)/bin ; \
- 			$(INSTALLBIN) wmget $(PREFIX)/bin/wmget ; \
--			$(INSTALLDIR) $(PREFIX)/man/man1 ; \
--			$(INSTALLMAN) wmget.1 $(PREFIX)/man/man1/wmget.1 ; \
-+			$(INSTALLDIR) $(PREFIX)/share/man/man1 ; \
-+			$(INSTALLMAN) wmget.1 $(PREFIX)/share/man/man1/wmget.1 ; \
- 		fi
- 
- uninstall:
--		cd `cat install.prefix` && rm -f bin/wmget man/man1/wmget.1
-+		cd `cat install.prefix` && rm -f bin/wmget share/man/man1/wmget.1
- 		rm -f install.prefix
- 
- wmget:		dockapplib $(OBJS)
diff --git a/x11-plugins/wmget/wmget-0.5.0.ebuild b/x11-plugins/wmget/wmget-0.5.0.ebuild
deleted file mode 100644
index cc77f8b2b394..000000000000
--- a/x11-plugins/wmget/wmget-0.5.0.ebuild
+++ /dev/null
@@ -1,32 +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/wmget/wmget-0.5.0.ebuild,v 1.10 2004/07/22 09:41:19 s4t4n Exp $
-
-inherit eutils
-IUSE=""
-DESCRIPTION="libcurl-based dockapp for automated-downloads"
-HOMEPAGE="http://amtrickey.net/wmget/"
-SRC_URI="http://amtrickey.net/download/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc"
-
-DEPEND="virtual/x11
-	>=net-misc/curl-7.9.7"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	epatch ${FILESDIR}/makefile.diff
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS} -ansi -Wall -W -I/usr/X11R6/include -D_GNU_SOURCE" \
-		|| die "parallel make failed"
-}
-
-src_install() {
-	make PREFIX=${D}/usr install || die "make install failed"
-}
diff --git a/x11-plugins/wmget/wmget-0.6.0.ebuild b/x11-plugins/wmget/wmget-0.6.0.ebuild
index a937db3d93fa..78102a3e28db 100644
--- a/x11-plugins/wmget/wmget-0.6.0.ebuild
+++ b/x11-plugins/wmget/wmget-0.6.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/wmget/wmget-0.6.0.ebuild,v 1.4 2004/10/19 08:55:59 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmget/wmget-0.6.0.ebuild,v 1.5 2006/01/24 23:22:38 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="libcurl-based dockapp for automated-downloads"
@@ -11,8 +11,17 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )
 	>=net-misc/curl-7.9.7"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
 
 S=${WORKDIR}/${PN}
 
diff --git a/x11-plugins/wmmsg/ChangeLog b/x11-plugins/wmmsg/ChangeLog
index 62c22428bbee..fa9a4482a30d 100644
--- a/x11-plugins/wmmsg/ChangeLog
+++ b/x11-plugins/wmmsg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmsg
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsg/ChangeLog,v 1.8 2005/11/11 09:45:07 s4t4n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsg/ChangeLog,v 1.9 2006/01/24 23:28:24 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmmsg-1.0.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmsg-1.0.ebuild:
   removed INSTALL and COPYING from dodoc.
diff --git a/x11-plugins/wmmsg/wmmsg-1.0.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.ebuild
index f564b41f49a3..64dc4182c44f 100644
--- a/x11-plugins/wmmsg/wmmsg-1.0.ebuild
+++ b/x11-plugins/wmmsg/wmmsg-1.0.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/wmmsg/wmmsg-1.0.ebuild,v 1.10 2005/11/11 09:45:07 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsg/wmmsg-1.0.ebuild,v 1.11 2006/01/24 23:28:24 nelchael Exp $
 
 DESCRIPTION="wmmsg is a dockapp that informs you of new events, such as incoming chat messages, by displaying related icons and arrival times"
 HOMEPAGE="http://taxiway.swapspace.net/~matt/wmmsg/"
@@ -9,8 +9,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
-DEPEND="virtual/x11
-	=x11-libs/gtk+-1.2*
+DEPEND="=x11-libs/gtk+-1.2*
 	media-libs/imlib2"
 S=${WORKDIR}/${PN}
 
diff --git a/x11-plugins/wmtimer/ChangeLog b/x11-plugins/wmtimer/ChangeLog
index bfa3b8d43655..c21e6c6630f3 100644
--- a/x11-plugins/wmtimer/ChangeLog
+++ b/x11-plugins/wmtimer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmtimer
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.18 2005/09/17 00:53:11 ciaranm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.19 2006/01/24 23:30:04 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmtimer-2.4.ebuild,
+  wmtimer-2.9.2.ebuild:
+  Fixed DEPEND for modular X.
 
   17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/x11-plugins/wmtimer/wmtimer-2.4.ebuild b/x11-plugins/wmtimer/wmtimer-2.4.ebuild
index f5c3f651446f..50eb6a36bd09 100644
--- a/x11-plugins/wmtimer/wmtimer-2.4.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.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/wmtimer/wmtimer-2.4.ebuild,v 1.18 2005/03/14 15:20:03 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.4.ebuild,v 1.19 2006/01/24 23:30:04 nelchael Exp $
 
 IUSE=""
 
@@ -14,11 +14,9 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ppc64 ppc ~sparc"
 
-RDEPEND="=x11-libs/gtk+-1.2*
-	virtual/x11"
+RDEPEND="=x11-libs/gtk+-1.2*"
 
-DEPEND="virtual/libc
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild b/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild
index 5271be9dbbc6..f84c46634d0d 100644
--- a/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.9.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/wmtimer/wmtimer-2.9.2.ebuild,v 1.4 2005/09/03 21:13:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.9.2.ebuild,v 1.5 2006/01/24 23:30:04 nelchael Exp $
 
 IUSE=""
 
@@ -17,9 +17,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
 
-RDEPEND="virtual/libc
-	virtual/x11
-	>=x11-libs/gtk+-2.6.2"
+RDEPEND=">=x11-libs/gtk+-2.6.2"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.15.0
diff --git a/x11-plugins/wsoundserver/ChangeLog b/x11-plugins/wsoundserver/ChangeLog
index 81967277168b..56759e9c4bde 100644
--- a/x11-plugins/wsoundserver/ChangeLog
+++ b/x11-plugins/wsoundserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wsoundserver
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/ChangeLog,v 1.3 2005/08/29 08:41:24 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/ChangeLog,v 1.4 2006/01/24 23:25:19 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wsoundserver-0.4.1.ebuild:
+  Fixed DEPEND for modular X.
 
   29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wsoundserver-0.4.1.ebuild:
   Stable for x86.
diff --git a/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild b/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild
index f74884e26521..e7514aa47bc7 100644
--- a/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild
+++ b/x11-plugins/wsoundserver/wsoundserver-0.4.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/wsoundserver/wsoundserver-0.4.1.ebuild,v 1.3 2005/08/29 08:41:24 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wsoundserver/wsoundserver-0.4.1.ebuild,v 1.4 2006/01/24 23:25:19 nelchael Exp $
 
 MY_P="${P/wsoundserver/WSoundServer}-new"
 S="${WORKDIR}/${MY_P}"
@@ -11,8 +11,7 @@ DESCRIPTION="WindowMaker sound server"
 SRC_URI="http://vlaadworld.net/public/${MY_P}.tar.gz"
 HOMEPAGE="http://vlaadworld.net/"
 
-DEPEND="virtual/x11
-	>=x11-wm/windowmaker-0.91.0-r1
+DEPEND=">=x11-wm/windowmaker-0.91.0-r1
 	>=x11-libs/libdockapp-0.6.0
 	>=x11-libs/libPropList-0.10.1-r3
 	>=media-libs/audiofile-0.2.6-r1
diff --git a/x11-plugins/yawmppp/Manifest b/x11-plugins/yawmppp/Manifest
index d1bdd03dbb44..81a2e211b35e 100644
--- a/x11-plugins/yawmppp/Manifest
+++ b/x11-plugins/yawmppp/Manifest
@@ -1,5 +1,5 @@
-MD5 da4fad416cc65fc65a88b3d65733b135 yawmppp-2.0.2.ebuild 1078
-MD5 1f289b2eaf4ee499577c1636531ed023 ChangeLog 1345
-MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 4e0fc569decd48ee323ab0a57d54b9a8 files/yawmppp-2.0.2-Makefile.in.patch 448
+MD5 037553ce3058f24d9cfa2f689feb70ca ChangeLog 1442
 MD5 5adde7571413fb3efb7ddde02602af74 files/digest-yawmppp-2.0.2 65
+MD5 4e0fc569decd48ee323ab0a57d54b9a8 files/yawmppp-2.0.2-Makefile.in.patch 448
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 e2eb0fe76653ffd6968b0a7fdaafdf48 yawmppp-2.0.2.ebuild 1083