version bump, add support for autotrace, lqr (liquid rescale of images) and fftw. dropping arches with unkeyworded new deps.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 204 insertions, 3 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index a92c9ebbfc7e..6ba4b85ecd09 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.358 2009/07/23 03:47:24 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.359 2009/08/15 11:58:26 maekke Exp $
+
+*imagemagick-6.5.4.10 (15 Aug 2009)
+
+  15 Aug 2009; Markus Meier <maekke@gentoo.org>
+  +imagemagick-6.5.4.10.ebuild, metadata.xml:
+  version bump, add support for autotrace, lqr (liquid rescale of images)
+  and fftw. dropping arches with unkeyworded new deps.
 
   23 Jul 2009; Gordon Malm <gengor@gentoo.org> imagemagick-6.5.1.0.ebuild,
   imagemagick-6.5.2.7.ebuild, imagemagick-6.5.2.9.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 733ab3f49ef4..9c60237c6140 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ImageMagick-6.5.1-0.tar.bz2 8795149 RMD160 e8f2f5eed7d9131c143d61d94a3738e2ffd58681 SHA1 d712a89dd45fc7e3bb55c66df5c03d2cc0d691d9 SHA256 c19677e8b4cd2322555436392fcf2a60cffac559c4d2aafcf60e6a59bd7fc466
 DIST ImageMagick-6.5.2-7.tar.bz2 8805044 RMD160 98e5df115b285438720fd92fdbaa17a5ee1c95c4 SHA1 289084e4091ffcc2bb687a3e193580a585810c19 SHA256 b9f21f2b04df6166dd34cad49335a5d9f83c088feb103f039ea94949b8dc25af
 DIST ImageMagick-6.5.2-9.tar.bz2 8819668 RMD160 01aa6604339eaee031b06aae27a4074ac36a88e1 SHA1 1eb8cb876742dba833917c30b10bfef215d4f261 SHA256 5bc9958ce4db8d36c6bd92f8e7c95aafc63aeb03694cdf1fdd4b3f3ae953ef4c
+DIST ImageMagick-6.5.4-10.tar.bz2 8819304 RMD160 b48f8b8c0c9ec8cc01a38eee45868d540b3845db SHA1 87fd01d4399c8caba2f505c35618117b5296a1cc SHA256 b27117bfafc989ce74214db116a5b3bd1fda0e501839faab09c715c8647cd8eb
 EBUILD imagemagick-6.5.1.0.ebuild 4734 RMD160 737f40e069a244b4d8ff2a7211f6af705e3db5b5 SHA1 3e5b1107b49a005b04174a2873d1e14614f369cd SHA256 278e5eac9bca4e2ab26f0d00937abd6d615b29e1a127af1be7a03498a8b46dff
 EBUILD imagemagick-6.5.2.7.ebuild 4840 RMD160 550b9b74e53a4bd9f59bafe8b622a65fc3c8695a SHA1 68714e0f990b782df416abde44479b9296f48c1f SHA256 95363bd6bc8726d87a49bd49f569106ab3889db1b0dfaf429048d842e20682b4
 EBUILD imagemagick-6.5.2.9.ebuild 4830 RMD160 19501798042db2b65e83a612f7dec8524975f7f9 SHA1 bb1e22274550dab53dad66cdc8fb412b50e5d944 SHA256 fdef39699c947168694e585fdc2ac1d464bc258b27db9b2020e762dde283de47
