update modular X depends #116254, change USE=X to USE=xpm, and stabilize for arm/hppa/ia64/s390 #112937

Package-Manager: portage-2.0.53

3 files changed, 14 insertions, 14 deletions

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 46f4d598aef4..7533fba25c7c 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -5,13 +5,13 @@ MD5 0abff33b207d0b1b3dfd88dcb3b933c0 ChangeLog 9613
 MD5 ef1f623ab65a05b7e14e9bd61bb02c65 files/digest-gd-2.0.32 61
 MD5 ba0985339b94b8c354d8e3246b8972e0 files/digest-gd-2.0.33 61
 MD5 e87c929b6ea7468d13cc8f2e176f6aaa files/gd-2.0.33-overflow-checks.patch 1382
-MD5 dd997b3de3bba1b67bb918160d090224 gd-2.0.32.ebuild 1015
-MD5 ceb7e95f4decc46d4c0f55060187a27b gd-2.0.33.ebuild 1086
+MD5 04bffaeba0819fd7d5ee67f95084fe44 gd-2.0.32.ebuild 1033
+MD5 705932b8cad7f391f95c0b519bfc3aa0 gd-2.0.33.ebuild 1127
 MD5 312563b7288a2111976b24b0865d9df8 metadata.xml 1227
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDqWSOntT9W3vfTuoRAv7lAKCqMSldLomN0/OBvdvB5BbRbhErYwCfV/fu
-AfNG3LtSbXsp1Tnm8Qxe81M=
-=Jhs8
+iD8DBQFDqep62+ySkm8kpY0RAtXHAJ9igjvhUaEgYGruj9DN0aPW5bXILACgxGCh
+KI2RUfO9ryXGDvPvO1De+bI=
+=bZMP
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gd/gd-2.0.32.ebuild b/media-libs/gd/gd-2.0.32.ebuild
index 7deb2168a850..f930cdeb3419 100644
--- a/media-libs/gd/gd-2.0.32.ebuild
+++ b/media-libs/gd/gd-2.0.32.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/media-libs/gd/gd-2.0.32.ebuild,v 1.6 2005/12/13 05:31:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.32.ebuild,v 1.7 2005/12/21 23:50:30 vapier Exp $
 
 inherit eutils
 
@@ -11,13 +11,13 @@ SRC_URI="http://www.boutell.com/gd/http/${P}.tar.gz"
 LICENSE="|| ( as-is BSD )"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
-IUSE="fontconfig jpeg png X truetype"
+IUSE="fontconfig jpeg png truetype xpm"
 
 DEPEND="fontconfig? ( media-libs/fontconfig )
 	jpeg? ( >=media-libs/jpeg-6b )
 	png? ( >=media-libs/libpng-1.2.5 sys-libs/zlib )
 	truetype? ( >=media-libs/freetype-2.1.5 )
-	X? ( || ( x11-libs/libXpm virtual/x11 ) )"
+	xpm? ( || ( ( x11-libs/libXpm x11-libs/libXt ) virtual/x11 ) )"
 
 src_compile() {
 	econf \
@@ -25,7 +25,7 @@ src_compile() {
 		$(use_with png) \
 		$(use_with truetype freetype) \
 		$(use_with jpeg) \
-		$(use_with X xpm) \
+		$(use_with xpm) \
 		|| die
 	emake || die
 }
diff --git a/media-libs/gd/gd-2.0.33.ebuild b/media-libs/gd/gd-2.0.33.ebuild
index 79564aee10ac..0a79f3a9752a 100644
--- a/media-libs/gd/gd-2.0.33.ebuild
+++ b/media-libs/gd/gd-2.0.33.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/media-libs/gd/gd-2.0.33.ebuild,v 1.6 2005/12/21 14:19:47 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.33.ebuild,v 1.7 2005/12/21 23:50:30 vapier Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ SRC_URI="http://www.boutell.com/gd/http/${P}.tar.gz"
 
 LICENSE="|| ( as-is BSD )"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ppc64 ~s390 sparc x86"
-IUSE="fontconfig jpeg png X truetype"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc-macos ppc64 s390 sparc x86"
+IUSE="fontconfig jpeg png truetype xpm"
 
 DEPEND="fontconfig? ( media-libs/fontconfig )
 	jpeg? ( >=media-libs/jpeg-6b )
 	png? ( >=media-libs/libpng-1.2.5 sys-libs/zlib )
 	truetype? ( >=media-libs/freetype-2.1.5 )
-	X? ( virtual/x11 )"
+	xpm? ( || ( ( x11-libs/libXpm x11-libs/libXt ) virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
@@ -31,7 +31,7 @@ src_compile() {
 		$(use_with png) \
 		$(use_with truetype freetype) \
 		$(use_with jpeg) \
-		$(use_with X xpm) \
+		$(use_with xpm) \
 		|| die
 	emake || die
 }