gentoo resync : 05.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
commit: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree: c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /media-gfx
parent: 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)
103 files changed, 1150 insertions, 2747 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index aba448976deb..7d65d598b96f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index e3a66c414dcd..2fa7a0a3f436 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -7,8 +7,13 @@ AUX asymptote-2.41-xdg-utils.patch 744 BLAKE2B 9e36f5f04c7be761abb026fd894417ff5
 AUX asymptote-2.47-configure-ac.patch 475 BLAKE2B d47a0b93bc890f2bbe528458768f1ea66745d8f3341b8870a155fb066fecdc224bdfb8fde78bdb00f671ee11f2222c43d83d79dfd32b47cc8cc26a61fac223bc SHA512 20a3b965aa892f70de432cd201025bea61e1635767b43a890e0c40d3098f982b2c6de663b613b5fac0ceb6c2392935df85f590716f7d92beb0880d0250e28a0e
 AUX asymptote-2.47-info.patch 436 BLAKE2B bb74a841ea91483fb46845d6f5fe7a5ff98d6b890632fd1bc6fdb24a182aed1a7ba531f8ad472201b1b6e898985ca3981f3a3ad6eea312059081188077fb9082 SHA512 df36a1a7987538ec93acdb99513da5bd45835137b0e82b17a686daf1821a4111b24400fb090d79de9d477930a6258b91af526bf653e8ca8cf5c7e88969f253d3
 AUX asymptote-2.47-xdg-utils.patch 727 BLAKE2B e49045dac05319382a1c1b649ce525d8bc806dbd4e9cf080103b4371025e57880d82b578c7e85f0f41c9b728ad29acce073629a5b04e4382897632c2ed18dbf8 SHA512 c30b8190f008730846364b4e97667053fc31308eac5173226617d7f1d41f828ebb8f9307012be9eab7dfa99163aa00d5c0d7d49c3765740561acc9e90772208b
+AUX asymptote-2.48-configure-ac.patch 475 BLAKE2B 9794a455eef50cab9bf0bfe306adc39971f4255eaf2dae3357e16d3754d6b577cfd28efafc887a2a4ed22a9569f2e6211e74d61ee85b351690e4390f74ebf507 SHA512 10f60794c7fd79d1fd11cbec7afe0fdbd82ff62add1ed13c1089f24d896867a35b54f6e245dfa2c757193b8575cf582a92390fedba69331159fa9107fd3dc8c7
+AUX asymptote-2.48-info.patch 436 BLAKE2B 549c1dabc62651789889ae78d82dc59326982aa37e8903474a7023481f514a1c0632cd114c347b607ea08901c1f93e751e41d064d16e1dcd4bb8eeedb2a4d5d4 SHA512 f38f45e1148ddd97c231221995cdc04527ed711a60820a7b07ac30272ae3cade1a27786215064a1ca42055b5a3edbc49780b587e3f4d074a3eb2d9ee229cdba6
+AUX asymptote-2.48-xdg-utils.patch 727 BLAKE2B 0352df07cb5930daa71d3fdbf2fb6230b22d3423e06e596e4c92358ba5f84b473900c76c28a083ed583fed21ed644bbe43ec59e7e65ce91257d72ee5d31b794e SHA512 ea5d83b50973bb361e5ad3ad409c2fa0f634fb390a52d17d4a1915960dcff1a84a56e5a59e79cb2fcdd7a02dd7544ee7c58bade22e3c519641e94019bd1d3ffc
 DIST asymptote-2.41.src.tgz 3516426 BLAKE2B d4623609be58566e32de82c5c47f635ed737459fa27cd2da0622d639cd8207fc69988a7ecbf82993b051435fbf223c1f1178d213aea258a2b57fd3a698eee9cb SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb
 DIST asymptote-2.47.src.tgz 3621676 BLAKE2B 575032093276b9df6b8d74897a4721dd0d5419b3380bce7962afc9dcdd20ec3bd47b5c4b882f2276a2ac4c0d99e657d7385122d7dc400efbfb52ceec753ee8f4 SHA512 9efc4a70e8d29d6d50ba49c54c48da38beb00f64e5b39f23dbaec5cb12b714e427473fdffbf71f2d636a007cbfc993fa3237a8beab01e3419c1da1287823c159
+DIST asymptote-2.48.src.tgz 3729763 BLAKE2B 5820ddbbd27f6e7296501f50f25051d8417a0ab24d7c4c777013bf23601b5cbe34a69ba781e16e05141fda4e2e7a8bc527a41829f8d9e983aadc19bd05743122 SHA512 cd8b756185ae6627ea66bcaea224152f6644df633fe7ed40c1738f3b2ec31fbaa7ba97f2b1e290b073995779768ee3a264dd942f609b768cab7624d12807583d
 EBUILD asymptote-2.41-r1.ebuild 4666 BLAKE2B b08d0c753cd411fa0c0c6d32a9c28874e3f035481a5a52277e3e0c43dcab2fc98a51671859ec4542cbbd8d65b0a7519e15cc665053d1e28cc190a8547ae088b3 SHA512 3160eada27c3c6a905df3b622019fb2f759a13ce7c261eabbd84d64483e55fbecc3ae13a5fb42d61b70e4a2874dd32187df1d0bb63f64e02fa6899dc1efeac80
 EBUILD asymptote-2.47.ebuild 4609 BLAKE2B 72b9016f520f39be0841b5363935e0e8fed242c2b1389d3c483f607495c7f432f58384072c760de9869c2d64b5864e19d93b124f9ba8650d44ca08c74f827ef7 SHA512 32f999eead1c5a8875b29ab01b268f4e1724bf4ba80d8e90665d5229fd6b9f267aa1f692b531d137d48175aaa49fe6abb87a05a8950635c80faa890abd8a8bda
