gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /media-gfx
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
86 files changed, 1451 insertions, 1181 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 78c71ee6eecc..aba448976deb 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index c965315c07c5..77ec2c08c730 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -1,4 +1,3 @@
-AUX cropgui-0.1.1-PIL.patch 994 BLAKE2B 36d75764382c598c0bb58668d8c5e3882f58e8999c694d9466f2d48f86fe2da44e7ed075f50fef3988e719203b757bf13c08c5952050fdb7561f6c9128414315 SHA512 5bbe9ff690f055c9257096ea457874f3f3b4838eb0bfa3134ce1ee468922ef15f6f8ac00344aba2f229e0ce81d3d55e9d22db97d06dfd15151ea491a19ff5414
 AUX cropgui-0.2-PIL.patch 831 BLAKE2B 936d4de690a45d9213f7337c1f2adc72dc39b370a9327bcb23f8d527c02397bb01e8ffe581eed734e4b99e2827c713e97e11bd6449623dade81ead6f4a3ce028 SHA512 b2b4be9f04c26906f998d5c693722d58e2d40270dcf41cb6027206adbbfeed0133858be7fbd44f846a83b23cd4da3f286fbb188b2547103a7320bcee0b35fa15
 AUX cropgui-0.2-tobytes.patch 1590 BLAKE2B e83066d2c80d4351d557d91e4d662515419b68579e07834d95da66a12b20bb891b913224c54bb6d4befba4a5a1c86989fbb0392d0e5e53fffaae1ada82ae3947 SHA512 2824a75de26eb200f991c759235a9da9ba5a61bc5f315e679920f1481b6826230432d91f2b710882463c8d8fb5856d001aa9d209de2a6d31fa027683cd57cd75
 DIST cropgui-0.2.tar.gz 842734 BLAKE2B 4a09fef84634cc07d81580f9652826dd4e388c27d9db33fb63e8f7c9ac2341cb532b81894fcab624df2495865af6f6580b03c871ed7d138bf5c7d2fc02386a7b SHA512 d6a9feea8c5de57455d0f7247465108d5a931f773f4df0c91629400bcc2c958c76559a84b6cde45709bcc8936ff7f5e2b3553897a14fbec14a9f032065ce83ba
diff --git a/media-gfx/cropgui/files/cropgui-0.1.1-PIL.patch b/media-gfx/cropgui/files/cropgui-0.1.1-PIL.patch
deleted file mode 100644
index 88f7ffbfed81..000000000000
--- a/media-gfx/cropgui/files/cropgui-0.1.1-PIL.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Только в cropgui: cropgui-0.1.1-PIL.patch
-diff -ru cropgui.orig/cropgui_common.py cropgui/cropgui_common.py
---- cropgui.orig/cropgui_common.py	2009-07-24 06:15:12.000000000 +0400
-+++ cropgui/cropgui_common.py	2013-05-28 21:48:24.000000000 +0400
-@@ -13,9 +13,9 @@
- #    You should have received a copy of the GNU General Public License
- #    along with this program; if not, write to the Free Software
- #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--import Image
--import ImageFilter
--import ImageDraw
-+from PIL import Image
-+from PIL import ImageFilter
-+from PIL import ImageDraw
- import subprocess
- import threading
- import Queue
-diff -ru cropgui.orig/filechooser.py cropgui/filechooser.py
---- cropgui.orig/filechooser.py	2009-07-24 06:15:12.000000000 +0400
-+++ cropgui/filechooser.py	2013-05-28 21:50:16.000000000 +0400
-@@ -8,7 +8,7 @@
- import gobject
- 
- import os
--import Image
-+from PIL import Image
- 
- HIGH_WATER, LOW_WATER = 25, 5
- image_cache = {}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 0e86c39fba6e..3d93295d5dfa 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -3,6 +3,7 @@ DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b91
 DIST darktable-2.4.3.tar.xz 3422460 BLAKE2B 2fa1d7787301b6bc83b09e8d93bda251d2f9b7cf7d47979087b6da5126272d17c15f925be26652580aad6601f8613eac593c08e91638f2d445de1981f8694798 SHA512 adc0740f866890c53a1389b43042d76a4c668dd22654d91fd5a7eb728aa6979cb7dd3703d6e7d3689b6d3840e892432b3c3ce6953a76d4355dfc1f90a8f29506
 DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4dfeaab3eb0061dd817e65c7118a5fe3f1832ce2d7b5adf1d8501c17adff7f1e87545774ca17bd2e33b749e993886 SHA512 143739b18217cb2b47f7c5cb29bbb17e0d78b380ccd9358e96e179639d8e3526c76f3822edace605856ec3272b099a09f052867479d20879bf36ef45dafe5df6
 DIST darktable-2.6.0.tar.xz 3358508 BLAKE2B 1d6dc414d0f5c7dc1340ce1db229e5f4629534e6ccc3d4f017dea87a1e33d897ee8d73affece22311bbb27338075e48384b86b9aece83cbd6c582f761226a863 SHA512 066a8766edf3d961b2995bd681c9be65ae118f650a34da3c87c9096b76586c4a949b4c620993bcba3e7cd29f255c19dad9c2e205ed413c309398b4bc606eb73b
+DIST darktable-2.6.1.tar.xz 3473300 BLAKE2B e2194d9d967872b3dbc5dd608b3aa946424ff8a20a00b8cd8e1e9dd7ad3146acd791d2a7f20652d4673fdaac7bec86e405e055bab664c41b601b5788f0f15e72 SHA512 0d92fa35629ca02ca7cbb2910966b3fad57e536c967fd05381ad02dc9645106e6baaf1a93c1c186618624850c876f23305704e41d7151150e3367e21c415a967
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
@@ -10,5 +11,6 @@ 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-2.6.0.ebuild 3731 BLAKE2B 6afcf3c29ad6876d7d9c20ae7f124d789e51f3325f14d6d1084e141b98b7bb6e259c38c066236255ef1ec10257ea12379bc91d9c6b80c43d0049c1b8c33e3387 SHA512 0e06808fd7d8689d12ac3f91d7cbbcb411d5015cbfa70ce98458332a747bfda199ec662dd0ff3074a9fa889a4a124ae4e3f13f1563a8e82b2cc3faa78683c843
+EBUILD darktable-2.6.1.ebuild 3735 BLAKE2B 12db2af18017c4770acf9553035542292f501149583e4037961f3f0ffa4bd70fd123e97f0d7771c95224482da615d72ab6458ea0f2fb43076d6de6924a32e010 SHA512 7d762bad746d01c80bd85c33233ef1dbf8ab7e4b5992c4dbeda79bb5579bbfece81903d3ad8532d0ab36bd0a1d76a3a22eb2c1285ef761cfa36de9542eac506d
 EBUILD darktable-9999.ebuild 3131 BLAKE2B 09a86d4cebb9c362edbd7c208ee1b3cb84743d25357ec7d9bc1141161587e8b7efaf4ab5261802207cf5b075cce222d67cb304351e476d5300c896620330adb2 SHA512 86db075f0f28a1cea81f3f1edd45b2adad7888f2637af58e6babd5d45ce13f015e3c598c7cfdc4ba3edc979cef3002a9606297ccce5670d19df061e5c7ae4dbd
 MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a
diff --git a/media-gfx/darktable/darktable-2.6.1.ebuild b/media-gfx/darktable/darktable-2.6.1.ebuild
new file mode 100644
index 000000000000..9aad79d520ff
--- /dev/null
+++ b/media-gfx/darktable/darktable-2.6.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
+
+DOC_PV="2.6.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+LANGS=" ca de es fi fr hu ja nb nl pl pt-BR ru sl"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+nls opencl openmp openexr pax_kernel webp
+${LANGS// / l10n_}"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	dev-libs/pugixml:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
+
+PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LUA=OFF
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	for lang in ${LANGS} ; do
+		if ! use l10n_${lang}; then
+			rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+		fi
+	done
+
+	if use pax_kernel && use opencl ; then
+		pax-mark Cm "${ED}"/usr/bin/${PN} || die
+		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
+		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
+		eqawarn "must be modified and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "when updating from the currently stable 1.6 series,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
+	echo
+	ewarn "It will not be possible to downgrade!"
+}
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index ed172c4d3d7a..442d155e6d46 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,9 +1,7 @@
 AUX conversion-examples.txt 545 BLAKE2B 4bda8339c0ae2f427ae0432b09da54aa5c194318b5cc0d3131c2e96f2b26ed0f91f6f419f0830fc773ab9be543019143755e039866146c6ce0eb361f9172ae4c SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9
 AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7b7767d45b88d7c139bb038816448c50a682c6645095f79be9d2836c6f896e27a8ffc20c SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e
-DIST dcraw-9.27.0.tar.gz 191803 BLAKE2B 85f2954ebe7d9ba5c30f1ad971c53f87b4b10094084837a361f1975bb78ca07edb8a535ef524374b8644434d43fc515523c08c2336dd460d543756a1819caf5f SHA512 2b2faed3f1889ef82a50721f7d3f22b081104b586d644d369fa849ad08604c10898e9dfccf8935828cf432db74352161fe6d1f9bde5fbfa4dd8435188767a17a
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.27.0.ebuild 2961 BLAKE2B 7b8e95853e118b6262bb7996745c6ce375c6e7f56b6d5b957073966c3558b85a2ccf276dcff83b45df8232791b95ba41a2e3b946d25e0931215cf89d97532ace SHA512 30abf4256100ead2e7ca525cf365fb18e5d46afa6fe3bc0012f272ed3bc715349602d05a8b26d44c401138517848fa2a1796094efaff9df8244fd715d9a5f5c2
 EBUILD dcraw-9.28.0.ebuild 2963 BLAKE2B 7ba95ebd63edcf718d263183ec26860ee7e7a2d9a835a01028a5b7cc29ee6ca8a9af3f2c0f411eebcf88c168a2891b87cedcbd7517ff415cb674f1121f2c7194 SHA512 f2082082748c6006cf81fd7888d9ed0a9b9373aaf1855ae8f699d7c51eb79cde748b3a702792f0bcd0a40b6c8eb4e8c0e8e838847c70a6841997b01d40a844e4
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.27.0.ebuild b/media-gfx/dcraw/dcraw-9.27.0.ebuild
deleted file mode 100644
index 7ff23c20d06b..000000000000
--- a/media-gfx/dcraw/dcraw-9.27.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils readme.gentoo toolchain-funcs
-
-DESCRIPTION="Command-line decoder for raw digital photos"
-HOMEPAGE="https://www.cybercom.net/~dcoffin/dcraw/"
-SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
-	mirror://gentoo/parse-1.73.tar.bz2
-	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
-IUSE="nls gimp jpeg jpeg2k lcms"
-
-COMMON_DEPEND="
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	jpeg2k? ( media-libs/jasper:= )
-	gimp? ( media-gfx/gimp )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	gimp? ( virtual/pkgconfig )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/netpbm
-"
-
-S=${WORKDIR}/dcraw
-
-DOC_CONTENTS="
-	See conversion-examples.txt.gz on how to convert
-	the PPM files produced by dcraw to other image formats.\n
-
-	\nThe functionality of the external program 'fujiturn' was
-	incorporated into dcraw and is automatically used now.\n
-
-	\nThere's an example wrapper script included called 'dcwrap'.
-	This package also includes 'dcparse', which extracts
-	thumbnail images (preferably JPEGs) from any raw digital
-	camera formats that have them, and shows table contents.
-"
-
-run_build() {
-	einfo "${@}"
-	${@} || die
-}
-
-src_prepare() {
-	rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename"
-}
-
-src_compile() {
-	local ECFLAGS="-O2" # Without optimisation build fails
-	local ELIBS="-lm"
-
-	use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
-	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
-	use jpeg2k && ELIBS="-ljasper ${ELIBS}" || ECFLAGS+=" -DNO_JASPER=yes"
-	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
-
-	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS}
-
-	run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c
-
-	# rawphoto gimp plugin
-	if use gimp; then
-		run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \
-			$(pkg-config --cflags gimpui-2.0) rawphoto.c -o rawphoto \
-			$(pkg-config --libs gimpui-2.0)
-	fi
-
-	if use nls; then
-		for lang in ${LANGS}; do
-			has ${lang} ${LINGUAS-${lang}} \
-				&& run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
-		done
-	fi
-}
-
-src_install() {
-	dobin dcraw dcparse
-	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap}
-
-	# rawphoto gimp plugin
-	if use gimp; then
-		insinto "$(pkg-config --variable=gimplibdir gimp-2.0)/plug-ins"
-		insopts -m0755
-		doins rawphoto
-	fi
-
-	doman dcraw.1
-
-	if use nls; then
-		for lang in ${LANGS}; do
-			if has ${lang} ${LINGUAS-${lang}}; then
-				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
-				insinto /usr/share/locale/${lang}/LC_MESSAGES
-				newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo"
-			fi
-		done
-	fi
-
-	readme.gentoo_create_doc
-}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 1f060a64de72..852acb292558 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,3 +1,5 @@
 DIST eom-1.18.3.tar.xz 2198324 BLAKE2B efdee3c56fec54342184ae75f7ecb3ebda0227ab0586b2cfcd8c1b793e1b9ae2fdea79202c8b3e0bcb45d9cd5c0eaf6ad51d59b5508126d9160806bf4b7c8239 SHA512 64244d5f8c354c53e479027f38c359e38c1dba3cc937440e1af6e4a05f54fc4a65327311998575b90055b5e65bd0dc24dae81e40e0f82b99b3e41c44685d5188
+DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0
 EBUILD eom-1.18.3.ebuild 1478 BLAKE2B 648972bae8be6e4e4b564569d2abd953f8bfd5fdf82e1509f89787a7234afb3815067796d9f6fd1a310a5b2b6dd127708476625c01a59748261890b6a9c5648d SHA512 0f9daa87cd84f89ddb0175de079f29acc000161abb2eec166f68a004e1083240e6a791df58099f29532ef1bfd72eed5013190e58402b4a6fefdf6c0e9f5f81ce
+EBUILD eom-1.22.0.ebuild 1456 BLAKE2B 4bb777d8bf23c1c894acda59e6063d682b79d2b18bfbd7ac3d070f8c177ff881c9375c669e53fb10c01cb4f839c69acbe31066783c7ae3d36a92b0ef9e1141ae SHA512 e7744c76d2555db058b56e1773d47d3b86291395fe83036af263a12a54099990ba2cf463c89a61e6dfacdadc5a73b6ef0e265dd5e2a51a4f3dbeacd0c97a3eeb
 MISC metadata.xml 332 BLAKE2B f99f5d545ed10be2869ef90b4b80eeb7a8ffbdc291f5808a121842d7f6faa1de8ebd0b2cbe13db7ae04b6073387a29dcf78fa90dc6ef3b31cab07551f7c02f5d SHA512 e915e0cb254f2e1a431eccd93b45be28d85b33f0d988508031dea48a87be182a54cea01fcffecc202c029b0b6156860471841ed871e00c929fde1fb0dceb4317
