Version bump.

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

3 files changed, 157 insertions, 9 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 46b4be0dd837..04d6e13ab4be 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.454 2012/01/23 22:54:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.455 2012/01/28 03:26:47 ssuominen Exp $
+
+*imagemagick-6.7.4.10 (28 Jan 2012)
+
+  28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.7.4.10.ebuild:
+  Version bump.
 
   23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   -imagemagick-6.7.4.0.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ecf1c41154ce..1a80a50ea530 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA1
 
 DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7b1edd43 SHA1 6570b9f994ae58e047d3a3ad84b1bfdf2e749159 SHA256 1b26dff61f46cdbb13fe57acdba9583dc9c47e303826bddea9276a0d3a666b47
+DIST ImageMagick-6.7.4-10.tar.xz 7548912 RMD160 443acda654a1c50cea4c94073506ccd270b6be1a SHA1 4aa576cbbe65866e68c974cf585867e3f0940e41 SHA256 4ae0e62777983e6464ff96108cfe9c893e667d526b1b177796c2e2883c3feb15
 DIST ImageMagick-6.7.4-8.tar.xz 7551180 RMD160 2bb25014e3c35f05af5796b9e2e0558582dfb1ac SHA1 71028edada3ac1f9e3f7b34082809cf7daf270b6 SHA256 796dd615cf372bd08b74cc96b0c0036a57c63f5cccbe6233073ccd2fc109dfd4
 EBUILD imagemagick-6.7.1.0.ebuild 4167 RMD160 d0ad4695afd96f80ddfbf7c3f5348ec0cf06e09d SHA1 71ab2a670bb0e586840e6c39bfa677edd1b6ddf8 SHA256 358c30c7aa2e737c7b9bb536442c1f5f9231cc77e5bbede18e0f61316fd7beb9
+EBUILD imagemagick-6.7.4.10.ebuild 4062 RMD160 ded536c361ce137161565c9f09f6cdcbc3292a71 SHA1 654eeb134c3037546b417ca88ac731f9a1b54d5b SHA256 b589e7ddfb5bb0ea74204227877a8230e1dd7d60e1569d3a31d57d6c225f8434
 EBUILD imagemagick-6.7.4.8.ebuild 4143 RMD160 26798667433d960993e5b9aeb1bc4cf87944fbb6 SHA1 18e6ad77a70211a4e1de9b3db5a0543eea8ab88d SHA256 928659f933b3dc4841cd406d7e9d3c72a0f9f27aa560bc3d9bc663452494698f
-MISC ChangeLog 67336 RMD160 66596f35f05794238d84aed5dc83e0d59c46233a SHA1 6ecd74bf0bb15160d6e9f0d71249cafe444f9982 SHA256 251bdf04f0df5b3eecb1123fc41ee5ad23bc0df5dbe533cc676a4f24fa205160
+MISC ChangeLog 67476 RMD160 f15e61b7ec80f3190d4bff177459543560b4e61f SHA1 448fc4eb6162399c1061dc88d2f9a9246b5849c8 SHA256 f512ecf3d11b982aa6970908bdc73eea923854ca1549024703f7b2cd3c2169a1
 MISC metadata.xml 1104 RMD160 a1e2500c6057d9aaac9424ec72dc099da042e1ee SHA1 4ad8f34e03f649808dfa3999d60497c56722cee8 SHA256 d6840b362278ffdced22382075ebd20652f1b82470b6b9cbd035c4fc9ece60d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPHeSqAAoJEEdUh39IaPFNJVUH/0n6tER9eBh+EUx6f7gXmv1j
-fH6jTOoj1O1gHWfMGLlbSo/GlScZ9XyXp9NiOi13tpdfNkZ+Nl+yM7c+i+B2CNw3
-tU0Rk2hkC4wftOzwiudu36gB8jnh03FkqdBocN9fR4zK30NY8I0g3z2m7pX4XZPt
-C3isNHWJG+frqHoHucqYSHYy/VncgoDUkchrH3FWzjbuJWqhcfDAn+aDNYbyZI9R
-cPwEHKldZJY9v2/wD/QEwPxQASxC4hvktgsFO6bNF5ZUMJ6q6FW4QcEUUmOmQVUj
-TCBLn7LSSNMCdOBSdvhY8X4ypktUbgijfLFWNBdmHsZ6url+fppmYCdHl/9RNWY=
-=8Gy3
+iQEcBAEBAgAGBQJPI2pzAAoJEEdUh39IaPFN5f8IAJlAL0HfTD1pjgzQtgcP92td
+IAxvJohlqFmL4y7l8A2M9B8P/8L9ig5DkVJeMQP6TqZkxdZZ9N9OIbVLIoN1nXTy
+XLrIW1MncpaFLKK2Bu3Ok4STTR1KoJPyY+rP65BwTlxoovaDdsIekrBNlsJVsou/
+hRKvwLi4YLLQN4trWEJO2C0HcWNq6RZwYXTvlowwjkLpRpdsVhZKsYv3gqHexlQY
++xCfIuxUFwRIZkBQH0fFhty6JeQ6zP5A0dCSEw+YGzaXUPPlCPsAwCP4eBa9uNjj
+0S28+b8OyWWqHqx7QpohEVbpNrn+ZAr6iGQx6r0xPfALPtbWb7vjjr4tyjP3kic=
+=BRU8
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.7.4.10.ebuild b/media-gfx/imagemagick/imagemagick-6.7.4.10.ebuild
new file mode 100644
index 000000000000..6e8b8a52f5b6
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.7.4.10.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 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.10.ebuild,v 1.1 2012/01/28 03:26:47 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 webp wmf X xml zlib"
+
+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? ( virtual/opencl )
+	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]
+	app-arch/xz-utils
+	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 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) \
+		$(use_enable 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() {
+	has_version media-gfx/imagemagick || emake -j1 check
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}