Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

9 files changed, 60 insertions, 23 deletions

diff --git a/x11-plugins/allin1/ChangeLog b/x11-plugins/allin1/ChangeLog
index 03e7b19995d0..a7252495356e 100644
--- a/x11-plugins/allin1/ChangeLog
+++ b/x11-plugins/allin1/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/allin1
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/ChangeLog,v 1.9 2004/09/05 22:17:38 s4t4n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/ChangeLog,v 1.10 2006/01/22 11:21:15 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> allin1-0.5.0.ebuild:
+  Fixed DEPEND for modular X.
 
   06 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> allin1-0.5.0.ebuild:
   Stable for x86.
diff --git a/x11-plugins/allin1/Manifest b/x11-plugins/allin1/Manifest
index 300f2b581261..629f679857d1 100644
--- a/x11-plugins/allin1/Manifest
+++ b/x11-plugins/allin1/Manifest
@@ -1,4 +1,4 @@
-MD5 9d82327fb1ab037426ce13a64d89a169 allin1-0.5.0.ebuild 687
 MD5 bcbea075a9d340d53722ede26a0759af ChangeLog 1504
-MD5 51e4144050265a6597eea69affc33666 metadata.xml 486
+MD5 f9d3c2012464d1f0064b4f9a7b8bbec0 allin1-0.5.0.ebuild 838
 MD5 0c2ec115af68196bad7c677c33d1d13e files/digest-allin1-0.5.0 63
+MD5 51e4144050265a6597eea69affc33666 metadata.xml 486
diff --git a/x11-plugins/allin1/allin1-0.5.0.ebuild b/x11-plugins/allin1/allin1-0.5.0.ebuild
index cb6e20946de4..e56e6d9ed91b 100644
--- a/x11-plugins/allin1/allin1-0.5.0.ebuild
+++ b/x11-plugins/allin1/allin1-0.5.0.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/allin1/allin1-0.5.0.ebuild,v 1.3 2004/09/05 22:17:38 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/allin1-0.5.0.ebuild,v 1.4 2006/01/22 11:21:15 nelchael Exp $
 
 DESCRIPTION="All in one monitoring dockapp: RAM, CPU, Net, Power, df, seti"
 HOMEPAGE="http://ilpettegolo.altervista.org/linux_allin1.en.shtml"
@@ -9,7 +9,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
-DEPEND="virtual/x11"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-libs/libX11 )
+	virtual/x11 )"
 
 src_compile()
 {
diff --git a/x11-plugins/cputnik/ChangeLog b/x11-plugins/cputnik/ChangeLog
index 2480be4dd4bd..209688cff057 100644
--- a/x11-plugins/cputnik/ChangeLog
+++ b/x11-plugins/cputnik/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/cputnik
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/ChangeLog,v 1.3 2005/06/12 19:24:11 josejx Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/ChangeLog,v 1.4 2006/01/22 11:24:46 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> cputnik-0.1.1.ebuild:
+  Fixed DEPEND for modular X.
 
   12 Jun 2005; Joseph Jezak <josejx@gentoo.org> cputnik-0.1.1.ebuild:
   Marked ~ppc for bug #95345.  Tested by nixnut.
diff --git a/x11-plugins/cputnik/cputnik-0.1.1.ebuild b/x11-plugins/cputnik/cputnik-0.1.1.ebuild
index bc1ee1375e0d..1c168ca46849 100644
--- a/x11-plugins/cputnik/cputnik-0.1.1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.1.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/cputnik/cputnik-0.1.1.ebuild,v 1.4 2005/07/14 23:07:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/cputnik/cputnik-0.1.1.ebuild,v 1.5 2006/01/22 11:24:46 nelchael Exp $
 
 IUSE=""
 
@@ -12,7 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile()
 {
diff --git a/x11-plugins/fsviewer/ChangeLog b/x11-plugins/fsviewer/ChangeLog
index fb0f0f5fb5d3..69b5255c4ffb 100644
--- a/x11-plugins/fsviewer/ChangeLog
+++ b/x11-plugins/fsviewer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/fsviewer
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.8 2005/06/22 21:38:59 smithj Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.9 2006/01/22 11:26:22 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> fsviewer-0.2.5.ebuild:
+  Fixed DEPEND for modular X.
 
 *fsviewer-0.2.5 (22 Jun 2005)
 
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
index ad9cc1f7b95f..54a8c4856fd8 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.5.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/fsviewer/fsviewer-0.2.5.ebuild,v 1.1 2005/06/22 21:38:59 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.2 2006/01/22 11:26:22 nelchael Exp $
 
 inherit eutils
 
@@ -16,8 +16,7 @@ KEYWORDS="~x86 ~ppc ~amd64"
 
 IUSE=""
 
-DEPEND="virtual/x11
-	x11-wm/windowmaker"
+DEPEND="x11-wm/windowmaker"
 
 S="${WORKDIR}/${MY_PN}.app-${PV}"
 
diff --git a/x11-plugins/wmCalClock/ChangeLog b/x11-plugins/wmCalClock/ChangeLog
index 45482c104b7f..38a47f5144a1 100644
--- a/x11-plugins/wmCalClock/ChangeLog
+++ b/x11-plugins/wmCalClock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmCalClock
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.12 2005/11/10 08:48:03 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.13 2006/01/22 11:31:03 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmCalClock-1.25-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmCalClock-1.25-r1.ebuild:
   Removed COPYING and INSTALL from dodoc.
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild
index 1f33d00a18fd..6815ed4770a7 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-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/wmCalClock/wmCalClock-1.25-r1.ebuild,v 1.15 2005/11/10 08:48:03 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/wmCalClock-1.25-r1.ebuild,v 1.16 2006/01/22 11:31:03 nelchael Exp $
 
 IUSE=""
 
@@ -8,7 +8,16 @@ DESCRIPTION="WMaker DockApp: A Calendar clock with antialiased text."
 SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz"
 HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml"
 
-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"