(#119028) Add modular X deps.

Package-Manager: portage-2.1_pre3-r1

8 files changed, 111 insertions, 50 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 3240ba7aeb76..e676ea203c4a 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/fox
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.45 2005/08/23 21:19:17 agriffis Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.46 2006/01/25 05:08:14 spyderous Exp $
+
+  25 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; fox-1.0.53.ebuild,
+  fox-1.2.6-r3.ebuild, fox-1.2.15.ebuild, fox-1.4.11.ebuild,
+  fox-1.4.12.ebuild, fox-1.5.4.ebuild:
+  (#119028) Add modular X deps.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> fox-1.2.6-r2.ebuild:
   stable on ia64
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 280670570081..355806ed9e11 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,24 +1,24 @@
-MD5 f793254a74b6b00db3cc044bae1f2f62 fox-1.2.4.ebuild 1207
-MD5 f99adef532922988cca81710fe7070ee fox-1.5.4.ebuild 927
-MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
-MD5 acf2240c75ffa4c45833dab2573aa708 fox-1.2.6-r2.ebuild 1455
-MD5 a5f1167fb465b82c2c240f208d924c3d fox-1.0.40.ebuild 1146
-MD5 d7e408d7348651c0735effe6b29dc900 fox-1.4.11.ebuild 1485
-MD5 8e902117bb20ef16e50d34cbe4bafea9 ChangeLog 5227
-MD5 5141afce9474b431ebc2be62b4fe35f1 fox-1.0.53.ebuild 843
-MD5 69b033422e3ef99c4104449924a1c735 fox-1.2.6-r3.ebuild 1337
-MD5 26c5d04b7c2c251d238378a598a462ef fox-1.4.12.ebuild 928
-MD5 d859eab1b76e952316741b414ef8acf6 fox-1.0.49.ebuild 1177
-MD5 042d23061d212f553c3b44d3e99f6a99 fox-1.0.43.ebuild 1146
-MD5 317912dda2b3de5c4924e17654ecf99b fox-1.2.15.ebuild 928
-MD5 7a002248b0d876eef33d56604799ab64 files/digest-fox-1.2.6-r2 62
-MD5 dfa6f7b6f4106903b051128fd8838422 files/digest-fox-1.2.4 62
-MD5 d54a926d81530863bfe613992128d46d files/digest-fox-1.2.15 63
-MD5 7a002248b0d876eef33d56604799ab64 files/digest-fox-1.2.6-r3 62
-MD5 ef6bd59b06837347451172daa73db79f files/digest-fox-1.5.4 62
+MD5 fc975eea5b7169c542129d7c95844a88 ChangeLog 5435
 MD5 e66ac5665267aa76e1efc8da12cc8928 files/digest-fox-1.0.40 63
+MD5 fb1e5d65f9c5bfd6f2f4e1b710c857d3 files/digest-fox-1.0.43 63
 MD5 70f3d73defc6189bbc075d615bde3594 files/digest-fox-1.0.49 63
-MD5 f9d9e432dde17dda3e7caeb01768d25f files/digest-fox-1.4.11 63
 MD5 0095a83c05118d9e346dd2d8ba18bb4f files/digest-fox-1.0.53 63
+MD5 d54a926d81530863bfe613992128d46d files/digest-fox-1.2.15 63
+MD5 dfa6f7b6f4106903b051128fd8838422 files/digest-fox-1.2.4 62
+MD5 7a002248b0d876eef33d56604799ab64 files/digest-fox-1.2.6-r2 62
+MD5 7a002248b0d876eef33d56604799ab64 files/digest-fox-1.2.6-r3 62
+MD5 f9d9e432dde17dda3e7caeb01768d25f files/digest-fox-1.4.11 63
 MD5 8facf84e5d62d38f0aee44efd517f615 files/digest-fox-1.4.12 63
-MD5 fb1e5d65f9c5bfd6f2f4e1b710c857d3 files/digest-fox-1.0.43 63
+MD5 ef6bd59b06837347451172daa73db79f files/digest-fox-1.5.4 62
+MD5 a5f1167fb465b82c2c240f208d924c3d fox-1.0.40.ebuild 1146
+MD5 042d23061d212f553c3b44d3e99f6a99 fox-1.0.43.ebuild 1146
+MD5 d859eab1b76e952316741b414ef8acf6 fox-1.0.49.ebuild 1177
+MD5 ee4714973fea66ea733afd36b2d7c1f2 fox-1.0.53.ebuild 1000
+MD5 6b65d6079cc421e60c61943ba1fb473c fox-1.2.15.ebuild 1088
+MD5 f793254a74b6b00db3cc044bae1f2f62 fox-1.2.4.ebuild 1207
+MD5 acf2240c75ffa4c45833dab2573aa708 fox-1.2.6-r2.ebuild 1455
+MD5 c000ae59e7f4889760ff66c7b5ad2c3c fox-1.2.6-r3.ebuild 1492
+MD5 06fa51b5b8b1e65b2f741bc5d699e7a8 fox-1.4.11.ebuild 1661
+MD5 6cd01de7cf9dfaa51d495c806b4eda95 fox-1.4.12.ebuild 1088
+MD5 a3588578cfc68033e0493a18e27f598f fox-1.5.4.ebuild 1087
+MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
diff --git a/x11-libs/fox/fox-1.0.53.ebuild b/x11-libs/fox/fox-1.0.53.ebuild
index 668f501b868e..b5a03abe21be 100644
--- a/x11-libs/fox/fox-1.0.53.ebuild
+++ b/x11-libs/fox/fox-1.0.53.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-libs/fox/fox-1.0.53.ebuild,v 1.1 2005/05/07 19:37:06 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.0.53.ebuild,v 1.2 2006/01/25 05:08:14 spyderous Exp $
 
 inherit fox
 
@@ -9,13 +9,23 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE="cups jpeg opengl png tiff zlib"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+		)
+		virtual/x11
+	)
 	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/opengl virtual/glu )
 	png? ( >=media-libs/libpng-1.2.5 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
 
 FOXCONF="$(use_enable cups) \
 	$(use_enable jpeg) \
diff --git a/x11-libs/fox/fox-1.2.15.ebuild b/x11-libs/fox/fox-1.2.15.ebuild
index 88e6750c421c..14aa5d8efa70 100644
--- a/x11-libs/fox/fox-1.2.15.ebuild
+++ b/x11-libs/fox/fox-1.2.15.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-libs/fox/fox-1.2.15.ebuild,v 1.2 2005/06/01 00:52:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.15.ebuild,v 1.3 2006/01/25 05:08:14 spyderous Exp $
 
 inherit fox
 
@@ -9,17 +9,27 @@ SLOT="1.2"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+		)
+		virtual/x11
+	)
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/opengl virtual/glu )
 	png? ( >=media-libs/libpng-1.2.5 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( =media-libs/freetype-2*
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \
diff --git a/x11-libs/fox/fox-1.2.6-r3.ebuild b/x11-libs/fox/fox-1.2.6-r3.ebuild
index c94d3d0f45d4..dd671b7edc05 100644
--- a/x11-libs/fox/fox-1.2.6-r3.ebuild
+++ b/x11-libs/fox/fox-1.2.6-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/x11-libs/fox/fox-1.2.6-r3.ebuild,v 1.1 2005/04/02 03:05:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.6-r3.ebuild,v 1.2 2006/01/25 05:08:14 spyderous Exp $
 
 IUSE="cups debug truetype opengl"
 DESCRIPTION="C++ based Toolkit for developing Graphical User Interfaces easily and effectively"
@@ -10,10 +10,19 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~alpha ~ppc64"
 LICENSE="GPL-2"
 
-DEPEND="virtual/libc
-	virtual/x11
-	truetype? ( >=media-libs/freetype-2.1.5-r1 )
-	opengl? ( virtual/opengl )"
+RDEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+		)
+		virtual/x11
+	)
+	truetype? ( >=media-libs/freetype-2.1.5-r1 virtual/xft )
+	opengl? ( virtual/opengl virtual/glu )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
 
 
 src_compile() {
diff --git a/x11-libs/fox/fox-1.4.11.ebuild b/x11-libs/fox/fox-1.4.11.ebuild
index f82eb9610e80..f3f3efdafe2b 100644
--- a/x11-libs/fox/fox-1.4.11.ebuild
+++ b/x11-libs/fox/fox-1.4.11.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-libs/fox/fox-1.4.11.ebuild,v 1.5 2005/06/01 00:52:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.4.11.ebuild,v 1.6 2006/01/25 05:08:14 spyderous Exp $
 
 IUSE="cups debug truetype opengl X tiff png jpeg zlib bzip2"
 DESCRIPTION="C++ based Toolkit for developing Graphical User Interfaces easily and effectively"
@@ -10,15 +10,22 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~alpha ~ppc64"
 LICENSE="GPL-2"
 
-DEPEND="virtual/libc
-	virtual/x11
+RDEPEND="virtual/libc
+	|| ( x11-libs/libXrandr virtual/x11 )
 	truetype? ( >=media-libs/freetype-2 )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/opengl virtual/glu )
 	tiff? ( media-libs/tiff )
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
 	zlib? ( sys-libs/zlib )