+EBUILD asymptote-2.48-r1.ebuild 4655 BLAKE2B 5a26448a84033c85122683607981353344e67713cfc0ed1a817a4ada501db5110a913d0ab025b5e8762a4fdd4056f15b7f0272a9c2f4175a1bf78240832eb4ff SHA512 2a3ce261339eeadd288ffa56ffd1290496c7e961af2cee84aa5865f50e3f5971fbd9ba89f58ddb2febce28c1d05c396ab3fa4ea19c3d26dab90c215a062fe81c
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.48-r1.ebuild b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
new file mode 100644
index 000000000000..6a39f53426e1
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools elisp-common latex-package multilib python-r1
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="http://asymptote.sourceforge.net/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	offscreen? ( opengl )
+	doc? ( boehm-gc )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	offscreen? ( media-libs/mesa[osmesa] )
+	svg? ( app-text/dvisvgm )
+	sigsegv? ( dev-libs/libsigsegv )
+	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
+	fftw? ( >=sci-libs/fftw-3.0.1 )
+	gsl? ( sci-libs/gsl )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/numpy
+		dev-python/pycson
+		>=gnome-base/librsvg-2.40
+		)
+	latex? (
+		virtual/latex-base
+		>=dev-texlive/texlive-latexextra-2013
+		)
+	emacs? ( virtual/emacs )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-lang/perl
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )"
+
+TEXMF=/usr/share/texmf-site
+
+PATCHES=(
+	# gc.h -> gc/gc.h
+	"${FILESDIR}/${P}-configure-ac.patch"
+
+	# Changing pdf, ps, image viewers to xdg-open
+	"${FILESDIR}/${P}-xdg-utils.patch"
+
+	# Bug #322473
+	"${FILESDIR}/${P}-info.patch"
+)
+
+src_prepare() {
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf \
+		CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		CFLAGS="${CXXFLAGS}" \
+		--disable-gc-debug \
+		$(use_enable boehm-gc gc system) \
+		$(use_enable fftw) \
+		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable offscreen) \
+		$(use_enable sigsegv)
+}
+
+src_compile() {
+	default
+
+	cd doc || die
+	emake asy.1
+	if use doc; then
+		# info
+		einfo "Making info"
+		emake ${PN}.info
+		cd FAQ || die
+		emake
+		cd .. || die
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		# see bug #260606
+		emake -j1 asymptote.pdf
+		emake CAD.pdf
+	fi
+	cd .. || die
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el
+	fi
+}
+
+src_install() {
+	# the program
+	dobin asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins base/*.asy
+
+	# documentation
+	dodoc BUGS ChangeLog README ReleaseNotes TODO
+	doman doc/asy.1
+
+	# X GUI
+	if use X; then
+		insinto /usr/share/${PN}
+		doins -r GUI
+		chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
+		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins \
+			examples/*.asy \
+			examples/*.eps \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/extra/*.asy
+		insinto /usr/share/${PN}/examples/animations
+		doins examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins ${PN}.sty asycolors.sty
+		if use examples; then
+			insinto /usr/share/${PN}/examples
+			doins latexusage.tex
+		fi
+		cd .. || die
+	fi
+
+	# asymptote.py
+	if use python; then
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/asy-ftd.vim
+	fi
+
+	# extra documentation
+	if use doc; then
+		cd doc || die
+		doinfo ${PN}.info*
+		cd FAQ || die
+		dodoc asy-faq.ascii
+		doinfo asy-faq.info
+		insinto /usr/share/doc/${PF}/html/FAQ
+		doins asy-faq.html/*
+		cd .. || die
+		insinto /usr/share/doc/${PF}
+		doins ${PN}.pdf CAD.pdf
+	fi
+}
+
+pkg_postinst() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch
new file mode 100644
index 000000000000..ef6fc52c934b
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.48/configure.ac
+===================================================================
+--- asymptote-2.48.orig/configure.ac
++++ asymptote-2.48/configure.ac
+@@ -162,7 +162,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
+       fi
+       CPPFLAGS_SAVE=$CPPFLAGS
+       CPPFLAGS=$CPPFLAGS" $INCL"
+-      AC_CHECK_HEADER(gc.h,
++      AC_CHECK_HEADER([gc/gc.h],
+ 	AC_CHECK_LIB([gc],[GC_malloc],[
+ 	  LIBS=$LIBS"-lgc "
+ 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.48-info.patch b/media-gfx/asymptote/files/asymptote-2.48-info.patch
new file mode 100644
index 000000000000..cd1577037f1f
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.48-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.48/doc/asymptote.texi
+===================================================================
+--- asymptote-2.48.orig/doc/asymptote.texi
++++ asymptote-2.48/doc/asymptote.texi
+@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
+      
+ @dircategory Languages
+ @direntry
+-* asymptote: (asymptote/asymptote). Vector graphics language.
++* asymptote: (asymptote). Vector graphics language.
+ @end direntry
+ 
+ @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch
new file mode 100644
index 000000000000..fe4ca556a73c
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch
@@ -0,0 +1,23 @@
+Index: asymptote-2.48/settings.cc
+===================================================================
+--- asymptote-2.48.orig/settings.cc
++++ asymptote-2.48/settings.cc
+@@ -91,15 +91,15 @@ bool msdos=false;
+ string HOME="HOME";
+ string docdir=ASYMPTOTE_DOCDIR;
+ const char pathSeparator=':';
+-string defaultPSViewer="gv";
++string defaultPSViewer="xdg-open";
+ #ifdef __APPLE__
+ string defaultPDFViewer="open";
+ #else  
+-string defaultPDFViewer="acroread";
++string defaultPDFViewer="xdg-open";
+ #endif  
+ string defaultGhostscript="gs";
+ string defaultGhostscriptLibrary="";
+-string defaultDisplay="display";
++string defaultDisplay="xdg-open";
+ string defaultAnimate="animate";
+ void queryRegistry() {}
+ const string dirsep="/";
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index e8e067a3b9c2..36ed0c13b794 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,18 +1,10 @@
-AUX blender-2.68-doxyfile.patch 732 BLAKE2B f5c1682aca8a2d6ba8baec140d1766965f1dabc6c99f5bbc8a7b43ce5d2083e96555a0c73df519132fd6953ec91a80b210ccba5a4a862ebe8f9831c0e8e049ef SHA512 5191a25127e24d3ac7b18f6cd0b247e76a3fdeec46640f5d1ecba118fa35abbdaf19642c718e85149a304e9dc2093465b54b96e343f125163d091f045ab09db7
-AUX blender-2.68-fix-install-rules.patch 740 BLAKE2B f6dbb945666a39b30b00388279a6e456be61f1d611d7cd04d8006360b43ca7d9fc4921d97287322f4856b3e910892bb2a332fbc2aa7dc568985af683a919d990 SHA512 dd21cb3aa8bf965631132d39ad8a43c15d0c32faeaee00e8b8a970108fba0ab43b2402e3637dcd0b3430b7023ac9203b0395bbd2dc2dd9eb80d8c1d994d89e4f
-AUX blender-2.70-sse2.patch 1421 BLAKE2B d8566eccad25534f8c97100c7f12b630adec156c5293e5923577068db1f1565e68b1ddbe841fecadd0b64b94b6a6ba10a525e649f212f9e3f84ca2358f74bdc4 SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca
-AUX blender-2.72-T42797.diff 342 BLAKE2B 0aa4724ae35004bc629db5c359059d4dd732d4f13fb9a8eabdde9cac9fbfcf009f52e435895405bd81180061ebab3c9a7030fbc257e967b2a1800753bcec37a3 SHA512 abe6c6e28a094ef76bad97c979f5927c464a8421a430bde3ea0fadc76eabd7a9049678a5d475363aba5e534fe12c8858ddcfd5e01fa39ba24ea79ebabec71407
-AUX blender-2.72b-fix-util_simd.patch 292 BLAKE2B 176faae00e80e741297e0c06998b0c40d7b5a2d2939ca947094144ca90daf0a33d91ab0b7704aa32e09ef13f4aca9c79d5f969ecaad72251fc86e9b7bcce7a07 SHA512 17c328b9c64f1f42b4223d5f0777a68500235f95a85b761fdef216c5af4be17f67455e8044ab52fe6dd3e0bdfc6a7075cc3c21dae135a9cc7d174b6972b0326b
-AUX blender-2.72b-gcc6-fixes.patch 4828 BLAKE2B aa189c58028c61102be7f1b6485700fd8d2968e65f6f71b6a2527f38f4ada0039017c67d2110b4a532140f1903c7ea7fbeaffadebbafa781e07e900803bfeac8 SHA512 886d594a87aafe827ed65c6106c29c727ec31b92a3a2df32023cc2b728719c4e6e7a8418b725201d338331e23cca17a88f518b353735b33e40cee30a754050cc
 AUX blender-2.79-fix-build-with-OSL-1.9.x.patch 1119 BLAKE2B f0289707d5383ee11af257b7d77a725e83aba3c086c12a4a2fb390bb5e02a27c4f3376083ddfd827e3ff3ca24212df4ea463062c6bea524aaee373847837986e SHA512 0a02efdcc6710d34e57ff99ff5c999cebeb7cf130fba76fa82ba29f0827ee63c97448eb01aa10982096d22b61fbc1751be5e1fe3154792e266b0c9dd04c54f42
 AUX blender-2.79b-ffmpeg-4-compat.patch 2052 BLAKE2B 3e9f341416a3dc629d950623cc54da4c2984c7f73b6565cb7cb0aa00bf86eec725f0fdc503a517b29282596669de108d1dbe2c9783c8a0da412a6d14834d5cdf SHA512 afd90ee52a2a7d955417450e92642e2169c1f0e6d20d96a1f08521db718bc224941c15d23152eb3fcde1b4dc84ffb52162d77b23252ef8250a6b5ddbcd8ca67d
 AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
-DIST blender-2.72b.tar.gz 52018242 BLAKE2B fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
 DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
-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 8163 BLAKE2B cfa1181a4044655d55606a1ab20105aa41b629671e6c6ae7ab501f7de199a4369b07a100a33ff9a0caa33869e57ceadeb5ec0976aa32e7f0fb336efa2b8de4b3 SHA512 705967cd0c67a2185f17fb335320dfc5b69c605c6e6615a1b84aa7073a3bf9c34adbf0b43d90707e54bba1219b5472eb320aa22f6897afa1a9ac0b6fcb1860eb
-MISC metadata.xml 3466 BLAKE2B e09a22c7fe5200a7b592c3fda2bdb4ae719ebe614f85d8cb8e9c4c72684fe785575e6b6b4f0e302b1e9beddc7476125e2e443943ff018d35d37f015c1b6414d8 SHA512 0112674420ffeb427dd2ad1cda3ad3e01801e02fa2bbb5dcaec15db21b4582cfff4712d5e587ab875619e94dacab4fa0263d9f635c48e5c94569bc6155577523
+MISC metadata.xml 2642 BLAKE2B 9575416eeb3ef81373e60263e095b5dcd441b710945775ae3a79c1bfd5b511e15751d37c0e9f6833d2e7de9f39d628a1e3c6c91707b3ee1573e64e8e1ae4b874 SHA512 0bc219e6065e76753c1dbe1aeee7c277d29e6574db388994e2dac13ecf4837233155e4c319bf41f484c7341a074dc2b60dd0b86a350ac438504205c555761b4f
diff --git a/media-gfx/blender/blender-2.72b-r4.ebuild b/media-gfx/blender/blender-2.72b-r4.ebuild
deleted file mode 100644
index 9d68984d4e3c..000000000000
--- a/media-gfx/blender/blender-2.72b-r4.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## BUNDLED-DEPS:
-# extern/cuew
-# extern/Eigen3
-# extern/xdnd
-# extern/carve
-# extern/glew
-# extern/libmv
-# extern/clew
-# extern/colamd
-# extern/lzma
-# extern/gtest
-# extern/rangetree
-# extern/libredcode
-# extern/wcwidth
-# extern/binreloc
-# extern/recastnavigation
-# extern/bullet2
-# extern/lzo
-# extern/libopenjpeg
-# extern/libmv/third_party/msinttypes
-# extern/libmv/third_party/ceres
-# extern/libmv/third_party/gflags
-# extern/libmv/third_party/glog
-
-EAPI=6
-PYTHON_COMPAT=( python3_4 )
-#PATCHSET="1"
-
-inherit multilib gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-case ${PV} in
-	*_p*)
-		SRC_URI="https://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
-	*)
-		SRC_URI="https://download.blender.org/source/${P}.tar.gz" ;;
-esac
-
-if [[ -n ${PATCHSET} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
-fi
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 x86"
-IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k libav ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile cpu_flags_x86_sse cpu_flags_x86_sse2 tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	player? ( game-engine )
-	redcode? ( jpeg2k ffmpeg )
-	cycles? ( boost openexr tiff )
-	nls? ( boost )
-	colorio? ( boost )
-	openal? ( boost )
-	game-engine? ( boost )
-	?? ( ffmpeg libav )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/freetype-2.0:2
-	media-libs/glew:0=
-	media-libs/libpng:0
-	media-libs/libsamplerate
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/libintl
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXxf86vm
-	boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
-	collada? ( >=media-libs/opencollada-1.6.18 )
-	colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
-	cycles? (
-		media-libs/openimageio
-	)
-	ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] )
-	libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] )
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( >=media-libs/openal-1.6.372 )
-	openimageio? ( media-libs/openimageio )
-	openexr? ( media-libs/ilmbase media-libs/openexr )
-	sdl? ( media-libs/libsdl[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[-nodot(-),dot(+)]
-		dev-python/sphinx
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.68-doxyfile.patch
-	"${FILESDIR}"/${PN}-2.68-fix-install-rules.patch
-	"${FILESDIR}"/${PN}-2.70-sse2.patch
-	"${FILESDIR}"/${PN}-2.72-T42797.diff
-	"${FILESDIR}"/${P}-fix-util_simd.patch
-	"${FILESDIR}"/${P}-gcc6-fixes.patch
-)
-
-pkg_pretend() {
-	if use openmp && ! tc-has-openmp; then
-		eerror "You are using gcc built without 'openmp' USE."
-		eerror "Switch CXX to an OpenMP capable compiler."
-		die "Need openmp"
-	fi
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# we don't want static glew, but it's scattered across
-	# thousand files
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	sed -i \
-		-e '/-DGLEW_STATIC/d' \
-		$(find . -type f -name "CMakeLists.txt") || die
-
-	# linguas cleanup
-	local i
-	if ! use nls; then
-		rm -r "${S}"/release/datafiles/locale || die
-	else
-		if [[ -n "${LINGUAS+x}" ]] ; then
-			cd "${S}"/release/datafiles/locale/po
-			for i in *.po ; do
-				mylang=${i%.po}
-				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
-			done
-		fi
-	fi
-}
-
-src_configure() {
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	append-flags -funsigned-char
-	append-lfs-flags
-	append-ldflags $(no-as-needed)
-
-	# WITH_PYTHON_SECURITY
-	# WITH_PYTHON_SAFETY
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_BOOST=$(usex boost ON OFF )
-		-DWITH_CYCLES=$(usex cycles ON OFF )
-		-DWITH_OPENCOLLADA=$(usex collada ON OFF )
-		-DWITH_IMAGE_DDS=$(usex dds ON OFF )
-		-DWITH_MOD_FLUID=$(usex elbeem ON OFF )
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg ON OFF )
-		-DWITH_FFTW3=$(usex fftw ON OFF )
-		-DWITH_MOD_OCEANSIM=$(usex fftw ON OFF )
-		-DWITH_GAMEENGINE=$(usex game-engine ON OFF )
-		-DWITH_INTERNATIONAL=$(usex nls ON OFF )
-		-DWITH_JACK=$(usex jack ON OFF )
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k ON OFF )
-		-DWITH_OPENIMAGEIO=$(usex openimageio ON OFF )
-		-DWITH_OPENAL=$(usex openal ON OFF )
-		-DWITH_IMAGE_OPENEXR=$(usex openexr ON OFF )
-		-DWITH_OPENMP=$(usex openmp ON OFF )
-		-DWITH_OPENNL=$(usex opennl ON OFF )
-		-DWITH_PLAYER=$(usex player ON OFF )
-		-DWITH_IMAGE_REDCODE=$(usex redcode ON OFF )
-		-DWITH_SDL=$(usex sdl ON OFF )
-		-DWITH_CODEC_SNDFILE=$(usex sndfile ON OFF )
-		-DWITH_RAYOPTIMIZATION=$(usex cpu_flags_x86_sse ON OFF )
-		-DWITH_SSE2=$(usex cpu_flags_x86_sse2 ON OFF )
-		-DWITH_BULLET=$(usex bullet ON OFF )
-		-DWITH_IMAGE_TIFF=$(usex tiff ON OFF )
-		-DWITH_OPENCOLORIO=$(usex colorio ON OFF )
-		-DWITH_INPUT_NDOF=$(usex ndof ON OFF )
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug ON OFF )
-		-DWITH_ASSERT_ABORT=$(usex debug ON OFF )
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_PYTHON_INSTALL_NUMPY=OFF
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_OPENJPEG=ON
-		-DWITH_SYSTEM_BULLET=OFF
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		cards=( /dev/ati/card* /dev/nvidia* )
-		for card in "${cards[@]}"; do addpredict "${card}"; done
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	local i
-
-	# Pax mark blender for hardened support.
-	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
-
-	if use doc; then
-		docinto "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
-
-		docinto "html/API/blender"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
-	fi
-
-	# fucked up cmake will relink binary for no reason
-	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
-
-	# fix doc installdir
-	docinto "html"
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -rf "${ED%/}"/usr/share/doc/blender
-
-	python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py
-	python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripting."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/blender/files/blender-2.68-doxyfile.patch b/media-gfx/blender/files/blender-2.68-doxyfile.patch
deleted file mode 100644
index c11c793fda97..000000000000
--- a/media-gfx/blender/files/blender-2.68-doxyfile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 62308d9fc24bde22a50497816c44c8ca91f96f63
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:36:34 2013 +0200
-
-    remove hhc.exe reference
-
-diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
-index 397cc30..ac61756 100644
---- a/doc/doxygen/Doxyfile
-+++ b/doc/doxygen/Doxyfile
-@@ -1051,7 +1051,7 @@ CHM_FILE               = blender.chm
- # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
- # the HTML help compiler on the generated index.hhp.
- 
--HHC_LOCATION           = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe"
-+HHC_LOCATION           = 
- 
- # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
- # controls if a separate .chi index file is generated (YES) or that
diff --git a/media-gfx/blender/files/blender-2.68-fix-install-rules.patch b/media-gfx/blender/files/blender-2.68-fix-install-rules.patch
deleted file mode 100644
index aa8ecc9f6174..000000000000
--- a/media-gfx/blender/files/blender-2.68-fix-install-rules.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 94eed33f878e35a8c7b69b0c23b3b30026460f33
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:50:08 2013 +0200
-
-    remove stupid uninstall snippet
-    
-    whoever coded this... it is dangerous
-    uninstall methods have NO PLACE in install rules
-
-diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index c84d944..2b9bf46 100644
---- a/source/creator/CMakeLists.txt
-+++ b/source/creator/CMakeLists.txt
-@@ -268,12 +268,6 @@ endif()
- # Install Targets (Generic, All Platforms)
- 
- 
--# important to make a clean  install each time, else old scripts get loaded.
--install(
--	CODE
--	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
--)
--
- if(WITH_PYTHON)
- 	# install(CODE "message(\"copying blender scripts...\")")
- 	
diff --git a/media-gfx/blender/files/blender-2.70-sse2.patch b/media-gfx/blender/files/blender-2.70-sse2.patch
deleted file mode 100644
index 6fc870ea3258..000000000000
--- a/media-gfx/blender/files/blender-2.70-sse2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:50:19 2013 +0200
-
-    add option to explicitly control sse2 optimization
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78bb3c6..d5f4576 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -86,6 +86,7 @@
- #-----------------------------------------------------------------------------
- # Load some macros.
- include(build_files/cmake/macros.cmake)
-+include(CMakeDependentOption)
- 
- 
- #-----------------------------------------------------------------------------
-@@ -251,6 +252,7 @@
- # Misc
- option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
- option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON)
-+cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF)
- option(WITH_OPENNL        "Enable use of Open Numerical Library" ON)
- if(UNIX AND NOT APPLE)
- 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
-@@ -1950,7 +1952,7 @@
- 		set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}")
- 		add_definitions(-D__SSE__ -D__MMX__)
- 	endif()
--	if(SUPPORT_SSE2_BUILD)
-+	if(WITH_SSE2 AND SUPPORT_SSE2_BUILD)
- 		set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}")
- 		add_definitions(-D__SSE2__)
- 		if(NOT SUPPORT_SSE_BUILD) # dont double up
diff --git a/media-gfx/blender/files/blender-2.72-T42797.diff b/media-gfx/blender/files/blender-2.72-T42797.diff
deleted file mode 100644
index cef03853434c..000000000000
--- a/media-gfx/blender/files/blender-2.72-T42797.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/source/blender/blenfont/intern/blf_glyph.c
-+++ a/source/blender/blenfont/intern/blf_glyph.c
-@@ -262,8 +262,8 @@
- 	g->xoff = -1;
- 	g->yoff = -1;
- 	bitmap = slot->bitmap;
--	g->width = bitmap.width;
--	g->height = bitmap.rows;
-+	g->width = (int)bitmap.width;
-+	g->height = (int)bitmap.rows;
- 
- 	if (g->width && g->height) {
- 		if (sharp) {
diff --git a/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch b/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch
deleted file mode 100644
index 8c83ee096284..000000000000
--- a/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/intern/cycles/util/util_simd.h	2014-10-20 12:58:22.000000000 +0500
-+++ b/intern/cycles/util/util_simd.h	2015-05-17 11:57:37.000000000 +0500
-@@ -19,6 +19,7 @@
- #define __UTIL_SIMD_TYPES_H__
- 
- #include <limits>
-+#include <x86intrin.h>
- 
- #include "util_debug.h"
- #include "util_types.h"
diff --git a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch b/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
deleted file mode 100644
index 1c4ab09e62cb..000000000000
--- a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -purN a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
---- a/source/blender/imbuf/intern/dds/ColorBlock.cpp	2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp	2016-09-22 15:50:25.359318967 +0100
-@@ -86,8 +86,8 @@ void ColorBlock::init(const Image *img,
- 
- void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y)
- {
--	const uint bw = min(w - x, 4U);
--	const uint bh = min(h - y, 4U);
-+	const uint bw = MIN(w - x, 4U);
-+	const uint bh = MIN(h - y, 4U);
- 
- 	// Blocks that are smaller than 4x4 are handled by repeating the pixels.
- 	// @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :(
-@@ -107,8 +107,8 @@ void ColorBlock::init(uint w, uint h, co
- 
- void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y)
- {
--	const uint bw = min(w - x, 4U);
--	const uint bh = min(h - y, 4U);
-+	const uint bw = MIN(w - x, 4U);
-+	const uint bh = MIN(h - y, 4U);
- 
- 	// Blocks that are smaller than 4x4 are handled by repeating the pixels.
- 	// @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :(
-@@ -124,10 +124,10 @@ void ColorBlock::init(uint w, uint h, co
- 			const uint idx = ((y + by) * w + x + bx);
- 			
- 			Color32 & c = color(e, i);
--			c.r = uint8(255 * clamp(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes?
--			c.g = uint8(255 * clamp(data[idx + 1 * srcPlane], 0.0f, 1.0f));
--			c.b = uint8(255 * clamp(data[idx + 2 * srcPlane], 0.0f, 1.0f));
--			c.a = uint8(255 * clamp(data[idx + 3 * srcPlane], 0.0f, 1.0f));
-+			c.r = uint8(255 * CLAMP(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes?
-+			c.g = uint8(255 * CLAMP(data[idx + 1 * srcPlane], 0.0f, 1.0f));
-+			c.b = uint8(255 * CLAMP(data[idx + 2 * srcPlane], 0.0f, 1.0f));
-+			c.a = uint8(255 * CLAMP(data[idx + 3 * srcPlane], 0.0f, 1.0f));
- 		}
- 	}
- }
-diff -purN a/source/blender/imbuf/intern/dds/Common.h b/source/blender/imbuf/intern/dds/Common.h
---- a/source/blender/imbuf/intern/dds/Common.h	2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/Common.h	2016-09-22 15:47:31.327081239 +0100
-@@ -28,14 +28,14 @@
- #ifndef __COMMON_H__
- #define __COMMON_H__
- 
--#ifndef min
--#define min(a,b) ((a) <= (b) ? (a) : (b))
-+#ifndef MIN
-+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
- #endif
--#ifndef max
--#define max(a,b) ((a) >= (b) ? (a) : (b))
-+#ifndef MAX
-+#define MAX(a,b) ((a) >= (b) ? (a) : (b))
- #endif
--#ifndef clamp
--#define clamp(x,a,b) min(max((x), (a)), (b))
-+#ifndef CLAMP
-+#define CLAMP(x,a,b) MIN(MAX((x), (a)), (b))
- #endif
- 
- template<typename T>
-diff -purN a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
---- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp	2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp	2016-09-22 16:10:53.985775837 +0100
-@@ -1102,8 +1102,8 @@ void DirectDrawSurface::mipmap(Image *im
- 	// Compute width and height.
- 	for (uint m = 0; m < mipmap; m++)
- 	{
--		w = max(1U, w / 2);
--		h = max(1U, h / 2);
-+		w = MAX(1U, w / 2);
-+		h = MAX(1U, h / 2);
- 	}
- 	
- 	img->allocate(w, h);
-@@ -1223,9 +1223,9 @@ void DirectDrawSurface::readBlockImage(I
- 			readBlock(&block);
- 			
- 			// Write color block.
--			for (uint y = 0; y < min(4U, h-4*by); y++)
-+			for (uint y = 0; y < MIN(4U, h-4*by); y++)
- 			{
--				for (uint x = 0; x < min(4U, w-4*bx); x++)
-+				for (uint x = 0; x < MIN(4U, w-4*bx); x++)
- 				{
- 					img->pixel(4*bx+x, 4*by+y) = block.color(x, y);
- 				}
-@@ -1240,7 +1240,7 @@ static Color32 buildNormal(uint8 x, uint
- 	float ny = 2 * (y / 255.0f) - 1;
- 	float nz = 0.0f;
- 	if (1 - nx*nx - ny*ny > 0) nz = sqrt(1 - nx*nx - ny*ny);
--	uint8 z = clamp(int(255.0f * (nz + 1) / 2.0f), 0, 255);
-+	uint8 z = CLAMP(int(255.0f * (nz + 1) / 2.0f), 0, 255);
- 	
- 	return Color32(x, y, z);
- }
-@@ -1379,9 +1379,9 @@ uint DirectDrawSurface::mipmapSize(uint
- 	
- 	for (uint m = 0; m < mipmap; m++)
- 	{
--		w = max(1U, w / 2);
--		h = max(1U, h / 2);
--		d = max(1U, d / 2);
-+		w = MAX(1U, w / 2);
-+		h = MAX(1U, h / 2);
-+		d = MAX(1U, d / 2);
- 	}
- 
- 	if (header.pf.flags & DDPF_FOURCC)
-diff -purN a/source/blender/imbuf/intern/dds/FlipDXT.cpp b/source/blender/imbuf/intern/dds/FlipDXT.cpp
---- a/source/blender/imbuf/intern/dds/FlipDXT.cpp	2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/FlipDXT.cpp	2016-09-22 16:11:35.626829002 +0100
-@@ -246,8 +246,8 @@ int FlipDXTCImage(unsigned int width, un
- 
- 		// mip levels are contiguous.
- 		data += block_bytes * blocks;
--		mip_width = max(1U, mip_width >> 1);
--		mip_height = max(1U, mip_height >> 1);
-+		mip_width = MAX(1U, mip_width >> 1);
-+		mip_height = MAX(1U, mip_height >> 1);
- 	}
- 
- 	return 1;
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 9dd73dfe3522..14a1619c7d4c 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer restrict="&gt;=media-gfx/blender-2.77" type="person">
+	<maintainer type="person">
 		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
-	<maintainer restrict="&gt;=media-gfx/blender-2.77" type="person">
+	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
@@ -20,9 +20,6 @@
 	</longdescription>
 
 	<use>
-		<flag name="boost">
-			Enable features depending on boost.
-		</flag>
 		<flag name="bullet">
 			Enable Bullet (Physics Engine).
 		</flag>
@@ -50,49 +47,42 @@
 		<flag name="elbeem">
 			Adds surface fluid simulation to Blender using El'Beem library.
 		</flag>
-		<flag name="game-engine" restrict="&gt;=media-gfx/blender-2.50">
+		<flag name="game-engine">
 			Adds Game Engine support to Blender.
 		</flag>
-		<flag name="headless" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="headless">
 			Build without graphical support (renderfarm, server mode only).
 		</flag>
-		<flag name="llvm" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="llvm">
 			Enable features depending on llvm.
 		</flag>
-		<flag name="man" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="man">
 			Build and install man pages.
 		</flag>
 		<flag name="ndof">
 			Enable NDOF input devices (SpaceNavigator and friends).
 		</flag>
-		<flag name="opencl" restrict="&lt;=media-gfx/blender-2.79">
+		<flag name="opencl">
 			Allow OpenCL Graphics Acceleration. This may
 			require extra graphics card drivers.</flag>
 		<flag name="openimageio">Enable OpenImageIO Support</flag>
-		<flag name="opennl" restrict="&lt;=media-gfx/blender-2.73">
-			Enable use of Open Numerical Library
-		</flag>
-		<flag name="opensubdiv" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="opensubdiv">
 			Add rendering support form OpenSubdiv from Dreamworks Animation
 			through <pkg>media-libs/opensubdiv</pkg>.
 		</flag>
-		<flag name="openvdb" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="openvdb">
 			Add GPU preview rendering. Only works with nVidia cards.
 		</flag>
-		<flag name="osl" restrict="&gt;=media-gfx/blender-2.79">
+		<flag name="osl">
 			Add support for OpenShadingLanguage scripting.
 		</flag>
 		<flag name="player">
 			Build the Blender Player. THis requires the Game engine.
 		</flag>
-		<flag name="redcode" restrict="&lt;=media-gfx/blender-2.73">
-			This flag add support for RED CODE camera digital format (5K HD
-			images *.r3d) - EXPERIMENTAL.
-		</flag>
-		<flag name="test" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="test">
 			Build the provided unit tests.
 		</flag>
-		<flag name="valgrind" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="valgrind">
 			Add support for memory debugging using
 			<pkg>dev-util/valgrind</pkg>
 		</flag>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 3d93295d5dfa..009f5701b6cc 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,16 +1,8 @@
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
-DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
-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-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
-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 3731 BLAKE2B 6afcf3c29ad6876d7d9c20ae7f124d789e51f3325f14d6d1084e141b98b7bb6e259c38c066236255ef1ec10257ea12379bc91d9c6b80c43d0049c1b8c33e3387 SHA512 0e06808fd7d8689d12ac3f91d7cbbcb411d5015cbfa70ce98458332a747bfda199ec662dd0ff3074a9fa889a4a124ae4e3f13f1563a8e82b2cc3faa78683c843
 EBUILD darktable-2.6.1.ebuild 3735 BLAKE2B 12db2af18017c4770acf9553035542292f501149583e4037961f3f0ffa4bd70fd123e97f0d7771c95224482da615d72ab6458ea0f2fb43076d6de6924a32e010 SHA512 7d762bad746d01c80bd85c33233ef1dbf8ab7e4b5992c4dbeda79bb5579bbfece81903d3ad8532d0ab36bd0a1d76a3a22eb2c1285ef761cfa36de9542eac506d
+EBUILD darktable-2.6.2.ebuild 3737 BLAKE2B a030fb0083587d73a5195a374cf37a7dea114a9207283841a4e07bf071cfac7ee3db77dd0f840160887402297041e64a29a9b4565088003c1a60aea78a39d49d SHA512 b8a7e75e9c247c12b1ce5c584ec3b2524b81a0f1aae4fcbcf284e9e37858ba70b54e0942dd92578eac84489415531a40e9827e8df26e150054833d915facc790
 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.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild
deleted file mode 100644
index 09628ed7484f..000000000000
--- a/media-gfx/darktable/darktable-2.2.5.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
-
-DOC_PV="2.2.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 cs da de es fr he hu it ja nl pl ru sk sl sv uk"
-# 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_}"
-
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-CDEPEND="
-	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
-	virtual/jpeg:0
-	virtual/glu
-	virtual/opengl
-	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:0 )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-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)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-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-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	for lang in ${LANGS} ; do
-		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
-	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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	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!"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/darktable/darktable-2.4.3.ebuild b/media-gfx/darktable/darktable-2.4.3.ebuild
deleted file mode 100644
index 2d418fad028b..000000000000
--- a/media-gfx/darktable/darktable-2.4.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
-
-DOC_PV="2.4.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 cs da de es fr he hu it ja nl pl ru sk sl sv uk"
-# 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_}"
-
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-CDEPEND="
-	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= )"
-RDEPEND="${CDEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)"
-
-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)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-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
-		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
-	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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	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!"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/darktable/darktable-2.4.4.ebuild b/media-gfx/darktable/darktable-2.4.4.ebuild
deleted file mode 100644
index 76721f6a80a4..000000000000
--- a/media-gfx/darktable/darktable-2.4.4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
-
-DOC_PV="2.4.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 cs da de es fr he hu it ja nl pl ru sk sl sv uk"
-# 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_}"
-
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-CDEPEND="
-	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= )"
-RDEPEND="${CDEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)"
-
-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)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-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
-		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
-	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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	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!"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/darktable/darktable-2.6.0.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index 0a6833989c25..16cb27650ab5 100644
--- a/media-gfx/darktable/darktable-2.6.0.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LANGS=" ca de fi fr hu ja nb nl pt-BR ru sl"
+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
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 00bb77e43470..c2f5f9aae448 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,7 +1,10 @@
 DIST DisplayCAL-3.7.1.2.tar.gz 10472879 BLAKE2B a0722af9c8a6df8af57c0a66e792886b6aecb78bec79d0bed22567bd6ce540793ed6dd51437cbf1974b9070b9adb3708f841cf8cfae0e482056d90783be6ddbd SHA512 d708110e0528ffada5fd4a0ca7da9cf02a54964bc7d5af2b98738aa3e34079c0a4890f2cf6086750045915e06d6c943fc954e0f03653d25c080522a4b24795bd
 DIST DisplayCAL-3.7.1.3.tar.gz 10474328 BLAKE2B 9c305809a9f46f3ad76eec728026b2abbd1dec3bee46db92bfe9fe4e7c31f24d61eafaca0bda12f510002d3c5d51bfba4c6d4b1bae5e1ce105a8b75d84672ef8 SHA512 9718f589ee1842f6247ea110c4c6defaf767313fb2fd9ce9fb1b35775141774ce9084c2cbf00d9c432162e8b32c8d789e5a52ca385976c4772bf644738257926
 DIST DisplayCAL-3.7.1.4.tar.gz 10478572 BLAKE2B 9f646caea40a22804877f168c2a88a2b3069b8d0e4688c9676bd4d6d873a3528797dd3aadde26da40a4945e224504b2f8673f0c176ced687747ef23d8ca20044 SHA512 d60a240714cf32f1f8084caf74cbccc613263612b7192ad766216ec8253c5682079f32d9cf501e91bf7795ddcce4d9f2f0b023117719d0cc05f203d51dc3ef42
+DIST DisplayCAL-3.7.2.0.tar.gz 10536990 BLAKE2B c3e0c1b75c10911b1624d56f4e5d612eba8c257b5abd8a4632f13d91285283d870d928ad3eb17a9cd620b7fed4b9e5414495e12227fb2b94e3da2551d14042bd SHA512 f516376a84680daa2baffa0b4738f52e5dc6df374ae5d97ed385430e2744a087e044faa4929fdc84b01d79878b44e15eda5fa75b40b8a78e6962f66fc06876d4
 EBUILD displaycal-3.7.1.2.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
 EBUILD displaycal-3.7.1.3.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
 EBUILD displaycal-3.7.1.4.ebuild 1518 BLAKE2B 665a66c4563a6f6ec0516841e063eb0f79278e8b11a82b6d9598305a0fbdaa577f77c18dce7b81a6ed6deb257591e241b1ba308ee1c0d0c5d51a17600a9f8ee9 SHA512 c2e00107271a3a724a07ae901343800da4dfa4d33fc96651149cf9c99cc301be744da73f445641dfd129e9848f07009d95c04055d146fdc84bd2c79aaa71ef87
+EBUILD displaycal-3.7.2.0-r1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
+EBUILD displaycal-3.7.2.0.ebuild 1518 BLAKE2B 665a66c4563a6f6ec0516841e063eb0f79278e8b11a82b6d9598305a0fbdaa577f77c18dce7b81a6ed6deb257591e241b1ba308ee1c0d0c5d51a17600a9f8ee9 SHA512 c2e00107271a3a724a07ae901343800da4dfa4d33fc96651149cf9c99cc301be744da73f445641dfd129e9848f07009d95c04055d146fdc84bd2c79aaa71ef87
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.7.2.0-r1.ebuild b/media-gfx/displaycal/displaycal-3.7.2.0-r1.ebuild
new file mode 100644
index 000000000000..6d9baac97b2a
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.7.2.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	dev-python/faulthandler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/displaycal/displaycal-3.7.2.0.ebuild b/media-gfx/displaycal/displaycal-3.7.2.0.ebuild
new file mode 100644
index 000000000000..d6063154f815
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.7.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/duhdraw/Manifest b/media-gfx/duhdraw/Manifest
index e18005eba24e..ac3add273cfd 100644
--- a/media-gfx/duhdraw/Manifest
+++ b/media-gfx/duhdraw/Manifest
@@ -1,5 +1,5 @@
-AUX duhdraw-2.8.13-macos.patch 329 BLAKE2B b1529683f8468e9396183e1c552618a74b0a501b78b3d2f3df430097a268e7b07957060a187fcbecad7a656f64f3c096f53c01de2e9cd87936c4509232f8beb3 SHA512 6a971ed804c04594e88b240a7361a94f61c721ff47fd3e81d99af812cf20ded8a4ef5213b644eaeee76d73145f5057d3839569941b060e7b93589debe0c73e40
-AUX duhdraw-2.8.13-prestrip.patch 425 BLAKE2B 11c6a67f2608356e1ba3021face193067b09e6c5b72a2c44567b3dc78242aff5271b00f41de17250a5b634b60db7b4c95428f527414533354337dc83bab3644a SHA512 cc37c5e6c41b9e4088f956db44241ebca6e34a01e89f87e0d28674395569af4cbe69b8a03f6ef9ec131d87ec38eb34992da17360f674f583e6275fce20732fe1
+AUX duhdraw-2.8.13-macos.patch 248 BLAKE2B ba9bd84d8cf3b271dd8292062894c76ff4e2d18a114326d505b1a4bd135a49420b0984554e894162ae292297836268d7e1868b635be9d7641d021135a60d9845 SHA512 5ee28dd33ad8589c64a69de3eac5636a178419061df167228be2f63f88c626f9a1d8f0df03d3c5890c42b7fa90d3a330d39a808579451345feb584fce5429ae0
+AUX duhdraw-2.8.13-prestrip.patch 344 BLAKE2B dc84ac31a40a9fc57b2a0edc6454a3b0f1df3ad7b280bad84e9443c52eb64ba6c0396c93b6048561aee0c2d48fc5c02128ee21eb68f3dfaf63e19f479c21b5a0 SHA512 461a167ccc609b96f2a4fc8064cda9a97f22952f17c08a68e4980e7366a1fe91685fce7bdf2a5aa6e59aa8b5ebf0d9ada640c67ad64ba59c8b0d7d10a047b3d2
 DIST duhdraw-2.8.13.tar.gz 51779 BLAKE2B 7d87c9bb7a23b9c520636dacec34ca20281bf68e650dfb133cfaf59e3f71e27fa2086f1aee60ce9c01e5f0a6c6483553fe1103ff503bfbb80df9679057ca8e49 SHA512 fa9102133dcd100b2cde58d4d92aabfcdf86bb16a8066191e92922d6cea470094ff226e569bf92d34e1f0f6a3e657eaf3326cecf091ed1bc37bd2faace340798
-EBUILD duhdraw-2.8.13-r1.ebuild 671 BLAKE2B 72d2da6e88d9fb162cc93e57f1db7369c9cf84947f236265ded6487293760bdd26b3d78eca95f7cc4f0587cfba00909613d66c0e1d2d48d265d40a1ade32b8b6 SHA512 453eaea31c3da4705c0eb8875ce9a1904b554a3420f1d7cb04fef5bc8c69fe1a9f062e59e085ba34a14ff9bf9bcf9709145f034ba8d46c88e2b50610fec39a0c
+EBUILD duhdraw-2.8.13-r1.ebuild 725 BLAKE2B dc9ec0bdb1a13615f9df2f9da00e8b29cc9fe07a3387e8f950c399f309ef56dbb3bc694055fc9010add162e2454c5b57ab1d4a9ac6b3a7b3cee4a76e3c6ea6eb SHA512 fe078f198a5587af0b56aa8bc27a4c5f31bce6af418c9907256c4f479b6b573bc8ec7da1797060bc5e167599be7d35767ced018a1b6e925b1747d9abf1af24f0
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
index 64e4f8d7f285..ead354248580 100644
--- a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
+++ b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit toolchain-funcs eutils
+EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="ASCII art editor"
 HOMEPAGE="http://www.cs.helsinki.fi/u/penberg/duhdraw"
@@ -12,16 +12,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-macos.patch
-	epatch "${FILESDIR}"/${P}-prestrip.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-macos.patch
+	"${FILESDIR}"/${P}-prestrip.patch
+)
 
 src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+	emake \
+		CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
+		LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
 src_install() {
diff --git a/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch b/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch
index 30be358e46d3..cdf18e48e41d 100644
--- a/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch
+++ b/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch
@@ -1,5 +1,5 @@
---- ./duhdraw-2.8.13/duhdraw.c.orig	2005-03-02 09:22:46.000000000 +0100
-+++ ./duhdraw-2.8.13/duhdraw.c	2006-11-16 09:56:21.000000000 +0100
+--- duhdraw-2.8.13/duhdraw.c
++++ duhdraw-2.8.13/duhdraw.c
 @@ -12,7 +12,9 @@
  #include <stdio.h>
  #include <dirent.h>
diff --git a/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch b/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch
index 0162f39370aa..3112a015748d 100644
--- a/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch
+++ b/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch
@@ -1,5 +1,5 @@
---- ./duhdraw-2.8.13/Makefile.orig	2005-03-02 09:22:46.000000000 +0100
-+++ ./duhdraw-2.8.13/Makefile	2006-11-16 09:58:29.000000000 +0100
+--- duhdraw-2.8.13/Makefile
++++ duhdraw-2.8.13/Makefile
 @@ -12,15 +12,12 @@
  
  ansi:	cleanansi
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 9d7e599f0976..9db67c8056ef 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,7 +1,5 @@
 DIST eog-3.24.1.tar.xz 4632496 BLAKE2B 24d6957285d5dae7fa2299165b1bac236e75dfa77938132c1d3f8f7312ed4a07d5d3a770fdbdbcf5ee1966a43b4443d331fbedec47575836e2170fa3022e657f SHA512 c007b6f2cd2b59747db72a5b86ecb34ac87fe0910a2d33df466eb05ebe5ff638fb9e57b15f2ea9328c95037334a2fd9010895241ff285628b7ed7b6d65912fb0
-DIST eog-3.26.2.tar.xz 5516240 BLAKE2B 5e63edd97c50e059af8d282d4596193fdb4e8a5767ebf9391c8c4f0b202136b1ef67c5d5d601e9863126b0db25e51927c4ac1fcb713fbd1a7ad21ccf207501af SHA512 40941d77739d1ed572dd7c4864435e5944c9dd48f5386b2ea11e16da52f7fa550844e4636ee35947172e921df596542d13928c79f7f511ef70ec92b832b1f1db
 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 1550 BLAKE2B 051a1673bb0287d59697dfca6daf6cd75f1b1d10fa24ad0827f26dc7671625077fdd65418a63c862167e7d0ad8ec101a55353bae1909cd083ae1fd0140a26e57 SHA512 1d34e6b49845a6c115ce9f12db495a7c048efcdd2786a6800a715975abdb0f1823b48efa3ac3474a9478a84e84cdeea12e203ac90b9115b8aae743736a5b5dfa
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.26.2.ebuild b/media-gfx/eog/eog-3.26.2.ebuild
deleted file mode 100644
index a56ef9b214c2..000000000000
--- a/media-gfx/eog/eog-3.26.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="debug +exif +introspection +jpeg lcms +svg tiff xmp"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2[dbus]
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-libs/gtk+-3.22.0:3[introspection,X]
-	>=x11-misc/shared-mime-info-0.20
-
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	x11-libs/libX11
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	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:2 )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.16
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms cms) \
-		$(use_with xmp) \
-		$(use_with svg librsvg)
-}
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index c23a1594d6c6..deb5bd7aca2f 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,16 +1,6 @@
 AUX feh-2.6.2-debug-cflags.patch 197 BLAKE2B a5a9b2c2ac22869401303706b92a10474d091cb01869c6272adac79000eb02591e424fd71734d3c0bd29d253854a27f4fe1fe21f99ba55cd48c66325521dc836 SHA512 eb09a90a9ff3ba2ae7a40c8ef9e5b361d42bb045e194ddb5823111d780da265371ee087c6f80963d80f5cd1d0427478f46fec9b0f0607ad2bb122415a9c2e397
-DIST feh-2.18.3.tar.bz2 2127924 BLAKE2B c667a7bea38e66afd4ed7c688c3232770041964893ead60dd35eb06a7db7abed8c2275e1126f7e2081a4df3abf8d551f4610a3dea4887dd7c4f0c9637e15b13a SHA512 3ffb44f8a2207c2c8725a519a23b7235a6df86aa8578b7b79a8819122e509d18dcc8263859e02cdbdeb5fb5ca56229f90aef567d53d63d763f8259fbc1fff515
-DIST feh-2.26.4.tar.bz2 2132124 BLAKE2B 962af7b7e806a8cea570c1512c377b0eb9ca9924706bdce63cebe7dad240d9b5a7f16c0291aedf954abb45bbecc4f835f77bccbd42101a7f99dea92a102fc0bb SHA512 cd78081a6ab821a0c6b20fa6746ec180df97ab3412e0cc56bbccaf700c443b4fd5f95edd9b2781ebb2eb85491946809c962039346830ae6f5f85ea0ae5e7de81
-DIST feh-2.27.tar.bz2 2131975 BLAKE2B 84100beaff26454c8d33a479171b1b59402b74d04860192e5e826dcac93a288b095afee6f0676b56eae0d1f8dd3c4998767d0cd196ffd3b6a5406f5c1e6eb1d9 SHA512 6d9cf38e9b40291f6e7145705057a2c945b720b22d85020e265c2a158d5e4ca68cca958e2fae3d01a91bb4b2c52ebb5d2c298c41bf8ff3e4f635af7c006d0cc7
-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 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
+EBUILD feh-3.1.1.ebuild 1497 BLAKE2B f6e2659966cface0e1f154b219101caf560c075699545d52611e5c5f4f49fa8caafe9b96a06e7a8b06712cf5023feef0433fea82c377a08b737c41fb70dded2d SHA512 73681572193a12dfdb2c7bbb8bd99a29ebfda1ef01be4664ca7664afa00e8633ddaeb0a7929859882f9c0f8cf8a10b09c40efcd0fa9fdb1b877d49e4acdd18e9
+EBUILD feh-3.1.3.ebuild 1501 BLAKE2B 1e2bfdded6414e79a76ba2365246e9baf5d525b999e0a3f61a692b1724b3d2455567e924b6c2c675519c78d1ad3845479429e149328140854f02d78f9d9d9932 SHA512 702a19de9be1bb591d2daadd4285bd9a942de5ebda401de2f62ca03984ee0f68bc437689b405c35aa405e641638e98ef8c9d765b6f8c107a7e19d9c2181bc764
 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
diff --git a/media-gfx/feh/feh-2.18.3.ebuild b/media-gfx/feh/feh-2.18.3.ebuild
deleted file mode 100644
index 72bb0487879c..000000000000
--- a/media-gfx/feh/feh-2.18.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-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
-}
diff --git a/media-gfx/feh/feh-2.26.4.ebuild b/media-gfx/feh/feh-2.26.4.ebuild
deleted file mode 100644
index 0fc4bf732db8..000000000000
--- a/media-gfx/feh/feh-2.26.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/feh/feh-2.27.ebuild b/media-gfx/feh/feh-2.27.ebuild
deleted file mode 100644
index 0fc4bf732db8..000000000000
--- a/media-gfx/feh/feh-2.27.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/feh/feh-2.28.ebuild b/media-gfx/feh/feh-2.28.ebuild
deleted file mode 100644
index 0fc4bf732db8..000000000000
--- a/media-gfx/feh/feh-2.28.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/feh/feh-3.1.1.ebuild b/media-gfx/feh/feh-3.1.1.ebuild
index 98f7cb6d011b..9c2309b6d220 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]
@@ -27,6 +27,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		>=dev-lang/perl-5.10
 		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
 	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
diff --git a/media-gfx/feh/feh-3.1.2.ebuild b/media-gfx/feh/feh-3.1.2.ebuild
deleted file mode 100644
index 06c60d87c45b..000000000000
--- a/media-gfx/feh/feh-3.1.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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/feh/feh-3.1.3.ebuild b/media-gfx/feh/feh-3.1.3.ebuild
index 06c60d87c45b..e701805c82c7 100644
--- a/media-gfx/feh/feh-3.1.3.ebuild
+++ b/media-gfx/feh/feh-3.1.3.ebuild
@@ -27,6 +27,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		>=dev-lang/perl-5.10
 		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
 	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index c296ee6d9b5a..ff0d95dba9e1 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,7 +2,9 @@ AUX 20170731-PyMem_Free.patch 5579 BLAKE2B ffb048f9790ea237f37bedf17ec50087002c6
 AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cfccf4c3990045a92af79b60c7e018a118996aa4f4b7146408b713b4eaf2b867110dc41d6c99ba302cdc522f62d035572a SHA512 ef4df9ac6589615f4ce619d073cb78dc9fcc281f24a01941567a09a9e536d105672856fa3fded436bddefac4de094d017ed51ace9d5bb0454f44dc373c95927b
 AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366
 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
+AUX 20190317-gdk_init.patch 1391 BLAKE2B 6b4294e24d1bef0300344d2c11ef59d7d3f22d83ba7e8cc3e981db827dde7c30f234be35c017cc8c854ae090aa1f3e177af2c4bc511365fdbdb2e8c40402dda9 SHA512 3976f2a860f6c6aaec8e1532ede9fde7beff3ae98ca8e0cf87b33b7165f158ae676c751a7cb3e7897f1dff3f03c041d4ee6bd06e68904973b5bc5acdee5bede5
+DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r3.ebuild 2790 BLAKE2B 8d0290229ff389cca1f1e4915801b1f9ee0683a55030eadec60da8c82d4177f47af0592b366c9f1c7b730568e01a98d202e9502647f91cfccb02c5ac0b7bc98b SHA512 f14898b95f7a457b793d5ebabc84ce845296c84fe7360ab6069db4c99b485b5231ff12285981ba0e6fabe815204fe0b5cf878f0c84d594622e367afb62497b89
 EBUILD fontforge-20170731-r4.ebuild 2849 BLAKE2B 3989df4621ff1d3a29abce501a9aa3490daa2caceeee9205f8571c51ccbe6f2328e1cde3a2ebbfd954cdd75a86cce3a27cd38ed690927a7b3309000546bee4aa SHA512 2c5c592c8b637c04da4f532c5357fabdb8dd5850bdb77af6a24b8c0b7dfe539e16f86570f65f1e66cee2b97e79227552e4fafb2aa40aa9a1a06365eb49449f07
+EBUILD fontforge-20190317-r2.ebuild 2762 BLAKE2B 4e0abd3354e71a91f4e6b3390820a1972ae219410dc09f9ca5d8e819e4817ab95c314a46f4afb1a02ad56d48b50af64cddbf34238a8b9b3dca039ca77a1d8020 SHA512 14633892a06c9a3da79f284bf61ce5ff58374f0768fe587c9dbf4737bb9cddbbf36b8d73ce9b2a38a3ed54eb1a8323851f8c4afe62cff17e70ad4001c06a5dcd
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/files/20190317-gdk_init.patch b/media-gfx/fontforge/files/20190317-gdk_init.patch
new file mode 100644
index 000000000000..060e69577482
--- /dev/null
+++ b/media-gfx/fontforge/files/20190317-gdk_init.patch
@@ -0,0 +1,39 @@
+From 4577ad7205c600c6c8e809e10d51eb2118cb66b5 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 24 Mar 2019 18:12:21 -0400
+Subject: [PATCH] Defer gdk_init() until after CheckIsScript()
+
+This allows fontforge to run without an X server available.
+
+Fixes: https://github.com/fontforge/fontforge/issues/3582
+---
+ fontforgeexe/startui.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/fontforgeexe/startui.c b/fontforgeexe/startui.c
+index 1bb5fd8ca..ae15afbf2 100644
+--- a/fontforgeexe/startui.c
++++ b/fontforgeexe/startui.c
+@@ -900,9 +900,6 @@ int fontforge_main( int argc, char **argv ) {
+ #if !(GLIB_CHECK_VERSION(2, 35, 0))
+     g_type_init();
+ #endif
+-#ifdef FONTFORGE_CAN_USE_GDK
+-    gdk_init(&argc, &argv);
+-#endif
+ 
+     /* Must be done before we cache the current directory */
+     /* Change to HOME dir if specified on the commandline */
+@@ -1093,6 +1090,9 @@ int fontforge_main( int argc, char **argv ) {
+     CheckIsScript(argc,argv); /* Will run the script and exit if it is a script */
+ 					/* If there is no UI, there is always a script */
+ 			                /*  and we will never return from the above */
++#ifdef FONTFORGE_CAN_USE_GDK
++    gdk_init(&argc, &argv);
++#endif
+     if ( load_prefs==NULL ||
+ 	    (strcasecmp(load_prefs,"Always")!=0 &&	/* Already loaded */
+ 	     strcasecmp(load_prefs,"Never")!=0 ))
+-- 
+2.21.0
+
diff --git a/media-gfx/fontforge/fontforge-20170731-r3.ebuild b/media-gfx/fontforge/fontforge-20190317-r2.ebuild
index 4fd342e71902..4cc9f6d02dc8 100644
--- a/media-gfx/fontforge/fontforge-20170731-r3.ebuild
+++ b/media-gfx/fontforge/fontforge-20190317-r2.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2004-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
-inherit gnome2-utils python-single-r1 xdg-utils
+inherit python-single-r1 xdg
 
 DESCRIPTION="postscript font editor and converter"
 HOMEPAGE="http://fontforge.github.io/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-dist-${PV}.tar.xz"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz"
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
 
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	cairo? ( png )
+	gtk? ( cairo )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( png python )
 "
 
 RDEPEND="
+	dev-libs/glib
 	dev-libs/libltdl:0
 	dev-libs/libxml2:2=
 	>=media-libs/freetype-2.3.7:2=
@@ -37,7 +39,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0= )
 	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
-	gtk? ( x11-libs/gtk+:2= )
+	gtk? ( >=x11-libs/gtk+-3.10:3 )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
 	unicode? ( media-libs/libuninameslist:0= )
@@ -49,9 +51,11 @@ RDEPEND="
 	!media-gfx/pfaedit
 "
 DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )
 "
 
 # Needs keywording on many arches.
