Version bump wrt #391383 by Ilia Glazkov and Alexander Wigen

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 188 insertions, 45 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index f7fe62eb4ede..882b6f7ea659 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.449 2011/11/16 10:21:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.450 2011/12/11 06:21:32 ssuominen Exp $
+
+*imagemagick-6.7.4.0 (11 Dec 2011)
+
+  11 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.7.4.0.ebuild, metadata.xml:
+  Version bump wrt #391383 by Ilia Glazkov and Alexander Wigen
 
   16 Nov 2011; Justin Lecher <jlec@gentoo.org> imagemagick-6.6.5.6.ebuild,
   imagemagick-6.7.1.0.ebuild, imagemagick-6.7.3.0.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 6465c407468c..6c574d6323bb 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST ImageMagick-6.6.5-6.tar.xz 6314756 RMD160 9c2d96bc1210356305096b27f2d829a8d3445356 SHA1 c129c813bd73deae5ec21491e8121f365bbdd7b3 SHA256 585a8372deb2052906c8fc74e84f96d72b711a08f804a4952cbb4c21fc4538fe
 DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7b1edd43 SHA1 6570b9f994ae58e047d3a3ad84b1bfdf2e749159 SHA256 1b26dff61f46cdbb13fe57acdba9583dc9c47e303826bddea9276a0d3a666b47
 DIST ImageMagick-6.7.3-0.tar.xz 7946508 RMD160 628626e7eff38148339851f41f9804bb3dafa763 SHA1 bbcdb092f6c4cc4c1d29163bef1199e86dd5ab05 SHA256 8159b3c3fa2c121b30a020df5ae87ec345a79608379413a8fa38fe3000d0607b
+DIST ImageMagick-6.7.4-0.tar.xz 7583560 RMD160 3f2f96844653e45ab53be62db8b6f3bfce729254 SHA1 f0310885972341b74670925b503ad8a8b05ad75d SHA256 7a23a77707efdac2686ca09ef4a1fb83f1f21385a6410a30a1c003180da37ca4
 EBUILD imagemagick-6.6.5.6.ebuild 4113 RMD160 b2a6f33ce79f0c1ee7b42116cad5fe9b24c0508a SHA1 fffc57251b9d5cd5119f2b0878d65103af8aaf9b SHA256 7cca9de66dc5e7d795d4eb417e4d697dcb7fc1a7cecea0b40df302eff63b93c2
 EBUILD imagemagick-6.7.1.0.ebuild 4211 RMD160 8078204aad2c1b4103b462f48e1198abdb9b3010 SHA1 7b9a32ed05bc834e67f7af639d24c13bc9da5a1c SHA256 a59ce410c5f62585fa45d343f8a97e4bae73136359e2208bccbed4f9877234ad
 EBUILD imagemagick-6.7.3.0.ebuild 4335 RMD160 9e9b89bc896e15f0769e2c138a33444056635f46 SHA1 51c1d955045d749d8642faa7fb33adcf9125e77e SHA256 7017ff50925d87ea35ffe53f726aef28d763a1dad14eca1d10a3069ede83b000
