gentoo resync : 14.07.2018

31 files changed, 383 insertions, 179 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bb6ef39c1b3a..3047aff54899 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ephoto/Manifest b/media-gfx/ephoto/Manifest
new file mode 100644
index 000000000000..ff15c3b41dbe
--- /dev/null
+++ b/media-gfx/ephoto/Manifest
@@ -0,0 +1,3 @@
+DIST ephoto-1.5.tar.xz 324384 BLAKE2B 20e6a8904b2b80c67355b404ae39b10cb00f050f44336d899e63cc8e6d73b9b6d37dd9147479a2b6fa783ec90a07762fd31663d85d92d518e39cebc858489c9d SHA512 a60558230750f0edf7fb28f1d002a905a2c9afaf00f110c08e35f9d44f7d3939167065e0ef3819ac9ef0cfeed4ec260aef5267d631343dcce4628de70e7a5f23
+EBUILD ephoto-1.5.ebuild 533 BLAKE2B 1d5e884b4009853cede8eea909221999880fe2de12a08969b3facd3ede5ef7eb0e85e0d082f8f700a8b755ee2b3aeaf7def9282b711b4ef27bdb49209c892c4a SHA512 ae7b18946f3558c87c3c890b607bda83cfefa2e21477a7c9004d2a11f4a4b8e69fd00a0f0c7aca6eb5a2e1310a65241725f73d970d6feb87f4f21252d1e50f56
+MISC metadata.xml 1203 BLAKE2B 81c54ec20b38cfbaac1af938c254c1b4a7a4f05f930c49221e4a7069dafa072c28dac491f314043b5df20cb459e068e9082ae10f4a8f84371127d842d5033ef1 SHA512 54f5e200874bfe2a33343f147f320960be3cfcffb710ddf20e4721c446f1d3cc67a87185d4347c64ba80ecae1836cff757e2d44bd368d96c7459776b67b411d7
diff --git a/media-gfx/ephoto/ephoto-1.5.ebuild b/media-gfx/ephoto/ephoto-1.5.ebuild
new file mode 100644
index 000000000000..0d9b39d3494e
--- /dev/null
+++ b/media-gfx/ephoto/ephoto-1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enlightenment image viewer written with EFL"
+HOMEPAGE="https://www.enlightenment.org/about-ephoto"
+SRC_URI="http://www.smhouston.us/stuff/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/efl-1.18.0[eet,X]"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable nls)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/media-gfx/ephoto/metadata.xml b/media-gfx/ephoto/metadata.xml
new file mode 100644
index 000000000000..997099762b2c
--- /dev/null
+++ b/media-gfx/ephoto/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    Ephoto is an image viewer and editor written using the Enlightenment Foundation 
+    Libraries(EFL).  It focuses on simplicity and ease of use, while taking advantage of 
+    the speed and small footprint the EFL provide. 
+
+    Ephoto’s features include:
+    - Browsing the filesystem and displaying images in an easy to use grid view. 
+    - Browsing images in a single image view format, 
+    - Viewing images in a slideshow, 
+    - Editing your image with features such as cropping, auto enhance, blurring, 
+      sharpening, brightness/contrast/gamma adjustments, hue/saturation/value 
+      adjustments, and color level adjustment, 
+    - Applying artistic filters to your image such as black and white and old photo, 
+    - Drag And Drop along with file operations to easy maintain your photo directories.
+  </longdescription>
+</pkgmetadata>
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 194f32629b79..24c3c13e61ad 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 2852 BLAKE2B 6ca3b179543a8e95853c3b77ba7664bc28f4f00c7ae0af7ace7590cadd8f105fc1499598956191d8ed90599767ce8438928b22b254d093b24b439f29792fa315 SHA512 8ffa980ad263e24da8424b0af679d6f4718f96e24180648aeffe1692f1f8734cb3fcdcb17338791a46d4ad6325146cf7009ae1a18eed1781935ee2ea0e4e4cca
+EBUILD fontforge-20170731-r4.ebuild 2850 BLAKE2B 7dd1932e28fde621b6af94f96b42c9ac7a9583b76890076d8eee91803e0ab889dc0a96747c90a682eaf63533fa15659c49b87a4d14f77792ec7978f2aa5b1492 SHA512 43d10231680abca2faf74d3d51bc75c781e9f3d23ebe0406cd2667ae608527f47ba11a00d4078f0a543a0851b6d65e310509d4e4e03d050e04d0a4fdbdd1298c
 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 f0072048fd04..48ea943d4edf 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/gimp/Manifest b/media-gfx/gimp/Manifest
index 7e4b43044ab1..0cd97cc38316 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -15,5 +15,5 @@ DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26
 EBUILD gimp-2.10.2.ebuild 5296 BLAKE2B 2ab4fe7a79d779f93d62f95a83fb754dca40dd6f8490e660766b722e216cc956a03ff73f118c24bd8d356925a9a688f093da23b81cf0a9de62d4ca3b209715a3 SHA512 c9c70bc7f093dbe9cad2d9324c0ce2269cb0aaa6c022590cb01538fb14ada2a1885151e4d610596b39ea5fa556abb4872a68a389fa0496c0186ae906c5c22e2c
 EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56
 EBUILD gimp-2.9.8-r1.ebuild 5734 BLAKE2B a176bcbabc8298b9e29b755f7d3dbdc26c3e6a77335e826762c6ce0273aeea38341378bc719df8e617a69bd6f8570442e46f92116119fd40043669201ecdcf50 SHA512 2778c83c74d87fd8492a1107b1b64aab8114ea167aaf8d7ca2290cec314ed9640d60096a04c7834b718159f242cf3e2a2c46c6293a03927d8084d834bc415ff5
-EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5
+EBUILD gimp-9999.ebuild 5146 BLAKE2B fc245f0f86922ea132cc7839c45e5ecb18cce3f9eb14c29ec74589563e1e5621bcf119d943ae85fd90c960ba0b5a43a94c43404c7920fa4239e447fdb87ba0fa SHA512 57d76bac0516d2273c3cfbc8d7cb1d6598bb82b339e980463061b0b97d32e690988bf4ce03f35bec9e9e4e100c4ad9345f5c09023aa3cc9910a369f97caa952f
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 2ac820e3f5b1..8d2e5828d246 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
 
-inherit virtualx autotools eutils gnome2 multilib python-single-r1 git-r3
+inherit virtualx autotools gnome2 multilib python-single-r1 ltprune git-r3
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
@@ -15,12 +16,11 @@ SLOT="2"
 KEYWORDS=""
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
-RDEPEND=">=dev-libs/glib-2.40.0:2
+RDEPEND=">=dev-libs/glib-2.54.2:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
 	>=x11-libs/gdk-pixbuf-2.31:2
 	>=x11-libs/cairo-1.12.2
 	>=x11-libs/pango-1.29.4
@@ -29,25 +29,27 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/gexiv2-0.10.6
 	>=media-libs/libmypaint-1.3.0[gegl]
-	>=media-libs/fontconfig-2.2.0
+	>=media-gfx/mypaint-brushes-1.3.0
+	>=media-libs/fontconfig-2.12.4
 	sys-libs/zlib
 	dev-libs/libxml2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.30
-	>=media-libs/gegl-0.3.20:0.3[cairo]
+	>=media-libs/babl-0.1.50
+	>=media-libs/gegl-0.4.2:0.4[cairo]
 	>=dev-libs/glib-2.43
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
 	gnome? ( gnome-base/gvfs )
 	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.7:2
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	>=media-libs/lcms-2.8:2
 	mng? ( media-libs/libmng )
 	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.6.25:0