diff --git a/media-gfx/eom/eom-1.22.0.ebuild b/media-gfx/eom/eom-1.22.0.ebuild
new file mode 100644
index 000000000000..b0edd30076c5
--- /dev/null
+++ b/media-gfx/eom/eom-1.22.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libpeas-1.8.0[gtk]
+	>=dev-libs/libxml2-2:2
+	gnome-base/dconf
+	>=mate-base/mate-desktop-1.17.0
+	sys-libs/zlib
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	>=x11-misc/shared-mime-info-0.20
+	virtual/libintl
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	exif? (
+		>=media-libs/libexif-0.6.14
+		virtual/jpeg:0
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+	!!media-gfx/mate-image-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_with X x) \
+		$(use_with dbus) \
+		$(use_with exif libexif) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms cms) \
+		$(use_with svg librsvg) \
+		$(use_with xmp)
+}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index c185c138ee94..80c5d27498a6 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,10 +1,6 @@
-AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3d0d687928d86487380e0b12b3b7f6458b827285806afa73034497265cae169998ab281f4687d736cc5e3e6df1b5 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4
-AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483
 AUX exiv2-0.27.0-doc.patch 1024 BLAKE2B 102557142367e36a3632c8c742e35aa820bed92b2688e7b2fc575e6bc2cc18f79c23f5492f3486146cab639c90afd0ebedd53f9807d6db0ebfc77330df28425b SHA512 4e0ad52ecfc7c23ff59b97f165ec35d721a4395357983eaa7e7913387594cf6bae354e48e9b95652fb192b2d6044ecc931228cb2e6d225605adce5165fd81687
 AUX exiv2-0.27.0-fix-pkgconfig.patch 710 BLAKE2B eb4952dc49f3a464ee2041c19de9dee404197814086bef869d99d30acb3a0eb13faa716472926c69dc0b44bdcd8d60494aa06855d9eec183fe4920e728f33cfe SHA512 2eb56a1641efbdb5abb6ed62259850f4cc9630d60c213782fc1cf44a705ca9d0fbde22eb6503c9a06dafcaf4eced4d21704442626b6e8b082457de31ae49fcf8
 AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
-DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
 DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
-EBUILD exiv2-0.26_p20180811-r3.ebuild 2954 BLAKE2B 06ad8b544150e1f5d4f1a305d78ab3ff7772b7c797e67e47ce01a233d0afee514d7660921c33b43634da60883b2adba119a80830c2493ad01800bd9b05b34072 SHA512 172e65b6210cb383afee4f344d585fae40dc7af1b7bb5d8dd2e5acbd7fcb4086b4caca998ce3627aefb4be3f8e4cebcaef24ccfb67d61d580b674fee50b24627
 EBUILD exiv2-0.27.0-r2.ebuild 2540 BLAKE2B b3b82cfe192f0b612770c0efd244272589f0f41c485a7b8183e9a79f179aeea5787ca78a09172d58f42cccb3ae0aa0350ebaeba844436bd035570c188be89209 SHA512 0ab5c3a135f61c847ae66f44b8266d56fd9ea830b6cf90626f9de3c104654ef923b51ef15b99d417a8f23ec315096debcc6565826f00ac6a4e43dc3df3bee877
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild
deleted file mode 100644
index bce9baadb497..000000000000
--- a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}d.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/26"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="doc examples nls png webready xmp"
-
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README doc/ChangeLog doc/cmd.txt )
-
-PATCHES=(
-	# TODO: Take to upstream
-	"${FILESDIR}"/${PN}-0.26-fix-docs.patch
-	"${FILESDIR}"/${PN}-0.26-tools-optional.patch
-)
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != *9999 ]] ; then
-		if [[ -d po ]] ; then
-			pushd po > /dev/null || die
-			local lang
-			for lang in *.po; do
-				if [[ -e ${lang} ]] \
-						&& ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then
-					case ${lang} in
-						CMakeLists.txt | \
-						${PN}.pot)      ;;
-						*) rm -r ${lang} || die ;;
-					esac
-				fi
-			done
-			popd > /dev/null || die
-		else
-			die "Failed to prepare LINGUAS - po directory moved?"
-		fi
-	fi
-
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen &>/dev/null -u config/Doxyfile || die
-	fi
-
-	edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DEXIV2_ENABLE_BUILD_SAMPLES=NO
-		-DEXIV2_ENABLE_BUILD_PO=$(usex nls)
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		-DEXIV2_ENABLE_LIBXMP=NO
-		$(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && emake -j1 doc
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch
deleted file mode 100644
index 05ea18d6eb0c..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/CMakeLists.txt	2015-07-19 16:04:35.363628707 +0200
-+++ b/CMakeLists.txt	2015-07-19 16:28:31.051680136 +0200
-@@ -216,9 +216,7 @@
- ADD_SUBDIRECTORY( xmpsdk )
- ADD_SUBDIRECTORY( src )
- 
--IF( EXIV2_ENABLE_BUILD_SAMPLES )
--    ADD_SUBDIRECTORY( samples )
--ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
-+ADD_SUBDIRECTORY( samples )
- 
- IF( EXIV2_ENABLE_BUILD_PO )
-     ADD_SUBDIRECTORY( po )
---- a/samples/CMakeLists.txt	2015-07-19 16:04:35.360628744 +0200
-+++ b/samples/CMakeLists.txt	2015-07-19 16:30:46.415987850 +0200
-@@ -21,6 +21,10 @@
- include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src")
- 
--SET( SAMPLES addmoddel.cpp
-+SET( SAMPLES taglist.cpp )
-+
-+IF( EXIV2_ENABLE_BUILD_SAMPLES )
-+    SET( SAMPLES ${SAMPLES}
-+             addmoddel.cpp
-              convert-test.cpp
-              easyaccess-test.cpp
-              exifcomment.cpp
-@@ -38,7 +42,6 @@
-              mmap-test.cpp
-              prevtest.cpp
-              stringto-test.cpp
--             taglist.cpp
-              tiff-test.cpp
-              werror-test.cpp
-              write-test.cpp
-@@ -47,6 +50,7 @@
-              xmpparser-test.cpp
-              xmpsample.cpp
-    )
-+ENDIF()
- 
- FOREACH(entry ${SAMPLES})
-     STRING( REPLACE ".cpp" "" target ${entry})
-@@ -63,6 +67,7 @@
-     SET( MC_SRC            ${MC_SRC}       ../src/getopt_win32.c )
- ENDIF( MSVC )
- 
-+IF( EXIV2_ENABLE_BUILD_SAMPLES )
- SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp )
- ADD_EXECUTABLE( metacopy ${MC_SRC} )
- TARGET_LINK_LIBRARIES( metacopy exiv2lib )
-@@ -79,6 +84,7 @@
- # ******************************************************************************
- # Man page
- INSTALL( FILES exiv2samples.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
-+ENDIF()
- 
- # That's all Folks!
- ##
---- a/doc/templates/Makefile	2015-07-19 16:50:50.589933604 +0200
-+++ b/doc/templates/Makefile	2015-07-19 16:51:07.686719864 +0200
-@@ -143,7 +143,7 @@
-          xmp_mwg-rs \
-          xmp_mwg-kw
- 
--TAGLIST = ../../bin/taglist
-+TAGLIST = ../../src/bin/taglist
- 
- # **********************************************************************
- # ======================================================================
-diff --git a/doc/cmake_doc.sh b/doc/cmake_doc.sh
-index 44dd6760..5910a86d 100755
---- a/doc/cmake_doc.sh
-+++ b/doc/cmake_doc.sh
-@@ -16,7 +16,7 @@ if [ $# == 1 ]; then
-         mv src/exv_conf.h.keep src/exv_conf.h
-     fi
-     mkdir -p  src/bin/
--    cp    -f  "${CMAKE_BINARY_DIR}/bin/taglist" src/bin/
-+    cp    -f  "${CMAKE_BINARY_DIR}/samples/taglist" src/bin/
-     make doc
- fi
- 
diff --git a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch
deleted file mode 100644
index 686b37ff8b60..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/CMakeLists.txt	2017-06-07 00:14:25.374608170 +0200
-+++ b/CMakeLists.txt	2017-06-07 00:17:00.680483299 +0200
-@@ -60,6 +60,7 @@
-     OPTION( EXIV2_ENABLE_SSH           "USE Libssh for SshIo"                              ON  )
-     SET ( EXIV2_ENABLE_DYNAMIC_RUNTIME OFF )
- ENDIF()
-+OPTION( EXIV2_ENABLE_TOOLS         "Build exiv2 executable"                                ON  )
- 
- # set include path for FindXXX.cmake files
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/")
---- a/src/CMakeLists.txt	2017-06-07 00:14:25.368608098 +0200
-+++ b/src/CMakeLists.txt	2017-06-07 00:16:06.710831682 +0200
-@@ -317,10 +317,12 @@
- 
- # ******************************************************************************
- # exiv2 application
--ADD_EXECUTABLE( exiv2 ${EXIV2_SRC}  ${EXIV2_HDR} )
-+IF(EXIV2_ENABLE_TOOLS)
-+    ADD_EXECUTABLE( exiv2 ${EXIV2_SRC}  ${EXIV2_HDR} )
- target_compile_definitions(exiv2 PRIVATE EXV_LOCALEDIR="${CMAKE_INSTALL_LOCALEDIR}" )
--TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} )
--INSTALL( TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+    TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} )
-+    INSTALL( TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ENDIF( EXIV2_ENABLE_TOOLS )
- 
- # ******************************************************************************
- # connection test application
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index d0551297da11..c23a1594d6c6 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -5,10 +5,12 @@ DIST feh-2.27.tar.bz2 2131975 BLAKE2B 84100beaff26454c8d33a479171b1b59402b74d048
 DIST feh-2.28.tar.bz2 2132687 BLAKE2B 92e428250a7fc01b5ecc8783d1a0f325ab168935eb6533a5726681389c05f662d9f7b978a50c2f1ef4d5cfd6f356e758cfff781072143902dbdab41f2310b705 SHA512 565a5aa0ce1c29fb2f09995283dbf2e12e0f228294df7c1b744a545e4f550126e0b327e9903c9eb35cb7dbd96d69e4653c57f3b3cb2dc2475680b3c62b71e1d8
 DIST feh-3.1.1.tar.bz2 2109534 BLAKE2B ea02ab09791ef61a9ac5db84b5a0f69ddc76f994343660cf4072a41769a59ddd2936e0f047eeed26be0b3676711b1e440c0483325e6bb621205788ebe13c1fca SHA512 cbdf6e36831a750a6bdb9f1a5735c814662b5274d9c453392de88b98926b539cc54e2041fc0cd2a393762f14ec24b81435de6d506d9efc1ee4c7d80105aa6243
 DIST feh-3.1.2.tar.bz2 2109860 BLAKE2B eb3c4b0d93a6b18477626d1cf4d99fa96e0ccd2bd21ad646ef7afa31c5f9e318c7b20eca2615f13d537806caee16a7ae6f789ebdf2dc3eb7b53ba8824e807333 SHA512 a81ee5d8d0ac3ce13cfc5af6e1f5854235755ea54dd92a1019ff206617f1c46196a5e3a0794bbc886e89854b221f99b6e3fe387fa7d50bb0cbc3a2d9e834bbbc
+DIST feh-3.1.3.tar.bz2 2110285 BLAKE2B ee42b766eccf7e4661a47bd6c748b2e0cc6345fb9c08de425b0f4ef87c7fb383dd20140fb2c8b2fc540b70a6c01bb612b48aa76fc1f47a117f2503257bf3b403 SHA512 dc4960706e4134bbe6c34036a9c9b7cd98eb8935e13e2354504664a1599d4af193c6b977433a40c7e3638b2b3e2928960e0c755b04f7c48076ef15445f792583
 EBUILD feh-2.18.3.ebuild 1194 BLAKE2B a9ba56ee28f45ba475db7373f3caf7534fb9cb1e020b85b6f4fa19fecd00cd23c493d862b662639e73cd2e9b38bc8703e42a36107e26cee636b0ad871b1d6990 SHA512 f23c472d2686a21fb3c81111415682d059a121eb5e0a14a6a71298395407e3aea0f5a16b9d91ca8c46c2e7a1ce455656832863ba63de2a142e056dac132e7346
 EBUILD feh-2.26.4.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
 EBUILD feh-2.27.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
 EBUILD feh-2.28.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
-EBUILD feh-3.1.1.ebuild 1466 BLAKE2B 255d6fb69535b31a1775c5be3779e72550c03ddf67f77c22bd237ee468bfc85f9eca7641d1f1a8ef051c2c8172dd8c8e6b1ffefef065c86b72ea665fa2ab5c85 SHA512 b240119bbc8adede6ca0232770d755f00ed0fa37eca2984defe148cb3fa28cb6e61bb075eb18407dca7b3b3a01e68a9289d5cea9d759b419040dab714736bd14
+EBUILD feh-3.1.1.ebuild 1465 BLAKE2B 7b9dff611b47e425b139fc5e463b8f431b7e236070b933f2cff911e70a8a9bb9b2a8cfc98cfd8a69aa1e4032f3b3fd6e99b5989ed323ea0a2d2a43b303b96df8 SHA512 c26f1b0f8358833fd0e148cbf57e505154aee520d246bba740c589b780b265cf2215b6e02ed9b1acb8839b44cbb20ed9f286ed023d1ff7e8225a049bebf59099
 EBUILD feh-3.1.2.ebuild 1467 BLAKE2B 39c5f81f461a816de37e2bbdbb1b4aab6beca6c285981db80922d82b728a0ef539268d845b17c0413774fd7cc3d9e6019559d6c0949266f34521773b22d0dece SHA512 fca2377658182715b3d0c139a75a35e9ff834ec3ce8e813666f229178f033a9614f29cc0d2992dbb594a008d6cb07233928382b17496bf545ec87a48cc68e550
+EBUILD feh-3.1.3.ebuild 1467 BLAKE2B 39c5f81f461a816de37e2bbdbb1b4aab6beca6c285981db80922d82b728a0ef539268d845b17c0413774fd7cc3d9e6019559d6c0949266f34521773b22d0dece SHA512 fca2377658182715b3d0c139a75a35e9ff834ec3ce8e813666f229178f033a9614f29cc0d2992dbb594a008d6cb07233928382b17496bf545ec87a48cc68e550
 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
diff --git a/media-gfx/feh/feh-3.1.1.ebuild b/media-gfx/feh/feh-3.1.1.ebuild
index 461f8261e5f2..98f7cb6d011b 100644
--- a/media-gfx/feh/feh-3.1.1.ebuild
+++ b/media-gfx/feh/feh-3.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~x86"
 IUSE="debug curl exif test xinerama"
 
 COMMON_DEPEND="media-libs/imlib2[X]
diff --git a/media-gfx/feh/feh-3.1.3.ebuild b/media-gfx/feh/feh-3.1.3.ebuild
new file mode 100644
index 000000000000..06c60d87c45b
--- /dev/null
+++ b/media-gfx/feh/feh-3.1.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs gnome2-utils xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 1c74cefa2b96..0f451423c44b 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,8 +1,5 @@
-AUX geeqie-1.3-stdstring.patch 2247 BLAKE2B 4569351aff9f524c17b9ad08634406e21d6e1b88921e12e320f5a618665aad9287b05d4d16d90f3a701fb7de73514005dfd5bf7d09e87313a97cc594849a9b2b SHA512 f26122a1419f795393174340f0e4a5b341d8341664840347730a8b19b1956d4c684b6a5a5183357250364a040eacc18267aab272789ac65ece9ece56d6b2dadf
 AUX geeqie-1.4-exiv2-0.27.patch 2052 BLAKE2B db7bb4d2631d566e4c9dbc89cad262cfb173df96b92ea83a690bdcdbbb7d3c873e9e5bd5a581c45b3a4af42c3c7711c65080e1822eaa31be97632b57d4e34713 SHA512 b8108f9a77022f1a0d1354883d1f7a1981a8079e675e765aa67fac16606ed42ecc169ad5cb8a6baf86e919d6ddf018ed54bf5950b9601d2cd1ff647f7fa47bca
-DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
-EBUILD geeqie-1.3-r1.ebuild 1941 BLAKE2B 2ac0dfaa649219e597b6128fd65cc435edb9fb90f6e1c44defa821f9c282b18c208a3553d11dba175b69806f674b9baa0c2348dd7988971adbeb14d43d521e50 SHA512 9116a91a9459f59c9dab49bfd40b29f57ad042ae740d29809cfd55b6df829c73327ef28e1c8a69cee3b14fee2962edc5b002f2f26adb8c0d72ea1f61c17dc91b
 EBUILD geeqie-1.4-r1.ebuild 2367 BLAKE2B bca36e24f57330c1d9993c191326cb9e204663770a885904fad177a4f3f18394bfaa07f88ed659a9771b25ad2e34e01de219dbac5e487c16d9dbc193399e7ea9 SHA512 f6fdf9420db3861bb2e533b0319bfd147c4b6fe6c5e1201c54a557c112d9f4843b4d80a037894ff7656d724e7a2026b8b095ef0cb63e4d580c161c32946c87f5
 EBUILD geeqie-9999.ebuild 2269 BLAKE2B 719319e9805f58a4f1dfaea869c911f1ade15e762ba46add49975f17b38a6e3909b74e0db223082c06ae55c0aa655389ab5a10e75d4d1dc85552e55105fe29d0 SHA512 8435b9882a9a767af7592bfb59e32d47f0f01e932eac23f920bf0933ae1ae3044302205dd6902fe490c6f995d669b1eaf62b141cc66538444bd5d57d39d896b4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch
deleted file mode 100644
index fb58db6a5283..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0b044d1d685307e5755917e31d56a1a3104cd505 Mon Sep 17 00:00:00 2001
-From: David Kalnischkies <david@kalnischkies.de>
-Date: Fri, 27 May 2016 12:04:40 +0100
-Subject: [PATCH] Work around changed c++11 std::string implementation
-
-Bug was already partly fixed by 96db62d but there was even more
-positions that was unseen by Solomon.
-
-The patch is originally from Debian bug report #800350.
-
-Signed-off-by: Klaus Ethgen <Klaus@Ethgen.de>
----
- src/exiv2.cc | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index 1dbe118..49b8e07 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -25,6 +25,7 @@
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
- #include <iostream>
-+#include <string>
- 
- // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
- #ifndef EXIV2_TEST_VERSION
-@@ -1140,8 +1141,9 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width,
- 
- 	if (!exif->image()) return NULL;
- 
-+	std::string const path = exif->image()->io().path();
- 	/* given image pathname, first do simple (and fast) file extension test */
--	gboolean is_raw = filter_file_class(exif->image()->io().path().c_str(), FORMAT_CLASS_RAWIMAGE);
-+	gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE);
- 
- 	if (!is_raw && requested_width == 0) return NULL;
- 
-@@ -1241,10 +1243,10 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
- 	if (!exif) return NULL;
- 	if (!exif->image()) return NULL;
- 
--	const char* path = exif->image()->io().path().c_str();
-+	std::string const path = exif->image()->io().path();
- 
- 	/* given image pathname, first do simple (and fast) file extension test */
--	if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL;
-+	if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL;
- 
- 	try {
- 		struct stat st;
-@@ -1255,9 +1257,9 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
- 
- 		RawFile rf(exif->image()->io());
- 		offset = rf.preview_offset();
--		DEBUG_1("%s: offset %lu", path, offset);
-+		DEBUG_1("%s: offset %lu", path.c_str(), offset);
- 
--		fd = open(path, O_RDONLY);
-+		fd = open(path.c_str(), O_RDONLY);
- 		if (fd == -1)
- 			{
- 			return NULL;
diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
deleted file mode 100644
index dd9b8e0511a4..000000000000
--- a/media-gfx/geeqie/geeqie-1.3-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	gpu-accel? ( media-libs/clutter-gtk )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	map? ( media-libs/libchamplain:0.12 )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
-	map? ( gpu-accel )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-stdstring.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# clutter does not compile, gps depends on clutter
-	local myconf="--disable-dependency-tracking
-		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable debug debug-log)
-		$(use_enable gpu-accel)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable map)
-		$(use_enable tiff)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
-	docompress -x /usr/share/doc/${PF}/README
-}
-
-pkg_postinst() {
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 08d89d66bbb0..730288881795 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,6 +1,10 @@
 AUX 3.26.4-support-tracker1.patch 1094 BLAKE2B 224f4052fe379d79ca9fa02dc0d7e19196c5016e6f8e6936f620697d27f063aa421bd37dfa159856fedf0971095bc302f36591788923483729380dc9e754acce SHA512 32c1dcea04be037827d9c6b23ce38e3cb1d7548233f0569c58b87b3dcca25a060933dbbf89d8f2a5bac442c7fde854efc72f27df3e6eed9d0d0ee163a02e1763
 DIST gnome-photos-3.24.6.tar.xz 986200 BLAKE2B 656737326f594958ea1cc956f85e50c7eaebc227491d95342acab9a1fa0e3c5c109efe932cd0465e48ada62beab238e6eef0e01033b145de72a1fb64ce2f3c89 SHA512 47fd858b643fe0bca9a4801d43bd7eb181db08d7e09941a60a134247df97b0e900cd062efef70da5161a9fceb1d33b998b87ad5eca0a5937a10c4e06b908de22
 DIST gnome-photos-3.26.4.tar.xz 1101324 BLAKE2B 81e851bdeb39455cad6d4ba99194229507a809c3bd8c9ff0c24992cbbf90001d87f96d1c2b3c3a07101982e6ea169cba0e2249431138e962850f55fffc2c54ec SHA512 0a49b7eb29918ccf87af4211db6ffbb3c55ab40f4eaa1437317fda32de43b3b0c9033397d5b06fbc5012d0fa322a79dafdf46817cfaea57ef2f4df1a975fb489
+DIST gnome-photos-3.28.1.tar.xz 1139192 BLAKE2B c6be02cf49ef96c580759dabeeecb55d74e137a234663fe2ce78b45257abb2a0d5d52d34fdf30dd5672b054ab592f9858e9a963d593fc95dbca5c97cab2d5671 SHA512 6246c55484d45883dda93f990c52b46755420d820007a64d606685153353607a90702ac7c6e4de59c54ff9ffb5b36f15a297541c5fa866718b5ac9e44e15d35b
+DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
 EBUILD gnome-photos-3.24.6.ebuild 1794 BLAKE2B dce8b2a44345c35c19058389cfa48d0e9f4e50f427e7d5406e09515598a13c6569b886cdf8e6effcaa9d87ad2ea693596ab49aaa6d8eb9ac930b28749bc6f1a3 SHA512 0a27e45dbdb2adfa84a8eb389a8342a9fa58f5d98d0142c1ab4817f7c2e5f247b7702968190947ad25db6ed1f7fe3a91be9683c5f57010600a2a890b8ca84975
 EBUILD gnome-photos-3.26.4.ebuild 2062 BLAKE2B a5f08ee546de0a51cbfd74c812c320f22ab9a2c3b131693ade2049ae53cda83b669e945bc557be3c24af4f205020176ce733e75cde78f4ea830fc31920c9707b SHA512 3da683b6f4ffabcbf9420751a2d99f94cd0f8f5960069a3a4cb25d9d9195fd90d8b11d498e3c305a6c36917675fe09934d38705c99bca11e6a2deb3db543fb05
-MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11
+EBUILD gnome-photos-3.28.1.ebuild 1945 BLAKE2B 91188dc888b2744fc5ad078efca6a9a18630ab7a7fa373489469d809efe985adba6299b7944614df83584cd2b142df9674271a02eeb0ab1fb446aac839bc5f99 SHA512 eb77aad0b81d710809e3e1ff629e3dd0f62e12b59eb358c5ffed57818136c63279d49af0b328d327f15af5bad09bdcfe7e0fd4c28ce32bc87ce3b1454e5d08b1
+EBUILD gnome-photos-3.30.1.ebuild 1951 BLAKE2B 0abd314d897dc1f6ab6fa76ba518e848550018ebd86ec80ac7d546959e3b7dfef3bf9adab9669b949cb6025e054922db032baa32e4f231721d7f990f4c7fcf57 SHA512 b7ed7697606e80043df70668ddd81e2591cffd0574ae8488a4e1ec92b210ceb689a5c12034353500b458c5f2f04cc5666c91bc32032d4f5dac6d7e6e51a43913
+MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.28.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.28.1.ebuild
new file mode 100644
index 000000000000..803cf12a2262
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.28.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-3+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flickr test upnp-av"
+
+COMMON_DEPEND="
+	>=app-misc/tracker-2.0:0/2.0
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libdazzle-3.26.0
+	gnome-base/gsettings-desktop-schemas
+	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
+	media-libs/babl
+	>=media-libs/gegl-0.3.28:0.3[cairo,jpeg2k,raw]
+	media-libs/gexiv2
+	>=media-libs/grilo-0.3.0:0.3=
+	>=media-libs/libpng-1.6:0=
+	>=net-libs/gnome-online-accounts-3.8:=
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	sci-geosciences/geocode-glib
+	>=x11-libs/cairo-1.14
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/gtk+-3.22.16:3
+"
+# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
+# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
+# so don't pull it always, but only if either USE flag is enabled
+RDEPEND="${COMMON_DEPEND}
+	net-misc/gnome-online-miners[flickr?]
+	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+" # app-text/yelp-tools needed for eautoreconf; otherwise just itstool
+RDEPEND="${RDEPEND}
+	>=app-misc/tracker-miners-2
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# XXX: how to deal with rdtscp support, x86intrin
+	gnome2_src_configure \
+		$(use_enable test dogtail)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild
new file mode 100644
index 000000000000..5a60791ae408
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flickr test upnp-av"
+
+COMMON_DEPEND="
+	>=app-misc/tracker-2.0:0/2.0
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libdazzle-3.26.0
+	gnome-base/gsettings-desktop-schemas
+	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
+	media-libs/babl
+	>=media-libs/gegl-0.4.0:0.4[cairo,jpeg2k,raw]
+	>=media-libs/gexiv2-0.10.8
+	>=media-libs/grilo-0.3.5:0.3=
+	>=media-libs/libpng-1.6:0=
+	>=net-libs/gnome-online-accounts-3.8:=
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	sci-geosciences/geocode-glib
+	>=x11-libs/cairo-1.14
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/gtk+-3.22.16:3
+	virtual/jpeg:0
+"
+# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
+# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
+# so don't pull it always, but only if either USE flag is enabled
+RDEPEND="${COMMON_DEPEND}
+	net-misc/gnome-online-miners[flickr?]
+	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+" # app-text/yelp-tools needed for eautoreconf; otherwise just itstool
+RDEPEND="${RDEPEND}
+	>=app-misc/tracker-miners-2
+"
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test dogtail)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/media-gfx/gnome-photos/metadata.xml b/media-gfx/gnome-photos/metadata.xml
index 97374ee59f59..991ec58281a6 100644
--- a/media-gfx/gnome-photos/metadata.xml
+++ b/media-gfx/gnome-photos/metadata.xml
@@ -8,4 +8,20 @@
 <use>
 	<flag name="flickr">Ensure runtime Flickr support</flag>
 </use>
