Fixed DEPEND for modular X, see bug #118306. Removed old version.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 21 insertions, 38 deletions

diff --git a/x11-plugins/wmwifi/ChangeLog b/x11-plugins/wmwifi/ChangeLog
index b968ac78b724..76847eb07543 100644
--- a/x11-plugins/wmwifi/ChangeLog
+++ b/x11-plugins/wmwifi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmwifi
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/ChangeLog,v 1.9 2005/12/24 15:48:27 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/ChangeLog,v 1.10 2006/01/15 14:40:42 nelchael Exp $
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmwifi-0.3.ebuild,
+  wmwifi-0.5.ebuild:
+  Fixed DEPEND for modular X, see bug #118306. Removed old version.
 
   24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> wmwifi-0.5.ebuild:
   Stable on ppc.
diff --git a/x11-plugins/wmwifi/Manifest b/x11-plugins/wmwifi/Manifest
index 452262e51b43..38c47176d521 100644
--- a/x11-plugins/wmwifi/Manifest
+++ b/x11-plugins/wmwifi/Manifest
@@ -1,6 +1,4 @@
-MD5 c7775f51d7d28029fad38215de08b854 ChangeLog 1072
-MD5 f827390bbdd272567d57e41743c1933d files/digest-wmwifi-0.3 62
+MD5 46dd6daf82733590395b3bad33d9584f ChangeLog 1238
 MD5 f50f814eee17cebb5de77d6c8f1940f1 files/digest-wmwifi-0.5 62
 MD5 5fb59ae4e503b4edd028ed8e0b09f2aa metadata.xml 230
-MD5 3d5e7d279d2cebaf9fbd29cd6cb0c220 wmwifi-0.3.ebuild 704
-MD5 843c28b8594bcaa750be40ae280880a1 wmwifi-0.5.ebuild 803
+MD5 1764f8c4090c755d5c60867cc913c2d5 wmwifi-0.5.ebuild 976
diff --git a/x11-plugins/wmwifi/files/digest-wmwifi-0.3 b/x11-plugins/wmwifi/files/digest-wmwifi-0.3
deleted file mode 100644
index a803444ec0af..000000000000
--- a/x11-plugins/wmwifi/files/digest-wmwifi-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b60a5ee57ba8b08248c5dcbd25be750 wmwifi-0.3.tar.gz 225100
diff --git a/x11-plugins/wmwifi/wmwifi-0.3.ebuild b/x11-plugins/wmwifi/wmwifi-0.3.ebuild
deleted file mode 100644
index e25b8e3fd5be..000000000000
--- a/x11-plugins/wmwifi/wmwifi-0.3.ebuild
+++ /dev/null
@@ -1,28 +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/wmwifi/wmwifi-0.3.ebuild,v 1.7 2005/11/07 13:05:46 s4t4n Exp $
-
-IUSE=""
-HOMEPAGE="http://wmwifi.digitalssg.net"
-DESCRIPTION="wireless network interface monitor dockapp"
-SRC_URI="http://digitalssg.net/debian/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ppc x86 ~amd64"
-
-DEPEND="virtual/x11"
-
-src_compile() {
-	myconf=""
-	# make sure it uses current kernel headers to insure 
-	# its using current kernels wireless ext.
-	export CPPFLAGS="-I/usr/src/linux/include"
-
-	econf  || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-}
diff --git a/x11-plugins/wmwifi/wmwifi-0.5.ebuild b/x11-plugins/wmwifi/wmwifi-0.5.ebuild
index 2b4b83c88609..08b8cab1829f 100644
--- a/x11-plugins/wmwifi/wmwifi-0.5.ebuild
+++ b/x11-plugins/wmwifi/wmwifi-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/wmwifi/wmwifi-0.5.ebuild,v 1.4 2005/12/24 15:48:27 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmwifi/wmwifi-0.5.ebuild,v 1.5 2006/01/15 14:40:42 nelchael Exp $
 
 IUSE=""
 HOMEPAGE="http://wmwifi.digitalssg.net"
@@ -11,7 +11,17 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc x86"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )"
 
 src_unpack()
 {