gentoo resync : 03.03.2019

45 files changed, 326 insertions, 524 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a807b4ecee08..78c71ee6eecc 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 2fb920dcc2b1..e8e067a3b9c2 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -14,5 +14,5 @@ DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947
 EBUILD blender-2.72b-r4.ebuild 8106 BLAKE2B 32e220cf9afc0219a0b5d4adf14f540f381ac37d64b71be671f6edeb48f6bbf22aa62604fdb229aaa8b115d5a12b907f289e4fe458279eb2d7bbef623858d667 SHA512 068fad5bfd2fe25a5846e00f1a456ceb0e1e828549e537a3cb967cc062639ce6d179b3501504623c5a881ae662c4bba62275a70e148c2f2018eedd17948e4e21
 EBUILD blender-2.79-r1.ebuild 8100 BLAKE2B 7c077c8d3847fa0d7b881b5f5989e42339574b7104bc78869c8e481073b1e6ca062e5a74233f0b96b9ff6b1390f1cc0f203038e733223ddf21b796e696ba508b SHA512 9af0b9f17969a6601c3945fbe3d3d10dc6707df0c88e86e1c2f1617e9b750019a21d05cecab5e726069b9908ba6345d2e190732d3960bbb87674d1f983e311ee
 EBUILD blender-2.79.ebuild 8049 BLAKE2B b4effa99e23ee172e685dff46235c88aecf129a40ab4e01a7b8dd0fb4993e52849c5ebbc712ff63999176644ea9027e572b1f21f4838d31845a525d09d396bbd SHA512 7b660679c69df11a108e58e76cc2e950843bf0285e962cf1f776b3cabf8e7b187ab65984ff6e4bd85120347489d10853ab163d916a4f1c833d890112dd2692c6
-EBUILD blender-2.79b-r1.ebuild 8165 BLAKE2B 8dba69527cd1800c587afd1f5f3369d86eec60ca83a7631df3868ccd17eb42effef1f486a30e8ab772e1baab3cd26f8317bc6c521879fe9cb187525d8894fa3b SHA512 945aceb3481a451ac5ffa54ce8f08605c7d33c34e7de97d5bab0a90d7bfb63d55f739282ced5fa512fd69232c01df9245ab75f5ae5f1d1365b38bb463c30a9a1
+EBUILD blender-2.79b-r1.ebuild 8163 BLAKE2B cfa1181a4044655d55606a1ab20105aa41b629671e6c6ae7ab501f7de199a4369b07a100a33ff9a0caa33869e57ceadeb5ec0976aa32e7f0fb336efa2b8de4b3 SHA512 705967cd0c67a2185f17fb335320dfc5b69c605c6e6615a1b84aa7073a3bf9c34adbf0b43d90707e54bba1219b5472eb320aa22f6897afa1a9ac0b6fcb1860eb
 MISC metadata.xml 3466 BLAKE2B e09a22c7fe5200a7b592c3fda2bdb4ae719ebe614f85d8cb8e9c4c72684fe785575e6b6b4f0e302b1e9beddc7476125e2e443943ff018d35d37f015c1b6414d8 SHA512 0112674420ffeb427dd2ad1cda3ad3e01801e02fa2bbb5dcaec15db21b4582cfff4712d5e587ab875619e94dacab4fa0263d9f635c48e5c94569bc6155577523
diff --git a/media-gfx/blender/blender-2.79b-r1.ebuild b/media-gfx/blender/blender-2.79b-r1.ebuild
index 1b9da6f82314..9add67424fe1 100644
--- a/media-gfx/blender/blender-2.79b-r1.ebuild
+++ b/media-gfx/blender/blender-2.79b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,9 +9,9 @@ inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
 	pax-utils python-single-r1 toolchain-funcs eapi7-ver
 
 DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
+HOMEPAGE="https://www.blender.org"
 
-SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+SRC_URI="https://download.blender.org/source/${P}.tar.gz"
 
 # Blender can have letters in the version string,
 # so strip off the letter if it exists.
@@ -19,7 +19,7 @@ MY_PV="$(ver_cut 1-2)"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \
 	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
 	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index e80923f09a22..0e86c39fba6e 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -9,6 +9,6 @@ DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f450
 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
 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 3812 BLAKE2B 1385ece8bd15d05c952d35d3d66745ab48eb112c8a5d06c76d54e68af0982ee1a1a60140f9dc8c408c376d0943ca9f42dc0fe78512af3df0da69f75ada994555 SHA512 a973df309f430724d8dfa81ef372d7d19ad963ca442fe343b8e758c6704bcb49aedb4b5908ba0876359b31175941939cdad0f01132d278402e246762bdd0ef77
-EBUILD darktable-9999.ebuild 3212 BLAKE2B 091af0fd15369c39bee3d1cf075f552ecb5f048a2db4f620438a2a9f57ef0939e4e2e17eb6ea3ac4e174d28b2bc11c23358843a1dcd682d273c33ac3a11a5f62 SHA512 92d9be516d34c3b40f55186b58bbedcb94b020806e71ea2e3c1f68f275dc0e06b2aa42d3d3968e8fd0273e9718f1be336a62bfa3cc8ec460459d2aa81f62f145
+EBUILD darktable-2.6.0.ebuild 3731 BLAKE2B 6afcf3c29ad6876d7d9c20ae7f124d789e51f3325f14d6d1084e141b98b7bb6e259c38c066236255ef1ec10257ea12379bc91d9c6b80c43d0049c1b8c33e3387 SHA512 0e06808fd7d8689d12ac3f91d7cbbcb411d5015cbfa70ce98458332a747bfda199ec662dd0ff3074a9fa889a4a124ae4e3f13f1563a8e82b2cc3faa78683c843
+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.0.ebuild b/media-gfx/darktable/darktable-2.6.0.ebuild
index 741a54b7187c..0a6833989c25 100644
--- a/media-gfx/darktable/darktable-2.6.0.ebuild
+++ b/media-gfx/darktable/darktable-2.6.0.ebuild
@@ -23,9 +23,6 @@ IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto
 nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
 BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index dce04128d375..891596c86e8f 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -19,9 +19,6 @@ IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto
 nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
 BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index a8d9e59a2abc..eb95669a91ab 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,4 @@
 AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a
-DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
 DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
-EBUILD digikam-5.9.0.ebuild 4758 BLAKE2B 89cb7574f20f3cd08697386b6a0cc25a6bec270062a23d68afe1148c631980f8fe9cde76d5ebf9fc129eafba06dc96c25d92614e3422abc5140d7a0f2364f576 SHA512 f758f3dfb93c15721d27cb6242779a358dbe86b976d84fb5fe7796c959d757dfc9efedecfb344df17eaf0869d5fbab1169d1bcf34cf45c68e8422caf48ccaa6c
 EBUILD digikam-6.0.0.ebuild 3951 BLAKE2B b7bcf74012b240e5864298c82e18e5f1d3a52f0df16c90896b9d2ba295e396f757f10e3c4a14dd8359086acfde797013d68bcfae57f4105de933d16790d0fd24 SHA512 50c11d1925a65f4d9c307bc1a32fb615176b7c14dd4ec3b30b4080b30f93845b732f725cae2a6fc188ea43982396a44acaf6e4fc64c1f47b95a4070f39ef8913