+<longdescription lang="en">
+	Access, organize and share your photos on GNOME. A simple and elegant
+	replacement for using a file manager to deal with photos. Enhance, crop
+	and edit in a snap. Seamless cloud integration is offered through GNOME
+	Online Accounts.
+
+	You can:
+	- Automatically find all your pictures
+	- View recent local and online photos
+	- Access your Facebook or Flickr pictures
+	- View photos on TVs, laptops or other DLNA renderers on your local network
+	- Set pictures as your desktop background
+	- Print photos
+	- Select favorites
+	- Easily edit your pictures in the app, or send to a full featured editor for more advanced changes
+</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 1bb7109d282c..04a5062ee9f6 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-screenshot-3.22.0.tar.xz 258888 BLAKE2B 48f997832a8e0f937283a2cfba8880dc9032ea7a3254b0f45dd1ffd3951d096f03899199497ca78fc9be22f83ae8c60bb4f72662a323dad3afc05d2229fd914c SHA512 a532e9cc8615ce22db5805c1857a3bad5bf69a3436a45574384c6c8f848ae67d6991dbfc5556e7cf08f630915c0666bba0c4bee9e4190340bbad57faa9af2ff9
 DIST gnome-screenshot-3.30.0.tar.xz 225244 BLAKE2B 69c75bb8e3d18578317343b549d4ad837b6e58420c6b49efbc01338697bc2251032d9158e658c9f4ae4e086a1c117eac818c18b6ed95d031c2b60c2ba62a56b6 SHA512 a42ff4f14bbb3a3feb438ee64f1dff3d3a792a6585fef92fde8546b9c3fc07013e8bd2ef42ddc880f2529cbc4241a50d441d4de2a4b26923036f1724aabafdba
