media-gfx/imagemagick: Bump to versions 6.9.6.6 and 7.0.3.8. Removed old.

Package-Manager: portage-2.3.2

3 files changed, 180 insertions, 1 deletions

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 48f452c9f175..676ebe337fc7 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,4 +2,5 @@ DIST ImageMagick-6.9.5-10.tar.xz 8794440 SHA256 2805ab7945ca92251172335da992df80
 DIST ImageMagick-6.9.6-2.tar.xz 8784120 SHA256 39244823fe736626fb4ea22c4b6cb4cae30c6a27a38a02ecd774f0ce3c4d308d SHA512 7d639684474eb5da7fc85adba0977d81252eca92d671ce1d16863e4e66118b0231f9c926b1adf2623fb029b3663715217c60f97b852915c105b4ec92f5cb4df1 WHIRLPOOL ad735cddb6d5a53d989124abf98c39f29bb291b15b98b84f2691b9ab432a703ca2ee2ca479147809762d315babd519c5252a9c742c26385997d24c3ed5e57645
 DIST ImageMagick-6.9.6-4.tar.xz 8767920 SHA256 d523c2c45dc2ff55f1bc27aa0cfa6e00e6f80dc182e8d6c27fcac99461c462d7 SHA512 38e1c0ceced8facff6da22c35c87c2fd37519a2e19b1252dbff94430891e0c48bcccb591f3d8b3954264b5196e8bcc8d638b8f92c088541cb999efc9601ef8ab WHIRLPOOL 679d3c42e51cc561a06dbd37c0898736d45a59d8991836a559795939719700f0d70c5a13b383125129a1951dfde90eb567dbc121d1fb530ccbac94e68a73115c
 DIST ImageMagick-6.9.6-5.tar.xz 8762376 SHA256 8d0122ba93a3f16d09cadcd4228f996c0048f0a44d92113d3d61150faa78f40c SHA512 4cf8d24f78c9ab15e38bd71ca28357db885640bb65c8fe23eaddc18f217f796a159cf950036bb9e240ffc3a13729c66f99eab3b8adbc504ad110ef95cf0b385c WHIRLPOOL 5c9674605dcbffb6b083023efb5414557e887404f840e8ee3c5c25945d338f98a6dad0519192098b1b199ff8a4a303b3103884418fcd1099e7c8ce9929e9a8db
-DIST ImageMagick-7.0.3-7.tar.xz 8290176 SHA256 140b99f33a3326aed92132a7cd054ee962a6e2562064c68495640411aa4571d7 SHA512 ade84f576ddd48ee6fe99d25139b879ba38da18f2b0e868109dd04263636b398fbd10c88660cfec9ac75ae500ba4690373f445677aa39908cea6845f3fcb5ad4 WHIRLPOOL 9875b70a5154d07c3f277df88fd64e5c126e5685fdb722a14f1f335b3c085ea475e9cd39b4e5d3b1f37fda6f0edb472fc4551d8c69ca122b05a8077d5b54e611
+DIST ImageMagick-6.9.6-6.tar.xz 8787060 SHA256 9cd1fe001d3ecb68b7d053ede40950d411956d47afc5267acc3ca57a77070d0a SHA512 6721f9f7973d6931006314c6afa090209766432b2d14d4e37e3d11b1042797012c9fe41e469c169bbe6862cdfc4c832eac4f9a6f8c052e1c0d41e40a13c9d95e WHIRLPOOL 32b92606bf03e36e5ac09a2be9da2ddba6590093edd68aa320c6126f5406c0c82dfeaf80f31258109b2875d0c2af3ced3e27911e7df54c159c895caa6f3ff27f
+DIST ImageMagick-7.0.3-8.tar.xz 8292080 SHA256 dc128b281c255d71d754934408d278b3ca314253103ca2501cd0b8d5ec98db74 SHA512 c673c8d0ae044441b593bfc7a9cbdd7f5408bf725215742351c204a7611be3e0d857b7bc367a2b85e3497f4c91a4cc0e96fae346e2fa4efbc2a37c760b742ca7 WHIRLPOOL 9b5281764db6ba1c226d141a97e8fb11d556835fb998ef210e40323dbcb1a358aad83e397c61b05dc0335a007f25cd7d9250b8db173dc609a72ea544ac73f79b
diff --git a/media-gfx/imagemagick/imagemagick-7.0.3.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.6.6.ebuild
index 47260e1ab822..47260e1ab822 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.3.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.6.6.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.3.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.3.8.ebuild
new file mode 100644
index 000000000000..47260e1ab822
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.3.8.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
+}