-MISC ChangeLog 66577 RMD160 52ac561320aae52178f6825ee686d1f21f2c5f53 SHA1 98d6fc204bdd026c8f563ff7a34e32ddc16c41de SHA256 3d6ca85ed04c6d53e513dcf5cf91f7da0a721b9adefcde5594f7b0cee1c14f12
-MISC metadata.xml 996 RMD160 4afdb1acb67b84fdb8a4c4b720ec1858e85bc2fd SHA1 5cb81df1fbada2f137e13530b30af67baed6c68d SHA256 42f246f5285d9d6a16d764420e069baecd0518d126ecbbc3ff4fa81536947062
+EBUILD imagemagick-6.7.4.0.ebuild 4338 RMD160 0da0420fbf07611aa66c7694e2d067dd1fcfccf1 SHA1 9a6680407ee5e82ad88e28f60300d0e1cd724df4 SHA256 efdd347b100da4e2f625f6e37fbfa481f530160ee7ed7b2cf3a15fac16986a97
+MISC ChangeLog 66781 RMD160 1d3c5b9241f441c037f2926939a2ed80a979f7b2 SHA1 9d2a7b2f43d89efcc315fd4e8045360d360471b6 SHA256 ed1e2f57749c54084bac9b7cc39f2cbee9417ebba6c2c9b1d3a23d41433bd2b9
+MISC metadata.xml 1104 RMD160 a1e2500c6057d9aaac9424ec72dc099da042e1ee SHA1 4ad8f34e03f649808dfa3999d60497c56722cee8 SHA256 d6840b362278ffdced22382075ebd20652f1b82470b6b9cbd035c4fc9ece60d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7DjrMACgkQgAnW8HDreRZUcgCfToAyFRPEicOvU3GyfGUMZQBu
-AFcAnjwozC8q1jgvG9FrUhvIW5q9Gmcg
-=n7qK
+iQEcBAEBAgAGBQJO5EvwAAoJEEdUh39IaPFNIAkH/3XcYZ29EszQjqam92R6Rp5T
+9YA99mZ93irCf7p9mMlV0sp8XHkYGI9cgkMkU1ouclfnmPmsoFH+sMW2/Qy2dPDO
+Vof6f5rls/mgZPVTxMhsKVrmB8mmpvaQlAouAw/zqq4KZelYP55+LxQ5a0yGRsPA
+whGif2X19RqNoDfvBLow0HsOQJDUJJx5pWiCEaFoXCejsdHTKQ3WodborNFDxNrR
+H2zXkgOraBaV/ryEKh4FeU0Kk360Lmq4ZPfI00drb5TptWeYwN+/+bFZlZB5AndZ
+58yxW1dz0N2WOJGWFguhQOVEwpCQSP7i2Xs57XlZ2YgdaZEwyydEHOLF1QRIJW8=
+=Pdgk
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.7.4.0.ebuild b/media-gfx/imagemagick/imagemagick-6.7.4.0.ebuild
new file mode 100644
index 000000000000..d765eebce197
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.7.4.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.4.0.ebuild,v 1.1 2011/12/11 06:21:32 ssuominen Exp $
+
+EAPI=4
+inherit multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg tiff truetype video_cards_nvidia webp wmf X xml zlib"
+
+# libtool is required for loading plugins
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( app-text/ghostscript-gpl )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( media-libs/lcms:2 )
+	lqr? ( >=media-libs/liblqr-0.1.0 )
+	opencl? (
+		video_cards_nvidia? (
+			x11-drivers/nvidia-drivers
+			>=dev-util/nvidia-cuda-toolkit-3.1
+			)
+		)
+	openexr? ( media-libs/openexr )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.6-r6 )
+	png? ( media-libs/libpng:0 )
+	raw? ( media-gfx/ufraw )
+	svg? ( >=gnome-base/librsvg-2.9.0 )
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	webp? ( media-libs/libwebp )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-util/pkgconfig
+	>=sys-apps/sed-4
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="perl? ( userpriv )"
+
+DOCS=( AUTHORS.txt ChangeLog NEWS.txt README.txt )
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+	use q64 && depth=64
+
+	local opencl=disable
+	if use opencl && use video_cards_nvidia; then
+		opencl=enable
+	fi
+
+	local openmp=disable
+	if use openmp && tc-has-openmp; then
+		openmp=enable
+	fi
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		--${opencl}-opencl \
+		--with-threads \
+		--without-included-ltdl \
+		--with-ltdl-include="${EPREFIX}/usr/include" \
+		--with-ltdl-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-modules \
+		--with-quantum-depth=${depth} \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with perl) \
+		--with-perl-options='INSTALLDIRS=vendor' \
+		--with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with autotrace) \
+		$(use_with gs dps) \
+		$(use_with djvu) \
+		--with-dejavu-font-dir="${EPREFIX}/usr/share/fonts/dejavu" \
+		$(use_with fftw) \
+		$(use_with fpx) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k jp2) \
+		--without-lcms \
+		$(use_with lcms lcms2) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		$(use_with openexr) \
+		$(use_with pango) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with webp) \
+		$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		--${openmp}-openmp
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P}; then
+		emake -j1 check
+	else
+		ewarn "Skipping tests because installed version doesn't match."
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 27903001f29f..d4a1a608002f 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -1,42 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <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
-		</flag> 
-		<flag name='fpx'>
-			enable <pkg>media-libs/libfpx</pkg> support
-		</flag>
-		<flag name='gs'>
-			enable ghostscript support
-		</flag>
-		<flag name='hdri'>
-			enable High Dynamic Range Images formats
-		</flag>
-		<flag name='lqr'>
-			enable experimental liquid rescale support
-		</flag>
-		<flag name='opencl'>
-			Enable OpenCL support
-		</flag>
-		<flag name='q32'>
-			set quantum depth to 32
-		</flag>
-		<flag name='q64'>
-			set quantum depth to 64
-		</flag>
-		<flag name='q8'>
-			set quantum depth to 8
-		</flag>
-		<flag name='webp'>
-			enable webp image format support
-		</flag>
-	</use>
+  <herd>graphics</herd>
+  <use>
+    <flag name='autotrace'>Use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector graphics</flag>
+    <flag name='corefonts'>Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag> 
+    <flag name='fpx'>Enable <pkg>media-libs/libfpx</pkg> support</flag>
+    <flag name='gs'>Enable ghostscript support</flag>
+    <flag name='hdri'>enable High Dynamic Range Images formats</flag>
+    <flag name='lqr'>Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
+    <flag name='opencl'>Enable OpenCL support</flag>
+    <flag name='pango'>Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
+    <flag name='q32'>Set quantum depth value to 32</flag>
+    <flag name='q64'>Set quantum depth value to 64</flag>
+    <flag name='q8'>Set quantum depth value to 8</flag>
+    <flag name='webp'>Enable webp image format support using <pkg>media-libs/libwebp</pkg></flag>
+  </use>
 </pkgmetadata>