gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /media-gfx
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
133 files changed, 1644 insertions, 868 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7d65d598b96f..c42c64f912df 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index bbc0d89e4ee8..8f34c86a96dc 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,5 +1,3 @@
-DIST ahoviewer-1.6.4.tar.gz 227225 BLAKE2B c00c89bf80865ddf60a478a8ad030aa136fbc2735598de2b237ea97bc247337d9a12a1423e402c2e95c77df4e70ad68242ed31d5f8d896c1ae835acd860e7a5f SHA512 5e00f086685b7fd6601758e5ae0e6e7d1d24b56c1bd7c81de0be5c3613404fcfc585b8bf035a72a51171a40c8a25c7ad084fc3a9f7ba038e121fb2b7874b4ebd
 DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775
-EBUILD ahoviewer-1.6.4.ebuild 1579 BLAKE2B acabb4739b50bf53584157bead036e882154478e413f68d7c85014da3b17aefe7a043b3ec74c8644d113a54e1698cf2a5c2c5844bfefb1eb3837e803e83c4b80 SHA512 1dbe353fcad2f17f4612341e7180ca92a7343f9e566dcf97c410f6383dc444d9fc79a706463bd0e94860d2dee50d7b1c58fb78b29917650f43dd55216fd7d393
 EBUILD ahoviewer-1.6.5.ebuild 1750 BLAKE2B 6c4d365732f480ce61f4d99b0b7a505bdc8bf8698b6698d48c8f9656bb73a3ab5548f715a165fc594be1ca6d7c920bd6a357743fe04746e02e306656527c6246 SHA512 73d6616d4ff8413091a45d867e02e373f6b6a5112ae4d8ee1278c90ac45def3649655f92871a939d5f8854d6b8a962182cd3d177f9e29249eaf0d14730b6bf12
 MISC metadata.xml 532 BLAKE2B 03de1e92365b5abb2e277362cd7e4914e798f98eba5c4f7b1d0a3bd238f1bd35357045b41d96fc979f238c746acd31f35a4557e1251c8786e20420b016648fe4 SHA512 f5a47485137a9721ad98a363167214118f92391f83c75ea66b51c87dfddc5d7585162adc20b23147c6d42781be8c830204af5552fd365d317b7572e2f4fdd260
diff --git a/media-gfx/ahoviewer/ahoviewer-1.6.4.ebuild b/media-gfx/ahoviewer/ahoviewer-1.6.4.ebuild
deleted file mode 100644
index 605a1a3cbc46..000000000000
--- a/media-gfx/ahoviewer/ahoviewer-1.6.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="A GTK2 image viewer, manga reader, and booru browser"
-HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
-SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls +gstreamer libsecret +rar +ssl +zip"
-
-DEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-libs/libconfig[cxx]
-	dev-libs/libxml2:2
-	dev-libs/libsigc++:2
-	net-misc/curl
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gstreamer:1.0
-	)
-	libsecret? ( app-crypt/libsecret )
-	rar? ( app-arch/unrar )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:=
-			net-misc/curl[curl_ssl_gnutls]
-		)
-		!gnutls? (
-			>=dev-libs/openssl-1.0.0:0=
-			net-misc/curl[curl_ssl_openssl]
-		)
-	)
-	zip? ( dev-libs/libzip )
-"
-RDEPEND="
-	${DEPEND}
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		|| (
-			media-plugins/gst-plugins-vpx
-			media-plugins/gst-plugins-libav
-		)
-	)
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable gnutls)
-		$(use_enable gstreamer gst)
-		$(use_enable libsecret)
-		$(use_enable rar)
-		$(use_enable ssl)
-		$(use_enable zip)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index 7d56b6b1fffc..828c953603e3 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -2,5 +2,5 @@ DIST album-4.07.tar.gz 619238 BLAKE2B 2d3ddfc08fbc5852f9d49ef687fb5360f832588de9
 DIST album-4.13.tar.gz 667760 BLAKE2B fa4bd75147d708c18f183787fb62d55a068956204dab249ca2652583421fd444ff6fbbce54e16f02072534050c52c67dabe3c4e6fc977c6aff7317a0df9357d4 SHA512 c22bbc5ad154f35d50d28e5331911d0fd32c5e7f25b659e48274baa1ccc9e3e8b9f771a1bfdf39078c9e959c3fd84b3ccd8528f20f7a80baa7c59bc579579756
 DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e
 EBUILD album-4.07.ebuild 898 BLAKE2B 7bd2dd060bed7655f159eaa858da473f9b40da8886777cd22ca3302a26ab3c9d378d0501ccf7eff792c3abd837a904878f6901f7e36392981127c3d6a54c3062 SHA512 ad9aae9a19a84cfe0afb7ad39950025e435abfc3d3ff7d09122801975ea70c436973ecab74ec2fe9bc4717ae216c062d17aefce86e6520db4ae5b4fae90a0964
-EBUILD album-4.13-r1.ebuild 904 BLAKE2B 5ddc6cb4bc8f73efe2411a3ed4139f2b9f0b3e3b7f97a1bc4de68fac4fa634dbdfb6ced8d66839da2047172fb029138c33642391ad4aa391443b8867af451337 SHA512 6473b1e92e7385804f2d438d18f66b8c0d64556149600c6657160aa7699a66408b8ea17362f089e332da16f1fd66bc2e1fc476d0ca38fb0960baad145a933aa3
+EBUILD album-4.13-r1.ebuild 900 BLAKE2B d982adcf646ef7dd78dc44ce145320f25835a616057a6a06e85273da38e0028d1c2152d92f704aa471a810e9e2fd56ed1a8329d3f7f85844bd72feeec4e1b96a SHA512 73f631c122bc6656a9039b770047111a75d5bab9d535d95ab3106661844f842a9292eb14157b420e7fec3e128952cfc2e3ce55d486debd578f2d26af27f4b6e3
 MISC metadata.xml 374 BLAKE2B 05c713b2922350914356e8a0073f22c635b6c1b84bd6d0dd8031b0515fba8580da54636e1e75dd4bfd903fd10b3f465cfbda325e4e826bffee3a40badd9cf8e8 SHA512 b0e38d10966a2d98b1f8d8235e9f8c96c294037e503179531e795ffedcf8517ddcab991d692fc7dae7d64e354510a36e07671fb216b94a62b3d78c938667d530
diff --git a/media-gfx/album/album-4.13-r1.ebuild b/media-gfx/album/album-4.13-r1.ebuild
index b837918881df..f80081ce44d4 100644
--- a/media-gfx/album/album-4.13-r1.ebuild
+++ b/media-gfx/album/album-4.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz
 
 LICENSE="marginalhacks"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc ffmpeg plugins themes"
 
 DEPEND=""
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index c47befc900d5..0990a5ef2c50 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -3,5 +3,5 @@ AUX apngasm-2.91-makefile.patch 585 BLAKE2B 8972e2c3b59f4d128f522309496ed643046a
 DIST apngasm-2.7-src.zip 11448 BLAKE2B 848a5c9be65bacb3297c9f0b54235f2143be91840c5f0730c0c7bd1c6d273855d730eb9722860f7543eb6e57e8ace5b775f73f5789ee6814f5d62fec02bd2b14 SHA512 28ec70a4ac02021ff85390ad6863aaca5451937209345128ecd5baf76bef9495168c3c4ee5d823afbeb569ca673328673a81b807e7985c3d5d1843c056af7810
 DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
 EBUILD apngasm-2.7.ebuild 716 BLAKE2B 4107ecdef38e348c4df536a50b4d5646082d7dd19f801326f312d3e6bb13867a4f33cf72a24fe1d0c88df236d911d1d137a41d546fb484caa29485516e6ed714 SHA512 52952bcdc1e070979037174b0477ec6f51c661368f436282eb3556db4a10b63c593e607b284d52ad7ba29ef6732d8b6714a56ed4b2ee310c4b728b6698d09df1
-EBUILD apngasm-2.91.ebuild 979 BLAKE2B b1cdad83281b6d42031825020163d9a10b08b15474383819b8681937ce49712ae150d3b035db840b7e54d4140285dd62f9255f1e36f279cb00d42a274d2483f4 SHA512 d67116f62f8a94d5e1cdebd2a44a3690925f532de6cae2d512ae952c5258ef3088070d75a55808f9aab92c30fe6adca79e8fd2ba777e74db1ba491fc44d2fbfc
+EBUILD apngasm-2.91.ebuild 975 BLAKE2B 24f0a278d33b6c7c3290ad761e73f693c71da0907277c0e6128638c111bbf2547dd156698d2b233aa16cc89dc414720c0a56a04270004a9e04b196fbbd00930c SHA512 33936f15560a7ff38f6c902a201d6ff6c5afba3617da5bd822d5825e517531753a8f987615ca71bf11e9687ea1739a302fbcbcfdf75f9a3aa0d84a04bdc5d962
 MISC metadata.xml 479 BLAKE2B 9307c8ff6da1b0010362d8bdb070e6de22c15ba492e71890882adb87c849bd7e3a639bdf8b0d278b0c2df3894f50a71ade73970daba7573b1b4ea968baa5e2e0 SHA512 a630460ee809f9bb4e7ac231cf5d53b9b560926eb515d9a698a1e2d5f6f4318f771cf77e3f47f256b7458a9b1dba67bbc654cf6f9d4bd9e194490b2cd32c8e31
diff --git a/media-gfx/apngasm/apngasm-2.91.ebuild b/media-gfx/apngasm/apngasm-2.91.ebuild
index e5d8debea7bf..166900714da3 100644
--- a/media-gfx/apngasm/apngasm-2.91.ebuild
+++ b/media-gfx/apngasm/apngasm-2.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
 
 LICENSE="ZLIB 7z? ( LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="7z zopfli"
 
 RDEPEND="media-libs/libpng:0=[apng]
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 43324dd62cb1..6b78ef2c966b 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -2,7 +2,9 @@ AUX argyllcms-1.8.0-gcc5.patch 530 BLAKE2B cc0e43a6c00b37732f8c8e6abd62479dbadad
 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
+DIST Argyll_V2.1.0_src.zip 13823910 BLAKE2B 344520ba06055333858ebc1991939589fb276ee434a5d16c6eedbb318da1cff27a910298fdd0ced86f292d1e3564c6e0d6a2663cf7b80cbd4afcf2d49982b3f2 SHA512 9a74828c8cea8aac5795ab48b1531b2cbd43ea613e856eceb55ee291412eb5e8816f25f6bc620bd1bfb32eb8c08e87e85e821a2dcf0c25eac68d96184e8f8bca
 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
+EBUILD argyllcms-2.1.0.ebuild 2032 BLAKE2B ab27af1801046c31cce2b24267e3ad372ec5fce441cf4a42b5981bb278d6499178c76c188c935b12db27f0138019a68a4366de7891f0c3a8eb2106696b9a0200 SHA512 430d091e3421deee3fc1a5ab53ba549f677d143cbc5ccfffbc7434bf2b24d5017554b4eaf06895d0124a5c28adb19acf88401d974b2d385057054af0557b596b
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.1.0.ebuild b/media-gfx/argyllcms/argyllcms-2.1.0.ebuild
new file mode 100644
index 000000000000..fa22ef163023
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.1.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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/birdfont/Manifest b/media-gfx/birdfont/Manifest
index 72868ce09c67..e47da0f81483 100644
--- a/media-gfx/birdfont/Manifest
+++ b/media-gfx/birdfont/Manifest
@@ -1,3 +1,3 @@
 DIST birdfont-2.18.3.tar.xz 2333612 BLAKE2B bf1b92bd17b0d9970d091fcbbaadb5a027da35bee57cb9e11611959bf8ca09b08d582aa3e6a950a0b1b26688a8fbb3987197bfabb6156097da6a1343426dc051 SHA512 c86fff4e40ecfc571e3880cfa99f6adf518daae5476ea1b2a78bab031bc832bc5c8d58ecc928eda4922134fd3ceca312b80cbb8cf2fd35ecb8dc7656addb854e
-EBUILD birdfont-2.18.3.ebuild 1831 BLAKE2B 56a13202cf72c48de316028a6d55dcba764f9a469bfe1f05ee80ee1d237ab91c7f730d9cc9ae65d6dd08000832d93c2bdcf9d6dcaeda6c3a687354d72181ab54 SHA512 3a6dac916f99c69cff94e4661ccef0fbb651dd95114ebdb9802a32d92551215f1681a6dd7319b2b0fc35a5081daf4658c4228b7554234707b02101f401495832
+EBUILD birdfont-2.18.3.ebuild 1827 BLAKE2B da95f500edf7d328e6ceb88336a3f5518e2171b59624ff96573c0b54cf36fb29ccb42bce719b5037a490c70ffb8a2c4b07920a47d375cf8c6fe193bf68bf1076 SHA512 d36c4578e918d75e734752e06b5ccd4e41b1dbe3a94a2de3b0c9c72fb16f50cef7f6df276f089d09a66ef8d6631b10a029dd6a466c5e4ad1e57e58d4ef249a9a
 MISC metadata.xml 352 BLAKE2B a73cbe4b01dfc96aa631fc89a7bbc140d85eeb4e8757965a35a6d5cfcbd74d72499ecdeddabe963a972b9411c83c0099faf88dcef61df8cf1c9dc1b33af051a6 SHA512 ef910c9c78ad31aff97b15546e892bfa52a18ca9ccbf2b325c96c60f440fa09d5535ea2455e42dba2a11983b4e8b7eb7c3881c47fa6d43df6a22ac4d01535adc
diff --git a/media-gfx/birdfont/birdfont-2.18.3.ebuild b/media-gfx/birdfont/birdfont-2.18.3.ebuild
index cc951a0230fa..b74ee9b80fc7 100644
--- a/media-gfx/birdfont/birdfont-2.18.3.ebuild
+++ b/media-gfx/birdfont/birdfont-2.18.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PLOCALES="cs de it nl pt_BR sv"
 
 inherit python-any-r1 vala l10n toolchain-funcs multiprocessing
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 8f50c7d9aae5..89a23cc407fe 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,5 +1,5 @@
 DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6
 DIST CairoSVG-2.0.3.tar.gz 39371 BLAKE2B a04e3e3d311167cef84063fd3eabc4ffa7c206c5c6fc8016283874411c344c686c441a3149631eccb38b610bb86a2ec3c193eec869b8802ddba1dac92c612215 SHA512 b7ad7be9bd06059392f2004e7cd5c1df1667dbae78482c68d681990a8b3a4141a9c4b72aa4af5075a87ac6a1a4ddf8311d991512be98128b21b87d4355c1bd3d
-EBUILD cairosvg-1.0.22.ebuild 719 BLAKE2B 82df1e5d393515d46a551416cfa85569953a8b5aecde6bc80830b7cdd3951b031f17e5fcae230dd5ab86c0a10f3d8cff063bd5beb1a4781cefbe2b704d6f269b SHA512 e845c377a29f22bf71e3bc448663dd2c010b4bcf3dc73b30b9c24cf053b5f4a85be76de4e994b0730963f2fbc7b3ecfaf4244161c46502bc996b6d0f2911e6df
-EBUILD cairosvg-2.0.3.ebuild 713 BLAKE2B 48bd3d5934087be502ad61d46d1d9763dd7a4670f88bc43a25b868251110285137adbfa681e7189af0a6fa506dab9504075cc139a7b512eb7c48a0d6f7b0d479 SHA512 645ed6f4fa59a24ed568dde7aac28e8fb0690c2dd195e5d4c1381c54747bf79796ed87cd2d6cb2f487bef088caa3fb25e6794175f8c5af67625a837e4962e655
+EBUILD cairosvg-1.0.22.ebuild 712 BLAKE2B 26c16f78305f3b225aa42fc646b405a7c9b8a6f77970bb68ee3fbc13de5e89efa716359d5d5f94a28b1821077ffb81b71b1723b4a5e2609a57e54bb5e5e70b9f SHA512 6d664bfc3c8376af7e3d3b7f40b492a12acb3a96be9f30e3aadca9cde7b7ae95987191a19d15884703888d5a43368c727fb7bc4ebfc4fd946e8f716cf19c45af
+EBUILD cairosvg-2.0.3.ebuild 708 BLAKE2B 6f4ebd76feb149363726541b92fb8ae460e4221bca9e8ad21a66c6d900910a4b268f00696e312b492293fb4e688c767b84558641bbb9c7177acc31b16986c801 SHA512 165ef3557e7e47a8a3c179c7b5d67a33e8fe3b8528745518a37bb5909c8d8f2dbce80a4bd27f9516ef6004cd5aeac966c9906ff7a37ab9bb2e116156ab4a279e
 MISC metadata.xml 340 BLAKE2B 98ccd93460bbb405ae591ba8d5d216fcf57d07247bd2f03698b158eadaabf79d510393b32e7827f2d4a2e859e64f0ff3262ba4b6086baf5a0d893d942d516915 SHA512 48eddade88ce54234da4c04edc349a80d162f88ad6c96ee30b9434e792fe174654990efedabbe3927b78f54400c7aa61dcc8acd1776772d6e5bb31626cd31e4d
diff --git a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
index f898401de010..f3d8348892d8 100644
--- a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
+++ b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild b/media-gfx/cairosvg/cairosvg-2.0.3.ebuild
index 89657ccefda8..bd2d1bcd1d2b 100644
--- a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 442d155e6d46..b2f922b86688 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,7 +1,9 @@
 AUX conversion-examples.txt 545 BLAKE2B 4bda8339c0ae2f427ae0432b09da54aa5c194318b5cc0d3131c2e96f2b26ed0f91f6f419f0830fc773ab9be543019143755e039866146c6ce0eb361f9172ae4c SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9
+AUX dcraw-9.28.0-gimp-2.10.patch 1182 BLAKE2B 25a71d36fe20ea97b17f13a65e09fbbe786bffb4c57ea398adc83933bb8cdae27a5db8f0b12cc1e51671aa70e2da14755e5aefa2f035060d08da99c7d51e23bf SHA512 e237cf9e917f451bb141dc86dd80c4a78eeb7b42ccda28eabb94b2516dff4ef7148b97a34b61ab27fb9743b3a40f81ab2e416ff0950ffdffdae3a98925896c0c
 AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7b7767d45b88d7c139bb038816448c50a682c6645095f79be9d2836c6f896e27a8ffc20c SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