+	>=app-text/poppler-0.44[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=media-libs/libpng-1.6.25:0=
 	python?	(
 		${PYTHON_DEPS}
 		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
@@ -65,8 +67,9 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	postscript? ( app-text/ghostscript-gpl )
 	udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
+	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
 	sys-apps/findutils
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40.1
@@ -75,7 +78,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2
 	>=sys-devel/autoconf-2.54
 	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
+	dev-util/gtk-doc-am"
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
@@ -88,25 +91,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply_user
-
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
-	echo '#!/bin/sh' > py-compile
-	chmod a+x py-compile || die
-	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	local myconf
-	if ! use doc; then
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-	./autogen.sh ${myconf} || die
-
-	# Fix "libtoolize --force" of autogen.sh (bug #476626)
-	rm install-sh ltmain.sh || die
-	_elibtoolize --copy --install || die
-
-	gnome2_src_prepare
+	gnome2_src_prepare  # calls eautoreconf
 
 	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
 	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
@@ -114,7 +102,8 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		GEGL=/usr/bin/gegl-0.3
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
 
 		--enable-default-binary
 		--disable-silent-rules
@@ -124,14 +113,15 @@ src_configure() {
 		$(use_with alsa)
 		$(use_enable altivec)
 		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
 		--without-webkit
-		$(use_with jpeg2k libjasper)
+		$(use_with jpeg2k jpeg2000)
 		$(use_with postscript gs)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_with mng libmng)
 		$(use_with openexr)
 		$(use_with webp)
-		$(use_with pdf poppler)
+		--without-libheif
 		$(use_enable python)
 		$(use_enable smp mp)
 		$(use_enable cpu_flags_x86_sse sse)
@@ -158,7 +148,7 @@ src_compile() {
 	addwrite /dev/ati/  # bug 589198
 	addwrite /proc/mtrr  # bug 589198
 
-	export XDG_DATA_DIRS=/usr/share  # bug 587004
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
 	gnome2_src_compile
 }
 
@@ -170,7 +160,7 @@ _clean_up_locales() {
 			einfo "- keeping ${lang}"
 			continue
 		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
 	done
 }
 
@@ -187,12 +177,12 @@ src_install() {
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
 	prune_libtool_files --all
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
 	_clean_up_locales
 }
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index cf37ac2c2a3f..7df3894a2842 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,7 +4,7 @@ AUX graphicsmagick-1.3.27-version.sh-fix.patch 310 BLAKE2B 0a9a0c97c675af8892073
 DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c
 DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24efa07249145b4dd3e1ff2802ec07ad7ea70e4484d0ffcc255454adf4b2be72d6e19f4352db65e22def6e12dfde4cf5987f8 SHA512 c372212e54e6403a44a973113764bf1fee6dde5df08a6ee015ae03c32823f96316018cafd34a355ff8a35ad3581aa7d455d30d664b9d68d3ea2ad277d7cf45e6
 DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
-EBUILD graphicsmagick-1.3.27.ebuild 3325 BLAKE2B 2dc3525d0cd95d103a6f78dbb098c63fb69d50528107306c48ea2cd378ced281b08ec6a006c0ae4216e8f7c15910334efce0f628ba396bad936db04f5dacd047 SHA512 5381ce87435c8e86e1a09de878dea8f71a3aca7aef212f1132b227786abcfa6fc883c4af28b9f603889731cd7ac4931a8f3c6cc9ba0da46027e6a003519accea
+EBUILD graphicsmagick-1.3.27.ebuild 3324 BLAKE2B 309ac3fb37a14f5aef75015135b678a79165b5f915a1954595e15321992856474703efb49fdbce07c06f41a53ac9381e52356de171a204d456d1883428c5ed69 SHA512 1db593b2b9df429e57b33346c1b3fe83fee14d6902a1175b38e8e62aa58018ab6c3ad1fe58ec9b662324fe57b9163f0c55098d98724fd656dd159c5635559498
 EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 EBUILD graphicsmagick-1.3.30.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
index 7295e1e63303..ea52ca5e1e59 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 545b6c7641d9..1001c95a0d41 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -3,6 +3,6 @@ DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B fa7475347f6b1b561132d5370172fee410afd4
 DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
 EBUILD hugin-2016.2.0.ebuild 1948 BLAKE2B 813e60b2a655186d9ee3042e03372e1185e07aa6fdb7a5ecd57889efb9252630d7902b36600995e02ba03677f9c11a6bc4b7fc841f852391e1c3ed168c24b24f SHA512 0fa77072010e24db9fa58b5601040baff38121342a7c187b24b6fd37626becd46b372fde844981bb00da4b840970ebff88bc2f3f2833afc584c2aad6cba8a265
 EBUILD hugin-2017.0.ebuild 1924 BLAKE2B 8d618f623ed9d53a49e138acad196d691bcd0b69b4f3318a002b88917bcfc216ce9b10c02a283b540acae345e8878a6ab233022ec1ae44f37b305e11eb592066 SHA512 7921827a90e88f68218e7d2a4b9480ab5ffcb7bcd9aff1f8245d7d9233b55d425f216fcd14c13c064fe30dc2fe65f2882fb8ba8f3a4e8d126db754d6e733737f
-EBUILD hugin-2018.0.0.ebuild 1971 BLAKE2B ce8ccaea602866ecaee5d5890e740d98e940344c3da1d1f0ddec1257e1ef02e2e67962658c47e3ae4f3b1f5edd0705b9df7157e4c6a3ae8e2ff1aff8ff208aff SHA512 0776d6b2b334da1d85763dfa2628b3c0f44adbd6e295b2b36d5cc9b5b75fdcb33cefd5702e0f75f03ea134e1c4b622d975d1693251cff45792d7acb3fc8a3026
+EBUILD hugin-2018.0.0.ebuild 1970 BLAKE2B f756191712f7f71d7b5bbf4b58b8943a6851c231c070d42794b06a0adc04189b757541432027c4f0f1014bfd7f1bde1cbb67f11cfbeeb9e9c4ca589578b1e6d9 SHA512 45f5cf6a1d2532316834a967396b445b2686bc6aa68e6f367d82d65abbb8d986552a56b61465382001616fe1e4bceef605c1f86f9ac17116cca81665c9efcc2b
 EBUILD hugin-9999.ebuild 1988 BLAKE2B 0fa525881a25a8141a1fc2fabc176382ec1cd040ad49e3c1f90f9b239570f06c944f44d633d2c43ce304048fa48075f0432c2c89bdb6921b0a6bf476d24b9786 SHA512 40f281844a1fe6562e9c692f6ca6dee905b7dbd7e233da31a7be04940f6b7c831d50180969a6752024a15a7e667459ec5ef835f4879b3789e9c5d156016de133
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 3a3bee02ade3..3b5e82f438dd 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2 SIFT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index dc7d6307538d..bb446ed97bb0 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,21 +1,23 @@
-DIST ImageMagick-6.9.10-1.tar.xz 8918684 BLAKE2B 62e77bed14b2a82f2fd2e429142c4200d7b243caa3ed8ff11be672d1c0a9094b7916dcbac11f0876cf46e6aa4753044e0cbe0c25dacafe5966f49d3f586bb747 SHA512 570edd18299982769a471ae37b7458401b13aa7802fd9f6ae8a72a2ece34cbf9b30e42a9f06abe62a6b01cc3573fc16d4c43a732260e0dedc8da54fef82f74a4
+AUX imagemagick-7.0.26-FTBFS-on-i386.patch 1228 BLAKE2B 113d732c49e8341c9f9b7a9722ff561a9d37951a1278f6bc8a11af306016a798518f39d0ebfb5b85800dd211c9da3f60eebca4d7e5cd9f751ddf298d9dcc39db SHA512 f56936b02ed7fd3ce7d886df21980d7c1a6b9a9c92c4e3d46a4a33a7b30ff050c399d063595ba1efe62a56e2d3e5a6b36e901e96d7546b12db60fd18824fd164
 DIST ImageMagick-6.9.10-3.tar.xz 8922536 BLAKE2B 36936b28aac025bd948d9925707877b6f6b5a9eb50f1afc2f318a0596c9096b7853f4db44c42994fe32b7ba0fe42eafb9d705ead0faf6f75eb9e7e07bc1c97e4 SHA512 760e8b003415fcf6c83e542346800f1f2d8834cd47ba343eead1f0fa228f2f44af7ca9b4379de52498a3da76aa35f25d0ec939cefa71718400702bc6801fffbe
+DIST ImageMagick-6.9.10-5.tar.xz 8921204 BLAKE2B b11c6dded5b42b797585e8253441fa6265de9f06241206b9ce29781df6c8896e9dd0ec967191ff28fcae445130d38e7e781728cbc27752b33b3422d971459952 SHA512 b6c068918a2c23bc86d84a1fd81bd8c0aea83fee0c33b5c686c7c6180231be2b27c1c43be111555017d2065fa97ba36c084e1479ff771846b73d500d67c7f85b
 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
 DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
 DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
 DIST ImageMagick-7.0.7-35.tar.xz 8614296 BLAKE2B 7c3c65d3fa630040febd40370fe93d3ba946b3d71cfef4daa340154a111f58af8e5028813fd35d1db99796d691f4d13999c3030b8ab7dc82494d0d89e2853359 SHA512 65aac1f1b4546212608acc1bf8b7b0a6fc7e45c9273183725dcfaf04e16948112fd4cfb295d88e5860dff66f04c54cc504af067e32c46cf8662f4ff72c64688a
-DIST ImageMagick-7.0.8-1.tar.xz 8606196 BLAKE2B fd7bd794793cd9bb063023f2f7f36272efb99a1b75082dd3f71a244b7cb0e28971ff091af5b8a575084f42bd5a4639641b44831dae0cc52ea03d6624a650f01e SHA512 e7f2acb9a7912bb68dced74b7a0381d4909b13aa4fa36e4f3c56479b7b24f8f91ff21c171e542bec63e2873a94adea4673c5351ce1d641f72e8279886eb4b224
 DIST ImageMagick-7.0.8-3.tar.xz 8613672 BLAKE2B c3ad7bb2d0917d2551b7c8ae0d80a8ab95e31d40cf18c26d7df363c3df209d7923a62a7fb90aec581fc4101139bc369a82289a96f51965f533b1956a9cfa4eed SHA512 0594de337c9eb1d116b15eeac0f1bceefeb86f13a41bc6721b120fa2e58f0ca5e2e1454b4e2b670c93545f13406f8bdbf54e5b3470e34841b5e9ac9d26821b70
-EBUILD imagemagick-6.9.10.1.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
+DIST ImageMagick-7.0.8-5.tar.xz 8611448 BLAKE2B 7a4f38ec458d010644d88cda605355d5871952b055ba9e088fe164448e2a0332e44e1545fc5929df455298ee56be65b66846faae4738912314177be050c683b0 SHA512 d760e630fd82b7636a031728e1f078efb8bb962e60cdc912cdfad29d3e6f74c1b5047941e711db89aa847d2e7c8c6ed44f451fa8ccff431c20d92ef49ef1915d
 EBUILD imagemagick-6.9.10.3.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237
+EBUILD imagemagick-6.9.10.5.ebuild 5190 BLAKE2B 5a149c6283ed909e7536c3b9119e6c347fa12897835101a3fe1d36ebf50016fa5bd4bfb8b3c698de38452948ef6e22993651111c5524d346cb5647bee1b9ab1e SHA512 5207197582de505a66eddc265563d8a1673b93bd1d2429f086f6becaf4a8a72c1adc5393e11c091b07cd75e5597175c5adbcf361f0fd621438168496637ee138
 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
 EBUILD imagemagick-7.0.7.19.ebuild 5126 BLAKE2B 944cdfc402eaf48aeeb4fc8fe7411233774ff8c44cab855aa50b79c22502adeeb38879fc8c454c428504b8d290e4fa7b41386a3a0404204df322928cf180425c SHA512 a9b3b238e38e931d534fe4826b0ba525bc6c9850a1aca244c701199d66fa989faf86d7c0a4995a0012e5bb68bbf09e15628494aebe8bbb3b8dc8a725a5e95885
 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.1.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 5196 BLAKE2B 8773a600b236dc906796ba12160df7f22792ca1b49f27a4fe165d6448099a0de8773090f4a44206ce201218a6d0cb25b012fa62ac0782fcef500ea13bfea5ba1 SHA512 584841bb65fff2dda4095dc32e6fc388306a2f73253d60fac721e0ae15b2b337d44ff7baafe088fcc1df7283bd32d96a6a1137fab4f3979c54a5b6777e566138
+EBUILD imagemagick-9999.ebuild 5297 BLAKE2B dd922782da40926064b6fdceb7cd0c9cb16f7187ac94ace7aee3c2581bc5d4bc86dd19d4eb9068083d93f401970f2a673af445c589b93ab0709735a67af18b79 SHA512 24762b7a8642ad54f88dabfdf5966b99e406977eafc486544720c466f1eac54e84ab7a496b81d8438e04ff0ad2bb943680c258a37a66cd28b8bd4677aadd7dee
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
new file mode 100644
index 000000000000..c568ed345ecd
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
@@ -0,0 +1,36 @@
+Gentoo-Bug: https://bugs.gentoo.org/653752
+Upstream issue: https://github.com/ImageMagick/ImageMagick/issues/1019
+
+
+From 0c26fea274e615ff6b179bdd30e970a55f6c3f52 Mon Sep 17 00:00:00 2001
+From: Svante Signell <svante.signell@gmail.com>
+Date: Mon, 25 Jun 2018 16:06:19 +0200
+Subject: Fix FTBFS on i386 any
+
+bug-debian: https://bugs.debian.org/898914
+---
+ Magick++/tests/attributes.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
+index 9ebc67f2d..e969def27 100644
+--- a/Magick++/tests/attributes.cpp
++++ b/Magick++/tests/attributes.cpp
+@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv)
+     //
+ 
+     // Test default value.
+-    if ( image.backgroundColor() != ColorRGB("white") )
++    if ( image.backgroundColor() != string(ColorRGB("white")) )
+       {
+ 	++failures;
+ 	cout << "Line: " << __LINE__ << ", backgroundColor default ("
+@@ -1068,7 +1068,7 @@ int main( int /*argc*/, char ** argv)
+     // pixelColor
+     //
+     // Test default
+-    if ( image.pixelColor(40,60) != canvasColor )
++    if ( image.pixelColor(40,60) != string(canvasColor) )
+       {
+ 	++failures;
+ 	cout << "Line: " << __LINE__ << ", pixelColor default ("
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
index 52e77059cb1d..89f3e64c115f 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
 
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
+MY_P=ImageMagick-$(ver_rs 3 '-')
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
@@ -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 )"
@@ -38,7 +38,7 @@ RDEPEND="
 	perl? ( >=dev-lang/perl-5.8.8:0= )
 	png? ( media-libs/libpng:0= )
 	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
+	raw? ( media-libs/libraw:= )
 	svg? ( gnome-base/librsvg )
 	tiff? ( media-libs/tiff:0= )
 	truetype? (
@@ -64,7 +64,9 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
+
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	local mesa_cards ati_cards nvidia_cards render_cards
@@ -137,6 +139,7 @@ src_configure() {
 		$(use_with openexr)
 		$(use_with pango)
 		$(use_with png)
+		$(use_with raw)
 		$(use_with svg rsvg)
 		$(use_with tiff)
 		$(use_with webp)
@@ -161,7 +164,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
 	dodoc {AUTHORS,README}.txt ChangeLog
 
 	if use perl; then
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
index 1db0353011d7..ec008c8024fa 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
 
-MY_P=ImageMagick-$(replace_version_separator 3 '-')
+MY_P=ImageMagick-$(ver_rs 3 '-')
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
@@ -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 )"
@@ -38,7 +38,7 @@ RDEPEND="
 	perl? ( >=dev-lang/perl-5.8.8:0= )
 	png? ( media-libs/libpng:0= )
 	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-gfx/ufraw )
+	raw? ( media-libs/libraw:= )
 	svg? ( gnome-base/librsvg )
 	tiff? ( media-libs/tiff:0= )
 	truetype? (
@@ -64,7 +64,9 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
+
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	local ati_cards mesa_cards nvidia_cards render_cards
@@ -137,6 +139,7 @@ src_configure() {
 		$(use_with openexr)
 		$(use_with pango)
 		$(use_with png)
+		$(use_with raw)
 		$(use_with svg rsvg)
 		$(use_with tiff)
 		$(use_with webp)
@@ -161,7 +164,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
 	dodoc {AUTHORS,README}.txt ChangeLog
 
 	if use perl; then
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
new file mode 100644
index 000000000000..aa36a8a3e7be
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -0,0 +1,193 @@
+# 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
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	inherit eapi7-ver
+	MY_P=ImageMagick-$(ver_rs 3 '-')
+	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+	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"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+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/krita/Manifest b/media-gfx/krita/Manifest
index 69f715c205b9..b81e734ef6e0 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,6 @@
 AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
 DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
 DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
-EBUILD krita-3.3.3.ebuild 2553 BLAKE2B a1d97fa3af8a79da72fa2dbdddd73135892d9df066f9316359036eed49d0bf21cc57ff2aab2d9e43549bab839d3949e0623aea9fc946337fbd1004ef10df6404 SHA512 c750f5904eddcee56469a463c0421250d905d9d6bb3f97711e19ee98b1e3b614c07e6fd68cc46597b4e500d8c8b51f9b10401cdb54622243cdc6491807657662
-EBUILD krita-4.0.3.ebuild 3027 BLAKE2B 32d9132b221c68d5e22fff6a7e234f1f34099a3aec054fc5d3becc4dc69f7ed205ba2f3468945346fc5890e10ad0f7301da5833d70b1039ac9993d697c0e0a21 SHA512 103fddb1bdbdfb47cd2dd04403c1840e5108d16ef7c43f7e6462bfc26cd33202603df51f0f94ad17b4c006643a386989aa887bd2302ea3a0ece807e9c265ed7a
+EBUILD krita-3.3.3.ebuild 2559 BLAKE2B a8cff6bd75d240ab4f4b63ac7f58d3d329c7c830cd5c62b0846d3b8b9f5ccbc0cb3a4405daad513a4d3ed3db3de9d9c9f81696d204cbc1779721312a171fe6d8 SHA512 43163beb98c83de02b28da41e8172546cf9993280d395387ed471b0c35568a7e6393610cc53da64d55830c0460b00d0fabb5431d14a6a360bba17f8ad54d1f14
+EBUILD krita-4.0.3.ebuild 3033 BLAKE2B 9103366c623967ad717a23cab0be96b8f1214a6c6f3e7958cc6a70c11436093cb3b476521f728b999669f1fb2aef2d82cd63f542c8660b7cd33edfc49b1fbd72 SHA512 7e74f23f97e3053ef4d73b99ff769303824aa81d458d379e43603925aaff9b8567ce664a0cab3d5d62b16bf87b2d0441da8f4405d5708d75ec5bfdc003ce101c
 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/krita-3.3.3.ebuild b/media-gfx/krita/krita-3.3.3.ebuild
index 24bf800d2a04..b99c804b692b 100644
--- a/media-gfx/krita/krita-3.3.3.ebuild
+++ b/media-gfx/krita/krita-3.3.3.ebuild
@@ -58,7 +58,7 @@ COMMON_DEPEND="
 	)
 	pdf? ( app-text/poppler[qt5] )
 	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
+	raw? ( <media-libs/libraw-0.19:= )
 	tiff? ( media-libs/tiff:0 )
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
index 432b5ebc2692..ef2f33ef2484 100644
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 		dev-python/sip[${PYTHON_USEDEP}]
 	)
 	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
+	raw? ( <media-libs/libraw-0.19:= )
 	tiff? ( media-libs/tiff:0 )
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 0785ba4f94c1..46534209ee24 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0.ebuild 520 BLAKE2B 74cdd57d777c4c58d69c295a6feb173504e1033a3c966421509aa96f574bf198f2d921045d137b670d82f657312cb00d7a0e57ca92f134805bdb562f17bfafd7 SHA512 d2dcb6d1b44c27a618a88ce3a531d3a50731242bc4fc4818baee207bf7100ee4945737a1b9ba147c1cc604190fce792ad0e785e990ebf461622321da4fb829fb
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 528 BLAKE2B 1e75e64a45364f2bff22dc7bfb298d5c6464036a9094e114ff42fcd7c1d808c3717e354ef47a814ea3745ebf0fc52ee0537e93404f65225efa900fb816f173a9 SHA512 4b1a783a7ae8ef88b15935bf6f7691f4c90d8cb23b34e39f3a355c59a271b34a55521596581d0c88b13599e6662b534d9ef6fdd285aebcd53d9bb044fd735b22
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 67caf0132e3d..5cf603c4f1d6 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DOCS=( AUTHORS NEWS README )  # to exclude README.md
+DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
 
 src_prepare() {
 	eapply_user
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index 89fb34dc12a3..9c532977835e 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,6 +1,3 @@
-AUX openexr_viewers-1.0.1-gcc43.patch 2122 BLAKE2B ad29a9a5972f00d2955fce75a927fc87a2a042a0343a6e6586866b606784c4e8783c53a2ea4caefa4e786bfbfe0c99dec6194757d4f74c829c77e88a1f2e3277 SHA512 1e4c2f7a496b7a48063b6ec163c72620eabc78fa850cd87de8c4d1555bdcf91913941c16fdadcfe076c67d0903c229e677ee3b7c0fe194116864c5cab1bbe4a1
-AUX openexr_viewers-1.0.1-gcc44.patch 1064 BLAKE2B 6142b8195a0ee03e1e8f7c0f711cf7a63dbf59291c95f4a4d6fb6c85f84ada831c1549daf7910e56717ac63f954d1efc870980ad22d9a9ab95521f367b521139 SHA512 3b6c2f02581025a9a9e8963274aca27badc905a1986376860728b24b795008dedbb7a3887b5a4fed04c81b0ea1acff1918fab3ad09881de9f2be899c90443177
-AUX openexr_viewers-1.0.2-nvidia-automagic.patch 472 BLAKE2B 52a9adbbf2c809433009b20e4ca6655eb837dedb368a7eced8d38f52941278355d8385a8c185feecb138a239fcd33373e3b0dd866c85e59f3410b96c26a15980 SHA512 777b8635b4454ea9c8c9bcd1b707012218ba16c523a105e987e897a17b126a2e11d986bc566cfe1a87a1af2df3336ec53e5ff8cc54cdc01ea7752947dac140f4
 AUX openexr_viewers-2.0.0-nvidia-automagic.patch 434 BLAKE2B adf9fb0455af68739344527f5119ef31976ce1f078f445900567e9afbb23bf233c3890b669db931d33114bf2e497f4550882747730803147e271441416992e90 SHA512 6c05ec9708822559e8f84f601f8ede89d4e9820cbbe4b49b93ac6d0ba228fa602b699f13540d2169ce16b144ec85db63d06262001bfa391e80f2febfa66ceec7
 AUX openexr_viewers-2.2.0-Remove-nVidia-automagic.patch 869 BLAKE2B 5a3576eaa7c5cc87e885e75fd13e5cf00386be0473fec7655278ddacb8b4084570cbe821097ec32036d9e37f8d8414e391171a8efd511114a6c1c285e236aa93 SHA512 232f990857bfbac7c8417e818e2efe0926a3d5fc20d7392c90a79a4762f26bf3044cc46729feafe407c73c75372ef52af8fa22247d82a4eb982fe538ac71de40
 DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc43.patch b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc43.patch
deleted file mode 100644
index 3630efc6f7a2..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc43.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -up openexr_viewers-1.0.1/exrdisplay/applyCtl.h.gcc43 openexr_viewers-1.0.1/exrdisplay/applyCtl.h
---- openexr_viewers-1.0.1/exrdisplay/applyCtl.h.gcc43	2006-12-09 01:14:07.000000000 +0100
-+++ openexr_viewers-1.0.1/exrdisplay/applyCtl.h	2008-01-10 02:07:14.000000000 +0100
-@@ -49,6 +49,7 @@
- #include <ImfArray.h>
- #include <ImfHeader.h>
- #include <vector>
-+#include <cstdlib>
- 
- //
- // Apply a series of CTL transforms to the raw pixel data from an image file
-diff -up openexr_viewers-1.0.1/configure.ac.gcc43 openexr_viewers-1.0.1/configure.ac
---- openexr_viewers-1.0.1/configure.ac.gcc43	2007-10-10 00:20:51.000000000 +0200
-+++ openexr_viewers-1.0.1/configure.ac	2008-01-10 02:07:14.000000000 +0100
-@@ -126,6 +126,7 @@ AM_COMPILELINKRUN(
- #include <ImfFrameBuffer.h>
- #include <ImathBox.h>
- #include <vector>
-+#include <cstdlib>
-     using namespace Ctl;
-     using namespace Imf;
-     using namespace Imath;
-diff -up openexr_viewers-1.0.1/configure.gcc43 openexr_viewers-1.0.1/configure
---- openexr_viewers-1.0.1/configure.gcc43	2007-10-10 00:21:01.000000000 +0200
-+++ openexr_viewers-1.0.1/configure	2008-01-10 02:07:14.000000000 +0100
-@@ -20869,6 +20869,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <ImfFrameBuffer.h>
- #include <ImathBox.h>
- #include <vector>
-+#include <cstdlib>
-     using namespace Ctl;
-     using namespace Imf;
-     using namespace Imath;
-diff -up openexr_viewers-1.0.1/playexr/ctlToLut.h.gcc43 openexr_viewers-1.0.1/playexr/ctlToLut.h
---- openexr_viewers-1.0.1/playexr/ctlToLut.h.gcc43	2008-01-10 03:09:55.000000000 +0100
-+++ openexr_viewers-1.0.1/playexr/ctlToLut.h	2008-01-10 03:11:18.000000000 +0100
-@@ -88,6 +88,7 @@
- #include <string>
- #include <vector>
- #include <half.h>
-+#include <cstdlib>
- 
- 
- void
-diff -up openexr_viewers-1.0.1/playexr/main.cpp.gcc43 openexr_viewers-1.0.1/playexr/main.cpp
---- openexr_viewers-1.0.1/playexr/main.cpp.gcc43	2008-01-10 03:05:03.000000000 +0100
-+++ openexr_viewers-1.0.1/playexr/main.cpp	2008-01-10 03:05:48.000000000 +0100
-@@ -48,6 +48,7 @@
- #include <vector>
- #include <string>
- #include <stdlib.h>
-+#include <cstring>
- 
- using namespace std;
- 
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch
deleted file mode 100644
index 4ab58548d71a..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur openexr_viewers-1.0.1.orig/exrdisplay/applyCtl.cpp openexr_viewers-1.0.1/exrdisplay/applyCtl.cpp
---- playexr/ctlToLut.cpp.orig	2009-12-14 09:07:00.863493115 -0800
-+++ playexr/ctlToLut.cpp	2009-12-14 09:08:16.721186947 -0800
-@@ -49,6 +49,7 @@
-     #include <ImfFrameBuffer.h>
-     #include <cassert>
-     #include <iostream>
-+    #include <cstdio>
- 
-     using namespace std;
-     using namespace Ctl;
-@@ -61,6 +62,7 @@
-     #include <ImfHeader.h>
-     #include <cassert>
-     #include <iostream>
-+    #include <cstdio>
- 
-     using namespace std;
-     using namespace Imf;
---- exrdisplay/applyCtl.cpp.orig	2009-12-14 09:11:44.950334079 -0800
-+++ exrdisplay/applyCtl.cpp	2009-12-14 09:11:59.900332294 -0800
-@@ -49,6 +49,7 @@
-     #include <ImfFrameBuffer.h>
-     #include <cassert>
-     #include <iostream>
-+    #include <cstdio>
- 
-     using namespace std;
-     using namespace Ctl;
-@@ -61,6 +62,7 @@
-     #include <ImfHeader.h>
-     #include <cassert>
-     #include <iostream>
-+    #include <cstdio>
- 
-     using namespace std;
-     using namespace Imf;
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.2-nvidia-automagic.patch b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.2-nvidia-automagic.patch
deleted file mode 100644
index e39a0c1da789..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.2-nvidia-automagic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -188,8 +188,11 @@
- 
- dnl
- dnl check for Cg
--dnlCG_LD
--if test "${have_fltk}" = yes; then
-+dnl CG_LD
-+AC_ARG_ENABLE(nvidia, AC_HELP_STRING([--enable-nvidia],
-+  [enable nvidia cg support [[default=check]]]), [want_nvidia="${enableval}"], [want_nvidia=yes])
-+
-+if test "${have_fltk}" = yes -a "${want_nvidia}" != "no"; then
-   AM_PATH_CG(have_cg=yes, have_cg=no)
-   if test "${have_cg}" = yes; then
-     AC_DEFINE(HAVE_FRAGMENT_SHADERS)
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 44ca2495708e..b4c61579c59b 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,5 @@
 DIST ristretto-0.8.2git-rd21ed3c.tar.bz2 584418 BLAKE2B 50d24fa81f4ce59a3a9acdb71a532e8d57399aafc4c20790b4a08ef3584bf3c71af978cb4e53ba6f4821fd4fc02e12600d39b84309ee29a764581855fd43bc75 SHA512 17fe6b5c24d4f4f3b6d28e1c435afbb0140e81a77f2b1c628ab7e05ed380a55a902368dabbb8e92647f08bb8853df8099b8de779d94dc91d3426cc7e33cbcbe3
 DIST ristretto-0.8.3.tar.bz2 564745 BLAKE2B 74f6fe50dbbcb538ff370fdefc934921e5878f7422dde577b86acc0ee63a03edaada860f0a91301de4b4ed4ae2fab89d74eccc5f3b9faababa4c71ee07159c33 SHA512 c43b48dfdf9e8ed0ea3c5f2bbac1c837881aa6a467c78377b6f53dcce030b5a3b8134a7b8cbad1008ae758295953fde50a916c284e54e8c5490158e776554514
 EBUILD ristretto-0.8.2_p20170821.ebuild 949 BLAKE2B 118693c9ce2ac41f5dfce5410cf4951c3f05ea5334a84b04c43e4d877d14021eb08b30a99c343270af2ccb1611ee898695f9d20fada95888a28516a6ff1dfa26 SHA512 01e5b950ff9684ade413e33532e0f81b0ea214bd13203cfe68f2cfa7bd278be50d27cb9a1196b0ab69d80a0f48384aa11e0686074d7919e17fcb0cd8d8b40d12
-EBUILD ristretto-0.8.3.ebuild 868 BLAKE2B f2a43df79c91c5bee6d711a8e34a83f46ecfdcd3c2182a8785a63421afcdeb491d8864a3958df1304f6408da21f1910b452c6cc4adf1f3459cf932746aca828e SHA512 ec132996ec3ab06259952db5b26cb15463d5e396ca9fb3a6561d8dd89943dec3456fc74134f1c9b69a3f778502072a1998d8fb82a018c997764fc689a191db87
+EBUILD ristretto-0.8.3.ebuild 879 BLAKE2B 7f7473ecbbf739f47d1cb0370e15b2f487862792487e894b76dab4681adb2c433ea9a782c820bb95111bd83212badeb333ce21e2d10ec8cb455d6acf5224900d SHA512 faf62c22bba201b3136d30843ecca5d11dceb79b64ad97102a9b7ae3242e35264cccc41e66f37b32cd08fa63b599eb40be7a45a51e6bd219cab6757b7a076f63
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.3.ebuild b/media-gfx/ristretto/ristretto-0.8.3.ebuild
index b5c45b79a92e..330499742f2c 100644
--- a/media-gfx/ristretto/ristretto-0.8.3.ebuild
+++ b/media-gfx/ristretto/ristretto-0.8.3.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
 
 DESCRIPTION="A fast and lightweight picture viewer for Xfce"
 HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest
new file mode 100644
index 000000000000..83cdf37974ad
--- /dev/null
+++ b/media-gfx/termtosvg/Manifest
@@ -0,0 +1,3 @@
+DIST termtosvg-0.4.0.tar.gz 88543 BLAKE2B a45e15e7d681bb649670d4c73cf09306fa09276b2a34f762db66f4cf2d640d2163f4e98b16dc609e92b4145978e76a00e80950634d1599ee0766c4f08afb15a5 SHA512 c0c90fc9e74c892ebe6b7fcd25ff2757a7a8b9ee4da459fc608c96295d0f9b40bf6c98a0ac56f42c3e2a60cb60e9404a9b50863bdf74335d2b4758b124c04fcb
+EBUILD termtosvg-0.4.0.ebuild 535 BLAKE2B 36a601396f720ded522dacd4754deb2a26adbd9a8cbda06ae0239490038f3faa9d00c66835e41e01ab5007c483acd97a450276e6bde501919085797836007f4f SHA512 ccd3929947cbf35b573e9502d8c5122f2339f55f169d6a98c2edcee5cee28c17d410d029e56d0402ed43a6f1030a3f9648e07c79f48124dc2e2daf160b3d7f20
+MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-gfx/termtosvg/metadata.xml b/media-gfx/termtosvg/metadata.xml
new file mode 100644
index 000000000000..38b28ff6e621
--- /dev/null
+++ b/media-gfx/termtosvg/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/termtosvg/termtosvg-0.4.0.ebuild b/media-gfx/termtosvg/termtosvg-0.4.0.ebuild
new file mode 100644
index 000000000000..a9ab7bed95f3
--- /dev/null
+++ b/media-gfx/termtosvg/termtosvg-0.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Record terminal sessions as SVG animations"
+HOMEPAGE="https://github.com/nbedos/termtosvg"
+SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
+	dev-python/svgwrite[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"