Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

12 files changed, 54 insertions, 36 deletions

diff --git a/x11-misc/iconbox/ChangeLog b/x11-misc/iconbox/ChangeLog
index 3a497d20668f..ca241a214194 100644
--- a/x11-misc/iconbox/ChangeLog
+++ b/x11-misc/iconbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/iconbox
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/iconbox/ChangeLog,v 1.4 2005/07/10 18:43:48 smithj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/iconbox/ChangeLog,v 1.5 2006/01/21 12:58:15 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> iconbox-0.2.ebuild:
+  Fixed DEPEND for modular X.
 
   10 Jul 2005; Jonathan Smith <smithj@gentoo.org> iconbox-0.2.ebuild:
   #98575: added dev-perl/gtk2-perl as a dep... no idea how i missed it the
diff --git a/x11-misc/iconbox/iconbox-0.2.ebuild b/x11-misc/iconbox/iconbox-0.2.ebuild
index f0a2b5839438..333cf053a1fc 100644
--- a/x11-misc/iconbox/iconbox-0.2.ebuild
+++ b/x11-misc/iconbox/iconbox-0.2.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-misc/iconbox/iconbox-0.2.ebuild,v 1.4 2005/07/10 18:43:48 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/iconbox/iconbox-0.2.ebuild,v 1.5 2006/01/21 12:58:15 nelchael Exp $
 
 MY_P="${P/-/_}"
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	=x11-libs/gtk+-2*
+DEPEND="=x11-libs/gtk+-2*
 	dev-perl/gtk2-perl"
 
 src_compile() {
diff --git a/x11-misc/jaffm/ChangeLog b/x11-misc/jaffm/ChangeLog
index fe555334f4b2..305fd670005d 100644
--- a/x11-misc/jaffm/ChangeLog
+++ b/x11-misc/jaffm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/jaffm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/ChangeLog,v 1.10 2005/11/01 15:08:22 nelchael Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/ChangeLog,v 1.11 2006/01/21 13:00:23 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> jaffm-1.2.1.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> jaffm-1.0.ebuild,
   jaffm-1.2.1.ebuild:
diff --git a/x11-misc/jaffm/jaffm-1.2.1.ebuild b/x11-misc/jaffm/jaffm-1.2.1.ebuild
index 399faca823e1..a34f8c9dafdf 100644
--- a/x11-misc/jaffm/jaffm-1.2.1.ebuild
+++ b/x11-misc/jaffm/jaffm-1.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-misc/jaffm/jaffm-1.2.1.ebuild,v 1.4 2005/11/01 15:08:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/jaffm/jaffm-1.2.1.ebuild,v 1.5 2006/01/21 13:00:23 nelchael Exp $
 
 inherit eutils
 
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	>=x11-libs/wxGTK-2.6"
+DEPEND=">=x11-libs/wxGTK-2.6"
 
 src_unpack() {
 	unpack "${A}"
diff --git a/x11-misc/lineak-defaultplugin/ChangeLog b/x11-misc/lineak-defaultplugin/ChangeLog
index d47246eeb65f..acf6f4a30598 100644
--- a/x11-misc/lineak-defaultplugin/ChangeLog
+++ b/x11-misc/lineak-defaultplugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lineak-defaultplugin
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-defaultplugin/ChangeLog,v 1.9 2005/12/25 12:40:04 blubb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-defaultplugin/ChangeLog,v 1.10 2006/01/21 13:05:43 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  lineak-defaultplugin-0.8.2.ebuild, lineak-defaultplugin-0.8.3.ebuild:
+  Fixed DEPEND for modular X.
 
   25 Dec 2005; Simon Stelling <blubb@gentoo.org>
   lineak-defaultplugin-0.8.3.ebuild:
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.2.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.2.ebuild
index df635b8eefe3..85013bd71708 100644
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.2.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.2.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-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.2.ebuild,v 1.1 2004/11/29 20:07:15 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.2.ebuild,v 1.2 2006/01/21 13:05:43 nelchael Exp $
 
 MY_PV=${PV/_/}
 MY_P=${PN/-/_}-${MY_PV}
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-RDEPEND="virtual/x11
-		>x11-misc/lineakd-0.8"
+RDEPEND=">x11-misc/lineakd-0.8"
 
 src_install () {
 	make DESTDIR=${D} lineakddocdir=/usr/share/doc/${MY_P} install || die
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild
index 8727b284582a..d55637cd6e83 100644
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.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-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild,v 1.6 2005/12/25 12:40:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.8.3.ebuild,v 1.7 2006/01/21 13:05:43 nelchael Exp $
 
 inherit multilib
 
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="virtual/x11
-		x11-misc/lineakd"
+RDEPEND="x11-misc/lineakd"
 
 src_install () {
 	make DESTDIR=${D} PLUGINDIR=/usr/$(get_libdir)/lineakd/plugins lineakddocdir=/usr/share/doc/${MY_P} install || die
diff --git a/x11-misc/lineak-kdeplugins/ChangeLog b/x11-misc/lineak-kdeplugins/ChangeLog
index 45c3e79cabe3..acea86f7c951 100644
--- a/x11-misc/lineak-kdeplugins/ChangeLog
+++ b/x11-misc/lineak-kdeplugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lineak-kdeplugins
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-kdeplugins/ChangeLog,v 1.13 2005/12/25 12:40:25 blubb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-kdeplugins/ChangeLog,v 1.14 2006/01/21 13:04:26 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  lineak-kdeplugins-0.8.3.ebuild:
+  Fixed DEPEND for modular X.
 
   25 Dec 2005; Simon Stelling <blubb@gentoo.org>
   lineak-kdeplugins-0.8.3.ebuild:
diff --git a/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild b/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild
index 8889bafd1946..32cb7af39c18 100644
--- a/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild
+++ b/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.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-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild,v 1.8 2005/12/25 12:40:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-kdeplugins/lineak-kdeplugins-0.8.3.ebuild,v 1.9 2006/01/21 13:04:26 nelchael Exp $
 
 inherit kde multilib
 
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="virtual/x11
-	x11-misc/lineakd"
+RDEPEND="x11-misc/lineakd"
 
 need-kde 3.2
 
diff --git a/x11-misc/login-app/Manifest b/x11-misc/login-app/Manifest
index b776329017ec..f73f541295bb 100644
--- a/x11-misc/login-app/Manifest
+++ b/x11-misc/login-app/Manifest
@@ -1,7 +1,5 @@
-MD5 a7088f9969426ef2acd8d25f98665012 ChangeLog 1392
-MD5 242ad5512ec9aa8ae4a655379ae0baa2 files/digest-login-app-2.0.0_alpha7 75
+MD5 a7608fd02426e7abb7d2d7db844f2600 ChangeLog 1503
 MD5 242ad5512ec9aa8ae4a655379ae0baa2 files/digest-login-app-2.0.0_alpha7-r1 75
 MD5 acba8cb6c040d505ef53f616b5d1f2d9 files/login-app-windowmaker.patch 737
 MD5 533c051fc60c481f75d922d65f12876e login-app-2.0.0_alpha7-r1.ebuild 1023
-MD5 f9207ee4dfc6e0a8ebd82d953210ec8b login-app-2.0.0_alpha7.ebuild 847
 MD5 8dad4c602e8fc48cf21cf32d762b9af0 metadata.xml 231
diff --git a/x11-misc/pogo/ChangeLog b/x11-misc/pogo/ChangeLog
index 31401b458353..1449647b74a7 100644
--- a/x11-misc/pogo/ChangeLog
+++ b/x11-misc/pogo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/pogo
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pogo/ChangeLog,v 1.8 2005/04/29 00:27:06 wormo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pogo/ChangeLog,v 1.9 2006/01/21 12:56:21 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> pogo-2.2.ebuild:
+  Fixed DEPEND for modular X.
 
   28 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> pogo-2.2.ebuild:
   added ~ppc
diff --git a/x11-misc/pogo/pogo-2.2.ebuild b/x11-misc/pogo/pogo-2.2.ebuild
index 9e31fb31cea8..da011e82a961 100644
--- a/x11-misc/pogo/pogo-2.2.ebuild
+++ b/x11-misc/pogo/pogo-2.2.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-misc/pogo/pogo-2.2.ebuild,v 1.9 2005/04/29 00:27:06 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pogo/pogo-2.2.ebuild,v 1.10 2006/01/21 12:56:21 nelchael Exp $
 
 IUSE=""
 
@@ -12,7 +12,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64 ~ppc"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )
 	media-libs/imlib
 	media-libs/jpeg
 	>=sys-apps/sed-4"