media-gfx/imagemagick: Bump to versions 6.9.4.6 and 7.0.1.8

Removed old.

Package-Manager: portage-2.2.28
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 66b498be910c..b24e283b8d2f 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -5,4 +5,5 @@ DIST ImageMagick-6.9.3-10.tar.xz 8784108 SHA256 e33f021c879f31703f9e620f578ccf7d
 DIST ImageMagick-6.9.4-1.tar.xz 8789688 SHA256 2ea0fef839cd5d6f134502b7cf7ee0e57a3f230b19771515d4aa44354f4c6b3b SHA512 0ba9027ffa246627b3af35460e1dfeabc6cdfe867fb21f7d1d8f334fc42dc640383e31a65c4cff19ba496be1d2878924d25b9803d7da62bfeac8c078754bad8c WHIRLPOOL cb84efad5536db8b1fe4fe9b6a41af447d9dbc80b62c142834fab4d0ed7694039f106b3f4a8d698af85ad7f9c863899ea999cc0a2bb926c6051a416f1044c443
 DIST ImageMagick-6.9.4-4.tar.xz 8778596 SHA256 17f4ba8fa894f58cd9a489a5f297fcc714831ac5e6c6c69c4f656b55c1b5b600 SHA512 443bbb68d99ae76cc025cc632578ac04ff7166ae82b01ba7e7dcff3804f926fd69ef42549141248c955e487b4383a48bb880a13217a744180fc51f4395e6e3e0 WHIRLPOOL 2ff4b15f74af6b0e49b6627e75b044c62793194577aba9f97840b081e2aea3cf16cbfe5dc3264450bdc77d1ef33eb26f8ca8727cfe3bb0b99fede754d92240e0
 DIST ImageMagick-6.9.4-5.tar.xz 8784244 SHA256 39a65b8e2371db36cb63709dea0b15f08a6870f8ce6103432f068112d9513c5a SHA512 d8e3f4dc790b3c6f557d52fe99294986df6a5588597ae9141eb2bb02ea29d0b0e5f1a79f8434bb5cd5064358256ff8752a5fcc1e6ea9f9d376fec6007c3dfab9 WHIRLPOOL 61cf2b76b930ef0cd047f84079b071f4898e618e23ae47c8d3402c0b2b1e99a34973adfb210b701f487506fd179342aa14d94dac67a266cc5df138d98a473265
-DIST ImageMagick-7.0.1-7.tar.xz 8291640 SHA256 2999223a1e7b26bc81d08e73c819eae6fa13a4d9e4e1294891cca52ce38119b1 SHA512 b61783a9b4fae2f328d8a5e728da265727fbc867d1178bb9433f6b2e9da7590ca6ab1c4958e5ef51a44b567ed6cbadee194507ebc28cef9ce1e6ce1ad33df6ef WHIRLPOOL 094b1c362201c2e91abc35a4e7c3fd347d6d8495362c9c683d27c39a8494d5b2ad1d1ba71996c75906b59edfe353edc7b9fe9df6150d7d4528c345913c9431fd
+DIST ImageMagick-6.9.4-6.tar.xz 8785300 SHA256 c028642af5f4cbae864b4afd6ea96878191be64103ca9c7cc67612ec3cbb9dec SHA512 2984533e6b5c3e09d2e270c27ce9c3316499e622ed0b657e17baede5e380778d496626e3f47a32572a8c9a3a4b5257004ecf51b66ada762375516fbdffd0707d WHIRLPOOL 2ecb83b7f6790db17632eae822de64bd05b7bcb6839eb686e34f95c31ebeddc2023960005cf6d956d2692d79733b7f15e7a6355a0af2d98546f7c3e04c16b626
+DIST ImageMagick-7.0.1-8.tar.xz 8282352 SHA256 d6d3a60df2d1defcf55cd4bb12239acaec9d9e3e1fc060002c689326269cec7b SHA512 81e8d3ae45a17856bede7d87762511206d8bdb18597b7ef820f72c69411c00a8acb2591148e78254b968a4b135cc696f07502eeff3bc61cc007d627740c5140e WHIRLPOOL 9b3b97875e54516128dc153d71e3f9faecdf8ff0b9ce98e532d04bb94b953c9f4620aa548fbb2e8764ee8db405fe1a793256982539dcd226e895250731cf941d
diff --git a/media-gfx/imagemagick/imagemagick-7.0.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.4.6.ebuild
index 47260e1ab822..47260e1ab822 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.1.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.4.6.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.1.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.1.8.ebuild
new file mode 100644
index 000000000000..47260e1ab822
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.1.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
+}