Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 190 insertions, 15 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 0f4859ef15c5..82eb5fca7e26 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # 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.576 2014/11/10 13:51:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.577 2014/12/14 17:06:00 radhermit Exp $
+
+*imagemagick-6.9.0.0 (14 Dec 2014)
+
+  14 Dec 2014; Tim Harder <radhermit@gentoo.org> +imagemagick-6.9.0.0.ebuild:
+  Version bump.
 
   10 Nov 2014; Agostino Sarubbo <ago@gentoo.org> imagemagick-6.8.9.9.ebuild:
   Stable for ppc64, wrt bug #527028
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 49f3411b6d6c..160821bc585d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -7,26 +7,22 @@ DIST ImageMagick-6.8.8-10.tar.xz 7530504 SHA256 f31c7771ed0b8050837289f0c7b55303
 DIST ImageMagick-6.8.9-7.tar.xz 7552828 SHA256 45670f37ebd3354d64e45df5462b929b5b843dee2b038b0ad524491492bffbf9 SHA512 e9be966b430d4aca1fe64435b68a5586c458ba8e238ba47d5d7046e90c2e807e6f7b476ede00c22ffb2dbdf9bb21762e121bba6e48062ebee2800612caf81eed WHIRLPOOL 7170e6dbfb9e6c990fc828f8f157ebd4f7cd25854dcd45834d9959fca63ee8add1775e072b534237580a5df49619cbbd0546e055692cdaf01dbf1c5e5965c62a
 DIST ImageMagick-6.8.9-8.tar.xz 7889188 SHA256 27360449c6f3d4cca548d1780ecd5f8313a57a0a83d6d953a5088cc81714e9b0 SHA512 e200dee8a11b2d7077eae7645f0f21e5deb628aa11ade0b75ebd3865867ca544c89ca1a745b4b78d5496c86d359a63e290a53f25d090872286704c8ecb6176c6 WHIRLPOOL 10fed3f3faa1b9359f2dd19cf57b1f9019ccbb759136fb73a2234fd796043025519e27bfa7d05b23b6e3f7ca0685e21e93685ed868547ff14ddeaead1aa6bdf1
 DIST ImageMagick-6.8.9-9.tar.xz 7891624 SHA256 a4cccc70179ff2c67550e063cdcb2e62907338ef3e68b45bb1c41931e515b3eb SHA512 c30067ae55e2905fdd23c70de83198b52937a5b87396b5b89d3324f19a77ac8f654f6bbeeb07d4dcef1b4d609e9f53e1d1dd70848aa1452b58a548a240f7a3a3 WHIRLPOOL 84430ea4551960afd0f6a85c6febf34fecb2fd60f89ed4e88d76562e65a47202b918d7419d4cd1925ccabd70d74dc949ee02d6955a3f77f2ccadecbfe0e9bdb6
+DIST ImageMagick-6.9.0-0.tar.xz 7893104 SHA256 12331c904c691cb128865fdc97e5f8a2654576f9b032e274b74dd7617aa1b9b6 SHA512 37f9d604d8998b780309a9083d4ee4a5bea4b6353ee3434717e52b1aeb95603ce0affecdd21292c62995cdcc048e62f1e20b422df35047ad549829fac4ef548b WHIRLPOOL 9b503d8849aaca3e277962a7a123d6e25e1e823ad58763ab9b4aa26110015c985fc50ad0dbe74cf9a94ca7f23fe5d0f15f22072d21db3a19fee831210bc4ce8c
 EBUILD imagemagick-6.8.8.10-r1.ebuild 5154 SHA256 9d06ffa746949cf3ecf02342d487219a85876614b4fa1bede4a2073a05087d22 SHA512 7ecad9d900e4a9ec49ed8bae95ceaacfba0867302f7ea55ab9c72847d9aba0670bffc71c3c1be6a74369e65ff52c3544e2997e1a722ebb454284cfd66a21e825 WHIRLPOOL ff915f0be184481a1d533de974ca708ff1c3ea5036690316f00755c0b2a3b8ec53fd63bf7b26769abceeb18484c5eedc0e2726f37618e8bb6b7958b5c4ccdc94
 EBUILD imagemagick-6.8.9.7.ebuild 4986 SHA256 709cb3c3678595db9e1dcde99fe61943381926910b03b6b154c9f4d45b14a8d2 SHA512 1b9340a5fa2b2702b48c33c853d8d01973f475a2016c6e6bf0eda61adba8cf6729b379600c642488efedcfc28b85560d4579f5a2c25a456f4dec798e4a9817ab WHIRLPOOL 7749b28c83f1ca922f3fc17b0351941a6d2966fe0af7e67e3cfab1689a079f2cec375b848de32aaf67a1ed7b8e1a32a7480e2162f951c024e489d6967b871e42
 EBUILD imagemagick-6.8.9.8.ebuild 4986 SHA256 a8aabc40905364cbd8f31f977c86ba985a6e3da302e25f26ffbcd807b460f2db SHA512 6dcf9621c84081cfa3190f140bbc406d059bc844003b164cc5df9073f755f98320b3a591e0fd36b64b943f3ed0229e346363e361b91af6f804c9b24221d9560c WHIRLPOOL a1bc05177af10f5c4e908ec3204951235e8d75dc9da25dfe23d62cd6696f266e282d9732fbf5ce312ac6cac4e0d79caf49874168bccafb5ac22dc7de7892431a
 EBUILD imagemagick-6.8.9.9.ebuild 5061 SHA256 986b56a9a3bd288137018d7615ef7d3c2daa5747258216c98c173ca8bbb6c489 SHA512 3c113336719b027ee1583d67f4ef908ab98e14c93aa9261e4164e201fca61ba7f58d3eb59a921206118268de712773e63232299a91873d3053c78bc6df3b0e98 WHIRLPOOL edeed303f92392a1786f6065bf1373b7bc3bae904fc34d495eb27393271988e0420b76a2e7a78660c908103f100294a206a8fd61b62b0084fd156e2dbe6de653
