gentoo resync : 04.08.2018

23 files changed, 690 insertions, 149 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e7e992d6f0f4..cf42e560c390 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 1cfb4ea76ead..43324dd62cb1 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,6 +1,8 @@
 AUX argyllcms-1.8.0-gcc5.patch 530 BLAKE2B cc0e43a6c00b37732f8c8e6abd62479dbadad76877b709eb6956e733c9be4bcf4e93b72f0780aea27a3d1adb610e00da9a750f5fa6747b12e38fb378d0a3d874 SHA512 1b9b49e704f2c0e00398cdbe6be3fa7bc17858ed69374cd255bb3a4925bab84d401edbaaaefabfa8286ad7361c8e0afef27b7e41e115644f1430c5ec78a28a9a
 DIST Argyll_V1.9.2_src.zip 13624924 BLAKE2B 7035a1cd43b320acd3ccb6eeee46681e39f723a0d96c1ce0d880f3084e8c8a0201182c50cc3c4d9977937a846fb119ce0002810697d81c9301f7082fe8a524bd SHA512 f21fc2385b643dd6c32d1b1b0ab208a79ad8bc4319ac644d96e69ebc4c4e333d38b41e4516742816da9a91145e4f00bffb7f8b61a827859d5e14c1a8867b5a41
 DIST Argyll_V2.0.0_src.zip 13588152 BLAKE2B a299d7b4b2c76ac22c6761b4e25b4ee5751bd0771fb3d4c58dcb722aec1b413ab07fef35263e2dcb311d893bb16105072a83dd640720efbf160a59369fc88768 SHA512 44e9a2307bc39a8e455c15b2f4126de652a9ecd43bec94a841cb3da56896effcb023740d7e6b8991d109766c83426eee4b131a6c56cda5ff28b22a06ea470b5d
+DIST Argyll_V2.0.1_src.zip 13606682 BLAKE2B 156c94d538a868a90e59a009999ed35536ab84e27434c071613540c4afac1c7374f77eca73a38ca87220a0f1cff7213286312cb681d50a7e7e14b946788b8e0b SHA512 d0755d1837fa000278f390d9d101c1e9de3f2e294583c8b67b37f74f0ca6190917bfddd5ce50a39a274aefeeca304aaebdfd11db391521e222da2368a2881c0e
 EBUILD argyllcms-1.9.2.ebuild 2091 BLAKE2B fcd58b111e342dbbb5036704767e94f3006eb3930bcfadfecd4df678d28ee461fedd04b38dec6f0447fe5821edade9fbc5a326f11d88c4f7c1e129c1db3bbfaf SHA512 965976aa88fea6cf5455a778e0e36559db03e7a073d05d65f1fe5305b5d9ac86652da77ed2085d38a5d025349ead3248e5e041aeabbec4446aef348b5339b950
 EBUILD argyllcms-2.0.0.ebuild 2042 BLAKE2B 2d8c8f9bdaffd551fd69ccd2ba9d7ec26055fc1b52dfd367d32da5a71629e4c50bcb529a1635ceb5dd397cdad8cfdf9fc1c28b5cc6d19206e1e7b0111af45d20 SHA512 e41a6c9053b2bd8a3814a89875d714a4af8d00143277aa120d509ed2d24a3a4f31b10559bfa92141abd0b5131ed5344932e198350959221b48faaadf5f5d86a9