-MISC metadata.xml 1166 BLAKE2B 0844b599bbb92d64c88ed1d4d32ffec17f71912d8736e8f6cd5829a662be59886f52ae57c3de2eb3c36c3de252d6ff9868dddff30d212f7ae7cef36775c46ec0 SHA512 41741282ed42fa5bb9ff644d0dc3cf021daaf4904d8811fe5f3e37e909432e86c489f0c1843b547f70790acdbc74163de133f078722f8c33fffd389d870d4367
+MISC metadata.xml 1082 BLAKE2B b1bfefa49e333b9975e06c5cda58c787914aa8811a693f5132f1defa59ceaf6301dc931b5b6f7370a0dc1eef3692672ae96665aab6823a5b88f75c3d4efad368 SHA512 cd6bd240321db65a0800cc392f99929cd82fdd6c277422a3793fd242a9e0df9284ea16c9c68714e92066856f9a6eb0d53d1685cce22fe9f65b77cf2036f61254
diff --git a/media-gfx/digikam/digikam-5.9.0.ebuild b/media-gfx/digikam/digikam-5.9.0.ebuild
deleted file mode 100644
index 75e3928b82c8..000000000000
--- a/media-gfx/digikam/digikam-5.9.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KDE_HANDBOOK="true"
-	KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-KDE_APPS_MINIMAL="17.12.0"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="amd64 x86"
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_BRANCH=stable
-	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}/core"
-fi
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'mysql?')
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/expat
-	>=media-gfx/exiv2-0.26:=
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	media-libs/opencv:=[-qt4(-)]
-	|| ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 )
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		$(add_kdeapps_dep akonadi-contacts)
-		$(add_kdeapps_dep kcontacts)
-	)
-	calendar? ( $(add_kdeapps_dep kcalcore) )
-	gphoto2? ( media-libs/libgphoto2:= )
-	jpeg2k? ( media-libs/jasper:= )
-	kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_kdeapps_dep marble)
-		$(add_qt_dep qtconcurrent)
-		$(add_qt_dep qtnetwork)
-	)
-	mediaplayer? ( media-libs/qtav[opengl] )
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/opengl
-	)
-	panorama? ( $(add_frameworks_dep threadweaver) )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost[threads]
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/kipi-plugins:5
-	mysql? ( virtual/mysql[server] )
-	panorama? ( media-gfx/hugin )
-	!media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		# prepare the translations
-		mv "${WORKDIR}/${MY_P}/po" po || die
-		find po -name "*.po" -and -not -name "digikam.po" -delete || die
-		echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
-		echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-		echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-		if use handbook; then
-			# subdirs need to be preserved b/c relative paths...
-			# doc-translated is, in fact, broken, and ignored
-			mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
-			echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
-			echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
-		fi
-	fi
-
-	if ! use marble; then
-		punt_bogus_dep Qt5 Network
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_APPSTYLES=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
-		$(cmake-utils_use_find_package calendar KF5CalendarCore)
-		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		$(cmake-utils_use_find_package jpeg2k Jasper)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package lensfun LensFun)
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package mediaplayer QtAV)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package openmp OpenMP)
-		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 7b233c2b9fee..fe15e413c171 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -10,7 +10,6 @@
 	</maintainer>
 	<use>
 		<flag name="addressbook">Enable akonadi contact integration</flag>
-		<flag name="kipi">Enable support for <pkg>media-plugins/kipi-plugins</pkg></flag>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
 		<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag>
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 461014fe98fe..9d7e599f0976 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -3,5 +3,5 @@ DIST eog-3.26.2.tar.xz 5516240 BLAKE2B 5e63edd97c50e059af8d282d4596193fdb4e8a576
 DIST eog-3.28.4.tar.xz 5732396 BLAKE2B 9adf7e6793add9298dd879a0fe5ea7c736854d3a40473b2def84851a1e5a78ef84316b20b172c85c85f070278a51b06c1019aef1e5e9c5f31a87243c9229a579 SHA512 57ccb6269b2829a0606cbae08fc376bcd13028d3affe03d76c929a95faf9106dfd497872a12019158aeff5e8e101640d912cae0cece435121319820df7262c00
 EBUILD eog-3.24.1.ebuild 1361 BLAKE2B 346a3d7b927c624f13d56dd40800e6bf15221eb3fd9b8592019979ed84dff3d6fef815f5d7b3039da2440f9028f7775bb0f37b1c5e49f8f65e6ed6c104f45e6b SHA512 26d67acc6add7c8c0ddb1314b511286c310acfdd6c7372221ec2bb4dba69394b8a75e6d5ff04506720e5e911fc3998d810bc03fc7dad50a2556e25c1d4520758
 EBUILD eog-3.26.2.ebuild 1410 BLAKE2B 7b8f29a3e66bccbd3d3c23e67f62a18c8ca7d37c80fb8a6c1a25ef526cf0b91ab2789721ec984d42f43a28c6d755d1d7049b3bb3b8cc0c83049a184be23d2fdb SHA512 10b7f91cb6b9d175128dc39af87f90115a6e90e3b093ef4373875bfa5088d27f70a1d3c9f6bddc09105b62ec792286217251448695ff29cccf00aeea4e2f6074
-EBUILD eog-3.28.4.ebuild 1529 BLAKE2B 7312880bbd5c9437e75492b93d2eb49bde1e5a53a591e0de0d825edef89095e1e9d208e9cccbaa0dd90c3440cf341e901da34f51d76bcb6fdd0cddcab391de9c SHA512 3db6f5c64b662c422e839b5a6b083c84dcc32b7cb7dd47c4fc1cd69dab08467ed3945a01217a73860f080789f33c4306eb4669c369c5ee1fc9676e49f6aabf0c
+EBUILD eog-3.28.4.ebuild 1550 BLAKE2B 051a1673bb0287d59697dfca6daf6cd75f1b1d10fa24ad0827f26dc7671625077fdd65418a63c862167e7d0ad8ec101a55353bae1909cd083ae1fd0140a26e57 SHA512 1d34e6b49845a6c115ce9f12db495a7c048efcdd2786a6800a715975abdb0f1823b48efa3ac3474a9478a84e84cdeea12e203ac90b9115b8aae743736a5b5dfa
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.28.4.ebuild b/media-gfx/eog/eog-3.28.4.ebuild
index 0ddf7c2999b1..b385ab287a64 100644
--- a/media-gfx/eog/eog-3.28.4.ebuild
+++ b/media-gfx/eog/eog-3.28.4.ebuild
@@ -18,27 +18,29 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
-	>=gnome-base/gnome-desktop-2.91.2:3=
 	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	>=x11-misc/shared-mime-info-0.20
 	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
 	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	sys-libs/zlib
 
 	exif? ( >=media-libs/libexif-0.6.14 )
 	lcms? ( media-libs/lcms:2 )
 	xmp? ( media-libs/exempi:2 )
 	jpeg? ( virtual/jpeg:0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	svg? ( >=gnome-base/librsvg-2.36.2:2 )
 
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.16 )
+	gtk-doc? ( >=dev-util/gtk-doc-1.16
+		app-text/docbook-xml-dtd:4.1.2 )
 	dev-util/glib-utils
 	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
@@ -51,6 +53,7 @@ src_configure() {
 		$(meson_use svg librsvg)
 		$(meson_use gtk-doc gtk_doc)
 		$(meson_use introspection)
+		-Dinstalled_tests=false
 	)
 	meson_src_configure
 }
@@ -58,11 +61,9 @@ src_configure() {
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_pkg_postrm
 	gnome2_schemas_update
-	gnome2_icon_cache_update
 }
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index a74fbbe9c89c..c185c138ee94 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -6,5 +6,5 @@ AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a
 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 2541 BLAKE2B c3d9e00989467055dc8ff0ea1d7f78e3234936518720aaea3b7df3e8786e5567ae032421d29fc92b80bffbf59b84ac538293d2dd78d951f84b817104e9ff8337 SHA512 e48341e0e43d6a6ecb940523c225c4cc6558cec929d97a3b716ec5017bdd9378ea0a7e97e7285e2aaf270ef85c9180b9e5ba3bf4628d55b0942ac0d043668c22