@@ -60,12 +64,9 @@ DEPEND="${RDEPEND}
 #		>=net-libs/zeromq-4.0.4:0=
 #	)
 
-S="${WORKDIR}/fontforge-2.0.${PV}"
-
 PATCHES=(
-	"${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch
-	"${FILESDIR}"/20170731-tilepath.patch
 	"${FILESDIR}"/20170731-gethex-unaligned.patch
+	"${FILESDIR}"/20190317-gdk_init.patch
 )
 
 pkg_setup() {
@@ -76,7 +77,6 @@ src_configure() {
 	local myeconfargs=(
 		--disable-static
 		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
-		$(use_enable gtk gtk2-use)
 		$(use_enable python python-extension)
 		$(use_enable python python-scripting)
 		--enable-tile-path
@@ -93,28 +93,23 @@ src_configure() {
 		--without-libzmq
 		$(use_with X x)
 	)
+	if use gtk; then
+		# broken AC_ARG_ENABLE usage
+		# https://bugs.gentoo.org/681550
+		myeconfargs+=( --enable-gdk=gdk3 )
+	fi
 	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
 	# Build system deps are broken
-	emake -C plugins
-	emake
+	emake -C plugins HTDOCS_SUBDIR=/html
+	emake HTDOCS_SUBDIR=/html
 }
 
 src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	emake DESTDIR="${D}" HTDOCS_SUBDIR=/html install
+	docompress -x /usr/share/doc/${PF}/html
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index ff91e8c6defb..4a6f2d779be7 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,4 +1,4 @@
 AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
-EBUILD fotoxx-15.05.ebuild 1146 BLAKE2B f1a7701b0fe1d9e23a3e644aa05c7683b55fbaaa048757d88104c843c9864e45eb5e9d8489ec5c275463f09e01742da9275f044a3c1986550812655a1bf4d994 SHA512 aa6838cf7d5461c9b5526641979b50e1d742247dca5703ccad0e161d43ea4765cc2c90b422e8bdb5680eb022407afbfb343286a9a29dc00f0f14e478945e387e
+EBUILD fotoxx-15.05.ebuild 1151 BLAKE2B e57effd1bcc1ef9f867e9c93a0080c55f108ed87a9c7e1ee58faeb4632e23f06939f8aa2d97347ef25e58cdd96784e00960abf944886d0450873e259a021de64 SHA512 7fbb27c242856ea797982b6799a558394da5e245b1adad434fcfa087a8f4b11ab5665f1ca8419943ca7ae74ff7f96e16c0c1a4dede948fbb93e0842d1af69f7f
 MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index 0a425e4da1d4..dd440e48f705 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit desktop toolchain-funcs xdg-utils
 
 DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="http://www.kornelix.com/fotoxx.html"
+HOMEPAGE="https://www.kornelix.net/fotoxx/fotoxx.html"
 SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 7a10f0068e89..50b6b2ffd1ed 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -1,10 +1,9 @@
 AUX gif2png-2.5.11-makefile.patch 968 BLAKE2B ccc9c0955d105a6be48bd5e761304c11d451b8e0afcdbe60c168cc7f530041140e78b10c63a8791a74ce736f888e9be511ef63d2037304551f5fd368ee11ffd6 SHA512 d5d10837171ebf0db971a3a0513e34f94b4a070f4cf61dcb38b3e301edb7d151c2965e2bf483dd6a0631fbc98d621a4b02f53aac6bed8ed85549dc12b7423756
-DIST gif2png-2.5.10.tar.gz 138944 BLAKE2B bb299a4a00920f2979455f63e8c0cdedd4046fd3cf726cf30bc73ab476277002a828f7c1f59e2292f08d53742038c11ded13d8b9f1fa7bc2c7e07b25cb3cb120 SHA512 3ca1c0d41a38b4b628f929afa231b8f67079f9998210e63b68e4438379a5d70b64d332f7e0786fb199ef866e188f5095c0d0d4570ec9da829aeac63c8918ad3e
+AUX gif2png-2.5.12-makefile.patch 1049 BLAKE2B bbf558d2fbfeea6ea5c4b8bc863541f2118d93994b78d80390cbad4179d739e2a547a06359a13d0e2a0c2b9dd056a62e0a7a954043e69ea35a57e6082c1bba9e SHA512 1c0278626ead4640eeae69408020007fcc96fd6078fe6abcc5ab81c1fec2a89eb8ccdf134bd22c8b4e26abfe390aded4fda3a9d9ccf600e2128bcf1ebcaef735
 DIST gif2png-2.5.11.tar.gz 31507 BLAKE2B d35c1afc8dc790fb99ee819495eb41ac6d0555d14c12707c0f844a33f631d7d6e074776b8f51b1439b0b0ee608f67622d92de761f42e44e2974b24f47ad0db0c SHA512 c7e42aca45f941bca970ff14f49881f485c4dee18be448ae71aa7c80dabd9384bcba6d6de05a0a78757150b3e775d99df315231ddae8e32c91c08f1c9cfefb67
-DIST gif2png-2.5.8.tar.gz 128373 BLAKE2B a8b374661a03cdaaabe0a534f5fcbe1c56f40bb74cdf73bfe2a7b8f4fdbc2ac078bdd30a9232795ee804963bed1a36ec5d81e7494595de644591f6b4f855fefd SHA512 050c516c125efda315e6bc7e4fadcdd612a9596bd1e6f611865a457efb06153a45516eca343422e15ad75b1219f82ec855f03781285df411590008f5a67e0554
+DIST gif2png-2.5.12.tar.gz 31613 BLAKE2B 8614d3e0435bab334465d3f43d8676a80f1041e6cd5572fb525295c00d9027b505741331bd3df452d55e8f49893ab611832f2d4d150794d268a436a04f5f20b2 SHA512 481775d0efc65e0606a60546ed2a1e4a976587ca1a406620f8ea9126b32dc810d3b549cc99ba33ff9f88379de2ce47a799840b92978ee621bd18d3ae08b2c6a8
 DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02cf882f2e1e40ed7dbbce4be8b75290e4b0a78b5dde74cc244c9a848dd429a937e696746d3d39b8cec9dd469fd SHA512 0632f1b4b96a1e4b5567101fbac36db55e658503977c8c875d75d9c1db5b374deba5afbda5507585b6b79242781fd70afc477e686458cc124adb8e1b29860c1e
-EBUILD gif2png-2.5.10.ebuild 476 BLAKE2B 4720d8061e93f87f241d981c3c5fd116df76ae4a5f876e4029868b374219936de4b526d1c923730565eb8d80d67988bfbb8d7a64a63bd994424d88f9217651a6 SHA512 5e94bc0156e9e0c21c12b1998c63fc1731db0501eb4b6e65286cadf4b3f6cacf40d4df9f7bea78a258affcd0cd2b25157344900f1bd6ce9970e8e5a1ac9be040
 EBUILD gif2png-2.5.11.ebuild 620 BLAKE2B f7db5fdcab6140e9d69e2e9a55a52f14b0374a978a0023c492aa3255120775102c64f9f1ec8d4071418dcb6110aa7a55be2208f6d389f062a733b3baacc31823 SHA512 b6b173a8a3cb48eba996253cc28eb7835d902e13db7f67c55f6e6634a27ca81a3e850eee322508e21d8127fbcfef34fe437e743a036513e4af2f363e41a8b5c1
-EBUILD gif2png-2.5.8.ebuild 472 BLAKE2B 082fe78d6b0aaeb507e7d3d8e2693e93d8de888da1b0d1fa52e0f45164d53c0c7b98fe534a70377353db38f31c80a5ea4d93fb6e98c45c27bb7d4d6b9e2170f1 SHA512 7e71654906afee75a3b094ed796ccdba126b1e8c635bbd65ed018222be651a65fd5cd2ac84346beb0d2fbb305f7c8040f5dccb553ffbbcb0b80b3fcc74249daa
+EBUILD gif2png-2.5.12.ebuild 824 BLAKE2B 9102092ff19c7f7c8e2628a1d93699c628202e50f0d587a2c05bf0c6dbe7cbb51f524403435552ca08b3c98a6666822eda153e363514a73a01f99bfdf9702a6e SHA512 22fd274b541e4779a990009a3365a830f85b26835385c1ece11a3cf266474b90bdab477bd73e15a91e32c5c947565c7519bfc3dba00d1fe87639a06f1e740ca1
 EBUILD gif2png-2.5.9.ebuild 472 BLAKE2B 7e87e3e7bcc682a9d0642882312fce3c9cd70a47a427be947989cad1fe66f49fbb82404b417c8388c60cc4bd313a4ca6a94062a430ee465403f1ad0031e31734 SHA512 e3fed27af7cd3ccfbe2ee618a547fc3a7a5729cef1fa48798a9f8001de6b08a23ce67a239cf33b96ff8a41a49e2941c1f68e93271de626a7a605813ac6745d8e
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch b/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
new file mode 100644
index 000000000000..e99180f8686e
--- /dev/null
+++ b/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
@@ -0,0 +1,42 @@
+Respect CFLAGS/LDFLAGS/DESTDIR and don't try to run missing tests.
+
+--- gif2png-2.5.12/Makefile
++++ gif2png-2.5.12/Makefile
+@@ -2,8 +2,7 @@
+ 
+ VERSION = $(shell sed -n <NEWS '/::/s/^\([^:]*\).*/\1/p' | head -1)
+ 
+-CFLAGS = -DVERSION=\"$(VERSION)\" -O2
+-LDFLAGS = -s
++CFLAGS = -DVERSION=\"$(VERSION)\"
+ 
+ SOURCES = 437_l1.c gif2png.c gifread.c memory.c version.c
+ OBJECTS = $(SOURCES:.c=.o)
+@@ -28,22 +27,19 @@
+ web2png.1: web2png.xml
+ 	xmlto man web2png.xml
+ 
+-check:
+-	cd test; make --quiet test
+-
+ clean:
+ 	rm -f gif2png *.o gif2png.1 web2png.1
+ 
+ version:
+ 	@echo $(VERSION)
+ 
+-prefix?=/usr
++prefix ?= /usr
+ 
+ install: gif2png gif2png.1 web2png.1
+-	mkdir -p $(prefix)/bin
+-	mkdir -p $(prefix)/share/man/man1
+-	cp gif2png web2png $(prefix)/bin/
+-	cp gif2png.1 web2png.1 $(prefix)/share/man/man1/
++	mkdir -p $(DESTDIR)$(prefix)/bin
++	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
++	cp gif2png web2png $(DESTDIR)$(prefix)/bin/
++	cp gif2png.1 web2png.1 $(DESTDIR)$(prefix)/share/man/man1/
+ 
+ uninstall:
+ 	rm $(prefix)/bin/gif2png $(prefix)/bin/web2png
diff --git a/media-gfx/gif2png/gif2png-2.5.10.ebuild b/media-gfx/gif2png/gif2png-2.5.10.ebuild
deleted file mode 100644
index 6d952faaee56..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.2:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
diff --git a/media-gfx/gif2png/gif2png-2.5.12.ebuild b/media-gfx/gif2png/gif2png-2.5.12.ebuild
new file mode 100644
index 000000000000..937a694a8ebb
--- /dev/null
+++ b/media-gfx/gif2png/gif2png-2.5.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Converts images from gif format to png format"
+HOMEPAGE="http://catb.org/~esr/gif2png/"
+SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND=">=media-libs/libpng-1.2:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.12-makefile.patch
+)
+
+src_prepare() {
+	default
+
+	# this release lacks the NEWS file that is being used to
+	# query the release version
+	# https://gitlab.com/esr/gif2png/issues/4
+	sed "s@^VERSION.*@VERSION = ${PV}@" -i Makefile || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+}
diff --git a/media-gfx/gif2png/gif2png-2.5.8.ebuild b/media-gfx/gif2png/gif2png-2.5.8.ebuild
deleted file mode 100644
index e3d4326da751..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.2:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index cf64f92501c3..31050e3db56a 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,8 @@
 AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f334a56c1d2083b0a8c02c37697795ea82f37d4caaf23edb37111d201db75315169a12f256571ad081f60b9890 SHA512 1c5cef3879749ab9a62e52ae5ac1c26ab60ff4b323352af9e7fb0f55b3ca7804290d03bd63dcaedb68c3d6fe43da332681a1eeb84543a1ac30163169ccee6368
 DIST gmic_2.4.3.tar.gz 3816129 BLAKE2B 1c9dd6c7e45809d0cf8b8a45476a4b20ad321b5f34fbc5214cb149777c6e9a6aba845cd816cc1503010e281bda0b32e1059dd34d052afe2ebc086469163967be SHA512 482e70b0c82992799c5769ded1547904d16dbc9206d67279b6f524c1214258b97fa539678844a450d6f64144dc7a2715c754d6a1d85398e648bc34086fc3218f
 DIST gmic_2.4.5.tar.gz 3819428 BLAKE2B 71d19bf6d79ca00bf95006bd96595b83ee28caadf46a9c899176dcd96c5da1b3b9fa7b2150ea2383262c1db2357838c4c716c8ab09060c6c06faa5f7c52975c8 SHA512 39f7c35303704c579d62377f491830f6d310be672f3015aafbd6715c5fa1185d64671f841fd5e0cb818dfc96851afc6dbdbbb99f9b5156ccaeab91e7e1b08033
+DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5
 EBUILD gmic-2.4.3.ebuild 4306 BLAKE2B 608561cc5f9dc176f4b7951033a7a9cdcddf033bbc3f229a6a0a2ee72c08801ffc564b125eab25e1168bc8c93a8c60a6da2099337a1cd3483d087cff670bc094 SHA512 4b1501fd135e1133e6d8cf8404a20ee6155e04377821a00c0719679f8ce03e156d09a84f0c6104de356b9847f61c8d502db62bc1c2f31330f9d7b7d6b453ef99
 EBUILD gmic-2.4.5.ebuild 4351 BLAKE2B e9baff4d80ff61668f29ed4fd4dc8ac4a289df1cd0e9b7981ba9de75880463a3a9371a6d38495a7186f04d9bb2be45ecbe23ddda7deca181981fc17bbcd36740 SHA512 135f2c950c90f0052c60c891b323a016d2ba9c78b937a88b0244c43e7239880a85742a178c4f5866aa75079ba28ce38db76d127c41f6aa4957d46b49c0087bcc
+EBUILD gmic-2.5.3.ebuild 4346 BLAKE2B 7d403804948db22dec88c15ac345b8b76237370bbd879a1711154dee5d654b203b20d0416db23d2f313678b6965a42df033c678656d01e7b096fd1e180977d26 SHA512 53fb2252a564a6060587594498277037d3844ee5cf3837ae754104a7304895f3ca9d18fb779cf131b335d346d6b73ab255a3aa301b57b04b754a08457224438e
 MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
diff --git a/media-gfx/gmic/gmic-2.5.3.ebuild b/media-gfx/gmic/gmic-2.5.3.ebuild
new file mode 100644
index 000000000000..bfd30752357e
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.5.3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=()
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 730288881795..3d379e405716 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,10 +1,8 @@
 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
-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
deleted file mode 100644
index 803cf12a2262..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.28.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-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-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index 89bf9b2b82a4..92b24d9877b3 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -2,5 +2,5 @@ AUX gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch 1715 BLAKE2B 62d10ead9
 AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f7f6293cc420157e0e33a8cfdd169e65771019fd00acf2d8a760c522ce6f0c2a2c13052804ed726b2eb35e378a43a1110328ea694449cfdf77 SHA512 b4985090dad9a06087d2b598eed03333a80d71343a244db3c08fc0f5ef1fc8baae1969b0cdaad460cdd54106173fdd9aa52086203727e823e20bb830deee1242
 AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
 DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
-EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 891 BLAKE2B d694b4ab4dd5928137b12552c66ea674cb092f820559df66b15651fbeb70e6a6aa1c4d72dcb41928e90391310ea832597c79c840f8aa88609cce8af722944db0 SHA512 7bade2926a93fb5684d2f6c22a869fd603a8d46a453737890616c689544af4c9b68f6be7272fd25255ad419cbdfdd4119e0f9d581e4972362f9be332de74a52a
+EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 891 BLAKE2B 27f1e0832bb2157f0d4be4fc89e55290e45da89f32b8ecf4a98dff7866220f4447dbbd654e5e0f340e2a5a11b74017374a1a2e6b206f7b6f67abdf6f7de4ca36 SHA512 103e0fc49a92d0004b9dafbaf6546506ad7f5380cc3fdc6d4ab81c4fb9cc4a5e99625c2db66316a5ed37954146dbd67e191afac918739e9d148c9ddb5003e186
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
index 0c143ee418ef..79c2a4895fa1 100644
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
+++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools gnome2
 MY_P="${PN/gnome-}-${PV}"
 
 DESCRIPTION="A lightweight and fast raw image thumbnailer for GNOME"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/RawThumbnailer"
+HOMEPAGE="https://libopenraw.pages.freedesktop.org/raw-thumbnailer/"
 SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 63feb57777c1..1f2b5e2f14ce 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.3.0.tar.xz 432604 BLAKE2B e411e3a58f6c1a9e9c6df7057711377a70676d7ab718d5e4a19ea2690a26bda0b99def3cc04099bd0392bef0060b6d60328cf36450bd18d7c64100d553a4c627 SHA512 c9f08ce9c4f9c14c78d0b821d8c4381eccdc5a741a4b54e817dab33e67b7eeb705d48a02109c97913149b4839a713340aa6947a548eef3acd6a7bcabfa4116e1
 DIST gscan2pdf-2.4.0.tar.xz 437096 BLAKE2B 947c1d3c4c726254ba61be4f7a34ae867d0af9b6ebf53e4594aeb908dfda43ff1e85791641b42e9e13b978a56cfe523a6fa23566e14ad130278d05e7836d34d8 SHA512 90ec9d8cc56a2fe9d7a77c928f548c87a81bdfb62f1caa491b32a42600c5677974ec613b0bf384bd806953a9a5d29ccf3077df7c0b3dd73d06866003c3a01791
+DIST gscan2pdf-2.5.1.tar.xz 440484 BLAKE2B 375434ee633f895da29d69672faa6da5247e6f45e25b7fe1111394c03c2a6a6e482973365733a7d123c2a94ef40d2d7ce8666b5c632a6465f31ef09f237100fa SHA512 677f9081fb4f6ecd064f965399be20802e10f470d40ef00da5afd6de37ed9914c856fe01e28daedf900e8c8bd75a798f1579a7970509fc789382bbe2b1923804
 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
+EBUILD gscan2pdf-2.5.1.ebuild 1609 BLAKE2B 0804b57945439bc55cc55d2b73b56cc4a892f9f72555ee74c0f1fe5203e0ac452659e1988dd55e59eee4f1791fd05e2d408b8f4b0ac7a2e77aea3f353ef0ee19 SHA512 7173ce075f21c158db8d964144073028275e6cea2346bf6275c4ca4a34a6e6a59f7da110f71ce988a5e033e92c5f0eedbb4661f2539613111891abd363845bb4
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.3.0.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.5.1.ebuild
index d19c0627489d..d19c0627489d 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.3.0.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.5.1.ebuild
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index b913042bfc24..0d38de83fd79 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,5 +1,7 @@
 AUX hugin-2018.0.0-exiv2-0.27.patch 1095 BLAKE2B 52cd5e31f36b22291a3a864a9f248510f0fc871f1a9ee8e49cbcda5d8876eb9e7ec0e5e1595cce015c55dfc0f53b4fa8efc82e30f8c129e81d426accb3538e5e SHA512 480cb3f5e4ba04efa863b409747029ec1ed158168705621b3ba588e6566c56c3e5b16f422daf40cc27660b48f63c1a32861f9a4cda22c0eda397922d00a828a1
 DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+DIST hugin-2019.0.0_rc1.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
 EBUILD hugin-2018.0.0.ebuild 1994 BLAKE2B 5ce3bf34d0cc0624ce414174a95bbc08b19bd162961927fb0da4e48d3c6d89eb8ca1837e77633ed54dbfa0e61411288bc048c66ab3e88eacf527027cd717b868 SHA512 9547fdc6ee37e9980f7fbddab5c2a073b6fe0ed5454657e8d4171805c043a6badd7e080bb733c0addebdc8a1cf042c5eda02d529487c505285bb05e84542431a
+EBUILD hugin-2019.0.0_rc1.ebuild 2108 BLAKE2B 43c7dee776d82e503abca73cbe562eb53f02f53ec0614c9f56ec9996c96ee722adb39009f14d9abb147cefeb581d53c058358b0a62fed64b7394eb9fe757261b SHA512 44a5230f1557d2e49f0c66b90bc759c7a7780da466acae02dd3e3eb532d19848a0f0e1d83b9970974d3ef251f8df3c921c729c47e29c1a6192b127415ce4e06c
 EBUILD hugin-9999.ebuild 1981 BLAKE2B fd52cc7022ccdd63117c259083a0e0e34600e5b1ec4d9f5a19d7bc6fa7878a92242227efd6a6b576a17e7d1f6fd7201f32a4a507ea787df4533698c6bd9aace4 SHA512 7c918c42fb21ad9d53fb2e49d3cf48ea7e5a3897c94452770c800c7d69516bddd748e157f95d88a0c0c3ff77ee984ddddcfa64ae201895ea91a9648d2ae29f70
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild b/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild
new file mode 100644
index 000000000000..fc7b4544dcb5
--- /dev/null
+++ b/media-gfx/hugin/hugin-2019.0.0_rc1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
+
+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 raw 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=
+	sci-libs/flann
+	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
+	raw? ( media-gfx/dcraw )"
+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}-$(ver_cut 1-2).0
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	sed -i \
+		-e "/COMMAND.*GZIP/d" \
+		-e "s/\.gz//g" \
+		"${S}"/doc/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+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 a90c56455319..2eeab7c03108 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,16 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-28.tar.xz 8937428 BLAKE2B 240e39d6ffa702227abb645fdd2bfc7dab6fbe39727fdd77d84eb43e3788014a8df7369e024063b25000e7e0d0cd17ac2931f5eeeb3ac8049a3013ab5d10108d SHA512 300632f540ec533ec981d8173135b33422b9d53d4d5fa5d619463030749d3822a74dee14ab0e076187dff6b589857fa72cb5a28418b81348f9ed493a3c8d3a5e
-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
-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
+DIST ImageMagick-6.9.10-36.tar.xz 8938664 BLAKE2B 0791f4234eace5e338d0016c74cd69b7eab07cc2829b0e2ae69e53af6f02bd0ff17b9cf15b81af061fc5b7f1d23faa9f6c54bbd1829198ab64464d76838e9161 SHA512 0c85648d39b741d693acb4d98a28e67a271447c0406a064852806b693c777a2069c5b39120a39d1fc0a73533a8edc4a13f6be7643b3b9f6a287884ca3265d834
+DIST ImageMagick-7.0.8-36.tar.xz 9445340 BLAKE2B 146c2c19dd4b61f2bc7080063bfc04766ecb6fdc54028319a41d2ac4de0c6786d60f434f11cdcf8886b9d2c968ade5119f3ca68a8693273ab38d81c86052484d SHA512 d32ccdfac7d410c6d83009d9d97d1a4e0195d5618fc95530424f43c86f369541d36b3fa53eee7f8872a84bb8e5164387aa731d452c2d9e0c8f872406c4044fb8
+EBUILD imagemagick-6.9.10.36.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-7.0.8.36.ebuild 7151 BLAKE2B 2a45d3c2bf28fa0c18a7d7b2b81f9b41a208bf74e84a8bd0fd9630380f432e4a2ee27911b83a7a2ebd86c828105754d6b092a6205b4fc2d22ac79824c62e9069 SHA512 49dec8a319fef02989b7ad27a3553688f720391f670525f5d89dc34722eaab3fb2dbadf7e5ebd0565193020e54e0509fd171a2505f79a99b1eaa263daddd405b
 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.30.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.30.ebuild
