gentoo resync : 04.08.2018

5 files changed, 380 insertions, 4 deletions

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 123bd9f8a25a..91bc1c84cd29 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,6 +3,7 @@ DIST ImageMagick-6.9.10-3.tar.xz 8922536 BLAKE2B 36936b28aac025bd948d9925707877b
 DIST ImageMagick-6.9.10-5.tar.xz 8921204 BLAKE2B b11c6dded5b42b797585e8253441fa6265de9f06241206b9ce29781df6c8896e9dd0ec967191ff28fcae445130d38e7e781728cbc27752b33b3422d971459952 SHA512 b6c068918a2c23bc86d84a1fd81bd8c0aea83fee0c33b5c686c7c6180231be2b27c1c43be111555017d2065fa97ba36c084e1479ff771846b73d500d67c7f85b
 DIST ImageMagick-6.9.10-6.tar.xz 8913200 BLAKE2B 7009454e8d1d3bb27ef143dd3d0810df1548ff66d36cb48d0a91aee11246e2c2c4908947b95058b8cd2a83a4d69318564e4881a45636dca666fdec95e418c26a SHA512 984acc4610c205ead3b32ae4c059470dc4361e48cee6d9314bd3f8beed6b88b4adc824d59f059ead840293afae5595bdc3161e57ac9b2d4d49b90d32df46e49a
 DIST ImageMagick-6.9.10-7.tar.xz 8916444 BLAKE2B 59211b1fe876226f53999706b7d992306f67687ab6170e3a1846e66806ef92b4eb2808eea8bcc69ffe7ad40bef36fcd4417124b784534d474647b413747dbb1e SHA512 3bda2478b79d9a35dd7b3dd1206d23e2b8ddb71a881e1d8f036fa3488d10245c11587ef7f8624febc758af65ce0d28d642d485deffc033e144f791977aac7beb
+DIST ImageMagick-6.9.10-8.tar.xz 8909952 BLAKE2B 0868759a5c6982c29d315bda69c1dec3b190fbea3757cf8e368b42976c9f35c4cd53610643e05e8872b0669768206559b2b726b494494f305b71dc2140d7d09c SHA512 63f131d4aa455e3f3a4a891359601d932aa6d43ff22fb9c6bed1a98a1a758da610db90cf951c131aaceabdbc8af0418d1a8e3752cabb39f95735ef18cd6745f2
 DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
 DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
 DIST ImageMagick-6.9.9-47.tar.xz 8918196 BLAKE2B f28948d5728cbd2b011091ded2c12b507d1939ae5f2e0872c098ea488a3668d5f15782de023a6775a60790feeabcbab3ae62917f5f160bbc5ec59b65527775d5 SHA512 7bf7ae7fc276c2857f546370851ef7aaf1704c1b5bbad1a739d964e8e48a4ece9d9274e154a5aaa18c24f31e60e03d2df661cca922a3fff780cbcddd86524cb5
@@ -13,10 +14,12 @@ DIST ImageMagick-7.0.8-3.tar.xz 8613672 BLAKE2B c3ad7bb2d0917d2551b7c8ae0d80a8ab
 DIST ImageMagick-7.0.8-5.tar.xz 8611448 BLAKE2B 7a4f38ec458d010644d88cda605355d5871952b055ba9e088fe164448e2a0332e44e1545fc5929df455298ee56be65b66846faae4738912314177be050c683b0 SHA512 d760e630fd82b7636a031728e1f078efb8bb962e60cdc912cdfad29d3e6f74c1b5047941e711db89aa847d2e7c8c6ed44f451fa8ccff431c20d92ef49ef1915d
 DIST ImageMagick-7.0.8-6.tar.xz 8636756 BLAKE2B de30cbf334e47232c4f2addc789342a96da72f13f1f88d0db08462cf8ad80487d78dfae51f23a63c83100f78a60beb79781c44cff1b25f084badbb009fedf965 SHA512 4d498d2b7e9345b71e08a541aeaa1ee0ee62c781e92638cdd38a9a830b8fa291afece032b731ee79e1142d26cf94817356f0492cef257039beac33f865e9f588
 DIST ImageMagick-7.0.8-7.tar.xz 8634788 BLAKE2B dbb5103f314d83b4318b2cfd6dcb5931e4c20c7a2c8b8f57c52b85ea8a46ca27733a4828203723f337acbc5fb4dc2ae446b789a6d2ca46ad8e2e0d0f7973fc29 SHA512 b1db005899b7c55c1794be1edfb0596989d8e4b4e521a1dadf28b837ba16b337587ac0a0a17c1c441a0085df56cfc3386d9f750fa83fd5ea8e3eb2d1398e58cd
