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.

(Portage version: 2.1_pre7-r3)

6 files changed, 120 insertions, 115 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/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