9 files changed, 38 insertions, 101 deletions
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}