Version bump. Use virtual/opencl for USE="opencl" instead of any drivers.

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

4 files changed, 166 insertions, 14 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 28a37c64ac8e..93f1bfbd3ad2 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.452 2011/12/11 06:32:21 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.453 2012/01/23 22:54:00 ssuominen Exp $
+
+*imagemagick-6.7.4.8 (23 Jan 2012)
+
+  23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  imagemagick-6.7.1.0.ebuild, +imagemagick-6.7.4.8.ebuild:
+  Version bump. Use virtual/opencl for USE="opencl" instead of any drivers.
 
   11 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
   -imagemagick-6.6.5.6.ebuild, -imagemagick-6.7.3.0.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ffe6e700ed7a..bc1ce289ce34 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,18 +3,20 @@ Hash: SHA1
 
 DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7b1edd43 SHA1 6570b9f994ae58e047d3a3ad84b1bfdf2e749159 SHA256 1b26dff61f46cdbb13fe57acdba9583dc9c47e303826bddea9276a0d3a666b47
 DIST ImageMagick-6.7.4-0.tar.xz 7583560 RMD160 3f2f96844653e45ab53be62db8b6f3bfce729254 SHA1 f0310885972341b74670925b503ad8a8b05ad75d SHA256 7a23a77707efdac2686ca09ef4a1fb83f1f21385a6410a30a1c003180da37ca4
-EBUILD imagemagick-6.7.1.0.ebuild 4214 RMD160 6d4b96db0be65ca3bd14397f7d7c28f3a91b76fa SHA1 2b5b31635d00461e8dadc114905340fa35277869 SHA256 cc0b380d59379d5e8b06762f2d0842ff619419ae61fdc913e53a0116be825c53
+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.0.ebuild 4338 RMD160 0da0420fbf07611aa66c7694e2d067dd1fcfccf1 SHA1 9a6680407ee5e82ad88e28f60300d0e1cd724df4 SHA256 efdd347b100da4e2f625f6e37fbfa481f530160ee7ed7b2cf3a15fac16986a97
-MISC ChangeLog 67018 RMD160 b7f1691ee1fa4a690e7a1d4a44ae422a6df77862 SHA1 68d1fd5a3212fbf46a04623317ec2b671f461840 SHA256 8cdf181d9d1827c1b6e1fe1d89401f99faea1e4d8c6c7643e7eb77e800477fe2
+EBUILD imagemagick-6.7.4.8.ebuild 4143 RMD160 26798667433d960993e5b9aeb1bc4cf87944fbb6 SHA1 18e6ad77a70211a4e1de9b3db5a0543eea8ab88d SHA256 928659f933b3dc4841cd406d7e9d3c72a0f9f27aa560bc3d9bc663452494698f
+MISC ChangeLog 67244 RMD160 915059a010ea0310fe9ea5a8fe2d0a82e0cf94c7 SHA1 75881912fa1acd26da508edd579e7d446816cffd SHA256 030b4273e79fb195534d94ace6a36a113bdcb74f397abb090b198161277fcf72
 MISC metadata.xml 1104 RMD160 a1e2500c6057d9aaac9424ec72dc099da042e1ee SHA1 4ad8f34e03f649808dfa3999d60497c56722cee8 SHA256 d6840b362278ffdced22382075ebd20652f1b82470b6b9cbd035c4fc9ece60d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO5E56AAoJEEdUh39IaPFNstMH/0ZGZ7h6KvXBaC5bJFQWxFPU
-qiKMdFWxF1muwWfQpyuuCbsbDxNYe58fMZkHO5V2PpmCPwPeQITP6MqXuyWoKB7s
-bSa9EbqokQ9Csk7SIWTbZIhJVyuYSSAUJPv/s9jmp/CnrZ/D5ulOGGM07HDmKrGl
-tYhGTw/hWnhPuWjmMx11+9vArrEyQUc/XvY3eOU8tC2fD2Q/GakgvW6tuPcslN6T
-4jI7WRBbRO7RVFiFSSJuwQMs+GKlZyI5xY93I7K9yq4+TGDnnoYXhBCaOZsKLA6+
-NpvhC8I9bB4qLlmW1BGu9vBLy91jWYXX+q3F+UWTRj12HRllrAsiL8I2CeQu63c=
-=9Ro+
+iQEcBAEBAgAGBQJPHeR7AAoJEEdUh39IaPFNYrMIAITPILsUC9j5stn91DUYGQtd
+WkZBsM4+eptKdPUGuF6X928CKnFmeqo/rLXgPVYaWDuh+j5munvyBGUmA4yRWd4g
+x8IPc2ApWwrRRBwCytjlxjoXdH/80w5wnRpn6tLYjiveAwisXQA3LXMQOkzl5/eI
+LJ7In6Z3DX8OUulALTj1KQod7K/XHhLE/iKQpV1Lt67pRy6e0+FXGFlga6pI5wHF
+7gF1NHralwfcpRVEDqHqppdw9rNDuuYPM/5N5WbQcnozuiYYXoVDJ452xkqNAfjL
+JaMi102Ex4A0Mrm6wYrpNsGlhc6mPdkOhzWvJAdj6v+2BxQ6iP13gYJfhwg0PHs=
+=0ed1
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild b/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
index 9fbaf2d305f0..8ab2075b894e 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.0.ebuild,v 1.13 2011/12/11 06:31:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild,v 1.14 2012/01/23 22:54:00 ssuominen Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs versionator
@@ -31,7 +31,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	jpeg2k? ( media-libs/jasper )
 	lcms? ( media-libs/lcms:2 )
 	lqr? ( >=media-libs/liblqr-0.1.0 )
-	opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
+	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr )
 	perl? ( >=dev-lang/perl-5.8.6-r6 )
 	png? ( >=media-libs/libpng-1.4:0 )
diff --git a/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild b/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild
new file mode 100644
index 000000000000..a5e621955ecd
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild
@@ -0,0 +1,144 @@
+# 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.8.ebuild,v 1.1 2012/01/23 22:54:00 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() {
+	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 -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:=.*:='':" {} +
+}