deleted file mode 100644
index b09291336ccb..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.30.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# 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-6.9.10.33.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.33.ebuild
deleted file mode 100644
index b09291336ccb..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.33.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# 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-6.9.10.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.36.ebuild
index b6bca9ea8b20..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.36.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.30.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.30.ebuild
deleted file mode 100644
index 69c412db11b7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.30.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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/imagemagick/imagemagick-7.0.8.33.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.33.ebuild
deleted file mode 100644
index 69c412db11b7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.33.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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/imagemagick/imagemagick-7.0.8.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.36.ebuild
index 3b3fc7c8d30d..3b3fc7c8d30d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.36.ebuild
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index a990ee17c1c0..2ce416c39b66 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -3,11 +3,12 @@ AUX iscan-2.29.1-drop-ltdl.patch 2107 BLAKE2B ebb47c8148d3b1baaec17606bb85d98ed5
 AUX iscan-2.29.1-png-libs.patch 1309 BLAKE2B debdebb6753d3f71ec5af8a16082dcb8b9fda301a63b690cf4bba92dff2b559aeeaab8fcc9149bd4334f411e7f68aa514c986541eb99ced01bb14df7a141dd68 SHA512 ea2347e169118cfa2916f9ef3f0715d2322763715198714271fc611203a37cec5977ec0de5de0e737a5dd8cf223f2e23198faf52d79671b85173f4a02d3982c5
 AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab3482590a4b3f627b00f6f1fdd17cbf2aea57b52715eebda678833ec2ea9543470a4b7a5c9f07fced84808b337edd43c11c5e SHA512 b11667e6698955b482c9cffd88413180d77b700ca040bf70969ce10be652cfa38fe2fb3de930519bdfe098f18ce258f24859ab79a93032dbe5052e0e1059ce63
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
+AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3301cfd46c04cda85ad95f8e21bae8e8f87e63e787ea69d494d7ae152dbce368ccb9fda44781201d1630e1c487cb9ad0d5d2a33e6d77 SHA512 723c3d5b6522da913ed93abaa1797f661e7eecc3974faa2bf730ced27c6a4adb3ffc87bfb38d42c4929b5afafb3cfe3e9111870aa796ea4872a053302b29ec6f
 DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
 DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.2.2-r1.ebuild 4489 BLAKE2B ed29cfe8ed1f9394e12051b00ed32b86def372a6b04a185bf827e4851e3b386cbf892dd4e5ec82b17658964de8d3a9d2288daaff09955ac7179989b3d1c6405f SHA512 adb0808b9a1be643d18913b08d207cef5f732ee233628446772452dadf99967c1e339018029804cc7d967e52d77232a85146144a055272cb6b5336bc8497d7e0
 EBUILD iscan-2.30.2.2.ebuild 4582 BLAKE2B 27c48a10f7e146aa94e90b8827ac1fc08044e2a2fb38bddfa56946ea2c7ab5631da428b17a6e19c1537caec096c60ed360c9f489a15b6a32b032f35192848df2 SHA512 42aee5ac19f6c46d4d59bfd32db3a43235013a53d8205089401c6459069d474df1e967bc03a2e08a9bff8fbf6e4f48cbb03f847ea031dadd963724cb4a6480ae