+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.27.0-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
index 5fbca1ca5129..6ec0a4ad1b44 100644
--- a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://exiv2.dyndns.org/builds/${P}a-Source.tar.gz"
-	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"
+	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"
 fi
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index 68f84b6f3b61..bf004bd9abae 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -1,3 +1,3 @@
 DIST fbgrab-1.3.tar.gz 13027 BLAKE2B 57acd93432b01befd99c73e45337bd2eecfdb18b9b5d98106e1a433b48bb03ef05cc5d3a99e0a34f501bb4d0731c8d6c92bcd8b145dd5f503632b63d41d902d5 SHA512 2d1166890f41d7de813a6c9b722db148980fcc802da38dea1a42d1f150cbdc16d0dd6757bc334586402f109b382e5039d44b03f9f19024f546958bdf21ca5d52
-EBUILD fbgrab-1.3.ebuild 621 BLAKE2B 3b77470a9c15d6ed2e846c621e1071ad116c2e6c1ef25dc88052b5ee76e90f4f58f97659c4515ee770c896b6abea3f97c0431171553c7b70f7a7c70e6a18807c SHA512 25b0a43aa49b49527892b0226fcd11e58a9260d7077bd9da9f22ef43b26a8889ff9d3f7444b0249553af15a923bd3bbe83ce51210d5c741b2a3f293e3f979896
+EBUILD fbgrab-1.3.ebuild 620 BLAKE2B 9887492e98ac3b8b5e5d2b3a8457bda96a864e1fbecee3910763417f9a630677a73807ab6a8ec530b8033c80cf84c80db289e13d2041b2463e4bad011f74c3cd SHA512 868993681397921644907eb33485c7a9a5dc1005c4486380a17441e39fb86fc6d7d7470a3352acf8852d29ab3b2fba4cd727fde8c6b2a071bcf3b5fb60efe20a
 MISC metadata.xml 355 BLAKE2B 907ae0fec9a4a2284f98737d79de3747882c83bf3dee2588056ab3baa2720b987eda2930a3b79dae83327363d13fa72b98cc04d7b3d477f0b53f26eb6e11396b SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231
diff --git a/media-gfx/fbgrab/fbgrab-1.3.ebuild b/media-gfx/fbgrab/fbgrab-1.3.ebuild
index 79ccfa440935..07d7f5e68fb5 100644
--- a/media-gfx/fbgrab/fbgrab-1.3.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Framebuffer screenshot utility"
 HOMEPAGE="https://fbgrab.monells.se/"
@@ -20,6 +20,7 @@ RDEPEND="media-libs/libpng:=
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	sed -i -e "s:-g::" Makefile || die "sed failed"
 }
 
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 925532548ceb..eea145542a8c 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -2,5 +2,5 @@ AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3b
 DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
 EBUILD graphite2-1.3.10.ebuild 2499 BLAKE2B cdfabfaeecaf58e032422d60adf6ee349ec2bdba70313138d4dd4e88e258ba9868a31a4f56109a043846e2aaf7dd242468bd49244ebf28c3b3a9cb0b2d085300 SHA512 43b767dbed5273118dd9cd42a505e659217989f4165dd41e971df02ce6042f1c8476e06eda60b66023f02df3a41b0bfe8b63df88b2035d70ccd2d5fe36a7e4ac
-EBUILD graphite2-1.3.13.ebuild 2669 BLAKE2B 406c0eba3da4432f877514091700cc9f34848053edfb1498db5f1840e836228bd72e4c8ca532f5ae611543110efb8a8de219ec7d9628f047c740bc4d038ee891 SHA512 8dd9f20cccdc997356a665fdadaabc9cd5d124fe17bb367b532377b41eac04614f296f8d8ec55f98ea0387cd20fd94a8b9a20ca962279b1dd24a2f7fff58289b
+EBUILD graphite2-1.3.13.ebuild 2666 BLAKE2B 72b35ac8ddc4ca40a64a53039c9be64bec726571c2a9ed24fe0b51859955cc83ba0d775e3168cb3e9c8d032fc1f2e4e49cae54cdea1b93e07a0092f571af80a5 SHA512 2f8d1df747980527e302c48cc561e49a3d803752149e46f3b5d673f0242920b13707de676a86d507efca9e0a1babe94b2f31694329e32cdbda2c776d0312ce17
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 6247910618eb..51e0e6c17c91 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 
 RDEPEND="
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 8fb6cd2bb0eb..63feb57777c1 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
-DIST gscan2pdf-1.8.10.tar.xz 406128 BLAKE2B 328c05f377e12742bbf8ebf92f327afddc4556533e4f7500b237d968fa07b6505f0a3be2c02f42318740e9d185611c094cf96c66804af02197097eebd16b880c SHA512 334979b10238d510da8c5807290920b50e3a06ddda99dad41ced96d33e1ca8467cafe1f3112fb81b6705f80bc232eb6f041d588a57e04d5eecd09a201f007a49
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
 DIST gscan2pdf-2.3.0.tar.xz 432604 BLAKE2B e411e3a58f6c1a9e9c6df7057711377a70676d7ab718d5e4a19ea2690a26bda0b99def3cc04099bd0392bef0060b6d60328cf36450bd18d7c64100d553a4c627 SHA512 c9f08ce9c4f9c14c78d0b821d8c4381eccdc5a741a4b54e817dab33e67b7eeb705d48a02109c97913149b4839a713340aa6947a548eef3acd6a7bcabfa4116e1
-EBUILD gscan2pdf-1.8.10.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d
+DIST gscan2pdf-2.4.0.tar.xz 437096 BLAKE2B 947c1d3c4c726254ba61be4f7a34ae867d0af9b6ebf53e4594aeb908dfda43ff1e85791641b42e9e13b978a56cfe523a6fa23566e14ad130278d05e7836d34d8 SHA512 90ec9d8cc56a2fe9d7a77c928f548c87a81bdfb62f1caa491b32a42600c5677974ec613b0bf384bd806953a9a5d29ccf3077df7c0b3dd73d06866003c3a01791
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
 EBUILD gscan2pdf-2.3.0.ebuild 1609 BLAKE2B 0804b57945439bc55cc55d2b73b56cc4a892f9f72555ee74c0f1fe5203e0ac452659e1988dd55e59eee4f1791fd05e2d408b8f4b0ac7a2e77aea3f353ef0ee19 SHA512 7173ce075f21c158db8d964144073028275e6cea2346bf6275c4ca4a34a6e6a59f7da110f71ce988a5e033e92c5f0eedbb4661f2539613111891abd363845bb4
+EBUILD gscan2pdf-2.4.0.ebuild 1609 BLAKE2B 0804b57945439bc55cc55d2b73b56cc4a892f9f72555ee74c0f1fe5203e0ac452659e1988dd55e59eee4f1791fd05e2d408b8f4b0ac7a2e77aea3f353ef0ee19 SHA512 7173ce075f21c158db8d964144073028275e6cea2346bf6275c4ca4a34a6e6a59f7da110f71ce988a5e033e92c5f0eedbb4661f2539613111891abd363845bb4
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.10.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.4.0.ebuild
index 00f29f30d45d..d19c0627489d 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.10.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.4.0.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
@@ -14,24 +14,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # OCR tests fail with tesseract[opencl], not fixed by addpredict
-# and others on Wayland and the console
 RESTRICT="test"
 
 RDEPEND="
 	dev-perl/Config-General
-	dev-perl/Date-Calc
 	dev-perl/Data-UUID
