Change USE=xml2 to USE=xml #116346. Add modular X support #126931. Change USE=jp2 to USE=jpeg2k #123699 by Fritz Heinrichmeyer. Clean up the ebuild in general.

Package-Manager: portage-2.1_pre7-r3

7 files changed, 142 insertions, 137 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 4adbe5d6741e..35ca2dfb4a0d 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.28 2006/04/01 19:53:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.29 2006/04/02 21:35:15 vapier Exp $
+
+  02 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  graphicsmagick-1.1.5.ebuild, graphicsmagick-1.1.5-r1.ebuild,
+  graphicsmagick-1.1.6.ebuild, graphicsmagick-1.1.6-r1.ebuild,
+  graphicsmagick-1.1.7.ebuild:
+  Change USE=xml2 to USE=xml #116346.  Add modular X support #126931.  Change
+  USE=jp2 to USE=jpeg2k #123699 by Fritz Heinrichmeyer.  Clean up the ebuild
+  in general.
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org>
   graphicsmagick-1.1.7.ebuild:
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 67d3d9248cce..2abde2749d40 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 224eb818720cf15464f999ba4071eb4b ChangeLog 4337
-RMD160 6f74e9224680deef93f9b2ce128e19bd2cc946e6 ChangeLog 4337
-SHA256 e506e9a1026a463b84d6fd1a3769e7061f47f3d924d45c68094785476726fba3 ChangeLog 4337
+MD5 028109e024c69c46ad135169399d1026 ChangeLog 4712
+RMD160 d276420e950e82f41ae7fe1d7d6167e50f6287d5 ChangeLog 4712
+SHA256 2ac37777b24b7b85e1fed6bc92e87defc923f8edbec4f31e18585a780370d4b2 ChangeLog 4712
 MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5 74
 RMD160 4816db9fb150ab51da87a9afa1f7dd43ef8576f0 files/digest-graphicsmagick-1.1.5 74
 SHA256 cc9bf75fc120fa2d6e6195836c57263e19161878b0978f0bb1e92ee663af42c0 files/digest-graphicsmagick-1.1.5 74
@@ -25,28 +25,28 @@ SHA256 1cfc01739d4911dc31978b35b5b7df46fab5468ec1a5fb3874fba0e202f92a12 files/gr
 MD5 0d86c7176f6338aed5b5f86af8f76d63 files/xwd-dos.patch 1103
 RMD160 991cc1701e753ba6848dff77b3cae95398f41732 files/xwd-dos.patch 1103
 SHA256 fa3a08ad0ffab2a1ff721e040c8eb78d2326ff25c6ed7d13bafc971a64fe52f9 files/xwd-dos.patch 1103
