Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

8 files changed, 51 insertions, 52 deletions

diff --git a/x11-plugins/wmalms/ChangeLog b/x11-plugins/wmalms/ChangeLog
index f587599e4034..09e16feede99 100644
--- a/x11-plugins/wmalms/ChangeLog
+++ b/x11-plugins/wmalms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmalms
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.7 2005/02/27 12:23:09 brix Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/ChangeLog,v 1.8 2006/01/22 12:25:19 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  wmalms-1.0.0a-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> wmalms-1.0.0a-r1.ebuild:
   Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
@@ -9,7 +13,7 @@
   Masked on sparc as lm_sensors doesn't work.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
+
 *wmalms-1.0.0a-r1 (6 Jun 2002)
 
   29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
@@ -20,12 +24,12 @@
 
   add dependency on lm_sensors
 
-  6 Jun 2002; Brandon Low <lostlogic@gentoo.org> wmalms-1.0.0a-r1.ebuild
+  6 Jun 2002; Brandon Low <lostlogic@gentoo.org> wmalms-1.0.0a-r1.ebuild:
 
   Fix doc locations
 
 *wmalms-1.0.0a (3 Jun 2002)
 
-  3 Jun 2002; Brandon Low <lostlogic@gentoo.org> wmalms-1.0.0a.ebuild
+  3 Jun 2002; Brandon Low <lostlogic@gentoo.org> wmalms-1.0.0a.ebuild:
 
   Initial package
diff --git a/x11-plugins/wmalms/metadata.xml b/x11-plugins/wmalms/metadata.xml
index 5ebfc73f5163..7cf6fd004331 100644
--- a/x11-plugins/wmalms/metadata.xml
+++ b/x11-plugins/wmalms/metadata.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<longdescription>
-wmalms monitors data obtained from a sensor chip: 
-temperature, fan speed, and voltage.   It can be 
-used as a dockable/swallowed applet with Window 
-Maker or any window manager that supports 
-swallowing, including GNOME, kwm (KDE), fvwm, 
-and its clones. Alternatively, you can run wmalms 
-as a normal window with any window manager.   
-wmalms is designed to suit any hardware supported 
-by lm_sensors. It provides a wide range of 
-customized features, including window appearence, 
-order and representation of sensor data, refresh 
-frequency, alarm mode, etc. 
-</longdescription>
+	<herd>desktop-dock</herd>
+	<longdescription>
+		wmalms monitors data obtained from a sensor chip: temperature, fan
+		speed, and voltage. It can be used as a dockable/swallowed applet
+		with Window Maker or any window manager that supports swallowing,
+		including GNOME, kwm (KDE), fvwm, and its clones. Alternatively, you
+		can run wmalms as a normal window with any window manager. wmalms is
+		designed to suit any hardware supported by lm_sensors. It provides a
+		wide range of customized features, including window appearence,
+		order and representation of sensor data, refresh frequency, alarm
+		mode, etc.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
index aa5943cf9ecb..0ed36b99ff2a 100644
--- a/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
+++ b/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild
@@ -1,13 +1,22 @@
-# 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/wmalms/wmalms-1.0.0a-r1.ebuild,v 1.9 2005/02/27 12:23:09 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmalms/wmalms-1.0.0a-r1.ebuild,v 1.10 2006/01/22 12:25:19 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="wmalms X-windows hardware sensors applet"
 HOMEPAGE="http://www.geocities.com/wmalms"
 SRC_URI="http://www.geocities.com/wmalms/wmalms-1.0.0a.tar.gz"
 
-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/lm_sensors"
 
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmapm/ChangeLog b/x11-plugins/wmapm/ChangeLog
index 55ed7ebd04c5..fb5472605d4e 100644
--- a/x11-plugins/wmapm/ChangeLog
+++ b/x11-plugins/wmapm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmapm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/ChangeLog,v 1.7 2005/10/31 13:35:48 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/ChangeLog,v 1.8 2006/01/22 12:29:30 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmapm-3.1.ebuild,
+  wmapm-3.1-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   31 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> wmapm-3.1-r1.ebuild:
   Fixed dodoc not to install COPYING and INSTALL.
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest
index f8aa0b971b0e..dd6f4bdb2648 100644
--- a/x11-plugins/wmapm/Manifest
+++ b/x11-plugins/wmapm/Manifest
@@ -1,6 +1,4 @@
 MD5 867125244c8daa7c9bb7ab360c30cca6 ChangeLog 1148
-MD5 9ab1770653f3d1f164714a1862b98560 files/digest-wmapm-3.1 60
 MD5 9ab1770653f3d1f164714a1862b98560 files/digest-wmapm-3.1-r1 60
 MD5 3b259a5f363f33db91782a3a521d9d2f metadata.xml 490
 MD5 b6599084b9e476307c33094887de8d84 wmapm-3.1-r1.ebuild 643
-MD5 7a752ea45dcff7d445468d3f589a989c wmapm-3.1.ebuild 619
diff --git a/x11-plugins/wmapm/files/digest-wmapm-3.1 b/x11-plugins/wmapm/files/digest-wmapm-3.1
deleted file mode 100644
index 377c50dcf695..000000000000
--- a/x11-plugins/wmapm/files/digest-wmapm-3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a62620d49b5cc4c2250e013149ca1e9 wmapm-3.1.tar.gz 28321
diff --git a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
index 9dedbb1080e5..39f5969a0f73 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-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/wmapm/wmapm-3.1-r1.ebuild,v 1.11 2005/10/31 13:35:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmapm/wmapm-3.1-r1.ebuild,v 1.12 2006/01/22 12:29:30 nelchael Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}/${PN}
@@ -12,7 +12,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64 ppc"
 
-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 )"
 
 src_install () {
 	cd ${S}
diff --git a/x11-plugins/wmapm/wmapm-3.1.ebuild b/x11-plugins/wmapm/wmapm-3.1.ebuild
deleted file mode 100644
index 8be566079a7f..000000000000
--- a/x11-plugins/wmapm/wmapm-3.1.ebuild
+++ /dev/null
@@ -1,21 +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/wmapm/wmapm-3.1.ebuild,v 1.9 2004/06/24 23:04:41 agriffis Exp $
-
-IUSE=""
-DESCRIPTION="WMaker DockApp: Battery/Power status monitor for laptops"
-SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
-HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc"
-
-DEPEND="virtual/x11"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_install() {
-	dodir /usr/bin /usr/man/man1
-	make DESTDIR=${D}/usr install || die
-}