-EBUILD gnome-screenshot-3.22.0.ebuild 1203 BLAKE2B 9f74f14b77d22c51394d9d131a5e03779594f405e2f95c3398b50df057fb7c854979e17ab02aaba1f73ef76dd61262a9d9e57795cac15f2c0946312316be6a6c SHA512 fed2aaf00f661cf23e83f0c86b610e94ed3100d62e8d18bb1fded4b8e72fd98e030e048a8c3aff442eaf990f6a9050431a8448ade68de2c54ce0f8af53b2bce4
-EBUILD gnome-screenshot-3.30.0.ebuild 1238 BLAKE2B 18dcfe3b8f6ef9c4ab2b2277acd8a6feb51eb722385258488dea827f86e1c02a63872bf8e76250ed6a03790cc293be78824c4f4895fe81a0f56f4fabd14acd98 SHA512 8ef1d69d80aa01cf9e5edcb1011af8bca83a5624e2f400dea162d06b366e26b1cd0d2582bfda9a9dd19e2687459710d59fd1421245ba222420845ee9a56bf35a
+EBUILD gnome-screenshot-3.22.0.ebuild 1203 BLAKE2B dc1efcbc247c271b2d9b070d13f2e9bcacd9045d948cf0fb359904da7277dae7b7547d88d6f5b098611d576a60645339e3a43098eecfc744136e26bdb92e72da SHA512 bf9c4c8079ae8cf8716eadf646e013508e6363db4fdc5d35147d17561c28f9244fe32133572a01df712c675076add6cd35c7783b58749bbeed4043d91e31408d
+EBUILD gnome-screenshot-3.30.0.ebuild 1241 BLAKE2B 7fa3570a4e43f428010042396552b247780a284d6e03551c0d6cac369c86469fd9f26e11d37a689d363de97bbb2fe4746aa10e4cdc7da9062827fcdca86ac59a SHA512 2a092210cff2550c175a1429e6ddf08ba2539f742ecc97891622acbed7b152db780e23f508d4e72da51e51f58457d24542dbcf40ccf647f87c15e1418b92d736
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
index 7abe28836619..b72d4467390a 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit gnome2 readme.gentoo-r1
 
 DESCRIPTION="Screenshot utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
index 356eb6e133b5..b3a90dc58263 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
 
 DESCRIPTION="Screenshot utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 49ebb64a197a..758b8e6c597b 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -2,5 +2,5 @@ AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 6
 DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
 DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
 EBUILD gphoto2-2.5.15.ebuild 1389 BLAKE2B dfdf84cdcd5c2305ee92572633308fd7f861677dfa98fe708b76b4ca6983014854e27f8c21456a9b1db806d2a160a0f45fe4bea13b5227290c0d6edeed444b1d SHA512 353294fbc29fb2c3f948e51906b91f5214948e2c6172a171a0a9a6ae19d318b215865bea8212c63cbfcfd5d54134acd9ab35b7cf8eba8c6677c9727833fd6ad0
-EBUILD gphoto2-2.5.20.ebuild 1331 BLAKE2B 89ef478df066b8824503bea7a1dcbad7257974b22731080a6eeadb16ef45885c72edeef77b600c6088a72ee4007bbf54a28befce6f536f400cc7c10cfdd9e7e9 SHA512 31d763dd83771ad375011cab0d9a8ff563b47654677db787f1b953a239b7d977a70ca412a5ba8bc85bb847c2019fe322a79cbe1b2a794ed6f51788071d450825
+EBUILD gphoto2-2.5.20.ebuild 1327 BLAKE2B fc83ba6e8d6624ee700bf40cfc238ebf255b8e8c606c33cecb248cd7217a0ecc17b9a1e1239e718ca5f82e54d965e65052de6f8cb14de137e432879a29e7875e SHA512 39e2c807c15580d7b528b2712d36f0d29c5b261f1b489db19e1239b172e74f65be0fd2b1b6553d29a1f0b2523b800141dcd8aa15524376659532e7d06e8d3715
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
index 5470646b4f22..7f9f28877711 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 80b1db018823..39cb62100591 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,6 +1,4 @@
 AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d
-DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42
 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
-EBUILD gthumb-3.6.1.ebuild 2595 BLAKE2B 64912212a1e032ee927272bd77fee83367a678569d7ef58b67e27629404019b5fd101445973a81a870563c756f49de3ee290a9ae50a50abc0b61e913bc02f4ce SHA512 4f7ab17a2331dc0b592a267254d70e7f80d3ecd66aa069200500acf8488f0bdbbfdd1874829468556e25d71c38a0e7d6ead8d894e5085ee68100abe9bfd4c424
 EBUILD gthumb-3.6.2.ebuild 2654 BLAKE2B 3f89993297e713e9b50875763ed9623bfbf740ffcfb43562ff119e494394d3f91443d1b5aae47d2c35148bd33a28ea1c7f8dfcc909c2d822f4ef43899477386f SHA512 003160b92864d1410cdc813d825e2ef32e496fccd8692494fd7bf53e48aaaedc2ccf3762236b29f2c7c31bec095b73ba6f7c4179005701eff2b923a2feea38da
 MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
diff --git a/media-gfx/gthumb/gthumb-3.6.1.ebuild b/media-gfx/gthumb/gthumb-3.6.1.ebuild
deleted file mode 100644
index 8f1c52090c00..000000000000
--- a/media-gfx/gthumb/gthumb-3.6.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2[dbus]
-	>=x11-libs/gtk+-3.16.0:3
-	exif? ( >=media-gfx/exiv2-0.21:= )
-	slideshow? (
-		>=media-libs/clutter-1.12.0:1.0
-		>=media-libs/clutter-gtk-1:1.0 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	raw? ( >=media-libs/libraw-0.14:= )
-	http? ( >=net-libs/libsoup-2.42.0:2.4 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
-	cdr? ( >=app-cdr/brasero-3.2 )
-	svg? ( >=gnome-base/librsvg-2.34:2 )
-	webp? ( >=media-libs/libwebp-0.2.0 )
-	json? ( >=dev-libs/json-glib-0.15.0 )
-	webkit? ( >=net-libs/webkit-gtk-1.10.0:4 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	colord? ( >=x11-misc/colord-1.3
-		>=media-libs/lcms-2.6:2 )
-
-	media-libs/libpng:0=
-	sys-libs/zlib
-	>=gnome-base/gsettings-desktop-schemas-0.1.4
-	jpeg? ( virtual/jpeg:0= )
-	tiff? ( media-libs/tiff:= )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Remove unwanted CFLAGS added with USE=debug
-	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
-		-i configure.ac -i configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Upstream says in configure help that libchamplain support
-	# crashes frequently
-	local myeconfargs=(
-		--disable-static
-		--disable-libchamplain
-		$(use_enable cdr libbrasero)
-		$(use_enable colord)
-		$(use_enable debug)
-		$(use_enable exif exiv2)
-		$(use_enable gnome-keyring libsecret)
-		$(use_enable gstreamer)
-		$(use_enable http libsoup)
-		$(use_enable jpeg)
-		$(use_enable json libjson-glib)
-		$(use_enable raw libraw)
-		$(use_enable slideshow clutter)
-		$(use_enable svg librsvg)
-		$(use_enable test test-suite)
-		$(use_enable tiff)
-		$(use_enable webkit webkit2)
-		$(use_enable webp libwebp)
-	)
-	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
-	if use lcms || use colord; then
-		myeconfargs+=( --enable-lcms2 )
-	else
-		myeconfargs+=( --disable-lcms2 )
-	fi
-	gnome2_src_configure "${myeconfargs[@]}"
-}
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 7e39cf85ac78..b913042bfc24 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,9 +1,5 @@
 AUX hugin-2018.0.0-exiv2-0.27.patch 1095 BLAKE2B 52cd5e31f36b22291a3a864a9f248510f0fc871f1a9ee8e49cbcda5d8876eb9e7ec0e5e1595cce015c55dfc0f53b4fa8efc82e30f8c129e81d426accb3538e5e SHA512 480cb3f5e4ba04efa863b409747029ec1ed158168705621b3ba588e6566c56c3e5b16f422daf40cc27660b48f63c1a32861f9a4cda22c0eda397922d00a828a1
-DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B 8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b SHA512 9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
-DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7 SHA512 bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
 DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
-EBUILD hugin-2016.2.0.ebuild 1948 BLAKE2B 813e60b2a655186d9ee3042e03372e1185e07aa6fdb7a5ecd57889efb9252630d7902b36600995e02ba03677f9c11a6bc4b7fc841f852391e1c3ed168c24b24f SHA512 0fa77072010e24db9fa58b5601040baff38121342a7c187b24b6fd37626becd46b372fde844981bb00da4b840970ebff88bc2f3f2833afc584c2aad6cba8a265
-EBUILD hugin-2017.0.ebuild 1924 BLAKE2B 8d618f623ed9d53a49e138acad196d691bcd0b69b4f3318a002b88917bcfc216ce9b10c02a283b540acae345e8878a6ab233022ec1ae44f37b305e11eb592066 SHA512 7921827a90e88f68218e7d2a4b9480ab5ffcb7bcd9aff1f8245d7d9233b55d425f216fcd14c13c064fe30dc2fe65f2882fb8ba8f3a4e8d126db754d6e733737f
 EBUILD hugin-2018.0.0.ebuild 1994 BLAKE2B 5ce3bf34d0cc0624ce414174a95bbc08b19bd162961927fb0da4e48d3c6d89eb8ca1837e77633ed54dbfa0e61411288bc048c66ab3e88eacf527027cd717b868 SHA512 9547fdc6ee37e9980f7fbddab5c2a073b6fe0ed5454657e8d4171805c043a6badd7e080bb733c0addebdc8a1cf042c5eda02d529487c505285bb05e84542431a
 EBUILD hugin-9999.ebuild 1981 BLAKE2B fd52cc7022ccdd63117c259083a0e0e34600e5b1ec4d9f5a19d7bc6fa7878a92242227efd6a6b576a17e7d1f6fd7201f32a4a507ea787df4533698c6bd9aace4 SHA512 7c918c42fb21ad9d53fb2e49d3cf48ea7e5a3897c94452770c800c7d69516bddd748e157f95d88a0c0c3ff77ee984ddddcfa64ae201895ea91a9648d2ae29f70
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild b/media-gfx/hugin/hugin-2016.2.0.ebuild
deleted file mode 100644
index 6d66c2d74197..000000000000
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.9.0[openexr]
-	sci-libs/fftw:3.0=
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
-	lapack? ( virtual/blas virtual/lapack )
-	python? ( ${PYTHON_DEPS} )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-DEPEND="${CDEPEND}
-	dev-cpp/tclap
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	local lang
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			ca-valencia) dir=ca_ES@valencia;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang/-/_};;
-		esac
-		if ! use l10n_${lang} ; then
-			rm -r "${ED%/}"/usr/share/locale/${dir} || die
-		fi
-	done
-}
diff --git a/media-gfx/hugin/hugin-2017.0.ebuild b/media-gfx/hugin/hugin-2017.0.ebuild
deleted file mode 100644
index 649cba97977b..000000000000
--- a/media-gfx/hugin/hugin-2017.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
-	sci-libs/fftw:3.0=
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
-	lapack? ( virtual/blas virtual/lapack )
-	python? ( ${PYTHON_DEPS} )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-DEPEND="${CDEPEND}
-	dev-cpp/tclap
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-S=${WORKDIR}/${PN}-2017.0.0
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	local lang
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			ca-valencia) dir=ca_ES@valencia;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang/-/_};;
-		esac
-		if ! use l10n_${lang} ; then
-			rm -r "${ED%/}"/usr/share/locale/${dir} || die
-		fi
-	done
-}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 5e479a12bbf5..a90c56455319 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,16 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-27.tar.xz 8946680 BLAKE2B 74992d85c02336cc5d64dea25df04a56e97d3d6e9feabd03230fd693ae94fb79781581c0d293c765c4639e2f82b3585f5e98a7c0015cab1980c7a766fee7066a SHA512 13b83c72e96cab30eccda2a260a952c7a6f1016eb22df15643aceeca4b8b95b485da844d04484c39f9b1c93168c4b4e2d4cb92a6bd3b0831c94985717db8c368
 DIST ImageMagick-6.9.10-28.tar.xz 8937428 BLAKE2B 240e39d6ffa702227abb645fdd2bfc7dab6fbe39727fdd77d84eb43e3788014a8df7369e024063b25000e7e0d0cd17ac2931f5eeeb3ac8049a3013ab5d10108d SHA512 300632f540ec533ec981d8173135b33422b9d53d4d5fa5d619463030749d3822a74dee14ab0e076187dff6b589857fa72cb5a28418b81348f9ed493a3c8d3a5e
-DIST ImageMagick-7.0.8-27.tar.xz 9431068 BLAKE2B 57fdf9bcb1c6c6a94f3b88c429a9369cfacf2d11894f7230a0b4c8091d556a77415e07e4fdc47db8779cbc8271a9fe53106f37acf677829a707742ac727cc025 SHA512 84dea016884306ae8b1939064020f78628faaa1bb26433e277cef0c668558ac9588df9b6c89b2db2cac9e0691a9b5d87db64315785befd982bffd9754f532f41
+DIST ImageMagick-6.9.10-30.tar.xz 8948384 BLAKE2B 6f372f1c29e8e3939d95a1d3dadefa2f1911cbf19a929e39ddffdb3d7caa31330ee8ad277a147a54012815b76e1e205141d6b329689d3adf7aa0690f84496d58 SHA512 00d5e11569f4ba59a9c4aa4fae44d87f1ca3e0efe3df5a870c1e5ffc000e75c55cdd2fc0ba760d1401e28903b6a809e678e90c900421893fcd06e5078dfdbfeb
+DIST ImageMagick-6.9.10-33.tar.xz 8935040 BLAKE2B 042410c49229d218b1ae36db96317da12b578581dbe2689749fe6331d1dfa1683d6182dda502429365af8bb86407195cc5107c5a0b454391c38a387bde967de3 SHA512 bdcc23de644ccf8150969849b6cec36f2c987b46588cd8717ae73ffe14aba2d262e4449e9f3a3bd6a9444e7a724f89c7f9a13dcb5ca11459ef97e07f25f1c014
 DIST ImageMagick-7.0.8-28.tar.xz 9432232 BLAKE2B 0754f0d0a2327dbeb76da12f8686a7a3b19fe18b1ef07eb7ddb4367eb3b0d9b61c35b6ccf869b78b32a9bb77f1dbfc02ba33bbf6d2b266310a3ee9c6dc15d1ce SHA512 4014beb2f743e46d725b3f22985f87f42adffbe23152fb19bc0d55647260e4a15f560c2ba68c7db5ce9c931665220ba5ccd01abce8d38a5d57724f35de8904cd