+DIST ImageMagick-7.0.8-8.tar.xz 8639896 BLAKE2B 5971dbbee9726fab15e19e531bdbb50af710c67be84759030768958a33688b5492bb20758917c976dd9c08307031d041d5de7ae9a2326fecff6ba3a7dc226e84 SHA512 8cc18deb4c14feb71de2624637e1df708ddbcaebd543c03e177a1cfe6c2f63e09af7e787c730f11d3d0332659d2642e5076f6a83f3580f5c0afc8bdb9537733a
 EBUILD imagemagick-6.9.10.3.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237
-EBUILD imagemagick-6.9.10.5.ebuild 5188 BLAKE2B bf7f6f7df6145351bd98cd8cb790c87ae217a1372893fb6047c29f1b0fcd3df857a1d9766e3617862e69a377b3a34fba2dd4eb0f00c810b448d2651c361a070d SHA512 4782431e98f0b1243781a4c89f06954c8eac3c588c4dee5b8d302ff5daea57fa9eea69f404fe2d0db5dba4bc4daffbb2d01dbbfba45e630f432faf30fba05014
+EBUILD imagemagick-6.9.10.5.ebuild 5186 BLAKE2B b6a74aa80f1d156fdf2f44b4a6a9fb0896bb8ae7876e22f766724e36f23638c1a93cde03178b89f88421de9f3b902ca84552422bb76dfa82bfe4186389f847e3 SHA512 95535e041888bc88c766cc55c1c1b8ec9dead286a98c150e15b2e107e2b16100eafc040fd693b45477bbbf842b156fb3f135c850c949e6bc4e9ae2a82cba24c6
 EBUILD imagemagick-6.9.10.6.ebuild 5194 BLAKE2B ff0cb28f803d22d4ab9a01715668c4aa749edc8376d117910748cf22d5e492ca6ce2b6b4b5e5cc2a128797f2a812e21604fd4d2ca6a8a9d0129effd923feea94 SHA512 7f505cfb89213208d0fea6edff576dfcc495f0ef3c396baa076acf50359f2dd631d48242fb315a6ca3764e2460bb34ad9092d4d0b21306e62a3a75ff3a51afc5
 EBUILD imagemagick-6.9.10.7.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237
+EBUILD imagemagick-6.9.10.8.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237
 EBUILD imagemagick-6.9.9.31.ebuild 5120 BLAKE2B 0d046adad40ac52ebb6f091eae800054b7c22ebd425f6e64a7de68fd6f10ecd699c537a5284f39f496f02be1ecfc44252209599589a3c8686f81988a8e7adfbd SHA512 b45803b538b7d1c6e3d4c3abcd363354b561e01360eaf36cf587e61bae66bbc2543d754dbae8b782cff89aafec267538253f6e3af34211e146e152d1a688e140
 EBUILD imagemagick-6.9.9.40.ebuild 5121 BLAKE2B 686029e7c87384f8f6e06c0eb0ed3a348a48b0e52bddca4f4942cc105b2f1d280859031c9aa6ea9198c981373e74a9f9dd19e95e553e62b6e9d6f9c3d41b8265 SHA512 4c02b42d699833cc4ab7597d576d21d64f991bb947d9193992ce3100d0599fa0cd71306c93316521409b096bd813f3720a474283491dc3e937a8a68264b3b3e7
 EBUILD imagemagick-6.9.9.47.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