+EBUILD dcraw-9.28.0-r1.ebuild 3081 BLAKE2B 81ac28d2e8dced5e8d92e3df18ac1ea04438a652930665b392c16670ca1b77da1b81c2c23cf9112060cd2fd4e2bef6ba93445a5d49f72c059bd44df4a2b786e7 SHA512 bce5809ecb127cd172687ec32cdd0aabb17a90905c6ff2ba4355964210d14f38d457812833d7dce40cc3b09a1852aba446c600d2feb2376a89da25006fafdf78
 EBUILD dcraw-9.28.0.ebuild 2963 BLAKE2B 7ba95ebd63edcf718d263183ec26860ee7e7a2d9a835a01028a5b7cc29ee6ca8a9af3f2c0f411eebcf88c168a2891b87cedcbd7517ff415cb674f1121f2c7194 SHA512 f2082082748c6006cf81fd7888d9ed0a9b9373aaf1855ae8f699d7c51eb79cde748b3a702792f0bcd0a40b6c8eb4e8c0e8e838847c70a6841997b01d40a844e4
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
new file mode 100644
index 000000000000..b711bc3baee1
--- /dev/null
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Command-line decoder for raw digital photos"
+HOMEPAGE="https://www.cybercom.net/~dcoffin/dcraw/"
+SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
+	mirror://gentoo/parse-1.73.tar.bz2
+	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
+IUSE="nls gimp jpeg jpeg2k lcms"
+
+COMMON_DEPEND="
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	jpeg2k? ( media-libs/jasper:= )
+	gimp? ( media-gfx/gimp )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	gimp? ( virtual/pkgconfig )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/netpbm
+"
+
+S="${WORKDIR}/dcraw"
+
+DOC_CONTENTS="
+	See conversion-examples.txt.gz on how to convert
+	the PPM files produced by dcraw to other image formats.\n
+
+	\nThe functionality of the external program 'fujiturn' was
+	incorporated into dcraw and is automatically used now.\n
+
+	\nThere's an example wrapper script included called 'dcwrap'.
+	This package also includes 'dcparse', which extracts
+	thumbnail images (preferably JPEGs) from any raw digital
+	camera formats that have them, and shows table contents.
+"
+
+run_build() {
+	einfo "${@}"
+	${@} || die
+}
+
+src_prepare() {
+	default
+
+	# Support gimp-2.10, bug #655390
+	use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch
+
+	rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename"
+}
+
+src_compile() {
+	local ECFLAGS="-O2" # Without optimisation build fails
+	local ELIBS="-lm"
+
+	use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
+	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
+	use jpeg2k && ELIBS="-ljasper ${ELIBS}" || ECFLAGS+=" -DNO_JASPER=yes"
+	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
+
+	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS}
+
+	run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c
+
+	# rawphoto gimp plugin
+	if use gimp; then
+		run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \
+			$(pkg-config --cflags gimpui-2.0) rawphoto.c -o rawphoto \
+			$(pkg-config --libs gimpui-2.0)
+	fi
+
+	if use nls; then
+		for lang in ${LANGS}; do
+			has ${lang} ${LINGUAS-${lang}} \
+				&& run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
+		done
+	fi
+}
+
+src_install() {
+	dobin dcraw dcparse
+	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap}
+
+	# rawphoto gimp plugin
+	if use gimp; then
+		insinto "$(pkg-config --variable=gimplibdir gimp-2.0)/plug-ins"
+		insopts -m0755
+		doins rawphoto
+	fi
+
+	doman dcraw.1
+
+	if use nls; then
+		for lang in ${LANGS}; do
+			if has ${lang} ${LINGUAS-${lang}}; then
+				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
+				insinto /usr/share/locale/${lang}/LC_MESSAGES
+				newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo"
+			fi
+		done
+	fi
+
+	readme.gentoo_create_doc
+}
diff --git a/media-gfx/dcraw/files/dcraw-9.28.0-gimp-2.10.patch b/media-gfx/dcraw/files/dcraw-9.28.0-gimp-2.10.patch
new file mode 100644
index 000000000000..f590243a9867
--- /dev/null
+++ b/media-gfx/dcraw/files/dcraw-9.28.0-gimp-2.10.patch
@@ -0,0 +1,27 @@
+--- a/rawphoto.c.ORIG	2018-05-10 14:06:37.553419235 +0200
++++ b/rawphoto.c	2018-05-10 14:06:37.553419235 +0200
+@@ -105,8 +105,15 @@
+ 			  load_args,
+ 			  load_return_vals);
+ 
++#if HAVE_GIMP_2_9
++  gimp_register_magic_load_handler ("file_rawphoto_load",
++    "3fr,arw,bay,bmq,cine,cr2,crw,cs1,dc2,dcr,dng,erf,fff,hdr,ia,jpg,k25,kc2,kdc,mdc,mef,mos,mrw,nef,nrw,orf,pef,pxn,qtk,raf,raw,rdc,rw2,sr2,srf,sti,tif,x3f",
++    "","0,string,II*\\0,0,string,MM\\0*,0,string,<?xml");
++      gimp_register_file_handler_raw ("file_rawphoto_load");
++#else
+   gimp_register_load_handler ("file_rawphoto_load",
+     "3fr,arw,bay,bmq,cine,cr2,crw,cs1,dc2,dcr,dng,erf,fff,hdr,ia,jpg,k25,kc2,kdc,mdc,mef,mos,mrw,nef,nrw,orf,pef,pxn,qtk,raf,raw,rdc,rw2,sr2,srf,sti,tif,x3f", "");
++#endif
+ }
+ 
+ static void run (RAWPHOTO_CONST gchar *name,
+@@ -225,7 +232,7 @@
+   layer = gimp_layer_new (image, "Background", width, height,
+ 			depth == 3 ? GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE,
+ 			100, GIMP_NORMAL_MODE);
+-  gimp_image_add_layer (image, layer, 0);
++  gimp_image_insert_layer(image, layer, 0, 0);
+ 
+   /* Get the drawable and set the pixel region for our load... */
+   drawable = gimp_drawable_get (layer);
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index eb95669a91ab..168ecb30ead2 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,6 @@
 AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a
 DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
+DIST digikam-6.1.0.tar.xz 332466544 BLAKE2B 2f9aad537108a905d42bd218052287ccdb76a75e4883990c19a4c12318dbf019fa37b547e1adf4394dad14ab6f2a38d5f0c397060382d525ef7c1cabafa649d6 SHA512 36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da
 EBUILD digikam-6.0.0.ebuild 3951 BLAKE2B b7bcf74012b240e5864298c82e18e5f1d3a52f0df16c90896b9d2ba295e396f757f10e3c4a14dd8359086acfde797013d68bcfae57f4105de933d16790d0fd24 SHA512 50c11d1925a65f4d9c307bc1a32fb615176b7c14dd4ec3b30b4080b30f93845b732f725cae2a6fc188ea43982396a44acaf6e4fc64c1f47b95a4070f39ef8913
-MISC metadata.xml 1082 BLAKE2B b1bfefa49e333b9975e06c5cda58c787914aa8811a693f5132f1defa59ceaf6301dc931b5b6f7370a0dc1eef3692672ae96665aab6823a5b88f75c3d4efad368 SHA512 cd6bd240321db65a0800cc392f99929cd82fdd6c277422a3793fd242a9e0df9284ea16c9c68714e92066856f9a6eb0d53d1685cce22fe9f65b77cf2036f61254
+EBUILD digikam-6.1.0.ebuild 4167 BLAKE2B 0a25c675d347b1f4d693cd7020dd0dd308e07a98f42c00cc3ccee0ab0e5ec8689d574568f00ba6a57ef68edca9ffe4cd16d0e12c05f8ab7fc6e836890b410931 SHA512 9e47a3af8b4509714da06c680abb566b79ffbe81c7ff241b31e2183d4f1c796b1b80bc0c0c15bc28f1bdc9f196048b4d91a965e034eeaadf56d7a2e31aca5594
+MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.1.0.ebuild b/media-gfx/digikam/digikam-6.1.0.ebuild
new file mode 100644
index 000000000000..d0fd33163224
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.1.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
+inherit kde5 toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	SRC_BRANCH=stable
+	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
+	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+IUSE="addressbook calendar dnn +imagemagick gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql 'mysql?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/expat
+	>=media-gfx/exiv2-0.26:=
+	media-libs/lcms:2
+	media-libs/liblqr
+	media-libs/libpng:0=
+	>=media-libs/opencv-3.1.0:=
+	media-libs/tiff:0
+	virtual/jpeg:0
+	addressbook? (
+		$(add_kdeapps_dep akonadi-contacts)
+		$(add_kdeapps_dep kcontacts)
+	)
+	calendar? ( $(add_kdeapps_dep kcalcore) )
+	dnn? ( >=media-libs/opencv-3.1.0:=[contrib_dnn] )
+	gphoto2? ( media-libs/libgphoto2:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jpeg2k? ( media-libs/jasper:= )
+	lensfun? ( media-libs/lensfun )
+	marble? (
+		$(add_frameworks_dep kbookmarks)
+		$(add_kdeapps_dep marble)
+		$(add_qt_dep qtconcurrent)
+	)
+	mediaplayer? (
+		media-libs/qtav[opengl]
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	opengl? (
+		$(add_qt_dep qtopengl)
+		virtual/opengl
+	)
+	panorama? ( $(add_frameworks_dep threadweaver) )
+	scanner? ( $(add_kdeapps_dep libksane) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	vkontakte? ( net-libs/libkvkontakte:5 )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost[threads]
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql[server] )
+	panorama? ( media-gfx/hugin )
+"
+
+RESTRICT+=" test"
+# bug 366505
+
+PATCHES=( "${FILESDIR}/${PN}-6.0.0-cmake.patch" )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	kde5_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	kde5_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_APPSTYLES=ON
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake-utils_use_find_package calendar KF5CalendarCore)
+		-DENABLE_FACESENGINE_DNN=$(usex dnn)
+		$(cmake-utils_use_find_package gphoto2 Gphoto2)
+		$(cmake-utils_use_find_package imagemagick ImageMagick)
+		$(cmake-utils_use_find_package jpeg2k Jasper)
+		$(cmake-utils_use_find_package lensfun LensFun)
+		$(cmake-utils_use_find_package marble Marble)
+		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+		$(cmake-utils_use_find_package mediaplayer QtAV)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
+		$(cmake-utils_use_find_package scanner KF5Sane)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+		-DENABLE_QWEBENGINE=$(usex !webkit)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index fe15e413c171..3f8f9d04dcfd 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -10,6 +10,8 @@
 	</maintainer>
 	<use>
 		<flag name="addressbook">Enable akonadi contact integration</flag>
+		<flag name="dnn">Build neural network faces engine module</flag>
+		<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
 		<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag>
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 7790b0c84b66..d2b0b09585a1 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,5 +1,5 @@
 AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
-EBUILD enblend-4.2.0_p20161007-r1.ebuild 1755 BLAKE2B 651b934a2e1a63a5761b2fbd2ffc3fe2a9e45464359d7877041b65abea4cb001927a91d05159421d0e3dea042d1e6ae8f0802b40f371a00de2a17fe92219a234 SHA512 7b082d0d7716ed034b484173fef1a68beb892ca0f01048a23d00cdcd8ee99631f05bd1fd7531ebf5b1769eb927961c1ee0689a3e4bf8aeb69a289b0e12eaf2d3
+EBUILD enblend-4.2.0_p20161007-r1.ebuild 1756 BLAKE2B 65b93a2b9eaafc5771cec53a48e2d62dea398f2ed844ab3277e23e72e1935567401c1132efb02f2c55c5a346d7af370e380ab53f4d97a1f705006b7042d3ae9a SHA512 be06524f5efa2da515f7e3e6fb398dd9ce7e8c631277a87396a19a6b752bafe8b2782e2ff93696f5221feb58b05d6f517dd4f1d4d326dcb12e8921bea9669a37
 MISC metadata.xml 336 BLAKE2B ca7263a1856bc0a6de0a9085fcaa0df5745cda2f678c36984fc2bf11218207214dbad308c39811213d7ce5d376228bc87a60adbfd4fee8f02b2119af0ebac207 SHA512 ac71d3806312b434087a0ce55eadd3db06091e11a195fe90da48570bdb4ad47bf50c864ae2b82e25acb08b6ce78ebc6dc8b33bdd064ee449efcb0995806f2eca
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
index b98dd3a34295..137c0d695f54 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Image Blending with Multiresolution Splines"
 HOMEPAGE="http://enblend.sourceforge.net/"
 SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
 
-LICENSE="GPL-2 VIGRA"
+LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug doc openmp tcmalloc cpu_flags_x86_sse2"
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 1cbb3deedf6b..b523a26310c2 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST eog-plugins-3.16.6.tar.xz 398836 BLAKE2B fcd3c6dc61ca6d935580caffdf9c941d34265f8caa6cd3d682e0d7679888f6965f64ac30b807c00417e904b4e0eeff1a213a8f6d284c130abe265f9c97fc636b SHA512 e3bff786785ae36a41bc7c5fcb3cf75233595777409f373c4a6597fa6e432f72c7a75608e09ab66e1033ca0d12e3855346d7f7e0c571014b5aaef40184a3383b
 DIST eog-plugins-3.26.3.tar.xz 470712 BLAKE2B cd5845481006b681555f35d1f353ed624baa83fc8fc45bb889b2418f31a776bf9e08e270f911f61f431123825a5b96fa684f72e378ddd0ad1107ff44a5c98519 SHA512 5ea0bbf692fa71fa77b0b78307cceee067c95e80c2e69e173990c1154df8014912f24f8d023eda79da56b7c1bdf0870e5e92b968a68c4961af3fc1382d4f468c
-EBUILD eog-plugins-3.16.6-r1.ebuild 1603 BLAKE2B f260b6b3e7f3f2710b5875bede7448dda4e717205d4abc03ff4f8d102cb3c3e6ad3d1d85108f2382f8b2aea984de910228b2b150c1cd7f9b9483264b3124c8d0 SHA512 46bbf6a0236ce8957d28beb82414c6c3bb6b7e7ae0411f1cf295e0aca0bc5296448076e1aec09f0d970217556fcbe0bdee635741db81f6eb4ef4d2423bf9cf51
-EBUILD eog-plugins-3.26.3.ebuild 1652 BLAKE2B 5c0cf60a96213a7e486362c5b7fa78d36617f6cc6b9bcdad2b1896a890ebd0fc70b8e2c4aeb94b87e187e7ca91317a08c7c96718ffca0c70ec0f26f1d329c11b SHA512 7e1631b5cbfc22acb3524ac3f3c4105d91d104aa28fa77d3bfc8930ccd24cdc23853b3edf2323438459cbd2537929248536c64de8b41d148a41d7902d4531e10
+EBUILD eog-plugins-3.16.6-r1.ebuild 1596 BLAKE2B b567b54448539ec6131d31976bc05084d0dce25e1dd4c56e68159b53bf59bbdf6b95adbeecc9c60b81618d1ee2d57b62be91dd930a8604196c083a3185d9b5f8 SHA512 6c5319369b6453cc98c2a28721add88f404547c9e5ef7ac94fe21b99567a827a54d6404ff85270550b9fd5719b1e56350a515d73912460bed98666556bf85159
+EBUILD eog-plugins-3.26.3.ebuild 1645 BLAKE2B 3612e4ba2e617760703c89ac8b0b767a667030e463f66c02b96a7573b8477211179367609b255068ab19ecf6f7666cb7c914202bc02e242a0a9faadfb7b99316 SHA512 0a34bc3225f031a17fece2dd6ba65c27a191cadd7a8c363548674c3094d954ca33988d433d646ee71b04b4d936152089a75712bd7f5fb7699e39440e10adb024
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
index 87ff2256e591..d2fc7789e502 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit gnome2 python-single-r1
 
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
index 93902b0bb3c4..8cdfa42dd1c0 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit gnome2 python-single-r1
 
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 852acb292558..27bd583c4e79 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,5 +1,3 @@
-DIST eom-1.18.3.tar.xz 2198324 BLAKE2B efdee3c56fec54342184ae75f7ecb3ebda0227ab0586b2cfcd8c1b793e1b9ae2fdea79202c8b3e0bcb45d9cd5c0eaf6ad51d59b5508126d9160806bf4b7c8239 SHA512 64244d5f8c354c53e479027f38c359e38c1dba3cc937440e1af6e4a05f54fc4a65327311998575b90055b5e65bd0dc24dae81e40e0f82b99b3e41c44685d5188
 DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0
-EBUILD eom-1.18.3.ebuild 1478 BLAKE2B 648972bae8be6e4e4b564569d2abd953f8bfd5fdf82e1509f89787a7234afb3815067796d9f6fd1a310a5b2b6dd127708476625c01a59748261890b6a9c5648d SHA512 0f9daa87cd84f89ddb0175de079f29acc000161abb2eec166f68a004e1083240e6a791df58099f29532ef1bfd72eed5013190e58402b4a6fefdf6c0e9f5f81ce
-EBUILD eom-1.22.0.ebuild 1456 BLAKE2B 4bb777d8bf23c1c894acda59e6063d682b79d2b18bfbd7ac3d070f8c177ff881c9375c669e53fb10c01cb4f839c69acbe31066783c7ae3d36a92b0ef9e1141ae SHA512 e7744c76d2555db058b56e1773d47d3b86291395fe83036af263a12a54099990ba2cf463c89a61e6dfacdadc5a73b6ef0e265dd5e2a51a4f3dbeacd0c97a3eeb
+EBUILD eom-1.22.0.ebuild 1368 BLAKE2B 974c39063c4666a9c6c7a5748d41d5f7f80748423e6941cb120aab9369a52f2f23888013e1bf1519ade27abb540290c607a95357ad48db2899a4ed21be2e8ac4 SHA512 56ef038a5e994fea720703b4cdb5a7b7b9d6f6202a76d2e40f3973899e0b78546e3ac1fce01799225712bd0ead9f91570b05eac4b4943d186688030c99e7ecdd
 MISC metadata.xml 332 BLAKE2B f99f5d545ed10be2869ef90b4b80eeb7a8ffbdc291f5808a121842d7f6faa1de8ebd0b2cbe13db7ae04b6073387a29dcf78fa90dc6ef3b31cab07551f7c02f5d SHA512 e915e0cb254f2e1a431eccd93b45be28d85b33f0d988508031dea48a87be182a54cea01fcffecc202c029b0b6156860471841ed871e00c929fde1fb0dceb4317
diff --git a/media-gfx/eom/eom-1.18.3.ebuild b/media-gfx/eom/eom-1.18.3.ebuild
deleted file mode 100644
index 8b4d2d8201bc..000000000000
--- a/media-gfx/eom/eom-1.18.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libpeas-1.2.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf:0
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libX11:0
-	>=x11-misc/shared-mime-info-0.20:0
-	virtual/libintl:0
-	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
-	exif? (
-		>=media-libs/libexif-0.6.14:0
-		virtual/jpeg:0
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with dbus) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.22.0.ebuild b/media-gfx/eom/eom-1.22.0.ebuild
index b0edd30076c5..c0f71f634ca6 100644
--- a/media-gfx/eom/eom-1.22.0.ebuild
+++ b/media-gfx/eom/eom-1.22.0.ebuild
@@ -6,16 +6,16 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
+IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libpeas-1.8.0[gtk]
@@ -29,7 +29,6 @@ COMMON_DEPEND="
 	x11-libs/libX11
 	>=x11-misc/shared-mime-info-0.20
 	virtual/libintl
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	exif? (
 		>=media-libs/libexif-0.6.14
 		virtual/jpeg:0
@@ -41,22 +40,20 @@ COMMON_DEPEND="
 	xmp? ( >=media-libs/exempi-1.99.5:2 )
 	!!media-gfx/mate-image-viewer"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 src_configure() {
 	mate_src_configure \
 		$(use_enable debug) \
 		$(use_enable introspection) \
 		$(use_with X x) \
-		$(use_with dbus) \
 		$(use_with exif libexif) \
 		$(use_with jpeg libjpeg) \
 		$(use_with lcms cms) \
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 80c5d27498a6..e10f5e7cab97 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -2,5 +2,5 @@ AUX exiv2-0.27.0-doc.patch 1024 BLAKE2B 102557142367e36a3632c8c742e35aa820bed92b
 AUX exiv2-0.27.0-fix-pkgconfig.patch 710 BLAKE2B eb4952dc49f3a464ee2041c19de9dee404197814086bef869d99d30acb3a0eb13faa716472926c69dc0b44bdcd8d60494aa06855d9eec183fe4920e728f33cfe SHA512 2eb56a1641efbdb5abb6ed62259850f4cc9630d60c213782fc1cf44a705ca9d0fbde22eb6503c9a06dafcaf4eced4d21704442626b6e8b082457de31ae49fcf8
 AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
 DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
-EBUILD exiv2-0.27.0-r2.ebuild 2540 BLAKE2B b3b82cfe192f0b612770c0efd244272589f0f41c485a7b8183e9a79f179aeea5787ca78a09172d58f42cccb3ae0aa0350ebaeba844436bd035570c188be89209 SHA512 0ab5c3a135f61c847ae66f44b8266d56fd9ea830b6cf90626f9de3c104654ef923b51ef15b99d417a8f23ec315096debcc6565826f00ac6a4e43dc3df3bee877
+EBUILD exiv2-0.27.0-r2.ebuild 2541 BLAKE2B 64153fbdd34708a6ae6e71e90a9183f0e588ef102c618027ef4b006c965aa4543e998f4e4a2a03406395fdc1f4e00c158a344e1e1627f1ff37c05ca6c24e3951 SHA512 eabce178bab383cd95511a9259983f6af6ad5a7af5bd23c037a2041c82d6549dfa88753129721a6c4eeb5569030850c63f6ef987a72ca6b7a4ab1a902f68b4f4
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
index 6ec0a4ad1b44..d95c0550c1c2 100644
--- a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
@@ -15,7 +15,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
+HOMEPAGE="https://www.exiv2.org/"
 
 LICENSE="GPL-2"
 SLOT="0/27"
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 41d7b630376e..4eb9d5111ef0 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -10,5 +10,5 @@ DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc8
 EBUILD fbida-2.12.ebuild 2413 BLAKE2B a13d6907d2363749e807b1d18a07ddb43bd0f0fe58f44226bb33a6a0b5fbbcb8fdd3508e49714043ae95d02c7e52ac9a5a93d3403aadcd50aaaae69f3674ecaf SHA512 a90449e66ffb678b4eee8013dc634db4e3cb1a933405aa6c6ba0dbe1ff5cbe4df49ebab421ce3e175160fe2f9617a2dc6a7ec3f5f213f38082f9727e47fa53e0
 EBUILD fbida-2.13-r1.ebuild 2396 BLAKE2B 426cfd4ba38a58edb391a4985f37d4e58d018e575b0a128c3506cc7835e5f2a7ca967482e53a9c71139d929ba80bc5d407c55d5ab3f2cd221e489ec3555dfb08 SHA512 163007a96ada9fbbc6937e82a53de1c7dc7d07b20faf68e3b2bfd94baef32541ecf6fa4deb8dc213200e767823950f0625da03c0c058a282e31246481b9ed71c
 EBUILD fbida-2.14.ebuild 2349 BLAKE2B be5d3538f93d23fd806f9a6488e13156907341cb93dad8a180d02bedf1986d6093d76ec55d4fc7a06fe0e60cb14f0638941b893edc592e2d7680f27c537d7e1e SHA512 18228be236b992885dbf5b9d04289cc36a2d8b348319b24735f9868cb0038cafeee508d87fa5a50c33c433a8c3b8c68ac1ebf28b0a8727336ec023762a38cd18
-EBUILD fbida-9999.ebuild 2438 BLAKE2B 4d7d861cb734cc18a4e14c4fa20c57ce423f014e787fed9c3a64af1414bfead1f574650c2f081d675bd9fe34bf8e35b9af37101a457182fec894c77ba2997c9d SHA512 79f044737d5f3f3b1214dab5a8c142cc4138a421bdd9a3d68167469a03f4401c582923309400bb3690551b0d580fb878bca9d8d6233c813ab9234fc341d172ac
+EBUILD fbida-9999.ebuild 1233 BLAKE2B 56c7622721eee293c0ae8a87339ddc82bd4481ebaa7e79fb5801f4b5d1c0d7e097e6a66b7579495ceba6c771c81abcb01bb198d55cc5d5dce8aa08fb23254d6f SHA512 599f6af792c45c9f819d319f5d13232c4e9a793fa0d770742e1750c2a091c0e2a6054ff802c0d2640c7279e79be243139f1df4137662f5fad8fab0a723e96d7b
 MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58
diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild
index d2f3b8d0b085..b1a1c6b1f620 100644
--- a/media-gfx/fbida/fbida-9999.ebuild
+++ b/media-gfx/fbida/fbida-9999.ebuild
@@ -1,63 +1,51 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils git-r3 toolchain-funcs
+EAPI=7
+inherit desktop git-r3 meson toolchain-funcs
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
 HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
-EGIT_REPO_URI="
-	git://git.kraxel.org/fbida
-"
+EGIT_REPO_URI="https://git.kraxel.org/cgit/fbida"
 SRC_URI="
 	mirror://gentoo/ida.png.bz2
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
 KEYWORDS=""
-IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
-REQUIRED_USE="
-	ghostscript? ( tiff )
-"
-
 CDEPEND="
 	!media-gfx/fbi
-	app-text/poppler
 	>=media-libs/fontconfig-2.2
 	>=media-libs/freetype-2.0
+	>=x11-libs/motif-2.3:0
+	app-text/poppler
+	media-libs/giflib:=
 	media-libs/libepoxy
 	media-libs/libexif
+	media-libs/libpng:*
+	media-libs/libwebp
 	media-libs/mesa
+	media-libs/tiff:*
+	net-misc/curl
 	virtual/jpeg:*
 	virtual/ttf-fonts
 	x11-libs/cairo[opengl]
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt
 	x11-libs/libdrm
-	curl? ( net-misc/curl )
-	gif? ( media-libs/giflib:= )
-	lirc? ( app-misc/lirc )
-	png? ( media-libs/libpng:* )
-	scanner? ( media-gfx/sane-backends )
-	tiff? ( media-libs/tiff:* )
-	webp? ( media-libs/libwebp )
-	X? (
-		>=x11-libs/motif-2.3:0
-		x11-libs/libX11
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
 "
-
 DEPEND="
 	${CDEPEND}
-	X? ( x11-base/xorg-proto )
+	x11-base/xorg-proto
 "
-
 RDEPEND="
 	${CDEPEND}
-	ghostscript? (
-		app-text/ghostscript-gpl
-	)
 "
+PATCHES=(
+	"${FILESDIR}"/ida-desktop.patch
+	"${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
+)
 
 src_unpack() {
 	unpack ${A}
@@ -65,70 +53,19 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply \
-		"${FILESDIR}"/ida-desktop.patch \
-		"${FILESDIR}"/${PN}-2.10-giflib-4.2.patch \
-		"${FILESDIR}"/${PN}-2.10-fprintf-format.patch
-
-	eapply_user
-
-	tc-export CC CPP
+	default
 
 	# upstream omission?
 	echo ${PV} > VERSION
-}
-
-src_configure() {
-	# Let autoconf do its job and then fix things to build fbida
-	# according to our specifications
-	emake Make.config
-
-	gentoo_fbida() {
-		local useflag=${1}
-		local config=${2}
-
-		local option="no"
-		use ${useflag} && option="yes"
-
-		sed -i \
-			-e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
-			"${S}/Make.config" || die
-	}
 
-	gentoo_fbida X MOTIF
-	gentoo_fbida curl LIBCURL
-	gentoo_fbida fbcon LINUX_FB_H
-	gentoo_fbida gif LIBUNGIF
-	gentoo_fbida lirc LIBLIRC
-	gentoo_fbida ghostscript LIBTIFF
-	gentoo_fbida png LIBPNG
-	gentoo_fbida scanner LIBSANE
-	gentoo_fbida tiff LIBTIFF
-	gentoo_fbida webp LIBWEBP
-}
-
-src_compile() {
-	emake verbose=yes
+	tc-export CC CPP
 }
 
 src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		STRIP="" \
-		prefix=/usr \
-		install
+	meson_src_install
 
 	dodoc README
 
-	if use fbcon && ! use ghostscript; then
-		rm \
-			"${ED}"/usr/bin/fbgs \
-			"${ED}"/usr/share/man/man1/fbgs.1 \
-			|| die
-	fi
-
-	if use X ; then
-		doicon "${WORKDIR}"/ida.png
-		domenu desktop/ida.desktop
-	fi
+	doicon "${WORKDIR}"/ida.png
+	domenu desktop/ida.desktop
 }
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index 05bcb564e220..e4165582d364 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -1,9 +1,7 @@
-AUX fim-0.4_rc3-gcc6.patch 2140 BLAKE2B d5b041660e880675d83bd3743c647a12def7058a1731a272399a27999de61c51509df4b6e31f96a715ccdcec22a8506714eff22e28f643660c0b52e71502843b SHA512 288796013b4f3f54cb7893de2a558a5315c00bd09aed770bb3f0b743e06575d35d23addca67e192fcf96378f637d1421d2258785065c081816e9a556a7d930d5
 AUX fim-0.4_rc3-poppler031.patch 706 BLAKE2B b358bc51ccdb6b19533f4ef0571eb2f86e9f1259d4a6ca86d3cddeaf96b6e983a19993ce523a8edb45037eafd12412a56ca641276eb5ba6a915d0cd1bef8b88d SHA512 ddd9d5a9a8fee1269af6daed3edf965f3a2eba33c31c86bfae5af1b1db2e6809e6ad92439b9a438a7ab8a8dc7e30f9c472aad8d13c96b3d5371726b6fac6972c
+AUX fim-0.5_rc3-jpeg-9c.patch 723 BLAKE2B de59fa7a985fb38900ae3089bbbb20e2efeff2dbb7ccba3212155aff59a339af2f7c30488875cfb88691652682c78f56231366448d11e741f865c7c83133281b SHA512 be5692fc3a84a84aadccee3a5e86f0b3a1c4a2b8c2394640a762b98f1896463762a9d67f2ed62fa52d09d73224b2270b785725aac2ed658d5da497d8fdf9c9f8
 AUX fim-0.5_rc3-jpeg.patch 434 BLAKE2B a0de955643df8602a940f42f1727b4d7ae4ed1d65ce62ee32b0bf9882b1143aecf1566bc0328ae2ca7e6fd21d5331b78e43638fb2a295da09a816854e2e22f53 SHA512 e7918287d59a6677f2c0701a3e03871c2913aacb525438e56daf26064192606ff50b82b8334a3f96e1651fce895d7018606e24a06408fe1981a241f8b874dc7c
 AUX fim-0.5_rc3-libsdl.patch 905 BLAKE2B 5ee899dfa13c362ff4b5de243968376bd9c602f1c4d34763c99556fa0aa8ed523480fe4a65043124d5d65ebf67f376768647284db4a8ccfb812b62b33deee858 SHA512 b96dff8e07f44f24aa2324344889c6828f0d913f40a0b9eab8dffc58e3fddecafa36baa18eee08e19cbf5d1ad3996b1cbcda195c3f58f91537ce309a1345150c
-DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B 6a161e5b278b980a4442300f1c7d90b5ab690f6379cb0f2e72d7b2b3478d1877f1c99f1f46f173f788390ea32d6185f13d570ea128d2f52ff351dff74c779737 SHA512 82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf
 DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
-EBUILD fim-0.4_rc3-r2.ebuild 2501 BLAKE2B 5f66202def62df300eddfed039655131adbd86a26cbe316c8dc67cb9753e99749893a65af02780ad120db625c87ba4fb652fb363677b8cd0348796e08b1f268b SHA512 b0839bab333a084bdc2d2864e3fd03d084af3522c99d5699c2fe9251ccdf585043f7dce491805a8ebae893906fa2054be034d50435b2d98ad14e634484421e97
-EBUILD fim-0.5_rc3.ebuild 2725 BLAKE2B dadbe6a87a5a3bdbaa02da27e40bbc4dd36568d570ec7dfdf879870a7af7ebf0c91360511f626ce7065bb97ff26cdba44be38c0e24932e69c282baee0883d346 SHA512 a08429dcdec86eca9e50267ab7bef1b04dbf042f9718822b13baa83b06a6e2af57ec4107aaee7b9a9d3ac278c52c0222508003eac2b1e49f25478ee9b6215722
+EBUILD fim-0.5_rc3.ebuild 2714 BLAKE2B 931cad86c682320640e635d81afee47cddf15aa28261c0902c81ddc699cfba0a650ffa5072bf15dde38134f3deadf2a5ae786e7ea81599cc7e18f2babd2e0a38 SHA512 8f0bba1ac27b1a619c046a99a00dcfe043f50a3103855669606459a2f60a6adcfebbbc3eaab404240cb5e89df894e85a45ee5ffe6efadd8695dd8cb0ce2faa69
 MISC metadata.xml 610 BLAKE2B ef1a0623bedf204e2f261325be02fbb452355b2a9266afc320f81298cd1ae6b4bcb15f44713cb8640abcbf00b977294a6ca38f702e40fc5b6ce0c78b98b2b267 SHA512 4fdac65cfd930aac84e304c61addb77f7e19db8436ea477035615c93411449b5f3d314ee8b02864caed85d743d0f97c9d93e14dc4e513c048dd65223f788cef0
diff --git a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch b/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
deleted file mode 100644
index 7f5388b63b35..000000000000
--- a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bug: https://bugs.gentoo.org/595832
-Commit: http://svn.savannah.gnu.org/viewvc/fbi-improved?view=revision&revision=735
-
---- a/src/fim.cpp
-+++ b/src/fim.cpp
-@@ -114,7 +114,7 @@
-     {"device",     required_argument, NULL, 'd',"specify a {framebuffer device}","{framebuffer device}",
- "Framebuffer device to use. Default is the one your vc is mapped to (as in fbi)."
-     },
--    {"dump-reference-help",      optional_argument /*no_argument*/,       NULL, 0xd15cbab3,"dump reference info","[=man]",
-+    {"dump-reference-help",      optional_argument /*no_argument*/,       NULL, 0x6472690a,"dump reference info","[=man]",
- "Will dump to stdout the language reference help."
-     },
-     {"dump-default-fimrc",      no_argument,       NULL, 'D',"dump on standard output the default configuration",NULL,
-@@ -182,7 +182,7 @@
- /* FIXME: shall document this */
- #endif /* FIM_WITH_LIBIMLIB2 */
-     },
--    {"offset",      required_argument,       NULL,  0xFFD8FFE0,"will open the first image file at the specified offset","{bytes-offset}",
-+    {"offset",      required_argument,       NULL,  0x6f66660a, "will open the first image file at the specified offset","{bytes-offset}",
- "Will use the specified \\fBoffset\\fP (in bytes) for opening the specified files (useful for viewing images on damaged file systems; however, since the internal variables representation is sizeof(int) bytes based, you have a limited offset range: using already chopped image files may be a workaround to this limitation)."
-     },/* NEW */
-     {"text-reading",      no_argument,       NULL, 'P',"proceed scrolling as reading through a text document",NULL,
-@@ -979,9 +979,8 @@
- 		    cc.pre_autocmd_add(FIM_VID_SCALE_STYLE"='1';" "autocmd \"" FIM_ACM_POSTSCALE "\" \"\" \"" FIM_FLT_DISPLAY "'resize';\";");
- 	#endif /* FIM_AUTOCMDS */
- 		    break;
--		case 0xFFD8FFE0:
--		    //fbi's
--	 	    // NEW
-+		case 0x6f66660a:
-+		    //fim's
- 	#ifdef FIM_AUTOCMDS
- 		{
- 			int ipeppe_offset;
-@@ -1191,7 +1190,7 @@
- 			}
- #endif /* FIM_WANT_OUTPUT_DEVICE_STRING_CASE_INSENSITIVE */
- 		    break;
--		case 0xd15cbab3:
-+		case 0x6472690a:
- 		    //fim's
- 		{
- 			args_t args;
-\ No newline at end of file
diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch
new file mode 100644
index 000000000000..3e0c3067a310
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/670020
+
+--- a/src/FbiStuffJpeg.cpp
++++ b/src/FbiStuffJpeg.cpp
+@@ -115,7 +115,7 @@
+     cinfo->src->bytes_in_buffer = h->tsize;
+ }*/
+ 
+-static int thumbnail_src_fill(struct jpeg_decompress_struct *cinfo)
++static boolean thumbnail_src_fill(struct jpeg_decompress_struct *cinfo)
+ {
+     FIM_FBI_PRINTF("jpeg: panic: no more thumbnail input data\n");
+     exit(1);
+--- a/src/FramebufferDevice.h
++++ b/src/FramebufferDevice.h
+@@ -37,8 +37,8 @@
+ #include "DisplayDevice.h"
+ 
+ /* these are required by FbiStuffJpeg.cpp */
+-#define FIM_FBI_TRUE            1
+-#define FIM_FBI_FALSE           0
++#define FIM_FBI_TRUE            TRUE
++#define FIM_FBI_FALSE           FALSE
+ 
+ #ifndef FIM_WITH_NO_FRAMEBUFFER
+ 
diff --git a/media-gfx/fim/fim-0.4_rc3-r2.ebuild b/media-gfx/fim/fim-0.4_rc3-r2.ebuild
deleted file mode 100644
index 8f78c3df9c25..000000000000
--- a/media-gfx/fim/fim-0.4_rc3-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim"
-HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved"
-SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aalib dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pdf png postscript readline sdl static svg tiff xfig"
-
-RDEPEND="media-fonts/terminus-font
-	aalib? ( media-libs/aalib[slang] )
-	dia? ( app-office/dia )
-	djvu? ( app-text/djvu )
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	imagemagick? ( virtual/imagemagick-tools )
-	jpeg? ( virtual/jpeg:0 )
-	pdf? ( >=app-text/poppler-0.31 )
-	png? ( media-libs/libpng:0 )
-	postscript? ( app-text/libspectre )
-	readline? ( sys-libs/readline:0 )
-	sdl? ( media-libs/libsdl )
-	svg? ( media-gfx/inkscape )
-	tiff? ( media-libs/tiff:0 )
-	xfig? ( media-gfx/xfig )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-poppler031.patch"
-	epatch "${FILESDIR}/${PN}-0.4_rc3-gcc6.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable aalib aa) \
-		$(use_enable dia) \
-		$(use_enable djvu) \
-		$(use_enable exif) \
-		$(use_enable fbcon framebuffer) \
-		$(use_enable gif) \
-		$(use_enable graphicsmagick) \
-		$(use_enable imagemagick convert) \
-		$(use_enable pdf poppler) \
-		$(use_enable png) \
-		$(use_enable postscript ps) \
-		$(use_enable readline) \
-		$(use_enable sdl) \
-		$(use_enable static) \
-		$(use_enable svg inkscape) \
-		$(use_enable tiff) \
-		$(use_enable xfig) \
-		--disable-hardcoded-font \
-		--disable-imlib2 \
-		--disable-matrices-rendering \
-		--disable-xcftopnm \
-		--enable-fimrc \
-		--enable-history \
-		--enable-loader-string-specification \
-		--enable-mark-and-dump \
-		--enable-output-console \
-		--enable-raw-bits-rendering \
-		--enable-read-dirs \
-		--enable-recursive-dirs \
-		--enable-resize-optimizations \
-		--enable-scan-consolefonts \
-		--enable-screen \
-		--enable-scripting \
-		--enable-seek-magic \
-		--enable-stdin-image-reading \
-		--enable-unicode \
-		--enable-warnings \
-		--enable-windows \
-		--with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-}
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index 1fc260ca524d..3e4bdf97f88a 100644
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.4_rc3-poppler031.patch"
 	"${FILESDIR}/${PN}-0.5_rc3-jpeg.patch"
 	"${FILESDIR}/${PN}-0.5_rc3-libsdl.patch"
+	"${FILESDIR}/${PN}-0.5_rc3-jpeg-9c.patch"
 )
 
 src_prepare() {
@@ -82,8 +83,6 @@ src_configure() {
 		--enable-mark-and-dump \
 		--enable-output-console \
 		--enable-raw-bits-rendering \
-		--enable-read-dirs \
-		--enable-recursive-dirs \
 		--enable-resize-optimizations \
 		--enable-scan-consolefonts \
 		--enable-screen \
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index ff0d95dba9e1..d2b3955c4007 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -5,6 +5,6 @@ AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6
 AUX 20190317-gdk_init.patch 1391 BLAKE2B 6b4294e24d1bef0300344d2c11ef59d7d3f22d83ba7e8cc3e981db827dde7c30f234be35c017cc8c854ae090aa1f3e177af2c4bc511365fdbdb2e8c40402dda9 SHA512 3976f2a860f6c6aaec8e1532ede9fde7beff3ae98ca8e0cf87b33b7165f158ae676c751a7cb3e7897f1dff3f03c041d4ee6bd06e68904973b5bc5acdee5bede5
 DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r4.ebuild 2849 BLAKE2B 3989df4621ff1d3a29abce501a9aa3490daa2caceeee9205f8571c51ccbe6f2328e1cde3a2ebbfd954cdd75a86cce3a27cd38ed690927a7b3309000546bee4aa SHA512 2c5c592c8b637c04da4f532c5357fabdb8dd5850bdb77af6a24b8c0b7dfe539e16f86570f65f1e66cee2b97e79227552e4fafb2aa40aa9a1a06365eb49449f07
+EBUILD fontforge-20170731-r4.ebuild 2842 BLAKE2B 6f39603b1bce78d27632e4cfb469f854e9970db77f68f4e48724b87993fb9174669f70a1e27872e9bba8e63a1cf8bc5abf60627421db211ad14be2a56190ef22 SHA512 e48df12792942616ac47ef585c6b89aefe5bfe876f638b1eb81dc14f2df2c1316d5f6b9decb4daca5c63ad74dd00b68cdeb7cf04d499a7cb788b11dc1a7f106c
 EBUILD fontforge-20190317-r2.ebuild 2762 BLAKE2B 4e0abd3354e71a91f4e6b3390820a1972ae219410dc09f9ca5d8e819e4817ab95c314a46f4afb1a02ad56d48b50af64cddbf34238a8b9b3dca039ca77a1d8020 SHA512 14633892a06c9a3da79f284bf61ce5ff58374f0768fe587c9dbf4737bb9cddbbf36b8d73ce9b2a38a3ed54eb1a8323851f8c4afe62cff17e70ad4001c06a5dcd
 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 eb072da531ae..75d7faf5bb94 100644
--- a/media-gfx/fontforge/fontforge-20170731-r4.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit gnome2-utils python-single-r1 xdg-utils
 
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 0f451423c44b..95b87a9f6397 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,5 +1,5 @@
 AUX geeqie-1.4-exiv2-0.27.patch 2052 BLAKE2B db7bb4d2631d566e4c9dbc89cad262cfb173df96b92ea83a690bdcdbbb7d3c873e9e5bd5a581c45b3a4af42c3c7711c65080e1822eaa31be97632b57d4e34713 SHA512 b8108f9a77022f1a0d1354883d1f7a1981a8079e675e765aa67fac16606ed42ecc169ad5cb8a6baf86e919d6ddf018ed54bf5950b9601d2cd1ff647f7fa47bca
 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
-EBUILD geeqie-1.4-r1.ebuild 2367 BLAKE2B bca36e24f57330c1d9993c191326cb9e204663770a885904fad177a4f3f18394bfaa07f88ed659a9771b25ad2e34e01de219dbac5e487c16d9dbc193399e7ea9 SHA512 f6fdf9420db3861bb2e533b0319bfd147c4b6fe6c5e1201c54a557c112d9f4843b4d80a037894ff7656d724e7a2026b8b095ef0cb63e4d580c161c32946c87f5
+EBUILD geeqie-1.4-r1.ebuild 2396 BLAKE2B 4fe4b8aee881eb138f5b8bf2a7199c18858d45586220c549173d13d8ab5e200b143e8aca3ab623bb9e507419d6b5e5027c63a47d72d4606355a3e9adc03381ea SHA512 5b4b13476620aeee811cd06f357c2fc49a1e732f68a0508715ba113b02688440738edb4799f53adf2a79c713e22c3ed19ef376981b2aed9be884bedd70880bf0
 EBUILD geeqie-9999.ebuild 2269 BLAKE2B 719319e9805f58a4f1dfaea869c911f1ade15e762ba46add49975f17b38a6e3909b74e0db223082c06ae55c0aa655389ab5a10e75d4d1dc85552e55105fe29d0 SHA512 8435b9882a9a767af7592bfb59e32d47f0f01e932eac23f920bf0933ae1ae3044302205dd6902fe490c6f995d669b1eaf62b141cc66538444bd5d57d39d896b4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
index d98bed393028..5cf44c8bfe1d 100644
--- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
@@ -49,6 +49,7 @@ src_prepare() {
 	# Remove -Werror (gcc changes may add new warnings)
 	sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die
 
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
diff --git a/media-gfx/gimp-arrow-brushes/Manifest b/media-gfx/gimp-arrow-brushes/Manifest
index fc6186c08cd3..c1d240d3fb98 100644
--- a/media-gfx/gimp-arrow-brushes/Manifest
+++ b/media-gfx/gimp-arrow-brushes/Manifest
@@ -5,7 +5,10 @@ DIST arrow_brushes_black_gloss.tar.bz2 35106 BLAKE2B bd6656cd81d58cd03436eb26f1d
 DIST arrow_brushes_color_1.tar.bz2 6911 BLAKE2B 64c9476203d0824cba9f11f2c96755226a0a5dfdbc6729cd20f7329840c155088f0389ea15f58219e9616988485f34a2d4104e160ca830a7b5bac9c001bf52a0 SHA512 f656ce8a78122a041f0e3fbb1a2239e3cac71e5381a2301dacba2e72daf3ef8ff5a885979aefd5a657e5395a816b6a6a97cd0ca15c866a391f86a13d9e682c7d
 DIST arrow_brushes_color_2.tar.bz2 33699 BLAKE2B 9af6c053394a05cbe2536890f513a3a85a53773143c930f60e4ff519f45379472d2d88017341e7dc1e3e3f484fc07a1b22a8b1f09d03ee000b8a8dce1fa9bf79 SHA512 82ed728f812f667a37a966c91c3b7b8f95b42e449da615a92bf61c694e81930a6a9aed2b6bc49a01e81c91977152b041fa32d4de0bc23564337893e77def7080
 DIST button_arrow_brushes.tar.bz2 35320 BLAKE2B fac53441cba1f11691ab88ecc29598ab62d65f73d13a2865c81abf388d1ed4fb7e2c38dc5c3c35e6cb5c85796bbe0ef6166e20d943167c5222808db363bb66ec SHA512 54e36152f169240d5caeb6e5230c3398465b96522399044e39db2d204983decc48e0e6043d65c7647b4e46abeec24e8ac3470110541d2d38ae4e4ba44a023b21
+DIST checkmark_brushes-1.0.tar.bz2 67478 BLAKE2B 039845fdb46b8163dbd8240ab4c993f4f25e9b0e8fcdb1c4d68de994379bbbdc25dbaab452995e950a84339d0506d933a6f04340cd0cb9bc5cf9a7343b8ed85d SHA512 a8f79002baf4624e10edc06fa4b382561d0c443fccec1ed7bb64cd30d9968b34fe988719b6d0710b6fd8f4d1c964e1e4332056b9617aa7e903f181c1ae8c55e1
+DIST circle_brushes-1.0.tar.bz2 42630 BLAKE2B dec1f22bdb9faa888aa2262dd92b3866ca6761669c5da0d8b3d37e830a6b4a075e55f974960aa77b2ae3983f2f07e86b490a13e8a001d1395abd21e28d92c80e SHA512 57b97fba45f165871ea72314ab316cd483827dac2c0b006e5734dc378936c7d2ee277319cb6e3528d404160ab0118c9976f09b09445475be34ceb5b692c712d1
 DIST cursor_brushes-1.0.tar.bz2 18272 BLAKE2B 23dd380173e8962efd43367f7f0c61fec72d3208463423a834e4c4b9612dad46baa715635a509d4737bc40b491375b0b95847a062170fd389c1e7318ac327459 SHA512 e9fa944f9c210518c96929b6860c4234e9c7e69cada7fe85304043d5ef3118d40b3f90696057e28ab98cd4587d4aef8b150171863b5c1c1b51255b6cd23ad3ff
 DIST hand_pointer_brushes.tar.bz2 19068 BLAKE2B b662c0b1ef8a0639c1ce9e6d8d05637f4fa8db837c2ce5191c1cb4eb83a5388324afa02473f9235770f4978406ef9cdd38303acde0d6b2174b5fff0dcd5d84d5 SHA512 b072b58f7219057b682459b5b73d60e5cf26943436c1116dc4fb73076a32b02d0164f2f0506cb0cae4378c54bdfd2a66281c7fd42a7a6919afb19896e2193c34
-EBUILD gimp-arrow-brushes-20120122.ebuild 960 BLAKE2B c9484599480189bafd11e56c18e06f7499bc9e9bda323db4a1bb1084d4b58bcec403d9219467d339a0aa017e98bdb8404625ae01cb058252a70e7695ad2f51ed SHA512 acb763419c8b6eb7ff51977ec18572b9206da18e99c0cd2ca7a410a522a87aeee0744b44500237dd3514507e027d794553f53575cfa9eb3a6c91f521aff8b55f
+DIST star_brushes.tar.bz2 10610 BLAKE2B 40bef059e87d2ab162acff8b1525a89acf98a98c4e8b7e8b9bc7fc55341f4508e0c7c4eff5d49ebc4fafee9c2e4af0ba54d287f6a1ff0efe92831c7037f9be63 SHA512 31e8bb173363b455d89ad98846c7392f9f2b5b77e48d1f0afa114c54bfd40aa1b772f8d64de670209fa98a6bf68863e2424f5ce008e9c0e4942bb8bd6cf12e01
+EBUILD gimp-arrow-brushes-20190407.ebuild 1290 BLAKE2B f0416dd4dda056568d7e7b7f92f5c924292135c3d42503132206719cfbe7304476a41e476b28e1a0223c4867776d0555166ca0b8eb489d12d29347fe59a04e43 SHA512 c8373b857937d120c6efeaf29c7c6af9013272d9a748f3d8612ba1de95668d63e90ec69f25402b74985765cbe8be4428cb9256c89369762574de775deea53ad4
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20120122.ebuild b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20120122.ebuild
deleted file mode 100644
index 186be49c8c20..000000000000
--- a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20120122.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Brushes for GIMP with the styles arrow, handpointer, button arrow and cursor"
-HOMEPAGE="http://www.gimphelp.org/index.html"
-SRC_URI="
-	http://www.gimphelp.org/DL/arrow_brushes_color_1.tar.bz2
-	http://www.gimphelp.org/DL/arrow_brushes_color_2.tar.bz2
-	http://www.gimphelp.org/DL/arrow_brushes_BW_1.tar.bz2
-	http://www.gimphelp.org/DL/arrow_brushes_BW_2.tar.bz2
-	http://www.gimphelp.org/DL/arrow_brushes_black_gloss.tar.bz2
-	http://www.gimphelp.org/DL/hand_pointer_brushes.tar.bz2
-	http://www.gimphelp.org/DL/button_arrow_brushes.tar.bz2
-	http://www.gimphelp.org/DL/arrow_action.tar.bz2
-	http://www.gimphelp.org/DL/cursor_brushes-1.0.tar.bz2
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	for i in */*.gbr; do
-		insinto /usr/share/gimp/2.0/brushes
-		doins $i
-	done
-}
diff --git a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
new file mode 100644
index 000000000000..5958ac66e933
--- /dev/null
+++ b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Brushes for GIMP with the styles arrow, handpointer, button arrow and cursor"
+HOMEPAGE="http://www.gimphelp.org/index.html"
+# http://www.gimphelp.org/DL/ refuses wget without user-agent
+SRC_URI="
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_color_1.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_color_2.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_BW_1.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_BW_2.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_black_gloss.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/hand_pointer_brushes.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/button_arrow_brushes.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_action.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/cursor_brushes-1.0.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/circle_brushes-1.0.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/checkmark_brushes-1.0.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/star_brushes.tar.bz2
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	for i in */*.gbr; do
+		insinto /usr/share/gimp/2.0/brushes
+		doins $i
+	done
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index fb1b7a9b0260..7e4d8f15f22d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -9,17 +9,19 @@ AUX gimp-2.8.22-cve-2017-17787.patch 1058 BLAKE2B baeffda42385b552709781a772ef59
 AUX gimp-2.8.22-cve-2017-17788.patch 1012 BLAKE2B 90bc17b66dd40426073a2581c20e68551b1c80378e055704d36ad56cc0a2b7448c847b847aacded6b8033ee86b3bb42e679845a46c65c1ea2d3af8c90aeb53f8 SHA512 82231c53664535c66d70b4e129b24afa31a50d465968f1012e20420ee71842435acf7d43de78cdac81602d80b89a927c03f9d60159c89c41d4b88e6851ed8acc
 AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f00231e535ba3502875e8e90350e62c2cd0ff634ab1b38f16bb098670dd1e9d21c88aa64e19c3f81600acc7ea448e8f22b90 SHA512 f2f4aff0f0478356513a1f6da0732c5d0986ef1deb7b8e68bd283b7259887cf9a4d4785f00e48f03892cc86aa715b9764302640b2b891ab16617ef595ab779b8
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
+DIST gimp-2.10.10.tar.bz2 32408724 BLAKE2B 7d4f06d255d7b853f08c2a8bd9695b5cbc27a417f2f78aab56c970675430534b7c6f870168c5555369b873971b4ca3889565085cfc0cb9b2e1bb60c3bfe938bd SHA512 87caab9643a018e741e5e51c61220b7b282a66ed5bb723750cdf4139950f98c9ab246f4d6450420531d0e878c4561150efc4063cda896f08b25669bac4d1d172
 DIST gimp-2.10.2.tar.bz2 30863771 BLAKE2B a3525f7266ffe35be1daf973bee4ea107d9e7384e0c85a792f2fc69bd29fa8ee3d19409586b9b1e1bf36a1be4e30719c7ed945e5de9b7cb4be4f81be06ea1468 SHA512 6e351294e018a9f879993700355bdf5f10bccc6862604ae1950c4d235d32cdfcd6a0195b37377819adeef53ab3d24f32ed1de60cba6bafe58608ed0906a6fbcf
 DIST gimp-2.10.4.tar.bz2 31064613 BLAKE2B 66d815c830696923759146dce68049131078ddf4f67242c78a7755db34c1b7e31b1b25bfe52e8e47a7fb81e24e60e4161261043484242c4682ca6cf362d55816 SHA512 9d0cc8d97b82423687b579907edaab6044f19a8207426edf4f7428de23fa82481112bb0a53b06bb7037b68d92336517b1eddef4600519707e7feedb64e5414f7
 DIST gimp-2.10.6.tar.bz2 31447973 BLAKE2B 96df16c1d774726580ad09317cba31f36bac341aa53178bdb04444c87406465b2c56d508ba0b8c012ad8abc85136f8c635b6e9875e4da57c97e6a6832edbc296 SHA512 1330ec756ec5f57243435e66aeb5f6214a9783e26763be6679714010a631e47dbb8b5f610195587af29261d2183332a4a4c6202acafc3f2837ae7a6b7f9a30c2
 DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
+EBUILD gimp-2.10.10.ebuild 5963 BLAKE2B bfb209689c7cd9f2f72f9129c2fedfc8e4668513f1c8f18a6635ec6c2e7800008cc1c713cabd9d62e3f33e9cda2eb45877d3c8b2a36ee0cac4e2070ec883a596 SHA512 52cd5f35ea3d518ac8d1b85ea4ec6c93c622ce1a221dbda48724ccb987bdf7899517e0e6d7b6941c67b32ecd266ed3cfd5c8ff9914976b970aa65aab66bcdd57
 EBUILD gimp-2.10.2.ebuild 5274 BLAKE2B b2ad4c07c37503dd243731b809995d063ec237a63ece2d84a9e84f39171d03a718cb262ad8520b9cc8a976a3a426877c28f7401773f4ff26baf36c1ea1ccee76 SHA512 7a5fb5056250cac3fe0842fd869701e6fb91af8ae99f97d4fdba13ae2fd3ed6b7a37acb5988258a61548bc720867357d5593c147d01997d7da3dd8e789fae281
 EBUILD gimp-2.10.4.ebuild 5274 BLAKE2B 3b3da266805208b6a2931ee06a9c0a4fab9de812283e799b0e76f12a2b7bf02b058dbb5a13654919b7514f4464ddb068e2c1b65280fa9bebb32d3814a10ebb5b SHA512 f9d7a30c93cc898bfc5c6a402cabe95d449315566f28644b5835849d49cfff39ac690a726ccf5a21ea98deba648a66f652eb93273d08baa9add5d6c4cff23c04
 EBUILD gimp-2.10.6-r1.ebuild 5964 BLAKE2B 4f834599caa6b9a2823dce38a8770d2383f2a63e3844e29b8a22e20485e7b9d6f8031eecd7820933b595f920905664aa878fa86d70c8aae942e4b766407ed151 SHA512 70f741ee3c68006d2488b8064b4e176e260c21a67517a3d6ebed8e2daa13ab1e87f1caa76d2b15d12fed6939bea32ada8e662865ff385508899d8299d74de05d
-EBUILD gimp-2.10.8-r1.ebuild 6043 BLAKE2B 3ca970fa7633422f2dbb2d97760ae362ba42f68a79050383a929112900ed8e36e76fc9863fd251108c1698ad339ffb664c7e5ab2db33240bf2fca5ecf37ae6d0 SHA512 e59e9dce2257dbe0fceeb2f449ac7625846e1d47026807451dff920f5489d5979312b6b5daab67d46480becf83786aac2c3ba17bd53b1e2b5b78ab2990f6308c
+EBUILD gimp-2.10.8-r1.ebuild 6042 BLAKE2B 56393dafada4950dd3d1da114663757a5cf4e498c58b0ebdfb8f1dd7b1e4f15610170be65be3822a05d04bc47bef40eb768c05029c6300ee1ddfebde2cef0223 SHA512 29bd3ab7f6f0c38ef82d123e1e8b670d6e8e40858b7dcbe4bd7933e4d0451ceade21a8b2e09c67ae3daa8d319b0cdfa3c45865332f4c531e1127333ebff157e5
 EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
 EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
-EBUILD gimp-9999.ebuild 5926 BLAKE2B 7cb98417de8c6d8763e267dbaf5ff957dfb28433a9bd4ba80ca02354ce9520abc719c261d3d300d5cb4ce18e7e25a6f62862bf551a75ce06d5b60b3a0603ee05 SHA512 6a302141451c735e63d6343b52c58088fc93574a467b5f221150115af6d5260c53e65ab634d3466c4bcd01c6dd6bffcb0fa8f4594f592a7fb1e429275f92dec7
+EBUILD gimp-9999.ebuild 5950 BLAKE2B 9e6f8d667e22ef8adf155b645c109946f76b73429985efe23a218bf96c7914ca3f7eae4bb39258916a7897587581759ae39df2d92da1cacc2998846c9e5da171 SHA512 9cfb8f01a32f60c24f4ceea4520f746eecd5d4fbcb8aaaf8f03acae05c1d15ebda9ddd2dffb9facb557300c502c8d7e85a468790885b25ddc16ab1d94ba4027e
 MISC metadata.xml 474 BLAKE2B 7beaaa52a35415b9460b23f5031f71464008417e589105db607f0f86519cb7f19c9621dc77acea9aa9e67a1bf8f5887415761a69a29eb77aa205a89cc8b586ac SHA512 f1a58ab4fc0c7a4257648f35027d0860ee7b088ebd61703dde7622078bcc345168f3b747e79d71206ae36c479334925aac137e96c0d2134413f9e62aa27cee53
diff --git a/media-gfx/gimp/gimp-2.10.10.ebuild b/media-gfx/gimp/gimp-2.10.10.ebuild
new file mode 100644
index 000000000000..cfcc2774ce96
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.10.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+
+inherit eapi7-ver virtualx autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+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 heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
+
+RDEPEND=">=dev-libs/glib-2.56.0:2
+	>=dev-libs/atk-2.2.0
+	>=x11-libs/gtk+-2.24.32:2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/pango-1.29.4
+	xpm? ( x11-libs/libXpm )
+	>=media-libs/freetype-2.1.7
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/libmypaint-1.3.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.62
+	>=media-libs/gegl-0.4.14:0.4[cairo]
+	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/openjpeg-2.1.0:2= )
+	>=media-libs/lcms-2.8:2
+	mng? ( media-libs/libmng )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	>=app-text/poppler-0.50[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}]
+		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+	)
+	>=media-libs/tiff-3.5.7:0
+	>=gnome-base/librsvg-2.40.6:2
+	webp? ( >=media-libs/libwebp-0.6.0 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	net-libs/glib-networking[ssl]
+	x11-libs/libXcursor
+	sys-libs/zlib
+	app-arch/bzip2
+	>=app-arch/xz-utils-5.0.0
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( virtual/libgudev:= )
+	unwind? ( sys-libs/libunwind:= )
+	heif? ( >=media-libs/libheif-1.1.0:= )"
+DEPEND="${RDEPEND}
+	>=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
+	>=sys-devel/gettext-0.19
+	doc? ( >=dev-util/gtk-doc-1 )
+	>=sys-devel/libtool-2.2
+	>=sys-devel/automake-1.11
+	dev-util/gtk-doc-am"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	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
+
+	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
+}
+
+src_configure() {
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+		--disable-silent-rules
+
+		$(use_with !aqua x)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_enable altivec)
+		--with-appdata-test
+		--without-libbacktrace
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--without-webkit
+		$(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 heif libheif)
+		$(use_enable python)
+		--enable-mp
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with wmf)
+		--with-xmc
+		$(use_with xpm libxpm)
+		$(use_enable vector-icons)
+		--without-xvfb-run
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+	addwrite /dev/dri/  # bug #574038
+	addwrite /dev/ati/  # bug 589198
+	addwrite /proc/mtrr  # bug 589198
+
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+_clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		has ${lang} ${LINGUAS} && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
+	done
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	_rename_plugins || die
+	_clean_up_locales
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
index f4e16cd1bf9b..3c52ca4f773a 100644
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 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 heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 726f300ada28..81a0a726eb37 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 GNOME2_EAUTORECONF=yes
 
-inherit virtualx autotools gnome2 multilib python-single-r1 ltprune git-r3
+inherit virtualx autotools gnome2 multilib python-single-r1 git-r3
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
@@ -20,7 +20,7 @@ IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu
 
 RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
+	>=x11-libs/gtk+-2.24.32:2
 	>=x11-libs/gdk-pixbuf-2.31:2
 	>=x11-libs/cairo-1.12.2
 	>=x11-libs/pango-1.29.4
@@ -35,8 +35,8 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	dev-libs/libxml2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.58
-	>=media-libs/gegl-0.4.12:0.4[cairo]
+	>=media-libs/babl-0.1.62
+	>=media-libs/gegl-0.4.14:0.4[cairo]
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
@@ -46,7 +46,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=media-libs/lcms-2.8:2
 	mng? ( media-libs/libmng )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
-	>=app-text/poppler-0.44[cairo]
+	>=app-text/poppler-0.50[cairo]
 	>=app-text/poppler-data-0.4.7
 	>=media-libs/libpng-1.6.25:0=
 	python?	(
@@ -129,7 +129,7 @@ src_configure() {
 		--enable-mp
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_with udev gudev)
-		$(use_with unwind)
+		$(use_with unwind libunwind)
 		$(use_with wmf)
 		--with-xmc
 		$(use_with xpm libxpm)
@@ -201,7 +201,7 @@ src_install() {
 	# precedence on PDF documents by default
 	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -type f -delete || die
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
 	mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 81db70e18bf5..7cfe448b6b84 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -3,5 +3,5 @@ AUX gnofract4d-3.14-manual.patch 914 BLAKE2B 20be2e073ba3fb8fe06647b091e152a5d29
 DIST gnofract4d-3.14.1.tar.gz 4660808 BLAKE2B f5125be0414b847f506686734e9234c3d88732be6f7cd0feb9cbe759d6e0584f8ce143d64de17a5fcca9b28d75ae922e00993140f0ccb793d10faadb3221b990 SHA512 bcec1d12c589cdee2f0da5555a075db511debd21d4536db66793f6a28be35656258daffd8cbaaff4b5af041b18ca77c94d910ec4d0c7e14960412c580fd56725
 DIST gnofract4d-3.14.tar.gz 862499 BLAKE2B dcca058b6a625b4d2f0153f896ed029b27b8e6135a310942c4b58bf5a6396977f5ca065061918e99034b6303a5634c5288cac90c887a8dfa87286d24f9f1d04f SHA512 cf3614f60a43f7ab20208fb1a62d3823495c84060d177d2926bad20a475e661d7ec45a7bc14e826229656027fe7c0f68aac093b6b0dc7912e84d8d8ec8ff81e5
 EBUILD gnofract4d-3.14-r1.ebuild 838 BLAKE2B faf89e7b8110f981fc500a83b10985e71bd60320a3ae1ff4048d9ecef5866399369e13c35904df5d0474afceab7e29c16d69322aac55bf0a7b12500ca97fc6f5 SHA512 639bbddf911d9314e99142e4f55ab968b0898293d8ddeabd286010faa9304a35cb280f39790028360b78e64c8722581239913b37e15e196631a5011b9fb6950a
-EBUILD gnofract4d-3.14.1.ebuild 1147 BLAKE2B 2ef4ff191481883839084bde3eade4fec4f12dac48e772d95a555cfecab117e225499f136caf6720f3405e60538c2350ec8ab44e7694546ab3723e904bb99de5 SHA512 a0e28c13845121f5b041d9e3dfea9b062a5a1d47f6163ce72bf3c7ccd74fe1a7d07b01489729fae559f7db65b4e4ce1c2a587b90c33fb21e275f2b44dcb7d049
+EBUILD gnofract4d-3.14.1.ebuild 1143 BLAKE2B 43052e5ed9bd0e7570cf38e8a88d283287d4a3f2a9333d40390745b6471a47e778b1c94e837192e602129a481fe6da567ffa414072a191476396ac2eac2bfbba SHA512 82d6d0861bf4671764d5616d92883961873b8c897ead24f69181247d75b0cda839b7a9bdd58226800c94f436baa12e6d4174277952210f6a3c89cdad0d9eb162
 MISC metadata.xml 397 BLAKE2B 0df3e1527627657309017673cc4557df01f71016eec2b6daaa16aee959534600be9a9292e966783ed9e14bf076ae57de0904a901c9f9e80a9bedf4ec7e113ec7 SHA512 9f2efdbbb8eefe3d2d7b42287f233db308e24b9ef825522e650b98857de963171870460a1a5c8ad2e9f65272db6bd176a552587e38d877fcad2afd6be2b0e6e6
diff --git a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild b/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
index 0b9934a1077f..627a3fcf439d 100644
--- a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/edyoung/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 3d379e405716..b8c0b927d856 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,8 +1,6 @@
 AUX 3.26.4-support-tracker1.patch 1094 BLAKE2B 224f4052fe379d79ca9fa02dc0d7e19196c5016e6f8e6936f620697d27f063aa421bd37dfa159856fedf0971095bc302f36591788923483729380dc9e754acce SHA512 32c1dcea04be037827d9c6b23ce38e3cb1d7548233f0569c58b87b3dcca25a060933dbbf89d8f2a5bac442c7fde854efc72f27df3e6eed9d0d0ee163a02e1763
-DIST gnome-photos-3.24.6.tar.xz 986200 BLAKE2B 656737326f594958ea1cc956f85e50c7eaebc227491d95342acab9a1fa0e3c5c109efe932cd0465e48ada62beab238e6eef0e01033b145de72a1fb64ce2f3c89 SHA512 47fd858b643fe0bca9a4801d43bd7eb181db08d7e09941a60a134247df97b0e900cd062efef70da5161a9fceb1d33b998b87ad5eca0a5937a10c4e06b908de22
 DIST gnome-photos-3.26.4.tar.xz 1101324 BLAKE2B 81e851bdeb39455cad6d4ba99194229507a809c3bd8c9ff0c24992cbbf90001d87f96d1c2b3c3a07101982e6ea169cba0e2249431138e962850f55fffc2c54ec SHA512 0a49b7eb29918ccf87af4211db6ffbb3c55ab40f4eaa1437317fda32de43b3b0c9033397d5b06fbc5012d0fa322a79dafdf46817cfaea57ef2f4df1a975fb489
 DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
-EBUILD gnome-photos-3.24.6.ebuild 1794 BLAKE2B dce8b2a44345c35c19058389cfa48d0e9f4e50f427e7d5406e09515598a13c6569b886cdf8e6effcaa9d87ad2ea693596ab49aaa6d8eb9ac930b28749bc6f1a3 SHA512 0a27e45dbdb2adfa84a8eb389a8342a9fa58f5d98d0142c1ab4817f7c2e5f247b7702968190947ad25db6ed1f7fe3a91be9683c5f57010600a2a890b8ca84975
-EBUILD gnome-photos-3.26.4.ebuild 2062 BLAKE2B a5f08ee546de0a51cbfd74c812c320f22ab9a2c3b131693ade2049ae53cda83b669e945bc557be3c24af4f205020176ce733e75cde78f4ea830fc31920c9707b SHA512 3da683b6f4ffabcbf9420751a2d99f94cd0f8f5960069a3a4cb25d9d9195fd90d8b11d498e3c305a6c36917675fe09934d38705c99bca11e6a2deb3db543fb05
+EBUILD gnome-photos-3.26.4.ebuild 2060 BLAKE2B f5a8f491495c415fb3c0a3adae4e19f28f9c4fd1327cad0a197ac0612dcb6a8650d125db298977e641ef10264942a04968d3b722c97f406a6be86499641115ce SHA512 14d25f1d2f6e95de682c020eef13ab0d79b6246b5e4495a795021545dc49590b3c155ac33fc90bc3bb1add1aa5cac61294aea6080142698b9586cc83c0cbcf66
 EBUILD gnome-photos-3.30.1.ebuild 1951 BLAKE2B 0abd314d897dc1f6ab6fa76ba518e848550018ebd86ec80ac7d546959e3b7dfef3bf9adab9669b949cb6025e054922db032baa32e4f231721d7f990f4c7fcf57 SHA512 b7ed7697606e80043df70668ddd81e2591cffd0574ae8488a4e1ec92b210ceb689a5c12034353500b458c5f2f04cc5666c91bc32032d4f5dac6d7e6e51a43913
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
deleted file mode 100644
index 8b380b9f0ca6..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flickr test upnp-av"
-
-COMMON_DEPEND="
-	app-misc/tracker:0/100[miner-fs]
-	>=dev-libs/glib-2.44:2
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
-	media-libs/babl
-	>=media-libs/gegl-0.3.14:0.3[cairo,jpeg2k,raw]
-	media-libs/gexiv2
-	>=media-libs/grilo-0.3.0:0.3=
-	>=media-libs/libpng-1.6:0=
-	>=net-libs/gnome-online-accounts-3.8:=
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	sci-geosciences/geocode-glib
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22.15:3
-"
-# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
-# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
-# so don't pull it always, but only if either USE flag is enabled
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners[flickr?]
-	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# XXX: how to deal with rdtscp support, x86intrin
-	gnome2_src_configure \
-		$(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
index f34fc89fd7ac..fe3c9e781a00 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flickr test upnp-av"
 
 COMMON_DEPEND="
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index a0fb7d7f0065..b25280ab2a9f 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,6 +1,6 @@
 DIST gpicview-0.2.4.tar.gz 488510 BLAKE2B 2a674c35cb849531923afde826bdf3f10eeb61f09b2bcb92166532918bd286a886ab52fdfb0b8b00e4e3c4b63aa9f473fd938d81b14409854ec1ccb3421da605 SHA512 60aeae5100ceafc5131cf61d600be5e5fd21c7d0fa62b8124b6f5bc917666b80908ba9e540010867c6d3eab485d9735dfa72f16095be468a718c55eeb65cef34
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
 EBUILD gpicview-0.2.4.ebuild 546 BLAKE2B 6aaf09a08fcd8b0d67008c147a92ad1a00d83595e483878e73d959c4b40a55bbeefaa858604a98ce825b665f0ae9693824cce55f95e28871e66e1e6fa859eeea SHA512 ecb21137ae587b179168db328b8e8591acd7ee14cbd412d8353f2ab4105ec9838f7934ebf95c239013b4b85ea1e24990c1391d4bc88df2d0cdd030a33b2f36d9
-EBUILD gpicview-0.2.5-r1.ebuild 660 BLAKE2B 55a05808f30bb011ca9639a1de19dce8fbe24bd0d7959320e44eb6a6e826880d2565ab2a18bdd2cdde2dde6715c332d44f12e1e235a0df435d91ba7c04305418 SHA512 17932b706615451551334540794cc21b5b091443f07c2e4671c80dd0c441c57342f9ef46fef6b1d0f3d00f385bf849969933ff76fd705fbf8452f403333d899e
+EBUILD gpicview-0.2.5-r1.ebuild 654 BLAKE2B 80cefaa7ae3f0ca75ccffb635bf6a2c483fcc546b0fb3cae40b03edcf0f1acc089998955fcffc95e3fd8387a1c61f3c4dffeead6cd4bd29ae272d36e2f64a71c SHA512 cbac8becdc14028f81d8948df5c1f2cffe3c08e621b4aef71100852543dd2c96d8132f6bbe21155f7c669b06468f0f5a00f2ee79ca3585581f5d089dbf1b7638
 EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
 MISC metadata.xml 445 BLAKE2B d91e39bbfe204c70cc479af04d21d643a48077eef9940f4a2cab081ee8f5921291074d0c68c207798b9ec1400e27ba6092068a98e15ca80d2c0e45d5e02f33aa SHA512 bbc64e2e70d381c829c9ef28d202be2b2418b5d387d99f281db5f666a45bd67cbde4c161c99a2e39f4bdd2a3a276574aab878c0a7e0a861f2483aee0bdca55b5
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
index 7dc7d1cddc39..fda00aa5a904 100644
--- a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ~x86 ~x86-linux"
 
 RDEPEND="virtual/jpeg:0
 	>=x11-libs/gtk+-2.6:2"
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 0d38de83fd79..6c50a364da7b 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,7 +1,7 @@
 AUX hugin-2018.0.0-exiv2-0.27.patch 1095 BLAKE2B 52cd5e31f36b22291a3a864a9f248510f0fc871f1a9ee8e49cbcda5d8876eb9e7ec0e5e1595cce015c55dfc0f53b4fa8efc82e30f8c129e81d426accb3538e5e SHA512 480cb3f5e4ba04efa863b409747029ec1ed158168705621b3ba588e6566c56c3e5b16f422daf40cc27660b48f63c1a32861f9a4cda22c0eda397922d00a828a1
 DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
-DIST hugin-2019.0.0_rc1.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
-EBUILD hugin-2018.0.0.ebuild 1994 BLAKE2B 5ce3bf34d0cc0624ce414174a95bbc08b19bd162961927fb0da4e48d3c6d89eb8ca1837e77633ed54dbfa0e61411288bc048c66ab3e88eacf527027cd717b868 SHA512 9547fdc6ee37e9980f7fbddab5c2a073b6fe0ed5454657e8d4171805c043a6badd7e080bb733c0addebdc8a1cf042c5eda02d529487c505285bb05e84542431a
-EBUILD hugin-2019.0.0_rc1.ebuild 2108 BLAKE2B 43c7dee776d82e503abca73cbe562eb53f02f53ec0614c9f56ec9996c96ee722adb39009f14d9abb147cefeb581d53c058358b0a62fed64b7394eb9fe757261b SHA512 44a5230f1557d2e49f0c66b90bc759c7a7780da466acae02dd3e3eb532d19848a0f0e1d83b9970974d3ef251f8df3c921c729c47e29c1a6192b127415ce4e06c
-EBUILD hugin-9999.ebuild 1981 BLAKE2B fd52cc7022ccdd63117c259083a0e0e34600e5b1ec4d9f5a19d7bc6fa7878a92242227efd6a6b576a17e7d1f6fd7201f32a4a507ea787df4533698c6bd9aace4 SHA512 7c918c42fb21ad9d53fb2e49d3cf48ea7e5a3897c94452770c800c7d69516bddd748e157f95d88a0c0c3ff77ee984ddddcfa64ae201895ea91a9648d2ae29f70
+DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
+EBUILD hugin-2018.0.0.ebuild 2023 BLAKE2B 084ad47690dba6a9020dd815ba6b91621bdbb8ff39b3a70d5033fb9533199254016ed6be6a117ee57b8126169f866453c7016a26ef95733e8d221f00f70421ca SHA512 95a3dff5c0ba71574cd1f7454ffd6fbcaaad105313b20f9bba4eaada750efd1e7262261536898e7b7941775b27325ae9768b3376d0f13a2d4cbe5b7f18314835
+EBUILD hugin-2019.0.0.ebuild 2137 BLAKE2B 6979c0d973b46470e728cba52149fb9f6661f802e3cf44b2ade519cecebe467db69c10e85de22b3c08a88586f6c369e3fe46d835b35d8e5cac508856e115b6d3 SHA512 edb77fa285955e0332b93770d3ad0bdf21707a2f515b61705006c756eabeb452cccf126e0cb8eeedb38c37d83187ab0a094bcbb97c319a8b65cd094c2389e937
+EBUILD hugin-9999.ebuild 2010 BLAKE2B dc2a3fa7c6252cb2e6efb15fbcfe410113184c29e031e45d7482b2628fa6d68b641d3c6ee23d0ea5b6fa5150fe2c72bf2c615a603b5452b458ecde44b89e8974 SHA512 cfc02d7f6688f3024c987052a1f1cf3e110265d56b181e89a7f4525570231c8b2ee58932a376350a32b623b0d75b1821084d5523ec3bc7ff41592d1ead667de5
 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 cb72199b0eb0..5c87262440f2 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
 
@@ -12,7 +12,7 @@ DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
 
-LICENSE="GPL-2 SIFT"
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
diff --git a/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index fc7b4544dcb5..931b74efeb76 100644
--- a/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
 
@@ -12,7 +12,7 @@ DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2 SIFT"
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index c46a552195e8..0783740a35d3 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver
 
@@ -14,7 +14,7 @@ SRC_URI=""
 EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin"
 EHG_PROJECT="${PN}-${PN}"
 
-LICENSE="GPL-2 SIFT"
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
 KEYWORDS=""
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 2eeab7c03108..28bca7dbc1ce 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-36.tar.xz 8938664 BLAKE2B 0791f4234eace5e338d0016c74cd69b7eab07cc2829b0e2ae69e53af6f02bd0ff17b9cf15b81af061fc5b7f1d23faa9f6c54bbd1829198ab64464d76838e9161 SHA512 0c85648d39b741d693acb4d98a28e67a271447c0406a064852806b693c777a2069c5b39120a39d1fc0a73533a8edc4a13f6be7643b3b9f6a287884ca3265d834
-DIST ImageMagick-7.0.8-36.tar.xz 9445340 BLAKE2B 146c2c19dd4b61f2bc7080063bfc04766ecb6fdc54028319a41d2ac4de0c6786d60f434f11cdcf8886b9d2c968ade5119f3ca68a8693273ab38d81c86052484d SHA512 d32ccdfac7d410c6d83009d9d97d1a4e0195d5618fc95530424f43c86f369541d36b3fa53eee7f8872a84bb8e5164387aa731d452c2d9e0c8f872406c4044fb8
-EBUILD imagemagick-6.9.10.36.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-7.0.8.36.ebuild 7151 BLAKE2B 2a45d3c2bf28fa0c18a7d7b2b81f9b41a208bf74e84a8bd0fd9630380f432e4a2ee27911b83a7a2ebd86c828105754d6b092a6205b4fc2d22ac79824c62e9069 SHA512 49dec8a319fef02989b7ad27a3553688f720391f670525f5d89dc34722eaab3fb2dbadf7e5ebd0565193020e54e0509fd171a2505f79a99b1eaa263daddd405b
+DIST ImageMagick-6.9.10-40.tar.xz 8943020 BLAKE2B df7420a9460a339ffa439c90b1b2c4685be44a14ad15af946bc8274e53a6d92f4826d58ead494dc3de69ae4ea3063c03cd87349c1c42ab7cf6ee855e19cc304e SHA512 494ce14b546453c95ecbba369c2bfe86b8b5a065b27436ac58b6f38d09299e53883538aa2c29404497bdb6ce7f60aba5825be8244fba6e8c2be7b3cc2ac23e17
+DIST ImageMagick-6.9.10-42.tar.xz 8944092 BLAKE2B c616030d5624cc67879f698c52a906dede56db5f594cd1efef67ae7a7ce555f385b60b442e87904e3cb9f95840448e2a58d5121bd8e408812a3099864be880f0 SHA512 49ca335a7f0f83fb925995fa4249790cbb93142a0a30387f4d6c6ee9278599801da8b8644f3828afff8be841f55b64e31fda3bb4c6eea2c540bb94be4c926cb6
+DIST ImageMagick-7.0.8-40.tar.xz 9451940 BLAKE2B 26cba54acb5f8dddefb6a91eceef776e520dc6c01681e63904fb449f8ee440c2b96e535675d49ee92b87598d82d7dd75f3292100d75fc1d78b4658758c7c50e0 SHA512 09defd7bedfc18ff5ef8e404e2f1189cbcd97f087b05fc925cfd6e90b416e97aea691542a1eca6841b99c24dbeaf10d2437a74d8d380dfc5f70a1eb54ae61982
+DIST ImageMagick-7.0.8-42.tar.xz 9455976 BLAKE2B c3cc7353da73fea92c51febad8816c333970b91069ee54756acf7f1b9f57481fceec066dcb21845b2ebf1a9a97b17b9f8b6859d1becdbfc9553bfa148b5c0433 SHA512 88f57b69ece3b93b0af41e85bacb0b232cf07e7d0aab34e1479ce6c5fe29b1cfcdcd8bc6b2b87773c2109122614a0f64847629029470d945409b08b19032d936
+EBUILD imagemagick-6.9.10.40.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-6.9.10.42.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
+EBUILD imagemagick-7.0.8.40.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
+EBUILD imagemagick-7.0.8.42.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.36.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.40.ebuild
index b6bca9ea8b20..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.36.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.40.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild
new file mode 100644
index 000000000000..b09291336ccb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+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 heif 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 )
+	heif? ( media-libs/libheif:= )
+	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() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	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; }
+
+	use perl && perl_check_env
+
+	[[ ${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 heif heic)
+		$(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() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+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
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.36.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.40.ebuild
index 3b3fc7c8d30d..59c2b130c53d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.36.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.40.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	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"
+	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"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild
new file mode 100644
index 000000000000..69c412db11b7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	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 heif 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"
+
+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 )
+	heif? ( media-libs/libheif:= )
+	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() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	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; }
+
+	use perl && perl_check_env
+
+	[[ ${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 heif heic)
+		$(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() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+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
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index eb92146ebd3d..47f1be7665f4 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,5 +1,5 @@
 DIST img2pdf-0.3.1.tar.gz 67954 BLAKE2B d0d6a9927e9b3e7087e562a108157677a46a17a896beddcc424dd2c234fd7c4f1376b824dbf814b42d9a314a8495b149bc9df65ab2864405b9dde0054e7bafdf SHA512 25f788f78e93ed336ed8e31e88350d89263b82477c8d9c36103dfa522a5e661922fc09b59e1d5104161fe1be15114f843172555efa942722d8b093900d38bae1
 DIST img2pdf-0.3.3.tar.gz 80523 BLAKE2B 39e372f1ab82d9f521cf2c512b173680afe6463dd041283b336af49c41b12d12261fe5947ad9f03d489b7898d3c8d161faedb2b3366cb75bd1bc0666f905f60c SHA512 234e0031d75727d2f5d2b82603bb447d9101ace81e604b6d5eb358d0b4681e209dbd737775b90b44096cf84239aac9e87e2369e0c6112a17f24ccbf10a20cdd5
-EBUILD img2pdf-0.3.1.ebuild 573 BLAKE2B 96ddbfb40bb0c5ea8e237f6c8b4e6f005d4583e49340273b7a9fcd7f0c631632931d1ebb3ee0b39de5886db281761552b0bdd64c6509ff1206eeffd17074adfe SHA512 baff293bf9770cbfb004908fbd9d0afee0d25248cbf3fccb92a2cca228675d3784021e50227dfdc2f28edcead9ccc40bba62e5e0916c98dc24f4d520f00ce32f
-EBUILD img2pdf-0.3.3.ebuild 624 BLAKE2B 653a184f56981b19da846b22dce97623dbf8aa3894e8b58a790b8dfa8d745320c9fb4d9be2452fd7ccf94bb6f7eb0a93f2345ef806c36fc68a60cee4aa9d2c47 SHA512 e5b7b816d032d0a5a093c1bc407bacd8361cd523a515b9aca0f9749d60d6b17bbe4fd2e71c1f01e4d235f01ff880eed59ab203c3922f125af1755c60483ad43d
+EBUILD img2pdf-0.3.1.ebuild 571 BLAKE2B 1f66a8c4c08cf3b29c1cec00b61cb2afb9434a2c842ed594b2c261743e2162cb8d54328b7238bfd93cbe766e600f3271b643dede92fd1feffe99b1cf705c5961 SHA512 511b479e2e87791e33614c173a749d34270359ee2fd08ee6cc09f3c26bbc0cf57c4052df8c91355edc776866cc62fb56772f142b72bb134c461a80a07255c41b
+EBUILD img2pdf-0.3.3.ebuild 622 BLAKE2B b65c91334ef05e4ed459ca9c4ca6996963d79715fafdafff4608e087cd89357b3947633a40ec6ee63c48a77ef0b9686997db19974b9de6679f8e34bac31025a4 SHA512 8f4337032d1e9b1c2c4ecb1cb169c276ba56049240081b78ea01259790b6778c6b77760ae5101c2eccd13530123bd8fb24d8ff25a22ab611d176aa54754a739c
 MISC metadata.xml 1096 BLAKE2B 18befc3c4c34d0210ad594ba46749dd304d673ecd697d30b3c60a951787a7ac9e8d7371d0c853c8a4cfce896b18dd36a29f15dd12aa4fb6190635e20d2b201e0 SHA512 c4f5e02479a3ca0d6a2a52c58c25197cae533855500327c84c694b82e2ad625e149124c555b8822f79ec8000a4f926b6e21dd59db92b0989a316687d56775531
diff --git a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild b/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
index 9e0dd7864237..58dbb835eaa4 100644
--- a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/img2pdf/img2pdf-0.3.3.ebuild b/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
index 9436b9466ccc..6cb9e2637350 100644
--- a/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 80c0fb4ad568..88c28ed1ad5f 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -5,9 +5,10 @@ AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4
 AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
 AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b31989d531f94f0bbf2c9bad2ac5fdb453f8a1a5c169e71d7ef5d71ca55072f76fd31646589a62c06b5d44809f6ef873cbe1edca1f9 SHA512 95a265b0e7e9fda74a9bcf31eb6d23afead4c71567126ca893b75c0dcc87f5b03e38c30e2917b4278dbf4fcaf35c2b3fe7a1b509a43b19212c814a2a2b9de53d
+AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698
 DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab587c677907588678222f53bc8305b9adf399b8237e8ac3e169a22a39e33a50f5e517ea4122d736134dfaf5bd675fb34e5c168eb42e30 SHA512 8254d5cc0651bc6ed389f4610aac5ed9451b8c662e82b5c0f9aa221be748f4cd2075a41234c2516a98159cbd3e23c9ada3d519edbe69f05bab418d2fb1af2ffa
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 EBUILD inkscape-0.92.3-r1.ebuild 4183 BLAKE2B 074d57b407abdc33e616d7d6229b9b7db12fc6ed6c5278797bd62296403815d6900081c5fd5adaf20ba4a12bdaf083314531ecb8f10212f51e9ae8293d113ada SHA512 09ec9080cc60458b98deaeda24ec08b27200db024f3f34270264576b4edb9d3a6beb241de0c0a2ff5d019e072538c7279385b0a242dae007d41395de5032a6c9
-EBUILD inkscape-0.92.4.ebuild 3785 BLAKE2B 84189598db59c7d51780eb3c664cc7796be22f176655d8ad36f4a7cfe72581bcb4872603d78f861c7c66a29b20574f736a18f0ce26458f2d283404ef7b730a62 SHA512 8e2cded9dc358b1b864b07003a3e134aca4c0bac6ba07818879339dd1586564478e08ad9d1e4b51339513401c99c5b68b19ea70b89747e41c507a25b41bea633
+EBUILD inkscape-0.92.4.ebuild 3842 BLAKE2B 65915e0d0f058d6eea2a5e404604ba0eb1d466ce0874e502815109e0874e6fe1a7164bb7deeb2b4bfc63e5cd4becd7c9b87986a8af8e560b4dfda007268b6bac SHA512 095f5e03f7228da21d9a230ad9764f9dc54395bc04a9c9a7c9cbc7026f85a4b5c431add5275ac52c0d03467300935c27347c0e2cc869f671b6cfaa192ffd2418
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch
new file mode 100644
index 000000000000..11383d9aa338
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch
@@ -0,0 +1,44 @@
+From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001
+From: Marc Jeanmougin <marc@jeanmougin.fr>
+Date: Wed, 24 Apr 2019 14:11:26 +0200
+Subject: [PATCH] Tentative fix for poppler 0.76
+
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
+ src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 2981d6ee51..ddbff7671f 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
+ 	error(errInternal, -1, "Weird page contents");
+     	return;
+   }
+-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
++  parser = new _POPPLER_NEW_PARSER(xref, obj);
+   go(topLevel);
+   delete parser;
+   parser = NULL;
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 6e4dde7dee..21a60702fa 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -3,6 +3,13 @@
+ 
+ #include <glib/poppler-features.h>
+ 
++#if POPPLER_CHECK_VERSION(0, 76, 0)
++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
++#else
++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
++#endif
++
++
+ #if POPPLER_CHECK_VERSION(0, 72, 0)
+ #define getCString c_str
+ #endif
+-- 
+2.18.1
+
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index b4bddca2ef6f..7d775127ec30 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -97,6 +97,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
 	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
 	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/iscan-data/Manifest b/media-gfx/iscan-data/Manifest
index 24d6f36aeddb..05db1e52c771 100644
--- a/media-gfx/iscan-data/Manifest
+++ b/media-gfx/iscan-data/Manifest
@@ -3,5 +3,5 @@ DIST iscan-data_1.37.0-3.tar.gz 100499 BLAKE2B 8710a69702306b50bb4d9a21a924dd9bf
 DIST iscan-data_1.39.0-1.tar.gz 100793 BLAKE2B 690ce06ed82e817658bd05611a66f9bf6d895bdc17185c585c83c0a8b9c020f0354f782bf991dd4913336799a75d3d424085624e488ca4a77f797088a327fda6 SHA512 15e456d5e64bfe9bea77c3f2a349a2e50c4d8a8cbd1347dfac4ef1f692793561d0d3d32fb3cec10176f013d3b0e46f62d6d24f0870c199088e2e65ec82b4326a
 EBUILD iscan-data-1.36.0.1.ebuild 1265 BLAKE2B 9309392140cf44bbe93ea0f5cf917dcb58656080b8b5cd3088aa080f310f422bb4998c66e532c7dd23bf10da9ed498b83f2446982c7158019df0f37a48ccf0b7 SHA512 4dd435ffc75204b5a87d7dbd144cffe96ee92a25e6bbd5fb19680eac5cf192404d252c5582b4acaf24cb2fe764f25611ab2bd16a4cf63b58ab758166b3315c1a
 EBUILD iscan-data-1.37.0.3.ebuild 1072 BLAKE2B 3aa8ea569f8bfbe597f80cd3ac63437fdcc9a3e3fb19ac3b729c866e366b64719fe99d1913ef8dbcb5b0d848c64114c4f80ebe588308db1d2ac7185c521f4be0 SHA512 0212c3a6f9e5cdab4915c274f06fc7c61392d7a22426184ab8ec5b7f38fc79c32d08ee0949136c2637c863fd9f873c8482ada9f7103647f0b0a99e4378e8f478
-EBUILD iscan-data-1.39.0.1.ebuild 1008 BLAKE2B 06febefb6b2d82435f2556210bac6ce2272e5fd27ea190a76b362754a5c3cff0250b47edb54c881ab842d9388453df4569a7df12d1f94340f40bf2ba06a2a091 SHA512 4a37fcfe31ca7ae1c40c4e2e01fc26280e697c98acc4d940639c8b284ffa763648539bc68133402958c2a312954381cf8afb5e33118e35b87e37a8f282211fee
+EBUILD iscan-data-1.39.0.1.ebuild 1007 BLAKE2B 22c069c47f9dcfa983a67668f20f978011d2454da7cd5c63ac09ef82739c183eea4b217e97f0d2d62ff05e3503c52440b9e030fd4ff91a05c7288f7bfa91c9d2 SHA512 c1e204c115d8068ce0fd485b7a32c0ba9df59bd5a40f63ccee278233317bd77aba9b7dd9707ea421e1dadf643c8cb652300d830b8df1207f5a9b3e0e56ab451a
 MISC metadata.xml 609 BLAKE2B e0c2521d9bd70daf3bca54713178819db98aea387bc4a6b41c682d044656229ab5cdf2bd3212bd61faabdb5d600dfeb8fa445f57eb0247d694a59b35a663b6b2 SHA512 32ede245d749b0be045e45a5c8a6f68f9487d807f8777c0da84fd93b20ca11aa1ec3d132d2b24a7a58802a112b71ace82fa03f3e618a9d66bc99101eefb7b5df
diff --git a/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
index e9b6501a2b6c..096330222826 100644
--- a/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
+++ b/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="udev"
 
 DEPEND="
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 2ce416c39b66..dc6218206be8 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -10,5 +10,5 @@ DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.2.2-r1.ebuild 4489 BLAKE2B ed29cfe8ed1f9394e12051b00ed32b86def372a6b04a185bf827e4851e3b386cbf892dd4e5ec82b17658964de8d3a9d2288daaff09955ac7179989b3d1c6405f SHA512 adb0808b9a1be643d18913b08d207cef5f732ee233628446772452dadf99967c1e339018029804cc7d967e52d77232a85146144a055272cb6b5336bc8497d7e0
 EBUILD iscan-2.30.2.2.ebuild 4582 BLAKE2B 27c48a10f7e146aa94e90b8827ac1fc08044e2a2fb38bddfa56946ea2c7ab5631da428b17a6e19c1537caec096c60ed360c9f489a15b6a32b032f35192848df2 SHA512 42aee5ac19f6c46d4d59bfd32db3a43235013a53d8205089401c6459069d474df1e967bc03a2e08a9bff8fbf6e4f48cbb03f847ea031dadd963724cb4a6480ae
-EBUILD iscan-2.30.3.1.ebuild 3519 BLAKE2B 8a66918cce3a094ae133756fe083fb5ae776651ee3557f1a292a176eda0feb1d4c4027ef0784af120d4a64f256b949d08f46cc2753abce0ae06fa4f8dbf46101 SHA512 da83c308740e1f6017c748c17c5602838e7a9e96422d45a5d39dbdc7c020f5a5a6ce7a40c2392955662f4291ee48d47a1647e7a1001075d963e0a1be923a8068
+EBUILD iscan-2.30.3.1.ebuild 3518 BLAKE2B b7cd9cf83354897d50768d8458e1f7900d8d39296530b19df42a3ef2116cdb88975525ded7e0143bf3d055f6a33d402e556a44e718e1e5776b1c8ef28fc8e37c SHA512 d5abd277cdede2a204a0c86ae3bb1e16f54710495ce8928f039e94c448b75931967ad29cf0c96f98219478ad175a24f8fca4bbd4069d1205611481adcd155926
 MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
index 66591b118f08..39e701ef3778 100644
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
 
 LICENSE="GPL-2 AVASYS"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc gimp l10n_ja X"
 
 REQUIRED_USE="gimp? ( X )"
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index b34a4103bc66..c9d78a86d573 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -3,6 +3,6 @@ AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541
 DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
 DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
 EBUILD jhead-2.97.ebuild 745 BLAKE2B 41bee772b4941cba460549b464f24758b716d4ed3012a544e2277deea5cd651ef0fa3519d6b7c77a3b0512320b7936294c0ea4a8b574ce5c7141cbb82f566a9d SHA512 690547b5b0b4eb36153ff782f6e55e8b67155e677cba2ace3a0ec6cdd0f3d1eda313dcaea5e33a417e98c1c113cfb22de011a88117f31dcea7ab7858e229bb67
-EBUILD jhead-3.00-r2.ebuild 688 BLAKE2B 71c31d2141cd214a70185f532399ef86859baeb5d13bf4d374820e90664060a2f67eaaa3d6fb775f5ebb55f352cb26e946324ff0a4ea266c1afb669d5c32db06 SHA512 42f1b10c425fa66b5f36168efe4ac3d81bac19101482b1825d4e12a631e2a9e4cf836ecf145ecf6827c016f8835d7de8850418b826e230aad517f30a2a826e99
+EBUILD jhead-3.00-r2.ebuild 705 BLAKE2B 90f6d9c4fcaeac9e387f9a2ada519f18d875fed9f4a9c99fe1328108294db8eb5f4dae28fc27c13fdcba3e030447500e60aa28fc14f8dfacc9b725a2b148fcaf SHA512 8ec686acec1b6fbf8e3192ab4954fb6c67ba2be42ba917677e399d2540e0f539d78dfdc5982129a205a67a7184338ded547433341f28abd1f56136cb6fa9841b
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild b/media-gfx/jhead/jhead-3.00-r2.ebuild
index a47820149d19..c3e3a742dfc7 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 src_prepare(){
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index df2a747917a1..99dee686565b 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,5 +1,5 @@
 AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
-EBUILD jpeginfo-1.6.1-r1.ebuild 648 BLAKE2B 795b403fb3fcf92bdcf7c025b64abf46e4213b513df25c18f4d6320db9f233a8042f6ac8f8d26fc453cb48c782d4612204c26b214d7513b1b334671833f18b49 SHA512 e1c08078269babed555cda67b9a167dbb8d2900de7811168090c936a6940318deaaf824449ed6d8bf456fe1550cb7ccacd3c2fb718134258ac4e18a6d71841ba
+EBUILD jpeginfo-1.6.1-r1.ebuild 645 BLAKE2B 26a03bd811828c9a8a6a77a3d437e0a47f9e567f9cd2d6f0410db3c84d1b636bfcfbc7662624fca9fd3e81c75a6a76b981394f598e5f8faf156783a7ace6baea SHA512 c20b4baeb09a4de39db1a68b497f792ee1a0734e35eb559359e6bb97ae6191a45d5a3817f977a89d46b0eee7ba32cf5602ab15ee5007064b7442e12ef13d712c
 EBUILD jpeginfo-1.6.1.ebuild 670 BLAKE2B 3c03a10d42865a06ca72ce8c0fe765dc2d978ec9b53f0f6f7cc1e19c13bce7ddcb969e37975240788699e33e4bbc4d5a826444148f7950932fbfd8e4467af4fa SHA512 099f7b21978f8df38d027d11af7222ecb539ef42b573d93c4a343e710934bb4fc3c127c9f406c5a9c8859bc7ab0e52d5629918f1cd23079f8c32b7dba0484ae2
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
index d9beabe1b3e6..8e8fd5f1145b 100644
--- a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
+++ b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="virtual/jpeg:0"
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index df8a4d9ec9cb..b717689f01bc 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,9 +1,6 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416abf1150a4b25f81b5befb8ffb254daf0c25b4b189ba0aefe9a3256eb83013d80919e21f77f7880fa7856a05ef5c995dfc73d079753e2c38 SHA512 c4048d8fe560508f04df785a012db99a5e6a2d4ca5b1d8e774a307cdb99f62de4969b04a58586c771a174dadf6dedafaa70568e8b6342612fbe52be32db257cb
 AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
-DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772 SHA512 a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
-DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-EBUILD krita-4.1.7-r1.ebuild 3457 BLAKE2B 520b1b159aa586ca15e7347c031887fc27df80378b5ac8790f0242fde258717228bfa5cfc2ca5851e875f1482a6197d8a0ba9344ac02953c679b82fcc550817c SHA512 39d313a44e0086604f00a4bca6e6d15f44e5041d38f55b3da3c5906fe67d192a16fe275c222fd89ca6c21156d013c46578f083a3e0641b892714d92b8c569551
-EBUILD krita-4.1.8-r1.ebuild 3391 BLAKE2B 15aa6e2c6cc62d58e83a2f4cf05fb9f21319f5dc1927868705b20718c8e97ba647e38224e149f204390ba97144748691267280b64c3a66d93558a0b6f88d202f SHA512 f212dd7bb4be8b79dc9064746b25c06bfe092d1c0b798e182379f6830ea3cf796ac5b47b20d0a2c0f026c1aadba2932e3df55071259152014c2e6f034451940a
+EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.1.7-r1.ebuild b/media-gfx/krita/krita-4.1.7-r1.ebuild
deleted file mode 100644
index 929971405f1a..000000000000
--- a/media-gfx/krita/krita-4.1.7-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.11.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz
-		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: Drop subslot operator when QTBUG is fixed:
-# https://bugreports.qt.io/browse/QTBUG-72488
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
-	"${WORKDIR}/${P}-exiv2-0.27.patch"
-	"${WORKDIR}/${P}-resize-hud.patch"
-	"${WORKDIR}/${P}-overview-docker.patch"
-	"${WORKDIR}/${P}-assert-error.patch"
-)
-
-S="${S}.101"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild b/media-gfx/krita/krita-4.1.8-r1.ebuild
index 46926f21e6a8..dae8437cd874 100644
--- a/media-gfx/krita/krita-4.1.8-r1.ebuild
+++ b/media-gfx/krita/krita-4.1.8-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 8fac3bf55f76..b1cd43dfb09a 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -3,5 +3,5 @@ AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
-EBUILD libimagequant-2.12.2.ebuild 1455 BLAKE2B 042d8ee1c679be1c653be7db67959a256aab915d7abc1a9fc15018b6b05573c65ba4dc570380be0da4c21b08da3214643c294e22c9221d6df24ef7ee126cb934 SHA512 3674057adc382735084b34d314a7ab291c655ac5a74db902cb05f1efa2e7cf3ab59ef57a7e318796e36c7826b32c84f510337a3ceac04aa38ee428821f99d7f3
+EBUILD libimagequant-2.12.2.ebuild 1454 BLAKE2B 8e9506be6ed5f0fe99734df7765a1bed62d2a74e7b8e346a315938a082b5fc05cd8cb58d71d25613b2b98afab0e83199c8f25bc0267f5efec26622add3622512 SHA512 b86d5c73eb281e96c321ef544335cc0e98346eb5f22f244590da159c92da0a442aed5be96be507890db6dba5bf631076b2aa2128b2135cdb9ca767b61090d578
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index e17635af6507..56e70c7e72c9 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index 568f10279181..09cb6e4cb5ae 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -3,5 +3,5 @@ DIST llgal-0.13.18.tar.bz2 81674 BLAKE2B 96b48e9d6ad91ad2b11cd898563c7640f047ddb
 DIST llgal-0.13.19.tar.gz 96675 BLAKE2B b306eed900a1071898ebe2d0dcbfeb9c505271ec8d5889e75fcf189dee22489fb8d671ede05a1af74a7761b604d8af8e3b26b8771ec50c8e49036000e90258fd SHA512 24f247071678f21c79e37002a443ff222e9e99e9bf04363fc123c5d9538a35db100ea814408e2bcc9e20781982145301df3337e521413651547828654a92d169
 EBUILD llgal-0.13.17-r2.ebuild 914 BLAKE2B d52a3d2ae2de6da933bbd651fa215dfd7609bf6e34afcda0b753f5be1dd5a5cf269ceb508c0c50f2b2497f6f8998904ded0f51d639a16f207da495f99d1cd05e SHA512 c7150f19b551b77c7934f4a12fe9b60c0ec2ef96eacdc0e4de192b0d8ba088609373436499ef2351983f8d279fb269908479ee12da26bcb1dbf3b50110cf419f
 EBUILD llgal-0.13.18.ebuild 916 BLAKE2B 0b6156409e0440708cd37e45d7e16c326c643c5ef35090de4e40fa8c802ee5d457db139ffb0149e59d4f80417a6c6b408deea06a1e9802f9589b3eaa67d7a690 SHA512 9960069fcf88897ddbfd5cc026ca9dea6f1bbcfa0fd5ab437af970a260db06bf52268730ea425af451fb0847c070ec07305de126884c8f550f0329c266d52b9a
-EBUILD llgal-0.13.19.ebuild 1073 BLAKE2B 0b2291b5fc2436668c0f5f5d369570ca64532d46dae3b35e2460d87cec55bc06f79ffa2c0c89bc01ed4bfcf705c6d499daddcf7bc43bf5cc59a6bdad573c616f SHA512 d091c8d29096227d33ba56a385dad69976b063dbcf777d3e090c24f94524f1465ca4077f12b67269359f77d774c29aa147163fa550fd917486b4f6799b7c4f39
+EBUILD llgal-0.13.19.ebuild 1072 BLAKE2B 637838ea6919ac4aaa892e605320eb4a985696c55bba4b57b0d5b5984a389276c575245bffad3625f28ccd1aa7fac03513bd0b73c91f8ac03ab7ebe9cd91d47e SHA512 3ad5caf2d360216a34fc14e4900fde19564e9bee8ce9da745b235a7f118f5b36742c2bc8e92d887166b9463de478148366dc5c0fc29197a64f22270d461e8dba
 MISC metadata.xml 365 BLAKE2B 91e30c99cee02f64efac65038cd7e3e04b37f466b83d423cef36a31a071ee9ffd38fc1d46b71f736ee87d846d9787348720b49c83fd2aa6e402dd2817b18fec3 SHA512 2abbab6015809e7c8f484a40cfd646173763f54cec04f2aa71a550dcc8c4dde96f8d692d03de6280411b480a0597708da655eaf0005e3f8b4b87e65cbc44f04a
diff --git a/media-gfx/llgal/llgal-0.13.19.ebuild b/media-gfx/llgal/llgal-0.13.19.ebuild
index bc446bec1942..b65d69d63edc 100644
--- a/media-gfx/llgal/llgal-0.13.19.ebuild
+++ b/media-gfx/llgal/llgal-0.13.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bgoglin/llgal/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 # Package warrants IUSE doc and possibly examples
 IUSE="exif"
 
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index 154e5a70839e..87a779f7091b 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
-DIST maim-5.5.1.tar.gz 39601 BLAKE2B f87daf54bad43ba92d57878cd2f368eb071aa43f1258125895e676fec1bb407308d72807cb200f8887d376b8c3b81885fc0cb31ba15115ce8f670aa3ad458425 SHA512 72bbf945df21403f51ccd8d2e5775e1a229ad6b362c4a1eb29d92d1b2fb679a48703bc195476e7ec9e661be7a6f1c076199a7d881a40b82fa99c1ded7d2be118
-EBUILD maim-5.5.1.ebuild 884 BLAKE2B 07480cf8d249dadb6379146d114506e34300eb5afb4c4080a564321288d1329164238aa325c2f355bb58f22bf8873e7fb400be53cfa83a6e02a346d3da58f4c1 SHA512 b9e93ed46bfb17b12c5f346b8ea8dc7f07a4aa77915f10243c96d2db33c1d33607dfda2c5ef323c2f7155dacd3b3e7afbea7260071cab5ea04364075410dc118
+DIST maim-5.5.3.tar.gz 40083 BLAKE2B 93392bcec8d1ae5188c27414695b04d0ff94a0824e9ef4a7fe8ca0949a1583b7dc7893346bde94bcdf629d9dc8d3f8350a8484eb8cc5bcbf8ff24cbdcb651b10 SHA512 bbcd4f0276090b9650cda88e527d0d1b80270a50935fbc02aac9a302a64bc3975386f24a97d8eb3c1f97d7d32cc9905d5e1f652915fbe3aae0766bd90bc5f51a
+EBUILD maim-5.5.3.ebuild 842 BLAKE2B c3a9c035b9f61ee9fff6a6c7c54a2db9ed0687f10190683dd5faefe34b5b970ac656756570e9076d2f4f6f33017f8065b5aa63de13b20de7a944a7c5b6e69534 SHA512 4414a8454d073013a62ed8a9ad7b6e105406a59fa8120415ab16a85f952484778e7a1864595ff12dd3c1b523990a61d5a072118940b23f59eba8653cc1be872e
 EBUILD maim-9999.ebuild 842 BLAKE2B c3a9c035b9f61ee9fff6a6c7c54a2db9ed0687f10190683dd5faefe34b5b970ac656756570e9076d2f4f6f33017f8065b5aa63de13b20de7a944a7c5b6e69534 SHA512 4414a8454d073013a62ed8a9ad7b6e105406a59fa8120415ab16a85f952484778e7a1864595ff12dd3c1b523990a61d5a072118940b23f59eba8653cc1be872e
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/maim-5.5.1.ebuild b/media-gfx/maim/maim-5.5.3.ebuild
index cb8869b7b809..d046bb0b70e6 100644
--- a/media-gfx/maim/maim-5.5.1.ebuild
+++ b/media-gfx/maim/maim-5.5.3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils
 
 DESCRIPTION="Commandline tool to take screenshots of the desktop"
@@ -21,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="unicode"
 
-RDEPEND="
+DEPEND="
 	media-libs/libpng:0=
 	virtual/jpeg:0
 	x11-libs/libX11
@@ -31,9 +30,8 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-misc/slop:=
-	unicode? ( dev-libs/icu:= )
-"
-DEPEND="${RDEPEND}"
+	unicode? ( dev-libs/icu:= )"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 46534209ee24..091a009967f1 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-r1.ebuild 528 BLAKE2B 1e75e64a45364f2bff22dc7bfb298d5c6464036a9094e114ff42fcd7c1d808c3717e354ef47a814ea3745ebf0fc52ee0537e93404f65225efa900fb816f173a9 SHA512 4b1a783a7ae8ef88b15935bf6f7691f4c90d8cb23b34e39f3a355c59a271b34a55521596581d0c88b13599e6662b534d9ef6fdd285aebcd53d9bb044fd735b22
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 524 BLAKE2B 045c7f500357e223f3501940732fc0971f04147e6eedd3bab3973b9ce56774cf6fbe4451377ff74beb1598186ca1adf0537f0d9576cd628cb8f341a0f5ceb0a5 SHA512 dabb86ddf090db1373465d88735e5b8474cecbf5248805defd14fd80222203680b6b9c1164d515e48c7072135e0ac6d05b5544015bdd299f792dfe1c10cfb623
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 5cf603c4f1d6..a54ba289fde0 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 79c7818a79fc..9de3a4c23da4 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1,3 @@
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
-EBUILD nomacs-3.12.ebuild 1339 BLAKE2B 0f6501b09d0efb5881a3f64120e75e512c224e190d17f210f4b4ec7e925f6490c39f238f7be8935ef88434c445c0709819ca455a464e56ed3dfc629303abf636 SHA512 ef0c676c97d0e0615cf2f24117d16734bf7ab9958f547414abe39e2b27cc7b470dbac96cd9a4d4eb0ca8b04db6c31e2150989c03593963659e0c7513a41a077b
-MISC metadata.xml 658 BLAKE2B 72c4850c61d0aa0c068870eb15f33471279182f0b4fb09a18f24b4a497df4f0928492a2cb24d6f47bd6adc54f3e8be95d937c65f95db01dfc5a4bda83830e3ea SHA512 7388bf834b7483835054cf4550984916a6ccd56902d7992b24f83affd39e2aac8a50599b81370f85683882425c93bfd081fffa5f7e693b6d1683b5429be1cae0
+EBUILD nomacs-3.12.ebuild 1273 BLAKE2B e16331ab550098f3f680672034e59d0d5667589bd54a929f381ea40df753d33486fde632f181cd5baeba819048bb2bf10b1828be3a7c491728697fb9fa8ff829 SHA512 cd0138e1e4701843355b2b48a8a989fc67cef0f45da2487297d2bfaa6003ddfb2e4927e40f35db86af6ed18243f33f63054e68b245ed36695d209d2cae65239f
+MISC metadata.xml 531 BLAKE2B fc54042c41205b0a44c1b2dcd266e1311b306ee928149b3806e16260be85a65bf0da0716706653f82ff3dc83351fca6a68ca47930a08f3d170d00416515e2eac SHA512 ac9d022d7b0883217b77513e6d913ed816e414402cd4028428f6b239d97c8f5eaab48d709821675529af8a5a3d945105997235dcb63b826fd669f1b5fb2660a4
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 462a1644b167..b27b6fcfc0e4 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -11,7 +11,6 @@
 		<remote-id type="sourceforge">nomacs</remote-id>
 	</upstream>
 	<use>
-		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
 		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
index ed18ddad7616..32fc7db491a3 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="heif +jpeg +opencv raw tiff zip"
+IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="
 	raw? ( opencv )
@@ -28,7 +28,6 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	media-gfx/exiv2:=
-	heif? ( media-libs/libheif:= )
 	opencv? ( >=media-libs/opencv-3.4:= )
 	raw? ( media-libs/libraw:= )
 	tiff? (
@@ -52,7 +51,6 @@ src_configure() {
 		-DENABLE_CODE_COV=OFF
 		-DUSE_SYSTEM_QUAZIP=ON
 		-DENABLE_TRANSLATIONS=ON
-		-DENABLE_HEIF=$(usex heif)
 		-DENABLE_OPENCV=$(usex opencv)
 		-DENABLE_RAW=$(usex raw)
 		-DENABLE_TIFF=$(usex tiff)
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index f13ab0142c06..704303f962f1 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -5,5 +5,5 @@ AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e448
 DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a
 DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27
 EBUILD nvidia-cg-toolkit-3.1.0013-r3.ebuild 3270 BLAKE2B 43cb73b6ea942446de89ee94686af08f53c33226b7eefb95e202d638576c69c5e6ace010f1aec63e45c27a8b062f5298de59c3b88508ff39ffbd415972cec600 SHA512 bda4e6a0e4793dae86a35d046760f0763ef5f92a962e6ab9af3a091f951b783a1c082746aa8c346f3cd31a43fdfa7cf44acd8b665cf23fd8699f088b4c4356f3
-EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 3182 BLAKE2B f70a9bef349130fcc75e987ddc46c9a04993d2ce1b808c7ad9c8cd804ead5f176442286adfa0eaf6670a77aa73191442da0fcfc28f833177b54e469accbf21f9 SHA512 2ba7c0789b25e948f81e125f49e314785361362c3d25a587acf70a99e4350cb355055f8fd7c29dc72a3f5306ba42cc9740dd53b10dd1a423b8ab686764a697bd
+EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 3178 BLAKE2B 3428f817af215a1c4b8c83e6f1849768bfbc15379920654cb8c5d2a1808a6abd19ce95a8372dae98cec7d22b96078040bb07d7f1216d777b0c75c81c711d9f75 SHA512 db6ef0aebb9f2e5516448e5ac58c1297f4feaa8e68531c739d0ce8f00e633b4f7c2ff94b2eeb503886b1322eddb459555750b7ff4cc4646fc86c1de1835300da
 MISC metadata.xml 652 BLAKE2B 8bb1f448a07402e9de7b8265b50318595c3b7de92b8b444b92dce29ac428682ab856f6d4ed668579a8fcda48b8d17f975b69d08154a54cefe7dce8916db0e0a3 SHA512 cde9ca3c2c16c3a83593c4fbdd1b05f5b79596f42d77df5f20470d7e2cbca2e445fcac254dcc7f31e41938f756d1bd5b314c7aa1a2dc6a7bc19f170a4d7e1656
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
index 389b9a1b8318..7f8c81f2e733 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="NVIDIA-r1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples multilib"
 
 RESTRICT="strip"
diff --git a/media-gfx/openclipart/Manifest b/media-gfx/openclipart/Manifest
index 6151c2988c5c..e790d5ab8afd 100644
--- a/media-gfx/openclipart/Manifest
+++ b/media-gfx/openclipart/Manifest
@@ -1,3 +1,3 @@
 DIST openclipart-0.20.tar.bz2 367385284 BLAKE2B b308270d6f55573a27d473b63128245b6e5ccdaec7d76598c09e3ad54ab4618b7fbf16bdc28c929856684727330f2edafc22535dd3c57426eee2bce6ef5b3c9d SHA512 2d3e0071e019cc272d220b5a4960d4dd7d8ca1ea36d2de7358c7b21e4b3135630075da032b3e274b88e6be8b7e3d331c02c9eebfd43e4e5b199c6016a8fbbdb7
-EBUILD openclipart-0.20.ebuild 1084 BLAKE2B 1294aef71a3848c82ff4e1f38fa54cb81c4b0f8b67ba2b4b00b6c932434eb64811d71b8c074ed9bc6ec1b505c4fd597bf218b045887bf98579f5625bfc59a9f3 SHA512 5e346dc816161f811c93c8027dde7e30b203cc088549b581a5ef4f6c2234b89500e82351952e43bfdc6a871bd6cc276bf5965b7e5d844a8744c98c71b529aab2
+EBUILD openclipart-0.20.ebuild 1047 BLAKE2B 1ff0188435a939aa7d9c478c9c2871b9c9274608166bc8eece20f19d205a91f0b885e95df9e317d5c9846655377497b2f63d030ddab130c9a568bc462d84173d SHA512 89c4a4ac01576a2b330377ec19004674eb4b90938e33b5b4883b05383a7d2c0927b5462b4597d9db920475847fcf116a42377d1cee5f4b23c8c9ca39d00b172f
 MISC metadata.xml 332 BLAKE2B bbd9ad47860ce7ed16d880960784854160dafdbd724c61372cae276840c69f1fe2ee7ef1646c877f7836fc46323e666d0a24f2019fb8e3905f7aa4c17f9a67a3 SHA512 58e164a238ec35cf87e8de731d9d7fc797432b0944277e2893d2ea7e70d49c5c82ec15352bcfe2ff8497f7f41d5cfd17f4fb3994bbbe17d9223d3f0c0522b9b4
diff --git a/media-gfx/openclipart/openclipart-0.20.ebuild b/media-gfx/openclipart/openclipart-0.20.ebuild
index f512de948c2e..17b765217857 100644
--- a/media-gfx/openclipart/openclipart-0.20.ebuild
+++ b/media-gfx/openclipart/openclipart-0.20.ebuild
@@ -1,44 +1,37 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=7
 
 DESCRIPTION="Open Clip Art Library (openclipart.org)"
-HOMEPAGE="http://www.openclipart.org/"
-
+HOMEPAGE="https://www.openclipart.org/"
 SRC_URI="http://download.openclipart.org/downloads/${PV}/${P}.tar.bz2"
+
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="svg png gzip"
 
-# We don't really need anything to run
-DEPEND=""
-RDEPEND=""
-
 # suggested basedir for cliparts
 CLIPART="/usr/share/clipart/${PN}"
 
 src_compile() {
-	local removeext
+	local removeext=( $(usev !png) $(usev !svg) )
+	[[ -z ${removeext} ]] && elog "No image formats specified - defaulting to all (png and svg)"
 
-	if ! use svg && ! use png; then
-		elog "No image formats specified - defaulting to all (png and svg)"
-	else
-		! use png && removeext="${removeext} png"
-		! use svg && removeext="${removeext} svg"
-	fi
-
-	for ext in ${removeext}; do
-		elog "Removing ${ext} files..."
-		find -name "*.${ext}" -exec rm -f {} \; \
-			|| die "Failed - remove"
+	local i
+	for i in "${removeext[@]}"; do
+		elog "Removing ${i} files..."
+		find -name "*.${i}" -delete || die "Failed removing files (${i})"
 	done
 
 	if use gzip; then
 		einfo "Compressing SVG files..."
-		find -name "*.svg" -print0 | xargs -L 1 -0 \
-			bash -c 'gzip -9c "${1}" > "${1}z"; rm -f "${1}"' --
+
+		while IFS="" read -d $'\0' -r i ; do
+			gzip -9c "${i}" >"${i}z" || die "Failed compressing ${i}"
+			rm -f "${i}" || die "Failed removing temporary ${i}"
+		done < <(find "${S}" -name "*.svg" -print0)
 	fi
 }
 
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 7dfcf9e72d4f..90199d16e73a 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,6 +1,6 @@
 AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
 AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
-EBUILD openscad-2015.03_p3.ebuild 1584 BLAKE2B b283c7b93ac0797ec7a7884047568e07773c6714ca0ea787ad8c4003fe85cfc7219bcca0dbcb1149063580109d2e6c419ce4a9a6f2ef0cbbb8a87d33907637e5 SHA512 e5ce533fce3fe8bdcdcd86b62a7aa77073a2acf572f1c386e4fded6d023bc3571757f8513c1ab538d59f70ee1e3a11c63b951e93224abbfd2baf09dec7430419
-EBUILD openscad-9999.ebuild 1463 BLAKE2B afe4a5aa2b53e6667626605fe869a76318d9f74933cb0e1f6f8e1ad7d7e17e42bdd93cb306689fac49622fb8f62659911512cacc762406e488068fd738ec3a97 SHA512 04900830eef04f18fcb64ad35a7e60ef00247acfcdfbe63f3a685ddd39bc699198f4addf2a47141018c5c4cf551f01f60d7b3ee48088f9aaf9cbe4ae216d987b
-MISC metadata.xml 754 BLAKE2B d8247b4210f8e5470a0e2bbbb21c4b0755b7aa0beac0f75845bdda5135eb86a9214888cca436a02b7e566520865aae7714a9942bb5871c8e8fd54240b933abb4 SHA512 23905b2fb9ff937bdaee469086c9eefc3404de22e72be73f470ee51b9d078da20c856918d320c7156221708c11855a7e12ff6f277f4d5cfad671dcb4d9911c40
+EBUILD openscad-2015.03_p3-r1.ebuild 1552 BLAKE2B 99950ff5682870f6068b2c5b22d89980df3328924603eb87316038d1b32b11591c08c153809b390188a24232762f177687b71879f385b96774529e2f6de6577c SHA512 30775ffdb75080c69eea9aa1d8d7b4c093c33760f490b5f695ef9bba30dab412d8fe001cdff66b69623169eb0d6b3399bf469cce023b4b79e53b7ddd7ee41c21
+EBUILD openscad-9999.ebuild 1365 BLAKE2B 2d00f343fd981e771b5215146d26017949dfa2c29f358a5430ce353a5bfc11e481b04b270e89a7f5717c1a535d3c93ae5b794fd2cad5834f86294927708ec3ca SHA512 d3dc21a02a29fca95aa8df5e8b650eae61f31b3fd1ab61a0dbe4c303b974f5bd27a75f92b873b3f4c0e56699afbf37ee0bf53f44fc62c59c099e1caf9cf84977
+MISC metadata.xml 1025 BLAKE2B f1d33e8f6f5f045c0993882d461e9bd8457fc33ee5c32b115540abe18e66b8020ae2ba0f6a593b3e7feb3e48c1d85554bb8340ee0606541964770a40dafc76b6 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index a11c32d6c96b..7b83ba148002 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-OpenSCAD is a software for creating solid 3D CAD objects.  Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.  OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X.
-	</longdescription>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+	OpenSCAD is a software for creating solid 3D CAD objects.  Unlike
+	most free software for creating 3D models (such as the famous
+	application Blender) it does not focus on the artistic aspects of 3D
+	modelling but instead on the CAD aspects. Thus it might be the
+	application you are looking for when you are planning to create 3D
+	models of machine parts but pretty sure is not what you are looking
+	for when you are more interested in creating computer-animated movies.
+	OpenSCAD is free software and available for Linux/UNIX, MS Windows and
+	Mac OS X.
+</longdescription>
+<upstream>
+	<remote-id type="github">openscad/openscad</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-gfx/openscad/openscad-2015.03_p3.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
index aee0a681df2e..1b34fa207c5e 100644
--- a/media-gfx/openscad/openscad-2015.03_p3.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit elisp-common qmake-utils xdg-utils
+inherit elisp-common qmake-utils xdg
 
-MY_PV="2015.03-3"
+# 2015.03-3
+MY_VER=$(ver_cut 1-2) # version component
+MY_REL=$(ver_cut 4) # release component, 'p' being the third component
+MY_PV=${MY_VER}-${MY_REL}
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
@@ -72,13 +75,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 4dd3247d891b..e885fba11965 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit elisp-common git-r3 qmake-utils xdg-utils
+inherit elisp-common git-r3 qmake-utils xdg
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -21,10 +21,13 @@ DEPEND="
 	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/gmp:0=
+	dev-libs/libzip:=
 	dev-libs/mpfr:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtmultimedia:5[-gles2]
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0
@@ -68,13 +71,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index e7c686450e68..f365b13a5465 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -5,7 +5,7 @@ DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a06
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r2.ebuild 2055 BLAKE2B 212e28be4291d37d65c1267e3165aee224e03ec0d13910675c5affee005305a1b2ac2fabc6739714152e7880497ebd2e4ec5b4cdc12ca458e5c720c119ffccdc SHA512 47080bd3590217ffb779058864e39b94a86743bcf9e6d2b332a9159dd22354e076dcccafdb0100f2b71ffe08d6e91b60bf34d96a805a5b074fd5bf8750ef1fb0
-EBUILD openvdb-4.0.2.ebuild 1939 BLAKE2B d582b4ef569c23a0c8abb87e4371b39700430c27820fbce623857b84e665f342e3f61b4f224245c2c338a485e971d61ebbbba330096c566aec0a1d74725ccb86 SHA512 3a2d529460fa36ba324abc6a298522383056eea574109d2c796e8efb7b7fbbb4b260f5530456884f391cebb8279d736f48f1c34c3675a121371a5d887180039c
+EBUILD openvdb-4.0.2-r2.ebuild 2051 BLAKE2B 9b38c7a2f4d9c002f98890dd139211a353020d1d8cc3f7b95eac34765e11a153332498f83455cc1db384f436a080d33f5f1d982cc02cc82f4b49d90a8e3b9def SHA512 4c0e23bba7064bab8578b2f26c1234da7be2ddec2c7d70b15a710447d43550b23931120da432069fecaa69cf617376047b4ff1cb597d15fc5874c17034163286
+EBUILD openvdb-4.0.2.ebuild 1935 BLAKE2B 8b25b6a5a55f91cb50c9b79b732d79921eab1ea4cbfa84f47431b1b5256142d489f38cd4da3946bd8d12ad471cb776d6fcf894b12263669138c453624d487868 SHA512 6fdb9ada5f4630e0f1b917b2d9c9467af7e8ba335dcba04866dc7cef3191aab606f5495d36f92e1500c53b1eca1b1471e8f182a470ad495e1290b659a56c10a9
 EBUILD openvdb-5.2.0.ebuild 1785 BLAKE2B b16a9beabf0e755da3daf1213703eb1103bc4a93681c5686842cfd814c1ac13753a8380d4a432772977f328fc5f4ba0e7eb5422142e9c11771952b7ef2b3de0c SHA512 e9ac1a52a478e9bd4108ef78eb124934a22310b9ec96239bf6e796abb873f1a36c527416b68d99e5fea077def2edbb4949198ef0e733532dc9a8daecf86e09a0
 MISC metadata.xml 1028 BLAKE2B a6d852019e2bf507aa175846fc1687f101df9fc498b7dd2c7de25d860f419e86eb37549e3a2b742c32d0a2f5c6fc0450b3c82da18ef96c65fc81e547f3e7e944 SHA512 2f9d7a4271998fd9fef7a0c4fbd9d77187ba0fe41d31a807e88b19554cc5b624686e3dca44a47e8e69edc71fa89a06fcd89de59f09bccf3378418500b268d287
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index 166cef75e0e3..4b21771b9f40 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils flag-o-matic python-single-r1
 
diff --git a/media-gfx/openvdb/openvdb-4.0.2.ebuild b/media-gfx/openvdb/openvdb-4.0.2.ebuild
index 84304db862cf..cfd305eed6cf 100644
--- a/media-gfx/openvdb/openvdb-4.0.2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils flag-o-matic python-single-r1
 
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 4dd0c0528e34..415f7dc6164e 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,3 +1,3 @@
 DIST plantuml-8046.tar.gz 2966063 BLAKE2B 8634fbccbcd0ae2038a5e611215dd4343baba5e9562c02d6ebfc2a9fe702359fd035f490a9fd06484c08431993792efd1b3afd35f2a9812fb052f92f3616e284 SHA512 2ddae800fb30c0e352b44ef06476f7d770c12d516d93fe6f82ec1f33dd3bc1cb3330ba4a0cc89e06daa6eec9a56dc772a4f901d441dea86a8ce82b8d298cdfd5
-EBUILD plantuml-8046.ebuild 707 BLAKE2B db701e0f0ffd7202c69ab6054a4a60a2c004983e153a26b6f8d6788b46360b0b9653e9a8e1b8f7aa172ce436d55ecbaa111ba10c495842e6e64be92d50f41976 SHA512 732a2e56f552f08dd29722c80aabd1f6e949239ae5454286d46d1f3ce8c9e0ca24b081ff2a5e8a5505950ec55b229090607d5bd9fbb2556b5db22b4a41b88698
+EBUILD plantuml-8046.ebuild 703 BLAKE2B 06b199c7c9877d6fe344ff18241c9aeca7397de343679a16a7bcf71b3951e1f09b2a5a1e19e0004f60780684ea0300b5bed8b16aae4e56ebdd5ecf360ef9668b SHA512 2fdc840e0816509ba11f80d21ae23c312a2d3e4836f13baa0e604c7607890ae96efe9944bcf7330d1547cf35be4923c763e8f89711378b6e6db2e817c28058c2
 MISC metadata.xml 821 BLAKE2B dd2177671848872c7a33108b012327639d40e2664ae85619bd94810e99a385dfa39111a95922a59e451ee4be7c9eebdc288934ef7a79ef33ce0683c09c13cb51 SHA512 8b2400bb96cbac0403ef0865bdb3d72a00dfad45f1c3807ca1a1ba0d98aa3f7777bc8d65089d82c6132ffb75a7395312b374ffaa88f67866512978be1eae9b98
diff --git a/media-gfx/plantuml/plantuml-8046.ebuild b/media-gfx/plantuml/plantuml-8046.ebuild
index e214cf19d516..57239acc9c8a 100644
--- a/media-gfx/plantuml/plantuml-8046.ebuild
+++ b/media-gfx/plantuml/plantuml-8046.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.7"
 
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index 2aef14735796..47b1aa5c389f 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -2,5 +2,5 @@ AUX pngrewrite-1.3.0-gcc44.patch 411 BLAKE2B c1df75d9f27385c4f71a6cb87007d9eb50b
 DIST pngrewrite-1.3.0.zip 105995 BLAKE2B f09ce3b542e7013136e9244f89f6be5389df0522296bab609ad2023acb0a9792ee4ae5f9ba3666682c5d81c2364530225f5b306417a8e26d468f39e74d99cd68 SHA512 f146d69780309c61246f71cbc58081e1e357ea0cb58ee7ae5908075ab9cf86218f3eed956ff32df39efcebad7a743bf303ce1a50753d4d4c3710968002a75f1d
 DIST pngrewrite-1.4.0.zip 149760 BLAKE2B 7ae0acabe8d231233bfab3fe0c6a71da4f835d5c6c6943aa394ec0e83f126c93127d5f798e2206f2c45ed5b9b016a14c45a99ea450b40fd63af09a321fb5d2bd SHA512 9ed9d220a4d8066f752d7ba123dd831ce6550072e7f8dd2327bf257b3d8e886f781c4878896c633a9a251a1311a10af56434e2c9ff773d174233a340a1f37e42
 EBUILD pngrewrite-1.3.0.ebuild 702 BLAKE2B fb84c0a1afcb918156f2db5ae747efa3e846ccf77e0f04f04022bed5473b09f5270812874fd00abec6dabeea1b8c5b11e7da549497201c933a5a968885cf94e2 SHA512 f4afe06f24b456c3ba90988540bc618cf07e521256bd247047e33c15e794bebf2ac36ae51c8f5b07ab5560dc681622c94be14935dd74bc1f7ba00d942dc94e56
-EBUILD pngrewrite-1.4.0.ebuild 630 BLAKE2B a8aa5ac17ca5a7eaca48ee7629a7b6e1c4b336d2d93d27f0027b94cdbc74be7659af6b678755cba2d6ed8ba4e1662fa5d844f547f6a33fbae8e215380d5482fa SHA512 958c207b0b43586ad01fc7058fd06455339d4d18ae669bd510b1627d3fa406bcf057bb5e7059b2489597dffa7d68d0da8ad47072ee9594383bef454e8c0329de
+EBUILD pngrewrite-1.4.0.ebuild 637 BLAKE2B 8777a33e36f753f8acf4d94c24ca5c09fe573e8114427f6723a09b44f4171f6d5f3847e93f487a0b032b9a9e2894bfa13ce5fe6c9b5c4ee940bad4493f2243cb SHA512 4cab23f9013cb714b509c015228e217bd707222dd7be3d5556ae421c46532c2e240e2fb6f5d3abb41bf5a859ac09fdfb42d809d2250acbc663358ed0f2a8da57
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
index 16c1e95be819..62104a186ac0 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="A utility which reduces large palettes in PNG images"
-HOMEPAGE="http://entropymine.com/jason/pngrewrite/"
-SRC_URI="http://entropymine.com/jason/${PN}/${P}.zip"
+DESCRIPTION="Utility which reduces large palettes in PNG images"
+HOMEPAGE="https://entropymine.com/jason/pngrewrite/"
+SRC_URI="https://entropymine.com/jason/${PN}/${P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc sparc ~x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND="media-libs/libpng"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+BDEPEND="app-arch/unzip"
+DEPEND="media-libs/libpng:0="
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_compile() {
 	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/media-gfx/qrencode-python/Manifest b/media-gfx/qrencode-python/Manifest
index 0296b1634bd2..2f9479511809 100644
--- a/media-gfx/qrencode-python/Manifest
+++ b/media-gfx/qrencode-python/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-python-1.02_pre140921.tar.gz 2084 BLAKE2B 19cecad794718a56bb0ac756b322fbeb9a748792bc9683a3c0784c5d2e2638b100fe523b4ab34be5563bd10e5773cc6925dbfbabba48d9487ed2d8e4e86dae57 SHA512 231c61f98f064d282611d14194de7b3c0a18faff0ed856722e39a6cc25f744442d77bd43418aec117c6e39ddd78a6ea770edee8992aa4e3cfce50254ac6526aa
-EBUILD qrencode-python-1.02_pre140921.ebuild 699 BLAKE2B 0e8f229beaac70c3378b5ad0bc731baa26330979b47f28956b0df8baec11dee2bca3f4ce32813e8115ca5cd1d9b857e1902f5d215dc0613bbad19dae70bd0064 SHA512 ba0c41bba4329c0052d73939a10905c7d53e447d9aaaa1ace3f51f240c67e9300984fe71f0fcfa18fbaefa5f1f3d458033cd0187ab6d686c2c6aac0b6ff64d03
+EBUILD qrencode-python-1.02_pre140921.ebuild 692 BLAKE2B b2ec65ef46bc241e3057a6eecd4aa277ee69560eab3b5b53c3e8c9e29cf983fb800e33f66fe8318719eee222d181461d9440e276fedab6f88b2330b59b342fe4 SHA512 6972ae0a4b121324e0195814485fb7912e301f5eaf620cb98dd87d48ddf7c91b4a8a273f76a5e81e9b8346e5d8a5647eb816fcb4b9e31f728acb62ff1c135ce8
 MISC metadata.xml 304 BLAKE2B eb11f9f35defdf53355add48e6b21809cbd85cbf1e12930d53ccf77f82a28b5fda23e5dbf0ac2c15c509f8a50997339ca2d43e0ea2c0fed45bf7e4b55f38c9ed SHA512 d36db02c7fa11ce34c655789975cdac826c259dfe778a27b28221c31bc6a5e99e3ce53f0b3c0a3abb8ad29b39e937cb02379a6c93310ccb1978c62511a4c6f1f
diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
index 1f2c96240d9a..dbc2aac46927 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 87d46af656a0..c9b0bc50cf69 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-EBUILD qrencode-4.0.2.ebuild 773 BLAKE2B 42d81d58e0ae8d0936f30ebda36ac3870e40c56704d2ea47a7c50c187d6b072f65de012e1e2dc2b64161649785eb71f2c72d311880eba33149e478ab03251ba1 SHA512 37117710fb76538a379f7731bcae7013f63d6066702308d383228a56eeeffb4855d189d0689fd0c4813263b77e93a4bef4f7809f36b22d87f28d4697ecda93c1
+EBUILD qrencode-4.0.2.ebuild 772 BLAKE2B 11ca1bc4a0623c5103a97ffffe14d95fe2ac5fe2c9eb8e42e50c6a53d6a9d631ce3db5e3bcccbebd82e91c88cba4913038749ebf176de0244ad20d5d74a85f6e SHA512 bbb9c68a38ec47d9c3c638cc761fefc5b315aeecaf3e408902fef4e998baeb5ad2edc561200c0f5a6445b26aba3d2e73902112aaa45df4890019ae91a3998d1b
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index 14b1fb90df63..973d1bda8962 100644
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 9ba2fff57db4..249fd247af23 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,5 +1,5 @@
 DIST rawtherapee-5.4.tar.xz 11991988 BLAKE2B 625b4e04b82f34d994e0f23f6aea6af4b0a2af2b6a325e916e7b51f8a83b568b65bef47a489be547d1e2437f9637b2ecea0d69d95bfabd53b61b11b46d9e36bc SHA512 6dc9a82202b80675f90eeb8f08c4484700561861f296546ae9425c6e9603f6e84bdc0859896c333d2367cc0b371c6bb6ab2fe36ff3d6f56419cbf18a58d8ef89
 DIST rawtherapee-5.5.tar.xz 12163556 BLAKE2B 6251655b5bcc8b805eda584e386771b14dec15a2d8a96518bdb79d7e31354c78eb263f6964d7f6ffaeb35a127d3f775c9c39dfebf072a0bfc14d284358acd03c SHA512 fcb546ad6e420200a821c89555ec259140995a3bc69429d2ecb648632c02e10ffceebbd7296e879c93b53ad8efa45ea71336d936cd90cead723e70e8932a413a
 EBUILD rawtherapee-5.4.ebuild 1626 BLAKE2B c85d316a1e741e3bb34b278429c35a01312bfb33ff413fdca05d3d14b329ed57f207ba56537711943c9afef4c3177c421af9f46bcf1d95a96a361cef5c3bac7b SHA512 f9645dfa2bda00054821956bc1a9de57066c06c8f74ec1d8ebdaf0b1ed2e4453b253fb66ae4ff7a8f0e55d8a455176cea71b5502e76a8004f435a65bc877bcf9
-EBUILD rawtherapee-5.5.ebuild 1632 BLAKE2B 9532c517460e30fa307d47ce83fb41c2722b178b6b560b70c13dbfbd75f233261f6b1eaa30711a131e801d44b181b1a121cf98e3e7801d842a6801fe345180e9 SHA512 eb553e9e10586745cdb200ddf69915d122c2a06cc0347894b697c9400d18053965670a3258092fa996004b21f16f054cf8b072020369adf91c8c0861b9b9eee1
+EBUILD rawtherapee-5.5.ebuild 1631 BLAKE2B 4bb476be966428d80824b7c9245acb9fa528534b45feac35e6b9e35ef9513342b115224331bed6bbfecf6d51f569f641337592f4611eb14998b477c8b5177890 SHA512 4be114ac1158e205c607bd551c87cbe271567cf8fedc82b6ef3581f30e977533660ecc790fe6a149e0b73a6821ddcb1da7afefd6927372ae5274df9dc64357e6
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.5.ebuild b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
index 0994a1f97e03..a47d21b7863e 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="openmp"
 
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 5b6479b0fa59..302ec7d8bde1 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,3 +1,5 @@
 DIST ristretto-0.8.3.tar.bz2 564745 BLAKE2B 74f6fe50dbbcb538ff370fdefc934921e5878f7422dde577b86acc0ee63a03edaada860f0a91301de4b4ed4ae2fab89d74eccc5f3b9faababa4c71ee07159c33 SHA512 c43b48dfdf9e8ed0ea3c5f2bbac1c837881aa6a467c78377b6f53dcce030b5a3b8134a7b8cbad1008ae758295953fde50a916c284e54e8c5490158e776554514
+DIST ristretto-0.8.4.tar.bz2 581374 BLAKE2B 8d4dc91daa1aebf7d8193d8a48c3be29ad6fed86b7fbea68effb63f6a56d2d39898b5ab0c93933adf9d65cce327109dca5ecff96855c4311494de7cc4182213f SHA512 c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8
 EBUILD ristretto-0.8.3.ebuild 879 BLAKE2B 7f7473ecbbf739f47d1cb0370e15b2f487862792487e894b76dab4681adb2c433ea9a782c820bb95111bd83212badeb333ce21e2d10ec8cb455d6acf5224900d SHA512 faf62c22bba201b3136d30843ecca5d11dceb79b64ad97102a9b7ae3242e35264cccc41e66f37b32cd08fa63b599eb40be7a45a51e6bd219cab6757b7a076f63
+EBUILD ristretto-0.8.4.ebuild 878 BLAKE2B 8d6acf62aab78bc684a29dc50714da1cba6c6f2c20243e0e82ccdd5ee52718551c74078c9e076ad2dfaa9f2fdbf314149a2a0f8978d63231b66566f7c8519128 SHA512 171906c898d2e8ca4e43da0bc93b9d0827c54641aaafb4b980bcdea609fe6d5925f3cb78d97d9229c46213ed11f5f6cc5cc50e3e995fbcdcfa4dc59cba82f963
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.4.ebuild b/media-gfx/ristretto/ristretto-0.8.4.ebuild
new file mode 100644
index 000000000000..fd92a6e06f88
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.24:2
+	media-libs/libexif:0=
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-2.20:2
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.10:0=
+	>=xfce-base/libxfce4util-4.10:0=
+	>=xfce-base/xfconf-4.10:0="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 229f8b57a3ab..eada741d1b6f 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,5 +1,5 @@
 DIST scour-0.35.tar.gz 80981 BLAKE2B 6cf0eba35a9deadf44534d3e8370187ec7b7655e9dc31f25b5bf465fee7482eb18ee985b0702c7fa8cb5db89cb1579186fee1c43b890ba4c74f4e86cd793927a SHA512 9a09d862d66e21a63744401a44f517eef268288408556e3541218713ee8c5b5c0414ab03ac61d5d2fdbd2f01fa3276793b17f110d44cdec1c53c7b7dee16afc0
 DIST scour-0.36.tar.gz 91575 BLAKE2B be65b751151cf939601b6c0dec0613d13be6367f761fc8d7201bd58f2a3475858740be0d972446e2727852b79b1197b82d217b51dd3ae41c0bada10d53d462b7 SHA512 8593f46a0e36fe220f5ce6dd85696172435712491cd1a6983c12054965ce96eeb2a52be0877f8fa6967444817abfc353f9a00f1d8d676cbd6651cfd33a0790f7
-EBUILD scour-0.35-r1.ebuild 655 BLAKE2B 0c6c37502c38260170e04f226c7a25bf78f98e14f5ddfb76b2eeb0ce89221cdf3588cc11f236664c4f8698a867409d531f1b5a7235b0e7f56c00e614beb8731e SHA512 ff88db744f396df8d9c0e964c7a48db367b2dea7bb2093bf06674c4cf1907b36617f27f68828c9a141fe19b23294ac3401fb314277228b3cde8269d8a582f954
-EBUILD scour-0.36.ebuild 662 BLAKE2B 9ba5afbd3df3052b95ab21b2be7a7902feb243d804d896f0adcd10777f4b7b3ad201d079ed679674486f2975ab99b13a2bb562016349e3ccd3f84c61c1956a19 SHA512 e79ccb38da7fdc957c30f3d97ef7532a991a73a151896d9457646ef57f93bee0976a809823368cc93562123e72ee37bc682cff73e06ab14f9b9ffa3086a51317
+EBUILD scour-0.35-r1.ebuild 648 BLAKE2B d3dc3dd0b91cd84a4629b7bd388c2fc2afa8823e01f30c01875868d3f92ad93a3acbf34d5d58a69be0314ce47196f3ad3d231e4fa06b6dc287cf61ae7deee252 SHA512 7fead8c52314c1eaf95f8c2b8f8ce58dfeb6ddacf135de160bb540c64ec5458c744acdadc53a8a6c5ea5d0319712a87dc4acc5da47f0b0f05148a9598381bdb5
+EBUILD scour-0.36.ebuild 655 BLAKE2B e28dc63d07ca0e490e24144db10fa3df9e0aabd1080ea6d5884e5a758885f86e17ea2150d90d8340a304d3067479e61ba17e9bb99ac07a3c9c425d59f31c2035 SHA512 2535527237312aa0384c55aadd53fd6ad9b2f6521ad46e369d22de32c072e0e515ab4832851e30b4d6843bb1e4f490211930ee80ee35780e89ac0ef547c5e7c2
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/scour/scour-0.35-r1.ebuild b/media-gfx/scour/scour-0.35-r1.ebuild
index ca09fb68ded8..47e1066ec112 100644
--- a/media-gfx/scour/scour-0.35-r1.ebuild
+++ b/media-gfx/scour/scour-0.35-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
diff --git a/media-gfx/scour/scour-0.36.ebuild b/media-gfx/scour/scour-0.36.ebuild
index 46c55274f05c..0ce936f07ef5 100644
--- a/media-gfx/scour/scour-0.36.ebuild
+++ b/media-gfx/scour/scour-0.36.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 2f2b4202c532..a95ed321143f 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -2,7 +2,7 @@ AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b
 DIST scrot-0.8.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
 DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
-EBUILD scrot-0.8-r1.ebuild 662 BLAKE2B b4b30806cfb63597a748b4924687259224dd09c0d2eb8a698786681595ec0124434621cf11de7d16b0c8a25188a6bdf230d9117f76bb6a5da4965e21652f379f SHA512 edd9a48e946ea4e3cbaedf277c1d80f9bd8c5a727da72ce1e6167fe1d23bbe9103b804197e4e46ef0a47500c54221d2299bae5abfd709eb5deeceae6ba10c66a
-EBUILD scrot-0.8_p13-r1.ebuild 999 BLAKE2B 8b9a2c5894409b0ce205c86aa85120608e341f62264a5e738f2487da7f9ff5dc71459149adec96e25577dd9295609b19d66e27c75a6850e68e0feacb17f03ee9 SHA512 e6599baad370c49917875c2c81ddc00a449078b8b4f22de45f7a9f7a09dfa311afc1bb04f16bf347788b944f68cf0dcf9cf3400d6563bf8baf734b7ebbbd3e3f
-EBUILD scrot-0.8_p13.ebuild 909 BLAKE2B b7848136b4b9c6bebc4ca18f6d562dbf0e2bdd164a92aeb60adee4b75352e08977dc9ca2938fc235b06761e7057f72f3de4e03547bd738f1f757b1703b31ffeb SHA512 98b9ef9f2a381fb4f33a87d51b0115ea38edea097bba1a5c71f96be1da04e6182e3e2586deee1e64962d2ed14ef2ec57458a1ffd842952cb8981bab8122224fa
+EBUILD scrot-0.8-r1.ebuild 666 BLAKE2B b91b37a7b8db6a3de2d4685293a32183f58b3ca5b9ec6b630d52597f56e681fd0a808bd9fdc2dbef8a9734c144c307a3fedc8d41e37b9b7ad9c75cddcf56025d SHA512 c43a8d61910df70a0a0a91562ab3fd685fd275e0408ad6b6007cb4a942dd7b4ac18cc343e9396cba16b18e5dc2df9d8efbd628187dae4446aa0dc97df96daed0
+EBUILD scrot-0.8_p13-r1.ebuild 1001 BLAKE2B c203706b7257fad582145bb304dd812417c73339ff6d2094174f12782d1043b3085855c6a2f580a8edc76641553c5728c5b46ed945fbcd1e33a3c9bfcde721f8 SHA512 2b90cc64c342e4ba07e87f55a4457bc2c45edb5cd5271995a72c25c3cbc72befc35d8334dfc3ddfd7869c4cc73d586d2b2769f40dd6f8239646397c3ff52d6e9
+EBUILD scrot-0.8_p13.ebuild 913 BLAKE2B 72da0f29f58047ec05aa001763247bd30471eee27c97373a9646cb55e29d8d33507faa1affd4f4b7e37a3fb25fad4cf6f09e6bab1b8e683c5cf54f7feb764ea1 SHA512 3544e4dd18d3c0686d0e0666adb32f89dd571a504cb6abb7083ca80275d408e0315b25cfabe032ba5c8380365e538357b0482307715652f17699f76f221b0a0e
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/scrot/scrot-0.8-r1.ebuild b/media-gfx/scrot/scrot-0.8-r1.ebuild
index 4ca575a899da..e5f7314290bf 100644
--- a/media-gfx/scrot/scrot-0.8-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index 793d8927d5d6..841368076118 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/scrot/scrot-0.8_p13.ebuild b/media-gfx/scrot/scrot-0.8_p13.ebuild
index 116fe3d5dd6f..3beccb11abbe 100644
--- a/media-gfx/scrot/scrot-0.8_p13.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/sigal/Manifest b/media-gfx/sigal/Manifest
index e4f6e4c0c068..89b5cb344a70 100644
--- a/media-gfx/sigal/Manifest
+++ b/media-gfx/sigal/Manifest
@@ -1,3 +1,3 @@
 DIST sigal-1.3.0.tar.gz 3267422 BLAKE2B 0be6dc6b92c8681e47ad7094004793fe78fd8974075958374268bb55f6d2deb903b5ad858c2603c751f74fd2394c945d3f933b3fb44a8f58b18dcd9a2c1c1236 SHA512 132c94a472301a2cc81a4aef13afa8137a6b69dfc035821e22fca6b0598cb94f1788f1a8cf1b47412214c9480867be816070aaa938290a1d10bccc407c38aaf4
-EBUILD sigal-1.3.0.ebuild 862 BLAKE2B 48f00dcf392072987b71b9c9a5d5f1b83f89e42276235f3ac2fd7a1737ad3254f1828d7aa01e178bc4cb4faad1fbf8d0d15353fa0c3331567a4dc727067a38c8 SHA512 2c4de2c38860bad10479102e6d550eb8966ed83f6b30a9cdc4e950d8722c04b568637c4df949e4f8599995f2d3cb9d8685d4e6f3dfbcafee7c292b29d4b78c7b
+EBUILD sigal-1.3.0.ebuild 855 BLAKE2B 3a5b4d1e583ee68248dc85718f4163f53a08afdc5e2475d98dadb1df7f6797a44a5b43e22fd94560f14b876008d5b6e7e7426c114caf4a1860de103aae69c56c SHA512 f789d4a14b209ef8a8f4b38a6d573578607ccfacdc17f27783d2eac784737c9c0348b97aa06884184ae204e89b0759036a940963573c885b62e09e214a266a37
 MISC metadata.xml 1062 BLAKE2B 2997924c7ffdf6ddf3afd6b8d55ab426c7701eb3beb3c566f870507730f99ddd4875621029e078d7f1db16d582de448257701ff7c6325169fafb71a15e9e2304 SHA512 d49289c1dbd612fe88b6ef3d883b073c4b2985839decd5d3b9d73a3c24e0aa83e37890068be8e127ad1f88f86b9b37f7f2f61299c431b3a21b6219f2671a73d3
diff --git a/media-gfx/sigal/sigal-1.3.0.ebuild b/media-gfx/sigal/sigal-1.3.0.ebuild
index 401e9cf2b24c..ba6b0dd74075 100644
--- a/media-gfx/sigal/sigal-1.3.0.ebuild
+++ b/media-gfx/sigal/sigal-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 5fac865f3256..4dfa9909a89c 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,8 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f93fb07315a4f5cb0292b29befb0417df6e6afb059158d9840903d7474bf0d4fb97e634c585ca7654581b82a264e80f0 SHA512 9f0ced644b13dcaad4f1e23a6520b1cbe3c36d995fca4791383f959986cd396f123638a23dbd02a9511ef7e1c9c915b3a025e9b7e4de4542a4c180c4fe29e2b9
 DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
+DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
 EBUILD simple-scan-3.24.1.ebuild 1335 BLAKE2B 63576693a802db62460e1082dff99268639ee3253dd261facd0db3bde5b399461e0e268a417dd4b3e7346de47287b1dee9321be09ba80fa03462d08961718a31 SHA512 071db78d53b4c1dede6c5509b9de07ccebe9f46664ad023764e352cb8c1c87ce3e17321a8e78602e6cda6c8f4a3a7e98fac8a4b19b60c4e4271ee3237d73410d
 EBUILD simple-scan-3.30.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0
+EBUILD simple-scan-3.32.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0
 MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
new file mode 100644
index 000000000000..c3f42c9f23b3
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="colord webp" # packagekit
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.22:3
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=dev-libs/libgusb-0.2.7[vala]
+	colord? ( >=x11-misc/colord-0.1.24:=[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/3.26-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 71468979e26a..31625fdb4745 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -5,5 +5,5 @@ DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c773
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 EBUILD slic3r-1.1.7.ebuild 2907 BLAKE2B 6075bf46ffd1f42fd6246107aad4b7c9c50a9332429164bf4d42a158a34158b71ae7a9132007aa7dee9d005177b0e3d3444cf6bb76bf81d44f99b4d669293b5d SHA512 7ebf691df256f4718ec3fd7c30605d8b10bb5abfed45bade71555fd6fe852f353ab7ed9ca25ffeeeb81154a291adb77ec416dc3a19c3a3927ba89c826b6f8c1c
 EBUILD slic3r-1.3.0-r1.ebuild 2819 BLAKE2B f22e3c7215075c120ec06a4081f1cced916f5db0c13907f4a276a2183e63c3e1544dffd7328a848c2e5088888bc71ea3f5a1ed9449312fce7b1260796c70e351 SHA512 5b0ad5c2ead2510171024d4f86142ea5479783ff10bd731c8cc719651b146ffbf4764a352e35a382a0092521fffb59de81783ec15abbc7c7b4c0c99639ef569a
-EBUILD slic3r-9999.ebuild 2619 BLAKE2B 4a22cb0ff372284025eae2eee01deeb45921fc90b98e0ad591c034bdd642b70596f5bab4a884ea14559ee22508bf9454654eae4e0dfd093abc594420481fae57 SHA512 9c0c0542fc0d41b6ceded25190509148d8e98fe7acb097d6293791d63a11ab073990a5b9e5adf20ee3f097d33efb1dfcc5d2e713d70ed8c5d0218fb50a827e65
+EBUILD slic3r-9999.ebuild 2619 BLAKE2B a15c36937ef599cbe0135c69296ecd57b0fb9fcce0ca8e598993a108454a29035a6801de0aabbabf64e8ec515afc909eaa5337bedbe01defb718374a3c638243 SHA512 4c4bbf15cbbe25111ad29dad2204f7b51ca59485ae2b5b746406345581157f40e4cf1b5143c368184fdc847d2af8131915be933214356af92903374cb0e86c29
 MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 7e99f7d16500..e5b72c099430 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -8,7 +8,7 @@ inherit eutils git-r3 perl-module
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/alexrj/Slic3r.git"
+EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git"
 
 LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 9298c66c1b4d..ad953ff182f2 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,6 @@
-DIST xdot-0.8.tar.gz 131659 BLAKE2B e8bfa034cd106054ef070b5c1cfe641b7fb3ce37f60c747c5ccb339f2b4bbbeb58b54f6f1f9cf57544c53a81d0bf61e4e787a6a78c18b6db90b5cceee3720e70 SHA512 76eea4054ed5b9b3fa25c53dcbceed6671ee622ed6d841ee30cb1005beaf35a74c4e36e4b577b69ef12e39f6e8fcb8f38d1bb024bb9abe92df8c672f0c114ab3
 DIST xdot-1.0.tar.gz 131868 BLAKE2B 433d81913d19ae341c7168d9e22a2c8a54f49b0ad6b0da744cc3152766b333252b9ad7ba3831bdb17fc29a2408f8bdf3d929a438e89a78945f8edd7a8cd123b9 SHA512 52330380973ee122ac5d93f1be5b8f21b5719f537c93dd6f356a116207e366d16cf3cefcb9ec59b21b7170dc94e1f413307c3980e9ba2eaef5ce45340b50b311
-EBUILD xdot-0.8.ebuild 912 BLAKE2B bcef6b54fa4ce563e10a87be6bd484b3436b7e5709953f1ae22b9dd243766b2d0bc05641e313988811209f79eff6d86cbbaecd91a2ad45bd19330108c0a3252b SHA512 8618c4ff7bd02870f569fcd7c24baf46caaa858cbc7c68be1fd6ec7a72945510950aceb409d7a5ed486eca663506721ce77d99553fbbefda93c8b93f08ffc375
-EBUILD xdot-1.0.ebuild 912 BLAKE2B bcef6b54fa4ce563e10a87be6bd484b3436b7e5709953f1ae22b9dd243766b2d0bc05641e313988811209f79eff6d86cbbaecd91a2ad45bd19330108c0a3252b SHA512 8618c4ff7bd02870f569fcd7c24baf46caaa858cbc7c68be1fd6ec7a72945510950aceb409d7a5ed486eca663506721ce77d99553fbbefda93c8b93f08ffc375
-EBUILD xdot-9999.ebuild 568 BLAKE2B 70f735fac2a628414c77a347307260fa439d106b07ebd0338118b0db16d4a883ab3d641abc570676d40a45a09f9ab09ab365faea80acaf355d20675669e3c041 SHA512 5b82f55937820a526ae13e93be38aff2f631e912efa6cf860724ac963b7c62412ade25f732db4d20dd5512804c9e49e18323fa0bc8f5310c090bd72cbc0b431e
-MISC metadata.xml 428 BLAKE2B f4638a5657c09d221d2139a8600502f51d02fc7f4bdf302706cfb75c1bff8980882bfd01a0dfb716bceb624dc0fa32f5f5adb6f259e5a657bd6b579b1612513e SHA512 5a6cf462a35470509a7b38baea1b95220527d20652e185cc280f3e85be2043c502089c012abdcd841c4cd9114b8058d7afd2874ff5b9e3f17eb218c914d09501
+DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
+EBUILD xdot-1.0.ebuild 899 BLAKE2B 5e4d6f4a69ad7a4abd6dd94b34fbbd1b1e06fbdd09818a7917e2f660d1dbb201b769fc8a366a30ed09d8f714bcd7433685b58c3133fd3019f98ca30174dac2f0 SHA512 2a7cc518a904f6d145c0377a9534a6134742e71d25699bb0ad623b9facf5bc21662b26da7f51971a5232f2a6960a96ec98e2b22ee8041b4dd85dfcaa5d0cd698
+EBUILD xdot-1.1.ebuild 1104 BLAKE2B e3e4fc6bfc97f72f48901173e8a8b477414afa78f619b36c3f1e6b418abe2af54534df4305a6e92db6fb18829ee53a94ed93826eaa031906fbde6d6c73c72133 SHA512 dca13c44f96d1e9ac3823b8583faa5ac56a3d69804410c282a612a6f0043d4b6e8019921225e0a3a90a94bcaea1391b7a5a2603aa003fb05e54cffeaf64a4b15
+EBUILD xdot-9999.ebuild 1104 BLAKE2B e3e4fc6bfc97f72f48901173e8a8b477414afa78f619b36c3f1e6b418abe2af54534df4305a6e92db6fb18829ee53a94ed93826eaa031906fbde6d6c73c72133 SHA512 dca13c44f96d1e9ac3823b8583faa5ac56a3d69804410c282a612a6f0043d4b6e8019921225e0a3a90a94bcaea1391b7a5a2603aa003fb05e54cffeaf64a4b15
+MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/metadata.xml b/media-gfx/xdot/metadata.xml
index 947bc75e20be..fed3a8992570 100644
--- a/media-gfx/xdot/metadata.xml
+++ b/media-gfx/xdot/metadata.xml
@@ -2,13 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
+    <email>mattst88@gentoo.org</email>
+    <name>Matt Turner</name>
   </maintainer>
   <longdescription>
   Interactive viewer for Graphviz dot files
   </longdescription>
   <upstream>
     <remote-id type="github">jrfonseca/xdot.py</remote-id>
+    <bugs-to>https://github.com/jrfonseca/xdot.py</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/xdot/xdot-1.0.ebuild b/media-gfx/xdot/xdot-1.0.ebuild
index e8716f71acdb..ae5b3769694f 100644
--- a/media-gfx/xdot/xdot-1.0.ebuild
+++ b/media-gfx/xdot/xdot-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_5 python3_6 )
 
 inherit distutils-r1
 
diff --git a/media-gfx/xdot/xdot-0.8.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index e8716f71acdb..8842ac3a99a5 100644
--- a/media-gfx/xdot/xdot-0.8.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -1,21 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 MY_PN=xdot.py
-MY_P="${MY_PN}-${PV}"
+EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+inherit ${GIT_ECLASS} distutils-r1
 
 DESCRIPTION="Interactive viewer for Graphviz dot files"
 HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
@@ -25,7 +33,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
 
 src_prepare() {
 	eapply_user
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index 6b682956a737..8842ac3a99a5 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.ebuild
@@ -1,23 +1,47 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 git-r3
+MY_PN=xdot.py
+EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+inherit ${GIT_ECLASS} distutils-r1
 
 DESCRIPTION="Interactive viewer for Graphviz dot files"
 HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-EGIT_REPO_URI="https://github.com/jrfonseca/xdot.py.git"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS=""
 
 DEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-gfx/graphviz[${PYTHON_USEDEP}]
+	media-gfx/graphviz
 "
 RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	eapply_user
+
+	# Don't require graphviz python(2) supprt, which xdot doesn't use. This allows xdot to support python3.
+	# For more info, see https://bugs.gentoo.org/643126
+	sed -i "/install_requires=\['graphviz'\],/d" setup.py || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /media-gfx
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)