-MISC ChangeLog 53938 RMD160 bf1fbf04985a66063d0f858e653d884e0e9b65ab SHA1 561e254fd28e061aa9b1c9172b7938a6c898474c SHA256 36bb12614c7b724a727d5f0813a53948fe4c9ad183df44c5fc6905641b4bdd9b
-MISC metadata.xml 620 RMD160 facd588ff7e13cf1a573927c5f3e653f384bb4b2 SHA1 e989aa7d14e2a1c7382b5fdf1c395ed7dcf7d6cb SHA256 86955c079d63a4faacc4be59e01a4ce47934fc35f5b89f6accfdb755cd4ff2df
+EBUILD imagemagick-6.5.4.10.ebuild 4947 RMD160 4126436b01428f8166feb65203caaf98cd8604c4 SHA1 4bbc61d700838b66830c0cf3f8a59c3984603a1a SHA256 de44c01486973edab43d0c248ea51f13019e675d3837f044374265a2a40615c6
+MISC ChangeLog 54199 RMD160 2c9ee260ce7faa4a1df57f28634a10ccd85ad4d2 SHA1 5323239f83e4bbd89b27ccdbf845da234805171d SHA256 c6acdcd30d8f1ebf6a7af62874c60e6207781e297e2e7ff401770e3ac248f012
+MISC metadata.xml 813 RMD160 1a299d749c40a81c6255e74b055d51bb2574947d SHA1 28be5abfb85ef530e3ec5a84678e914175435ed4 SHA256 53592450b5a53784153fc95d665dee08392968adab41bd3032ad759778bde31b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqGoxoACgkQkKaRLQcq0GKsuwCfQqXVzzLaQIsfBFQYyqE/+o2A
+tIoAniuiw5WZumthnA3XfQF9injeSjae
+=7U+w
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild b/media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild
new file mode 100644
index 000000000000..2ef60c598b73
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild,v 1.1 2009/08/15 11:58:26 maekke Exp $
+
+EAPI="2"
+
+inherit eutils multilib perl-app toolchain-funcs versionator
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
+
+# perl tests fail with userpriv
+RESTRICT="perl? ( userpriv )"
+LICENSE="imagemagick"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autotrace bzip2 +corefonts djvu doc fftw fontconfig fpx graphviz gs hdri
+	jbig jpeg jpeg2k lcms lqr nocxx openexr openmp perl png q8 q32 raw svg tiff
+	truetype X wmf xml zlib"
+
+RDEPEND="
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( media-libs/libfpx )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( virtual/ghostscript )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( >=media-libs/lcms-1.06 )
+	lqr? ( >=media-libs/liblqr-0.1.0 )
+	openexr? ( media-libs/openexr )
+	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+	png? ( media-libs/libpng )
+	raw? ( media-gfx/ufraw )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	truetype? ( =media-libs/freetype-2*
+		corefonts? ( media-fonts/corefonts ) )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+	)
+	!dev-perl/perlmagick
+	!sys-apps/compare
+	>=sys-devel/libtool-1.5.2-r6"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${MY_P2}"
+
+pkg_setup() {
+	# for now, only build svg support when X is enabled, as librsvg
+	# pulls in quite some X dependencies.
+	if use svg && ! use X ; then
+		elog "the svg USE-flag requires the X USE-flag set."
+		elog "disabling svg support for now."
+	fi
+
+	if use corefonts && ! use truetype ; then
+		elog "corefonts USE-flag requires the truetype USE-flag to be set."
+		elog "disabling corefonts support for now."
+	fi
+}
+
+src_prepare() {
+	# fix doc dir, bug #91911
+	sed -i -e \
+		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
+		"${S}"/configure || die
+}
+
+src_configure() {
+	local myconf
+	if use q32 ; then
+		myconf="${myconf} --with-quantum-depth=32"
+	elif use q8 ; then
+		myconf="${myconf} --with-quantum-depth=8"
+	else
+		myconf="${myconf} --with-quantum-depth=16"
+	fi
+
+	if use X && use svg ; then
+		myconf="${myconf} --with-rsvg"
+	else
+		myconf="${myconf} --without-rsvg"
+	fi
+
+	# openmp support only works with >=sys-devel/gcc-4.3, bug #223825
+	if use openmp && version_is_at_least 4.3 $(gcc-version) ; then
+		if built_with_use --missing false =sys-devel/gcc-$(gcc-fullversion)* openmp ; then
+			myconf="${myconf} --enable-openmp"
+		else
+			elog "disabling openmp support (requires >=sys-devel/gcc-4.3 with USE='openmp')"
+			myconf="${myconf} --disable-openmp"
+		fi
+	else
+		elog "disabling openmp support (requires >=sys-devel/gcc-4.3)"
+		myconf="${myconf} --disable-openmp"
+	fi
+
+	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
+
+	econf \
+		${myconf} \
+		--without-included-ltdl \
+		--with-ltdl-include=/usr/include \
+		--with-ltdl-lib=/usr/$(get_libdir) \
+		--with-threads \
+		--with-modules \
+		$(use_with perl) \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		$(use_enable hdri) \
+		$(use_with !nocxx magick-plus-plus) \
+		$(use_with autotrace) \
+		$(use_with bzip2 bzlib) \
+		$(use_with djvu) \
+		$(use_with fftw) \
+		$(use_with fontconfig) \
+		$(use_with fpx) \
+		$(use_with gs dps) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg jpeg) \
+		$(use_with jpeg2k jp2) \
+		$(use_with lcms) \
+		$(use_with openexr) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with truetype freetype) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		$(use_with zlib) \
+		$(use_with X x)
+}
+
+src_test() {
+	einfo "please note that the tests will only be run when the installed"
+	einfo "version and current emerging version are the same"
+
+	if has_version ~${CATEGORY}/${P} ; then
+		emake -j1 check || die "make check failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation of files into image failed"
+
+	# dont need these files with runtime plugins
+	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
+
+	use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
+	dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 64f505450372..551466c8df94 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 	<herd>graphics</herd>
 	<use>
+		<flag name='autotrace'>
+			use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector
+			graphics
+		</flag>
 		<flag name='corefonts'>
 			pull in <pkg>media-fonts/corefonts</pkg>, which is required for some
 			commands
@@ -16,6 +20,9 @@
 		<flag name='hdri'>
 			enable High Dynamic Range Images formats
 		</flag>
+		<flag name='lqr'>
+			enable experimental liquid rescale support
+		</flag>
 		<flag name='q32'>
 			set quantum depth to 32
 		</flag>