-MD5 965343c92e42a8c90c4cb6bd7e8402f1 graphicsmagick-1.1.5-r1.ebuild 2431
-RMD160 74c79688693a178d84ce9997af65617035ca1a96 graphicsmagick-1.1.5-r1.ebuild 2431
-SHA256 c7789f9254a35c68ef5bd6276e19839a913b7d2980de77882409f98776f40f59 graphicsmagick-1.1.5-r1.ebuild 2431
-MD5 8a71e26cc7fe52a2ab396809f2eb59d5 graphicsmagick-1.1.5.ebuild 2359
-RMD160 96f77efeb32aae2f805315813d27caead3e9385a graphicsmagick-1.1.5.ebuild 2359
-SHA256 53a9d7554f1308ab7ad12366b0a8f4647e3aa17242deade9fb373b2d974ab870 graphicsmagick-1.1.5.ebuild 2359
-MD5 9e2febc14e2e085cffb834b7442360fe graphicsmagick-1.1.6-r1.ebuild 2602
-RMD160 100980ee60227d2a91dd20d434d08d463f985c91 graphicsmagick-1.1.6-r1.ebuild 2602
-SHA256 296b84570ed9db525c06dd4df9e56c00ac39021d2f62ee75cbd135d26a162052 graphicsmagick-1.1.6-r1.ebuild 2602
-MD5 bfd824780fb9e271b794cb184116f9cd graphicsmagick-1.1.6.ebuild 2428
-RMD160 21fd9fc7e69d6f5ae47b2cde2ceb1b8d8efa0134 graphicsmagick-1.1.6.ebuild 2428
-SHA256 19fd9cd9a0ce0909c0478ff1de8819bccd81425f87c39c15b15393ea25e0dcdd graphicsmagick-1.1.6.ebuild 2428
-MD5 471c3e46325aadf2fc40e791753a2eae graphicsmagick-1.1.7.ebuild 2731
-RMD160 97a9adf6d881117c9d8d3291ed32acca2310cedb graphicsmagick-1.1.7.ebuild 2731
-SHA256 10b93647fa1cde01e950f377d90f422dbe244d7541128971ac122fca92b5ca9d graphicsmagick-1.1.7.ebuild 2731
+MD5 f3e9099e40de4fe33652202863ca18e8 graphicsmagick-1.1.5-r1.ebuild 2526
+RMD160 a72c00edb9aa85072cbd9fda9f32ab4b0c6485f4 graphicsmagick-1.1.5-r1.ebuild 2526
+SHA256 8ee8efc9176fb0f941a0bcc27cd88df742e15dd2b5acafe09f5634b2e24fb893 graphicsmagick-1.1.5-r1.ebuild 2526
+MD5 26ec5c55bc57838147d028d88c2a4a4b graphicsmagick-1.1.5.ebuild 2454
+RMD160 fe0e38c499e169728332dc31b4c35ef9ded74cda graphicsmagick-1.1.5.ebuild 2454
+SHA256 de5c03fa843cd4507fc8922a3c17fd2647d0643d42d0d16a1032f527f39391eb graphicsmagick-1.1.5.ebuild 2454
+MD5 4c5a704c3b0f1874e860314fde8d4a72 graphicsmagick-1.1.6-r1.ebuild 2697
+RMD160 3b747644882eb761017efde097acdd24de6028fb graphicsmagick-1.1.6-r1.ebuild 2697
+SHA256 439e54876f024ad5be53972b3bbe9fbe781af09442b9283eec6cd521a0ecefae graphicsmagick-1.1.6-r1.ebuild 2697
+MD5 636842979428ab83cb38952546870dee graphicsmagick-1.1.6.ebuild 2523
+RMD160 b696bce08c7708e98b5e750057e85b6530303284 graphicsmagick-1.1.6.ebuild 2523
+SHA256 4c837332853b0e88e75d7a8d74e69224877866f1eb8af5c487d14bb31112f279 graphicsmagick-1.1.6.ebuild 2523
+MD5 41b1d4f949485e35530910a02f854f6a graphicsmagick-1.1.7.ebuild 2520
+RMD160 5020d0197206a2caa4f5e5a443127ef26ddb11c3 graphicsmagick-1.1.7.ebuild 2520
+SHA256 3f6ba501348328b8108788d5ac081f9b998bc83a4ed073387140ab56e5ceb1b7 graphicsmagick-1.1.7.ebuild 2520
 MD5 eae2172901a7cc6b7a6e37fc9267a2b9 metadata.xml 197
 RMD160 45fece5f76f3776dd119fe5b124d815caced375f metadata.xml 197
 SHA256 a42685246e78553ec390823695d12279e70c7d4ebdd9d9af36cc5932374c95e9 metadata.xml 197
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELtpiJrHF4yAQTrARAqYlAJ0SxSc2I9NcfMff4ByZTpwS8l/bOACgycIm
-Z//JuLq0z3DCNpmMMnNMLNs=
-=+Huf
+iD8DBQFEMEO72+ySkm8kpY0RAoFEAKC2VO17bh48jMfkjiu5dyGfTKLP0wCeMSvU
+X7gRyZAVaROr3wg9BqlKajA=
+=lPaM
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild
index 288bcb3ba48b..4ca9e25bbefd 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild
@@ -1,47 +1,48 @@
-# 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-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild,v 1.2 2005/11/28 13:00:36 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.5-r1.ebuild,v 1.3 2006/04/02 21:35:17 vapier Exp $
 
 inherit libtool flag-o-matic perl-app
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2"
 
 MY_PN=GraphicsMagick
 MY_P=${MY_PN}-${PV}
 
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE="X gs jbig jpeg2k jpeg lcms lzw perl png tiff truetype wmf xml"
 
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
+RDEPEND="app-arch/bzip2
 	sys-libs/zlib
