Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

5 files changed, 34 insertions, 13 deletions

diff --git a/x11-misc/x2x/ChangeLog b/x11-misc/x2x/ChangeLog
index b426d6d041a9..20f7a87383af 100644
--- a/x11-misc/x2x/ChangeLog
+++ b/x11-misc/x2x/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/x2x
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.14 2005/09/17 02:04:14 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.15 2006/01/21 14:01:31 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> x2x-1.27.ebuild,
+  x2x-1.27-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> x2x-1.27-r1.ebuild:
   Mark 1.27-r1 stable on alpha
diff --git a/x11-misc/x2x/x2x-1.27-r1.ebuild b/x11-misc/x2x/x2x-1.27-r1.ebuild
index 79902f9bb6c4..9ea64d131fd0 100644
--- a/x11-misc/x2x/x2x-1.27-r1.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r1.ebuild
@@ -1,13 +1,12 @@
-# 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/x2x/x2x-1.27-r1.ebuild,v 1.4 2005/09/17 02:04:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r1.ebuild,v 1.5 2006/01/21 14:01:31 nelchael Exp $
 
 inherit eutils
 
 DESCRIPTION="An utility to connect the Mouse and KeyBoard to another X"
 HOMEPAGE="http://www.the-labs.com/X11/#x2x"
 LICENSE="as-is"
-DEPEND="virtual/x11"
 SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
 	mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz
 	mirror://gentoo/x2x_1.27-8-initvars.patch.gz
@@ -16,6 +15,14 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ~mips ppc ~sparc ~x86"
 IUSE=""
 
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXtst
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/x11-misc/x2x/x2x-1.27.ebuild b/x11-misc/x2x/x2x-1.27.ebuild
index 314f4ebbad25..fed5d3504f32 100644
--- a/x11-misc/x2x/x2x-1.27.ebuild
+++ b/x11-misc/x2x/x2x-1.27.ebuild
@@ -1,19 +1,26 @@
-# 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/x2x/x2x-1.27.ebuild,v 1.11 2005/04/19 19:30:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27.ebuild,v 1.12 2006/01/21 14:01:31 nelchael Exp $
 
 inherit eutils
 
 DESCRIPTION="An utility to connect the Mouse and KeyBoard to another X"
 HOMEPAGE="http://www.the-labs.com/X11/#x2x"
 LICENSE="as-is"
-DEPEND="virtual/x11"
 SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
 	mirror://gentoo/x2x-1.27-license.patch.gz"
 SLOT="0"
 KEYWORDS="x86 sparc alpha amd64 ~mips"
 IUSE=""
 
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXtst
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/x11-misc/xautolock/ChangeLog b/x11-misc/xautolock/ChangeLog
index d9f5d7f42854..df0a8d709b84 100644
--- a/x11-misc/xautolock/ChangeLog
+++ b/x11-misc/xautolock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xautolock
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautolock/ChangeLog,v 1.10 2005/06/17 00:05:26 smithj Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautolock/ChangeLog,v 1.11 2006/01/21 14:04:36 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xautolock-2.1.ebuild:
+  Fixed DEPEND for modular X.
 
   17 Jun 2005; Jonathan Smith <smithj@gentoo.org> xautolock-2.1.ebuild:
   fixed dependencies again
diff --git a/x11-misc/xautolock/xautolock-2.1.ebuild b/x11-misc/xautolock/xautolock-2.1.ebuild
index 7078b465a898..054c562fb281 100644
--- a/x11-misc/xautolock/xautolock-2.1.ebuild
+++ b/x11-misc/xautolock/xautolock-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/xautolock/xautolock-2.1.ebuild,v 1.15 2005/06/17 00:07:11 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautolock/xautolock-2.1.ebuild,v 1.16 2006/01/21 14:04:36 nelchael Exp $
 
 DESCRIPTION="An automatic X screen-locker/screen-saver."
 SRC_URI="http://www.ibiblio.org/pub/Linux/X11/screensavers/${P}.tgz"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="x86 sparc ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND=""
 RDEPEND="|| ( x11-misc/xlockmore
 		x11-misc/xtrlock )"