Version bump. Install sandbox.d file to prevent errors with USE="opencl" wrt #472766

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 183 insertions, 15 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index edd2f1d060d1..2cb1939d2a93 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.540 2014/03/24 14:29:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.541 2014/04/02 14:31:07 ssuominen Exp $
+
+*imagemagick-6.8.8.10 (02 Apr 2014)
+
+  02 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.8.8.10.ebuild:
+  Version bump. Install sandbox.d file to prevent errors with USE="opencl" wrt
+  #472766
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> imagemagick-6.8.8.5.ebuild:
   Stable for ppc64, wrt bug #500988
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 2eacc716bab2..4b1b4c53163e 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -5,30 +5,26 @@ AUX imagemagick-6.7.8.7-freetype.patch 1114 SHA256 fcdb9382eddab0ae73f1151782969
 AUX imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch 2317 SHA256 7e50934e70666b14956d90f2054f246eba36479d6def83ae4b378f8fefb0082a SHA512 83404ba9c240a8d911567beb894ebfc42887a06f06e91f0346adab6e8c1b1a50114819c0dd902452a1cad3c92dbbde50a1888fdc15e79367bb8f8a32fa477cd9 WHIRLPOOL 420bd8a9825220875cae3f692590d37935ddf44dafac48ab951b779add88b0ed1fdf0ad79b444f14a38ead4e8797c4929bede5fa0699bc02a052752b64b19865
 DIST ImageMagick-6.7.8-7.tar.xz 7830744 SHA256 593e09bec0e6def3f9d6d6b0f7970ddd37dd9420a1286ce27e3f4ba26b78f114 SHA512 76b30887a40e6c74006a0e17f848893901bf001d68b4bf4ab6f38bf3147bf8b1fffa7e0a3aca8acb46bd65c6489aee6f9c28606f43d46b00cf9be2b6a93290dc WHIRLPOOL 2b746348aa058e4c2ef1096c62254f7694d7cc32bb23ee36f8a6b9f8fbb4603a98c2d473d0656004d40923b124c9d882842fec700fbac4900eaba1a5a102164a
 DIST ImageMagick-6.8.6-8.tar.xz 7537236 SHA256 8ce81b1cbc6615bc634c9bdb539025957a299744323706c3d72c9a8bdc72ddbe SHA512 5ef4eda528afc1be24e9f157884f11def0f815b40c7a0df7917abed34e09806c63013504d8a79e6b246f9348e902f9ce0a803bb5f7009337a324befbb6bdaae1 WHIRLPOOL 2c88b5d6ca03440a1b890a32a119a3fe429e80a5021741b001188dbbfa902fcb7268c4d5369e36bbbbdad13adc835efcc0f69b3bcf65159eb20d485cfd64b136