-EBUILD iscan-2.30.3.1.ebuild 3454 BLAKE2B dc9b8bff1b3efebacdebf1b721b4e611a90da1839d99d184affa50d43d4d2645b03c4820c60255a55068d131a9b61a2a471221feaf04a27f56edd466fb30afd5 SHA512 f251562a61678622e378c219735d9a2491eafcd6a7dc7aa71de93e2b0303f42ec8099c8ea99e398e545e2b41fc34c44de43fa858383f03433fce928db7b81c4a
+EBUILD iscan-2.30.3.1.ebuild 3519 BLAKE2B 8a66918cce3a094ae133756fe083fb5ae776651ee3557f1a292a176eda0feb1d4c4027ef0784af120d4a64f256b949d08f46cc2753abce0ae06fa4f8dbf46101 SHA512 da83c308740e1f6017c748c17c5602838e7a9e96422d45a5d39dbdc7c020f5a5a6ce7a40c2392955662f4291ee48d47a1647e7a1001075d963e0a1be923a8068
 MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
diff --git a/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch b/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch
new file mode 100644
index 000000000000..265cdc7753a4
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch
@@ -0,0 +1,11 @@
+diff -ru a/sanei/sanei_pio.c b/sanei/sanei_pio.c
+--- a/sanei/sanei_pio.c	2019-03-01 10:44:36.723260142 -0600
++++ b/sanei/sanei_pio.c	2019-03-01 10:48:47.660693036 -0600
+@@ -73,6 +73,7 @@
+ #elif HAVE_SYS_HW_H
+ # include <sys/hw.h>
+ #elif defined(__i386__)  && defined (__GNUC__)
++#include <sys/types.h>
+ 
+ static __inline__ void
+ outb (u_char value, u_long port)
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
index 84029550db4e..66591b118f08 100644
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/iscan-2.29.1-png-libs.patch
 	"${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
 	"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