-	X? ( virtual/x11 )
+	X? ( || (
+		( x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM )
+		virtual/x11
+	) )
 	gs?   ( virtual/ghostscript )
 	jbig? ( media-libs/jbigkit )
-	jp2? ( media-libs/jasper )
+	jpeg2k? ( media-libs/jasper )
 	jpeg? ( >=media-libs/jpeg-6b )
 	lcms? ( >=media-libs/lcms-1.06 )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
 	truetype? ( =media-libs/freetype-2* )
 	wmf? ( >=media-libs/libwmf-0.2.5 )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) virtual/x11 ) )"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	local myconf=""
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with jbig)"
-	myconf="${myconf} $(use_with jp2)"
+	myconf="${myconf} $(use_with jpeg2k)"
 	myconf="${myconf} $(use_with jpeg)"
 	myconf="${myconf} $(use_with lcms)"
 	myconf="${myconf} $(use_enable lzw)"
@@ -49,7 +50,7 @@ src_compile() {
 	myconf="${myconf} $(use_with tiff)"
 	myconf="${myconf} $(use_with truetype ttf)"
 	myconf="${myconf} $(use_with wmf)"
-	myconf="${myconf} $(use_with xml2 xml)"
+	myconf="${myconf} $(use_with xml xml)"
 
 	# Netscape is still used ?  More people should have Mozilla
 	sed -i 's:netscape:mozilla:g' configure
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild
index 8c937c46747d..08f3868e8975 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild
@@ -1,47 +1,48 @@
-# 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-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild,v 1.3 2005/11/28 13:00:36 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.5.ebuild,v 1.4 2006/04/02 21:35:17 vapier Exp $
 
 inherit libtool flag-o-matic perl-app
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2"
 
 MY_PN=GraphicsMagick
 MY_P=${MY_PN}-${PV}
 
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE="X gs jbig jpeg2k jpeg lcms lzw perl png tiff truetype wmf xml"
 
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
+RDEPEND="app-arch/bzip2
 	sys-libs/zlib
-	X? ( virtual/x11 )
+	X? ( || (
+		( x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM )
+		virtual/x11
+	) )
 	gs?   ( virtual/ghostscript )
 	jbig? ( media-libs/jbigkit )
-	jp2? ( media-libs/jasper )
+	jpeg2k? ( media-libs/jasper )
 	jpeg? ( >=media-libs/jpeg-6b )
 	lcms? ( >=media-libs/lcms-1.06 )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
 	truetype? ( =media-libs/freetype-2* )
 	wmf? ( >=media-libs/libwmf-0.2.5 )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) virtual/x11 ) )"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	local myconf=""
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with jbig)"
-	myconf="${myconf} $(use_with jp2)"
+	myconf="${myconf} $(use_with jpeg2k)"
 	myconf="${myconf} $(use_with jpeg)"
 	myconf="${myconf} $(use_with lcms)"
 	myconf="${myconf} $(use_enable lzw)"