-EBUILD imagemagick-6.9.10.27.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-6.9.10.28.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
-EBUILD imagemagick-7.0.8.27.ebuild 7151 BLAKE2B 2a45d3c2bf28fa0c18a7d7b2b81f9b41a208bf74e84a8bd0fd9630380f432e4a2ee27911b83a7a2ebd86c828105754d6b092a6205b4fc2d22ac79824c62e9069 SHA512 49dec8a319fef02989b7ad27a3553688f720391f670525f5d89dc34722eaab3fb2dbadf7e5ebd0565193020e54e0509fd171a2505f79a99b1eaa263daddd405b
-EBUILD imagemagick-7.0.8.28.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+DIST ImageMagick-7.0.8-30.tar.xz 9439136 BLAKE2B f8396d4301b002bf5409a27e5918e75422a0c4b0986f6fad80af0b490567c126ce3e80a2496fa247e6f5a8dc16fd9164e3e8c69be689bdbec0666dbc3ea860ef SHA512 eb0c8fe7c4b55409240f7df3f75d6fc803952184c6c511b7e57198073a5ab60b6c1e6ae399c8c3e636b7e2a41784de86aa47e0f3019c2d3bbc81edeb552dfebb
+DIST ImageMagick-7.0.8-33.tar.xz 9447692 BLAKE2B 1773fd0e9d51bd296548a6fc8170d818d7950a37b56554a8d5159e3beaee2b412d29243827172f94d2c244e851a6683a3393c3b36212764c56f4ad0acb17e4d2 SHA512 7dab0e9c3c7e72944c7ccfefbe67249fd513b6c122c7061de3c12a9dbc5deb18531f3cfc79f5286494c6fb54b6cefcc6643d56a171406f6a70ab12e9d644170a
+EBUILD imagemagick-6.9.10.28.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-6.9.10.30.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
+EBUILD imagemagick-6.9.10.33.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
+EBUILD imagemagick-7.0.8.28.ebuild 7151 BLAKE2B 2a45d3c2bf28fa0c18a7d7b2b81f9b41a208bf74e84a8bd0fd9630380f432e4a2ee27911b83a7a2ebd86c828105754d6b092a6205b4fc2d22ac79824c62e9069 SHA512 49dec8a319fef02989b7ad27a3553688f720391f670525f5d89dc34722eaab3fb2dbadf7e5ebd0565193020e54e0509fd171a2505f79a99b1eaa263daddd405b
+EBUILD imagemagick-7.0.8.30.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+EBUILD imagemagick-7.0.8.33.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.28.ebuild
index b09291336ccb..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.28.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.27.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.30.ebuild
index b6bca9ea8b20..b09291336ccb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.27.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.33.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.33.ebuild
new file mode 100644
index 000000000000..b09291336ccb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.33.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.28.ebuild
index 69c412db11b7..3b3fc7c8d30d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.28.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.27.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.30.ebuild
index 3b3fc7c8d30d..69c412db11b7 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.27.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.30.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.33.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.33.ebuild
new file mode 100644
index 000000000000..69c412db11b7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.33.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest
index 379a66aad2cc..d86d5fe4ea3b 100644
--- a/media-gfx/jpegoptim/Manifest
+++ b/media-gfx/jpegoptim/Manifest
@@ -1,7 +1,5 @@
 DIST jpegoptim-1.4.3.tar.gz 98151 BLAKE2B 6faf7097fbd72302707ca7f7b7f6bb02841d5f6433c6624254c09fcf389da99cc117eddddf1e58de941394e84b22d6cef06d54568de26558c8c9cb90b0c77595 SHA512 4495e9cf5af9ba41273bf23a4abea724adb19ddac373d5985c29fe65b227c0b23bf14baaa28fa8f8617370e9b9fe41b0d365ad19da67f34d32fa857232c7b09e
-DIST jpegoptim-1.4.4.tar.gz 98794 BLAKE2B 32cc9a64b832ed994453f6f87c20c29ab23423cd94ecfa8894ad7ab3fd7aca2f7f54cc0eeb7148f768bf9378e79934c9c2ea6837f9348da6b8fad04b9be01dc1 SHA512 67879b5709a97c7b097e5eae6fe4047d330da8a445eab6e9528cb5f54d76db1bba058eff5c7342b68653e7d25e50ad923d5ce04799e1b3f1815d8b70affd46a3
 DIST jpegoptim-1.4.6.tar.gz 99004 BLAKE2B efe8d4155e6a111ef7f810ddfa9d2ddc2b58d2a54728b81698c47444eebde864662ecc397cd935af47070b84daf36b33815e87a2909fc8b6ba7ca2421eff9687 SHA512 1ebd4986cbfeae19c1e01521862c15de25e078ccb6483c29f0d89b9c8e308c93d8dca7a200a57dd5da793e481ca5dc9c4f0d84b252f5b9408b4e719c35d7e90f
 EBUILD jpegoptim-1.4.3.ebuild 488 BLAKE2B d4364cde3661544ee3c1d4d83198b77e16ae727399504c7e46aa1e208cab2066a06d9c37b7d28967849a2af92ec84c3661c8f9dabf256ba0174ef3b691df7b05 SHA512 a4479e23dec2ece4e69321550a8dfed1f84418ea450d85a7d64797a742660d98c3eada87b629d6e72229fc115d5814c0b7095c3a9c28dfba0610c375633e161b
-EBUILD jpegoptim-1.4.4.ebuild 524 BLAKE2B 26f3af75056797ded89c4cfa99ebccfefa1f6b1f8f48831a25a963cd94e328f783d9f16657460edfc01225ed59bada345bd3365b0be84a01fcca407ede7eb6af SHA512 b5ab4152ff514f537d8b88851ef44e6ee8b676a89e2e76eff432430ec89ca2764721f0cd7134c53cac2cbb6a5bd51a0f63c2219210ade9ff620f9cab4f4bafba
-EBUILD jpegoptim-1.4.6.ebuild 523 BLAKE2B c6d50118ff2add50b96f1dcdd741008bca97d6e772c64fbe1382f12b3bf60e44ac5ad70cb9a0458d4f7ade1524457a5c9fc0d6dce8d75dd6154a7165c9d6025a SHA512 05098febb77385f833410f5b1fab543cb9836d978dc3bfac8140353ef16522e72dbd958939a31e2ec27d0f860c9c5a2d52a836d1d64671d3e0a2a792ae2fe941
+EBUILD jpegoptim-1.4.6.ebuild 522 BLAKE2B 3438d71e873d37c2819d36a4a4e96a8d382fe0f5defa3247c2ef978be0cf083277f3549588cd3e6a9e3e7ad10a12db993ae0c0b2853a3ab26b715715ecdbf574 SHA512 90859437b0c88ccbe3e745d247d00ba155f9ca5a4ff3a07385e770cfc107872e911eab8e1a1a360687b75c9ce6f513cf0d6ef5be81289946d7963c207c810a76
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpegoptim/jpegoptim-1.4.4.ebuild b/media-gfx/jpegoptim/jpegoptim-1.4.4.ebuild
deleted file mode 100644
index 1fd5345af524..000000000000
--- a/media-gfx/jpegoptim/jpegoptim-1.4.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Utility to optimize JPEG files"
-HOMEPAGE="https://www.kokkonen.net/tjko/projects.html https://github.com/tjko/jpegoptim"
-SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
-
-LICENSE="GPL-2+" # While COPYING is plain GPL-2, COPYRIGHT is clarifying it to be 'any later version'
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="virtual/jpeg:0"
-DEPEND="${RDEPEND}"
diff --git a/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild b/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
index dab1c63d5ae2..6a78ab18057a 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-2+" # While COPYING is plain GPL-2, COPYRIGHT is clarifying it to be 'any later version'
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="virtual/jpeg:0"
 RDEPEND="${DEPEND}"
diff --git a/media-gfx/kcoloredit/Manifest b/media-gfx/kcoloredit/Manifest
index daa5ce7f2f6a..8264aaa62825 100644
--- a/media-gfx/kcoloredit/Manifest
+++ b/media-gfx/kcoloredit/Manifest
@@ -1,3 +1,3 @@
 DIST kcoloredit-2.0.0_p20171121.tar.gz 67173 BLAKE2B 2114da34e47768113bf643380efd29e59980f5bcfd544b183db7201b6d4707b81bbdc908476c6c5d36acf8b04e68c6ba1f85aab6f2e7594124f9ce4cbc496e54 SHA512 82dd71e45121357a7da45247862f4f9679fbd132e09e8fb85c0cbef6b73069443f84fe51ec642d30b0ff9b5db10aebf34978000636375afff6c91b49089a9554
-EBUILD kcoloredit-2.0.0_p20171121.ebuild 1013 BLAKE2B c403b3fb5fd434a5aa2e659bf1d2db9b31889fe35bf6edb1a702eb1bef8110f431059bf4d6248f31c8bab60b94e5bd5b1c3d07618cfad3c261b09e80fcbf0c1b SHA512 db017262b2406d75621fdfe3b632c35e8aefc6ab4173d43a0b81decaa9cffbb880d4f50ebf170ed10027daed86abe0a6361ced5f9fcbd2f9f60b952389219142
+EBUILD kcoloredit-2.0.0_p20171121-r1.ebuild 1029 BLAKE2B bcee39ab6f539292de06ee4e2944febbf6bf04ec35098683146524dc0e3cdf2eb73e1d0b2aea5183834e9b5d7c4db2ff822f1edaaadc96d4e8da1f6e2ace509d SHA512 427b12cb0f6c75a36759e9a72c868c039e5db87e2f3b162cdeff359ce9cbc87abfef8973e48de486eaa303a31c3e414d20925e5ddc7b898215a645b34dbd6180
 MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121.ebuild b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild
index 95cb22556e1e..e216c0f0398a 100644
--- a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121.ebuild
+++ b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 COMMIT=50ac0509891343bc01a0aeffda5a44a1e65d9d04
 EGIT_BRANCH="frameworks"
 KDE_HANDBOOK="forceoptional"
-inherit kde5 vcs-snapshot
+inherit kde5
 
 DESCRIPTION="Tool for editing color palettes"
 HOMEPAGE="https://userbase.kde.org/KColorEdit"
@@ -36,3 +36,5 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!media-gfx/kcoloredit:4
 "
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6d73524abf62..8f6af52ad551 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,7 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772 SHA512 a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
 DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
+DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 EBUILD krita-4.1.7-r1.ebuild 3457 BLAKE2B 520b1b159aa586ca15e7347c031887fc27df80378b5ac8790f0242fde258717228bfa5cfc2ca5851e875f1482a6197d8a0ba9344ac02953c679b82fcc550817c SHA512 39d313a44e0086604f00a4bca6e6d15f44e5041d38f55b3da3c5906fe67d192a16fe275c222fd89ca6c21156d013c46578f083a3e0641b892714d92b8c569551
+EBUILD krita-4.1.8.ebuild 3269 BLAKE2B b4326c317a9de468c023823f4226796318c98b535ca9d38fc51cc18dd1ba72669b4415f34792fa2dbcb798eb91d7dc93f91d8009f077465838c7ecba31a47489 SHA512 41580f3de0fcd72f203824d3a6e2d5c0eb3ca2dd31030d16fce692446db6019b4eed3c7145c34d0ad8fc51b43630c809ee1e596e265d9c08b255379999f12c84
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.1.8.ebuild b/media-gfx/krita/krita-4.1.8.ebuild
new file mode 100644
index 000000000000..09ab5c97fee2
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.11.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: drop qtgui subslot operator when QTBUG is fixed or QT_MINIMAL >= 5.12.0:
+# https://bugreports.qt.io/browse/QTBUG-72488
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 19bf5d54ec15..59e7e2a28ffd 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -3,5 +3,5 @@ AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
-EBUILD libimagequant-2.12.2.ebuild 1452 BLAKE2B 4fd7cc6bbd9acdc610af8791a32b6cd34ffff66893ab61e0e682fe6f9a1eebdf3783934febef879b7ab732cfd09d441dac95c053d1f222add132c08b632cf610 SHA512 a9cf5dcd24c59900cfff173abbbaf98261fbf75efa03d685f6c9b893674eb501f2701d2b25e28eedb08f7a4408a49cc9a7cfa061db779a10ea72e6cf9e841508
+EBUILD libimagequant-2.12.2.ebuild 1457 BLAKE2B 835275cf0cfba833abd472b9ad71b90541766df82c0ae67b2702d85efa0d94693176663f648e19fde1f9df39a510c63657da9d534adf6fe311b0821263cf7349 SHA512 b7343fd41663b075834272736924bc9f7cb92f3ae5167ce21dc9175a9e112c5122762509995ae94546e90f2e3470d58c9906f9d4b8e9a708dfb1399c59f06eff
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index e3a6a6b40254..51cfc32c7338 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index a8815fd5bc6b..d2bb00a7f120 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,3 +1,5 @@
+DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd
 DIST lximage-qt-0.7.0.tar.xz 41560 BLAKE2B 32ca95556a696059254a686727f72e1d57d245134b507dc90f83920e9a4a71b9b41aca459db96cd2adceffb6dd6592399c27279d3c3ca9ded6fd61480525dbd1 SHA512 a31185562dec1aa720287ab3f9fb79b9bccfcf0f2069aa404bd469852edbe2507f8c24cf8af0cbe2ef7013e4dab8ca51c00ac7a348254f1bf20458decd3c82b4
+EBUILD lximage-qt-0.14.1-r1.ebuild 875 BLAKE2B 0834a1d32ddfd242174dc2a3069cc353222ade0fdcfd03282e2e28ee2e16948f5a2233cee956c78ebeefa6b857b40d13253144b9426be164e84476a1b58d1cff SHA512 c5945aa8396fb16a7d372d1b0711612031dde81141f170e5c141e0dd35ae062b8a6a51c335c9b482d5acd0e693f773c6bcf53b055cdee44fff7976c9e7866be6
 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.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..7e74167d0fd4
--- /dev/null
+++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="LXImage Image Viewer - GPicView replacement"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	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"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/libexif
+	>=x11-libs/libfm-qt-0.12.0:=
+	x11-libs/libX11
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 654692ef3104..877edc200bea 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -4,5 +4,5 @@ AUX mypaint-1.1.0-json-c-0.11.patch 403 BLAKE2B 1608cb7706d85cb84284cc58bb78921c
 DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
 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.1-r3.ebuild 1840 BLAKE2B 2aa89ddd15eaf1c6a54209d696fff4a6c0b3556cfbbc8e344bdf78cbd8e2a75791af43ae21e3b5fee7b7645f3718bb67a9912b3ab991d071a6212dcb1bc4e66f SHA512 ce3fe70a737dccbbc9274124471192b8fc5e4285207c2d6a6226c614b4caebff86b7044d53ae74d1938553ce4f0fdda6e2b803650aec6a5c3b59e8a17deea960