+DIST ImageMagick-6.8.8-10.tar.xz 7530504 SHA256 f31c7771ed0b8050837289f0c7b55303172e31acc005b0ee0d120727e2572d33 SHA512 2f4a9c5297b025ac78332843b8cfa81ef498c038edff6f91cc80a1e762492a933892ab38c81671ba7f57453213d37addf98e875253c5c328162983c1d89c5825 WHIRLPOOL e2572ba553f6fcf0de9adcbbaa82ccdd5b6d748cac9f9d8c07e5eb940083fd9aba9ac8cba3a2efa11aa4db53705905019931d45b13b8587451f97eed01415ee0
 DIST ImageMagick-6.8.8-5.tar.xz 7446036 SHA256 8c30ef963e376a2b57528feda8fcea2ed76613a9825cf63f03a5a2c9e3093cd5 SHA512 99ac98c43efe9ed27a677fee4c39a83583f387aa0ce282480b210453b4a3eba576e1b4fe7ee055ba4d040d0e0a9d8d2c35ffc3acd910064877ffcbba7a0c2bd7 WHIRLPOOL 7da68835242f18235d2a7c09edeaa88d972f2eb337580ea48a0c1d40b9c08a80f7c4e68c2a4eccacf6bbaa1091bbe24663181fcc87abe4d1f36c164504e66997
 DIST ImageMagick-6.8.8-7.tar.xz 7448900 SHA256 ea5753a42329b0c251c753053b66078891a3733f929051f7e9190446f39ab2f4 SHA512 cc9c24750fb94d16149bae6bb3eaed68bf6f08dfaef8824f778fba54dd54daefd4759c02bf22ecf7fd51c8328c18ec10e1828845c297eb2c9d2dd9293bbc1e92 WHIRLPOOL 9ce3e398d73d73710f4efe0e01494b034e8db6cec5dea152688f3a9b77102bcbb5da59221813036d8a47bab8a80bad51fbf377fadfce7e1396a23f3945ec45b3
 DIST ImageMagick-6.8.8-8.tar.xz 7527740 SHA256 249f8679d03ed5ad50ce54653ad36c09c02df3450d9c7daa15a075ff8c2432ac SHA512 8f1383a8c2935a7e49395089ba7ed583532ce6c14925ae8a0f946f9153e754f19461aaa455c0552d022e70b3f2e81295dcfce423a159d88319125dfc2087faf1 WHIRLPOOL fbd5f8353dcc3f28e706ef540243406092d75346e961eb255b176a28a94bda0d12e126843eef60e4d0668263909711beaf7a17e41d9abed854a354d3adaf75df
 EBUILD imagemagick-6.7.8.7.ebuild 4262 SHA256 4999aaa5ca86a056bad155e48656256225c9dd4d918ecf17d41fdc563f6b8786 SHA512 635eeff5cc3ebf2277b30bd318630969ba017b5bbe9c50707473f1cd0de04ea6213b39d6b30f74654920c5ad637c4e8f33c8602a712d4edbce5d9d10f22fdba6 WHIRLPOOL 8ac9a2691c239605087eda39ed6b2d2c2a0ee08a477beec4eac7883ba4e6c92511026eba449d7e8db5d95bb626c1785ab33c13460a9f570e79ebd0df477652db
 EBUILD imagemagick-6.8.6.8.ebuild 4346 SHA256 5741890d4a1f48280481b5db16d87badfd528528cbaa902541a4317a7b0b79a8 SHA512 24031845c6c77af2966cb8161a9e3f541885f391f7c5275812eff6b0914cc2ea592481d3a44b7e0a65c126ef497dd9ba729fd88b1aff91e0111da38558b1dc54 WHIRLPOOL b35d517317e9d59a71093714e82b76dbdc8c6bbfee0a3c567079acd34f0747da672be46fc196dcceb08c905845e95ca7b1bfdd33e9f6a48f9c3fbfb3a31d4941
+EBUILD imagemagick-6.8.8.10.ebuild 4653 SHA256 0614804ba30d7d33ab13f688eae44cb3275164e06ed5d46cd4e57bcc3180bd48 SHA512 61229f0ed610146ab6423ec2c4775a0363f01bc7c013f14fe10572453b200a48689107a1f867a3086f9ca30e36e8e7a2af416222bc013f3afc14655eb178405a WHIRLPOOL 85b9536ae701a3d6b3ac28a852c014aca9120253d21024435155673b185968c346f863b24dfc09a4b8adf82f8d432b75e148937ed5d4e4520da9a691a8afe2bf
 EBUILD imagemagick-6.8.8.5.ebuild 4737 SHA256 969e9fef3f6bb70d4fc72bc444bf24b902f11fbee8fa01dd1bf0fae38bb3d02f SHA512 4d06252946d751eb98a70b5958b11d59ff546e6c833ce82cce89c32c0b65c1463a8e14e992596302823ca7f66090798da962b21f156bc4fb7708bf5b1f174abe WHIRLPOOL 1b4b21d161e87f78d6b5137b4835334dd5c6508aeaebd6facc9f579479b4e60a336f8a7efba239d76636bda10fc3ce47db66631ffc83c4cbda5cc4d0bf20b670
 EBUILD imagemagick-6.8.8.7.ebuild 4745 SHA256 193aa732f8750c991235170db1671a705ff0cd4795058ab71d2818e3296b81be SHA512 c3a59b87b64b02e65c04ad1f8decd3bdd6251960de556e21dc223cfe037aea2d1d901a672a4d9b033b44e7002a4e7073df09ef66ba204671992279b459f70a02 WHIRLPOOL c466917bb1534c07c00cbf9b082f355922ddad756bbbb74511194cfa14eac06f8ec7991ddccb651adefc8ad79a6ca15dc38f1b863fea4a80279b80c2b2ab642f
 EBUILD imagemagick-6.8.8.8.ebuild 4668 SHA256 06e632e2be19af118b0952ad3568616263d2f869783b7534ad554449c13f275b SHA512 142528973976efd05d9117b20ef0e4218912da862aded75819a46a32c661775a874e9e24eb29ec1e4f03cc849708c3f01c2b49e2d171082702d2630a5f1b7b75 WHIRLPOOL b3dd10b61922831532ad33228aaca51678b0b8902e23ab08bf02a942285097f3978d3c56a1ba2854d3382dce5f50cd1dd59b364a5efa79863f76a9c20dc86c85