+	dev-perl/Date-Calc
 	dev-perl/Filesys-Df
 	dev-perl/glib-perl
-	dev-perl/Goo-Canvas
-	dev-perl/Gtk2-Ex-PodViewer
-	dev-perl/Gtk2-Ex-Simple-List
-	dev-perl/Gtk2-ImageView
-	dev-perl/Gtk2
+	dev-perl/GooCanvas2
+	dev-perl/Gtk3
+	dev-perl/Gtk3-SimpleList
 	dev-perl/HTML-Parser
 	dev-perl/Image-Sane
-	dev-perl/Locale-gettext
 	dev-perl/List-MoreUtils
+	dev-perl/Locale-gettext
 	dev-perl/Log-Log4perl
 	dev-perl/PDF-API2
 	dev-perl/Proc-ProcessTable
@@ -45,7 +42,6 @@ RDEPEND="
 	virtual/perl-Getopt-Long
 	virtual/perl-threads
 	virtual/perl-threads-shared
-	media-gfx/gtkimageview
 	media-gfx/imagemagick[png,tiff,perl]
 	media-gfx/sane-backends
 	media-libs/tiff"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 6bffbfcca0d0..5e479a12bbf5 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-25.tar.xz 8938560 BLAKE2B 26d00bee1a0a70596afd670c010b4a103ef97c930b4cb34db688615d88ff9f6d026b7dc5b4c647b0a5aca2846ed25affef1ab29eaaa253168b807cc175aa56ad SHA512 6444ef305d36e515d94ee1d65a26049f7b7bcefea595796b7f01a27b10c474d9f35f585731c4d2e5e6f0034aea3d3db6c70bd6a40e88efbb2400fe285f20f776
 DIST ImageMagick-6.9.10-27.tar.xz 8946680 BLAKE2B 74992d85c02336cc5d64dea25df04a56e97d3d6e9feabd03230fd693ae94fb79781581c0d293c765c4639e2f82b3585f5e98a7c0015cab1980c7a766fee7066a SHA512 13b83c72e96cab30eccda2a260a952c7a6f1016eb22df15643aceeca4b8b95b485da844d04484c39f9b1c93168c4b4e2d4cb92a6bd3b0831c94985717db8c368
-DIST ImageMagick-7.0.8-25.tar.xz 9429456 BLAKE2B 9b5781bbc91059462e6f4356735ce49503b9fcdbbdd52acaba314d5736ef7b59a4b7b17500899728d9f735fd34f001d830ac6d59501602c394d207139918af37 SHA512 7fb3ebd3c77492a49d4b9d047d853de6eb1abea1614fed1f21b6b6c7de37093b53ade3f319fd74f87d76954392a5ec6ab5cf0df05db1fa73dbd73aee310edbf4
+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
-EBUILD imagemagick-6.9.10.25.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-6.9.10.27.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
-EBUILD imagemagick-7.0.8.25.ebuild 7151 BLAKE2B 2a45d3c2bf28fa0c18a7d7b2b81f9b41a208bf74e84a8bd0fd9630380f432e4a2ee27911b83a7a2ebd86c828105754d6b092a6205b4fc2d22ac79824c62e9069 SHA512 49dec8a319fef02989b7ad27a3553688f720391f670525f5d89dc34722eaab3fb2dbadf7e5ebd0565193020e54e0509fd171a2505f79a99b1eaa263daddd405b
-EBUILD imagemagick-7.0.8.27.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+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
 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.27.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.27.ebuild
index b09291336ccb..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.27.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.27.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.25.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.28.ebuild
index b6bca9ea8b20..b09291336ccb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.25.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-7.0.8.27.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.27.ebuild
index 69c412db11b7..3b3fc7c8d30d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.27.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.27.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.25.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.28.ebuild
index 3b3fc7c8d30d..69c412db11b7 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.25.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/mkgallery/Manifest b/media-gfx/mkgallery/Manifest
index 9ed3f9741f94..9cf19d08e26d 100644
--- a/media-gfx/mkgallery/Manifest
+++ b/media-gfx/mkgallery/Manifest
@@ -1,4 +1,3 @@
 DIST mkgallery-1.1.tgz 6514 BLAKE2B 3ac077de99e2c8e05424425eb640a6684eb199c99d0eca879aab23645b392d3b19184d0a93e7dd4a92cd643d261c22a0677919e26b1866507c35d782ee6ec390 SHA512 6d3cbe6bbf3673c26bedde0eef1b03409766324836296205b6dab0a32eb23c7f8cbd27db2778bf710c7d3641e01eb57dbac5493ab97862cd501b3858f1db6a4d
-EBUILD mkgallery-1.1-r1.ebuild 509 BLAKE2B 30f0dbeeb9ae81a358edcd875b636c5275591bb2925f81c34533e086333b9ffface8a780afd5240c45dc9fb439633720a61ca5e6d0e5644aa41c46956b198143 SHA512 dc900e25bc9d738b2ecd8f920a208d70cefdeed2cbe30390d225fbe2d76c4f8ea495b0d8ea4a4e167b8d077b7575641d8e705b5301a424002620f8586550364b
-EBUILD mkgallery-1.1.ebuild 528 BLAKE2B a114ec974e314ca71f0a107eb040697874432358989f66fb947ace0efed2d7a33edd3917ed229d9f9bdb36673d498521f516db2226bc50105396c3c093f08235 SHA512 a4e141929b498c0de8dc896ae94797a8eaf72b4a2744aca6105030b479af7b31e7093541d9090054e057d1282780430c6fab7ec8575903748cbdbf3aa7dc3e82
+EBUILD mkgallery-1.1-r1.ebuild 508 BLAKE2B b3a8e087e8241d2746a6fef201366fba37feb045fb8d86fb77c89ac6e064644e1bf0ed2cdf713c33ee558af9f7c79d7621b6f3b494c578e59ee10ee892e77277 SHA512 90017fbd434ee0b14ce2dc5faa063c69efab16d8de855aaa204bf7ed17ffe8ed6a652f118fedfddd782551ff095e7400507f262b51c63faffa766402a554aa2a
 MISC metadata.xml 246 BLAKE2B ae3650aa087620727ede47f5c455bcaf1c88078b720cc601aa399305760d957ab0ce54674ef2f3c0afc4e832637acd1f0758926c14ecbe22eb7c1c693235e46e SHA512 06b51a14b7a00428ccf8399b124bdf7ad7909af339489562a36e3e470da8c8cbdf09324fd01c14dd515ee0fb8d4849ef25f4117c56076a4590fd31b7f76b8651
diff --git a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
index fe1eb4c05895..b17bf63cb2da 100644
--- a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
+++ b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://mkgallery.sourceforge.net/"
 SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 SLOT="0"
 
diff --git a/media-gfx/mkgallery/mkgallery-1.1.ebuild b/media-gfx/mkgallery/mkgallery-1.1.ebuild
deleted file mode 100644
index 177b193e832c..000000000000
--- a/media-gfx/mkgallery/mkgallery-1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Creates thumbnails and a HTML index file for a directory of jpg files"
-HOMEPAGE="http://mkgallery.sourceforge.net/"
-SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-SLOT="0"
-
-DEPEND="media-gfx/imagemagick"
-RDEPEND="$DEPEND
-	sys-devel/bc"
-
-src_install() {
-	dobin mkgallery
-	dodoc BUGS README THANKS TODO
-}
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index e7e99fcbc174..126b90e0a627 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,6 +1,8 @@
 AUX opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e44bee9c4da81b6f50bfcd68c1566149d089fefddb9d90ed76cb3ae9f33b063bc3834e69da008660f689eb56b9597bd1702b40df761006b170c079 SHA512 c11194c06df6dc2e2ce18f3c6863c19191793512672779a2b5d4df2e2b59348dd4c71c7ab887546b96943e97e0257b3aa152f45aa53a3e5ed95008fa3d6b59d5
 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
 DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
+DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
 EBUILD opentoonz-1.1.2.ebuild 2152 BLAKE2B bbad89bf0799119e05e7ec8e900e786f28e51d4609874e7b676922ab8cc8ecb4506652f836e40778d3963eaea2cf9ec58c8da8fde68393455e60f82868ae3913 SHA512 62ca55a27d0e4ca42f274747b530221e003e67774fb822969f1b7e4e77eb80b961894a6362c45633c642dcbb1e35572ca77056d7cf43fede9f632789bb53aa35
 EBUILD opentoonz-1.2.1-r1.ebuild 2186 BLAKE2B cbd057c9b0cc2830f4168a5e044abd28d59e9395b51341463f204837c0e7a91f0c3a12905a34e06368b4d7f328a743c68808062754dba85d331d69b992970e2b SHA512 0ab9b5ec34212e2ded9a7b80efa8150b2bf4197d43dea613529f782bb1c2470b34beebb244bb38a79e4634e742ff67a9b482c4922d3f78432ae7c81b0dcdfe24
+EBUILD opentoonz-1.3.0.ebuild 1914 BLAKE2B bc234169777f8e3ba8528ffdc7651f8a54b705b3d4928e072de752f9140fe97d760e82d5d07292a230caa9e29d8fe213c7be0ed9466a2ee06c8ac39923466f58 SHA512 eb89c56318659db87a84122dcdb4c75a7492ca98fe49025eb5b825756d81db43130d7b730d5d893372ff4d1b605577e10fa8c37ad1be0a1609c99f992c9e9f8e
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
new file mode 100644
index 000000000000..a73803cb0e07
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
@@ -0,0 +1,87 @@
+# 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="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/lz4:=
+	>=dev-libs/boost-1.55.0:=
+	dev-libs/lzo:2
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtmultimedia-5.9:5[widgets]
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtopengl-5.9:5
+	>=dev-qt/qtprintsupport-5.9:5
+	>=dev-qt/qtscript-5.9:5
+	>=dev-qt/qtsvg-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	>=dev-qt/qtxml-5.9:5
+	media-libs/freeglut
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/libjpeg-turbo
+	>=media-libs/libmypaint-1.3.0:=
+	media-libs/libpng:=
+	media-libs/libsdl2
+	sci-libs/cblas-reference
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib:=
+	virtual/libusb:=
+	virtual/opengl
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd thirdparty/tiff-4.0.3 || die
+	econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${S}"/thirdparty/tiff-4.0.3 || die
+	emake
+
+	cmake-utils_src_compile
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index cb5e6d721b0a..c532775556b8 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,6 +1,6 @@
 DIST pqiv-2.10.4.tar.gz 138644 BLAKE2B 7dc358379d463e6b421c082942a2171b749ea41b4e655c64425d6cfdf8f251ce89d431b45a28d8b30eb5c022814bec7e365c3b3272ebf0cc7e994b803ddfd4ec SHA512 52534ed4728466b7c710db65115d7e79ad97546750946fa5c3a26b65055387b15c6239fdf1bb8c8345fe7ed2dfc7ed5586ffa2a864de44fd8213cff59f76048a
 DIST pqiv-2.11.tar.gz 139825 BLAKE2B 981d472ccd3284b2e9ad3da8e84233c95555a927af797f8421ac820225d3d39cab2275f01269a986bab54994e0fce2095b7c33b1201e7a6117e1c8399617341b SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7
 EBUILD pqiv-2.10.4.ebuild 1796 BLAKE2B 3708b1f8969a498f3582db811e53a8c3a3fb58071abfdd9089a45ffccb7596c856afbab014094103df9ca0f788127dff22f103e7c23ca04ac9294275fe36c05f SHA512 e42bdb8f10bb1474e3c32c8164c2e208bfb3035108ccb21698b4736e96f98de7fcfb819e4a73085a2b3a34effd1348af06bdb2a60722226274bc3bc6777db8fa
-EBUILD pqiv-2.11.ebuild 1797 BLAKE2B 8c07b9249542088ff80733ad9ae1a6fa945e15da5f691829a2d9bb16936d9b536415f05acee4b45b81a925fbd60167c730def5c5c196d0be3f56cc3ba433fd07 SHA512 883b5c6235dbcf169664ff5290cb17b4158b63b713536980165cb4bd19b8d88d8b72851c6640b1ef3630cb2e3219c9d78ef0372be5bee15046b1462cf682e670
+EBUILD pqiv-2.11.ebuild 1796 BLAKE2B df8f7a44179ec384667df001540f29a639677a24782ddec1d1892098f102eed7cc9b46050763e55c101c1fa50b163feead3653808d21a57c48172cbe6e494511 SHA512 ee143848f3fefacaa10c7c9e2ba37d0795418c3174418f6c6107fed98933f783c6ef5455c0b61f76dff0fb5ed6adc2e8668ff030097015eaf3b78982fac17b6a
 EBUILD pqiv-9999.ebuild 1798 BLAKE2B 7ef990a30f601a6e3651e643f8b013cdfbe82300e2e69e100573b968d9358ea177ce5fd5aebdcafd339f0ce8c6d61063b3f0c0da6e95d753a01e7d1a94774802 SHA512 980df3cbbcafc40946a7cfa17b86580637457d2549f69e63dc4443e0829b90e58b7adc14db6a025e4bf0866252600ecd782609584a0f7c62ba737db372924a96
 MISC metadata.xml 584 BLAKE2B 5d617c553a0f5f4be6268f17dae36d3bb52e984c4c7c89df44b40e1bde1cff3e5619210548b93bf6ffc2e0ea32839d6b4fd39714b237aea23f1cad966c92b3ec SHA512 0d589cf085f6e6335aae5f6e32ccd153ddae1f0fa926fd3a135eabcdc20d5c560e2694216ba93b6d8c6c16bd8541f9d7aaa496e7ee4bc82fea90228a28320fbd
diff --git a/media-gfx/pqiv/pqiv-2.11.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild
index 2f8ae62f1683..c094753f5a0d 100644
--- a/media-gfx/pqiv/pqiv-2.11.ebuild
+++ b/media-gfx/pqiv/pqiv-2.11.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
diff --git a/media-gfx/propaganda/Manifest b/media-gfx/propaganda/Manifest
index 247b4e417d9b..71de2febfdf5 100644
--- a/media-gfx/propaganda/Manifest
+++ b/media-gfx/propaganda/Manifest
@@ -13,5 +13,5 @@ DIST Propaganda-Vol-09.tar.gz 1664869 BLAKE2B 48baf8efa75f18141a557e0f36a982232d
 DIST Propaganda-Vol-10.tar.gz 6376914 BLAKE2B 365e96616d8f82321fd0a0460e6b14e5db7b96942ffa49f193ac86bba76c2394fa451718e611e8697ccde3ff02a6ac649d0ea85a04fad76a940c3769418b9751 SHA512 080d563442050f1266d09fbb2148d14173555a213ce1fb110ce4aab2d85a18563543705227b1e68146dd2f1a5b1bb7cc75f9512f823a4970f92b55eb9251b1fd
 DIST Propaganda-Vol-11.tar.gz 3030910 BLAKE2B b5637635165557c079d7801b91a6b1d7372a7ac1ef1ba414d0cf172d652de779fb05f106f0ef7cabebac79bbc8a1b21cabde0f34a14735eca17ccb193ade0882 SHA512 752a3e27bfbde1f694be3f57e4c7bf638159f8e7b06c00c703a82ff2795625298feca20f91beecc651da66ac7b6dc5e7fcfc0b5d7b465118e94f8769488be1c7
 DIST Propaganda-Vol-12.tar.gz 3140955 BLAKE2B ce23e5e781bd1d1cba757bcee71df199627e18bb72eddd0a6dc5759f1d80fcefbb4daa6048450aa51f9b4830ece14461ef63a299e0c13d43a1670bc8b1a4b0fc SHA512 1cef61c88a4cbe4c757c05c1ecf2d72ab67ad13e0268497971f9a11047351d0a0e8770a69bd6754672b6a8c99e69a2e61693fb593bcfb4db7003cd9eddd31f80
