Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 17 insertions, 38 deletions

diff --git a/x11-plugins/wmapmload/ChangeLog b/x11-plugins/wmapmload/ChangeLog
index a3b27470a390..53fb44caa6c8 100644
--- a/x11-plugins/wmapmload/ChangeLog
+++ b/x11-plugins/wmapmload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmapmload
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/ChangeLog,v 1.9 2004/10/19 08:49:58 absinthe Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/ChangeLog,v 1.10 2006/01/22 12:39:39 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  -wmapmload-0.3.0.ebuild, wmapmload-0.3.3.ebuild:
+  Fixed DEPEND for modular X.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmapmload-0.3.3.ebuild:
   Stable on amd64.
diff --git a/x11-plugins/wmapmload/files/digest-wmapmload-0.3.0 b/x11-plugins/wmapmload/files/digest-wmapmload-0.3.0
deleted file mode 100644
index fbf5474f7caa..000000000000
--- a/x11-plugins/wmapmload/files/digest-wmapmload-0.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b94e76e52dd870aa5895c172dd213ff wmapmload-0.3.0.tar.gz 91078
diff --git a/x11-plugins/wmapmload/metadata.xml b/x11-plugins/wmapmload/metadata.xml
index 40838bc36783..a03f5d8b381b 100644
--- a/x11-plugins/wmapmload/metadata.xml
+++ b/x11-plugins/wmapmload/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+	<herd>desktop-dock</herd>
 </pkgmetadata>
diff --git a/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild
deleted file mode 100644
index 9671a29cd334..000000000000
--- a/x11-plugins/wmapmload/wmapmload-0.3.0.ebuild
+++ /dev/null
@@ -1,29 +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/wmapmload/wmapmload-0.3.0.ebuild,v 1.8 2004/10/03 22:02:21 swegener Exp $
-
-IUSE=""
-DESCRIPTION="dockapp that monitors your apm battery status."
-SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
-HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
-
-SLOT="0"
-KEYWORDS="x86 amd64"
-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/wmapmload/wmapmload-0.3.3.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild
index d555814d0668..bdc3e7259e04 100644
--- a/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild
+++ b/x11-plugins/wmapmload/wmapmload-0.3.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/wmapmload/wmapmload-0.3.3.ebuild,v 1.5 2004/10/19 08:49:58 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapmload/wmapmload-0.3.3.ebuild,v 1.6 2006/01/22 12:39:39 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that monitors your apm battery status."
@@ -11,12 +11,18 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc"
 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() {
 
 	econf || die "configure failed"
-
 	emake || die "parallel make failed"
 
 }
@@ -26,4 +32,3 @@ src_install () {
 	einstall || die "make install failed"
 
 }
-