Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

12 files changed, 93 insertions, 38 deletions

diff --git a/x11-plugins/wmSMPmon/ChangeLog b/x11-plugins/wmSMPmon/ChangeLog
index 1adeced5e767..490517ff9d47 100644
--- a/x11-plugins/wmSMPmon/ChangeLog
+++ b/x11-plugins/wmSMPmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmSMPmon
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/ChangeLog,v 1.9 2005/08/29 08:31:00 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/ChangeLog,v 1.10 2006/01/22 12:05:43 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmSMPmon-2.3.ebuild:
+  Fixed DEPEND for modular X.
 
   08 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmSMPmon-2.2.ebuild:
   Wiped out older version...
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild
index 9bf7a1e6e55d..0a6bdb31febb 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-2.3.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/wmSMPmon/wmSMPmon-2.3.ebuild,v 1.4 2005/07/09 15:56:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/wmSMPmon-2.3.ebuild,v 1.5 2006/01/22 12:05:43 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="SMP system monitor dockapp"
@@ -11,9 +11,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
 
-DEPEND="virtual/libc
-	virtual/x11
-	>=sys-apps/sed-4"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 S="${WORKDIR}/${PN}-2.x/${PN}"
 
diff --git a/x11-plugins/wmSpaceWeather/ChangeLog b/x11-plugins/wmSpaceWeather/ChangeLog
index b02b26c58bc9..42d85287a19d 100644
--- a/x11-plugins/wmSpaceWeather/ChangeLog
+++ b/x11-plugins/wmSpaceWeather/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmSpaceWeather
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/ChangeLog,v 1.8 2004/11/24 04:45:39 weeve Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/ChangeLog,v 1.9 2006/01/22 12:08:21 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  wmSpaceWeather-1.04.ebuild:
+  Fixed DEPEND for modular X.
 
   23 Nov 2004; Jason Wever <weeve@gentoo.org> wmSpaceWeather-1.04.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmSpaceWeather/metadata.xml b/x11-plugins/wmSpaceWeather/metadata.xml
index 782652707f74..535b77e634ad 100644
--- a/x11-plugins/wmSpaceWeather/metadata.xml
+++ b/x11-plugins/wmSpaceWeather/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<longdescription>
-wmSpaceWeather shows environmental conditions in space.
-</longdescription>
+	<herd>desktop-dock</herd>
+	<longdescription>
+		wmSpaceWeather shows environmental conditions in space.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild
index 1e472995324e..a28b2ebda866 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.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/wmSpaceWeather/wmSpaceWeather-1.04.ebuild,v 1.13 2004/11/24 04:45:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04.ebuild,v 1.14 2006/01/22 12:08:21 nelchael Exp $
 
 inherit eutils
 
@@ -13,8 +13,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ~mips hppa ppc ~sparc"
 
-DEPEND="dev-lang/perl
-		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_compile() {
 	epatch ${FILESDIR}/getkp.patch
diff --git a/x11-plugins/wmSun/ChangeLog b/x11-plugins/wmSun/ChangeLog
index 1ca3a4d6fbc3..018f07db74a6 100644
--- a/x11-plugins/wmSun/ChangeLog
+++ b/x11-plugins/wmSun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmSun
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/ChangeLog,v 1.5 2004/11/24 04:48:08 weeve Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/ChangeLog,v 1.6 2006/01/22 12:11:11 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  wmSun-1.03.ebuild:
+  Fixed DEPEND for modular X.
 
   23 Nov 2004; Jason Wever <weeve@gentoo.org> wmSun-1.03.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmSun/metadata.xml b/x11-plugins/wmSun/metadata.xml
index 4b9687f7f8af..ddc54221de16 100644
--- a/x11-plugins/wmSun/metadata.xml
+++ b/x11-plugins/wmSun/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<longdescription>
-wmSun shows rise/set times for the Sun. The user needs to supply his/her 
-latitude and longitude. wmSun works for all latitudes (when Sun does not rise 
-or set, a --:-- is shown for the relevant entry).
-</longdescription>
+	<herd>desktop-dock</herd>
+	<longdescription>
+		wmSun shows rise/set times for the Sun. The user needs to supply his/her
+		latitude and longitude. wmSun works for all latitudes (when Sun does not rise
+		or set, a --:-- is shown for the relevant entry).
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/wmSun/wmSun-1.03.ebuild b/x11-plugins/wmSun/wmSun-1.03.ebuild
index fc52f5ce947f..0c25ea72a3e2 100644
--- a/x11-plugins/wmSun/wmSun-1.03.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.03.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/wmSun/wmSun-1.03.ebuild,v 1.10 2004/11/24 04:48:08 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/wmSun-1.03.ebuild,v 1.11 2006/01/22 12:11:11 nelchael Exp $
 
 IUSE=""
 
@@ -12,7 +12,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ~mips ppc ~sparc"
 
-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_compile() {
 	emake -C wmSun clean || die "make clean failed"
diff --git a/x11-plugins/wmacpiload-ac/ChangeLog b/x11-plugins/wmacpiload-ac/ChangeLog
index 839a1e29b607..5de8f84d64c8 100644
--- a/x11-plugins/wmacpiload-ac/ChangeLog
+++ b/x11-plugins/wmacpiload-ac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmacpiload-ac
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/ChangeLog,v 1.4 2005/10/01 23:36:11 morfic Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/ChangeLog,v 1.5 2006/01/22 12:14:11 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmacpiload-ac-0.1.2_p3.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Oct 2005; Daniel Goller <morfic@gentoo.org>
   wmacpiload-ac-0.1.2_p3.ebuild:
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
index 2c65dc9718a4..399b4b0c3198 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.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/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild,v 1.4 2005/10/01 23:36:11 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild,v 1.5 2006/01/22 12:14:11 nelchael Exp $
 
 MY_P="wmacpiload-0.1.2-ac3"
 
@@ -12,7 +12,14 @@ SRC_URI="http://perso.wanadoo.fr/acarriou/wmacpiload/${MY_P}.tar.bz2"
 # it has a new homepage, but the src_uri is still from the old one. change this
 # at the next version bump
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmacpimon/ChangeLog b/x11-plugins/wmacpimon/ChangeLog
index a33a9998b8b0..5a351cd81417 100644
--- a/x11-plugins/wmacpimon/ChangeLog
+++ b/x11-plugins/wmacpimon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmacpimon
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.3 2005/11/07 12:51:07 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.4 2006/01/22 12:16:40 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmacpimon-0.2.1.ebuild:
+  Fixed DEPEND for modular X.
 
   07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmacpimon-0.2.1.ebuild:
   Wiped out INSTALL from dodoc.
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index 44118d7cebc5..27ca2521c2ce 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.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/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.3 2005/11/07 12:51:07 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.4 2006/01/22 12:16:40 nelchael Exp $
 
 inherit eutils
 
@@ -14,7 +14,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="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 )"
 
 src_unpack()
 {