+	"${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
 )
 
 QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
@@ -115,7 +116,7 @@ src_install() {
 	if use gimp; then
 		local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
 		dodir "${plugindir}"
-		dosym /usr/bin/iscan "${plugindir}"/iscan
+		dosym "${ED}"/usr/bin/iscan "${plugindir}"/iscan
 	fi
 
 	use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index f712db89f753..b34a4103bc66 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -3,6 +3,6 @@ AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541
 DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
 DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
 EBUILD jhead-2.97.ebuild 745 BLAKE2B 41bee772b4941cba460549b464f24758b716d4ed3012a544e2277deea5cd651ef0fa3519d6b7c77a3b0512320b7936294c0ea4a8b574ce5c7141cbb82f566a9d SHA512 690547b5b0b4eb36153ff782f6e55e8b67155e677cba2ace3a0ec6cdd0f3d1eda313dcaea5e33a417e98c1c113cfb22de011a88117f31dcea7ab7858e229bb67
-EBUILD jhead-3.00-r2.ebuild 684 BLAKE2B 4d94def2692149fb917e60d1da74f2e8c20796c8960badb631a0fa2dee167fb4cecc2595d83438ef5577919f7054e527d62b325bd30aa5227bbd974bdf43c2ed SHA512 d6cefe40ea00700239fb0f567a9163f53369a1d103434a088dc7335bd16f6fecf00cbb9b9fd4287bf1d38cf268da2843c3a2050c71dbd3a6b77ebdeeec6c68df
+EBUILD jhead-3.00-r2.ebuild 688 BLAKE2B 71c31d2141cd214a70185f532399ef86859baeb5d13bf4d374820e90664060a2f67eaaa3d6fb775f5ebb55f352cb26e946324ff0a4ea266c1afb669d5c32db06 SHA512 42f1b10c425fa66b5f36168efe4ac3d81bac19101482b1825d4e12a631e2a9e4cf836ecf145ecf6827c016f8835d7de8850418b826e230aad517f30a2a826e99
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild b/media-gfx/jhead/jhead-3.00-r2.ebuild
index 4003550535b0..a47820149d19 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
 src_prepare(){
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index 9f40682c24fe..df2a747917a1 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,5 +1,5 @@
 AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
-EBUILD jpeginfo-1.6.1-r1.ebuild 649 BLAKE2B 0e5ffefeb11501f245fb943c2e42fe45e26e7f89e8918440c8200607421bc450e33f55ade47206ce5e26cc77b338b52c67c4c3ccd8a538abc1a8bcc73ccaa837 SHA512 13e0a0cf8d896684de7e3165a1d5c2c1d57ab199c1a381517661dff2978de5c9ad8ae3e03f19d029c0219dea016a979e38e72fca7a1f1c1c7f9a8b2726a3ede5
+EBUILD jpeginfo-1.6.1-r1.ebuild 648 BLAKE2B 795b403fb3fcf92bdcf7c025b64abf46e4213b513df25c18f4d6320db9f233a8042f6ac8f8d26fc453cb48c782d4612204c26b214d7513b1b334671833f18b49 SHA512 e1c08078269babed555cda67b9a167dbb8d2900de7811168090c936a6940318deaaf824449ed6d8bf456fe1550cb7ccacd3c2fb718134258ac4e18a6d71841ba
 EBUILD jpeginfo-1.6.1.ebuild 670 BLAKE2B 3c03a10d42865a06ca72ce8c0fe765dc2d978ec9b53f0f6f7cc1e19c13bce7ddcb969e37975240788699e33e4bbc4d5a826444148f7950932fbfd8e4467af4fa SHA512 099f7b21978f8df38d027d11af7222ecb539ef42b573d93c4a343e710934bb4fc3c127c9f406c5a9c8859bc7ab0e52d5629918f1cd23079f8c32b7dba0484ae2
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
index fb764fd99d88..d9beabe1b3e6 100644
--- a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
+++ b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="virtual/jpeg:0"
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest
index d86d5fe4ea3b..1cf202bb3eb2 100644
--- a/media-gfx/jpegoptim/Manifest
+++ b/media-gfx/jpegoptim/Manifest
@@ -1,5 +1,3 @@
-DIST jpegoptim-1.4.3.tar.gz 98151 BLAKE2B 6faf7097fbd72302707ca7f7b7f6bb02841d5f6433c6624254c09fcf389da99cc117eddddf1e58de941394e84b22d6cef06d54568de26558c8c9cb90b0c77595 SHA512 4495e9cf5af9ba41273bf23a4abea724adb19ddac373d5985c29fe65b227c0b23bf14baaa28fa8f8617370e9b9fe41b0d365ad19da67f34d32fa857232c7b09e
 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.6.ebuild 522 BLAKE2B 3438d71e873d37c2819d36a4a4e96a8d382fe0f5defa3247c2ef978be0cf083277f3549588cd3e6a9e3e7ad10a12db993ae0c0b2853a3ab26b715715ecdbf574 SHA512 90859437b0c88ccbe3e745d247d00ba155f9ca5a4ff3a07385e770cfc107872e911eab8e1a1a360687b75c9ce6f513cf0d6ef5be81289946d7963c207c810a76
+EBUILD jpegoptim-1.4.6.ebuild 521 BLAKE2B c3ed9280aa0a636ea102a73e681459d9435ed5a7ee689152e1fd9b0a8fe692d16dab2f709c4e100d1006cff90e1b1a1a8497dfba251ee7b6360fcb7d649567fa SHA512 3897cbc3888b8258f547321f1f64bbb2359a4d09bf4133f303a9b25e1172b0347148290e8716f7ecef9db1dfac292aa4f2d9de2f4a1a9330e7eda9efddf834b3
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpegoptim/jpegoptim-1.4.3.ebuild b/media-gfx/jpegoptim/jpegoptim-1.4.3.ebuild
deleted file mode 100644
index e6b750048b8b..000000000000
--- a/media-gfx/jpegoptim/jpegoptim-1.4.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility to optimize JPEG files"
-HOMEPAGE="https://www.kokkonen.net/tjko/projects.html"
-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 6a78ab18057a..905d570976eb 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/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 3617f7ff907f..652722b3eb5f 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,3 +1,4 @@
+AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-EBUILD kgraphviewer-2.4.3.ebuild 971 BLAKE2B cd38fbfe2c701f736ec608f1c3f658dc315254f398bc1b82a88b72588408dedfbfff09d392b43aaf86eaf39f1833cae9373f029d65d37fc2235ed438cc8bf53b SHA512 33d7d4e16eb680de6dd39b2e93bed30ddf28bcb35ff20ccf804bf81daf04e4fbbb609e7e8aa6be9c2b562d1a4fd7901cf2858124f32938687521b7907dacbfb5
+EBUILD kgraphviewer-2.4.3-r1.ebuild 1024 BLAKE2B 940daf0846ae9311673255a8922bd87c975338bef4fd78254af9ef3b2f3deff78db481aa2a16d7895be05cc0f074f6ab23ca1bccddbcefa7a40e4098abfb265c SHA512 e9f566e219c313f20bbf1c49320c919fd0ad52cb89865eae1f33b29f8f803dc9f80a91606c3cc3079381b8d04707b57f7b562de569f121605132590fa1947b35
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch
new file mode 100644
index 000000000000..970bf57f2cfb
--- /dev/null
+++ b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch
@@ -0,0 +1,27 @@
+From 50fea8d6413e06fcfaf0d0ca03cc6c266a1cda14 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Tue, 5 Feb 2019 04:49:16 +0100
+Subject: Set StartupWMClass in desktop file
+
+Used by non-Plasma unixoid X-based shells to map windows to desktop files
+e.g. in launcher UIs, which do not know about _KDE_NET_WM_DESKTOP_FILE and
+instead expect (one of) the WM_CLASS entries to match the basename of the
+desktop file by default. StartupWMClass overwrites that default.
+---
+ src/org.kde.kgraphviewer.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop
+index bfff1bf..6b3affb 100644
+--- a/src/org.kde.kgraphviewer.desktop
++++ b/src/org.kde.kgraphviewer.desktop
+@@ -41,6 +41,7 @@ MimeType=text/vnd.graphviz
+ Exec=kgraphviewer -qwindowtitle %c %u
+ Icon=kgraphviewer
+ Type=Application
++StartupWMClass=kgraphviewer
+ Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization;
+ X-DocPath=kgraphviewer/index.html
+ InitialPreference=10
+-- 
+cgit v1.1
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
index 3bc5085a5a82..80476c054574 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://www.kde.org/applications/graphics/kgraphviewer/"
+HOMEPAGE="https://kde.org/applications/graphics/kgraphviewer/"
 [[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
@@ -36,3 +36,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!media-gfx/kgraphviewer:4
 "
+
+PATCHES=( "${FILESDIR}/${P}-set-startupwmclass.patch" )
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8f6af52ad551..df8a4d9ec9cb 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,7 +1,9 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
+AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416abf1150a4b25f81b5befb8ffb254daf0c25b4b189ba0aefe9a3256eb83013d80919e21f77f7880fa7856a05ef5c995dfc73d079753e2c38 SHA512 c4048d8fe560508f04df785a012db99a5e6a2d4ca5b1d8e774a307cdb99f62de4969b04a58586c771a174dadf6dedafaa70568e8b6342612fbe52be32db257cb
+AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
 DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772 SHA512 a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
 DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 EBUILD krita-4.1.7-r1.ebuild 3457 BLAKE2B 520b1b159aa586ca15e7347c031887fc27df80378b5ac8790f0242fde258717228bfa5cfc2ca5851e875f1482a6197d8a0ba9344ac02953c679b82fcc550817c SHA512 39d313a44e0086604f00a4bca6e6d15f44e5041d38f55b3da3c5906fe67d192a16fe275c222fd89ca6c21156d013c46578f083a3e0641b892714d92b8c569551
-EBUILD krita-4.1.8.ebuild 3269 BLAKE2B b4326c317a9de468c023823f4226796318c98b535ca9d38fc51cc18dd1ba72669b4415f34792fa2dbcb798eb91d7dc93f91d8009f077465838c7ecba31a47489 SHA512 41580f3de0fcd72f203824d3a6e2d5c0eb3ca2dd31030d16fce692446db6019b4eed3c7145c34d0ad8fc51b43630c809ee1e596e265d9c08b255379999f12c84
+EBUILD krita-4.1.8-r1.ebuild 3391 BLAKE2B 15aa6e2c6cc62d58e83a2f4cf05fb9f21319f5dc1927868705b20718c8e97ba647e38224e149f204390ba97144748691267280b64c3a66d93558a0b6f88d202f SHA512 f212dd7bb4be8b79dc9064746b25c06bfe092d1c0b798e182379f6830ea3cf796ac5b47b20d0a2c0f026c1aadba2932e3df55071259152014c2e6f034451940a
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
new file mode 100644
index 000000000000..2928247e57a0
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
@@ -0,0 +1,49 @@
+From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Mon, 25 Mar 2019 21:16:41 +0300
+Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
+
+Basically, the patch mimics this Qt's patch that has been
+added in Qt 5.12.0 only:
+https://codereview.qt-project.org/#/c/239918/
+
+BUG:399696
+---
+ libs/ui/input/kis_input_manager_p.cpp | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/libs/ui/input/kis_input_manager_p.cpp b/libs/ui/input/kis_input_manager_p.cpp
+index 4f5a58f..0a26655 100644
+--- a/libs/ui/input/kis_input_manager_p.cpp
++++ b/libs/ui/input/kis_input_manager_p.cpp
+@@ -333,6 +333,28 @@ KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
+ 
+ bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject* object, QEvent* event )
+ {
++    /**
++     * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made all
++     * the tablet events be accepted by default. It meant that no mouse
++     * events were synthesized, and, therefore, no Enter/Leave were generated.
++     *
++     * The fix for this bug has been added only in Qt 5.12.0:
++     * https://codereview.qt-project.org/#/c/239918/
++     *
++     * To avoid this problem we should explicitly ignore all the tablet events.
++     */
++#if defined Q_OS_LINUX && \
++    QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
++    QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
++
++    if (event->type() == QEvent::TabletMove ||
++        event->type() == QEvent::TabletPress ||
++        event->type() == QEvent::TabletRelease) {
++
++        event->ignore();
++    }
++#endif
++
+     switch (event->type()) {
+     case QEvent::TabletEnterProximity:
+         d->debugEvent<QEvent, false>(event);
+-- 
+cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
new file mode 100644
index 000000000000..dc65b1c49d23
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
@@ -0,0 +1,38 @@
+From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
+ <griffinvalley@gmail.com>
+Date: Sat, 30 Mar 2019 21:47:37 +0100
+Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
+ 5.12
+
+Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
+
+Trying to paint with a painter that uses this while opengl is enabled
+will lead to a crash. The only relevant place this enum value is still used
+is in kis_tool.cc, where it is only painted on the regular non-accelerated canvas.
+
+Anyhow, told the smartpatch to use this function instead of doing something itself.
+
+The whole thing is a little bizar.
+---
+ plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+index 656ba38..32577a3 100644
+--- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
++++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter &painter, const KoViewConverter &converte
+     Q_UNUSED(converter);
+ 
+     painter.save();
+-    painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
+-    painter.setPen(QColor(128, 255, 128));
+-    painter.drawPath(pixelToView(m_d->brushOutline));
++    QPainterPath path = pixelToView(m_d->brushOutline);
++    paintToolOutline(&painter, path);
+     painter.restore();
+ 
+     painter.save();
+-- 
+cgit v1.1
diff --git a/media-gfx/krita/krita-4.1.8.ebuild b/media-gfx/krita/krita-4.1.8-r1.ebuild
index 09ab5c97fee2..46926f21e6a8 100644
--- a/media-gfx/krita/krita-4.1.8.ebuild
+++ b/media-gfx/krita/krita-4.1.8-r1.ebuild
@@ -88,7 +88,11 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+	"${FILESDIR}/${P}-qt-5.12-fix-unsupported-composition-mode.patch"
+	"${FILESDIR}/${P}-fix-pre-5.12-tablet-support.patch"
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 121a9d1ff3a3..043f296a202f 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,4 +1,4 @@
 AUX kxstitch-2.1.1-qt-5.11.patch 992 BLAKE2B f0be157270ddd27e1f997f57afbb8e3d80c31816334664a7a2804c4c9971a81c11ecd775820b7fe0db36dff7ea00d046c7f005a0bf715e9336f4f238a36c2b18 SHA512 93d6a5ddc2fa928369b09637ee6b856ba60d35d02e5e93f16fc08c4fdbc2ebead44224d2ad98fa2ffe6efcea8b93a0211eb00ad83c9cd91b8ddc30edff17602e
 DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36 SHA512 d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3
-EBUILD kxstitch-2.1.1.ebuild 996 BLAKE2B c4501fe2dd6f65972f32638ce780bdae756963aea4ae91c16a5963d6009345b61cb20449d9633928afe045efc4c260e044cf5b6507aba48cca4d30f6a0554cc5 SHA512 707d79a84adfcb6c17a7d2a9cfdaba94eccf10d4de2c2cf43f6759a638978f6f9e52a312445c1c12089a996d7da311c754faaa2bf7038ca6326e2fdbd42cbcb6
+EBUILD kxstitch-2.1.1-r1.ebuild 964 BLAKE2B 19695be54baf8f3a0f8d21eb48f02f13d9513672d89d7c3d0f22ca8d51356bf52360424fdb2b097d0f22890103b56e95a9afaedb6d98688384dd94c5f164b952 SHA512 6d962753cad9e1fec89043d9039e14996bc161d343447a8d674a1defceb1d4eaeec55e47f463b7685390282da01525cdaad0610ccabba1eb393e15a6f1160dd7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild
index e9ec0691e3f9..bf995e2e238c 100644
--- a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -15,7 +15,10 @@ SLOT="5"
 KEYWORDS="~amd64"
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -33,10 +36,7 @@ COMMON_DEPEND="
 	media-gfx/imagemagick[cxx]
 	x11-libs/libX11
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!media-gfx/kxstitch:4
 "
 
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 59e7e2a28ffd..8fac3bf55f76 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 1457 BLAKE2B 835275cf0cfba833abd472b9ad71b90541766df82c0ae67b2702d85efa0d94693176663f648e19fde1f9df39a510c63657da9d534adf6fe311b0821263cf7349 SHA512 b7343fd41663b075834272736924bc9f7cb92f3ae5167ce21dc9175a9e112c5122762509995ae94546e90f2e3470d58c9906f9d4b8e9a708dfb1399c59f06eff
+EBUILD libimagequant-2.12.2.ebuild 1455 BLAKE2B 042d8ee1c679be1c653be7db67959a256aab915d7abc1a9fc15018b6b05573c65ba4dc570380be0da4c21b08da3214643c294e22c9221d6df24ef7ee126cb934 SHA512 3674057adc382735084b34d314a7ab291c655ac5a74db902cb05f1efa2e7cf3ab59ef57a7e318796e36c7826b32c84f510337a3ceac04aa38ee428821f99d7f3
 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 51cfc32c7338..e17635af6507 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 877edc200bea..9cb8f384520c 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 1839 BLAKE2B d0664351d520712bc0282deddea28193a3b17262c0d72321b9f05752c5fee175429dc5d2752cd19dd88fb05a38438848b510d3f6ee833e4ab2bfc859fc3f70c2 SHA512 06a6fdd23acb648ce22859bb1813a0d1983134ed500be973428c82f18d478603447db3e523a2d3f7e92e764a9ffa249f102feef4bff651a91cdcba16a1ea7915
+EBUILD mypaint-1.2.1-r3.ebuild 1838 BLAKE2B 142ff5c4619f973055f9db2fab1535ec6f7be72e64876a94b657f850f4dd23678c1f51ba43f60a128e660c6382f9f24c48f14015f356913a703f318c922cb73d SHA512 85dbdf683e5f415e89f1199f44220f708ba75f177aee0c1272b18b7871d32f74723e1846ac200f390deb274154ba3b5b625bb2cec5314f49e2c80e8dd84e1a74
 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 d3156f6ad318..a557d74eb68d 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -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/pqiv/Manifest b/media-gfx/pqiv/Manifest
index c532775556b8..280a2e3f93e1 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,6 +1,4 @@
-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 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.10.4.ebuild b/media-gfx/pqiv/pqiv-2.10.4.ebuild
deleted file mode 100644
index 28b7ffe93510..000000000000
--- a/media-gfx/pqiv/pqiv-2.10.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info toolchain-funcs xdg-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/phillipberndt/pqiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
-HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript webp"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/cairo-1.6
-	x11-libs/gtk+:3
-	archive? ( app-arch/libarchive:0= )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	imagemagick? ( media-gfx/imagemagick:0= )
-	pdf? ( app-text/poppler:0= )
-	postscript? ( app-text/libspectre:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	local backends="gdkpixbuf"
-	use archive && backends+=",archive,archive_cbx"
-	use ffmpeg || use libav && backends+=",libav"
-	use imagemagick && backends+=",wand"
-	use pdf && backends+=",poppler"
-	use postscript && backends+=",spectre"
-	use webp && backends+=",webp"
-
-	doecho ./configure \
-		--backends-build=shared \
-		--backends=${backends} \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--destdir="${ED}"
-}
-
-src_compile() {
-	tc-export CC
-	emake VERBOSE=1 CFLAGS="${CFLAGS}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index e543b9d11425..2f2b4202c532 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -3,6 +3,6 @@ DIST scrot-0.8.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d
 DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
 EBUILD scrot-0.8-r1.ebuild 662 BLAKE2B b4b30806cfb63597a748b4924687259224dd09c0d2eb8a698786681595ec0124434621cf11de7d16b0c8a25188a6bdf230d9117f76bb6a5da4965e21652f379f SHA512 edd9a48e946ea4e3cbaedf277c1d80f9bd8c5a727da72ce1e6167fe1d23bbe9103b804197e4e46ef0a47500c54221d2299bae5abfd709eb5deeceae6ba10c66a
-EBUILD scrot-0.8_p13-r1.ebuild 1000 BLAKE2B a0c67967afffa40e9b16768dbf78090899ed5304fa2f4d8103c52898179d1816eb1b483792776e0c9b657c34a9e5d876df1ba98bb65c4aeb961617da8e7315c8 SHA512 2155cf6a25f10636fb11053434b1256d29040e891590fcdbc8e1119fb451a3ed9e7966f2b57be46ba865156e74737b7e36b5213d23b427c88a3cda971b5e0578
+EBUILD scrot-0.8_p13-r1.ebuild 999 BLAKE2B 8b9a2c5894409b0ce205c86aa85120608e341f62264a5e738f2487da7f9ff5dc71459149adec96e25577dd9295609b19d66e27c75a6850e68e0feacb17f03ee9 SHA512 e6599baad370c49917875c2c81ddc00a449078b8b4f22de45f7a9f7a09dfa311afc1bb04f16bf347788b944f68cf0dcf9cf3400d6563bf8baf734b7ebbbd3e3f
 EBUILD scrot-0.8_p13.ebuild 909 BLAKE2B b7848136b4b9c6bebc4ca18f6d562dbf0e2bdd164a92aeb60adee4b75352e08977dc9ca2938fc235b06761e7057f72f3de4e03547bd738f1f757b1703b31ffeb SHA512 98b9ef9f2a381fb4f33a87d51b0115ea38edea097bba1a5c71f96be1da04e6182e3e2586deee1e64962d2ed14ef2ec57458a1ffd842952cb8981bab8122224fa
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index f3270d6118dc..793d8927d5d6 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 95b9b67342e4..5fac865f3256 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,6 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f93fb07315a4f5cb0292b29befb0417df6e6afb059158d9840903d7474bf0d4fb97e634c585ca7654581b82a264e80f0 SHA512 9f0ced644b13dcaad4f1e23a6520b1cbe3c36d995fca4791383f959986cd396f123638a23dbd02a9511ef7e1c9c915b3a025e9b7e4de4542a4c180c4fe29e2b9
 DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
-EBUILD simple-scan-3.24.1.ebuild 1307 BLAKE2B 8b90d4018beaec2add9b1a9b9b5988caaae286304dfdc1c6180db1794ed53c20796f28144d8c3d4b37893219c18f7162e773d337978034ef5abaf5c5cc7d1506 SHA512 859a7b62b6717cd3ab921343be728e964a60c92b32de3a2ac1493a2f6d71d6ba5c5f07188e392250e1aae75673646de9f91bf25570bb43a99d564920ec98062d
-EBUILD simple-scan-3.30.2.ebuild 1399 BLAKE2B 2bb1071bda32bc657aad896ebad72dacdac7b7f2c91ef2e07e42855bba1e096c8153fa87ddb92131b3f0a04eba419811bc79c07c94f04c13567bd05698db8d48 SHA512 94079609c6a0cf84d902a97bdf1a71cf90a4265a7fab323649530fa7d8f842817c5b79b983dc491504c0014b5b239312de86cee6f5b59947da767b63ab6d09ce
+EBUILD simple-scan-3.24.1.ebuild 1335 BLAKE2B 63576693a802db62460e1082dff99268639ee3253dd261facd0db3bde5b399461e0e268a417dd4b3e7346de47287b1dee9321be09ba80fa03462d08961718a31 SHA512 071db78d53b4c1dede6c5509b9de07ccebe9f46664ad023764e352cb8c1c87ce3e17321a8e78602e6cda6c8f4a3a7e98fac8a4b19b60c4e4271ee3237d73410d
+EBUILD simple-scan-3.30.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0
 MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
diff --git a/media-gfx/simple-scan/simple-scan-3.24.1.ebuild b/media-gfx/simple-scan/simple-scan-3.24.1.ebuild
index 9cb904fdf738..b5767b15057f 100644
--- a/media-gfx/simple-scan/simple-scan-3.24.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.24.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+VALA_MAX_API_VERSION="0.40"
 inherit gnome2 vala versionator
 
 DESCRIPTION="Simple document scanning utility"
diff --git a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
index 0c95a91a0257..c3f42c9f23b3 100644
--- a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
@@ -2,12 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+VALA_MIN_API_VERSION="0.34"
 inherit gnome.org gnome2-utils meson vala xdg
 
 DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="colord webp" # packagekit
@@ -33,7 +34,7 @@ DEPEND="${COMMON_DEPEND}
 	$(vala_depend)
 	dev-libs/libxml2:2
 	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	>=dev-libs/libgusb-0.2.7[vala]
 	colord? ( >=x11-misc/colord-0.1.24:=[vala] )
@@ -51,8 +52,8 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-Dpackagekit=false
 		$(meson_use colord)
+		-Dpackagekit=false
 		$(meson_use webp)
 	)
 	meson_src_configure
@@ -61,11 +62,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/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 688824e44d3e..20a0de83a2a9 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,6 +1,7 @@
+AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
 DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
 DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
 EBUILD sxiv-24.ebuild 1219 BLAKE2B da05f3f295ee8c8afb247ff3e31609ddf0b8c0fe8fb0db47f7e108b4253aa6565ff9dae5fe8b1c6875d5177705a2260fcf2be2a20e0d56374d31761537f30f65 SHA512 62ba4b36f941fc709a8e83a0be2bd581493041f1f93c21acd43753f8d7d368c9a6d6b8d9d3560dd78c9ebe0c4a15fc09cc48cb8a60fe77c4691b1663d0f8a370
-EBUILD sxiv-25.ebuild 1241 BLAKE2B 4881e1503bf20cb06434fbb1cf4c540ecd2d724fb845c00eae2e349b96fc4440ed54359113f72a710a39564b7d4d2f015465b8754e1e6a6fb94abc1d6702e53f SHA512 1f8b2885556990c7de6b572cfc0f54d94d2fc804a73da9953d7f36511d73256c8318855ac32f578acb8bbb286eb0b70c411581a5cdaac2424239c866bab9d441
+EBUILD sxiv-25.ebuild 1288 BLAKE2B b2a01f9da164a41f2a107eb12b4d90cd65c1d205d355ffaf133aa0018785e5e8c74e05aba6a93779950b1474710351a6caaf59820c6c4bb7d9abc196fca232fa SHA512 26a337a4bf4b6392020707ba5f6fa3844218e2c6946b9abe22a77e3bcc9d04d0ff5053fde4e0293f056beaab2bfaef21df51ab2f036dd7fe9e764d40d704efcf
 EBUILD sxiv-9999.ebuild 1241 BLAKE2B 4881e1503bf20cb06434fbb1cf4c540ecd2d724fb845c00eae2e349b96fc4440ed54359113f72a710a39564b7d4d2f015465b8754e1e6a6fb94abc1d6702e53f SHA512 1f8b2885556990c7de6b572cfc0f54d94d2fc804a73da9953d7f36511d73256c8318855ac32f578acb8bbb286eb0b70c411581a5cdaac2424239c866bab9d441
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/files/sxiv-25-makefile.patch b/media-gfx/sxiv/files/sxiv-25-makefile.patch
new file mode 100644
index 000000000000..01a8ddf2c19a
--- /dev/null
+++ b/media-gfx/sxiv/files/sxiv-25-makefile.patch
@@ -0,0 +1,13 @@
+Don't try to rebuild sxiv during install.
+
+--- sxiv-25/Makefile
++++ sxiv-25/Makefile
+@@ -62,7 +62,7 @@
+ clean:
+ 	rm -f *.o sxiv
+ 
+-install: all
++install:
+ 	@echo "INSTALL bin/sxiv"
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	cp sxiv $(DESTDIR)$(PREFIX)/bin/
diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
index 3b3917053a8f..d1cdfacac94a 100644
--- a/media-gfx/sxiv/sxiv-25.ebuild
+++ b/media-gfx/sxiv/sxiv-25.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
 src_prepare() {
 	restore_config config.h
 	default
diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest
index 6fa2f9fd2e5f..a096a2a71a8f 100644
--- a/media-gfx/symboleditor/Manifest
+++ b/media-gfx/symboleditor/Manifest
@@ -1,3 +1,5 @@
+AUX symboleditor-2.0.0-cmake.patch 1248 BLAKE2B 09298608568c20dc29b8139abbd83544862fdcb84ac67ed6c1d3094b16fd864647d686b0685df0891ef74227038a61c40e42d0fa24ebe9e8faffa4729d39f2a8 SHA512 bfb9ae87492675cfcd19abfcf255aa720196129a8715b6315a9b6cd5cfa199b63be98a891d1c068c2feb789e6ec0bbc88a4f24cf23b766aec0953e39f6f7ecd0
+AUX symboleditor-2.0.0-doc-optional.patch 798 BLAKE2B d3ff8e71c6adc72f0cfb8914723eeaa7f4b80f07d5433638546536e018d4256b2d130e47b1963c5a11ca9338934c295019b7db8ea29475b9df2e4a7c01cce9e9 SHA512 2f84f7e772fe74dbc6733861d2f4a48adf95dab1ec33e4ef6e56c85123a190a17af1ed04ce554f95a5bd3ce80a402c6239c31ba20a8ac128c7362abc26a84281
 DIST SymbolEditor-2.0.0.tar.bz2 544789 BLAKE2B 2d0566d1e4b765e4cccec93def5fb184a27edbeb90bed8a76514e880e49a9c4139d4679f380c6c831c3f25a857af2df367d9ef96c56009189b2db9f964202e73 SHA512 8baee88fd8ff5f2b6334e80fe7c3fe8044ae521e5a8ffa2588f37dc4a8bf0495c902789bfaaed21a6eaf3c4f6380d18550aaed8046e84b396317104c8a49c993
-EBUILD symboleditor-2.0.0.ebuild 1030 BLAKE2B 4e2cecde14a23c4aae6dc4df71522b958eb9c56d52ebc39880f3b08e2cfb906ca067a2342a3f827cb9f07b3a173c89b315c69e4800433748173243fe360b52c5 SHA512 83f82650e0811e2669f00b03e3b0bfb6253543914225e8691fff6344296ba5f8bc692e816170f01c0c89ded7a30b7f0c4327e64a3eb961c8c6ee5bb3d02ceb31
+EBUILD symboleditor-2.0.0-r1.ebuild 1019 BLAKE2B a73fd66ba9ebdb1a95a5b69ed8e2da4ec67a4c8155785960b4bd70fd12f7ccec5b65e8e5289630183bdf346b2cfa8f8bbc5e665a240428b2a1c53efc596a4ea9 SHA512 a1c52dc93b696da3d8d94448d0af55cdedfa02f319d0a8f0e085df9266ff0667a0cce91111b0ecc009bed941f9df3f328a930669dc4a5f6a7ddef2b41fd1aea3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch b/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch
new file mode 100644
index 000000000000..ab0bd049bef3
--- /dev/null
+++ b/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch
@@ -0,0 +1,41 @@
+From 8739cd6f5fe0f2ed0cf9913170573c62ee246c63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Burkhard=20L=C3=BCck?= <lueck@hube-lueck.de>
+Date: Thu, 22 Sep 2016 21:17:07 +0200
+Subject: cleanup CMakeLists.txt
+
+remove qt5_wrap_ui wrong because the app uses xgettext and line 60 already has ki18n_wrap_ui
+remove add_definitions (-DTRANSLATION_DOMAIN=SymbolEditor), that is only for libraries
+and
+src/Main.cpp:84:    KLocalizedString::setApplicationDomain(SymbolEditor);
+is used to load the translation catalog
+REVIEW:128126
+---
+ CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d1016cb..d88174a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,10 +64,6 @@ add_subdirectory (doc)
+ 
+ kconfig_add_kcfg_files (SymbolEditor_SRCS SymbolEditor.kcfgc)
+ 
+-qt5_wrap_ui (SymbolEditor_SRCS
+-    ui/EditorConfigPage.ui
+-)
+-
+ ecm_install_icons (ICONS sc-apps-SymbolEditor.svgz DESTINATION ${ICON_INSTALL_DIR})
+ 
+ add_executable (SymbolEditor ${SymbolEditor_SRCS})
+@@ -89,8 +85,6 @@ add_definitions (
+     -DKDE_NO_COMPAT
+ )
+ 
+-add_definitions (-DTRANSLATION_DOMAIN="SymbolEditor")
+-
+ if (SILENCE_DEPRECATED)
+     add_definitions( -Wno-deprecated-declarations )
+ endif (SILENCE_DEPRECATED)
+-- 
+cgit v1.1
diff --git a/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch b/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch
new file mode 100644
index 000000000000..3434e90c6122
--- /dev/null
+++ b/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch
@@ -0,0 +1,28 @@
+From 2b809c68d40a3d0af2da668bad3f4d9ced86f56e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 10 Mar 2016 20:26:57 +0100
+Subject: KF5DocTools is optional, so add doc subdir conditionally
+
+REVIEW: 127336
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d88174a..da7458f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,7 +60,10 @@ file (GLOB SymbolEditor_UI ${CMAKE_CURRENT_SOURCE_DIR}/ui/*.ui)
+ ki18n_wrap_ui (SymbolEditor_SRCS ${SymbolEditor_UI})
+ 
+ add_subdirectory (icons)
+-add_subdirectory (doc)
++
++if (KF5DocTools_FOUND)
++    add_subdirectory (doc)
++endif (KF5DocTools_FOUND)
+ 
+ kconfig_add_kcfg_files (SymbolEditor_SRCS SymbolEditor.kcfgc)
+ 
+-- 
+cgit v1.1
diff --git a/media-gfx/symboleditor/symboleditor-2.0.0.ebuild b/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild
index 194321ebd65b..3661330a67f4 100644
--- a/media-gfx/symboleditor/symboleditor-2.0.0.ebuild
+++ b/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="optional"
 inherit kde5
 
-DESCRIPTION="Application to create libraries of QPainterPath objects with redering hints"
+DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints"
 HOMEPAGE="https://userbase.kde.org/SymbolEditor"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	MY_P=SymbolEditor-${PV}
@@ -18,7 +18,10 @@ LICENSE="GPL-2"
 KEYWORDS="amd64"
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -29,17 +32,16 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/symboleditor:4
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-doc-optional.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package handbook KF5DocTools)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 	)
 
 	kde5_src_configure
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index cf5bce18379e..b7a230e5ff1e 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 2519 BLAKE2B 80d64f282abb3c67a8b3e610dee00fe4ed383638cfe696c1ba876198477157509cc28b75b73dc84359450dde0c8f230f9314b98f9b9b1f30fe76c40fe6790f8b SHA512 8b7a85c4b19e5c16e68e221594bd99b70399bb19d9f313ec4385329a5f745ae780e25f8b316ddf521917a4b97867438e6269a52e33b7b1b20bb4b55905e2ebee
+EBUILD xloadimage-4.1-r12.ebuild 2517 BLAKE2B 877ce8c199d1080a21006d2f46714191aa7810b85a443e0a48dd772a3fc852ccf679d078c4c2b617f8321a4fa530c94b3cc36c689a2d392c05e79bb8a2ad0a6a SHA512 489017f7a6ede439fb8ac701cfe35f037a25f8ac98ee0927ef01cd2e40c2f4afd140289c50d2d19934af0316fbcc58a08fcc820bf6322962aa4258894151d8de
 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 f609119f5784..f02fa7f780e9 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
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
commit	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree	c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /media-gfx
parent	0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)