@@ -49,7 +50,7 @@ src_compile() {
 	myconf="${myconf} $(use_with tiff)"
 	myconf="${myconf} $(use_with ttf)"
 	myconf="${myconf} $(use_with wmf)"
-	myconf="${myconf} $(use_with xml2 xml)"
+	myconf="${myconf} $(use_with xml xml)"
 
 	# Netscape is still used ?  More people should have Mozilla
 	sed -i 's:netscape:mozilla:g' configure
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild
index 2e9bca121b15..d1ef8b92cf91 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild
@@ -1,41 +1,42 @@
-# 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-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild,v 1.6 2005/11/28 13:00:36 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild,v 1.7 2006/04/02 21:35:17 vapier Exp $
 
 inherit libtool flag-o-matic perl-app
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2 doc"
 
 MY_PN=GraphicsMagick
 MY_P=${MY_PN}-${PV}
 
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="ppc ~ppc64 ~sparc x86"
+IUSE="X gs jbig jpeg2k jpeg lcms lzw perl png tiff truetype wmf xml doc"
 
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
+RDEPEND="app-arch/bzip2
 	sys-libs/zlib
-	X? ( virtual/x11 )
+	X? ( || (
+		( x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM )
+		virtual/x11
+	) )
 	gs?   ( virtual/ghostscript )
 	jbig? ( media-libs/jbigkit )
-	jp2? ( media-libs/jasper )
+	jpeg2k? ( media-libs/jasper )
 	jpeg? ( >=media-libs/jpeg-6b )
 	lcms? ( >=media-libs/lcms-1.06 )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
 	truetype? ( =media-libs/freetype-2* )
 	wmf? ( >=media-libs/libwmf-0.2.5 )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) virtual/x11 ) )"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
@@ -47,7 +48,7 @@ src_compile() {
 	local myconf=""
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with jbig)"
-	myconf="${myconf} $(use_with jp2)"
+	myconf="${myconf} $(use_with jpeg2k)"
 	myconf="${myconf} $(use_with jpeg)"
 	myconf="${myconf} $(use_with lcms)"
 	myconf="${myconf} $(use_enable lzw)"
@@ -55,7 +56,7 @@ src_compile() {
 	myconf="${myconf} $(use_with tiff)"
 	myconf="${myconf} $(use_with truetype ttf)"
 	myconf="${myconf} $(use_with wmf)"
-	myconf="${myconf} $(use_with xml2 xml)"
+	myconf="${myconf} $(use_with xml xml)"
 
 	# Netscape is still used ?  More people should have Mozilla
 	sed -i 's:netscape:mozilla:g' configure
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild
index 207b83be8298..60981d5b60ca 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild
@@ -1,47 +1,48 @@
-# 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-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild,v 1.3 2005/11/28 13:00:36 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.6.ebuild,v 1.4 2006/04/02 21:35:17 vapier Exp $
 
 inherit libtool flag-o-matic perl-app
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2"
 
 MY_PN=GraphicsMagick
 MY_P=${MY_PN}-${PV}
 
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE="X gs jbig jpeg2k jpeg lcms lzw perl png tiff truetype wmf xml"
 
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
+RDEPEND="app-arch/bzip2
 	sys-libs/zlib
-	X? ( virtual/x11 )
+	X? ( || (
+		( x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM )
+		virtual/x11
+	) )
 	gs?   ( virtual/ghostscript )
 	jbig? ( media-libs/jbigkit )
-	jp2? ( media-libs/jasper )
+	jpeg2k? ( media-libs/jasper )
 	jpeg? ( >=media-libs/jpeg-6b )
 	lcms? ( >=media-libs/lcms-1.06 )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
 	truetype? ( =media-libs/freetype-2* )
 	wmf? ( >=media-libs/libwmf-0.2.5 )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) virtual/x11 ) )"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	local myconf=""
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with jbig)"
-	myconf="${myconf} $(use_with jp2)"
+	myconf="${myconf} $(use_with jpeg2k)"
 	myconf="${myconf} $(use_with jpeg)"
 	myconf="${myconf} $(use_with lcms)"
 	myconf="${myconf} $(use_enable lzw)"
