modular X dependencies

(Portage version: 2.0.54)

5 files changed, 104 insertions, 15 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 3de65964e0c5..e08e6a0348b4 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.96 2006/01/28 19:13:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.97 2006/01/30 05:58:28 mr_bones_ Exp $
+
+  30 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  libsdl-1.2.7-r3.ebuild, libsdl-1.2.8-r1.ebuild, libsdl-1.2.9.ebuild,
+  libsdl-1.2.9-r1.ebuild:
+  modular X dependencies
 
   28 Jan 2006; Simon Stelling <blubb@gentoo.org>
   +files/libsdl-1.2.8-gcc2.patch, -files/libsdl-1.2.8-gcc2.patch.bz2,
diff --git a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
index 93b634c4c727..26e2304261fa 100644
--- a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.7-r3.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/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.12 2005/12/17 03:31:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.13 2006/01/30 05:58:28 mr_bones_ Exp $
 
 inherit toolchain-funcs fixheadtails eutils gnuconfig flag-o-matic
 
@@ -18,8 +18,19 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
-	nas? ( media-libs/nas virtual/x11 )
-	X? ( virtual/x11 )
+	nas? (
+		media-libs/nas
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
 	directfb? ( >=dev-libs/DirectFB-0.9.19 )
 	ggi? ( >=media-libs/libggi-2.0_beta3 )
 	svga? ( >=media-libs/svgalib-1.4.2 )
@@ -27,6 +38,16 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	libcaca? ( >=media-libs/libcaca-0.9-r1 )
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
+	nas? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
 	x86? ( dev-lang/nasm )"
 
 S=${WORKDIR}/SDL-${PV}
diff --git a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
index ce0fe4a2efc7..a9d64d3ea036 100644
--- a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.26 2006/01/28 19:13:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.27 2006/01/30 05:58:28 mr_bones_ Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -21,8 +21,19 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
-	nas? ( media-libs/nas virtual/x11 )
-	X? ( virtual/x11 )
+	nas? (
+		media-libs/nas
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
 	directfb? ( >=dev-libs/DirectFB-0.9.19 )
 	ggi? ( >=media-libs/libggi-2.0_beta3 )
 	svga? ( >=media-libs/svgalib-1.4.2 )
@@ -30,6 +41,16 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	libcaca? ( >=media-libs/libcaca-0.9-r1 )
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
+	nas? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
 	x86? ( dev-lang/nasm )"
 
 S=${WORKDIR}/SDL-${PV}
diff --git a/media-libs/libsdl/libsdl-1.2.9-r1.ebuild b/media-libs/libsdl/libsdl-1.2.9-r1.ebuild
index 68e86439c7f7..1ca7329bbc43 100644
--- a/media-libs/libsdl/libsdl-1.2.9-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9-r1.ebuild,v 1.8 2006/01/07 03:30:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9-r1.ebuild,v 1.9 2006/01/30 05:58:28 mr_bones_ Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -21,8 +21,19 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
-	nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) )
-	X? ( || ( ( x11-libs/libXext ) virtual/x11 ) )
+	nas? (
+		media-libs/nas
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
 	directfb? ( >=dev-libs/DirectFB-0.9.19 )
 	ggi? ( >=media-libs/libggi-2.0_beta3 )
 	svga? ( >=media-libs/svgalib-1.4.2 )
@@ -30,6 +41,16 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	libcaca? ( >=media-libs/libcaca-0.9-r1 )
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
+	nas? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
 	x86? ( dev-lang/nasm )"
 
 S=${WORKDIR}/SDL-${PV}
diff --git a/media-libs/libsdl/libsdl-1.2.9.ebuild b/media-libs/libsdl/libsdl-1.2.9.ebuild
index 5138fe34434f..a9b0917bf985 100644
--- a/media-libs/libsdl/libsdl-1.2.9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.9.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/media-libs/libsdl/libsdl-1.2.9.ebuild,v 1.9 2005/12/29 08:10:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9.ebuild,v 1.10 2006/01/30 05:58:28 mr_bones_ Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -21,8 +21,19 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
-	nas? ( media-libs/nas virtual/x11 )
-	X? ( virtual/x11 )
+	nas? (
+		media-libs/nas
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
 	directfb? ( >=dev-libs/DirectFB-0.9.19 )
 	ggi? ( >=media-libs/libggi-2.0_beta3 )
 	svga? ( >=media-libs/svgalib-1.4.2 )
@@ -30,6 +41,16 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	libcaca? ( >=media-libs/libcaca-0.9-r1 )
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
+	nas? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
 	x86? ( dev-lang/nasm )"
 
 S=${WORKDIR}/SDL-${PV}