Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

5 files changed, 44 insertions, 22 deletions

diff --git a/x11-plugins/wmMatrix/ChangeLog b/x11-plugins/wmMatrix/ChangeLog
index e7052b127d1b..84641abb171d 100644
--- a/x11-plugins/wmMatrix/ChangeLog
+++ b/x11-plugins/wmMatrix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmMatrix
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/ChangeLog,v 1.8 2005/03/09 19:30:07 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/ChangeLog,v 1.9 2006/01/22 11:51:25 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmMatrix-0.2.ebuild:
+  Fixed DEPEND for modular X.
 
   07 Mar 2005; Markus Rothe <corsair@gentoo.org> wmMatrix-0.2.ebuild:
   Stable on ppc64
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
index ca1e6da183b2..71d2b2fef771 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2.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/wmMatrix/wmMatrix-0.2.ebuild,v 1.11 2005/03/09 19:30:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/wmMatrix-0.2.ebuild,v 1.12 2006/01/22 11:51:25 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack."
 SRC_URI="http://www.dockapps.org/download.php/id/17/${P}.tar.gz"
 HOMEPAGE="http://www.dockapps.org/file.php/id/10"
 
-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 )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmMoonClock/ChangeLog b/x11-plugins/wmMoonClock/ChangeLog
index ab327397f0b5..1df531303aa4 100644
--- a/x11-plugins/wmMoonClock/ChangeLog
+++ b/x11-plugins/wmMoonClock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmMoonClock
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/ChangeLog,v 1.6 2004/11/24 04:43:32 weeve Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/ChangeLog,v 1.7 2006/01/22 11:55:13 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  wmMoonClock-1.27.ebuild:
+  Fixed DEPEND for modular X.
 
   23 Nov 2004; Jason Wever <weeve@gentoo.org> wmMoonClock-1.27.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmMoonClock/metadata.xml b/x11-plugins/wmMoonClock/metadata.xml
index fcc813de2b5a..b883de84dbb9 100644
--- a/x11-plugins/wmMoonClock/metadata.xml
+++ b/x11-plugins/wmMoonClock/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<longdescription>
-wmMoonClock displays phases and ephemeris of the Moon. Clicking on the App 
-cycles the user through several `pages' of ephemeris information. Included are 
-age, fraction of current lunar cycle, the % illumination, whether its currently 
-visible or not, the rise/set times for yesterday, today and tomorrow, the 
-`horizon coordinates", and the "ecliptic coordinates". wmMoonClock supports 
-8-bit and high-color displays.
-</longdescription>
+	<herd>desktop-dock</herd>
+	<longdescription>
+		wmMoonClock displays phases and ephemeris of the Moon. Clicking on the App
+		cycles the user through several `pages' of ephemeris information. Included are
+		age, fraction of current lunar cycle, the % illumination, whether its currently
+		visible or not, the rise/set times for yesterday, today and tomorrow, the
+		`horizon coordinates", and the "ecliptic coordinates". wmMoonClock supports
+		8-bit and high-color displays.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
index 556346a7fdaa..112612502641 100644
--- a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
+++ b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild
@@ -1,15 +1,22 @@
-# 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/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.12 2004/11/24 04:43:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.13 2006/01/22 11:55:13 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy."
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
 
-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/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -29,4 +36,3 @@ src_install () {
 	doman Src/wmMoonClock.1
 	dodoc BUGS
 }
-