4 files changed, 18 insertions, 39 deletions
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() {