+EBUILD mypaint-1.2.1-r3.ebuild 1839 BLAKE2B d0664351d520712bc0282deddea28193a3b17262c0d72321b9f05752c5fee175429dc5d2752cd19dd88fb05a38438848b510d3f6ee833e4ab2bfc859fc3f70c2 SHA512 06a6fdd23acb648ce22859bb1813a0d1983134ed500be973428c82f18d478603447db3e523a2d3f7e92e764a9ffa249f102feef4bff651a91cdcba16a1ea7915
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
index 43afe4219d73..d3156f6ad318 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 78ce96db08d0..e7c686450e68 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -5,7 +5,7 @@ DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a06
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r2.ebuild 2057 BLAKE2B 3890a45eeea15b6627e9b616bc98cad4f40e56a0bf756f48d0a98997d010c86c60e8dfaa4b8e0cfb3481c63432535c8963deca40351d1ba98afe030503b1e9be SHA512 6b708c5eb1041dbb0d9e6642db2fc599610cd8ef35b7892d1caf8d4fa3508f8e84a76730bd72c298ca0e1d69be9e19afa51f58f6ec1b0d38f395e6b1b0183136
-EBUILD openvdb-4.0.2.ebuild 1941 BLAKE2B a31708ae94c2e8b19b958878ee0653f4d1b14b5b4fa272b87c749e27d949211701eccc9508e39ac65d7175b0a39ab17b2ff99015fab8d8ace2c9863f1d0d4bec SHA512 33fc77be6833fa19dfc4783782b83182e4f7f3c5ce09e48fce856be6e3b32e937cc8da5ffb962e891c1b5903a10dba530956dd239644d3d010c301f290dc753e
-EBUILD openvdb-5.2.0.ebuild 1787 BLAKE2B 88a885ac4b0091d9cc4263103ca04ac4dbc1ba378d70744a26a52d153be829965e8a678e48e84d845c992bdb37b7f37a92d40e80d1cb03e7de714769fbcc599a SHA512 5c8a9c264f582d800daf2ae2e4a6317d2a0150d75b2e8912bc78f622862d778511bdec0c662ce2a5ed8b0c065458ebc2e7b644d1939a59ef371160307d703995
+EBUILD openvdb-4.0.2-r2.ebuild 2055 BLAKE2B 212e28be4291d37d65c1267e3165aee224e03ec0d13910675c5affee005305a1b2ac2fabc6739714152e7880497ebd2e4ec5b4cdc12ca458e5c720c119ffccdc SHA512 47080bd3590217ffb779058864e39b94a86743bcf9e6d2b332a9159dd22354e076dcccafdb0100f2b71ffe08d6e91b60bf34d96a805a5b074fd5bf8750ef1fb0
+EBUILD openvdb-4.0.2.ebuild 1939 BLAKE2B d582b4ef569c23a0c8abb87e4371b39700430c27820fbce623857b84e665f342e3f61b4f224245c2c338a485e971d61ebbbba330096c566aec0a1d74725ccb86 SHA512 3a2d529460fa36ba324abc6a298522383056eea574109d2c796e8efb7b7fbbb4b260f5530456884f391cebb8279d736f48f1c34c3675a121371a5d887180039c
+EBUILD openvdb-5.2.0.ebuild 1785 BLAKE2B b16a9beabf0e755da3daf1213703eb1103bc4a93681c5686842cfd814c1ac13753a8380d4a432772977f328fc5f4ba0e7eb5422142e9c11771952b7ef2b3de0c SHA512 e9ac1a52a478e9bd4108ef78eb124934a22310b9ec96239bf6e796abb873f1a36c527416b68d99e5fea077def2edbb4949198ef0e733532dc9a8daecf86e09a0
 MISC metadata.xml 1028 BLAKE2B a6d852019e2bf507aa175846fc1687f101df9fc498b7dd2c7de25d860f419e86eb37549e3a2b742c32d0a2f5c6fc0450b3c82da18ef96c65fc81e547f3e7e944 SHA512 2f9d7a4271998fd9fef7a0c4fbd9d77187ba0fe41d31a807e88b19554cc5b624686e3dca44a47e8e69edc71fa89a06fcd89de59f09bccf3378418500b268d287
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index 73415cb7ea20..166cef75e0e3 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit cmake-utils flag-o-matic python-single-r1
 
 DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="http://www.openvdb.org"
+HOMEPAGE="https://www.openvdb.org"
 SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
 
diff --git a/media-gfx/openvdb/openvdb-4.0.2.ebuild b/media-gfx/openvdb/openvdb-4.0.2.ebuild
index 97720b303f01..84304db862cf 100644
--- a/media-gfx/openvdb/openvdb-4.0.2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit cmake-utils flag-o-matic python-single-r1
 
 DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="http://www.openvdb.org"
+HOMEPAGE="https://www.openvdb.org"
 SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz"
 
diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0.ebuild
index eb5d399b7a68..bcceabc54872 100644
--- a/media-gfx/openvdb/openvdb-5.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit cmake-utils flag-o-matic python-single-r1
 
 DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="http://www.openvdb.org"
+HOMEPAGE="https://www.openvdb.org"
 SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 599e286e2e07..1a2e413710e3 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -4,5 +4,5 @@ AUX optipng-0.7.6-cve-2017-16938.patch 878 BLAKE2B 8ad045b58d4e9072576b50c2f3b20
 DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
 EBUILD optipng-0.7.6-r2.ebuild 1418 BLAKE2B 01607a670df74745d7b553a9893e2f27edea8fccfcec222040bb0e3d6fef6595979e82867f3d01145262f89ecd2246aaa5e7d4224e7f590208626047587814b3 SHA512 55936ab0aa173ba316e322a4a11d036dfa63ff198c8d694cbef1f4acbce6e4b86a65d06f9af336a58f2b61f8346292868aa219a876ae2f022e3924c31aeb72f0
-EBUILD optipng-0.7.7.ebuild 1290 BLAKE2B 9368bfe4ca4a47ca16d9fa2f2fd87f4f0632e1a38f31fcd0a8eb1aca11ad67e5b810f7c2756df799d3bfce6a82540dd5c8b248d25b00ebf4bf6ac03b48cd7106 SHA512 717f73a6d115dec2fea332d108986f9a0772466f36a9ccba1b52114df7d9376fc05a808b3e8c0a5d810ba38ec96d0d5480141e497288dfbbb7d5d61682d92f61
+EBUILD optipng-0.7.7.ebuild 1294 BLAKE2B 82119e3513a19c807a231059ae09a974642a946ee2ebe562fc6e4d04eaded1f3f488a513574d81806bc640e73677be46a71cb13b9cea467f5c308a9c4a6ae7a3 SHA512 b9c36d48675575cd3ed27c0a604302b0e0223fe4647d6436e3e706a96f085159ef434d7a29776b6d55193fa7eb92f18fc6696145da2a630eebccad6555f0902d
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.7.ebuild b/media-gfx/optipng/optipng-0.7.7.ebuild
index 3880a888ddf3..a2b4dcd7be71 100644
--- a/media-gfx/optipng/optipng-0.7.7.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 5efba9ef15ce..e71d82aaf69a 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -2,5 +2,4 @@ AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e7
 AUX photoqt-1.7.1-exiv2-0.27.patch 3900 BLAKE2B 080ed5afb4c9a29779b6a875261a893315529dd87caacec31bca34b91a626bc196acb9ce3f7ed4427478855e31a4e24a14ef9d12834054c2c766e42596435fad SHA512 6a8b56ab47b4e2f21f951b8e78455b5ba7757c1a1d98ffd0f754a245662f87877a6a326409868091d0a163caa639ff7fc497151baee3b9fdae26b3cd291065f4
 DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
 EBUILD photoqt-1.7.1-r1.ebuild 1471 BLAKE2B 607dace056cb2c481275e48ec11d3ff381f48e2c23e9d1d03208950744f591db05dd0a2410c069739c869ac096d84a49a9c59e7d012eb3b7a85809615dd19c7c SHA512 5b45c2011f4fbc6c340c828a6073f61f73f81a5dc91124344f92bbfb232107d3afef95284fbeda0d6a56daf333ab8610bd81255f8292fa6b3659bb7ab7301b9a
-EBUILD photoqt-1.7.1.ebuild 1411 BLAKE2B 3e9d31303859cda721e5929022824df652be69b8f634807513f024d7ed9fc4e9a7523a26b3930f850971696cd837cc89c480e85512e168b8966489cd8aa8166f SHA512 0f8b88e6bcc2d1003d453153635f168bd923c3d3784547ef32af1a3a3f0203760e845e17d259468c4ceedd14485c36426ab59623ff540e40f8afbf533c8b3b9f
 MISC metadata.xml 474 BLAKE2B 44114be5222dc1c0ad5a926fc6ff85da5b284a929a0991795632896c0f56ad24021591260c899549eda9b36557dc251363d17eef52928930afaaafebdf29bcf3 SHA512 50c4bf4437dec5d9919e3a16fdc4e429e3fdbc8d23656ecca57ae7674bc90bd6e8e33949191d7c15d49cbfe5451e72155e1bf441f020a44ab98b35115a29b6e0
diff --git a/media-gfx/photoqt/photoqt-1.7.1.ebuild b/media-gfx/photoqt/photoqt-1.7.1.ebuild
deleted file mode 100644
index fc23fddb9b72..000000000000
--- a/media-gfx/photoqt/photoqt-1.7.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="https://photoqt.org/"
-SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="devil exif freeimage graphicsmagick pdf raw"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtimageformats:5
-	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	app-arch/libarchive:=
-	app-arch/unrar
-	devil? ( media-libs/devil )
-	exif? ( media-gfx/exiv2:= )
-	freeimage? ( media-libs/freeimage )
-	graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
-	pdf? ( app-text/poppler[qt5] )
-	raw? ( media-libs/libraw:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEVIL=$(usex devil)
-		-DEXIV2=$(usex exif)
-		-DFREEIMAGE=$(usex freeimage)
-		-DGM=$(usex graphicsmagick)
-		-DPOPPLER=$(usex pdf)
-		-DRAW=$(usex raw)
-	)
-	cmake-utils_src_configure
-}
-
-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/pixie/Manifest b/media-gfx/pixie/Manifest
index 606b298640fa..38798945b38b 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -3,5 +3,6 @@ AUX pixie-2.2.6-autotools.patch 680 BLAKE2B a4cb4e3e4db1e5c2cb8f83c42761fd2069a5
 AUX pixie-2.2.6-zlib-1.2.5.2.patch 2064 BLAKE2B ab891b633ff3c8d964e3bd73e32d46cb008f06d88bd8358cecfcee961a0a84f22f497b48ecdd8dc77219e7ec61555137b58082c4c359a4e30b82ae17b5e35b9b SHA512 f0cc7956117dc09cae574d5042a897c0f5ef9b26040c75d4c7b2ceef317c89431cceb7d32f61b5b5151efdc043e8968ac9129e1d1d6a7ac9720f9056e6db05d3
 DIST Pixie-src-2.2.6.tgz 9993504 BLAKE2B 59e04cd2294f1a0e8c841fd5c652fff184acf237dcf005207cd7f3d38195cc15b3246ae4ae8250dd245d7a4f7db65722ad8747798ae9c27c40c9411510016cfe SHA512 9b5256f5028d6091da293557e5385e53d8bdb2b3bfc7a89228b436b75424d7bd400d04e95cc04b71526aff026085f2bc2bd49e1ac0c54d3055f827fd5d05cc95
 DIST pixie-2.2.6-gcc6.patch.gz 16661 BLAKE2B 5d6f785e45f046fb9ff7ebbc9de18ccabd5ac566def3c48cc508aaec4387133aecdb48ba5d4b9eba93743c068a9d12a79ef4e13d3d23e2666bdca494ef979d32 SHA512 2cada11c95df1dde44119b97b44ab8550608427a2351540117655055d98a5ca142bc1fc78e8fc5ab25b8bb33385a7914114796a88cf83a232480e5b84bec57fb
-EBUILD pixie-2.2.6-r1.ebuild 2872 BLAKE2B 1852b7875d91ad5a14358913fa55a16b6388653ba98ce6ac05ab6f366e6eb1e276b1d0976bf90fb0856fb53eb69bc01361fd128deca71bb7f5554c2f20355208 SHA512 a7498b2c86f34763d8905bfc79866b1aac48d16314cc3ea94dea72edbedc0c277c65305da8cfe960dadede701a477e1eadb9487d335c44707413b3d39c6fb48d
+EBUILD pixie-2.2.6-r1.ebuild 2896 BLAKE2B 2fd66808d3df415b6a91c1a00c4b7d75e3143f4f973fb6921a03bc3bb2b2985505b1cdccdf66fccdfecd48d1348eba35f4598c0d7208a2706bf190d700b4d2f4 SHA512 ecf1d7b3eed32bae79bfa88c63f5df5adb4da9eb7d697a920cdf10b4e167e7b8b894859e0c705150663cc8183004d6fb9ba0daadbc3bda8ef9b94401f3f6bda9
+EBUILD pixie-2.2.6-r2.ebuild 2785 BLAKE2B b0033e953b2f98fecdb546f79ecbc31345948e1aac6e24668487ebeba021fcfd9e95e6a08f60f28209d977fa2638f02b9c3e5580ba89e769befffa86235da917 SHA512 fca68562e0be29a013769e91d271e19fc9efb32c8447bcff016cb3bc4f142ff972a20c4cfabffbd8718d103b7c1c2a4f2f76cf61a7ed348678bfe1a4e91f1878
 MISC metadata.xml 544 BLAKE2B dc06ba2d4e26190f38a162a227970bf47c87320a17ef4cad43e8349311441dcc8852e14d34ab9ae2bc3b9caa35bf84f04a42b10a1621d1b82c7966e7d7473e8f SHA512 961588ff38565e8a709b30f704d099676d73f0d1cbe5b266cc26542d511648a740ca430ef845b290c4ad0bc2ffdbe15706534b1f6421d975e66eedf6b6853c89
diff --git a/media-gfx/pixie/pixie-2.2.6-r1.ebuild b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
index 5a71b52b4754..f8863d0b8183 100644
--- a/media-gfx/pixie/pixie-2.2.6-r1.ebuild
+++ b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -11,10 +11,10 @@ MY_PN="Pixie"
 S="${WORKDIR}/${MY_PN}"
 
 DESCRIPTION="RenderMan like photorealistic renderer"