-MISC ChangeLog 79476 SHA256 d3ac0df2237cf9966599c1a7157518e4b3761b8ec958aa3375bae2bc2efcdf5c SHA512 7a3c391bdc421960f5c1a1b06b02eeca9660b5340e3c2f8be6616ad7a7ba9dbdadda865b8b15b73e78c0627a669cac9bc8687e0cafcd8111257cbbb1bfc13cac WHIRLPOOL 72a084feaf855b6ee00c9f43ecef591aaac3a44194798f4af6faa5d0bcdfef7e5c27189a9e217bd0691012e25a66b66476953299632e4627f345e82574ddeefb
+MISC ChangeLog 79695 SHA256 5f183bf7c33610eb72d81bfa1e5c48c1b217807b3ac683b1477944454820e435 SHA512 7ecf9a23a2af8be968e5c39cd4abc6d6acc29741b03a010e76a6bd8169f3b125f75859fb4b8cdc555d55e618a2cf6b5c1a20b9c8f5fc93f685a853522b99f55a WHIRLPOOL aba82d1ae2f20361a757933ae1a38c0b131db22ea5cf321f1a90da640c5678e730e873f44ccc73e3936a3a72e40368783b297a4bfae48e664bdc610d78e0fb7b
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMEE0AAoJELp701BxlEWfF78P/RY2xZ18b2XWXrct3UCQc5ZR
-YSCiFJnVmvfARsv5t8FC/xWMLgLolfiFUp6rRN+NaZwH49Hm3cyi1KKiDUwzfkM5
-H9dHfS+Pou4oCSlJBkuTucc77Q+61OPguXTSjVytiRfdLZ0Dh61KhdyyKnGUCFb/
-UoOuntN9P5sHzg13mFn+l5OkVbJpElB2bd8z8ngHAWCVbJwZdwftCgkQ8VK1bGbx
-xMOuWAnKcrHvqwU8QIm3LsR+LZlc1/HgNKRdWgrXFWLSdKLHnDwPNznb5CDfhAfm
-0Z8HAkF2ywYYPlbgndN7MJ5tecMm4nisjYWOOy3IP6AvB+d5+NT+n+rkbNdA1cHf
-0wlbxI0paUjGpBOQ6lxgjRPbM9xiNMvR3EHryosdB+Gh4EdOdWPkeWuZExnQc6fc
-zVzeeHV6Pcy2ljqPLF4LjKyq+SuCZJ9oCsj1gOc5WPG60q4bGicOgcJ0htBEbp/8
-oKL0eNVtjWynMztNdrIky0sVMfftw5IBbMKaOFXXGGQGqjfYDTuYrK1C7Ryn8FRa
-XX+mkYtgtwChZjkRR+wC0ns6qRyAPKGKfbVWcHKftf72r0XzEGLke7wheKT8wa0q
-ZveG0lYe3RpGdQrWmNaykc5SYGtpmjQ+irtKY7CeBgzNHTRNz8M2zEPDtQVzkj57
-U1FgE2DmoDxfHNBd9iGH
-=HX6W
+iQEcBAEBCAAGBQJTPB3jAAoJEEdUh39IaPFNhjkIAI2NkInNq+kPYymK2biy0C/N
+8sWewFtLFxzTJDymPtKrRUiB45kV+Nv/sui/jpuaT/gazljL6jMjIlBgsnLYs2R9
+h3s9zEgug8dyut0vmMrfA79AUU1nZpjXdrzohQ1pgwb8ZWzZLJLUj1zudXEqGXFz
+cNlYa3II0951U371a6I47bHmUmtilmUoMIT9v7ydUsO38iC/uIM5F2zD3t/rPcUE
+3X7iAhA7gnjrRMLQG47UZe3yRgtakqWSGhq9OG1J2TISVHofvlfRIT6TowHEOP2v
+suQc1M3i6i3ZT9jU0RAfTWx2bzX0e5wk2quj6OFB41FKTIUnDR8WDozrKO71UjU=
+=cRMc
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild
new file mode 100644
index 000000000000..f38e7f77e503
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10.ebuild,v 1.1 2014/04/02 14:31:07 ssuominen Exp $
+
+EAPI=5
+inherit eutils flag-o-matic libtool 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/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-interix ~x86-solaris"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+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 )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2 )
+	lcms? ( media-libs/lcms:2 )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch
+
+	epatch_user
+
+	elibtoolize # for Darwin modules
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+	use q64 && depth=64
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		$(use_enable opencl) \
+		--with-threads \
+		--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/urw-fonts \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with autotrace) \
+		$(use_with postscript 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 postscript gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k openjp2) \
+		--without-lcms \
+		$(use_with lcms lcms2) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		--without-mupdf \
+		$(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 "${EPREFIX}"/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 testsuite because installed version doesn't match."
+	fi
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	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:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/dri/card"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+}