Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

6 files changed, 46 insertions, 21 deletions

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"