add support for modular X when gcj/gtk

Package-Manager: portage-2.0.53_rc7

5 files changed, 27 insertions, 15 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index ab0ad3338a7e..86d8924cf4e7 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -91,19 +91,19 @@ MD5 6a290233a7c7a2759b09c3f590449e69 gcc-3.3.2-r7.ebuild 21863
 MD5 36e4fc99adb1677e85e10ae4ec36ceb7 gcc-3.3.5-r1.ebuild 3849
 MD5 e745147dc2058a8cafc25bba7e3f916b gcc-3.3.5.20050130-r1.ebuild 3281
 MD5 809734eb8668d83f43b77b6a24018795 gcc-3.3.5.20050130-r2.ebuild 3281
-MD5 e8abcd8f991d9375ef05279db5feb0b9 gcc-3.3.6.ebuild 3105
+MD5 14e2073340ca1c2c3853e3a8d11a75f3 gcc-3.3.6.ebuild 3220
 MD5 307b46ee9b86bb1d182824303c4b01f3 gcc-3.4.1-r3.ebuild 31283
 MD5 71e25d702be3dd13ee277b7383345fad gcc-3.4.3-r1.ebuild 5477
 MD5 769273e24a52732ce892d08ebeb4bbeb gcc-3.4.3.20050110-r2.ebuild 5240
-MD5 10e8245482e4da4ba16c6f589b5e7be8 gcc-3.4.4-r1.ebuild 5083
+MD5 253f0aec6dfc46f27e5f08b85f6f32a1 gcc-3.4.4-r1.ebuild 5202
 MD5 c2611e7e7fdf69e451da52b22ef78815 gcc-4.0.1.ebuild 1889
-MD5 d51271215d0ed197a8cc47d5cf428ad2 gcc-4.0.2-r1.ebuild 2228
-MD5 4218c5798bace4fe4d0ed2e24d3edbbf gcc-4.1.0_beta20051125.ebuild 2048
+MD5 a22e515b45be82f72ecb9442d5d0b865 gcc-4.0.2-r1.ebuild 2347
+MD5 6befa37cb0bf8e8e6e69db580a1539d1 gcc-4.1.0_beta20051125.ebuild 2166
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDiDnWgIKl8Uu19MoRAmvYAJ9B9NiW2+JSe6OkeVOcheq1S/t84wCdHOqa
-1K+BfCmh/w9g5OG6ktRJe8c=
-=yz8K
+iD8DBQFDi8XngIKl8Uu19MoRAg7KAJ4/su/1QpyXcLRLpZk5u7I2JiCqWQCfU02G
+y83XZZFKjliVaZ9BQgetWMo=
+=RBm7
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-3.3.6.ebuild b/sys-devel/gcc/gcc-3.3.6.ebuild
index 7f70ea834011..2ea1605457f9 100644
--- a/sys-devel/gcc/gcc-3.3.6.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.15 2005/10/07 02:01:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.16 2005/11/29 03:04:52 vapier Exp $
 
 MAN_VER=""
 PATCH_VER="1.3"
@@ -50,7 +50,10 @@ RDEPEND="|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
 	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
 	!build? (
 		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
+			gtk? (
+				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				>=x11-libs/gtk+-2.2
+			)
 			>=media-libs/libart_lgpl-2.1
 		)
 		>=sys-libs/ncurses-5.2-r2
diff --git a/sys-devel/gcc/gcc-3.4.4-r1.ebuild b/sys-devel/gcc/gcc-3.4.4-r1.ebuild
index f2ca98728d28..31f40519ff89 100644
--- a/sys-devel/gcc/gcc-3.4.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.4-r1.ebuild,v 1.7 2005/11/22 05:15:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.4-r1.ebuild,v 1.8 2005/11/29 03:04:52 vapier Exp $
 
 MAN_VER=""
 PATCH_VER="1.7"
@@ -56,7 +56,10 @@ RDEPEND="|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.10 )
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	!build? (
 		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
+			gtk? (
+				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				>=x11-libs/gtk+-2.2
+			)
 			>=media-libs/libart_lgpl-2.1
 		)
 		>=sys-libs/ncurses-5.2-r2
diff --git a/sys-devel/gcc/gcc-4.0.2-r1.ebuild b/sys-devel/gcc/gcc-4.0.2-r1.ebuild
index 801ac8c21220..201e83a9dbd1 100644
--- a/sys-devel/gcc/gcc-4.0.2-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.2-r1.ebuild,v 1.11 2005/11/21 01:12:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.2-r1.ebuild,v 1.12 2005/11/29 03:04:52 vapier Exp $
 
 PATCH_VER="1.2"
 PATCH_GCC_VER="4.0.2"
@@ -39,7 +39,10 @@ RDEPEND="!sys-devel/hardened-gcc
 	)
 	!build? (
 		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
+			gtk? (
+				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				>=x11-libs/gtk+-2.2
+			)
 			>=media-libs/libart_lgpl-2.1
 		)
 		>=sys-libs/ncurses-5.2-r2
diff --git a/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild b/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild
index 18ce9001a978..362e57966ff3 100644
--- a/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild,v 1.1 2005/11/26 04:05:10 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild,v 1.2 2005/11/29 03:04:52 vapier Exp $
 
 ETYPE="gcc-compiler"
 
@@ -22,7 +22,10 @@ RDEPEND="!sys-devel/hardened-gcc
 	)
 	!build? (
 		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
+			gtk? (
+				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				>=x11-libs/gtk+-2.2
+			)
 			>=media-libs/libart_lgpl-2.1
 		)
 		>=sys-libs/ncurses-5.2-r2