gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /media-gfx
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
71 files changed, 1474 insertions, 487 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index cab6b84edfb3..441a0b41a97a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
new file mode 100644
index 000000000000..fba3b5ad2d21
--- /dev/null
+++ b/media-gfx/ahoviewer/Manifest
@@ -0,0 +1,3 @@
+DIST ahoviewer-1.6.4.tar.gz 227225 BLAKE2B c00c89bf80865ddf60a478a8ad030aa136fbc2735598de2b237ea97bc247337d9a12a1423e402c2e95c77df4e70ad68242ed31d5f8d896c1ae835acd860e7a5f SHA512 5e00f086685b7fd6601758e5ae0e6e7d1d24b56c1bd7c81de0be5c3613404fcfc585b8bf035a72a51171a40c8a25c7ad084fc3a9f7ba038e121fb2b7874b4ebd
+EBUILD ahoviewer-1.6.4.ebuild 1579 BLAKE2B acabb4739b50bf53584157bead036e882154478e413f68d7c85014da3b17aefe7a043b3ec74c8644d113a54e1698cf2a5c2c5844bfefb1eb3837e803e83c4b80 SHA512 1dbe353fcad2f17f4612341e7180ca92a7343f9e566dcf97c410f6383dc444d9fc79a706463bd0e94860d2dee50d7b1c58fb78b29917650f43dd55216fd7d393
+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
new file mode 100644
index 000000000000..605a1a3cbc46
--- /dev/null
+++ b/media-gfx/ahoviewer/ahoviewer-1.6.4.ebuild
@@ -0,0 +1,84 @@
+# 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/ahoviewer/metadata.xml b/media-gfx/ahoviewer/metadata.xml
new file mode 100644
index 000000000000..9f11884bf0ed
--- /dev/null
+++ b/media-gfx/ahoviewer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="libsecret">Support password storing using libsecret</flag>
+    <flag name="rar">Rar archive support</flag>
+    <flag name="zip">Zip archive support</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-gfx/autopano-sift-C/Manifest b/media-gfx/autopano-sift-C/Manifest
index cc5826e745f7..c82d3e65cc00 100644
--- a/media-gfx/autopano-sift-C/Manifest
+++ b/media-gfx/autopano-sift-C/Manifest
@@ -1,4 +1,4 @@
-AUX autopano-sift-C-2.5.1-lm.patch 512 BLAKE2B 2d27dce09f989fca21be647cd028c5601535d98c7987213c0968fd93d8ee1aac6a6b32c08385b0600829b189fcaab6ee84359763fcbfb4a3710b8bd8ba5cc83d SHA512 35eb8d71f770f25a709599528679ac15e9a90c12ca3c34c1cd1411eaba852dbe9e627e4b8d8fb62adda7e2422c0de493538cbcbf14206e408b9921c895761856
+AUX autopano-sift-C-2.5.1-lm.patch 516 BLAKE2B 79fd443c4c2f321aa93982fb08ee7d8c6c9b588286e5f73d55c89ab014d53f569cd1de93f5846543ec33c2f9616dca65e932ce21cae47eec1c28b9a3c5ef56f8 SHA512 6198eaa686ab22a7707f840cc81c2fc68c9b02ce9d7831d28d255543bd0898b318b5d00b4f7bae487a6e4c70f4d0af75bfd61aeb07825cc70475e2988bb39002
 DIST autopano-sift-C-2.5.1.tar.gz 192267 BLAKE2B 552fe33230d322b5b33c31a6298058d30a8dd63110f15b1af25fa53aa762a5d9924a712523b626ba2381692c643c0bec44534bd5d2cc69b00faaf5b7fbd51d91 SHA512 4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931
-EBUILD autopano-sift-C-2.5.1.ebuild 688 BLAKE2B 46c2c123aab689cddde0b101b8b2e8523260f6fb4cc406b281ec94653bc0257a44f3e9f35a2343db4e1a39824ac4eeb28f000200d2077748606857c87d156500 SHA512 ec794565c3c1fb5ad00a232995c3643aa6a963bcd3a1aab245913708f8a6cd99a5464fdd262ba26d441426498930383e90698bf0f8e2bc864b2be354acb1ee21
+EBUILD autopano-sift-C-2.5.1.ebuild 612 BLAKE2B 08678b7085dd0eaed1176d758d6f2ac7b3e89ba37c40da2cd76c1ba99758d2e510cd316fbcc9510adf49b0e705c570e4a3d44b5a8cc95776232f9a6cb047881a SHA512 3523866054244625cc85f3d332d4a8e399a0af284d8c809709680258614a65b72ca3ac0ec31d224ea03230a3040df77ae89bcb29d0e9348c24e5b0d30246fb00
 MISC metadata.xml 472 BLAKE2B b36bfaf7b7c146cb6c5df0b50983bd6ba0e089f75d04bdc38b331fd0b3bef92380140eaef73db1811647cee1e73b955fdba54c27ae19cdfbecd67099618b349f SHA512 28eab06295fba1917784743b7103fca9ce4a54806ac9609172653896426013f0f2b18a6a4428226aeafca8d0a5de6e493e6288985564331cbc3e0a3e3f2fbb6a
diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
index 3e9405ae1588..6bf149ec6034 100644
--- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
+++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils eutils versionator
+EAPI=6
+
+inherit cmake-utils
 
 DESCRIPTION="SIFT algorithm for automatic panorama creation in C"
 HOMEPAGE="http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
@@ -13,15 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-S=${WORKDIR}/${PN}-"$(get_version_component_range 1-3)"
-
-RDEPEND="!media-gfx/autopano-sift
+DEPEND="
 	dev-libs/libxml2
 	media-libs/libpano13:0=
 	media-libs/libpng:0=
 	media-libs/tiff:0=
 	sys-libs/zlib
 	virtual/jpeg:0"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	!media-gfx/autopano-sift
+"
 
 PATCHES=( "${FILESDIR}"/${P}-lm.patch )
diff --git a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
index 97619975d9b6..e6141fffc0ae 100644
--- a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
+++ b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
@@ -1,8 +1,8 @@
 Link against -lm (mathlib) because ScaleSpace.c (which is part of the internal libsift.a)
 is using the exp() function, see http://bugs.gentoo.org/472150
 
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -121,7 +121,7 @@
  
  ADD_LIBRARY(libsift STATIC ${LIBSIFT_SOURCES})
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 24056c9922b6..2fb920dcc2b1 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -15,4 +15,4 @@ EBUILD blender-2.72b-r4.ebuild 8106 BLAKE2B 32e220cf9afc0219a0b5d4adf14f540f381a
 EBUILD blender-2.79-r1.ebuild 8100 BLAKE2B 7c077c8d3847fa0d7b881b5f5989e42339574b7104bc78869c8e481073b1e6ca062e5a74233f0b96b9ff6b1390f1cc0f203038e733223ddf21b796e696ba508b SHA512 9af0b9f17969a6601c3945fbe3d3d10dc6707df0c88e86e1c2f1617e9b750019a21d05cecab5e726069b9908ba6345d2e190732d3960bbb87674d1f983e311ee
 EBUILD blender-2.79.ebuild 8049 BLAKE2B b4effa99e23ee172e685dff46235c88aecf129a40ab4e01a7b8dd0fb4993e52849c5ebbc712ff63999176644ea9027e572b1f21f4838d31845a525d09d396bbd SHA512 7b660679c69df11a108e58e76cc2e950843bf0285e962cf1f776b3cabf8e7b187ab65984ff6e4bd85120347489d10853ab163d916a4f1c833d890112dd2692c6
 EBUILD blender-2.79b-r1.ebuild 8165 BLAKE2B 8dba69527cd1800c587afd1f5f3369d86eec60ca83a7631df3868ccd17eb42effef1f486a30e8ab772e1baab3cd26f8317bc6c521879fe9cb187525d8894fa3b SHA512 945aceb3481a451ac5ffa54ce8f08605c7d33c34e7de97d5bab0a90d7bfb63d55f739282ced5fa512fd69232c01df9245ab75f5ae5f1d1365b38bb463c30a9a1
-MISC metadata.xml 3599 BLAKE2B fbe6e8d0aca923eb7274eddc7d1bfe5dab20f09acf00479176aed6777788a48bde457f6c0495d86ae17a727e3152919712bfd5de80b394a4e86a9985b736a62c SHA512 1e0ce8315996355a12e9f688cde63f67cd5251cc605b1da32dd4f819c6f9a13cbe2874ab6553e00a426da02802c0de23971d408084ce6025533ac46fc9c5b617
+MISC metadata.xml 3466 BLAKE2B e09a22c7fe5200a7b592c3fda2bdb4ae719ebe614f85d8cb8e9c4c72684fe785575e6b6b4f0e302b1e9beddc7476125e2e443943ff018d35d37f015c1b6414d8 SHA512 0112674420ffeb427dd2ad1cda3ad3e01801e02fa2bbb5dcaec15db21b4582cfff4712d5e587ab875619e94dacab4fa0263d9f635c48e5c94569bc6155577523
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 685687e61af4..9dd73dfe3522 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -56,9 +56,6 @@
 		<flag name="headless" restrict="&gt;=media-gfx/blender-2.77">
 			Build without graphical support (renderfarm, server mode only).
 		</flag>
-		<flag name="jemalloc" restrict="&gt;=media-gfx/blender-2.77">
-			Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
-		</flag>
 		<flag name="llvm" restrict="&gt;=media-gfx/blender-2.77">
 			Enable features depending on llvm.
 		</flag>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 566616303d76..6fe6e8021c08 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -8,4 +8,4 @@ EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0
 EBUILD darktable-2.4.3.ebuild 3998 BLAKE2B ab0356bea66039573ec818f3f93670cee2728230e71e07e9f4acbb89e369971112ecb8cc9186b0235847619d583dbd61edcf287c03ade0eee484d93df2f817f5 SHA512 3a33ecadd7229bce3c2645fe37ad8673a3c68ac3c071c87173206753701703819f6e1ad2e3ed07f822356fa0b0bcde70b9988a9c8e0f3705749424e7cf878079
 EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
 EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
-MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
+MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index e363ebddb751..228506baefbe 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="opencl">Enable opencl support</flag>
 		<flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag>