-EBUILD propaganda-1.0-r1.ebuild 1172 BLAKE2B d77e4745e589e8ddf7273d3fbdb417ca79e00d8b51b7c98c60eaf72887656b7a3ddef5bfe17ec534407b5a051f7b7824db01e6fd12116c226408128f4324aa34 SHA512 449456227f619afb5e87503ea8accbc8b6ff94efb8cba4e7419c56a8a6510db998c0cfc50e834a04e592b842f3092b4ad059f035081cc92dde824c8e8ad3e308
+EBUILD propaganda-1.0-r1.ebuild 1200 BLAKE2B d0f29c2ef8d257b0d0bfe8d09926456a548d85cbadc8224ac90805e8788f4f75aa69af9991d603d40d4450ac7118c874f04f5cb7e80d04700e9fe0027ce1472d SHA512 b30d65a468330bcdadf91863bb41e6e36dba1957b2ecfc7a3199ad1921f1d0f2ce65114d01ebac86749f1c6c1e9ee3844af9c6822f4e5fb3cbb2cb0a929d934f
 MISC metadata.xml 251 BLAKE2B 08302baf062696a2cd9e6bbc3469d3e6a2d4d03caf4734810ad4dd22f64347a70a36e38cff8753da18246f448a080829bce1ceae41ae418dbeb19eb1336e5dd7 SHA512 5425f5f068673da4e79daec7d2d22dc122024e4b54a53b8d7b07ccb2b138fb5657b7fe29ec640c6faf12d6efefeaf3a53d67e954ec8b9884b0ff3d959c86a13f
diff --git a/media-gfx/propaganda/propaganda-1.0-r1.ebuild b/media-gfx/propaganda/propaganda-1.0-r1.ebuild
index 59b1cfda3be3..f683c1bd6279 100644
--- a/media-gfx/propaganda/propaganda-1.0-r1.ebuild
+++ b/media-gfx/propaganda/propaganda-1.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 S="${WORKDIR}/Propaganda"
 DESCRIPTION="Propaganda Volume 1-14 + E. Tiling images for your desktop"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SITE="mirror://gentoo/"
+SITE="https://dev.gentoo.org/~andrey_utkin/distfiles/"
 SRC_URI="${SITE}Propaganda-Vol-01.tar.gz
 	${SITE}Propaganda-Vol-02.tar.gz
 	${SITE}Propaganda-Vol-03.tar.gz
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index c7cf16e75aeb..58323dc75b23 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,4 @@
-DIST qimgv-0.7.1.tar.gz 273529 BLAKE2B 60f1f87c3347333f76224046776ca4303a03286593191feb18791dd7065ba714db387a1f8cbf6f16f04cab7190645edee4aba11f13d1ce6c0cb52d9b79042f18 SHA512 dd142377aca7248d00ac51d0732de94106e7471973de45d66e8905c476e5eb5f3543e98b1322390dc54946e7c518c1a8711bcde46fb67c376808e4049b22a630
-EBUILD qimgv-0.7.1.ebuild 1097 BLAKE2B 81a8236b34f9eb6c8d310a198f702f499b7749638797ddba906b114f49785bd19c141a7e4f4bf1e2e1f0485e2231f2e0b90ef4e55b441dbaa82c11198a2ed70c SHA512 d2305d48f4f8985ef5a35c34e3847b24aa82d6b8b3eb85fc7df431cef2216551d5c55b7e06065b2a2ba2578c383670186b9350df0d77d0d63ff963b7093295bf
+DIST qimgv-0.7.3.tar.gz 266307 BLAKE2B b13794f4bd7ff8b2c9309f95453baa65f91c60d155e22a86eac1eb79b3dc7f9da003dbfdbfc2d14cbb6242c769516283785ed72e2f50d5bb51b394db05c167b8 SHA512 fae7986ce29941232dd2863a0900651fb3a7d6d184b05e763670b16c74bb0cc27ce6eb936b2a41a2183e3dc5c33006e3fe3491ed043c6e357ea31d6a716d80e0
+EBUILD qimgv-0.7.3.ebuild 1087 BLAKE2B 470d072b17c63ab07b40bdda43a1416fe0f62f24ca553e0357c4cc088c07cd7478956306a3939c2a1cc685100d9d6698e5984626a6e04787d5a7df722597954c SHA512 0cb3f80c0b83a830f1aff592bc59bb870b019efd5fdd3e6206deef2f4921de32d1603d81e09c339265f7be8479afe1bce9b6ef8b000aa21775737ec65bd8585f
 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
 MISC metadata.xml 454 BLAKE2B bb9012bfbeff8b79f1f3a4de8b7e24bbb664d0137a92c8bde3189612e99ce7f94f4d135b5fcda3a935b8d3b8181e9ca882b073cbe26a6f7ace7d52ac0a57804f SHA512 3f2ec50c29ac720c91d61a5ede051eb62a58771974e8c9591ee9b3a98a8a8d0af2071b29c8e7abb842999559ab330f63b39d7de87c8a1d6fd560002e9bf7d107
diff --git a/media-gfx/qimgv/qimgv-0.7.1.ebuild b/media-gfx/qimgv/qimgv-0.7.3.ebuild
index dc7afe79d53d..002bdbd7f4fd 100644
--- a/media-gfx/qimgv/qimgv-0.7.1.ebuild
+++ b/media-gfx/qimgv/qimgv-0.7.3.ebuild
@@ -28,15 +28,14 @@ DEPEND="
 "
 
 src_prepare() {
-	eapply_user
+	cmake-utils_src_prepare
 	# respect make.conf CXXFLAGS
 	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3")/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DKDE_BLUR=$(usex kde)
+		-DKDE_SUPPORT=$(usex kde)
 		-DVIDEO_SUPPORT=$(usex video)
 	)
 	cmake-utils_src_configure
