media-gfx/imagemagick: Bump to versions 6.9.6.3 and 7.0.3.5. Removed old.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

3 files changed, 180 insertions, 1 deletions

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 3ad3d0305926..088e8a36e302 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,5 @@
 DIST ImageMagick-6.9.5-10.tar.xz 8794440 SHA256 2805ab7945ca92251172335da992df800bcc09fee993eeb4711b20c53efeb233 SHA512 7ee467cf8b1776300c12f135c7fea73afe888d4592c2008e76e578afa436efadccc62e7f2fd9d356aeb8559cc5ff9168ee477bab5474f7495a332756aba294bb WHIRLPOOL 3105e524182f81d1210fd3f56c3457259c04d3d95d5a5a118f0854dd5f5851e43c70256f915221a0c3dd772e344fc5d9e1d36c3d2b77fccde68d70f66471c299
 DIST ImageMagick-6.9.6-1.tar.xz 8785568 SHA256 cf9486439ca05e5e0e3738647f077d207c3812a4c5f3925240e0c042010bcc5b SHA512 b81b52a31d8d0af72495daa8b5c158a2f6f98c8e1014833858deeadf09e818cc50244dca8a0a21f9f86669d1033945bd2348e42b886c5da79b745ac837aa3fa2 WHIRLPOOL c507afc3016f06620526af5249c1c643f4b845e4a94a2cf5b5baa88949ad42183ebbb2d7f75aa803c297873aa8d45ec7ae47fe38ef05f5397ef936cfaa7c71f4
 DIST ImageMagick-6.9.6-2.tar.xz 8784120 SHA256 39244823fe736626fb4ea22c4b6cb4cae30c6a27a38a02ecd774f0ce3c4d308d SHA512 7d639684474eb5da7fc85adba0977d81252eca92d671ce1d16863e4e66118b0231f9c926b1adf2623fb029b3663715217c60f97b852915c105b4ec92f5cb4df1 WHIRLPOOL ad735cddb6d5a53d989124abf98c39f29bb291b15b98b84f2691b9ab432a703ca2ee2ca479147809762d315babd519c5252a9c742c26385997d24c3ed5e57645
-DIST ImageMagick-7.0.3-4.tar.xz 8291304 SHA256 86a1f04077de2b1486a93088030b010780067b25ab0284560435e2f458e247ca SHA512 b3934867fae86c9d6257aaab32fad6ad9cacd217bdffa6bb218966d8a9b739c463b43b4f704c323707dd04b70a673bed8df94163d822a222323c77125a6ebd61 WHIRLPOOL 2bba31c20450080bc9d164927200a294b208884108b0d6aa00f4c58d5fe4b92169c80e6c5952dea3d6495be4db8a95791753525765f69795640cfd1cefe18466
+DIST ImageMagick-6.9.6-3.tar.xz 8785472 SHA256 c34c16d345e2d158bf9c8cf486d0c559e6c9831c31a50f4bb4cb6cd8ea413656 SHA512 0ae0ab4e82761baef23c9ac4170f3556fe2e461a8f2055aae115a9d6a78f66077b774393f6f945d3d9695140f4999a58f15099f263caed413364cf12f9e3fb12 WHIRLPOOL 492c760c719beef1d0afc79f3ff1f51e96eaa09c536168f00f20657bf8ea4b7842ee477b0b3dc9a7324461991696839e642eb0c99afa2fb67ace68fd6b2cf184
+DIST ImageMagick-7.0.3-5.tar.xz 8284148 SHA256 fbf920be8ac523cf459d133c5694a284916fe8289fe26400a773ee7eaa9a27fb SHA512 f94331c06e4646f7afcb1283cb9c13fd5805228a6a59cf2b03fe889a33011fd72275233be897d1cf8db7483f382301f9f8564a6384b4ed2f02318c7b1bffe294 WHIRLPOOL d7bba1c0bdf09d9ef7171c2685a2c26a9dff81fb2b4ca9857f239c32f8a4784f298b3c77c3b53ed4e420efc1bb4b7bb34501d7f75a1ebf62963004004ed58392
diff --git a/media-gfx/imagemagick/imagemagick-7.0.3.4.ebuild b/media-gfx/imagemagick/imagemagick-6.9.6.3.ebuild
index 47260e1ab822..47260e1ab822 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.3.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.6.3.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.3.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.3.5.ebuild
new file mode 100644
index 000000000000..47260e1ab822
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.3.5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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 )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	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() {
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://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 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
+}