Version bump.

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

3 files changed, 202 insertions, 2 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 96df92116fd4..228cf67f44c5 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.591 2015/07/04 13:24:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.592 2015/07/05 04:01:57 radhermit Exp $
+
+*imagemagick-6.9.1.7 (05 Jul 2015)
+
+  05 Jul 2015; Tim Harder <radhermit@gentoo.org> +imagemagick-6.9.1.7.ebuild:
+  Version bump.
 
 *imagemagick-6.9.1.4 (04 Jul 2015)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 5a0bec846612..2148cc34e82d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ImageMagick-6.9.0-3.tar.xz 7898568 SHA256 f00452ba2c05c2df9624c62d7adb49ecf17140edd6e5f355cceca051dab1fb38 SHA512 0ff1ac91fa4330544cf6ba9ac8bfd48fce5a0a702b4578e1dcd23989c52c2287e1d6291c231591457a87652a59d908bade148e4e94676a887293671dfec99a4c WHIRLPOOL 0ca86ecb04a18aee95aa2990b73f0f87a7c800b028c45c6af5a906bc0b2f9a380b2ac52bf825cfda8396b4c8dc9b1768be7b46000b9bee9b6f4aaa1bf7d7dea8
 DIST ImageMagick-6.9.1-4.tar.xz 7978216 SHA256 74973478058069ce44040ff76b61df713d70adcadfd207836cc0622cadf1e4bf SHA512 b3c8cc0882d3941053dd7052048f6839c268a2969637ba39067422dca9a2b0f442303d5ec647c6f1372723da5b59c30ee014902ad338d2157b75b8741526c698 WHIRLPOOL 0b3473bcfa43ae4fca0c084ea5bdff8c533e138f58ba782d79dd22d46e55a82b4cd8565fe0be5928a148eb969507e7d4b05764a8db08d8f5e862f00952772792
+DIST ImageMagick-6.9.1-7.tar.xz 8284892 SHA256 b610e5261c01664e19c91e513e21b3c2d76d583b497ee3c7cf2f20876d742328 SHA512 6eeef09b0e0297347e95c25c94305439e32e3e95a6f1c2e476a84911e8ca036c52634693a63cd28832c5dd0df14ca0c3ff41bad577f07bfe86c4085576350434 WHIRLPOOL 1751ac644916389292c306998df1c1d635d8acbaac23666a18b216b1b9867be39e7c1300a0f5d465ea3f3990af2dfac77efd8f23efca3f6f18e0beca439ceee5
 EBUILD imagemagick-6.9.0.3.ebuild 5143 SHA256 1fb20671ee6d05d11b90dd25642b14ad3b40a7377e55ea2e0aba63318c1f2693 SHA512 5df7ff759bd6b17290205787d48c39a9ff56cb4dff65d8cff6deb98b882ab5703fcde28075ef5ade61e17245aff217b2cd4f89ca46e7af9d5e839903936b31a3 WHIRLPOOL 0d373cdaf1e71aa7df1c622eb3ef9e13ab13c4d4354e63c89d8925fdff2122d89b92e966f1d10379a4171c292f840ae69580c1740b0304387ab0fb3c6b287d80
 EBUILD imagemagick-6.9.1.4.ebuild 5153 SHA256 6047b21bffd70ec66da9a19000413e6637cadc2c9e515aa58830c2ad0cec976f SHA512 533c77a0aa13417070bf09514c7933ab8c88177ee348e33c25b72d261a49a8b26e722c61dd9238ed49023e0dc1e5ae167cae7c5bcdf8af5adf02c02cc8543d65 WHIRLPOOL 7a5a99834f0b48887aeffade35fa4de810e67edbf3855598f927c3b0ccdd83d12c8ec66f4d5bc84a1921814f02f36bfb0a508efddbb1401392153707523f2a36
-MISC ChangeLog 87231 SHA256 842740b71a7cc09fd4b4c923817d2b41b8dd590f102810c9de7abe2d96806aab SHA512 ad1df6396f6861e3c4a5967eb67fdd93dde6cbe3598bf1e62706b5897844724cc1c39ddfae474a93e8a9f1cebfcba10cb0204fcfa2f74d976e768615d7c03281 WHIRLPOOL 79cafa72a3b7fb1f640c2c0909909f7a4f32c73f1e2bc0751d5ce6b576f9379b56c3edd74c526be41f07f724c86e64efa058ec6cc63e210b8b080677024f7716
+EBUILD imagemagick-6.9.1.7.ebuild 5132 SHA256 e10316b52b5bcb547880271a94987600d7f37b37a5d5c3dd0d9fb11d0cfd8ad8 SHA512 a8a6ce246a143bb847bffd7de1339d35fe170f5257864c9b666e0e1d60c31648871a534f7d2df5935c10502f71f5d06fe2d7bc71f2500d74589f065b38cce4a0 WHIRLPOOL c0e1953a71acbbb789f6b3b83b3a639a7e788832914c73d47221ec1a25d78bccb33281def87e2d10b12c6fcb940978f9b8b904f900ba2ca4f56a7f6dbb054c09
+MISC ChangeLog 87366 SHA256 614a198b9b42336c5d4b5c60fa8e200a0f820dfa8e1f11ab7ff65e515a9fd1bf SHA512 f8e3d663e2095bebc7d1b4bf2b70f29187dc21118a31c4ddf55032b2c571ffcec6b9746bd1d5ad1e42b86b8d8e58f54eb6686d4980186638fd18287075a46bd8 WHIRLPOOL 4d55cb9945f1d288a73fd9c39ae19d02bebd44b97dc9827b3812e4ce006d0ce9ebf9fa61492b49022b0a93439323a41135397b0133bcf25a74feddd95f40ecf0
 MISC metadata.xml 1049 SHA256 aa6c00be430056ff297b25bbb9ee0c64baa60d7d039e860e01b4cd7148f65fb5 SHA512 97a8a8ebdb3366cd81036185ac2e81ab5df22bb5dfd8f106c1361276e91c9069ae6dafee74b3fe08e6afc5ce5e65c8b10fe431f4294dd4fb3e32d66e0d2c8f44 WHIRLPOOL e45a43998a456485e1e236737b60ca25ed28f01848d771b4eaff586dc594c85838e7d5155b875dbf31766f2927fc6f9d651e8ccb91ac8cb3c522d4a388b44beb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVmKw4AAoJEEqz6FtPBkyjIcgH/jOPcQUbk/IQkT6bGGm+XaHC
+O34uUaxiE+sxuoL6G1yW+HaPOWZ7xJ9yDcnV9BXGt1rjzzpIILKIXTls2ilOIc/f
+4vV/GRy9b+m1NMNJSpGt9RQfe/HQSR9KYB7FqmwFHhjx9VZwCehRr1BWMZXCNuJk
+h5rNlRWGMC+ZdgdbP4EDwypbARXx4Ejfv3/5unSvp4ZdKb+tF0bJDwAJEYKa2s1R
+XzmfJkjlVu/1+Jz3NNq7Y7g77Brf1JmJgnzTb517r6cnvB7r1MABUQR623tFnWCf
+PYLvFvYKUKsP0EX9EXvPknQV4Lef1Ex8B6YLhIWHH0T2T20yqzltF8xK2iLQ6zY=
+=wwo2
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild
new file mode 100644
index 000000000000..3898e4c3eef3
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild,v 1.1 2015/07/05 04:01:57 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) \
+		$(use_with lcms) \
+		$(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 \
+		--with-gcc-arch=no-automagic
+}
+
+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
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}