-HOMEPAGE="http://pixie.sourceforge.net/"
+HOMEPAGE="http://www.okanarikan.com/project/2005/05/24/Pixie.html"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz https://dev.gentoo.org/~dilfridge/distfiles/pixie-2.2.6-gcc6.patch.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 IUSE="X static-libs"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
diff --git a/media-gfx/pixie/pixie-2.2.6-r2.ebuild b/media-gfx/pixie/pixie-2.2.6-r2.ebuild
new file mode 100644
index 000000000000..c0fd04d6ab9b
--- /dev/null
+++ b/media-gfx/pixie/pixie-2.2.6-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="1.10"
+
+inherit autotools
+
+MY_PN="Pixie"
+S="${WORKDIR}/${MY_PN}"
+
+DESCRIPTION="RenderMan like photorealistic renderer"
+HOMEPAGE="http://www.okanarikan.com/project/2005/05/24/Pixie.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz https://dev.gentoo.org/~dilfridge/distfiles/pixie-2.2.6-gcc6.patch.gz"
+
+LICENSE="GPL-2+"
+IUSE="X static-libs"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="media-libs/libpng
+	media-libs/tiff
+	media-libs/openexr
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/fltk:1[opengl]
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libxcb
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}-zlib-1.2.5.2.patch
+	# FIX: missing @includedir@
+	# https://sf.net/tracker/?func=detail&aid=2923415&group_id=59462&atid=491094
+	eapply "${FILESDIR}"/${P}-autotools.patch
+	# bug 594354
+	eapply "${WORKDIR}"/${P}-gcc6.patch
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+
+	# FIX: removing pre-compiled shaders
+	# shaders must be removed before of their compilation or make
+	# parallelism can break the regeneration process, with resulting
+	# missing shaders.
+	rm "${S}"/shaders/*.sdr || die
+
+	# FIX: flex does not translate variable name in custom YY_DECL
+	sed -i -e '/define YY_DECL/ s/yylval/riblval/' src/ri/rib.l || die
+}
+
+src_configure() {
+	# NOTE: the option program-transform-name is used to avoid binary name
+	# conflict with package: mail-client/nmh (see #295996)
+	econf \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--includedir=/usr/include/pixie \
+		--libdir=/usr/$(get_libdir)/pixie \
+		--with-docdir=/usr/share/doc/${PF}/html \
+		--with-shaderdir=/usr/share/Pixie/shaders \
+		--with-ribdir=/usr/share/Pixie/ribs \
+		--with-texturedir=/usr/share/Pixie/textures \
+		--with-displaysdir=/usr/$(get_libdir)/pixie/displays \
+		--with-modulesdir=/usr/$(get_libdir)/pixie/modules \
+		--enable-openexr-threads \
+		--disable-static-fltk \
+		--mandir=/usr/share/man \
+		--bindir=/usr/bin \
+		--program-transform-name="s/show/pixie-show/"
+}
+
+src_compile() {
+	default
+
+	# regenerating Pixie shaders - see upstream bug report:
+	# https://sf.net/tracker/?func=detail&aid=2923407&group_id=59462&atid=491094
+	einfo "Re-building Pixie Shaders for v${PV} format"
+	emake -f "${FILESDIR}/Makefile.shaders" -C "${S}/shaders"
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/Pixie/textures
+	doins "${S}"/textures/*
+
+	# remove useless .la files
+	find "${D}" -name '*.la' -delete || die "removal of libtool archive files failed"
+}
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index e261ae891b32..6dfc53d43ffd 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,8 +1,4 @@
 AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
-DIST pngquant-2.11.4-src.tar.gz 142149 BLAKE2B eccf0c7a279d62981cfdf44ab0e378b2331377cd892019161b453edc7ffe73616a2aa83a07cf5f8d7292a0f96bf25612c23129348463cac73647021eae44f160 SHA512 171949977e1fd71c05bd75552f2e62535f6c15f31c3192cbe31df7451091634a6fbbfd08b47dd040f353af3b5f41fcc13db4421a212ca07cc6836f029635ddd0
-DIST pngquant-2.11.7-src.tar.gz 141959 BLAKE2B 00e36a818a2150aeb3c927daeb8621bafa41497a6fe32afe30e41ad04d788946390f382139aea9878f58fc7a84fdbaf597681c9d8769e0e23b785a10d2e0233c SHA512 5325577dcb16acf5dff81a5f3bcf8cfa2a12df07a7c2308ebb9a343b74e56ea21184ed3f87819122c8bb97b4a7ffd3b61046c60f7f339da9a93e76dfa17ebee6
 DIST pngquant-2.12.2-src.tar.gz 143404 BLAKE2B b06b1185fdeb1990e6b6f0cb77e33051729731fc2c2f4b1f618bd9077057354eabc21405872c938dbdf5395040860b4a884e9780bbd439da36f2af61d53e82a9 SHA512 ed82e0a57d9f4f3ee40258c4cbbf7ed086177dee1e2afdcb7d308f779c83fb2be9c7226c0713b9c72e6b6c22161dbaca3d14f2bdc2f0468daa608be80e9ef1c9
-EBUILD pngquant-2.11.4.ebuild 1003 BLAKE2B 6e56ca1685dbbd7bf9f5e6d45a02770e59b392ffb1494e819d74afd59e54b05532ab2925fab620a19bee90291e66e8cca9ab22ccb4b6a1d81f16e29330e1f5f3 SHA512 c7540c0565652abf15efaeef55b929577265e30df9759b00d53bff81002cbbcc42bc9b27873ab76b9869d776e6ff53ef75b53729c60d3e5399141cbc44d93507
-EBUILD pngquant-2.11.7.ebuild 1003 BLAKE2B 6e56ca1685dbbd7bf9f5e6d45a02770e59b392ffb1494e819d74afd59e54b05532ab2925fab620a19bee90291e66e8cca9ab22ccb4b6a1d81f16e29330e1f5f3 SHA512 c7540c0565652abf15efaeef55b929577265e30df9759b00d53bff81002cbbcc42bc9b27873ab76b9869d776e6ff53ef75b53729c60d3e5399141cbc44d93507
 EBUILD pngquant-2.12.2.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/pngquant/pngquant-2.11.4.ebuild b/media-gfx/pngquant/pngquant-2.11.4.ebuild
deleted file mode 100644
index 5497e70ac515..000000000000
--- a/media-gfx/pngquant/pngquant-2.11.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="https://pngquant.org/"
-SRC_URI="https://pngquant.org/${P}-src.tar.gz"
-
-LICENSE="GPL-3 HPND rwpng"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug lcms openmp cpu_flags_x86_sse2"
-
-RDEPEND="media-libs/libpng:0=
-	media-gfx/libimagequant:=
-	sys-libs/zlib:=
-	lcms? ( media-libs/lcms:2 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-libimagequant \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use openmp && tc-has-openmp && echo --with-openmp) \
-		$(use_with lcms lcms2) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc CHANGELOG README.md
-}
diff --git a/media-gfx/pngquant/pngquant-2.11.7.ebuild b/media-gfx/pngquant/pngquant-2.11.7.ebuild
deleted file mode 100644
index 5497e70ac515..000000000000
--- a/media-gfx/pngquant/pngquant-2.11.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="https://pngquant.org/"
-SRC_URI="https://pngquant.org/${P}-src.tar.gz"
-
-LICENSE="GPL-3 HPND rwpng"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug lcms openmp cpu_flags_x86_sse2"
-
-RDEPEND="media-libs/libpng:0=
-	media-gfx/libimagequant:=
-	sys-libs/zlib:=
-	lcms? ( media-libs/lcms:2 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-libimagequant \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use openmp && tc-has-openmp && echo --with-openmp) \
-		$(use_with lcms lcms2) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc CHANGELOG README.md
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index c525043e5709..c57999f69e6f 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -11,5 +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-r3.ebuild 8160 BLAKE2B a88fe394c4c248c5cdac9072d740b707e0d240935b4098f0b50a0c477339ed86a11cac07559b02cb635b655d6919f0cc5e17a7717ac4fe810a320bb988e62fd6 SHA512 28db81c16ece23a86711fa12913ccaf2a2f6ca2e384b3581ac86c236d3e1735bf1468ab9b5c337bb1b2d4105118b62611494c0b07d698a607d2b7fc9cd4e3779
+EBUILD sane-backends-1.0.27-r3.ebuild 8159 BLAKE2B 191353b0d1eb7773c79826595133799321c395377c382ee0cb82d43e951a5cadea5e59d109acfeeda7085a7d1bfc3871a2ce781492c438e803b313780fd061ce SHA512 acf8db419eafab5b27481ae148117325907f4ba5855b9f51790c979a55dda7c27fe4e4090cf8fd1ba224f55b1a54bbc8e532befa3acee53a8c5ee41f39d9d37d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index adbe847d22ea..0b6bfaf0ec24 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -122,7 +122,7 @@ 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"
+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}] )
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index d90bd1b56b8e..4f6d063a2a81 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,7 +1,7 @@
 DIST shotwell-0.28.3.tar.xz 5531900 BLAKE2B b585989434e3da9b2d5f43aabf41451e33b7b2f537a21305ff9decd9992d42e5422971d1f89836936630f641efdac1242dc21574d86f61a4c71562b657e0300d SHA512 9a0c15bfe856dabaa85038fe875cc178be6a3e104397b36555005615212ac92579234fc6277f1a4a7bddba517e9ea0db5ed06e0fc30614453e3db1153b47dc16
-DIST shotwell-0.29.2.tar.xz 2321576 BLAKE2B 2dd3c959ca8aba6ecb7c3c15ca491291a2c6ead860fac9c1fb1b97ad22140ce9e67617dd268b2d4d362bb8a0c2606d97b5cc71c12e19fcb59fec0185f27c3f0f SHA512 98c57d511a384ced717e2fb410af16326080e2291fce77ea953a377430459c7a81de73118925b2d42bf96b8b717efc93a898d0d859fbab1364c0c192dbb60311
-DIST shotwell-0.29.3.tar.xz 2416332 BLAKE2B 8f95e3e1b71eb20b10571b5689e9817112935c4d31c8b7800157f7771df04adb4559acc9885ec43032a7619ffefb8899fd90a7740798de4a150c4c78033e890c SHA512 f600db86adf5caece4ed4c8a3ca4309540f9eeb1caded8e3f062fd56fa54f2030568c8168fc662fcf80c9905e9b735d52a2578bc2401faf28876a6f5aed01121
-EBUILD shotwell-0.28.3.ebuild 1485 BLAKE2B 248f0309213445e4ba17c9d8e401fdc3a063c8e2f2df7c2f028d89d772ca668aac0e70986d80053cc879061dec21df87b3da941d08cf153ca802a914b01b3b31 SHA512 8273d6ece7dca82443499d7881f4f790baf2c80c2fe252d83e0eadee288afc9810b833486b9743670e1768141eb3e077798fee744b1a1a60a07227db9bd39d00
-EBUILD shotwell-0.29.2.ebuild 738 BLAKE2B 33f7584f897f980cc14a6823150cf9a2228bebd78d62b953ef3d757b11a37d348287a4f7776cd25c0c6db8450f5b5e6254c22a185afbe5baf01cbf1a915dcc7b SHA512 847163fa58acdb6eb326082e4c21d712c9e908d549330e7913205f3ea37b18049b46b6ac0cc1daa549e36d5487b1f65429ee0c544aa8ac3b1e8c834521d5dccb
-EBUILD shotwell-0.29.3.ebuild 738 BLAKE2B 33f7584f897f980cc14a6823150cf9a2228bebd78d62b953ef3d757b11a37d348287a4f7776cd25c0c6db8450f5b5e6254c22a185afbe5baf01cbf1a915dcc7b SHA512 847163fa58acdb6eb326082e4c21d712c9e908d549330e7913205f3ea37b18049b46b6ac0cc1daa549e36d5487b1f65429ee0c544aa8ac3b1e8c834521d5dccb
-MISC metadata.xml 789 BLAKE2B ea120210a69912ba02fc9e2d52b4d415254504427a38f572f23d5dca0df8d679b62218428fe588ff429ab74727d017f5a9bc709b400b357c0508e7624ae2d1a2 SHA512 ad52dde0111094d2ccccc8a9d2eebe2d03bab4735903acba5d74dc7cbdf1923a8cc51a299b44189c4c33a206eac34c8e186a954747f9bd3520a64c7080c83330
+DIST shotwell-0.28.4.tar.xz 5529712 BLAKE2B a8ee8243cf1a800fd1c1a91ade81decf9187aa6ce3b5040977dd45ae64245883691674ca2aa8d09df164e84dcc7f3e632dfc206b2f0eaecd18a171f0c170846d SHA512 b80014ec2c5ddfa35c0eea59daaf41fb8e8fac76482f18581de4c91b766f55d1b05e1925088152705ce3eb4ca228e5401ba80ebd2a6232d65b61cdb2c843267b
+DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36
+EBUILD shotwell-0.28.3.ebuild 1432 BLAKE2B 2bd4e420c1dfe788e5df463bf4caff3aa419c808db085f8213a1f66d4050a093c7ecb37337ecee770f91e4b0f7f895e08f54a480b2b51a2de8ded06bd60b04bb SHA512 53212e5aa3d691c8a8fb5ee50a3e3b1bcc17c78f340b9f2d6d8c2e6811fc6587309004c196a63a00d789652fc2329231b24f8d69263d041ce6ac6affcd513c39
+EBUILD shotwell-0.28.4.ebuild 1434 BLAKE2B d88d9a0be4f4e01c152755155afe28ea862101b2f10e7bc053cc8d6c67ddf77f7aaf2143eb3cbd22ac85d1fa82f88d8167054be81f40bf2ba3a82bc4f6d80aab SHA512 f0050d5cb6c3757aaee2d1b39d252d4c6f6f317a8824314aba12479dfa3f379df51d637924fce617e3ae391d6b98324eb96674c3d492ae2979390cb641dd1a04
+EBUILD shotwell-0.30.2.ebuild 1784 BLAKE2B 3041ee251f26919a4cea223771eabc24f44846b4746d697cae976b06218274ce57a3c6debe0336bdcbca09185ec01a155454b8e2820b45f53aa051ebd7712f2b SHA512 38379de15d76e00f42530903beabf18067bed88d2eb7c065ed05458fc6333ac62fee2c6b19b52d666745fdd3872d49aa7693cd0c186a72aed85a6273041b4667
+MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index 905269f2b26d..3e46be14231f 100644
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -13,10 +13,13 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Project</name>
 	</maintainer>
+	<use>
+		<flag name="opencv">Enable face detection via <pkg>media-libs/opencv</pkg></flag>
+	</use>
 	<longdescription lang="en">
-		Shotwell is a digital photo organizer designed for the GNOME desktop
-		environment. It allows you to import photos from disk or camera, organize
-		them in various ways, view them in full-window or fullscreen mode, and
-		export them to share with others.
+		Shotwell is a digital photo manager designed for the GNOME desktop
+		environment.  It allows you to import photos from disk or camera,
+		organize them by keywords and events, view them in full-window or fullscreen
+		mode, and share them with others via social networking and more.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/shotwell/shotwell-0.28.3.ebuild b/media-gfx/shotwell/shotwell-0.28.3.ebuild
index 1d1f9124eb96..b7049d635548 100644
--- a/media-gfx/shotwell/shotwell-0.28.3.ebuild
+++ b/media-gfx/shotwell/shotwell-0.28.3.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.28"
 
-inherit gnome2 multilib toolchain-funcs vala versionator
+inherit gnome2 multilib toolchain-funcs vala
 
-MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="Open source photo manager for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
diff --git a/media-gfx/shotwell/shotwell-0.28.4.ebuild b/media-gfx/shotwell/shotwell-0.28.4.ebuild
new file mode 100644
index 000000000000..e6ea4f5ab99e
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.28.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 multilib toolchain-funcs vala
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gcr-3[gtk]
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.8.5:0.8
+	>=dev-libs/libxml2-2.6.32:2
+	gnome-base/dconf
+	>=media-libs/gexiv2-0.10.4
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16:=
+	>=media-libs/libgphoto2-2.5:=
+	>=media-libs/libraw-0.13.2:=
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	>=net-libs/libsoup-2.42.0:2.4
+	net-libs/webkit-gtk:4
+	virtual/libgudev:=[introspection]
+	>=x11-libs/gtk+-3.14.0:3[X]
+	dev-libs/libgdata
+
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	>=sys-devel/m4-1.4.13
+	virtual/pkgconfig
+"
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/media-gfx/shotwell/shotwell-0.29.2.ebuild b/media-gfx/shotwell/shotwell-0.29.2.ebuild
deleted file mode 100644
index fc06ece5175b..000000000000
--- a/media-gfx/shotwell/shotwell-0.29.2.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
-
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 meson vala
-
-DESCRIPTION="Shotwell is a photo manager for GNOME 3"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	app-crypt/gcr:=[gtk,vala]
-	dev-libs/libgdata:=[vala]
-	dev-libs/libgee:=
-	media-libs/gexiv2:=[introspection,vala]
-	media-libs/libexif:=
-	media-libs/libgphoto2:=
-	media-libs/libraw:=
-	net-libs/webkit-gtk:=
-	x11-libs/gtk+:=[X]
-"
-DEPEND="
-	${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-"
-
-src_prepare() {
-	vala_src_prepare
-	eapply_user
-}
diff --git a/media-gfx/shotwell/shotwell-0.29.3.ebuild b/media-gfx/shotwell/shotwell-0.29.3.ebuild
deleted file mode 100644
index fc06ece5175b..000000000000
--- a/media-gfx/shotwell/shotwell-0.29.3.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
-
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 meson vala
-
-DESCRIPTION="Shotwell is a photo manager for GNOME 3"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	app-crypt/gcr:=[gtk,vala]
-	dev-libs/libgdata:=[vala]
-	dev-libs/libgee:=
-	media-libs/gexiv2:=[introspection,vala]
-	media-libs/libexif:=
-	media-libs/libgphoto2:=
-	media-libs/libraw:=
-	net-libs/webkit-gtk:=
-	x11-libs/gtk+:=[X]
-"
-DEPEND="
-	${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-"
-
-src_prepare() {
-	vala_src_prepare
-	eapply_user
-}
diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.2.ebuild
new file mode 100644
index 000000000000..167dc43d928a
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.30.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="opencv udev"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8
+	>=net-libs/webkit-gtk-2.4:4
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=virtual/libgudev-145:= )
+	>=media-libs/gexiv2-0.10.4
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16:=
+	dev-libs/libgdata
+	>=app-crypt/gcr-3:=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-2.3.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:2.4[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity-support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		-Dextra-plugins=true
+		#trace
+		#measure
+		-Ddupe-detection=true
+		$(meson_use udev)
+		-Dinstall-apport-hook=false
+		$(meson_use opencv face-detection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 8573c867abfe..71468979e26a 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,11 +1,9 @@
 AUX slic3r-1.1.7-adjust_var_path.patch 274 BLAKE2B 7f360a202f1bcbeb42619ed7293a5997ebc47ab754fc2fed0c88bbf514bf32b6c72f7c64e9c86efef90d8aec93a72662da599af910c14f6186e0f3cc5b1e9482 SHA512 c13cf1a6f37aa13a9b85093e75de0d2368b4ca4623b28be17e7cfef5740b2b4f4cee69492c099bf936e4ee553e37389b8ffa9ea0df804a80a1cb6295cd198653
-AUX slic3r-1.2.9-adjust_var_path.patch 293 BLAKE2B e16ca1eb4c7037adc704250e090cee3be3bddf0b4e7f4cb24a1d3d6769239904bc7fcf1cc34dd521424a3555f02732253578c05f2b343570c202eec58bc5a519 SHA512 5a1ddca0380964c2bce9ba83dd9654671636433d0719cb54851e2ff521bd08c886f317073a1db5c145f8b3689248781cc1dc734c2071e6f6319be21845ed8a9d
-AUX slic3r-1.2.9-c++11.patch 1102 BLAKE2B 3cb6c1ab196a73da820190e2f00f65654a1e3ac22926a6de94f64bb23d8d31df73f4a4cbff1e757602b018d4e3a430ddd1f43f0f33d13a5814dff601d9ea4538 SHA512 e5fa8ba0ce1ccbf5da34559c1e4d6d2db3c71acff69129125aef68e785285649a2e9b6c66779caffd2fe400859e878178afbd3f1884a28d9bdbee3b66d86311c
 AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
-EBUILD slic3r-1.1.7.ebuild 2909 BLAKE2B e27ded00dbfe3869bd08b5a7d969f78d23c96c34611e50997a57f9331a0b142de3e984e5a15eea219414b39c97fcd99633014bce2df072117ea334db2d41a868 SHA512 03a2ffd9a3290b582da0feb1eaff5445ec1baa991faa5dde9899f68d557bd234c2f20cca24a5660093e0695ef5ca47ed76059688da48d2561b92b45d17ece834
-EBUILD slic3r-1.3.0-r1.ebuild 2818 BLAKE2B 7c80a347937b464e5234f2823d927247c3faf577c558e6f8eae79d2e082394419f23904576e58380a43f4eb50c5f76ad29a3fbf691dc6cb18b4fdbf81c2f1c00 SHA512 e57b93f76eedfd4df9e4b7a00b81dd84fca6e31f1cc95abcaa75d970b47dfd2ec4f98a50419349a549a5a8044cde3a504f449446265107e2a681af0ccea6f4a6
-EBUILD slic3r-9999.ebuild 2621 BLAKE2B ac3c5a2f2790214a68522edae4b4e93958bd866bc236c0435ca535733a209ee05b96cee6ba1a470420ca1a9a3f66454c09b38eeb0e44d683a38977b797853626 SHA512 bfff6a690433fdd85398d841c738578e44569eb58df43b602502c062419a77b3786288944414b3114538cbc278ccb029fa074ce44e4f2fc919209052888dacdc
+EBUILD slic3r-1.1.7.ebuild 2907 BLAKE2B 6075bf46ffd1f42fd6246107aad4b7c9c50a9332429164bf4d42a158a34158b71ae7a9132007aa7dee9d005177b0e3d3444cf6bb76bf81d44f99b4d669293b5d SHA512 7ebf691df256f4718ec3fd7c30605d8b10bb5abfed45bade71555fd6fe852f353ab7ed9ca25ffeeeb81154a291adb77ec416dc3a19c3a3927ba89c826b6f8c1c
+EBUILD slic3r-1.3.0-r1.ebuild 2819 BLAKE2B f22e3c7215075c120ec06a4081f1cced916f5db0c13907f4a276a2183e63c3e1544dffd7328a848c2e5088888bc71ea3f5a1ed9449312fce7b1260796c70e351 SHA512 5b0ad5c2ead2510171024d4f86142ea5479783ff10bd731c8cc719651b146ffbf4764a352e35a382a0092521fffb59de81783ec15abbc7c7b4c0c99639ef569a
+EBUILD slic3r-9999.ebuild 2619 BLAKE2B 4a22cb0ff372284025eae2eee01deeb45921fc90b98e0ad591c034bdd642b70596f5bab4a884ea14559ee22508bf9454654eae4e0dfd093abc594420481fae57 SHA512 9c0c0542fc0d41b6ceded25190509148d8e98fe7acb097d6293791d63a11ab073990a5b9e5adf20ee3f097d33efb1dfcc5d2e713d70ed8c5d0218fb50a827e65
 MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch
deleted file mode 100644
index 9dc93a52dde3..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Slic3r.pm	2015-06-17 04:38:28.000000000 -0400
-+++ b/lib/Slic3r.pm	2015-06-19 11:56:07.005873299 -0400
-@@ -30,7 +30,7 @@
-     if $^V == v5.16;
- 
- use FindBin;
--our $var = decode_path($FindBin::Bin) . "/var";
-+our $var = decode_path($FindBin::RealBin) . "/var";
- 
- use Moo 1.003001;
- 
diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch b/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch
deleted file mode 100644
index f6b15d70a1ab..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/xs/src/libslic3r/Config.hpp	2015-06-17 04:38:28.000000000 -0400
-+++ b/xs/src/libslic3r/Config.hpp	2017-09-27 10:59:26.527103728 -0400
-@@ -65,7 +65,7 @@
-     
-     bool deserialize(std::string str) {
-         std::istringstream iss(str);
--        return iss >> this->value;
-+        return static_cast<bool>(iss >> this->value);
-     };
- };
- 
-@@ -124,7 +124,7 @@
-     
-     bool deserialize(std::string str) {
-         std::istringstream iss(str);
--        return iss >> this->value;
-+        return static_cast<bool>(iss >> this->value);
-     };
- };
- 
-@@ -249,7 +249,7 @@
-     bool deserialize(std::string str) {
-         // don't try to parse the trailing % since it's optional
-         std::istringstream iss(str);
--        return iss >> this->value;
-+        return static_cast<bool>(iss >> this->value);
-     };
- };
- 
-@@ -279,7 +279,7 @@
-     bool deserialize(std::string str) {
-         this->percent = str.find_first_of("%") != std::string::npos;
-         std::istringstream iss(str);
--        return iss >> this->value;
-+        return static_cast<bool>(iss >> this->value);
-     };
- };
- 
diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild
index a01849e78a09..6750210520c6 100644
--- a/media-gfx/slic3r/slic3r-1.1.7.ebuild
+++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="http://slic3r.org"
+HOMEPAGE="https://slic3r.org"
 SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3 CC-BY-3.0"
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
index a94b46f01a75..64cc0c14bc97 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils flag-o-matic perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="http://slic3r.org"
+HOMEPAGE="https://slic3r.org"
 SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3 CC-BY-3.0"
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index db80a647e0ed..7e99f7d16500 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils git-r3 perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="http://slic3r.org"
+HOMEPAGE="https://slic3r.org"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/alexrj/Slic3r.git"
 
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 225979e1fa03..cf5bce18379e 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -9,5 +9,5 @@ AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
 EBUILD xloadimage-4.1-r11.ebuild 2552 BLAKE2B 9ea8ec71be31f995f78aa0cd1801a9a47c9aacb3462f7397ed43b697021e0bced2f0a144082972daed3a10ac9589a65570506e0fa50fe2a64abe1663f3e31332 SHA512 03b9f7de5b6d51bde25176cbac7f82b37a13d73545916588b41469b1b158003663db5c534ad9fa0afde16773799634fe6f8527ab1335786d58d9daa604e7e2b9
-EBUILD xloadimage-4.1-r12.ebuild 2525 BLAKE2B 0e5c4b171361ec69f5d7c5c288896f1bc391a220de9f8f60e1211901edbb404781bb5cdaaae95fcd48cf40755d0637c150cebb10d9a70221079b5a394ee158b1 SHA512 26db57ef320f69379a5afebd673f267cd399d59339ab2774f297efe7d9d12586c449238a524a6850d0dae9dda5309cc73e5b76e3acff7b1d139bbed1f0fa041f
+EBUILD xloadimage-4.1-r12.ebuild 2519 BLAKE2B 80d64f282abb3c67a8b3e610dee00fe4ed383638cfe696c1ba876198477157509cc28b75b73dc84359450dde0c8f230f9314b98f9b9b1f30fe76c40fe6790f8b SHA512 8b7a85c4b19e5c16e68e221594bd99b70399bb19d9f313ec4385329a5f745ae780e25f8b316ddf521917a4b97867438e6269a52e33b7b1b20bb4b55905e2ebee
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 7e9f5a36e1e4..f609119f5784 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index b4dd4be4f3d6..9c6c68f0007e 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -7,7 +7,7 @@ AUX xpaint-2.9.9.4-submake.patch 747 BLAKE2B bbdce5e4ccbd6eb6b3957b9969261957d5e
 DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614
 DIST xpaint-2.9.10.2.tar.bz2 1245813 BLAKE2B 9ff1a94bdbaf996f7ca41fd8df86ccfc58d7f51b24b20311f082beb30620dc48a6e9ae0e28ccf2cf41a7cd7901cf303fda1d45a7b48ff4ec356a3ac1f2ccd642 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499
 DIST xpaint-2.9.10.3.tar.bz2 1283725 BLAKE2B 46e1798830ddff6cc7d6d827fad0cad6d42a61dd6e6740ae6d3bca70ae7012a7c63d1d3ea5b6ebb21e0b2889c96c3f0e57969ec02bb8e742f945027e0e22e3b8 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5
-EBUILD xpaint-2.10.2.ebuild 1512 BLAKE2B 2e1cb7f9db9f78b0be9015bda73a609e53991976af78418ffe8adc109acd006b9c878fe77a6c8ab55abf0480af262b1ba8f41df71ecb20862cf17df2f0d3561b SHA512 ff28572286161645306b977ee4ea84fa5c71677021cf42824d546443fbb2f615d6f93d297b7fe42bb870a0a2c2a4201ad61911724e593a88357c522ae3217a69
+EBUILD xpaint-2.10.2.ebuild 1510 BLAKE2B 84c90679da7f4d8f48a57ad494d6a9914f4fa47a97e3d18bfa4f71c13619c94018e49879371fe18f852c15faf1a75ae4c9228e93d97d7b3c3eac62748c443aaa SHA512 8f009d6bdea418b73a4295e8f66e8b255f6b1b221346ddfe86beb44675fc66954ca2b6fb232f5248e2eb20aa19e7c5bd80b2be25c8ca0c9f5e6f849d34adbeea
 EBUILD xpaint-2.9.10.2.ebuild 1635 BLAKE2B 8cb612fe6cff41992106335bc2bb9bc15def648837f2d174c4c05244e672146a386b4402bdc6d4dfef9ea89a687b3a7de4b5b16c84b0537a1f86b6cdf5754be5 SHA512 63a3808cc6fba26a962f821d140aff7d756be1aa72211d29a2dc65e05dd841640b6a8b81fa6d3dedfff9a27d40936278d8d947052e82b30ef945eb41c62c066f
 EBUILD xpaint-2.9.10.3.ebuild 1700 BLAKE2B 0b7a8b5734e158d365bcef7ecc0cf31bf03945af5e448b9811890af4127b2f63f827a1055742ea12a01676909dcf9269b0d62b8a836acf6c2303bd53f9db2687 SHA512 767027b82623caaf63f312f534b6636dbe277b6ce9ce18ff119eabd6ebe0074ea59e4502afde67f69cbc76b3ff2972e96124537eaf5fddc0787b4d78e7897adc
 MISC metadata.xml 1204 BLAKE2B 3cd1cf2062126075b6b4be1b987ab9098ae31b611abe6e81c15e684e62ed0a1133177c4718e5bc51d5be2a0b5b2b58fb4d4a2d67ea77f21ca6d9009f2a4d4150 SHA512 e2b37b1d3381dd97ecdd40f20535426539d7caff8032ffcb5e6b74d65968adb7319523a55e45d31a697a75b9aa384e0a5155059237730ea080cf46532da12c22
diff --git a/media-gfx/xpaint/xpaint-2.10.2.ebuild b/media-gfx/xpaint/xpaint-2.10.2.ebuild
index 359c779f707e..a49d1d20aec4 100644
--- a/media-gfx/xpaint/xpaint-2.10.2.ebuild
+++ b/media-gfx/xpaint/xpaint-2.10.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="jpeg2k pgf tiff"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /media-gfx
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)