diff --git a/media-gfx/ttygif/Manifest b/media-gfx/ttygif/Manifest
new file mode 100644
index 000000000000..92b36e2c67b6
--- /dev/null
+++ b/media-gfx/ttygif/Manifest
@@ -0,0 +1,3 @@
+DIST ttygif-1.80_p20181218.tar.gz 8428 BLAKE2B 376b6dca4d13120b90e3055e8a37acd017aa7966267d6ad76af6eb2cc4155c8b8ce9d618c682cf1c999095c96ae78e11ec343e0752362851f9a2b660820dc403 SHA512 f992094c0baa625106eefdebbde1d91f2686c0b01c4b3ec22ec9339c88df42c830e4417338c685b375646b212db0213983b41b8d6ee9bd9644dfb56f6db31f52
+EBUILD ttygif-1.80_p20181218.ebuild 589 BLAKE2B 609ad213d3a3efff6875f2d9911d3f535ef047659751385a4d6567649f3feabc49a60b9cabe9cac13e664bb1b7976bb1c79006ca829e917bdcacb807b7e24938 SHA512 248560bd9b524f1fd36a4b11a69675b18cfaecce6e73fa1a94176746fc6a9ba0e6c1a3ca16964b523b5a8fb0b27f4c2e94e373f1594dc08626d12874d57a6ea2
+MISC metadata.xml 339 BLAKE2B b66a558314f330d1c45e41a7630fe5e454270bf14a9cc038cc3f94c8ecd8dd9a51946c9f7faf39a96756c72df41c4847a7894c0373d39cfc3b1a06523a3f7219 SHA512 db977e98c60cbb3aa265263d0f400999bcbb9977f63c5ef6ed8a303e4c63ba652bbcfde2cc41697b0bd6b4063de90fb74eacd327a7053f0823f1ee485ea8b451
diff --git a/media-gfx/ttygif/metadata.xml b/media-gfx/ttygif/metadata.xml
new file mode 100644
index 000000000000..0bb66f2138d8
--- /dev/null
+++ b/media-gfx/ttygif/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">icholy/ttygif</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild b/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
new file mode 100644
index 000000000000..32b4aa70ac51
--- /dev/null
+++ b/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot
+
+# Commit Date: Dec 18th 2018
+COMMIT="362bc381c1c2449509e732d68f07656caf46b420"
+
+DESCRIPTION="Convert terminal recordings to animated gifs"
+HOMEPAGE="https://github.com/icholy/ttygif"
+SRC_URI="https://github.com/icholy/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+DOCS=( LICENSE README.md )
+
+RDEPEND="
+	x11-apps/xwd
+	app-misc/ttyrec
+	media-gfx/imagemagick"
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+}
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 862c5947fa4c..1e8c38a94ac3 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,11 +1,5 @@
-DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08b9d5f61becd03943b78ce68e8735d192f2f2d5d5dfe25cda19ba998b0ea4a73bc3d0845bd4a065f7c5b4e66098 SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf
-DIST valentina-0.6.0.zip 38305855 BLAKE2B 82733e97cd2ab1c2e0edddc05de228c040c43bd6a21b874b30554c526123ebd26d70f9fb8bb7556062f7df7b8d8f38c370d0f9ccd3d38100dacf841a68d4d1e6 SHA512 3bcc943c155b1b848c5328b53c8148448ede8fd057c8a50570045f61519bbeaaf0831f4a16127a24537feacb5251236c3bdc96e02788729635f4ec072686ca16
+AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c
 DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce
-DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
-DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
-DIST valentina-5406.patch 596 BLAKE2B 34c5cf515555e455416500795c2afd96176b3ca3c2c3e278dbb6311e7cfb38bba6556126beef23d8b98ace76f0156250974d95310a6af046c0884580aa1d19d9 SHA512 f504ca766969703a20fc7c16652d4615722afda9156eb07c43845d1a6e9c7d08a2e8f07be7c71b4379326757f95e95e85858add2b1d13b0e4e5e8b1974ce18ae
-EBUILD valentina-0.5.0-r2.ebuild 2569 BLAKE2B f372de37045b9a7ef8e582ed2e15c4f9519bf9b438e8a27b755e9cd33a9fc7caa2cbba8d1d5bf73c99539ce43dc97318154aea9a7a0410fc5607db45d640e17a SHA512 b52157b044ace4638a3610e5e5e5e6dc1ba50b6d9e6ab4183752d97fb0fd9970cc5fe80decaec688dad871343c22e8fb7293cbfe4b9f206f7493bb65d394be30
-EBUILD valentina-0.6.0.ebuild 2138 BLAKE2B a4c29b1c55c2055565225c448a4ba33fd89a45cf63452e05dc55d9aada619cb45bf2eb0db60cdf6c8fd0d1defd6ae9f78d38239eb2943427bb3bc6175a112997 SHA512 59e5dacfcfa1caea28f6dc5ca59fd9bba9c71cc50b695d4161a8d6c5fc10e83d3cd5ac4a26ffb5432cb1498751b14381f11393fb1f70218a25be08284d0c8c98
-EBUILD valentina-0.6.1.ebuild 2138 BLAKE2B 71fb0b9174b83ad55c8d9211d2190074a9949bfdde11375941e98949c13649b848de8c0dea85afcd341088d9c572b77b5c40e89f91e8da0940b1bb6827261944 SHA512 8a65e38f3d69c987544381bb1dc1e81d3e476516c1eff9d0072809de3f535c08c6d2cd90c774daf190509bc55df569c81c435b2e71c33216882c5d0a3649d1bd
+EBUILD valentina-0.6.1.ebuild 2177 BLAKE2B 58239504686422d35909bfae8d2913cbda227f6862f6cf7097235045b6a86d0b5f1a93689efd886e6c9f7db0fe7029d14cf5b8c9d2db1d88b3bcf1b262cce37f SHA512 827aee577d869b07cace5e4a9f2c30eb21cc187e52a5eceadc68081d7372e669d182085b0d4243675dbfc2052fdf8e370ec5b9e6919466360eca048c7001c979
 EBUILD valentina-9999.ebuild 2057 BLAKE2B 8f0884308477778a8bdb0ee588b4e976156513fa865c24406acd09079c545b719b82726ed0ec336150e6c26fcfdb97eb3ce71811c55bdffae38a6f0fd4b06525 SHA512 7ae7e33c54c720abd0111783acf5f8ea4c2e4812dc4013176bafc533a33b2359819f386648cef97cea3521329fc55af3f8156b28e4b69353ff1bc882c377fd20
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/files/5823.patch b/media-gfx/valentina/files/5823.patch
new file mode 100644
index 000000000000..79df9a74c5a6
--- /dev/null
+++ b/media-gfx/valentina/files/5823.patch
@@ -0,0 +1,50 @@
+# HG changeset patch
+# User Roman Telezhynskyi <kroluku@gmail.com>
+# Date 1551441739 -7200
+#      Fri Mar 01 14:02:19 2019 +0200
+# Branch release
+# Node ID 82e62ea2d785e093af68089e509b224f3f4f843f
+# Parent  0108ef767e2447e5b5f39378bcf245e25947a25d
+Don't use Qt OpenGL module since Q5.4.
+
+diff -r 0108ef767e24 -r 82e62ea2d785 src/app/valentina/valentina.pro
+--- a/src/app/valentina/valentina.pro	Sun Feb 24 17:29:12 2019 +0200
++++ b/src/app/valentina/valentina.pro	Fri Mar 01 14:02:19 2019 +0200
+@@ -297,7 +297,6 @@
+         $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
+         $$[QT_INSTALL_BINS]/Qt5Core.dll \
+         $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \
+-        $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \
+         $$[QT_INSTALL_BINS]/Qt5Gui.dll \
+         $$[QT_INSTALL_BINS]/Qt5Network.dll \
+         $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
+@@ -309,6 +308,11 @@
+         $$[QT_INSTALL_BINS]/libstdc++-6.dll \
+         $$[QT_INSTALL_BINS]/libwinpthread-1.dll
+ 
++    # Don't use Qt OpenGL module since Q5.4
++    equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
++        package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll
++    }
++
+     # For support Windows 7+
+     greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
+         package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
+diff -r 0108ef767e24 -r 82e62ea2d785 src/libs/vwidgets/vwidgets.pro
+--- a/src/libs/vwidgets/vwidgets.pro	Sun Feb 24 17:29:12 2019 +0200
++++ b/src/libs/vwidgets/vwidgets.pro	Fri Mar 01 14:02:19 2019 +0200
+@@ -7,7 +7,12 @@
+ # File with common stuff for whole project
+ include(../../../common.pri)
+ 
+-QT += widgets printsupport opengl
++QT += widgets printsupport
++
++# Don't use Qt OpenGL module since Q5.4
++equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
++    QT += opengl
++}
+ 
+ # Name of the library
+ TARGET = vwidgets
+
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
deleted file mode 100644
index 4dcf9c98e9b2..000000000000
--- a/media-gfx/valentina/valentina-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils gnome2-utils xdg-utils epatch
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="https://valentinaproject.bitbucket.io/"
-SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
-	https://bitbucket.org/dismine/${PN}/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch
-	https://bitbucket.org/dismine/${PN}/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch
-	https://bitbucket.org/dismine/${PN}/commits/572fe909f75e013be310905c118e1afe4368db1c/raw -> valentina-5406.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
-
-for LANG in ${LANGS}; do
-	IUSE="${IUSE} l10n_${LANG}"
-done
-
-CDEPEND="
-	app-text/poppler
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-31c95eadca8b
-
-src_prepare() {
-	epatch "${DISTDIR}/${PN}-4798.patch" \
-		"${DISTDIR}/${PN}-4802.patch" \
-		"${DISTDIR}/${PN}-5406.patch"
-
-	default
-}
-
-src_configure() {
-	local locales=""
-	local locale
-
-	for LANG in ${LANGS}; do
-		if use l10n_${LANG}; then
-			case ${LANG} in
-			"cs")
-				locale="cs_CZ"
-				;;
-			"de")
-				locale="de_DE"
-				;;
-			"el")
-				locale="el_GR"
-				;;
-			"en")
-				locale="en_CA en_IN en_US"
-				;;
-			"es")
-				locale="es_ES"
-				;;
-			"fi")
-				locale="fi_FI"
-				;;
-			"fr")
-				locale="fr_FR"
-				;;
-			"he")
-				locale="he_IL"
-				;;
-			"id")
-				locale="id_ID"
-				;;
-			"it")
-				locale="it_IT"
-				;;
-			"nl")
-				locale="nl_NL"
-				;;
-			"pt-BR")
-				locale="pt_BR"
-				;;
-			"ro")
-				locale="ro_RO"
-				;;
-			"ru")
-				locale="ru_RU"
-				;;
-			"uk")
-				locale="uk_UA"
-				;;
-			"zh-CN")
-				locale="zh_CN"
-				;;
-			esac
-
-			locales="${locales} ${locale}"
-		fi
-	done
-
-	eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	dodoc AUTHORS.txt ChangeLog.txt README.txt
-
-	doman dist/debian/${PN}.1
-	doman dist/debian/tape.1
-
-	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
-	insinto /usr/share/mime/packages
-	doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/valentina/valentina-0.6.0.ebuild b/media-gfx/valentina/valentina-0.6.0.ebuild
deleted file mode 100644
index b063352ab947..000000000000
--- a/media-gfx/valentina/valentina-0.6.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="https://valentinaproject.bitbucket.io/"
-SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
-
-for LANG in ${LANGS}; do
-	IUSE="${IUSE} l10n_${LANG}"
-done
-
-CDEPEND="
-	app-text/poppler
-	dev-qt/linguist:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-dd3cff212db5
-
-src_configure() {
-	local locales=""
-	local locale
-
-	for LANG in ${LANGS}; do
-		if use l10n_${LANG}; then
-			case ${LANG} in
-			"cs")
-				locale="cs_CZ"
-				;;
-			"de")
-				locale="de_DE"
-				;;
-			"el")
-				locale="el_GR"
-				;;
-			"en")
-				locale="en_CA en_IN en_US"
-				;;
-			"es")
-				locale="es_ES"
-				;;
-			"fi")
-				locale="fi_FI"
-				;;
-			"fr")
-				locale="fr_FR"
-				;;
-			"he")
-				locale="he_IL"
-				;;
-			"id")
-				locale="id_ID"
-				;;
-			"it")
-				locale="it_IT"
-				;;
-			"nl")
-				locale="nl_NL"
-				;;
-			"pt-BR")
-				locale="pt_BR"
-				;;
-			"ro")
-				locale="ro_RO"
-				;;
-			"ru")
-				locale="ru_RU"
-				;;
-			"uk")
-				locale="uk_UA"
-				;;
-			"zh-CN")
-				locale="zh_CN"
-				;;
-			esac
-
-			locales="${locales} ${locale}"
-		fi
-	done
-
-	eqmake5 LOCALES="${locales}" "CONFIG+=noDebugSymbols no_ccache noRunPath noTests noWindowsInstaller" Valentina.pro -r
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	dodoc AUTHORS.txt ChangeLog.txt README.txt
-
-	doman dist/debian/${PN}.1
-	doman dist/debian/tape.1
-
-	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
-	insinto /usr/share/mime/packages
-	doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/valentina/valentina-0.6.1.ebuild b/media-gfx/valentina/valentina-0.6.1.ebuild
index c9b395040317..a59fb86953a5 100644
--- a/media-gfx/valentina/valentina-0.6.1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1.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
@@ -38,6 +38,10 @@ DEPEND="${CDEPEND}
 
 S=${WORKDIR}/dismine-${PN}-b639b75d1688
 