-		<flag name="webp">Enable WebP export support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">darktable-org/darktable</remote-id>
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index aee31a684ace..29dff18aa6e9 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,3 +1,4 @@
+AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2285 BLAKE2B 458d2526784e58cb6299bea5e0b92616fb496361fdd28ae2bbfd865562a8c87aad73b765c4de0849edf7a5950f267ec14f4c009b102a07f4a5b79672658d9c4f SHA512 860f7cf94e180125c46c943b60f62278d16226a2bcba4a28a810cfc630de704bad701340df7f368d4c445f06e639c32380e42566d86cfbc266f635ef4ba9c9ee
+EBUILD engauge-10.6.ebuild 2324 BLAKE2B 5585f8e4675da09a8b3a3691f387cdd1bf06992f43548712eb58f4e9029e41d31aa70da50c0a762462a26744a1b1bb4b1feffff9089016ce0b8ada00b7619faa SHA512 0cbbe01804a346a606050479e79447616ea35e72536470c3ce5d5140bc779e28789260cb79f8ff97ae18553af899118084aa697715cdb298da36bfb8d2354a4a
 MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index ea7530fd0b5f..7d8aba7d2cce 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,8 @@ S=$WORKDIR/engauge-digitizer-$PV
 src_prepare() {
 	eapply_user
 
+	eapply "${FILESDIR}/${P}-qt-5.11.patch"
+
 	# Make sure the documentation is looked for in the proper directory
 	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
 		-i src/Help/HelpWindow.cpp || die
diff --git a/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
new file mode 100644
index 000000000000..9070f5223939
--- /dev/null
+++ b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/662476
+
+From 5eab86bf84dd1e52fc52b427a8f3508780811976 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 23:51:15 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/Load/LoadImageFromUrl.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Load/LoadImageFromUrl.cpp b/src/Load/LoadImageFromUrl.cpp
+index 684629bd..1150dad0 100644
+--- a/src/Load/LoadImageFromUrl.cpp
++++ b/src/Load/LoadImageFromUrl.cpp
+@@ -10,6 +10,7 @@
+ #include <QFileInfo>
+ #include <QMessageBox>
+ #include <QtNetwork/QNetworkReply>
++#include <QTextStream>
+ #include <QUrl>
+ #include "Version.h"
+ 
+-- 
+2.18.1
+
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 1314067f0b5b..41d7b630376e 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -11,4 +11,4 @@ EBUILD fbida-2.12.ebuild 2413 BLAKE2B a13d6907d2363749e807b1d18a07ddb43bd0f0fe58
 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
-MISC metadata.xml 505 BLAKE2B 2493a8f25224980e0ac358b104a248d522e7b1ab3846dd9d97b722c1a0b8b4a6f131677893092755c31670a162afde5662467d3a7fd660c7af28e39cc2dbca35 SHA512 cbd85cfd39d20a07c679f9f98d487795136ee1611fa69712d0539bc94d354a5a76fa59ea9c1da8b4ea7764e705ed16a4f3f77e0783525001c0ee5467a1af6a2f
+MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58
diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index 32d2983868dd..0959fcdd1155 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/metadata.xml
@@ -8,6 +8,5 @@
 <flag name="fbcon">Install the framebuffer image viewer "fbi"</flag>
 <flag name="ghostscript">Install the framebuffer ghostscript viewer "fbgs"</flag>
 <flag name="X">Install the Motif based image viewer "ida"</flag>
-<flag name="webp">Enable support for the WebP image format</flag>
 </use>
 </pkgmetadata>
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index a2efbecd09af..8c4da5f5e974 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -16,8 +16,8 @@ DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b755
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 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 5913 BLAKE2B 59a998963e01ec10965cadd57cd7cf0ca10f0455aac4ff45d5df7d71ab8ac407c632ea6ce0288f9cead8ec6fd70ea603c5fdb6b437acfb940f4135f52cd4b559 SHA512 a70f0e04a583a483af0609bb88a62199d28c2088f7fe8ea3f98e2aa5d9be80e1ed7558506c78a8668deeebac308433838a9d7e185adaa7e8e611e0e81c4af7ff
+EBUILD gimp-2.10.6-r1.ebuild 5964 BLAKE2B 4f834599caa6b9a2823dce38a8770d2383f2a63e3844e29b8a22e20485e7b9d6f8031eecd7820933b595f920905664aa878fa86d70c8aae942e4b766407ed151 SHA512 70f741ee3c68006d2488b8064b4e176e260c21a67517a3d6ebed8e2daa13ab1e87f1caa76d2b15d12fed6939bea32ada8e662865ff385508899d8299d74de05d
 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 5803 BLAKE2B 6c8e88e071f145e1377f00cccd35b5d3f19efdf23738f751835f625e0977852093157df6fc24c2ab2e3da7675b9ea8aed17c5c92ac202bd91718130934a362c8 SHA512 7d75bf322a3742e687260eb9e82fd85e187312dd4da31af726927eb628b6f6cfe23b763273b1f268d1940ea4da5248f5267906fffe1bc6e90faf132b11e14a3b
-MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
+EBUILD gimp-9999.ebuild 5857 BLAKE2B 5bd2b47844018e3c8be33b30271781c978e01d8a0fe7a165e3ed58782eb12a020ad1a00f002da782d02a1b1447d9659a167a1e6c845230f4d2152985e0f56152 SHA512 e1d744c2802dbe14e1a70f0b0cc2968100143a27c91cdc5e6afd8d905bc43fc62955c2729aae3335bd123935010628556f23808a08ad99264710d29d07c6930e
+MISC metadata.xml 474 BLAKE2B 7beaaa52a35415b9460b23f5031f71464008417e589105db607f0f86519cb7f19c9621dc77acea9aa9e67a1bf8f5887415761a69a29eb77aa205a89cc8b586ac SHA512 f1a58ab4fc0c7a4257648f35027d0860ee7b088ebd61703dde7622078bcc345168f3b747e79d71206ae36c479334925aac137e96c0d2134413f9e62aa27cee53
diff --git a/media-gfx/gimp/gimp-2.10.6-r1.ebuild b/media-gfx/gimp/gimp-2.10.6-r1.ebuild
index 7d7306ae33f2..88e720cd174d 100644
--- a/media-gfx/gimp/gimp-2.10.6-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ 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 postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=dev-libs/atk-2.2.0
@@ -47,7 +47,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
 	>=media-libs/lcms-2.8:2
 	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
 	>=app-text/poppler-0.44[cairo]
 	>=app-text/poppler-data-0.4.7
 	>=media-libs/libpng-1.6.25:0=
@@ -66,7 +66,8 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
+	udev? ( virtual/libgudev:= )
+	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
@@ -123,7 +124,7 @@ src_configure() {
 		$(use_with mng libmng)
 		$(use_with openexr)
 		$(use_with webp)
-		--without-libheif
+		$(use_with heif libheif)
 		$(use_enable python)
 		$(use_enable smp mp)
 		$(use_enable cpu_flags_x86_sse sse)
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index bce92e6ecef2..ac017892f38c 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -16,7 +16,7 @@ SLOT="2"
 KEYWORDS=""
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=dev-libs/atk-2.2.0
@@ -45,7 +45,7 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
 	>=media-libs/lcms-2.8:2
 	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
 	>=app-text/poppler-0.44[cairo]
 	>=app-text/poppler-data-0.4.7
 	>=media-libs/libpng-1.6.25:0=
@@ -64,7 +64,8 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	app-arch/bzip2
 	>=app-arch/xz-utils-5.0.0
 	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
+	udev? ( virtual/libgudev:= )
+	heif? ( >=media-libs/libheif-1.1.0:= )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
@@ -121,7 +122,7 @@ src_configure() {
 		$(use_with mng libmng)
 		$(use_with openexr)
 		$(use_with webp)
-		--without-libheif
+		$(use_with heif libheif)
 		$(use_enable python)
 		$(use_enable smp mp)
 		$(use_enable cpu_flags_x86_sse sse)
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 5bb4b5ca8ae9..f16562de25f4 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -11,5 +11,8 @@
 		<flag name="vector-icons">
 			Enable support for vector icons (experimental)
 		</flag>
+		<flag name="heif">
+			Enable support for ISO/IEC 23008-12:2017 HEIF files
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 550e33216e8c..89e8e3a81f3f 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -8,4 +8,4 @@ EBUILD graphicsmagick-1.3.27.ebuild 3324 BLAKE2B 309ac3fb37a14f5aef75015135b678a
 EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 EBUILD graphicsmagick-1.3.30.ebuild 3251 BLAKE2B 78eecba484d87f81e0ee12d119a84fabc3c052ab7b63b92acff37c0b9b751a4e99fde3c1bd14c6e8dc20a97ecbd94c0f0c558d28a13e4b1523b29c75d61899cd SHA512 165fc7bad883df3be55c9b5714d6a284d9c97e5c06f0e13a08ac783fd946e39b6b929bd9ea17b4284c312830f46edfb536131bf730eec52bd2249c5420569519
 EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
-MISC metadata.xml 1220 BLAKE2B 991045c4a8f2fa2c7d71b585b88af2a0e0d4d260ca64b67131a096f9948272365e2d7303a7fbd5faf6da2bf952645061462ec8d643f14f301d0a12c37dd5f849 SHA512 1bb5a109f05ee51df889358ceb97669aaaa75356390ff85b7ad2ea7659fcc4cf7ad811b2795121ff9957ad58f27fd47dfaf792e0d5afbe31d84cf755158c66fd
+MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 7b04761e284d..f6325c408643 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -19,7 +19,6 @@
     <flag name="modules">Compile graphicsmagick with dynamically loadable modules</flag>
     <flag name="q16">Set storage quantum size to 16 (~2*memory)</flag>
     <flag name="q32">Set storage quantum size to 32 (~5*memory)</flag>
-    <flag name="webp">Enable support for webp image format</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">graphicsmagick</remote-id>
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 2634ca19e9c3..e8126cab3793 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -2,4 +2,4 @@ DIST gthumb-3.4.5.tar.xz 3391492 BLAKE2B 62b3cd9be6954f734f3ae6d9e2d06364350a78b
 DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42
 EBUILD gthumb-3.4.5.ebuild 2289 BLAKE2B 8c98f4b9d534a11cdf789d823626a52e92fb949aaf867ab2caf7a776c2b545bcdb4bab4086911990cb11d2eda8feb2d26f19a81a36856dfb7a1b42ff4238cb91 SHA512 be7f25a32c4f313769a93964e5dbf06c2327ea23bfa755e74a9e9fb7cca3957375ab34f183587f22d7b9df8031fda7ef2a321e88deb8cac4cc8c0cc2de4d30aa
 EBUILD gthumb-3.6.1.ebuild 2579 BLAKE2B f13c9c84ea8466ab95b9dc75e724df532ab19fc967bec165c22619442976ee543da4515d701ee9f1322495d5faebb4ad5f9abd66210d3fab8329cff567814a0d SHA512 4ab95396f427e5daf332e17a8af023ff691b2a9cfee8b0a067add47ff8d8360a4cec0debf1749002990eb97e2e8831ce1951c19611c72886d5f7b9c66e3e7ebf
-MISC metadata.xml 637 BLAKE2B 413b52edeb5c603edf87cddd583bc805fc64bed853f7cbb05f38f26d4583c2a28332b4b6ed1d88e0b16072a4ecbce1f77adb06e9abea88661def2a8e8289e2c4 SHA512 c184a357c96fde1278e991b7ed6a4088481b6fcc3a3943275cd367b8c565006805294df009f0b140c34bb9bce60a059d6b6ce29a245a4ff59e58e7f0369b8bdb
+MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 8f93a7caa21c..48b98345a820 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -10,6 +10,5 @@
 		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
 		<flag name="json">Compile code that uses the libjson-glib library</flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>
-		<flag name="webp">Enable support for webp image format</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index c7d49c618d26..527e3831fbc9 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -10,4 +10,4 @@ EBUILD imagemagick-6.9.10.12.ebuild 6597 BLAKE2B 786a42c5ae37d50041a7c7af163df94
 EBUILD imagemagick-7.0.8.11.ebuild 6639 BLAKE2B bcd16d664b5976253c312714299974e712c8342be9f0fb4cb933944a46d20ac31bffff721ee3f53a2259bc15c3a3da218c188f7938dea8116bfb7f1693648bff SHA512 24ae4050a06bb6c06c1a5a1be43da47155158d7eec8823cb3f1fb67250e428c04fa961498d9217787197908db62f6e30dd15c1bc7d458079edb091c4e5d18b6a
 EBUILD imagemagick-7.0.8.12.ebuild 6719 BLAKE2B 1a21382252a7bbebed69f3903ceb1c3340100172958e9460d482226d1be0f2f4586668278f8c5bb70fc470e29b9b6ea93f6f046e6df33e6bfb224e6d1f7db617 SHA512 4b18be303504204b3cf3ff24ff9718120069bc542d3cc1c18df58d60379b504e62114c300f7a69d213934ea025993ac2893f2941882d8076ed49ffc55a4a626c
 EBUILD imagemagick-9999.ebuild 6722 BLAKE2B 387644c8c74c286dd2b3036646c621737e838dc02686f9def8c40f4e0bcaadfab7a5f7aa91dbab946fc4e73f4440ffe5d01583f7cf41bcc4d8196ccd8ee65fdc SHA512 c885e27422ec79fcba24e1fe6608bb949f4fa1c8e16eeb7779c91896f6ea61ecf063198918f62d461b96b43e0f817d7cec0106880235f378f419cb1f56e47b31
-MISC metadata.xml 1113 BLAKE2B 91aa4c24ab2b2917097f4910aaee88380f11c3a21015e1e094863d8dc4f92a3fec54e811ed72a3896221f12de01ee7e49496a28933eaae0d644e5a77e0d9b9fb SHA512 0d659fe8780e85796901f7369f9d695ad0bd52474626c023d8bba13d244ebda19cbdc7260ed36f655a5d85b5849af730bba7a599aa10fb307a426015647cd190
+MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 1b7f7eecf944..0ca390d487a7 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -15,6 +15,5 @@
     <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
     <flag name="q32">Set quantum depth value to 32</flag>
     <flag name="q8">Set quantum depth value to 8</flag>
-    <flag name="webp">Enable webp image format support using <pkg>media-libs/libwebp</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 57b3b78f01ec..5e7befe93838 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,3 +1,5 @@
 DIST imageworsener-1.3.2.tar.gz 661710 BLAKE2B ac79b9d883be34b93e935dc813e6f1edb4806203a20d1f7663d7cbeec74d62227aa88c92b9e96cb940f2a952e92d9724f98fe69dcbd7d2a9dccc2c0a2e9d19c2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668
+DIST imageworsener-1.3.3.tar.gz 662243 BLAKE2B 6b34dc111c5b2dcc25fdc717b7ec8d4268ca1b67c31cca58b5e1983643f1e3b78543a3bdba24b3692a05cb83a887bfcf0e7b09307535994d280056a0047c8b0d SHA512 ebe8a31819cf665d8d8d7e789d873de03206e74e100ea99b2d8dc6ac2590025ff0058066daeb17ebfaa6cf49222e33c8a9efa83f39f5e2b9b49d27a3ee1b027f
 EBUILD imageworsener-1.3.2.ebuild 1007 BLAKE2B 744e74cd7006ba139e8aab9311d44a12201f202129c66d4da7710504e7a1bbcfde3dbcef5ebb08ee38ddb657d80708967a28c7fcbc20f0b58fbc78d3de05d0a5 SHA512 bfe07f2ebb359e3b53cf2f86a7bb766084633b6a5f14a0aba8d8997797f5a36da8e81a30ba62715d73461bdbdf56dea887951663d8891a1514b1dc8c31f398e7
-MISC metadata.xml 317 BLAKE2B 0d213a7f9da3695ae439de34d4672a161d791005e67c8b1e303d58253b375c66992ee27de672ad0c5ed9ee8a6edb708d5913014df6ff82baa60fb53d374673de SHA512 128c5649fb194a4fef505f3445de2e4f114a966ddde1af3ac3ca5af23b260e0c038b743a7f95f7cc5e3268aeebbdfa9afeca7d152b5cb7a297d69c1ad4ef4e6a
+EBUILD imageworsener-1.3.3.ebuild 1006 BLAKE2B ca8a3d560d784f7b20c8877d23ff533441742b4660ae7f13f9b4eef6522260d8cda712d16637ea0833d0bb10bd850079f3928867cd924e4d5779be5bb855cca6 SHA512 2eaddfded3b5fc45a456079543840b321ede9513d8513a9282b27cb9547557ace21cca8e05bd68fe57f3791319ac46a3f301f63fb2fed41c441432a33da6f9cb
+MISC metadata.xml 245 BLAKE2B 72d076c6c3242be9c56106016a71f78c926c6c7fe92ae2d22c9cb5084eb1cf3cb4f930e6439c43b57e12c261fe77ef99c469b5629ecafb052dcedef6e346dc86 SHA512 385f7a990e82a7352c25fdf12ac028a67cc41112a9b5cde2e66140d26fdca910e6187d7965b622c3026843f6064d352a1884d5ff7b36aef0d0fab49d364a8a56
diff --git a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
new file mode 100644
index 000000000000..6ca631010a12
--- /dev/null
+++ b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+MY_P=${PN}-src-${PV}
+MY_PN=imagew
+
+DESCRIPTION="Utility for image scaling and processing"
+HOMEPAGE="http://entropymine.com/imageworsener/"
+SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg png static-libs test webp zlib"
+
+DEPEND="png? ( media-libs/libpng:0 )
+	jpeg? ( virtual/jpeg:0 )
+	webp? ( >=media-libs/libwebp-0.1.3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="test? ( jpeg png webp zlib )"
+
+src_configure() {
+	local switch=''
+	use test && switch=test
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ${switch} jpeg) \
+		$(use_with ${switch} png) \
+		$(use_with ${switch} webp) \
+		$(use_with ${switch} zlib)
+}
+
+src_install() {
+	default
+	dodoc {changelog,readme,technical}.txt
+	prune_libtool_files
+}
+
+src_test() {
+	cd "${S}"/tests || die
+	./runtest "${S}"/${MY_PN}
+}
diff --git a/media-gfx/imageworsener/metadata.xml b/media-gfx/imageworsener/metadata.xml
index 41005b6e9c32..ce454a1c5fbd 100644
--- a/media-gfx/imageworsener/metadata.xml
+++ b/media-gfx/imageworsener/metadata.xml
@@ -5,7 +5,4 @@
 	<email>sping@gentoo.org</email>
 	<name>Sebastian Pipping</name>
 </maintainer>
-<use>
-	<flag name="webp">enable webp image format support</flag>
-</use>
 </pkgmetadata>
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 13e68100075e..f76e0da32387 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,4 +1,6 @@
 AUX kphotoalbum-5.3-gcc8.patch 1127 BLAKE2B 6bc06c6b30ef6027199c0ad0dd3bcc539ec191faf71d168afeccf2a019e045508a41190b5b93a735c6cea5a7dcb2052e4b550525707bedbd8973b28e2e090a0f SHA512 1b59fa217efa9f5a784f520d2230785b23825184b89a4e58738c10e41e1a43be2a372fe706ed603e8f42fa15731f4226d4f99cacf460c6d03a1c0437522bdadd
 DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3 SHA512 8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f
+DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba
 EBUILD kphotoalbum-5.3.ebuild 1660 BLAKE2B 099b204d845146d55eb25cc914dc48d49e7bc0143e216a0c7313f7e4b6a5de458cdf3153b8ebb19473e8d5214f1b17805357f3fbb4498190d9154c8b3a87bc12 SHA512 47d0fee77e027563d5cf1d7a4838493ec4c7fc0ee48e2df66b0c7fdbd013df11654d687b71a1a5cb302bf0f04c3483af19728ad27614b09e63fc3c3244fa5737
+EBUILD kphotoalbum-5.4.ebuild 1525 BLAKE2B 572b7ef7477fbafdfc31422453073f83787c86b4bfbbeb304588379dfaf100b36bfdf400b018c5285e46f23a250d6e093750f69b98aadfbed59793a00dbfe5e1 SHA512 451454cd62874e151dcb4b5ecc3eb7bb25f1b4bf4e6397fe884202d5e04deeb48cf7d572cad60f093def2d0acd9f013c834c3ec4b8096b82cefbadb23b889a88
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
new file mode 100644
index 000000000000..ff37b76cc7ca
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+kipi +map +raw"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(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 kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-gfx/exiv2:=
+	media-libs/phonon[qt5(+)]
+	virtual/jpeg:0
+	kipi? ( $(add_kdeapps_dep libkipi) )
+	map? ( $(add_kdeapps_dep libkgeomap) )
+	raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+RDEPEND="${DEPEND}
+	|| ( media-video/ffmpeg media-video/mplayer )
+	kipi? ( media-plugins/kipi-plugins:5 )
+	!media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package map KF5KGeoMap)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index ce572e4b0213..c5fe3b5f877c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,7 +1,8 @@
 AUX krita-4.0.3-libraw-0.19.patch 3124 BLAKE2B c84c94b2e0032b4f1f78f1ca944940688775c91a48a0a6449343af36d03f5a754a48749e67365a028314757c0b822db7bda5e9b4e7c7c58796b032306abcd19b SHA512 90e2d40a6d30990b7de7365c06a769e500d2df75281767f3d724b7e5288e131b4cfcfff989a75e66642e374f624bdb8da2e6afe8c12de0ba3282ebd362189140
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
+AUX krita-4.1.5-desktopfile.patch 1587 BLAKE2B 7155223dfa5a9bace62729f71a298953c9c2b9ec426693b539bcab961287ee172d8c6151f028508efdfc4e0983b3a8903affefc8ee1a30eb48a51f807c3545df SHA512 ad2a265d287a8e5de9752a83f697f49470ec9984b69a24dd351708372f7c3f1b5dabbbd671a53e5e0fdfa4dae2a0ab1b90ebfc19e6e8ba745a673f1cff607707
 DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
-DIST krita-4.1.3.tar.gz 243979838 BLAKE2B 460d7c507b0d86d318b384ad26fd0d2be82d7b60734bd7b1f2016baaf5e0cc3ad91ef7410837aaab207d270745a3a08c1abde11ce3c3543cbf990d922794b606 SHA512 b0d9d8fecdf9f49e6431d0e31fdd6df2f53e654f64e93a05c73afbbdff0625c072a00347e667f1ba87c6d145185fe98d0518df3a4c0c56ccb944216a42d53d5c
+DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
 EBUILD krita-4.0.4.ebuild 3092 BLAKE2B d1fbb96ff445244a35e16411cf49fbcd3e81317a1759965ccde6b492568a7b69d30430582fa74e3239c66238fe80ad070456ae4c7b3fda36d9ddf14c81f90ba3 SHA512 4af6eabe2319395ac019a5679ae4176ae5629722ef57544a12a1c7a6b5c3f7ba108099b13c3e304fc6979a2bf9a7a65748321639cfa49ccc3b212897912dbc7a
-EBUILD krita-4.1.3.ebuild 3131 BLAKE2B f2f64de5571c11861bcff90fe335d47c0ff5caeb3b22554d87a0c636d3b602efd3f3e5d91b0b85d03361162ec0233f68bcc7b4e6f4fdb0671f75a41078553777 SHA512 7ef19e4b4267710942e32e18c333eec5d51d51049ab469af507c2bdcf24278ae2e4d5a8de73b0286cc53e239c8388749987dbae619d5fcedeb6073800888a9d4
+EBUILD krita-4.1.5.ebuild 3170 BLAKE2B 8fc7a641bb7a93f28bc2d2e75c48aae389668591090b47dd12939473011e7c7ed27cae149621408eba4aa2e6ae8cd0889dd17b72444a04a188da693898ef6c87 SHA512 52b3357a184cc2857fc095cde08a8fc7ca52b61de0c13b73d01d8b494720a61ef3973cf2a0d755f406a3446b5043f52532ebcb531ba43e9dee34720ac80c0b0e
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
new file mode 100644
index 000000000000..8721ab8a8a95
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
@@ -0,0 +1,39 @@
+From d267979af9524372f00a0759f02e75c60f604da5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 15 Oct 2018 13:08:09 +0200
+Subject: [PATCH] krita_qimageio.desktop: Fix MimeType separators
+
+Summary:
+desktop file did not pass validation.
+
+/usr/share/applications/krita_qimageio.desktop: error: (will be fatal in the future): value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" for key
+"MimeType" in group "Desktop Entry" contains value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" which is an invalid MIME type:
+"image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" contains an invalid character in the subtype
+
+Reviewers: #krita, rempt
+
+Reviewed By: #krita, rempt
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D16222
+---
+ plugins/impex/qimageio/krita_qimageio.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/impex/qimageio/krita_qimageio.desktop b/plugins/impex/qimageio/krita_qimageio.desktop
+index 4d7dabe235..af366fef07 100644
+--- a/plugins/impex/qimageio/krita_qimageio.desktop
++++ b/plugins/impex/qimageio/krita_qimageio.desktop
+@@ -63,7 +63,7 @@ Name[x-test]=xxKritaxx
+ Name[zh_CN]=Krita
+ Name[zh_TW]=Krita
+ Exec=krita %f
+-MimeType=image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon
++MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon;
+ Type=Application
+ Icon=calligrakrita
+ Categories=Qt;KDE;Office;Graphics;
+-- 
+2.18.0
+
diff --git a/media-gfx/krita/krita-4.1.3.ebuild b/media-gfx/krita/krita-4.1.5.ebuild
index 1e3252cbd580..24e0eeb67a37 100644
--- a/media-gfx/krita/krita-4.1.3.ebuild
+++ b/media-gfx/krita/krita-4.1.5.ebuild
@@ -84,7 +84,10 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+	"${FILESDIR}/${P}-desktopfile.patch"
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 39e229cc75f3..471a6ef6c01a 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,3 +1,3 @@
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
-EBUILD libimagequant-2.11.7.ebuild 1187 BLAKE2B a3ad23ae37dc3b52ba7a2695d4c7d8a86c249e8a0b9ce69fff7d84d88ab921dc12bf65dae2b5362a94865b11e24a3f338d1c1c4e5350d731e7e25273cd986044 SHA512 783c40640f7af16427f6a57f892efa7a816c89d9095a8cf2e443fb834cb722ed46b8d25cf2a64fec089beae798bac6111b50f8474555787a8214cd1fb0eb2284
+EBUILD libimagequant-2.11.7.ebuild 1185 BLAKE2B 89fe4eca4607c132955d18f54a116df6000f3c76a3dfa007ddded42bc36a307a77823ae81d64e43e2c5dbe02785de903e72246ad1943909b3d2a225618b2deac SHA512 6434d31f4ad8d4262adc60a93e8e408207e8696fc303761aa7962b8554dff710c7a5713c333c34fae42059a625ca228a061f025305e7ad92f004432f6bbd90f1
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index e0088b888eaa..092a935042fc 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.7.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="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 58f80f0e6d89..a8815fd5bc6b 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-0.5.0.tar.xz 36068 BLAKE2B 46cf157c1a48cfea8a3149e3177baa79ec493796843e7297371c1d5802df68bee1ac220aeb9d6110a4072ba588585f276be916f886e0d3f6010792a8800e54e1 SHA512 632399781614a9d62429ed1b31515c2a87cdf1c61ab26bfc8d566654a31eccfa66ae069cd18604f380a9fc8d8700aa73a2c71be16bc32775caeef211eb955b21
 DIST lximage-qt-0.7.0.tar.xz 41560 BLAKE2B 32ca95556a696059254a686727f72e1d57d245134b507dc90f83920e9a4a71b9b41aca459db96cd2adceffb6dd6592399c27279d3c3ca9ded6fd61480525dbd1 SHA512 a31185562dec1aa720287ab3f9fb79b9bccfcf0f2069aa404bd469852edbe2507f8c24cf8af0cbe2ef7013e4dab8ca51c00ac7a348254f1bf20458decd3c82b4
-EBUILD lximage-qt-0.5.0.ebuild 917 BLAKE2B 2a5c5950e1f448828f983235e499e39181735a12b62553182d0413df6ce1e1085ed9fde5c603749fcc23b94e50a3141118bb535018341f777ac9a183b7c8a5bd SHA512 f3b23acec23069d152067ca035fce26708db42495f334e886e3bc92885baa512e8d169f1f8c43f587b6eef540fc55c998e7f9b5d26a5c9660d4b512d6c64273a
-EBUILD lximage-qt-0.7.0.ebuild 967 BLAKE2B 2070310901c1bf2f7f4f7ff058f1e52311ec648304ccc8155c5ee537880a6e86d304218cde81407d377297177e435970bec7b09e897e4da5b1fb4c6f1b04d1c1 SHA512 aea35aa3a33a5f5e93d5282cfd03e27219316e1b8329cb14f85dad5e21f26b6b44c814fc12295e9dcbbf1a85eabf7b98050d94a7109c9abc2b00d50a0b728856
+EBUILD lximage-qt-0.7.0.ebuild 962 BLAKE2B ccfd2b0b440910ec1354e14e001823c61ef482d9ce7949cc710a31b0249c34f75678159e566bb6c71695f56af0c37ea638d5597363cb0acb4901670ef2ce9c6c SHA512 6507d2f818a4f6932ef76a380b841e5754137d8e7f65036f9f4ad9742d797276125c8027913ac9a2a41aa5682b9660828dc67e831b221998ff1196d405c6d1c2
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.5.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.5.0.ebuild
deleted file mode 100644
index e2ae8eb30997..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-0.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="LXImage Image Viewer - GPicView replacement"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/libexif
-	>=x11-libs/libfm-1.2:=
-	x11-libs/libfm-qt:=
-	x11-libs/libX11
-	x11-libs/libXfixes"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	lxqt-base/liblxqt
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild
index bbe8f695f42d..5f75efa92135 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 1ac3b220a9f5..654692ef3104 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -2,11 +2,7 @@ AUX mypaint-1.1.0-build-env-vars.patch 1812 BLAKE2B 4af7b90bdcd19dafd712631abe82
 AUX mypaint-1.1.0-desktop.patch 626 BLAKE2B efe635fc8c58d91935be0491c5847a69da1bd78b8a83e9e6ff110d1d69c17dbde91a36f9a2baa5fc97b8a0d81ee47759e040e319a5ca7f43fa6626228a61c425 SHA512 77f267ad6a12b6d18fa955b5b9f8ef3a3eb6fed832745eda4db539d75c49056bb7fd6474ee904e6ac7cab12ae286beb48617e4825b826ca77a439764873e8d75
 AUX mypaint-1.1.0-json-c-0.11.patch 403 BLAKE2B 1608cb7706d85cb84284cc58bb78921c063bf1e1d04d32eb11c7abdc61e3d03eabbe014f66f9c43f13ff8b0a583f900c85fe24fc17bdf4cf3c7ff0ebaccaf37b SHA512 554d0f0cc8c9cb4a48b1f9c57532247461e9705ad819c52f2e264ea238783fe60728af3e51e01667dc0c60883375727624811a48d1603436ad9970282a682605
 DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
-DIST mypaint-1.2.0.tar.xz 37895196 BLAKE2B fa0130a0b8ea6aba14f2994584f990c8c0cb4a784df2cbcec10a2be331c3f831dd0913e5b7d1f343ed90b9976b56fa8d55687c4421e11ea6377d2c87f218d59d SHA512 b4e75393cf6ed9b0c3c5a96979607c848d463987e3ac0f711738940ba97be6922e0cce735c56f91261bfce3e0730d69393dd57a45b3b04824c63c74cf1306790
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
 EBUILD mypaint-1.1.0-r2.ebuild 1927 BLAKE2B e0d4354567a619e5d259fcb50820186fc8b6f4f6f7108c0676059da9a3065830b504b68a2f9e575032fb30e0b5b6e8e71de23d4e4f778cc28bb0d8e3220282ae SHA512 356a6bef73fb283b0e7953be068bdd8feec0d92a3e06a1fdf0fbe1d80fe6225a777cf95c6ae198afa40269bad9d25f8762c9ac318a8b2e4a3763912b40127477
-EBUILD mypaint-1.2.0.ebuild 1738 BLAKE2B e81f01dd6cafee8337c2d6c7d967a02341d9ca4cab1fc8815b2eee71bcf186c32d6ebcc9655038e33f46018342a85be807dd05ba046c26932f67a4f332469ca8 SHA512 d00e0825a85be9e5129fd7895c9b08d91037a1c291d50a8bf2e425eca235d527386013092898061e173855af3c3c2c9c6ab93cef7c5309e028683bb7841217e4
-EBUILD mypaint-1.2.1-r1.ebuild 1742 BLAKE2B cddbca3b26a6f941fe684b05a9633aac0603f36a241701635d3fbb84a219ab357ed6346d047fa661450be64eaf48386e1f2eafe63e879028e63a5c08d8fa98ae SHA512 22c95f69ac1a55f986a969b5153db3d0c1d98479ef026f7ef902eeb6a249089c141674b38525a34b697306158cc4010a5d260e0229bb0ae855c9a8f7224f0d93
-EBUILD mypaint-1.2.1-r2.ebuild 1798 BLAKE2B 3d417928f99d11fbc942c16194faf94769164e0e4f2c99fe9a18aece385ff98fde3e71ecbb4057ad6598fcf4c71fe3fd2336d2c76c9b2ad4a20aa5b5916a3c07 SHA512 bad5e79ddca06cc0d37d161752cca100d903a652e88570363722c603cf927516b2c03af58c7d7d57143186c1e1264d24ab74cd8dd5787bd763111a9e5b46c7b6
-EBUILD mypaint-1.2.1.ebuild 1881 BLAKE2B 62c4152f2763737e6709fe5425aaab71c2bd69a3560c8acfab36997270d2e1690bb113ed15cbdaa464e8fed828249386cdb547621a1de7cc5e0c39318ab4379c SHA512 900af1c50c8d860b9e0551f7c12abe9ee3df5e21b900b78a92c17e7b9abf57968d6c1a895eb56869e9a45e2132bab40b3a9de6f49990f67577786904e8dccffd
+EBUILD mypaint-1.2.1-r3.ebuild 1840 BLAKE2B 2aa89ddd15eaf1c6a54209d696fff4a6c0b3556cfbbc8e344bdf78cbd8e2a75791af43ae21e3b5fee7b7645f3718bb67a9912b3ab991d071a6212dcb1bc4e66f SHA512 ce3fe70a737dccbbc9274124471192b8fc5e4285207c2d6a6226c614b4caebff86b7044d53ae74d1938553ce4f0fdda6e2b803650aec6a5c3b59e8a17deea960
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild b/media-gfx/mypaint/mypaint-1.2.0.ebuild
deleted file mode 100644
index 0e430db29cc8..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs python-single-r1
-
-DESCRIPTION="fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.org/"
-SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-libs/json-c-0.11:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	gnome-base/librsvg
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# multilib support
-	sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
-		SConstruct SConscript || die
-}
-
-src_compile() {
-	#workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	escons
-}
-
-src_install () {
-	escons prefix="${D}/usr" install
-	newicon pixmaps/${PN}_logo.png ${PN}.png
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm -rf "${ED}"/usr/share/locale/${x} || die
-		fi
-	done
-
-	python_optimize "${D}"usr/share/${PN}
-	# not used and broken
-	rm -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
deleted file mode 100644
index 8489c3857e41..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime gnome2-utils scons-utils toolchain-funcs python-single-r1
-
-DESCRIPTION="fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.org/"
-SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-libs/json-c-0.11:=
-	media-libs/lcms:2
-	>=media-libs/libmypaint-1.3.0
-	media-libs/libpng:0=
-	gnome-base/librsvg
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	#workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	escons
-}
-
-src_install () {
-	escons prefix="${D}/usr" install
-	newicon pixmaps/${PN}_logo.png ${PN}.png
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm -rf "${ED}"/usr/share/locale/${x} || die
-		fi
-	done
-
-	python_optimize "${D}"usr/share/${PN}
-	# not used and broken
-	rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
-	# already provided by system-libmypaint
-	rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
index 6dc9afe61a5e..43afe4219d73 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 )
 
-inherit flag-o-matic fdo-mime gnome2-utils scons-utils toolchain-funcs python-single-r1
+inherit flag-o-matic gnome2-utils scons-utils toolchain-funcs python-single-r1 xdg
 
 DESCRIPTION="fast and easy graphics application for digital painters"
 HOMEPAGE="http://mypaint.org/"
@@ -14,11 +13,13 @@ SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
@@ -28,20 +29,20 @@ RDEPEND="
 	>=media-libs/libmypaint-1.3.0
 	media-libs/libpng:0=
 	gnome-base/librsvg
-	${PYTHON_DEPS}
+	sys-libs/libomp
+	x11-libs/gtk+:3
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig
-	virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+	virtual/pkgconfig
+"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
 src_compile() {
-	#workaround scons bug with locales. Bug #352700
+	# Workaround scons bug with locales. Bug #352700
 	export LANG="en_US.UTF-8"
 	tc-export CC CXX
 	strip-flags  # scons upstream issue #3017
@@ -65,14 +66,16 @@ src_install () {
 }
 
 pkg_preinst() {
+	xdg_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_pkg_postinst
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
+	xdg_pkg_postrm
 	fdo-mime_desktop_database_update
 }
diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild b/media-gfx/mypaint/mypaint-1.2.1.ebuild
deleted file mode 100644
index b2c2e285156a..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs python-single-r1
-
-DESCRIPTION="fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.org/"
-SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-libs/json-c-0.11:=
-	media-libs/lcms:2
-	>=media-libs/libmypaint-1.3.0
-	media-libs/libpng:0=
-	gnome-base/librsvg
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# multilib support
-	sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
-		SConstruct SConscript || die
-}
-
-src_compile() {
-	#workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	escons
-}
-
-src_install () {
-	escons prefix="${D}/usr" install
-	newicon pixmaps/${PN}_logo.png ${PN}.png
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm -rf "${ED}"/usr/share/locale/${x} || die
-		fi
-	done
-
-	python_optimize "${D}"usr/share/${PN}
-	# not used and broken
-	rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
-	# already provided by system-libmypaint
-	rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 17fe1a2078e6..9614dfd57ed0 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,7 @@
+AUX nomacs-3.10.2_fix_move_crop_area_tooltip.patch 1254 BLAKE2B 5dec4f07fc0cdcd1316a61c179da94bdeaf01d56bb8c2d5327261280d176a976dc406c851f2f2b84d6ac5c62df5646ac8be64de1561edf8ad3220a353a95b887 SHA512 2866be24f07534bb34f15374145240580552fcfd3c33c0193236f597d9edaa256809b5a0da88cb58230d7d0efc19ae56bbf5247b789d5b82ae3ae89c489828ed
 AUX nomacs-3.8.1-qt-5.11.patch 4507 BLAKE2B 5473253ebd9405ee31dc8fa230dc3548f15f3b01cbeadf388339f836091c4a0880346a1d06344e1935c79fa1f25d30f76e1bba87363b777235a181c28aba713b SHA512 14495e3f1a93c5559fef6bfa3a141ec8b9b84e11cce09d3f362f1a8f9de1ab2b31b6c3f1407fa3f79f828b79d65f940118a311c69ae0aefee9c19cd87880bb3c
+DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af SHA512 977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134
+EBUILD nomacs-3.10.2.ebuild 1753 BLAKE2B 83873ae4347c1241de2fe0ff82a25189422e747379dade0a9133dca36ed669b78da12a3c98a49d40db7450893b31c8134072210afeaca9cd7378ec4a9b48dd6a SHA512 0b21878384690aff25570114cc1b9a32cf2024d8c95ba92aee61da1a5abde45698678e75e8a2fd49c75077cdea853b5343c47696042258cf9c718f6bda20b442
 EBUILD nomacs-3.8.1.ebuild 1733 BLAKE2B 52eaaba8455349581f26a583159df4ad8494e68fca503fa1659455dea921a9829145e2ac4302e36325fc33fc77424b6b263191995f7d8be7ab8a9051f9eb7860 SHA512 894b46f2662f472253b281b007018caace584076517bd010908a506533b7b299325a4fd5c43443096b66bcd9a80a976b43a05c2938caca5748cf684b17986ec4
-MISC metadata.xml 588 BLAKE2B 544009f8f7b184b666e5b7bbb88ce395028032bd060a7abe16f2ed096accb11b0819c19b3898ca1fc96c61aacc9cf0bb5960716f711ba77c5f545f040dd31567 SHA512 f681a8f2f1ec2c2902d34829245790edd014eca1829479f2a47b9179f370d3c3d3c562c32dae1918a7616c8f75c7d94b525beec410ad39704b25fd502cefb5fb
+MISC metadata.xml 531 BLAKE2B fc54042c41205b0a44c1b2dcd266e1311b306ee928149b3806e16260be85a65bf0da0716706653f82ff3dc83351fca6a68ca47930a08f3d170d00416515e2eac SHA512 ac9d022d7b0883217b77513e6d913ed816e414402cd4028428f6b239d97c8f5eaab48d709821675529af8a5a3d945105997235dcb63b826fd669f1b5fb2660a4
diff --git a/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch b/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
new file mode 100644
index 000000000000..ace6f3d51527
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
@@ -0,0 +1,38 @@
+From e963ab5870945b40055b8fc7eb2708ee11f8d4fd Mon Sep 17 00:00:00 2001
+From: Markus Diem <diemmarkus@gmail.com>
+Date: Fri, 7 Sep 2018 15:11:18 +0200
+Subject: [PATCH] show crop info when moving
+
+- fixes #253
+---
+ ImageLounge/src/DkGui/DkWidgets.cpp | 6 +++---
+ ImageLounge/src/nomacs.rc           | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/ImageLounge/src/DkGui/DkWidgets.cpp b/ImageLounge/src/DkGui/DkWidgets.cpp
+index 61c0c05e..b6a5eadb 100644
+--- a/src/DkGui/DkWidgets.cpp
++++ b/src/DkGui/DkWidgets.cpp
+@@ -1820,7 +1820,7 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
+ 		setAngle(angle, false);
+ 	}
+ 
+-	if (event->buttons() == Qt::LeftButton && mState != moving) {
++	if (event->buttons() == Qt::LeftButton) {
+ 
+ 		QPolygonF p = mRect.getPoly();
+ 
+@@ -1833,11 +1833,11 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
+ 		QPoint tl;
+ 
+ 		if (sAngle == 0.0f || fabs(sAngle) == 90.0f) {
+-			tl = mRect.getTopLeft().toPoint();
++			tl = mRtform.map(mRect.getTopLeft()).toPoint();
+ 			info += "x: ";
+ 		}
+ 		else {
+-			tl = mRect.getCenter().toPoint();
++			tl = mRtform.map(mRect.getCenter()).toPoint();
+ 			info += "center x: ";
+ 		}
+ 		info += QString::number(tl.x()) + ", y: ";
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 9f062f24a874..b27b6fcfc0e4 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -12,6 +12,5 @@
 	</upstream>
 	<use>
 		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
-		<flag name="zip">Build support for zip archives</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-3.10.2.ebuild b/media-gfx/nomacs/nomacs-3.10.2.ebuild
new file mode 100644
index 000000000000..bd6b71e7f273
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.10.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="https://nomacs.org/"
+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="+jpeg +opencv raw tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=media-gfx/exiv2-0.25:=
+	opencv? ( media-libs/opencv:=[-qt4(-)] )
+	raw? ( >=media-libs/libraw-0.14:= )
+	tiff? (
+		dev-qt/qtimageformats:5
+		media-libs/tiff:0
+	)
+	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+PATCHES=( "${FILESDIR}/${P}_fix_move_crop_area_tooltip.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# fix build with quazip-0.7.2 - bug 598354
+	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
+	sed -e "s/include <quazip/&5/" \
+		-i src/DkCore/DkImageLoader.cpp \
+		-i src/DkCore/DkImageContainer.cpp \
+		-i src/DkCore/DkBasicLoader.cpp \
+		-i src/DkGui/DkDialog.cpp || die
+
+	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+		-DUSE_SYSTEM_QUAZIP=ON
+		-DENABLE_TRANSLATIONS=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index 9c532977835e..f46cee5c3953 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,10 +1,14 @@
 AUX openexr_viewers-2.0.0-nvidia-automagic.patch 434 BLAKE2B adf9fb0455af68739344527f5119ef31976ce1f078f445900567e9afbb23bf233c3890b669db931d33114bf2e497f4550882747730803147e271441416992e90 SHA512 6c05ec9708822559e8f84f601f8ede89d4e9820cbbe4b49b93ac6d0ba228fa602b699f13540d2169ce16b144ec85db63d06262001bfa391e80f2febfa66ceec7
 AUX openexr_viewers-2.2.0-Remove-nVidia-automagic.patch 869 BLAKE2B 5a3576eaa7c5cc87e885e75fd13e5cf00386be0473fec7655278ddacb8b4084570cbe821097ec32036d9e37f8d8414e391171a8efd511114a6c1c285e236aa93 SHA512 232f990857bfbac7c8417e818e2efe0926a3d5fc20d7392c90a79a4762f26bf3044cc46729feafe407c73c75372ef52af8fa22247d82a4eb982fe538ac71de40
+AUX openexr_viewers-2.3.0-fix-cg-libdir.patch 487 BLAKE2B d9bb262f3e2a3e51cacdcd58acece3da30f797b4f892c9256ea04732092e97b2ea7883d8db17549720e89656bcaf84f99455ddb974d25bb95e790d3424377f40 SHA512 925c7fdd23e6f4855fe8b11ce392f9f616aead6f9f7267b5fe8bfc351c56792bbf68a58799718bfa6f28a4dd44d4d85ea6b8ed93a17dce35167e8cb84f9cbc07
+AUX openexr_viewers-2.3.0-fix-configure.patch 2449 BLAKE2B 226728e4183784337ab684b9245f74110772156fea1b4be8441c7bb14fe2887484691c200e05604f9308204c9221d5b7e7f3c343e5db3cdf0a8896fb13fc5590 SHA512 29a22fee7f88ce1359e74185f8baffa9e734f20555943cced71c198f5c716ab8f8aa5686f11f40e5ebc10911cb82453b784eeac06632f6700d8f4fd3a9ec5e1a
 DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235
 DIST openexr_viewers-2.1.0.tar.gz 497290 BLAKE2B 15d8c23e8a738788f7aeb896b671a42005569a8cf177fbe193d9dbe4df418302be2beabc86344a88137a3a0e6b7b8bbfd66ec213882e52d4df5788157e182163 SHA512 fd3b08ad91b1b2299d01d56c7a17694538fd912302db3472a8d8621b49a699a42604de8d816288399b31207304c7684de198acecd2c8a9825d35b827b8a2ddaf
 DIST openexr_viewers-2.2.0.tar.gz 486235 BLAKE2B db1ebc95dfb7d5b9b1ead3cd3d1eeb4406e4ad5704c90b080d3929c7dea7a2be631e74e2cb597803f55e05783fda43fdb33edc64ba63522d31122f96a4675608 SHA512 ab2f15d0352fa4e9daf76c7317312dad6cfe7b65a86affaf057c8eceb48d2637fc0df58125ea2ec5ad3b7251eed392a8eccff1001cfeced969bbb66fe92284f8
+DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
 EBUILD openexr_viewers-2.0.1.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb9975435a9b5015a2e5596e9d9aee54f45202d90f3970dba6bde7ca88a97b3d5270d67890d317a437ebfb7ee456f16d962 SHA512 cf7faacc6078a1e6d4f75aec1ce45b55b9811e012a71e4f6c5efda9e689fb35be1935adc078bd43b43aa7042103e9ea2de381f9cfe7fdb49d4fe3f16d166a818
 EBUILD openexr_viewers-2.1.0.ebuild 1220 BLAKE2B d3eece43d3c4c80570fe7a385e5f353d91414d5bfb2573a0f155c7d842e7da23c67633f6d967af1a5b2f2b4486ba8d6491f3ce5bc80f27b6a7da87369f67067b SHA512 f2132a37c732990c3043fdbbc2db64ef46e4fc4b87938233c6c96d95224665c28b6e6171a98eff1b80852717850224a0c042600cbb63beb0054c3a0d49287fce
 EBUILD openexr_viewers-2.2.0-r1.ebuild 1228 BLAKE2B 6406bb6f15b05d1ae4b0a4aeba3eeb149a0860fd371673fbb2ddb8a597b071fb93274aaf361e067ce4c037d7c4d017c4dbfc232b6d0791688832596bfc52e6ff SHA512 5a2f7c5b8978e32e766cf5da6f089db8cdedc5522e44a619faca728d73398fefa11924ab34e3dd7a5eb0b4f6d0595b442d6dcca9e3fc66491bf58cce134cd6ce
 EBUILD openexr_viewers-2.2.0.ebuild 1227 BLAKE2B aa225ae704ef4614127f47817b812bb9975435a9b5015a2e5596e9d9aee54f45202d90f3970dba6bde7ca88a97b3d5270d67890d317a437ebfb7ee456f16d962 SHA512 cf7faacc6078a1e6d4f75aec1ce45b55b9811e012a71e4f6c5efda9e689fb35be1935adc078bd43b43aa7042103e9ea2de381f9cfe7fdb49d4fe3f16d166a818
+EBUILD openexr_viewers-2.3.0.ebuild 1249 BLAKE2B c23c3819d053f5c4df61bf39ae604d2f8b24b074ae6bec9b1a697a007f9f3bf4ba57d4a525129396e24a2ecbc9a03e7e590d809c57ce99d61293608648aa41f4 SHA512 c22b09b03b743dc476376d975cae66d2f21c86aceda0ef0dbbe5a541eaa67e32c6633bd56feecae06d0e8c9afa006ad761c0b08fe17896e8640bf553413c1559
 MISC metadata.xml 379 BLAKE2B 3f58950f3fccc797478abbd2b60325904cc3288586e4a180a366e0b99bb7ffa4a08022138c658b3e0db861a720232b44b7bf4bb2b2bdb7f59856272961e1c6c8 SHA512 97d3ed7e0ee8f419d36df6b6ccc3b3e704445935b76fab412b4287ac1b88688591f775927e1cc333a85a64818cbe1c9c3e760d2ab734215c0f558639ca033b6a
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch
new file mode 100644
index 000000000000..1c3ef1a59234
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/m4/path.cb.m4 b/m4/path.cb.m4
+index 7e38708..832b96c 100644
+--- a/m4/path.cb.m4
++++ b/m4/path.cb.m4
+@@ -12,7 +12,7 @@ AC_ARG_WITH(cg-prefix,[  --with-cg-prefix=PFX  Prefix where Cg is installed (opt
+ 
+   if test x$cg_prefix != x ; then
+     CG_CXXFLAGS="-I$cg_prefix/include"
+-    CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
++    CG_LDFLAGS="-L$cg_prefix/lib64 -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
+   else
+     case $host_os in
+       darwin*)
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
new file mode 100644
index 000000000000..f9d51d5045b6
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
@@ -0,0 +1,83 @@
+diff --git a/configure.ac b/configure.ac
+index 0ae7531..f2cdfee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0)
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(playexr/main.cpp)
+ AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
+-AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+ 
+ 
+ LIBTOOL_CURRENT=24
+@@ -19,7 +18,7 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ 
+ dnl
+@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading,
+               [multithread="${enableval}"], [multithread=yes])
+ 
+ if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
+-    ACX_PTHREAD(
+-    [
+-	AC_DEFINE(HAVE_PTHREAD)
+-	OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS"
+-	OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS"
+-	OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS"
+-	OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS"
+-	CC="$PTHREAD_CC"
+-	
+-	AM_POSIX_SEM()
+-    ],
+-    [AC_MSG_ERROR([POSIX thread support required])])
+-    AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
++    AX_PTHREAD
++	AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available])
+ fi
+ 
+ 
+@@ -233,10 +155,13 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no)
+ dnl
+ dnl check for Cg
+ dnl
+-if test "${have_fltk}" = yes; then
++AC_ARG_ENABLE(cg, AS_HELP_STRING([--enable-cg],
++	[enable nvidia cg support [[default: test]]]), [want_cg="${enableval}"], [want_cg=yes])
++
++if test "${have_fltk}" = yes -a "${want_cg}" != no; then
+   AM_PATH_CG(have_cg=yes, have_cg=no)
+   if test "${have_cg}" = yes; then
+-    AC_DEFINE(HAVE_FRAGMENT_SHADERS)
++    AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available])
+   fi
+ else have_cg=no
+ fi
+@@ -251,20 +176,10 @@ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+ 
+-dnl gcc optimization
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ dnl Platform-specific stuff
+ case "$host" in
+ *darwin*) 
+-  AC_DEFINE(HAVE_DARWIN) 
++  AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)]) 
+ 
+   dnl OS X universal binary support, requires --disable-dependency-tracking
+   AC_ARG_ENABLE(osx-universal-binaries,
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
new file mode 100644
index 000000000000..e7eaf9ca0778
--- /dev/null
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="OpenEXR Viewers"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cg"
+
+RDEPEND="
+	~media-libs/ilmbase-${PV}:=
+	~media-libs/openexr-${PV}:=
+	virtual/opengl
+	x11-libs/fltk:1[opengl]
+	cg? ( media-gfx/nvidia-cg-toolkit )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-configure.patch"
+	"${FILESDIR}/${P}-fix-cg-libdir.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-openexrctltest
+		--with-fltk-config="/usr/bin/fltk-config"
+	)
+
+	if use cg; then
+		myeconfargs+=(
+			--enable-cg
+			--with-cg-prefix="/opt/nvidia-cg-toolkit"
+		)
+		append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/pdf \
+		install
+
+	einstalldocs
+}
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index ab77a2471b93..c7cf16e75aeb 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,6 +1,4 @@
-DIST qimgv-0.6.3.tar.gz 238521 BLAKE2B 55da7c0e7b18547e7c2e2ab76f0a535c655c898707641c896469a07040e8f7f1a6e80580143016e24cdc0a7d9e2287c0d081ca8d262337faeea5d02168796a8e SHA512 c18ed0678bc094fedb339cfa227a5ddace6728b724f7640e4b018e52aa49dfb80d18879b372ab25bbf9e8c38497999471ba35a9bea5cd6b18d5ccbf1e55f3301
-DIST qimgv-0.7.tar.gz 273405 BLAKE2B c4f497eb132eeefa161e328f1ce246ff0a369e21b895cf85b68a69aaf446289ae0fc1170be9c424c32fc8659c196d1c7542938813edef30ea30f4e8509f22cfe SHA512 35fb8fbba75e08dad945fcbc679f449894c6eafc01ab0166b1929956dca636ccd25ba261c22c58a4d283aafa0690ca2c1f672092fc40c5b532f41944e4b0a9e3
-EBUILD qimgv-0.6.3.ebuild 725 BLAKE2B a8e13551c1f0105a584ca932c720b22ec84d8877b36af8a3bafb33ebf85f713760ab9461a26f5be0684d1b6f3d2a171d406853d5502b7261739d368aa98a9c10 SHA512 026c66f462c52b63af2273e8b09711d8a27827fc3ef74192ec5d8816798b45e3abaf10304b65816c31103f181914e32aeeb85b675598a4780778871d335dacb0
-EBUILD qimgv-0.7.ebuild 943 BLAKE2B 7d57f7a600040c8924f549eacd6aee23c2709034322a4c108dda1e757d511573f729f7adb101eab31bed570158b69bc555b0fc1c8b5b0725c06d97e5c91b2d37 SHA512 846fc84fb4a00dd929763c33579575b1b3fe55aaa5b9d5c6112ed02a0291f53d1a9fe057bfc5e8748f2bb5d585f916b6153279d6e8551ae099a5aa6d57a1b982
+DIST qimgv-0.7.1.tar.gz 273529 BLAKE2B 60f1f87c3347333f76224046776ca4303a03286593191feb18791dd7065ba714db387a1f8cbf6f16f04cab7190645edee4aba11f13d1ce6c0cb52d9b79042f18 SHA512 dd142377aca7248d00ac51d0732de94106e7471973de45d66e8905c476e5eb5f3543e98b1322390dc54946e7c518c1a8711bcde46fb67c376808e4049b22a630
+EBUILD qimgv-0.7.1.ebuild 1097 BLAKE2B 81a8236b34f9eb6c8d310a198f702f499b7749638797ddba906b114f49785bd19c141a7e4f4bf1e2e1f0485e2231f2e0b90ef4e55b441dbaa82c11198a2ed70c SHA512 d2305d48f4f8985ef5a35c34e3847b24aa82d6b8b3eb85fc7df431cef2216551d5c55b7e06065b2a2ba2578c383670186b9350df0d77d0d63ff963b7093295bf
 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
 MISC metadata.xml 454 BLAKE2B bb9012bfbeff8b79f1f3a4de8b7e24bbb664d0137a92c8bde3189612e99ce7f94f4d135b5fcda3a935b8d3b8181e9ca882b073cbe26a6f7ace7d52ac0a57804f SHA512 3f2ec50c29ac720c91d61a5ede051eb62a58771974e8c9591ee9b3a98a8a8d0af2071b29c8e7abb842999559ab330f63b39d7de87c8a1d6fd560002e9bf7d107