@@ -49,7 +50,7 @@ src_compile() {
 	myconf="${myconf} $(use_with tiff)"
 	myconf="${myconf} $(use_with truetype ttf)"
 	myconf="${myconf} $(use_with wmf)"
-	myconf="${myconf} $(use_with xml2 xml)"
+	myconf="${myconf} $(use_with xml xml)"
 
 	# Netscape is still used ?  More people should have Mozilla
 	sed -i 's:netscape:mozilla:g' configure
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild
index 3ef55a007874..bd885cf63bb2 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild
@@ -1,71 +1,53 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild,v 1.5 2006/04/01 19:53:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild,v 1.6 2006/04/02 21:35:17 vapier Exp $
 
 inherit libtool flag-o-matic perl-app
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2 doc"
 
 MY_PN=GraphicsMagick
 MY_P=${MY_PN}-${PV}
 
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~ia64 ppc ~ppc64 ~sparc x86"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ppc ~ppc64 ~sparc x86"
+IUSE="X gs jbig jpeg2k jpeg lcms lzw perl png tiff truetype wmf xml doc"
 
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
+RDEPEND="app-arch/bzip2
 	sys-libs/zlib
-	X? ( virtual/x11 )
+	X? ( || (
+		( x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM )
+		virtual/x11
+	) )
 	gs?   ( virtual/ghostscript )
 	jbig? ( media-libs/jbigkit )
-	jp2? ( media-libs/jasper )
+	jpeg2k? ( media-libs/jasper )
 	jpeg? ( >=media-libs/jpeg-6b )
 	lcms? ( >=media-libs/lcms-1.06 )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
 	truetype? ( =media-libs/freetype-2* )
 	wmf? ( >=media-libs/libwmf-0.2.5 )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) virtual/x11 ) )"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-overflow.patch
-}
-
-src_compile() {
-	# -mcpu blows up PIC building on x86 + amd64
-	case $(tc-arch) in
-		x86|amd64) replace-flags "-mcpu" "-mtune" ;;
-	esac
-
-
-	local myconf=""
-	myconf="${myconf} $(use_with X x)"
-	myconf="${myconf} $(use_with jbig)"
-	myconf="${myconf} $(use_with jp2)"
-	myconf="${myconf} $(use_with jpeg)"
-	myconf="${myconf} $(use_with lcms)"
-	myconf="${myconf} $(use_enable lzw)"
-	myconf="${myconf} $(use_with png)"
-	myconf="${myconf} $(use_with tiff)"
-	myconf="${myconf} $(use_with truetype ttf)"
-	myconf="${myconf} $(use_with wmf)"
-	myconf="${myconf} $(use_with xml2 xml)"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-overflow.patch
 
 	# Netscape is still used ?  More people should have Mozilla
 	sed -i 's:netscape:mozilla:g' configure
+}
 
+src_compile() {
 	econf \
 		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
 		--enable-shared \
@@ -73,7 +55,18 @@ src_compile() {
 		--with-threads \
 		--with-bzlib \
 		--without-perl \
-		${myconf} || die
+		$(use_with X x) \
+		$(use_with jbig) \
+		$(use_with jpeg2k) \
+		$(use_with jpeg) \
+		$(use_with lcms) \
+		$(use_enable lzw) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		$(use_with wmf) \
+		$(use_with xml xml) \
+		|| die
 
 	# make PerlMagick using portage tools instead of Makefile to avoid sandbox issues
 	if use perl ; then
@@ -87,7 +80,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	if use perl ; then
 		cd PerlMagick
@@ -97,10 +90,10 @@ src_install() {
 
 	dosym /usr/lib/${MY_P}/ /usr/lib/GraphicsMagick
 
-	rm -f ${D}/usr/share/GraphicsMagick/*.txt
-	rm -rf ${D}/usr/share/${MY_P}/www
+	rm -f "${D}"/usr/share/GraphicsMagick/*.txt
+	rm -rf "${D}"/usr/share/${MY_P}/www
 
-	if use doc; then
+	if use doc ; then
 	    dohtml -r www/*
 	fi