+EBUILD argyllcms-2.0.1.ebuild 2042 BLAKE2B f9560bb31b6f74a37bb7fbe3927ffe8d7435a8057f109f976e9fe8dd433703393a7ca5ffdb086e287ace418093a01ba89d720a6e90aea68819d9d485a0031b4a SHA512 825b1047f6a2c8b49e175442b1cd6f85831527d852ddddee12f0e8bdf119a3234afd672c19b96583f8c18f06e70bbfe19feef9a04ff81eef9398c9261a3d31e7
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.0.1.ebuild b/media-gfx/argyllcms/argyllcms-2.0.1.ebuild
new file mode 100644
index 000000000000..6b881b095c21
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.0.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+IUSE="doc"
+
+RDEPEND="
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-libs/libXScrnSaver"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+	if use doc;  then
+		docinto html
+		dodoc doc/*html doc/*jpg doc/*gif
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index b78ab24aaf96..8c6a2188e97c 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,7 +1,5 @@
-DIST DisplayCAL-3.5.1.0.tar.gz 10378539 BLAKE2B b10e3f70401b9167728c4fc9b59bf66da7e3a09040fdf0800e9697aa9bc328d7d70e4018d14856fbde1a20028ef3aec2922727282050c291ed5a8c83209178e3 SHA512 7dd0c67c8766478223f1e36a36d386b0e8d284001642e34fd1aa27e196fc36be1fd98340f4af202c4b171aa44da9f9d20a53f8dda11ba5e270a1071351fc7a6a
-DIST DisplayCAL-3.5.2.0.tar.gz 10341417 BLAKE2B 218d73756c57107b17a475101a8969af4213ce0417669b5d18f009320cab970da125ddae68a3288f61f05be99f3e2a621a727c2cf6b4aeae43252c8d257ed3af SHA512 607a63c94fbebf916009327bf473c45e6e785e5dfa57bd0b5868616a57b7af1aa3173a43cd7e371b43a8078ad350ff27178c6c13b46a3e67e28a4397c5586665
 DIST DisplayCAL-3.5.3.0.tar.gz 10559161 BLAKE2B a3eb968dcd0b5edbcf22a0ec84da55d8660ffa8782135a908db8ea7a6480ce7be9a59528d35a73b7eb57c9c0dd46996407ea3de834a85e6da1c5d006b8aa33b3 SHA512 ddb405c1d8b7bc5aefac80fb79edbb03c2a3b32821c8bbbdd6d095312fff57e8ffe5e53cc5b53c56fa32e6bcbc10cd76598441d750008c38a512ed1f62d7cd9c
-EBUILD displaycal-3.5.1.0-r1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
-EBUILD displaycal-3.5.2.0-r1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+DIST DisplayCAL-3.6.0.0.tar.gz 10565171 BLAKE2B 394a925d28f513ededc1bc40b3ce7b5a2687a0c172006fd14b9081188e3ca80c0cd5f634ac84a9917d6aa301e083bffd05db622e292262f6d41db2a86c23a920 SHA512 6d0cff6344bb0dfcff58e88f93e2d0f7a3cf5f8e32b596f9f5e07b0e80ccb9b4ff429aa9fa63b5941f7622e0a7dcd227d0a1066e82d0843454f01d96dea97993
 EBUILD displaycal-3.5.3.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+EBUILD displaycal-3.6.0.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.5.2.0-r1.ebuild b/media-gfx/displaycal/displaycal-3.5.2.0-r1.ebuild
deleted file mode 100644
index 72a722b64356..000000000000
--- a/media-gfx/displaycal/displaycal-3.5.2.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.5.1.0-r1.ebuild b/media-gfx/displaycal/displaycal-3.6.0.0.ebuild
index 72a722b64356..72a722b64356 100644
--- a/media-gfx/displaycal/displaycal-3.5.1.0-r1.ebuild
+++ b/media-gfx/displaycal/displaycal-3.6.0.0.ebuild
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 24c3c13e61ad..c296ee6d9b5a 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -4,5 +4,5 @@ AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150
 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
 EBUILD fontforge-20170731-r3.ebuild 2790 BLAKE2B 8d0290229ff389cca1f1e4915801b1f9ee0683a55030eadec60da8c82d4177f47af0592b366c9f1c7b730568e01a98d202e9502647f91cfccb02c5ac0b7bc98b SHA512 f14898b95f7a457b793d5ebabc84ce845296c84fe7360ab6069db4c99b485b5231ff12285981ba0e6fabe815204fe0b5cf878f0c84d594622e367afb62497b89
-EBUILD fontforge-20170731-r4.ebuild 2850 BLAKE2B 7dd1932e28fde621b6af94f96b42c9ac7a9583b76890076d8eee91803e0ab889dc0a96747c90a682eaf63533fa15659c49b87a4d14f77792ec7978f2aa5b1492 SHA512 43d10231680abca2faf74d3d51bc75c781e9f3d23ebe0406cd2667ae608527f47ba11a00d4078f0a543a0851b6d65e310509d4e4e03d050e04d0a4fdbdd1298c
+EBUILD fontforge-20170731-r4.ebuild 2849 BLAKE2B 3989df4621ff1d3a29abce501a9aa3490daa2caceeee9205f8571c51ccbe6f2328e1cde3a2ebbfd954cdd75a86cce3a27cd38ed690927a7b3309000546bee4aa SHA512 2c5c592c8b637c04da4f532c5357fabdb8dd5850bdb77af6a24b8c0b7dfe539e16f86570f65f1e66cee2b97e79227552e4fafb2aa40aa9a1a06365eb49449f07
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/fontforge-20170731-r4.ebuild b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
index 48ea943d4edf..eb072da531ae 100644
--- a/media-gfx/fontforge/fontforge-20170731-r4.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
 
 RESTRICT="!test? ( test )"
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
+}
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 1d6392332fee..f09447431246 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -6,5 +6,6 @@ DIST mypaint-1.2.0.tar.xz 37895196 BLAKE2B fa0130a0b8ea6aba14f2994584f990c8c0cb4
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
 EBUILD mypaint-1.1.0-r2.ebuild 1927 BLAKE2B e0d4354567a619e5d259fcb50820186fc8b6f4f6f7108c0676059da9a3065830b504b68a2f9e575032fb30e0b5b6e8e71de23d4e4f778cc28bb0d8e3220282ae SHA512 356a6bef73fb283b0e7953be068bdd8feec0d92a3e06a1fdf0fbe1d80fe6225a777cf95c6ae198afa40269bad9d25f8762c9ac318a8b2e4a3763912b40127477
 EBUILD mypaint-1.2.0.ebuild 1738 BLAKE2B e81f01dd6cafee8337c2d6c7d967a02341d9ca4cab1fc8815b2eee71bcf186c32d6ebcc9655038e33f46018342a85be807dd05ba046c26932f67a4f332469ca8 SHA512 d00e0825a85be9e5129fd7895c9b08d91037a1c291d50a8bf2e425eca235d527386013092898061e173855af3c3c2c9c6ab93cef7c5309e028683bb7841217e4
+EBUILD mypaint-1.2.1-r1.ebuild 1742 BLAKE2B cddbca3b26a6f941fe684b05a9633aac0603f36a241701635d3fbb84a219ab357ed6346d047fa661450be64eaf48386e1f2eafe63e879028e63a5c08d8fa98ae SHA512 22c95f69ac1a55f986a969b5153db3d0c1d98479ef026f7ef902eeb6a249089c141674b38525a34b697306158cc4010a5d260e0229bb0ae855c9a8f7224f0d93
 EBUILD mypaint-1.2.1.ebuild 1881 BLAKE2B 62c4152f2763737e6709fe5425aaab71c2bd69a3560c8acfab36997270d2e1690bb113ed15cbdaa464e8fed828249386cdb547621a1de7cc5e0c39318ab4379c SHA512 900af1c50c8d860b9e0551f7c12abe9ee3df5e21b900b78a92c17e7b9abf57968d6c1a895eb56869e9a45e2132bab40b3a9de6f49990f67577786904e8dccffd
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..8489c3857e41
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime gnome2-utils scons-utils toolchain-funcs python-single-r1
+
+DESCRIPTION="fast and easy graphics application for digital painters"
+HOMEPAGE="http://mypaint.org/"
+SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
+
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	>=dev-libs/json-c-0.11:=
+	media-libs/lcms:2
+	>=media-libs/libmypaint-1.3.0
+	media-libs/libpng:0=
+	gnome-base/librsvg
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	virtual/pkgconfig"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_compile() {
+	#workaround scons bug with locales. Bug #352700
+	export LANG="en_US.UTF-8"
+	tc-export CC CXX
+	escons
+}
+
+src_install () {
+	escons prefix="${D}/usr" install
+	newicon pixmaps/${PN}_logo.png ${PN}.png
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			rm -rf "${ED}"/usr/share/locale/${x} || die
+		fi
+	done
+
+	python_optimize "${D}"usr/share/${PN}
+	# not used and broken
+	rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
+	# already provided by system-libmypaint
+	rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 56b8185ae96f..f0655a923e05 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,4 +1,7 @@
 AUX opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e44bee9c4da81b6f50bfcd68c1566149d089fefddb9d90ed76cb3ae9f33b063bc3834e69da008660f689eb56b9597bd1702b40df761006b170c079 SHA512 c11194c06df6dc2e2ce18f3c6863c19191793512672779a2b5d4df2e2b59348dd4c71c7ab887546b96943e97e0257b3aa152f45aa53a3e5ed95008fa3d6b59d5
+AUX opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e44bee9c4da81b6f50bfcd68c1566149d089fefddb9d90ed76cb3ae9f33b063bc3834e69da008660f689eb56b9597bd1702b40df761006b170c079 SHA512 c11194c06df6dc2e2ce18f3c6863c19191793512672779a2b5d4df2e2b59348dd4c71c7ab887546b96943e97e0257b3aa152f45aa53a3e5ed95008fa3d6b59d5
 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
+DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 EBUILD opentoonz-1.1.2.ebuild 2152 BLAKE2B bbad89bf0799119e05e7ec8e900e786f28e51d4609874e7b676922ab8cc8ecb4506652f836e40778d3963eaea2cf9ec58c8da8fde68393455e60f82868ae3913 SHA512 62ca55a27d0e4ca42f274747b530221e003e67774fb822969f1b7e4e77eb80b961894a6362c45633c642dcbb1e35572ca77056d7cf43fede9f632789bb53aa35
+EBUILD opentoonz-1.2.1.ebuild 2253 BLAKE2B b620d793a36f917b97fbd0e6910da5af293e47c602f2216eccfac294c4f65c124288336cbe84cbde3257436b4196bff11111ca62f1883e58937e58f032ea87f9 SHA512 b715e69ad8e8b013493c25c10cdcdf01c9a3de5bb70f689cf3ef971d3259874f040a3b977741957f645190b49f3da0dff171e6b05ca17bf85c8575befcc04be7
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
diff --git a/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch b/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch
new file mode 100644
index 000000000000..ad0e5a2758ea
--- /dev/null
+++ b/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch
@@ -0,0 +1,38 @@
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=612938
+
+From ae91dbad8c33b35ea564d235c8eba63adfcc0fef Mon Sep 17 00:00:00 2001
+From: Peter-Levine <plevine457@gmail.com>
+Date: Wed, 31 May 2017 04:49:36 -0400
+Subject: [PATCH] Don't allow throw() in destructors (#1182)
+
+---
+ toonz/sources/image/3gp/tiio_3gp_proxy.cpp | 2 --
+ toonz/sources/image/mov/tiio_mov_proxy.cpp | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
+index d1bd79717..03140f695 100644
+--- a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
++++ b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
+@@ -138,8 +138,6 @@ TLevelWriter3gp::~TLevelWriter3gp() {
+   QString res;
+ 
+   stream << (msg << QString("$closeLW3gp") << m_id);
+-  if (tipc::readMessage(stream, msg) != "ok")
+-    throw TException("Unable to write file");
+ }
+ 
+ //------------------------------------------------------------------
+diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp
+index 260bbb196..6be067c01 100644
+--- a/toonz/sources/image/mov/tiio_mov_proxy.cpp
++++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp
+@@ -206,8 +206,6 @@ TLevelWriterMov::~TLevelWriterMov() {
+   QString res;
+ 
+   stream << (msg << QString("$closeLWMov") << m_id);
+-  if (tipc::readMessage(stream, msg) != "ok")
+-    throw TException("Unable to write file");
+ }
+ 
+ //------------------------------------------------------------------
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1.ebuild
new file mode 100644
index 000000000000..84389a579e27
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.2.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/lz4:=
+	>=dev-libs/boost-1.55.0:=
+	dev-libs/lzo:2=
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtmultimedia-5.9:5[widgets]
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtopengl-5.9:5
+	>=dev-qt/qtprintsupport-5.9:5
+	>=dev-qt/qtscript-5.9:5
+	>=dev-qt/qtsvg-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	>=dev-qt/qtxml-5.9:5
+	media-libs/freeglut:=
+	media-libs/freetype:2=
+	media-libs/glew:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.3.0
+	media-libs/libpng:=
+	media-libs/libsdl2:=
+	sci-libs/cblas-reference:=
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib:=
+	virtual/libusb:=
+	virtual/opengl
+"
+DEPEND="
+	$RDEPEND
+	virtual/pkgconfig
+	dev-qt/linguist-tools:5
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+
+PATCHES=( "${FILESDIR}"/${P}-gcc6-no-throw-in-destructors.patch )
+
+src_configure()
+{
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd thirdparty/tiff-4.0.3 || die
+	econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${S}"/thirdparty/tiff-4.0.3 || die
+	emake
+
+	cmake-utils_src_compile
+}
+
+pkg_postinst()
+{
+	elog "It is supposedly optional but some files are"
+	elog "actually required to run the executable properly."
+	elog
+	elog "The .config/OpenToonz/ directory in your home folder"
+	elog "will contain your settings, work and other files."
+	elog
+	elog "We need to create it from the command-line:"
+	elog
+	elog "$ mkdir -p \$HOME/.config/OpenToonz"
+	elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/"
+}
diff --git a/media-gfx/postr/Manifest b/media-gfx/postr/Manifest
deleted file mode 100644
index 067e007738b1..000000000000
--- a/media-gfx/postr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST postr-0.13.1.tar.xz 384196 BLAKE2B bb3420d4ce35b3a06d183cd54c438c4a1a6a9d613f1909b73cb5a7b5d12b5ad6f06313889b7f780ed776c44e56922f5c731f7fcca46b364b1bb76ca3872a6988 SHA512 43486d6c19ccad86e44e00fd7e7aadbdc8268ada38cffe616c5b7c3b7280556222ae961036cd7c711b067948772acec92927d86d4c1d82a26ecf49011991f598
-EBUILD postr-0.13.1.ebuild 1453 BLAKE2B 8536b5cc53f53d71ad0dbcb9e53efe431632e09a6d8a3b51fc7a469f7cf5a82f9ff707aa00e883c45662c530ffe6443f8436383e7b58f951dd7e62b98f2b2ffb SHA512 004d9c69b56f34f57e2528102ec533b267bd13393a2cd25054c1cfa618bf7c0529b55b12bacb0f71dc07d2f3fe78336cf3812c9b998ebb2a4773905e880e4468
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/postr/metadata.xml b/media-gfx/postr/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/media-gfx/postr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/postr/postr-0.13.1.ebuild b/media-gfx/postr/postr-0.13.1.ebuild
deleted file mode 100644
index 0f140ae55826..000000000000
--- a/media-gfx/postr/postr-0.13.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="Flickr uploader for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Postr"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/gtkspell-python[${PYTHON_USEDEP}]
-	dev-python/libgnome-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		(
-			dev-python/twisted-core[${PYTHON_USEDEP}]
-			dev-python/twisted-web[${PYTHON_USEDEP}]
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Don't check for nautilus-python if we aren't installing the nautilus-2 extension
-	sed -e 's:nautilus-python >= 0.6.1::' -i configure || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--with-nautilus-extension-dir="${EPREFIX}"/usr/share/nautilus-python/extensions
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-
-	rm -r "${ED}usr/share/nautilus-python" || die
-}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index a2078e98a2f3..90da6afcf067 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -3,6 +3,6 @@ DIST qrencode-3.4.4.tar.bz2 369136 BLAKE2B 19e9a2089c6c22284da61dda57d1150573b72
 DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
 EBUILD qrencode-3.4.4-r1.ebuild 577 BLAKE2B 19577c82a04b248a08201344b226a236bf73b58540f0fb5c8e4d55493dfeade02cc1f0d22d096dda91a82b52f1c532f8068b755dc47be06e138e4b4a30516f7a SHA512 af41d0ff230fe92fdc21d7ee0ab93820187f1973f633dc7cc5b32140504c48729c30a9d35488cf59e90010a5852fd72111275118053789c6e5e4ccefeab35288
-EBUILD qrencode-4.0.0.ebuild 876 BLAKE2B d447134cd441d84f0aca40530c198967e355a96deac8ea3e542e8545d57fc4161fae073b193fe754ee38cca3b8042537b5df7c75a0bad56e281cb847844396fe SHA512 dd9190179b245e2570f59502b2cac2d07baa117b4810f05d2cbd2d29faae7ded2ab8c53cad582e9364c640e9fa2879afb661a0e25014e91729566601f4e8b01a
+EBUILD qrencode-4.0.0.ebuild 875 BLAKE2B deccce06b32c442852c73cba09f97d3c59518d49ae63008d1ac46ebc0940da20cbb42ceb502f30942af6392d47796bd91d413fdd68bf634d262ca8411af23f33 SHA512 b59b6c37c8fd489e98a8fc1e14989418a8292a739a74e0422b18ed64e48611c1846d2f6bee15e85d27a1142da2901b668973437955722c19425ee4939eb5a16d
 EBUILD qrencode-4.0.2.ebuild 785 BLAKE2B b223dac0308d17648761f32b45339aa12074113f81f9c35f37f806198f2922239efe9634135a68fab44b7ffd4f7d2e29a6f14940e5911e765c51f2aa91a3a2d9 SHA512 a4d2e49119d9365f75f2d7c740496d6e302ad66dfefb1894925f6323c105ca3f3d0a5788afbafbeee85015ce4380626c8948f175ddf54d567086493c3eabb14c
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.0.ebuild b/media-gfx/qrencode/qrencode-4.0.0.ebuild
index f6d7e79c7c7b..d7cd09ed89ae 100644
--- a/media-gfx/qrencode/qrencode-4.0.0.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="media-libs/libpng:0="