@@ -24,8 +27,9 @@ EBUILD imagemagick-7.0.7.19.ebuild 5126 BLAKE2B 944cdfc402eaf48aeeb4fc8fe7411233
 EBUILD imagemagick-7.0.7.28.ebuild 5127 BLAKE2B 8f974d1ca9caeafa2894d3210407f9f0455bd342c3c92505e595bb623ee1e729cecab7f4229f124a74e8ca6d25d942646b69af2c3f01ccf7fe617bdf167ab0c2 SHA512 4f87c1cf80d6e9fa77e2a7f5241e7958afc151c4d434b87f305e9a528ed1f238fe383f0276916b138ac11c769c3acfcefa5b4a420e16c2f0dcb41e66eaaecf34
 EBUILD imagemagick-7.0.7.35.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77
 EBUILD imagemagick-7.0.8.3.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a
-EBUILD imagemagick-7.0.8.5.ebuild 5194 BLAKE2B 74e2988ac0f2532015918b1b35df850ca9c14d22777d27b821f5cd0708b713533cf6c63e08dced17a65a96ba8ca4804fe8d218a3cae5d974bbcff6cca092e77d SHA512 677bc912f09293f5a3cc3c93998c155afb4dd9537d0e8523c03d00c5449f9844bbcd698020c1570e156186545368f45dfb0fa247bcf5579999700d93731c5ff2
+EBUILD imagemagick-7.0.8.5.ebuild 5192 BLAKE2B eb7eeb353817652e4727feec98b14f38d4a41fffa04c7c049b8ffa0464b3ebfd1bd32e4856b43c15c3bbf0f6b107acfb7d8844e701f11037eadfaaed0bf76147 SHA512 88d555134172c3994879bfae7ab94d9c941c54a409e5b2a2dd612181af7854a2b1ff12197d3e73a60db5b7d285d886cfe61d5cbd63d3d1fb35db5712ee134330
 EBUILD imagemagick-7.0.8.6.ebuild 5200 BLAKE2B c4b5732ddbfa435ffc44643f499da8babb26d52852595abcd2173f0929c4ac693c3a990bd00009a0bb388aa7b100d3e470975298d1fa7147a70ee360a5909dfb SHA512 3240cb6179cb5d08d462bbc700cf77bf5e1a0359b09495bc58c050889f9805cd068cbae24098e869372e2191ead596e2f35e4b645c698562a1cf0920fa0702ab
 EBUILD imagemagick-7.0.8.7.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a
+EBUILD imagemagick-7.0.8.8.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a
 EBUILD imagemagick-9999.ebuild 5297 BLAKE2B dd922782da40926064b6fdceb7cd0c9cb16f7187ac94ace7aee3c2581bc5d4bc86dd19d4eb9068083d93f401970f2a673af445c589b93ab0709735a67af18b79 SHA512 24762b7a8642ad54f88dabfdf5966b99e406977eafc486544720c466f1eac54e84ab7a496b81d8438e04ff0ad2bb943680c258a37a66cd28b8bd4677aadd7dee
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
index 737361b8f274..768f4c5cbe1d 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
@@ -13,7 +13,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild
new file mode 100644
index 000000000000..1d46b538e85c
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
+
+MY_P=ImageMagick-$(ver_rs 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	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-libs/libraw:= )
+	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-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local mesa_cards ati_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(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)
+		--without-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 raw)
+		$(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
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+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/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
index cbbf9e041918..95dea12510ff 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild
new file mode 100644
index 000000000000..49b5b2b7bbd7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
+
+MY_P=ImageMagick-$(ver_rs 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	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-libs/libraw:= )
+	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-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local ati_cards mesa_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(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)
+		--without-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 raw)
+		$(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
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+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/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}