diff --git a/media-gfx/qimgv/qimgv-0.6.3.ebuild b/media-gfx/qimgv/qimgv-0.6.3.ebuild
deleted file mode 100644
index 9226ed2e10a9..000000000000
--- a/media-gfx/qimgv/qimgv-0.6.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5"
-HOMEPAGE="https://github.com/easymodo/qimgv"
-SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-video/mpv[libmpv]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/qimgv/qimgv-0.7.ebuild b/media-gfx/qimgv/qimgv-0.7.1.ebuild
index 7af9daad7bfc..dc7afe79d53d 100644
--- a/media-gfx/qimgv/qimgv-0.7.ebuild
+++ b/media-gfx/qimgv/qimgv-0.7.1.ebuild
@@ -15,10 +15,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="kde video"
 
 RDEPEND="
-	>=dev-qt/qtconcurrent-5.10.0
-	>=dev-qt/qtcore-5.10.0
-	>=dev-qt/qtgui-5.10.0
-	>=dev-qt/qtwidgets-5.10.0
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	kde? ( kde-frameworks/kwindowsystem:5 )
 	video? ( media-video/mpv[libmpv] )
 "
@@ -27,6 +27,13 @@ DEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	eapply_user
+	# respect make.conf CXXFLAGS
+	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3")/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DKDE_BLUR=$(usex kde)
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 60022ec46f3d..87d46af656a0 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,5 +1,3 @@
-DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-EBUILD qrencode-4.0.0.ebuild 875 BLAKE2B deccce06b32c442852c73cba09f97d3c59518d49ae63008d1ac46ebc0940da20cbb42ceb502f30942af6392d47796bd91d413fdd68bf634d262ca8411af23f33 SHA512 b59b6c37c8fd489e98a8fc1e14989418a8292a739a74e0422b18ed64e48611c1846d2f6bee15e85d27a1142da2901b668973437955722c19425ee4939eb5a16d
-EBUILD qrencode-4.0.2.ebuild 777 BLAKE2B b75707486a92e5c08a93f0d0dcc1d05a6116243394ed051ee265977a1cb0ec166d1319cff293b03d3f7768900b55e94484a7b484918664335885d30b928baed4 SHA512 cef00008591be4590ab26842079cb771be8f686ac485f3dc6c4eefa58af954e47f2cad1e79da1a0974bd0f0319ac5cd61fb4d571b7a11ef3ed2fb34d873aeaca
+EBUILD qrencode-4.0.2.ebuild 773 BLAKE2B 42d81d58e0ae8d0936f30ebda36ac3870e40c56704d2ea47a7c50c187d6b072f65de012e1e2dc2b64161649785eb71f2c72d311880eba33149e478ab03251ba1 SHA512 37117710fb76538a379f7731bcae7013f63d6066702308d383228a56eeeffb4855d189d0689fd0c4813263b77e93a4bef4f7809f36b22d87f28d4697ecda93c1
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.0.ebuild b/media-gfx/qrencode/qrencode-4.0.0.ebuild
deleted file mode 100644
index d7cd09ed89ae..000000000000
--- a/media-gfx/qrencode/qrencode-4.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="https://fukuchi.org/works/qrencode/"
-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"
-IUSE="test"
-
-RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_with test tests)
-		# TODO: figure out how to make SDL check fail as the SDL test
-		# program is not useful
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	cd tests || die
-	# the configure test checks if reconfiguring works...
-	sed -i -e '/configure/d' test_all.sh || die
-	sh test_all.sh || die
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index 7209fbbdad1c..14b1fb90df63 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 Foundation
+# Copyright 1999-2018 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/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index f05e02fe9715..ce26a44de0d9 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -2,6 +2,8 @@ AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a
 AUX sane-backends-1.0.27-canon-lide-100.patch 907 BLAKE2B 3e625443b48e2f03d1d095c1d3d2651abf1ea073ca7bbd439ef389906ed683d7f8b43123e7a9cc6360703f1b66886ff2cb6a7428984e4073496b890ed240e9bb SHA512 870dc11926df5ef0c38588336c8d69cfa11ebf9d3355f26eec4e5178fe2dac6e8ffc576980a4b5789cdb7155fbcc97a35300c63ba4e9e1ebbdd0702c563d09f3
 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
 AUX sane-backends-1.0.27-network.patch 1022 BLAKE2B bcc929635fe62af4201f474cddd141b95bf1b7520f7279b713771ed9614990b3331ec1b42f309d88e375d6c9cffacb7195e7e3f063e491bb9cd6e4ae39f79eea SHA512 04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d