+PATCHES=(
+	"${FILESDIR}/5823.patch"
+)
+
 src_configure() {
 	local locales=""
 	local locale
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 36310c308ba2..b4dd4be4f3d6 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -4,8 +4,10 @@ AUX xpaint-2.9.10.3-Fix-build-with-clang.patch 669 BLAKE2B 72e06035a5cbc8f1f20f1
 AUX xpaint-2.9.9.4-QA1.patch 3336 BLAKE2B ef04f399152e9a66e774cff98c6b2c8d6f75761ef03736f33363be8af84421e2fec702aa13353124cf552eccbb3b49645cf2d3515955b39a7407fc90b2d29704 SHA512 2760bd60bc1e6335c48ce4576e9176c5893e70568f99d535b48878e6917591258ff5d206851c312b3af6b1bcda93076a60bcb3452176a49f588d4ffa1ed69a79
 AUX xpaint-2.9.9.4-parallel-make.patch 655 BLAKE2B 37c8ecee14090cb6a7a5543c9d53d52baf31446a5ef731ddf6b397660f6f6f6a598ee72c3309a0df82149e60fe123ad31936858eb48e5d1a141c3de54ddbbfcc SHA512 45161a7a76f05ebff009b8dda5c52baddcd936ee8c5984a3e0fa02d80a56947ba55df68c1241115dcce5a1f75d8993794b761ba0dbadb94b86b9c2ebfbe7c3d7
 AUX xpaint-2.9.9.4-submake.patch 747 BLAKE2B bbdce5e4ccbd6eb6b3957b9969261957d5e42ec12e273000abea0d34eef253325e1092b20df5d86ed2b30083acc5627ac2830d557b42d85f52394f3a99ef16f5 SHA512 72525c5cd892772210cba85b0f5ff193a6474657d6ffbead23c711de3346c87f8d306e252fdd8b98ae136f32311d88be6107bbe72932039bf17e4c0c64b70bae
+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.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
new file mode 100644
index 000000000000..359c779f707e
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-2.10.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg2k pgf tiff"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2c[unicode]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	sys-libs/zlib
+	virtual/jpeg:0
+	jpeg2k? ( media-libs/openjpeg:0= )
+	pgf? ( media-libs/libpgf )
+	tiff? (
+		media-libs/jbigkit:0=
+		media-libs/tiff:0
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e 's/-O3 -s//g' util/Makefile || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		$(use_enable jpeg2k libopenjpeg)
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${D}" -name '*.la' -type f -delete || die
+	find "${D}" -name '*.a' -type f -delete || die
+}