-MISC ChangeLog 85224 SHA256 1f49e5a431635681dcccca291f00f95c6ea194dcdb3c5882254307c55e15474f SHA512 7556704f5dd69fc50df43c1ec07455e1dd31e1e491d4f9658ec8a54405261cb801e4e25e891b3fa232acbaa523e59e62eab6e559b48f331b97f60580f18ea468 WHIRLPOOL fe3b53cf104a4aa24da68088d552abd80415e39fc0bacfd67a7d8e6cb277a09bb38269ab14c51fb2fd9d40a800b1cc587ee6569c659fb1098d014ae2f26f3eab
+EBUILD imagemagick-6.9.0.0.ebuild 5075 SHA256 62b605e7a6c2a28a668ab37520e7201281a6e491a2cb8a7a67dd6d5b9e0b7433 SHA512 c1abba39b6e83f122a219777aaab5e04af5c12f2867b6a7f873673f49e4caa28bb8a751c6ffdffb6c1ad2d3cf89ef916b43bf7c9147b0c012e34fd73c67ebeeb WHIRLPOOL bf06d7983274c8c43dbcf4f84037b8e13737d1abf8bbea15f226b152b35d4a5c21d3d06816989ba376c21086e1b522e529d5a50ed64b58296b08d51de9b48dfd
+MISC ChangeLog 85361 SHA256 c6b6f52f8d312b369a3d87c9bd81ad73b918719a90f06193be95ba4e15b805ed SHA512 0f71787dcfff1fd06123506bfa3bfe3431ac9ab0ca28a572a2c0308cf989c768337a8ddbd770db9e97f760b072279af80d15124cf51c3ae6ff7379547cab6926 WHIRLPOOL f2b3191dedcd03fa017102b2d7efc03b36d4a71a38fc2155a8b7a4e417d656338acec6ef9af38134ac830f3a4e35844ec173a6c3e50ca0f77a38f2e01a9c2b4c
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUYML7AAoJELp701BxlEWfNa4QAJKqTp+iLXCYT3iBxlH6827V
-NBk6fcw+CS459Lct/u9YzhBi7jiZhtBq+Qyv2NouwRZqLZM1CybOA7h/yck1Zj0C
-npu/NN4KmaTf4RspLq83W63T7UzUNqqU8zG/79KTneRyjPT7InyJv6YLKrW6d/gv
-1w4W39tYxaK0ZIMSD0tJA4jliR0h8bwbs2MU7DuymbHY9kTHLTfm3X730WGqF2el
-+Ex97YhMmiprdyeg623uePRtnfvw39NpHdoIljYBxrB+zHUIx32gMOLnevsMJuUA
-JiLkvOOCczWQCnlTjPDoTF/EaKuYLsuFjH85ZWxiThOXcorbPGAHdnfcr2mJfeG5
-Jwq1tqtZJjts9TGV4J2jLnlY+OXnAfmZttJg86ANkL4af1y+ePTcGrMnpps8VrIF
-7EoXOMp2pbVVxNLUOanrAewCUGf1wxysFewv7lR3e4It3gAjYHgDNTiKQcuEgoga
-xRAgcKBUg1+jLvB/oMp+NtZhnlW7zMeATd1pEacWbOGCDb1IzHOkww6deCZt8Kw0
-AOTgDsTShS2/9W6ulO4vyoR0yVjTmOrGs3LdSxlTZAIiZZImFrRXSKjTRzvI4REj
-LqxSfbh0sgcZfMJhdgwO4YAmgpxLNkR5MwrySgeSwhjhvAhd53OKD6oyGyITtM6w
-8H0mlkRS2WWiE5WwEH2L
-=xqUh
+iQEcBAEBCAAGBQJUjcOFAAoJEEqz6FtPBkyji90H/jYeV5YMZjRMcHGYF5L/qPNv
+Z0A/2F4wJw65Y8U67o17kFVXybyfEM6lSmwK0Jdw0EBbyu+vx5Kxa5ocZSSFacmv
+Z1iuKhF+aJC87puo9fdDr3Cyk5fLMHttpUccvw4XSuZj9jPgOIUbliqiI2cBScNp
+V6yl4IutVOkvcPIFgAAtN+soRooXkVAfYGUaHtV0g6wXeo7EDnwxTzVEC4Bu7zCx
+Ble8tTqBPHAOn8/kxGrjyFGS+grG1oYVLzQ+f3VmywkduKPFHzLgxTJp3DXpK80D
+ORYxQnORKBglPN9HeUMbQmg+bEuZJJbQHUXhimBB2PavsNg9WK/4N+GJ2AisoNc=
+=29Aa
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.9.0.0.ebuild b/media-gfx/imagemagick/imagemagick-6.9.0.0.ebuild
new file mode 100644
index 000000000000..1ecc54d5ec80
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.0.0.ebuild
@@ -0,0 +1,174 @@
+# 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.9.0.0.ebuild,v 1.1 2014/12/14 17:06:00 radhermit 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 ~ppc-aix ~amd64-fbsd ~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 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 )"
+
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	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-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0: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_user
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see http://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+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
+
+	CONFIG_SHELL=$(type -P bash) \
+	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) \
+		$(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() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake -j1 check
+}
+
+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/nvidiactl:/dev/ati/card:/dev/dri/card"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+}