+AUX sane-backends-1.0.27-revert-samsung.patch 14137 BLAKE2B ec41dcc9862a50f09518207b0db83f37d14f7e3ba6b101800144a8bc7059eb9c0fb5fcbab42dc8ec68001f61b304baa628c3f2ac73be9031b946fe8088e5cf37 SHA512 70e8d86291fbb21c7c9c5fa9ba5df54c808e5e75e3155af33ab9c18c768bc1eaa05890802c52daa3e60619fa8961b7162cac4c51e2dd2dd6c7114986d3a6136f
+AUX sane-backends-1.0.27-uninitialized-variable.patch 902 BLAKE2B 6f2e86d6d79f85f73d564bc1877667c1278108d876f61551cc89abb159dee68e6b454bec190cb44eee61255fa648010293382f5575d208dd7c1e33c1492be3e9 SHA512 b3c5675e5ec3a92345832d081025dae72bcfda9854f79565fc2801e6ea710a83e953a9f075ef9754c6d893fb099544989b4aaabf8a177d5c52b8a4b9c6eac052
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
@@ -9,4 +11,5 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
 EBUILD sane-backends-1.0.27-r1.ebuild 7729 BLAKE2B 99a75ac0aae614e4168b1216ed22c071acc4d1a448eeeee1a6c36991df23bf8e68dfb558d3047e144f8fd32cd4ad766a41238be5a991b4039172872011eed501 SHA512 42689dd5189e9bfba21f016dc63897b0fec6adb18fda2485c64c35764caceff307b18759aa359d7b56fb69aee86ceb769d1c5f5162d30cc9e8576dc3140f70aa