-	bzip2? ( app-arch/bzip2 )"
+	bzip2? ( app-arch/bzip2 )
+	X? ( || ( x11-libs/libXcursor virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
 
 
 src_compile() {
diff --git a/x11-libs/fox/fox-1.4.12.ebuild b/x11-libs/fox/fox-1.4.12.ebuild
index ef928c3a8716..34407e275613 100644
--- a/x11-libs/fox/fox-1.4.12.ebuild
+++ b/x11-libs/fox/fox-1.4.12.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-libs/fox/fox-1.4.12.ebuild,v 1.2 2005/06/01 00:52:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.4.12.ebuild,v 1.3 2006/01/25 05:08:14 spyderous Exp $
 
 inherit fox
 
@@ -9,17 +9,27 @@ SLOT="1.4"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+		)
+		virtual/x11
+	)
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/opengl virtual/glu )
 	png? ( >=media-libs/libpng-1.2.5 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( =media-libs/freetype-2*
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \
diff --git a/x11-libs/fox/fox-1.5.4.ebuild b/x11-libs/fox/fox-1.5.4.ebuild
index ead29890055a..55a6b9e53470 100644
--- a/x11-libs/fox/fox-1.5.4.ebuild
+++ b/x11-libs/fox/fox-1.5.4.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-libs/fox/fox-1.5.4.ebuild,v 1.2 2005/06/01 00:52:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.5.4.ebuild,v 1.3 2006/01/25 05:08:14 spyderous Exp $
 
 inherit fox
 
@@ -9,17 +9,27 @@ SLOT="1.5"
 KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
 IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+		)
+		virtual/x11
+	)
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/opengl virtual/glu )
 	png? ( >=media-libs/libpng-1.2.5 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( =media-libs/freetype-2*
 		virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
 	$(use_enable cups) \