+EBUILD sane-backends-1.0.27-r2.ebuild 8140 BLAKE2B 8637061b459d53e5ea2c46815ffa2ded960825a2b134e52da6063eb8869a577c9fd4b5dfd6d9e000d4a9978ed2d148dfe755355f1eb10d247ce21d54d1ad50cf SHA512 507035bcab7598e62fba58c2323c9ed61c773a3af4b080fe2a9f65db5a89711027ce9881b0f38c8e903e1d577af57b4d9759f9e6007b6f7687e94cb06dcdb5de
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch
new file mode 100644
index 000000000000..af3e141a010c
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-revert-samsung.patch
@@ -0,0 +1,406 @@
+From 9b13d4c18b2424eaed02b72a928e9607921ec265 Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
+Date: Tue, 17 Apr 2018 22:43:15 +0200
+Subject: [PATCH] Revert "Color scanning for Samsung models, which support JPEG
+ Lossy compression."
+
+This reverts commit 926bfade544de4a4fd5f1a8082b85a97e2443770, leaving
+the new IDs in.
+As tracked in #315876, this breaks scanning with multiple Samsung scanners
+
+Conflicts:
+	backend/xerox_mfp.c
+	backend/xerox_mfp.h
+	doc/descriptions/xerox_mfp.desc
+---
+ backend/Makefile.am             |   2 +-
+ backend/Makefile.in             |   7 +-
+ backend/xerox_mfp.c             | 193 +-------------------------------
+ backend/xerox_mfp.h             |   5 -
+ doc/descriptions/xerox_mfp.desc |  10 +-
+ 5 files changed, 14 insertions(+), 203 deletions(-)
+
+diff --git a/backend/Makefile.am b/backend/Makefile.am
+index 18695a4a..3225b133 100644
+--- a/backend/Makefile.am
++++ b/backend/Makefile.am
+@@ -1086,7 +1086,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
+ libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+-libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
++libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+ EXTRA_DIST += xerox_mfp.conf.in
+ 
+ libdll_preload_la_SOURCES =  dll.c
+diff --git a/backend/Makefile.in b/backend/Makefile.in
+index d1dca4a2..2643bb77 100644
+--- a/backend/Makefile.in
++++ b/backend/Makefile.in
+@@ -1430,10 +1430,9 @@ libsane_v4l_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ libsane_xerox_mfp_la_DEPENDENCIES = $(COMMON_LIBS) libxerox_mfp.la \
+ 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
+ 	../sanei/sanei_config.lo sane_strstatus.lo \
+-	$(am__DEPENDENCIES_1) ../sanei/sanei_usb.lo \
+-	../sanei/sanei_tcp.lo $(am__DEPENDENCIES_1) \
++	../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ nodist_libsane_xerox_mfp_la_OBJECTS =  \
+ 	libsane_xerox_mfp_la-xerox_mfp-s.lo
+ libsane_xerox_mfp_la_OBJECTS = $(nodist_libsane_xerox_mfp_la_OBJECTS)
+@@ -2754,7 +2753,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
+ libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+-libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
++libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+ libdll_preload_la_SOURCES = dll.c
+ libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD
+ libdll_la_SOURCES = dll.c
+diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
+index 8b8c8956..d37a6237 100644
+--- a/backend/xerox_mfp.c
++++ b/backend/xerox_mfp.c
+@@ -33,9 +33,6 @@
+ #include "../include/sane/sanei_usb.h"
+ #include "../include/sane/sanei_config.h"
+ #include "../include/sane/sanei_backend.h"
+-#ifdef HAVE_LIBJPEG
+-#include <jpeglib.h>
+-#endif
+ #include "xerox_mfp.h"
+ 
+ #define BACKEND_BUILD 13
+@@ -93,128 +90,6 @@ static char *str_cmd(int cmd)
+ }
+ 
+ #define MAX_DUMP 70
+-const char *encTmpFileName = "/tmp/stmp_enc.tmp";
+-
+-static int decompress(struct device __sane_unused__ *dev,
+-                      const char __sane_unused__ *infilename)
+-{
+-#ifdef HAVE_LIBJPEG
+-    int rc;
+-    int row_stride, width, height, pixel_size;
+-    struct jpeg_decompress_struct cinfo;
+-    struct jpeg_error_mgr jerr;
+-    unsigned long bmp_size = 0;
+-    FILE *pInfile = NULL;
+-    JSAMPARRAY buffer;
+-
+-    if ((pInfile = fopen(infilename, "rb")) == NULL) {
+-        fprintf(stderr, "can't open %s\n", infilename);
+-        return -1;
+-    }
+-
+-    cinfo.err = jpeg_std_error(&jerr);
+-
+-    jpeg_create_decompress(&cinfo);
+-
+-    jpeg_stdio_src(&cinfo, pInfile);
+-
+-    rc = jpeg_read_header(&cinfo, TRUE);
+-    if (rc != 1) {
+-        jpeg_destroy_decompress(&cinfo);
+-        fclose(pInfile);
+-        return -1;
+-    }
+-
+-    jpeg_start_decompress(&cinfo);
+-
+-    width = cinfo.output_width;
+-    height = cinfo.output_height;
+-    pixel_size = cinfo.output_components;
+-    bmp_size = width * height * pixel_size;
+-    dev->decDataSize = bmp_size;
+-
+-    row_stride = width * pixel_size;
+-
+-    buffer = (*cinfo.mem->alloc_sarray)
+-             ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+-
+-    while (cinfo.output_scanline < cinfo.output_height) {
+-        buffer[0] = dev->decData + \
+-                    (cinfo.output_scanline) * row_stride;
+-        jpeg_read_scanlines(&cinfo, buffer, 1);
+-    }
+-    jpeg_finish_decompress(&cinfo);
+-    jpeg_destroy_decompress(&cinfo);
+-    fclose(pInfile);
+-    return 0;
+-#else
+-    return -1;
+-#endif
+-}
+-
+-static int copy_decompress_data(struct device *dev, unsigned char *pDest, int maxlen, int *destLen)
+-{
+-    int data_size = 0;
+-    size_t result = 0, retVal = 0;
+-
+-
+-    if (0 == dev->decDataSize) {
+-        *destLen = 0;
+-        return retVal;
+-    }
+-    data_size = dev->decDataSize - dev->currentDecDataIndex;
+-    if (data_size > maxlen) {
+-        data_size = maxlen;
+-    }
+-    memcpy(pDest, dev->decData+dev->currentDecDataIndex, data_size);
+-    result = data_size;
+-    *destLen = result;
+-    dev->currentDecDataIndex += result;
+-    retVal = result;
+-
+-    if (dev->decDataSize == dev->currentDecDataIndex) {
+-        dev->currentDecDataIndex = 0;
+-        dev->decDataSize = 0;
+-    }
+-
+-    return retVal;
+-}
+-
+-static int decompress_tempfile(struct device *dev)
+-{
+-    decompress(dev, encTmpFileName);
+-    remove(encTmpFileName);
+-    return 0;
+-}
+-
+-static int dump_to_tmp_file(struct device *dev)
+-{
+-    unsigned char *pSrc = dev->data;
+-    int srcLen = dev->datalen;
+-    FILE *pInfile;
+-    if ((pInfile = fopen(encTmpFileName, "a")) == NULL) {
+-        fprintf(stderr, "can't open %s\n", encTmpFileName);
+-        return 0;
+-    }
+-
+-    fwrite(pSrc, 1, srcLen, pInfile);
+-    fclose(pInfile);
+-    return srcLen;
+-}
+-
+-static int isSupportedDevice(struct device __sane_unused__ *dev)
+-{
+-#ifdef HAVE_LIBJPEG
+-    /* Checking device which supports JPEG Lossy compression for color scanning*/
+-    if (dev->compressionTypes & (1 << 6))
+-        return 1;
+-    else
+-        return 0;
+-#else
+-    return 0;
+-#endif
+-}
+-
+ static void dbg_dump(struct device *dev)
+ {
+     int i;
+@@ -639,11 +514,9 @@ static void set_parameters(struct device *dev)
+     dev->para.pixels_per_line = dev->win_width / px_to_len;
+     dev->para.bytes_per_line = dev->para.pixels_per_line;
+ 
+-    if (!isSupportedDevice(dev)) {
+ #if BETTER_BASEDPI
+-        px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
++	px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
+ #endif
+-    }
+     dev->para.lines = dev->win_len / px_to_len;
+     if (dev->composition == MODE_LINEART ||
+         dev->composition == MODE_HALFTONE) {
+@@ -765,13 +638,6 @@ static int dev_set_window(struct device *dev)
+     cmd[0x11] = (SANE_Byte)floor(dev->win_off_y);
+     cmd[0x12] = (SANE_Byte)((dev->win_off_y - floor(dev->win_off_y)) * 100);
+     cmd[0x13] = dev->composition;
+-    /* Set to JPEG Lossy Compression, if mode is color (only for supported model)...
+-     * else go with Uncompressed (For backard compatibility with old models )*/
+-    if (dev->composition == MODE_RGB24) {
+-        if (isSupportedDevice(dev)) {
+-            cmd[0x14] = 0x6;
+-        }
+-    }
+     cmd[0x16] = dev->threshold;
+     cmd[0x17] = dev->doc_source;
+ 
+@@ -843,7 +709,6 @@ dev_inquiry(struct device *dev)
+                       dev->res[0x3e] << 8 |
+                       dev->res[0x3f];
+     dev->line_order = dev->res[0x31];
+-    dev->compressionTypes = dev->res[0x32];
+     dev->doc_loaded = (dev->res[0x35] == 0x02) &&
+                       (dev->res[0x26] & 0x03);
+ 
+@@ -942,10 +807,6 @@ dev_free(struct device *dev)
+         free(UNCONST(dev->sane.type));
+     if (dev->data)
+         free(dev->data);
+-    if (dev->decData) {
+-        free(dev->decData);
+-        dev->decData = NULL;
+-    }
+     memset(dev, 0, sizeof(*dev));
+     free(dev);
+ }
+@@ -1283,19 +1144,6 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+     /* if there is no data to read or output from buffer */
+     if (!dev->blocklen && dev->datalen <= PADDING_SIZE) {
+ 
+-        /* copying uncompressed data */
+-        if (dev->composition == MODE_RGB24 &&
+-            isSupportedDevice(dev) &&
+-            dev->decDataSize > 0) {
+-            int diff = dev->total_img_size - dev->total_out_size;
+-            int bufLen = (diff < maxlen) ? diff : maxlen;
+-            if (0 < diff &&
+-                0 < copy_decompress_data(dev, buf, bufLen, lenp)) {
+-                dev->total_out_size += *lenp;
+-                return SANE_STATUS_GOOD;
+-            }
+-        }
+-
+         /* and we don't need to acquire next block */
+         if (dev->final_block) {
+             int slack = dev->total_img_size - dev->total_out_size;
+@@ -1311,10 +1159,7 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+                 /* this will never happen */
+                 DBG(1, "image overflow %d bytes\n", dev->total_img_size - dev->total_out_size);
+             }
+-            if (isSupportedDevice(dev) &&
+-                dev->composition == MODE_RGB24) {
+-                remove(encTmpFileName);
+-            }
++
+             /* that's all */
+             dev_stop(dev);
+             return SANE_STATUS_EOF;
+@@ -1365,18 +1210,9 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+ 
+         if (buf && lenp) { /* read mode */
+             /* copy will do minimal of valid data */
+-            if (dev->para.format == SANE_FRAME_RGB && dev->line_order) {
+-                if (isSupportedDevice(dev)) {
+-                    clrlen = dump_to_tmp_file(dev);
+-                    /* decompress after reading entire block data*/
+-                    if (0 == dev->blocklen) {
+-                        decompress_tempfile(dev);
+-                    }
+-                    copy_decompress_data(dev, buf, maxlen, &olen);
+-                } else {
+-                    clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
+-                }
+-            } else
++            if (dev->para.format == SANE_FRAME_RGB && dev->line_order)
++				clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
++            else
+                 clrlen = copy_plain_trim(dev, buf, maxlen, &olen);
+ 
+             dev->datalen -= clrlen;
+@@ -1455,9 +1291,6 @@ sane_start(SANE_Handle h)
+     if (!dev->data && !(dev->data = malloc(DATASIZE)))
+         return ret_cancel(dev, SANE_STATUS_NO_MEM);
+ 
+-    if (!dev->decData && !(dev->decData = malloc(POST_DATASIZE)))
+-        return ret_cancel(dev, SANE_STATUS_NO_MEM);
+-
+     if (!dev_acquire(dev))
+         return dev->state;
+ 
+@@ -1479,22 +1312,6 @@ sane_start(SANE_Handle h)
+ 
+     dev->total_img_size = dev->para.bytes_per_line * dev->para.lines;
+ 
+-    if (isSupportedDevice(dev) &&
+-        dev->composition == MODE_RGB24) {
+-	int fd;
+-        remove(encTmpFileName);
+-
+-	/* Precreate temporary file in exclusive mode. */
+-	fd = open(encTmpFileName, O_CREAT|O_EXCL, 0600);
+-	if (fd == -1) {
+-	    DBG(3, "%s: %p, can't create temporary file %s: %s\n", __func__,
+-		(void *)dev, encTmpFileName, strerror(errno));
+-	    return ret_cancel(dev, SANE_STATUS_ACCESS_DENIED);
+-	}
+-	close(fd);
+-    }
+-    dev->currentDecDataIndex = 0;
+-
+     return SANE_STATUS_GOOD;
+ }
+ 
+diff --git a/backend/xerox_mfp.h b/backend/xerox_mfp.h
+index 3d93f06d..ea89dda2 100644
+--- a/backend/xerox_mfp.h
++++ b/backend/xerox_mfp.h
+@@ -74,10 +74,6 @@ struct device {
+ #define DATATAIL(dev) ((dev->dataoff + dev->datalen) & DATAMASK)
+ #define DATAROOM(dev) dataroom(dev)
+ 
+-#define POST_DATASIZE 0xFFFFFF
+-    SANE_Byte *decData;
+-    int decDataSize;
+-    int currentDecDataIndex;
+     /* data from CMD_INQUIRY: */
+     int resolutions;		/* supported resolution bitmask */
+     int compositions;		/* supported image compositions bitmask */
+@@ -102,7 +98,6 @@ struct device {
+     int composition;		/* MODE_ */
+     int doc_source;		/* document source */
+     int threshold;		/* brightness */
+-    int compressionTypes;
+ 
+     /* CMD_READ data. It is per block only, image could be in many blocks */
+     int blocklen;			/* image data block len (padding incl.) */
+diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
+index d21a6be6..67253b38 100644
+--- a/doc/descriptions/xerox_mfp.desc
++++ b/doc/descriptions/xerox_mfp.desc
+@@ -320,7 +320,7 @@
+ 
+ :model "SCX-3405W"
+ :interface "Ethernet"
+-:status :good
++:status :basic
+ 
+ :model "SCX-3400"
+ :interface "USB"
+@@ -335,17 +335,17 @@
+ :model "SCX-4729FD"
+ :interface "USB"
+ :usbid "0x04e8" "0x3453"
+-:status :good
++:status :basic
+ 
+ :model "CLX-6260"
+ :interface "USB"
+ :usbid "0x04e8" "0x3455"
+-:status :good
++:status :minimal
+ 
+ :model "CLX-3300 Series"
+ :interface "USB"
+ :usbid "0x04e8" "0x3456"
+-:status :good
++:status :basic
+ 
+ :model "SCX-470x"
+ :interface "USB"
+@@ -355,7 +355,7 @@
+ :model "CLX-4190"
+ :interface "USB"
+ :usbid "0x04e8" "0x345a"
+-:status :good
++:status :minimal
+ 
+ :model "SCX-4650 4x21S Series"
+ :interface "USB"
+-- 
+2.17.0
+
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch
new file mode 100644
index 000000000000..0311975c0ce8
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-uninitialized-variable.patch
@@ -0,0 +1,25 @@
+From dd61ef1cc84299781e382b9258d97102cee192b4 Mon Sep 17 00:00:00 2001
+From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date: Thu, 3 Aug 2017 18:50:05 +0900
+Subject: [PATCH] genesys: Fix use of uninitialized variable
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869673
+---
+ backend/genesys.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/backend/genesys.c b/backend/genesys.c
+index 1c1bbf4..0b644c4 100644
+--- a/backend/genesys.c
++++ b/backend/genesys.c
+@@ -6237,6 +6237,7 @@ attach (SANE_String_Const devname, Genesys_Device ** devp, SANE_Bool may_wait)
+   dev->model = genesys_usb_device_list[i].model;
+   dev->vendorId = genesys_usb_device_list[i].vendor;
+   dev->productId = genesys_usb_device_list[i].product;
++  dev->usb_mode = 0;            /* i.e. unset */
+   dev->already_initialized = SANE_FALSE;
+ 
+   DBG (DBG_info, "attach: found %s flatbed scanner %s at %s\n",
+-- 
+2.1.4
+
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
new file mode 100644
index 000000000000..4ce3733007d1
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp"
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
+
+for backend in ${IUSE_SANE_BACKENDS}; do
+	case ${backend} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm)
+		IUSE+=" -sane_backends_${backend}"
+		;;
+	mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${backend}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${backend}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_mustek_usb2? ( threads )
+	sane_backends_kvs40xx? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+MY_P="${P}"
+FRS_ID="4224"
+SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	snmp? ( net-analyzer/net-snmp )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	>=sys-devel/gettext-0.18.1
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+pkg_setup() {
+	enewgroup scanner
+	enewuser saned -1 -1 -1 scanner
+}
+
+src_prepare() {
+	default
+
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	hpaio
+	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
+	epkowa
+	EOF
+
+	eapply "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	eapply "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+
+	# From Arch
+	eapply "${FILESDIR}"/${PN}-1.0.27-network.patch
+
+	# From Fedora
+	# Fix https://bugs.gentoo.org/635348
+	eapply "${FILESDIR}"/${PN}-1.0.27-canon-lide-100.patch
+	# Fix https://bugs.gentoo.org/653300
+	eapply "${FILESDIR}"/${PN}-1.0.27-revert-samsung.patch
+
+	# From Debian
+	eapply "${FILESDIR}"/${PN}-1.0.27-uninitialized-variable.patch
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing # From Fedora
+
+	# if LINGUAS is set, just use the listed and supported localizations.
+	if [[ ${LINGUAS+set} == "set" ]]; then
+		mkdir -p po || die
+		strip-linguas -u po
+		printf '%s\n' ${LINGUAS} > po/LINGUAS
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local BACKENDS=" "
+
+	use gphoto2 && BACKENDS="gphoto2"
+	use v4l && BACKENDS="${BACKENDS} v4l"
+	for backend in ${IUSE_SANE_BACKENDS}; do
+		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
+			BACKENDS="${BACKENDS} ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+	)
+
+	# you can only enable this backend, not disable it...
+	if use sane_backends_pnm; then
+		myconf+=( --enable-pnm-backend )
+	fi
+	if use sane_backends_mustek_pp; then
+		myconf+=( --enable-parport-directio )
+	fi
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	ECONF_SOURCE=${S} \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${BACKENDS}" \
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# --without-api-spec to not automagically depend on tons of stuff
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	econf \
+		--disable-locking \
+		--without-api-spec \
+		$(use_with gphoto2) \
+		$(multilib_native_use_with systemd) \
+		$(use_with v4l) \
+		$(use_enable ipv6) \
+		$(use_enable threads pthread) \
+		$(use_enable zeroconf avahi) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null
+	fi
+
+	if use usb; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi; then
+		if use usb; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		udev_newrules tools/udev/libsane.rules 41-libsane.rules
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use systemd; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
+	find "${D}" -name '*.la' -delete || die
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	if use xinetd; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	if ! use systemd; then
+		elog "If you are using a USB scanner, add all users who want"
+		elog "to access your scanner to the \"scanner\" group."
+	fi
+}
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index ba7159fdd53b..a3092ddd5b78 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,4 +1,4 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
 EBUILD sane-frontends-1.0.14-r3.ebuild 1327 BLAKE2B 15e8425ed7db7301ded095f2652f8214a40f8381f67f90077835dcb9d03c6e024be07de4eb85279a6b8d728865d989c66d238a17d00d685546f05775ef1af251 SHA512 0e7c3cfcd8df0bba6fec4ece1188b3907d33fa57878a0d38265dda4d29c3b295c7128ce84507b55ca21a373926d15bf66d82f91a49a4fea0009c4c9e4d1305ca
-MISC metadata.xml 377 BLAKE2B 83b01e823ed6ad91413a2e23899b9fa78b3b3c6d84d52b0ee122976d1a2de2a21c5089ca0460aceb7a9d28f0cc854d3fc358e97c6f02f4116cc5b75a3ca802fd SHA512 57b14e3a91c20de45448332c24a3e681a48498a27244ac1a05e313a87081cb116f12f3fab170a18dca2b3fc55aca7785fc0713bccdad192ba7683982d83fda22
+MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/media-gfx/sane-frontends/metadata.xml b/media-gfx/sane-frontends/metadata.xml
index 8b40ef0464f3..58f638b2ac3e 100644
--- a/media-gfx/sane-frontends/metadata.xml
+++ b/media-gfx/sane-frontends/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 </pkgmetadata>
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index bdeef3280660..851f43c63324 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -1,3 +1,3 @@
 DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b4299c105eb6de7ec3fe74b350b49605dbe5246a5acd93562fd904923053ab99a5741b929abd99ace8b2ad148cc SHA512 4b150078573bfd3b8c5863d73087a51cd3b7ed5781e26c842fab44eec3e67ea9aea3feba064538578878df1ccb386525a6a84362dae7f92315fb7de735ace617
-EBUILD viewnior-1.6.ebuild 910 BLAKE2B 1b1fec4b088a7708c8d9193806406c24572104ed82a5ca7e4fc8e3eed1aeefe9df508d9f9090a7fe9b6bdc52a1ca0267169312c786a29d89edbb498625930690 SHA512 7a258895436c2345bf779e7ec159e18bca3304ca0b02691b579774e5901dda76bd68220d2ece1a9cee0ded34531148fbc4f409728df5920ac5acda6c092f15f3
+EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
 MISC metadata.xml 223 BLAKE2B db9722a650a3dd6a2457e8cfb4e45c95e4d435077a01d701d9ee8d1bd9f6c162060281a70762e72b57812f6a868eb172ab60b49f21319f1d143bb00ecf59e4f6 SHA512 1cdd15a0170f1ef8245c80abb67291759667b5ff4631b7a172b4797169198cec8fbd10e7226313e99f86ceb01f87d3a5faf010471aadf6c4d1559c63676c84a9
diff --git a/media-gfx/viewnior/viewnior-1.6.ebuild b/media-gfx/viewnior/viewnior-1.6.ebuild
index 1efc547aee7e..501a6fa864c3 100644
--- a/media-gfx/viewnior/viewnior-1.6.ebuild
+++ b/media-gfx/viewnior/viewnior-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,10 +17,13 @@ IUSE=""
 DEPEND="dev-libs/glib:2
 	media-gfx/exiv2
 	>=x11-libs/gtk+-2.20:2
-	x11-misc/shared-mime-info"
-RDEPEND="${DEPEND}"
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	dev-util/glib-utils
+"
 
-S=${WORKDIR}/${MY_PN}-${P}
+S="${WORKDIR}/${MY_PN}-${P}"
 
 src_prepare() {
 	default
diff --git a/media-gfx/w3mimgfb/Manifest b/media-gfx/w3mimgfb/Manifest
index 80a1656df38a..ae736a03713d 100644
--- a/media-gfx/w3mimgfb/Manifest
+++ b/media-gfx/w3mimgfb/Manifest
@@ -1,3 +1,3 @@
 DIST w3mimgfb-0.9.1.tar.gz 10070 BLAKE2B f64ebad5580647f7e686e654b910f2168419c086d26863f6d34eb58db1cd3f2092ce2c92135391781e4327ba49dadcff11017722e6ff0982e41976b037d1f094 SHA512 6717f922c37b9bbdf539efa95e9fefdd3a14aa0651fea613d6f24a5588537b300c1106ae1fc0435a0b08214682697e1fad59c491908775e08920469439dee628
-EBUILD w3mimgfb-0.9.1.ebuild 653 BLAKE2B 473eeb5f329a18a0ea4ff0210cc16604d1322de54166abab825d23a6f248b7a3632f492de7dce3572e1a8ced96ed8e03ba0d436d1afde593bebe5ab741a4c97d SHA512 e07f65b4b7b94611df4b694e8370c284670b84d14049199528b1d3c50d8e8c8f659b036aaafdc629fa87221cb5dbd1a542df3bf2eaac81bad486e220278e4c73
+EBUILD w3mimgfb-0.9.1.ebuild 720 BLAKE2B bdef846a0596b86df129122b7c07a06f8d3be2a53baf9c5f93c8743ece6f01ca11ac7f5e51d088f819c7932ed17eaebf5cb633816ff5404408c3c8490bcc61f6 SHA512 12e9fc8ae93146ae174c20e02cdfc00be671862ca822b47ce55903165cd00c4574238e7fe12aad2e1fc75f058103946a97767a920aa143e7ecdfeac203f21aca
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
index aa180059c55b..2aebe771a58b 100644
--- a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
+++ b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Image viewer for w3m under frame buffer environment"
@@ -11,18 +10,21 @@ SRC_URI="http://homepage3.nifty.com/slokar/fb/${P}.tar.gz"
 
 LICENSE="w3m BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86 ppc"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="media-libs/stimg"
 RDEPEND="${DEPEND}
-	virtual/w3m"
+	virtual/w3m
+"
 
 src_prepare() {
+	default
 	sed \
 		-e '/^CC/d' \
 		-e '/^CFLAGS/d' \
 		-e '/^LDFLAGS/d' \
+		-e 's/LIBS= -lstimg/LIBS= -lstimg -lpng -ljpeg -ltiff/g' \
 		-i Makefile || die
 	tc-export CC
 }
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index c3bd529a7936..5a548849e25f 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -3,5 +3,5 @@ AUX yafaray-3.3.0-respect-cflags.patch 502 BLAKE2B 1df4f8667e8c2577812c690baf17c
 AUX yafaray-3.3.0-strip-debug-mode.patch 767 BLAKE2B 42351950158441bd328e3fd3265e8e9e0f96ee51cf9aadf427c3dda7b57b77716e022801183271dd7206d9ec58b1e239159736894423ca53885c033a2b7e8e0f SHA512 f139d622162d02bfd1d95d38ffa2fcb29fd32cdd51cc14aec986dc481c00aa3c982e537ead2ae8d1972401312aaf9ef8cd92b81fc1fd3ee819f350eadac5d2d2
 DIST yafaray-blender-exporter-3.3.0.tar.gz 377928 BLAKE2B 7876c78ca6228282648909e566803b33304be0082fab48819340845e3927877b9734f7bc7e09702bf7cbf6477c68932637eb766dc98b9e8e4ab42ca99d2a3595 SHA512 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0
 DIST yafaray-core-3.3.0.tar.gz 1135360 BLAKE2B 67f6956a3866bfe0b4167f30a7c2c7f05ee23556e9fff7041ff3937e90011e4c2538b706ae27e02351ae555d0d05531f3eb711257591d85f779683c9c42ac6f7 SHA512 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90
-EBUILD yafaray-3.3.0.ebuild 3372 BLAKE2B 29ec1802d482a60e654fafdf990209fb4faad705c0ef9747f05cbbf744d164c57e70fd527ef37cf64d8130c0ae169aefc7e5dde224f903021cc3d2ac7009e5ed SHA512 928e5a003e822d9e2a282245efebf5cb007852a9101283a3a3178240d04a28378e5e9e99d631ac29084da036f0e5ccdc02fd5435e637abf6fe3d4a976b2793f8
-MISC metadata.xml 1133 BLAKE2B 17e445d385b5d94bcb6eafa02e211423d6a515c8fd6b756a856e312817117e958652a11a223e08ea062aef9fe0df1e23b623b0025f34b6b3b1a53a32cb1cabf6 SHA512 d1d8237a273d994de3f77328ab97bb6c4008ce94c0598d3fa345ecef047bbcaaa6f75b3fe3b05d80f65adbca05be7a30d7759e7ae37034a8e42e52d7483cc981
+EBUILD yafaray-3.3.0-r1.ebuild 3530 BLAKE2B ac21d61171d7f001baa05b1202b93a266eb7df11ec111755392f245e6928b414685189450cce24a5ecac62da035ec085e3f6341e20e3d1e7f9575ce7fb7a0445 SHA512 66a5c653af8ae1dc782d0c7a8595fcf6369372fe1f0ac751729292e5a6f64ea1ac0af25b6c60b08deafb76d0549d6cedb236c57389e18e35ef5542e4557a2fe2
+MISC metadata.xml 921 BLAKE2B 5a08a3398eed624e00d87f11460f0fba597b764c63506cca9c574be77225905bffc47b8d102acba71c40f38c0adc4f269c8af8fe2e74e730c36abff43d8ed7a2 SHA512 da6a25457068362228db88f4285a64472938a0f7fb5d9de0d29ec56afb2825566c105ff73193360caa9b91bea2f339403e503bd5b3745157b9e3e4fc8585a98c
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index cee5f0b787f1..f6cffe698244 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
 		An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
diff --git a/media-gfx/yafaray/yafaray-3.3.0.ebuild b/media-gfx/yafaray/yafaray-3.3.0-r1.ebuild
index 3b077ecb4aa8..01987b313724 100644
--- a/media-gfx/yafaray/yafaray-3.3.0.ebuild
+++ b/media-gfx/yafaray/yafaray-3.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-PYTHON_COMPAT=( python3_{5,6} )
 inherit cmake-utils python-single-r1
 
 DESCRIPTION="A free open-source montecarlo raytracing engine"
@@ -15,23 +15,31 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/boost:=
-	dev-libs/libxml2
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2:2
 	sys-libs/zlib
 	blender? ( media-gfx/blender )
 	jpeg? ( virtual/jpeg:0 )
 	opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
-	png? ( media-libs/libpng:= )
+	png? ( media-libs/libpng:0= )
 	python? ( ${PYTHON_DEPS} )
 	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype )"
+	truetype? ( media-libs/freetype:2 )
+"
 DEPEND="${RDEPEND}
-	dev-lang/swig"
+	dev-lang/swig
+"
 
 S="${WORKDIR}/Core-${PV}"
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -49,6 +57,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DYAF_LIB_DIR=$(get_libdir)
 		-DWITH_YAF_PY_BINDINGS=$(usex python)
+		-DYAF_PY_VERSION=${EPYTHON#python}
 		-DWITH_YAF_RUBY_BINDINGS=OFF
 		-DBLENDER_ADDON=OFF # addon is a separate package called blender-exporter
 		-DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem
@@ -88,10 +97,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "To confirm your installation is working as expected, run"
-	elog "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
-	elog "as an input file, then compare the result to"
-	elog "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
+	einfo "To confirm your installation is working as expected, run"
+	einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
+	einfo "as an input file, then compare the result to"
+	einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
 	if use blender; then
 		elog
 		elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)"
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /media-gfx
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)