gentoo resync : 02.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
commit: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree: c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /media-gfx
parent: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)
49 files changed, 1060 insertions, 1283 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1fc048d63600..7b17b5da7d6f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 7f2164dbb711..21cba16065e3 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -3,8 +3,11 @@ DIST Argyll_V1.9.2_src.zip 13624924 BLAKE2B 7035a1cd43b320acd3ccb6eeee46681e39f7
 DIST Argyll_V2.0.0_src.zip 13588152 BLAKE2B a299d7b4b2c76ac22c6761b4e25b4ee5751bd0771fb3d4c58dcb722aec1b413ab07fef35263e2dcb311d893bb16105072a83dd640720efbf160a59369fc88768 SHA512 44e9a2307bc39a8e455c15b2f4126de652a9ecd43bec94a841cb3da56896effcb023740d7e6b8991d109766c83426eee4b131a6c56cda5ff28b22a06ea470b5d
 DIST Argyll_V2.0.1_src.zip 13606682 BLAKE2B 156c94d538a868a90e59a009999ed35536ab84e27434c071613540c4afac1c7374f77eca73a38ca87220a0f1cff7213286312cb681d50a7e7e14b946788b8e0b SHA512 d0755d1837fa000278f390d9d101c1e9de3f2e294583c8b67b37f74f0ca6190917bfddd5ce50a39a274aefeeca304aaebdfd11db391521e222da2368a2881c0e
 DIST Argyll_V2.1.0_src.zip 13823910 BLAKE2B 344520ba06055333858ebc1991939589fb276ee434a5d16c6eedbb318da1cff27a910298fdd0ced86f292d1e3564c6e0d6a2663cf7b80cbd4afcf2d49982b3f2 SHA512 9a74828c8cea8aac5795ab48b1531b2cbd43ea613e856eceb55ee291412eb5e8816f25f6bc620bd1bfb32eb8c08e87e85e821a2dcf0c25eac68d96184e8f8bca
+DIST Argyll_V2.1.1_src.zip 13825860 BLAKE2B c1a748cf8ecd8e04164b0281e5cfb708386b196ea75bef6be02945d1a0cd1d191d069420628612ce0bd24028e40221a988becc3eba16293555376d20ab3a4bf5 SHA512 551b90c245d15e401c96c76ec0be66053bd75ca4d8b668a41841d72197820ed27d4d0186f903c126f7bacd667170e8e45e42ad31fcd44ec3276558b87b520565
 EBUILD argyllcms-1.9.2.ebuild 2087 BLAKE2B e20ba736ce25cbe2b8957ef60cd16d4a667ba606c564aa5c28c11949403c44dd014f06ce3a156f99d3f24d0d9a1f5c70dee723451867f65bcdd3310a72e8c904 SHA512 8485775e762c057e59407758788a5982b3a07c33516381ca6bf229452737d4a226e83e151109d6f8afcf70a68581d48009aa8d9722d180cc906796c010580ad6
 EBUILD argyllcms-2.0.0.ebuild 2042 BLAKE2B 2d8c8f9bdaffd551fd69ccd2ba9d7ec26055fc1b52dfd367d32da5a71629e4c50bcb529a1635ceb5dd397cdad8cfdf9fc1c28b5cc6d19206e1e7b0111af45d20 SHA512 e41a6c9053b2bd8a3814a89875d714a4af8d00143277aa120d509ed2d24a3a4f31b10559bfa92141abd0b5131ed5344932e198350959221b48faaadf5f5d86a9
 EBUILD argyllcms-2.0.1.ebuild 2042 BLAKE2B f9560bb31b6f74a37bb7fbe3927ffe8d7435a8057f109f976e9fe8dd433703393a7ca5ffdb086e287ace418093a01ba89d720a6e90aea68819d9d485a0031b4a SHA512 825b1047f6a2c8b49e175442b1cd6f85831527d852ddddee12f0e8bdf119a3234afd672c19b96583f8c18f06e70bbfe19feef9a04ff81eef9398c9261a3d31e7
 EBUILD argyllcms-2.1.0.ebuild 2032 BLAKE2B ab27af1801046c31cce2b24267e3ad372ec5fce441cf4a42b5981bb278d6499178c76c188c935b12db27f0138019a68a4366de7891f0c3a8eb2106696b9a0200 SHA512 430d091e3421deee3fc1a5ab53ba549f677d143cbc5ccfffbc7434bf2b24d5017554b4eaf06895d0124a5c28adb19acf88401d974b2d385057054af0557b596b
+EBUILD argyllcms-2.1.1-r1.ebuild 2113 BLAKE2B 7491a7a5fccb9ca0675dced451e2d8c88b804f279e19eb53c0e6afe8a64c415ae0d9b954428f490d1050e86ff01ad8ff74bbc133b6a189951336c65a6c44cbb3 SHA512 f4180c02dcc2997607ffea5e174626609809a08346b6c65c7f51cb79c2e57eff5de83909855a35712b9d5f055d2ece7cfdafc6af2b9ed0c63ab9570f3cd7bd44
+EBUILD argyllcms-2.1.1.ebuild 2052 BLAKE2B 6812bdc9650f94cb577b901a513849bfedd7403069f4e013991aed46aeddcf80942bb989500a9cae5ce91a49a6fbac54142c525a14d0623c892a4d67eb2615a1 SHA512 267a3532a37275bea029f42f690c10f2776d9aea50b53431354b89d449e8f88d5c7308f4d707f9a158680d5666e044f61bb4b611e90374024fdfa3410c17c62e
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.1.1-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..276ade085560
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.1.1-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+IUSE="doc libressl"
+
+RDEPEND="
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-libs/libXScrnSaver
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+	if use doc;  then
+		docinto html
+		dodoc doc/*html doc/*jpg doc/*gif
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/argyllcms/argyllcms-2.1.1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
new file mode 100644
index 000000000000..13a4b210e34c
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 hppa ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-libs/libXScrnSaver"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+	if use doc;  then
+		docinto html
+		dodoc doc/*html doc/*jpg doc/*gif
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 2fa7a0a3f436..0dbc5be5d2a0 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -10,10 +10,14 @@ AUX asymptote-2.47-xdg-utils.patch 727 BLAKE2B e49045dac05319382a1c1b649ce525d8b
 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
+AUX asymptote-2.49-info.patch 436 BLAKE2B bd620511b6c695bd30f91c2e2d3455f35ce328c769f075c862ef884021c44b2363b2dbe045487d7a1d362953782fcef4cc7aaad331e9479371193ef9dbd6facf SHA512 6dfca4a63df4d2735b7f957aa5f6c193a9f2ab81a8d45249d09903c454b2a95e3f480eadeb545d7adfe8efcebb80e4c59f7d240140f197190313272d6e7df57b
+AUX asymptote-2.49-xdg-utils.patch 727 BLAKE2B f2ba7a7cdded26eee90926b62a077be99e84e8ede15e3ffa8c923147c16316bcddff63970b4967d792035c253b4d300ea9139a55b0ad30562c1a6dd279b7ebdb SHA512 64eb6e626ad8a8dd96d9cac5e6ac0c798f317b1d3120bcaffcab4e6c4dff69b07c12108ab78812e54eae862f7946c75edb94dc3c3501996284ac98f54a6ded9d
 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
+DIST asymptote-2.49.src.tgz 3730453 BLAKE2B b52c2fbac5ea9c6046f2bd2990c7f3792823ae0ecd749c58990bcee898b8af7d26c4b457bee6aa15fb11e3c63a7cdc6d7e4976418ee96fc4470a17f3202d79cd SHA512 08c20e45ab764281b480a97c5e2294cdfcc18b179cbdc85cf9956806b40fe305360d589077bd3ac429985503b0e7d17c889a37349d8c6fdf8ccbd8d822544226
 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
+EBUILD asymptote-2.49.ebuild 4596 BLAKE2B 0462fb2a5efad3462fb7c348a80538badef4fb99df887e8134e1c6eef761c774277914c566dc333a1a6bcc6009cb25655c3d985f7d4d8ec734891a2c9180a8ff SHA512 a0094454032cfec2378a7586c6619d551d8b2cde249db9777db91a6731327f0d54cb0a7eddefbe33119875dec50b32738b82f5d82475c6c88ab3aa1cbabc26ea
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.49.ebuild b/media-gfx/asymptote/asymptote-2.49.ebuild
new file mode 100644
index 000000000000..60224c1dae4b
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.49.ebuild
@@ -0,0 +1,211 @@
+# 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=(
+	# 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.49-info.patch b/media-gfx/asymptote/files/asymptote-2.49-info.patch
new file mode 100644
index 000000000000..e2b51860c3d6
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.49-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.49/doc/asymptote.texi
+===================================================================
+--- asymptote-2.49.orig/doc/asymptote.texi
++++ asymptote-2.49/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.49-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
new file mode 100644
index 000000000000..d5d719de25da
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
@@ -0,0 +1,23 @@
+Index: asymptote-2.49/settings.cc
+===================================================================
+--- asymptote-2.49.orig/settings.cc
++++ asymptote-2.49/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/displaycal/Manifest b/media-gfx/displaycal/Manifest
index c2f5f9aae448..ff8d355a828c 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,10 +1,5 @@
-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
+DIST DisplayCAL-3.8.1.1.tar.gz 10611516 BLAKE2B 797c20aa7d26014ce5d039de352639b6d9f045eb06701044a0cb4a1b34c9744b0ca4f659a33cd23d16fe918e5d7e270def4ecd5007ddfc82682b486d3a413e44 SHA512 75d4ff038ad4f98b2d234b99d473a9e951983a607c28bc4eadcaa89bcfaa02ca13ed18fca8d4608cd881f215cbb37c36f91f7862a8c83541423524aca35b4688
 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
+EBUILD displaycal-3.8.1.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.7.1.2.ebuild b/media-gfx/displaycal/displaycal-3.7.1.2.ebuild
deleted file mode 100644
index 02f4e0b4a7e5..000000000000
--- a/media-gfx/displaycal/displaycal-3.7.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 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/displaycal/displaycal-3.7.1.3.ebuild b/media-gfx/displaycal/displaycal-3.7.1.3.ebuild
deleted file mode 100644
index 02f4e0b4a7e5..000000000000
--- a/media-gfx/displaycal/displaycal-3.7.1.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 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/displaycal/displaycal-3.7.2.0.ebuild b/media-gfx/displaycal/displaycal-3.7.2.0.ebuild
deleted file mode 100644
index d6063154f815..000000000000
--- a/media-gfx/displaycal/displaycal-3.7.2.0.ebuild
+++ /dev/null
@@ -1,63 +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 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/displaycal/displaycal-3.7.1.4.ebuild b/media-gfx/displaycal/displaycal-3.8.1.1.ebuild
index d6063154f815..6d9baac97b2a 100644
--- a/media-gfx/displaycal/displaycal-3.7.1.4.ebuild
+++ b/media-gfx/displaycal/displaycal-3.8.1.1.ebuild
@@ -20,14 +20,15 @@ IUSE=""
 
 DEPEND="
 	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.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/numpy-1.2.1
+	dev-python/faulthandler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
 "
 
 # Just in case someone renames the ebuild
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 924dda877d91..20df8bfba0d7 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -2,5 +2,5 @@ AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3b
 DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
 EBUILD graphite2-1.3.10.ebuild 2499 BLAKE2B cdfabfaeecaf58e032422d60adf6ee349ec2bdba70313138d4dd4e88e258ba9868a31a4f56109a043846e2aaf7dd242468bd49244ebf28c3b3a9cb0b2d085300 SHA512 43b767dbed5273118dd9cd42a505e659217989f4165dd41e971df02ce6042f1c8476e06eda60b66023f02df3a41b0bfe8b63df88b2035d70ccd2d5fe36a7e4ac
-EBUILD graphite2-1.3.13.ebuild 2665 BLAKE2B a1b167348d875a18f31e8f751b47d77905bed6154b608b27fb907e6bc3b3e0d866fb122f39a204bc13a95b28b6de3f42619d3dcbc282dc65ddd3b74c088015f2 SHA512 5901cf0829bea1a6bfea922bc35072b130691f5c63238172f2e4e5f5a600d003a20b522b298e351a3a9590a09d0c868c9b1411d4a18971700fd3e4e6bef96015
+EBUILD graphite2-1.3.13.ebuild 2664 BLAKE2B 523bff44957b4787413d88422a2f3b32b09c3ddf1dcc092b5ca3110845d881dd59a5f52755415fecfc25dcab87e6106494b923432ebca23fd7956ff557e6510a SHA512 a8fd81c61e19b15d90800f7e63c5cc9e9335b350cb6af829557c70cd6f98858d588677f7b86237ceab379a89652bdff8bf74930222c4cc13473a5071c2da78cb
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 48547d91bb4b..0fd46d437ad5 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 
 RDEPEND="
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 12bfda275128..92c3d07dd937 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,7 +1,5 @@
-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
+AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
 DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
-EBUILD hugin-2018.0.0.ebuild 2023 BLAKE2B 084ad47690dba6a9020dd815ba6b91621bdbb8ff39b3a70d5033fb9533199254016ed6be6a117ee57b8126169f866453c7016a26ef95733e8d221f00f70421ca SHA512 95a3dff5c0ba71574cd1f7454ffd6fbcaaad105313b20f9bba4eaada750efd1e7262261536898e7b7941775b27325ae9768b3376d0f13a2d4cbe5b7f18314835
-EBUILD hugin-2019.0.0.ebuild 2141 BLAKE2B 2b0a7e4575bf21869c77817400fe8d2c932d997c9af4ed24390f70444478c25025ee846c3c4c18d2eb4d2b6e4bf089963dced68fcc6c173b72ca04cabbd015da SHA512 f3a8f072b086f18b7bc36e89ae1e8aff658b7d188d8b0ed5db6589d57d456264109249f87b11d6fadee812e3a1496468b61580c46045cc8bc88909ed32816084
-EBUILD hugin-9999.ebuild 2010 BLAKE2B dc2a3fa7c6252cb2e6efb15fbcfe410113184c29e031e45d7482b2628fa6d68b641d3c6ee23d0ea5b6fa5150fe2c72bf2c615a603b5452b458ecde44b89e8974 SHA512 cfc02d7f6688f3024c987052a1f1cf3e110265d56b181e89a7f4525570231c8b2ee58932a376350a32b623b0d75b1821084d5523ec3bc7ff41592d1ead667de5
+EBUILD hugin-2019.0.0.ebuild 2209 BLAKE2B 422eb30880ce4b6b99f2386897fbd9bf681f3ac95d08e2403e7588b4d67b6ffbb5426135c301d5a67316977f4752a9db81717672a9374f737f4c6f82cd5e45c6 SHA512 4c6cf8a833bab922cad4c58de82d08360459584894c41d0b4f423480244bbdfc4dd5782c98f5bc8e040974f475d52944b9a1a5ded96e3f465e32241e7fecabfb
+EBUILD hugin-9999.ebuild 2058 BLAKE2B 7a3caa225c3a346a02fe52944ec07fa46116868df793ad91e7f1744bce8eabe495f5969da4f28a399f8c07673c42b6dc37bbcb7d4ee99c83c4dd819b959e39fb SHA512 7d9e70cee2f287214ea55c8aecb181f790ba1ac53bd7ea0fed5a50ce2d6f62c0fa656b27efaf6d965cd91b58e3e04941df645723236c2df58f510d4f69690cc5
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
deleted file mode 100644
index 23dd54289217..000000000000
--- a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/hugin_base/panodata/Exiv2Helper.cpp
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp
-@@ -29,6 +29,7 @@
- #include "hugin_math/hugin_math.h"
- #include "hugin_utils/utils.h"  
- #include "exiv2/easyaccess.hpp"
-+#include "exiv2/version.hpp"
- 
- namespace HuginBase
- {
-@@ -232,7 +233,7 @@
-                     return false;
-                 };
-             };
--#if EXIV2_TEST_VERSION(0,23,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0)
-             if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) &&
-                 _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2))
-             {
-@@ -563,7 +564,7 @@
-             std::string lensName;
-             // first we are reading LensModel in Exif section, this is only available
-             // with EXIF >= 2.3
--#if EXIV2_TEST_VERSION(0,22,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0)
-             //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above
-             if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName))
- #else
diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
new file mode 100644
index 000000000000..e22023f3998e
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
@@ -0,0 +1,29 @@
+Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
+
+--- a/src/hugin_base/panodata/SrcPanoImage.cpp	2019-02-16 09:18:55.000000000 +0100
++++ b/src/hugin_base/panodata/SrcPanoImage.cpp	2019-05-21 14:26:23.470193305 +0200
+@@ -40,9 +40,7 @@
+ #include <vigra/diff2d.hxx>
+ #include <vigra/imageinfo.hxx>
+ #include <hugin_utils/utils.h>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <lensdb/LensDB.h>
+ #include "Exiv2Helper.h"
+ 
+--- a/src/hugin1/hugin/RawImport.cpp	2019-02-02 11:11:01.000000000 +0100
++++ b/src/hugin1/hugin/RawImport.cpp	2019-05-21 14:33:00.522541182 +0200
+@@ -35,10 +35,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/xmpsidecar.hpp>
++#include <exiv2/exiv2.hpp>
+ #ifdef __WXMSW__
+ #include <wx/msw/registry.h>
+ #endif
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
deleted file mode 100644
index 5c87262440f2..000000000000
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_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+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
-	sci-libs/fftw:3.0=
-	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"
-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 )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	local lang
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			ca-valencia) dir=ca_ES@valencia;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang/-/_};;
-		esac
-		if ! use l10n_${lang} ; then
-			rm -r "${ED%/}"/usr/share/locale/${dir} || die
-		fi
-	done
-}
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 543908d5bca7..65ee4e79249f 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -56,6 +56,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS=( authors.txt README TODO )
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
+
 S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
 
 pkg_setup() {
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 0783740a35d3..5ec24c68ade6 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -64,6 +64,10 @@ pkg_setup() {
 	setup-wxwidgets
 }
 
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_HSI=$(usex python)
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 595496185fcd..3e099acd1082 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +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-42.tar.xz 8944092 BLAKE2B c616030d5624cc67879f698c52a906dede56db5f594cd1efef67ae7a7ce555f385b60b442e87904e3cb9f95840448e2a58d5121bd8e408812a3099864be880f0 SHA512 49ca335a7f0f83fb925995fa4249790cbb93142a0a30387f4d6c6ee9278599801da8b8644f3828afff8be841f55b64e31fda3bb4c6eea2c540bb94be4c926cb6
-DIST ImageMagick-6.9.10-45.tar.xz 8936232 BLAKE2B 7fb58bb55765efb0d0789334d91b11d95f62b49bef9810e5188291d20bb6fdce0c4e9d9bb9857a76ed3c23ec2c9747d366d1ace696687a7d95fd1ee838f6defb SHA512 a45f9d9d1080b7771b4ccecd4e36dce042e82d3bf18fe0b0d1d4dd82f25ce0a175f0ec6ec31a26f516c6517f2b76aac68a1b4a5471fa4af3d58e1c5f1193031a
-DIST ImageMagick-7.0.8-42.tar.xz 9455976 BLAKE2B c3cc7353da73fea92c51febad8816c333970b91069ee54756acf7f1b9f57481fceec066dcb21845b2ebf1a9a97b17b9f8b6859d1becdbfc9553bfa148b5c0433 SHA512 88f57b69ece3b93b0af41e85bacb0b232cf07e7d0aab34e1479ce6c5fe29b1cfcdcd8bc6b2b87773c2109122614a0f64847629029470d945409b08b19032d936
-DIST ImageMagick-7.0.8-45.tar.xz 9450936 BLAKE2B 6fa1260d98249ebf370bba0cd8352a6acb3b9e27df779881a77ca9701b804e513f6f6e4f8d008c2b86e3b9823d86d1de06c85cbed99c06f20aa50b261745458b SHA512 a54068d68b97adb4ffc3920f93a44166e1ce8c6a79304c60c20f020852e31502810d2f8cede4043ec3870febc3b7aebf2c06c06401813ce054a6b67cc343f1d2
-EBUILD imagemagick-6.9.10.42.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-6.9.10.45.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
-EBUILD imagemagick-7.0.8.42.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
-EBUILD imagemagick-7.0.8.45.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+DIST ImageMagick-6.9.10-46.tar.xz 8942956 BLAKE2B b62673ce3a8b889bfa7dfb5243c2e594df53915f2253f102b14c3cd9b2d57b2324ecf285be97e6b84e5b7a8b951ff4b76eddbd0c75dede409057ba386bcf9abc SHA512 cd2843a98c2bf121aea4cf2e5c101e879256a8f9e187e3e1042852c41097b1c89312f8b829b13604fbc4f0917e096e25ba09c6b76b462bf4eed8fa77ccd0e478
+DIST ImageMagick-7.0.8-46.tar.xz 9452404 BLAKE2B d235547f04205939370360c99e32ac63641a3fc2e0c9d6266befa02bbd102ed2b66e79e63afafe2a45ed5670882d61e73b93baa8b543d9ba78ffa53bcb114324 SHA512 32177f8a899c6a6b64740c3afbcea584da2573823324ca0bdd5a6d70692ca7a689944eac0b3a07bcc827c5c426fdb9e4b8714448fff7e50e26c7bd4587f2f43b
+EBUILD imagemagick-6.9.10.46.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-7.0.8.46.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
 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.45.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild
deleted file mode 100644
index b09291336ccb..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.45.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.42.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.46.ebuild
index b6bca9ea8b20..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.46.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild
deleted file mode 100644
index 69c412db11b7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.45.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.42.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.46.ebuild
index 59c2b130c53d..59c2b130c53d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.46.ebuild
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 88c28ed1ad5f..1f8c2f07261d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -10,5 +10,5 @@ DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab5
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 EBUILD inkscape-0.92.3-r1.ebuild 4183 BLAKE2B 074d57b407abdc33e616d7d6229b9b7db12fc6ed6c5278797bd62296403815d6900081c5fd5adaf20ba4a12bdaf083314531ecb8f10212f51e9ae8293d113ada SHA512 09ec9080cc60458b98deaeda24ec08b27200db024f3f34270264576b4edb9d3a6beb241de0c0a2ff5d019e072538c7279385b0a242dae007d41395de5032a6c9
-EBUILD inkscape-0.92.4.ebuild 3842 BLAKE2B 65915e0d0f058d6eea2a5e404604ba0eb1d466ce0874e502815109e0874e6fe1a7164bb7deeb2b4bfc63e5cd4becd7c9b87986a8af8e560b4dfda007268b6bac SHA512 095f5e03f7228da21d9a230ad9764f9dc54395bc04a9c9a7c9cbc7026f85a4b5c431add5275ac52c0d03467300935c27347c0e2cc869f671b6cfaa192ffd2418
+EBUILD inkscape-0.92.4.ebuild 3665 BLAKE2B da5dd894e76515e300e285139da88f76d12d811de6d7700d1b55710e435975429a961909883ea281194e1e98959d4ef11513213b0bc9a9f3f607827a3ffebb02 SHA512 31d4a5fedc13ea0f19817f4ae88e9719ea6499bf655454cbef2e107358cc20be0fd63b294adfc6bb82b06ae134028ad535e320d6bad753a1fd7503ef0227c82e
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 7d775127ec30..d29e444aff27 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
@@ -105,7 +105,7 @@ S="${WORKDIR}/${MY_P}"
 RESTRICT="test"
 
 pkg_pretend() {
-	if use openmp; then
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
 }
@@ -157,15 +157,3 @@ src_install() {
 	find "${ED}" -name "*.la" -delete || die
 	python_optimize "${ED%/}"/usr/share/${PN}/extensions
 }
-
-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/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index 5b7998d6bd7b..00522a43fa93 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,5 +1,4 @@
 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 643 BLAKE2B 2f1d3ddcdb79c1b5dacdb0e5219502224c679969e6b437d761d2e86021fc7af805c205106af13ab230694673434183b91b6f48eee9fa66975ba2e7345aa8985e SHA512 f6f1ec73f9b12de6dab5ae15c4bda8c20268b8e35c5c3d2804e21de27239d3376c9c3dbb103e5bb7a1f5f8693a2030a28a30ea1405d2436f5a8ec2f80d14632d
-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.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild
deleted file mode 100644
index 59414dd9e88d..000000000000
--- a/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Prints information and tests integrity of JPEG/JFIF files"
-HOMEPAGE="https://www.kokkonen.net/tjko/projects.html"
-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"
-IUSE=""
-
-RDEPEND="virtual/jpeg"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.6.0-parallel_install.patch
-}
-
-src_configure() {
-	tc-export CC
-	econf
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README
-}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b717689f01bc..4580ba67bc9e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +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
+AUX krita-4.2.0-tests-optional.patch 9915 BLAKE2B 3f63d2b30630e42413e58d23429c3df917c926d793c570be87bf59b83af9ec5740b220bbac433c928748dededf6714936c041433bc723c9612a45372311e6dc5 SHA512 72c62152ef767daedee84da58f179b34b0dc38adb03e63433c2870e0de93d30d2e929e65d7a8c8cd968b200ca0d87e570ab3c13f5be8b78b1c328dc3489ccb3b
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
+DIST krita-4.2.0.tar.gz 240015177 BLAKE2B 09992b50dfa4e244c809dd576c3b7c0d1cb09b19fde0985c3d72b57543e5a06aa863b9011d655432a089fb6869e2e7fdb23939877b0c4ee6aaf44a1c88e7084c SHA512 a6f373839e47c4e97f5680d266d1ea9f438db6636d3f8749f7fbf6d93b5329e1d46f7233af901dd224722c08100c4fc3b162a163c721299ebfa2d4939032ae44
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
+EBUILD krita-4.2.0.ebuild 3147 BLAKE2B 6238662d22d67a15503dd4c63b9e8c41c4c14144a50c33737b7b1777dc49c961102794a71f22a987fc706b01e5eaab091d78db172d207be0fe176296b1df61db SHA512 b8f6035e84083790fb1000f991daafde41a2c7423dd586d1493ba1157e11587dba39b20dbc3ebf8aa8bc14b04fb41d09114d9655c53eb1ca3af661a6f7dd0e41
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
new file mode 100644
index 000000000000..b605e922aba1
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
@@ -0,0 +1,324 @@
+--- a/plugins/color/lcms2engine/CMakeLists.txt	2019-06-01 15:10:43.442258240 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt	2019-06-01 15:10:43.452257980 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${LCMS2_INCLUDE_DIR}
+--- a/plugins/extensions/qmic/CMakeLists.txt	2019-06-01 15:10:43.469257540 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt	2019-06-01 15:10:43.477257332 +0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/filters/CMakeLists.txt	2019-06-01 15:10:43.488257047 +0200
++++ b/plugins/filters/CMakeLists.txt	2019-06-01 15:10:43.497256813 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt	2019-06-01 15:10:43.508256528 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt	2019-06-01 15:10:43.516256320 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+     unsharp.cpp
+--- a/plugins/dockers/lut/CMakeLists.txt	2019-06-01 15:10:43.527256035 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt	2019-06-01 15:10:43.535255828 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt	2019-06-01 15:10:43.546255542 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt	2019-06-01 15:10:43.555255309 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-01 15:10:43.566255024 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-01 15:10:43.574254816 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(kritatooltransform_SOURCES
+--- a/plugins/tools/basictools/CMakeLists.txt	2019-06-01 15:10:43.584254557 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt	2019-06-01 15:10:43.592254349 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+ 
+ set(kritadefaulttools_SOURCES
+--- a/plugins/impex/tiff/CMakeLists.txt	2019-06-01 15:10:43.602254090 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt	2019-06-01 15:10:43.609253908 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+     kis_tiff_converter.cc
+--- a/plugins/impex/libkra/CMakeLists.txt	2019-06-01 15:10:43.620253623 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt	2019-06-01 15:10:43.627253441 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritalibkra_LIB_SRCS
+     kis_colorize_dom_utils.cpp
+--- a/plugins/impex/jpeg/CMakeLists.txt	2019-06-01 15:10:43.638253156 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt	2019-06-01 15:10:43.646252949 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+ 
+--- a/plugins/impex/psd/CMakeLists.txt	2019-06-01 15:10:43.662252534 +0200
++++ b/plugins/impex/psd/CMakeLists.txt	2019-06-01 15:10:43.671252300 +0200
+@@ -1,5 +1,7 @@
+ if (NOT MSVC AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
+--- a/plugins/impex/xcf/CMakeLists.txt	2019-06-01 15:10:43.685251937 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt	2019-06-01 15:10:43.694251704 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+ 
+--- a/plugins/impex/heightmap/CMakeLists.txt	2019-06-01 15:10:43.705251418 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt	2019-06-01 15:10:43.714251185 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/csv/CMakeLists.txt	2019-06-01 15:10:43.725250900 +0200
++++ b/plugins/impex/csv/CMakeLists.txt	2019-06-01 15:10:43.734250666 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ # import
+ 
+--- a/plugins/impex/exr/CMakeLists.txt	2019-06-01 15:10:43.745250381 +0200
++++ b/plugins/impex/exr/CMakeLists.txt	2019-06-01 15:10:43.754250148 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+ 
+--- a/plugins/impex/ppm/CMakeLists.txt	2019-06-01 15:10:43.765249862 +0200
++++ b/plugins/impex/ppm/CMakeLists.txt	2019-06-01 15:10:43.773249655 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/svg/CMakeLists.txt	2019-06-01 15:10:43.784249370 +0200
++++ b/plugins/impex/svg/CMakeLists.txt	2019-06-01 15:10:43.792249162 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritasvgimport_SOURCES
+     kis_svg_import.cc
+--- a/plugins/impex/png/CMakeLists.txt	2019-06-01 15:10:43.803248877 +0200
++++ b/plugins/impex/png/CMakeLists.txt	2019-06-01 15:10:43.811248669 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritapngimport_SOURCES
+     kis_png_import.cc
+--- a/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-01 15:10:43.823248358 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-01 15:10:43.831248150 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-01 15:10:43.842247865 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-01 15:10:43.850247658 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush
+                     duplicate
+--- a/libs/metadata/CMakeLists.txt	2019-06-01 15:10:43.862247346 +0200
++++ b/libs/metadata/CMakeLists.txt	2019-06-01 15:10:43.870247139 +0200
+@@ -29,4 +29,6 @@
+ 
+ install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/global/CMakeLists.txt	2019-06-01 15:10:43.881246854 +0200
++++ b/libs/global/CMakeLists.txt	2019-06-01 15:10:43.890246620 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/ui/CMakeLists.txt	2019-06-01 15:10:43.901246335 +0200
++++ b/libs/ui/CMakeLists.txt	2019-06-01 15:10:43.911246076 +0200
+@@ -7,7 +7,9 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ if (APPLE)
+     find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/flake/CMakeLists.txt	2019-06-01 15:10:43.922245790 +0200
++++ b/libs/flake/CMakeLists.txt	2019-06-01 15:10:43.931245557 +0200
+@@ -9,7 +9,9 @@
+ )
+ 
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaflake_SRCS
+     KoGradientHelper.cpp
+--- a/libs/brush/CMakeLists.txt	2019-06-01 15:10:43.943245246 +0200
++++ b/libs/brush/CMakeLists.txt	2019-06-01 15:10:43.952245012 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(SYSTEM
+     ${EIGEN3_INCLUDE_DIR}
+--- a/libs/widgetutils/CMakeLists.txt	2019-06-01 15:10:43.963244727 +0200
++++ b/libs/widgetutils/CMakeLists.txt	2019-06-01 15:10:43.972244494 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+ 
+--- a/libs/store/CMakeLists.txt	2019-06-01 15:10:43.984244182 +0200
++++ b/libs/store/CMakeLists.txt	2019-06-01 15:10:43.992243975 +0200
+@@ -1,6 +1,8 @@
+ include_directories(${QUAZIP_INCLUDE_DIRS})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritastore_LIB_SRCS
+     KoDirectoryStore.cpp
+--- a/libs/pigment/CMakeLists.txt	2019-06-01 15:10:44.002243716 +0200
++++ b/libs/pigment/CMakeLists.txt	2019-06-01 15:10:44.010243508 +0200
+@@ -31,7 +31,9 @@
+     message("${__per_arch_factory_objs}")
+ endif()
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+ 
+ set(kritapigment_SRCS
+--- a/libs/libkis/CMakeLists.txt	2019-06-01 15:10:44.021243223 +0200
++++ b/libs/libkis/CMakeLists.txt	2019-06-01 15:10:44.028243041 +0200
+@@ -47,4 +47,6 @@
+ install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/image/CMakeLists.txt	2019-06-01 15:10:44.039242756 +0200
++++ b/libs/image/CMakeLists.txt	2019-06-01 15:10:44.047242548 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+--- a/libs/image/tiles3/CMakeLists.txt	2019-06-01 15:10:44.057242289 +0200
++++ b/libs/image/tiles3/CMakeLists.txt	2019-06-01 15:10:44.065242082 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/odf/CMakeLists.txt	2019-06-01 15:10:44.076241796 +0200
++++ b/libs/odf/CMakeLists.txt	2019-06-01 15:10:44.084241589 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaodf_LIB_SRCS
+     KoOdf.cpp
+--- a/libs/widgets/CMakeLists.txt	2019-06-01 15:10:44.094241329 +0200
++++ b/libs/widgets/CMakeLists.txt	2019-06-01 15:10:44.102241122 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
diff --git a/media-gfx/krita/krita-4.2.0.ebuild b/media-gfx/krita/krita-4.2.0.ebuild
new file mode 100644
index 000000000000..3153c3eba368
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.12.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-libs/quazip
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index cb6a68e85995..8883306138be 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -2,6 +2,8 @@ AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817
 AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
+DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
 EBUILD libimagequant-2.12.2.ebuild 1453 BLAKE2B cc36b27f971c7bdbbfb22a9b14ad70d00129aa90b1cc248cb512040d9a36f6e290acf5a5e6b34f672fc0b0cd95597569ee3d38e0cee57dbdfaa0be4dbc54c19b SHA512 c58252bd015bf0949df83f2781525b94578b19e9827837f50382db171c169af3c5239cb67bf68959411c1d6c231b3182b3ebeeac1ba0ef309514ff535a4eee4d
+EBUILD libimagequant-2.12.3.ebuild 1458 BLAKE2B b700b2e73c2a8429d9c8f171fb0279c2644baced6ed32b00c11af4f77bfaeb1b52ff09474ab91c1eed67aec08cb8c4d85299fa58dc6584e396891076f9c34092 SHA512 9a36392be28772244fc8785d919a91e1d7cef28815808c804d4ec40c862c895cdd7bc659eea278a7ace57153079cff914ad632930602d910548ef0f86795f7ff
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
new file mode 100644
index 000000000000..a68ab9c18f02
--- /dev/null
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
+HOMEPAGE="https://pngquant.org/lib/"
+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"
+IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	tc-export AR CC
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX%/}/usr" \
+		--libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+		$(use debug && echo --enable-debug) \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use_with openmp) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake shared imagequant.pc || die "make failed"
+	use static-libs && (emake static || die "make failed")
+}
+
+src_install() {
+	dolib.so libimagequant.so
+	dolib.so libimagequant.so.*
+	use static-libs && dolib.a libimagequant.a
+	doheader libimagequant.h
+	einstalldocs
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins imagequant.pc
+}
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index d2bb00a7f120..9b7775fbad2b 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,5 @@
 DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd
 DIST lximage-qt-0.7.0.tar.xz 41560 BLAKE2B 32ca95556a696059254a686727f72e1d57d245134b507dc90f83920e9a4a71b9b41aca459db96cd2adceffb6dd6592399c27279d3c3ca9ded6fd61480525dbd1 SHA512 a31185562dec1aa720287ab3f9fb79b9bccfcf0f2069aa404bd469852edbe2507f8c24cf8af0cbe2ef7013e4dab8ca51c00ac7a348254f1bf20458decd3c82b4
-EBUILD lximage-qt-0.14.1-r1.ebuild 875 BLAKE2B 0834a1d32ddfd242174dc2a3069cc353222ade0fdcfd03282e2e28ee2e16948f5a2233cee956c78ebeefa6b857b40d13253144b9426be164e84476a1b58d1cff SHA512 c5945aa8396fb16a7d372d1b0711612031dde81141f170e5c141e0dd35ae062b8a6a51c335c9b482d5acd0e693f773c6bcf53b055cdee44fff7976c9e7866be6
+EBUILD lximage-qt-0.14.1-r1.ebuild 873 BLAKE2B 9c51a5bf90065b0b13b2f506f538244e0af20b0c1704daa7a56b395dcc0fe84220a9b646d016941822bbb72ec634f96b6d6a248a990ade99b33ffe4c2e75fbf2 SHA512 bbd759e21943a7ead75e3f7d7a2808140da1de1f7106bb68e757c6b62524e8334708ed0c75061612fe48660590bb4611c0ddd501a943979ced535a15857d0874
 EBUILD lximage-qt-0.7.0.ebuild 962 BLAKE2B ccfd2b0b440910ec1354e14e001823c61ef482d9ce7949cc710a31b0249c34f75678159e566bb6c71695f56af0c37ea638d5597363cb0acb4901670ef2ce9c6c SHA512 6507d2f818a4f6932ef76a380b841e5754137d8e7f65036f9f4ad9742d797276125c8027913ac9a2a41aa5682b9660828dc67e831b221998ff1196d405c6d1c2
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
index 7e74167d0fd4..3b7064657413 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index f365b13a5465..9a3c00175b0a 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -5,7 +5,7 @@ DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a06
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r2.ebuild 2051 BLAKE2B 9b38c7a2f4d9c002f98890dd139211a353020d1d8cc3f7b95eac34765e11a153332498f83455cc1db384f436a080d33f5f1d982cc02cc82f4b49d90a8e3b9def SHA512 4c0e23bba7064bab8578b2f26c1234da7be2ddec2c7d70b15a710447d43550b23931120da432069fecaa69cf617376047b4ff1cb597d15fc5874c17034163286
+EBUILD openvdb-4.0.2-r2.ebuild 2050 BLAKE2B 019c4b6ba119dff7aff5cc3b41846f03e65f6680274199c89be04cc573e85af95a28e5d81b6f6d4a62fc1ecdcc733aba9911f4f97abb40128215147ca006a640 SHA512 c806cbdfd23bc085c032212672686e3ff19a1d414e9003570090373d82382a309f3f8d5673de2a791bd6a54a1f491e318e97cef982b03d15a51d21b5392af396
 EBUILD openvdb-4.0.2.ebuild 1935 BLAKE2B 8b25b6a5a55f91cb50c9b79b732d79921eab1ea4cbfa84f47431b1b5256142d489f38cd4da3946bd8d12ad471cb776d6fcf894b12263669138c453624d487868 SHA512 6fdb9ada5f4630e0f1b917b2d9c9467af7e8ba335dcba04866dc7cef3191aab606f5495d36f92e1500c53b1eca1b1471e8f182a470ad495e1290b659a56c10a9
 EBUILD openvdb-5.2.0.ebuild 1785 BLAKE2B b16a9beabf0e755da3daf1213703eb1103bc4a93681c5686842cfd814c1ac13753a8380d4a432772977f328fc5f4ba0e7eb5422142e9c11771952b7ef2b3de0c SHA512 e9ac1a52a478e9bd4108ef78eb124934a22310b9ec96239bf6e796abb873f1a36c527416b68d99e5fea077def2edbb4949198ef0e733532dc9a8daecf86e09a0
 MISC metadata.xml 1028 BLAKE2B a6d852019e2bf507aa175846fc1687f101df9fc498b7dd2c7de25d860f419e86eb37549e3a2b742c32d0a2f5c6fc0450b3c82da18ef96c65fc81e547f3e7e944 SHA512 2f9d7a4271998fd9fef7a0c4fbd9d77187ba0fe41d31a807e88b19554cc5b624686e3dca44a47e8e69edc71fa89a06fcd89de59f09bccf3378418500b268d287
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index 4b21771b9f40..ec3c20d387c3 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> $
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+abi3-compat doc python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 6dfc53d43ffd..63eb62a16f6d 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,4 +1,6 @@
 AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
 DIST pngquant-2.12.2-src.tar.gz 143404 BLAKE2B b06b1185fdeb1990e6b6f0cb77e33051729731fc2c2f4b1f618bd9077057354eabc21405872c938dbdf5395040860b4a884e9780bbd439da36f2af61d53e82a9 SHA512 ed82e0a57d9f4f3ee40258c4cbbf7ed086177dee1e2afdcb7d308f779c83fb2be9c7226c0713b9c72e6b6c22161dbaca3d14f2bdc2f0468daa608be80e9ef1c9
+DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
 EBUILD pngquant-2.12.2.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
+EBUILD pngquant-2.12.3.ebuild 1170 BLAKE2B 7c11ec368fcf151b197cdf89128b0b12dad91c2de6a39a9b04f2cc81d85eb59c4e09dd41544a0733ea0f42c5787974e499635f44a43a5a55815d020cfd7faad0 SHA512 842cf9d9d8cfa08ecf9eda120fadf8aa168736000fbaea8b8dcbf63d08901dad796fa1eb46a0a0facf9f6239feb392a0e1529a242ee085d96af950a331f6fa1e
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/pngquant/pngquant-2.12.3.ebuild b/media-gfx/pngquant/pngquant-2.12.3.ebuild
new file mode 100644
index 000000000000..822e8fbf648f
--- /dev/null
+++ b/media-gfx/pngquant/pngquant-2.12.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="command-line utility and library for lossy compression of PNG images"
+HOMEPAGE="https://pngquant.org/"
+SRC_URI="https://pngquant.org/${P}-src.tar.gz"
+
+LICENSE="GPL-3 HPND rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug lcms openmp cpu_flags_x86_sse2"
+
+RDEPEND="media-libs/libpng:0=
+	media-gfx/libimagequant:=
+	sys-libs/zlib:=
+	lcms? ( media-libs/lcms:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch )
+
+src_prepare() {
+	default
+
+	# avoid silent fallback to bundled lib
+	rm -rv lib || die
+}
+
+src_configure() {
+	tc-export AR CC
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--with-libimagequant \
+		$(use debug && echo --enable-debug) \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use openmp && tc-has-openmp && echo --with-openmp) \
+		$(use_with lcms lcms2) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc CHANGELOG README.md
+}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index d4fb065dd017..4182bb9c9723 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
-DIST ristretto-0.8.3.tar.bz2 564745 BLAKE2B 74f6fe50dbbcb538ff370fdefc934921e5878f7422dde577b86acc0ee63a03edaada860f0a91301de4b4ed4ae2fab89d74eccc5f3b9faababa4c71ee07159c33 SHA512 c43b48dfdf9e8ed0ea3c5f2bbac1c837881aa6a467c78377b6f53dcce030b5a3b8134a7b8cbad1008ae758295953fde50a916c284e54e8c5490158e776554514
 DIST ristretto-0.8.4.tar.bz2 581374 BLAKE2B 8d4dc91daa1aebf7d8193d8a48c3be29ad6fed86b7fbea68effb63f6a56d2d39898b5ab0c93933adf9d65cce327109dca5ecff96855c4311494de7cc4182213f SHA512 c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8
-EBUILD ristretto-0.8.3.ebuild 879 BLAKE2B 7f7473ecbbf739f47d1cb0370e15b2f487862792487e894b76dab4681adb2c433ea9a782c820bb95111bd83212badeb333ce21e2d10ec8cb455d6acf5224900d SHA512 faf62c22bba201b3136d30843ecca5d11dceb79b64ad97102a9b7ae3242e35264cccc41e66f37b32cd08fa63b599eb40be7a45a51e6bd219cab6757b7a076f63
 EBUILD ristretto-0.8.4.ebuild 876 BLAKE2B c950d825ab3ba23f9a0660a45c18874d591271a86e03c32d77be2908af0628cd1936290505f03a3b523ffd8932a453a8467d5c37062b6e19800635b8835c812f SHA512 42a4b7741c85d52878adc859fe4b9c9a7c5680c59be2c9c52bc9768371c2f39b89da1f01130c63aa4e66420b7d637531355c9eaea418d761b80024bfceb8c337
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.3.ebuild b/media-gfx/ristretto/ristretto-0.8.3.ebuild
deleted file mode 100644
index 330499742f2c..000000000000
--- a/media-gfx/ristretto/ristretto-0.8.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	media-libs/libexif:0=
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.10:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index c57999f69e6f..5a23145c3d72 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,6 +10,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r1.ebuild 7729 BLAKE2B 99a75ac0aae614e4168b1216ed22c071acc4d1a448eeeee1a6c36991df23bf8e68dfb558d3047e144f8fd32cd4ad766a41238be5a991b4039172872011eed501 SHA512 42689dd5189e9bfba21f016dc63897b0fec6adb18fda2485c64c35764caceff307b18759aa359d7b56fb69aee86ceb769d1c5f5162d30cc9e8576dc3140f70aa
-EBUILD sane-backends-1.0.27-r3.ebuild 8159 BLAKE2B 191353b0d1eb7773c79826595133799321c395377c382ee0cb82d43e951a5cadea5e59d109acfeeda7085a7d1bfc3871a2ce781492c438e803b313780fd061ce SHA512 acf8db419eafab5b27481ae148117325907f4ba5855b9f51790c979a55dda7c27fe4e4090cf8fd1ba224f55b1a54bbc8e532befa3acee53a8c5ee41f39d9d37d
+EBUILD sane-backends-1.0.27-r3.ebuild 8134 BLAKE2B a771fe78d1f77d7230929c81701abce57b455ce9da91df4f4b17e111e10fbe6a9135b6cc2a3bdd10382e49c53af2342e0082c7cd7e6428d40658288666938658 SHA512 dca0a98e48802811198dbaa6b12288364a1cd9f42542af9cfbeb52d1f0c5ff4127ec02a7c524094964dc74737e2eb4ba4af04128abcf7a9dcdbb3809a6c9ef21
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
deleted file mode 100644
index d69b29324a20..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev user xdg-utils
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf"
-
-for backend in ${IUSE_SANE_BACKENDS}; do
-	case ${backend} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm)
-		IUSE+=" -sane_backends_${backend}"
-		;;
-	mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${backend}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${backend}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_mustek_usb2? ( threads )
-	sane_backends_kvs40xx? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-MY_P="${P}"
-FRS_ID="4224"
-SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	snmp? ( net-analyzer/net-snmp )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	v4l? ( sys-kernel/linux-headers )
-	>=sys-devel/gettext-0.18.1
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-pkg_setup() {
-	enewgroup scanner
-	enewuser saned -1 -1 -1 scanner
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	cat >> backend/dll.conf.in <<-EOF
-	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
-	hpaio
-	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
-	epkowa
-	EOF
-
-	eapply "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	eapply "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-
-	# From Arch
-	eapply "${FILESDIR}"/${PN}-1.0.27-network.patch
-
-	# From Fedora
-	# Fix https://bugs.gentoo.org/635348
-	eapply "${FILESDIR}"/${PN}-1.0.27-canon-lide-100.patch
-
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing # From Fedora
-
-	# if LINGUAS is set, just use the listed and supported localizations.
-	if [[ ${LINGUAS+set} == "set" ]]; then
-		mkdir -p po || die
-		strip-linguas -u po
-		printf '%s\n' ${LINGUAS} > po/LINGUAS
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local BACKENDS=" "
-
-	use gphoto2 && BACKENDS="gphoto2"
-	use v4l && BACKENDS="${BACKENDS} v4l"
-	for backend in ${IUSE_SANE_BACKENDS}; do
-		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
-			BACKENDS="${BACKENDS} ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-	)
-
-	# you can only enable this backend, not disable it...
-	if use sane_backends_pnm; then
-		myconf+=( --enable-pnm-backend )
-	fi
-	if use sane_backends_mustek_pp; then
-		myconf+=( --enable-parport-directio )
-	fi
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	ECONF_SOURCE=${S} \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${BACKENDS}" \
-	econf \
-		$(use_with gphoto2) \
-		$(multilib_native_use_with systemd) \
-		$(use_with v4l) \
-		$(use_enable ipv6) \
-		$(use_enable threads pthread) \
-		$(use_enable zeroconf avahi) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null
-	fi
-
-	if use usb; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi; then
-		if use usb; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		udev_newrules tools/udev/libsane.rules 41-libsane.rules
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-
-	if use systemd; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
-	find "${D}" -name '*.la' -delete || die
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	if use xinetd; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-
-	if ! use systemd; then
-		elog "If you are using a USB scanner, add all users who want"
-		elog "to access your scanner to the \"scanner\" group."
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index 0b6bfaf0ec24..597f5de44373 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
 	)
 	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
 	xinetd? ( sys-apps/xinetd )
-	snmp? ( net-analyzer/net-snmp )
+	snmp? ( net-analyzer/net-snmp:0= )
 	systemd? ( sys-apps/systemd:0= )
 	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 "
@@ -235,10 +235,10 @@ multilib_src_configure() {
 	fi
 
 	# relative path must be used for tests to work properly
-        # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-        # --without-api-spec to not automagically depend on tons of stuff
-        # that break in many ways, bug #636202, #668232, #668350
-        # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# --without-api-spec to not automagically depend on tons of stuff
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
 	ECONF_SOURCE=${S} \
 	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
 	BACKENDS="${BACKENDS}" \
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 9c6c68f0007e..4c8e302e8308 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -8,6 +8,6 @@ DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e
 DIST xpaint-2.9.10.2.tar.bz2 1245813 BLAKE2B 9ff1a94bdbaf996f7ca41fd8df86ccfc58d7f51b24b20311f082beb30620dc48a6e9ae0e28ccf2cf41a7cd7901cf303fda1d45a7b48ff4ec356a3ac1f2ccd642 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499
 DIST xpaint-2.9.10.3.tar.bz2 1283725 BLAKE2B 46e1798830ddff6cc7d6d827fad0cad6d42a61dd6e6740ae6d3bca70ae7012a7c63d1d3ea5b6ebb21e0b2889c96c3f0e57969ec02bb8e742f945027e0e22e3b8 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5
 EBUILD xpaint-2.10.2.ebuild 1510 BLAKE2B 84c90679da7f4d8f48a57ad494d6a9914f4fa47a97e3d18bfa4f71c13619c94018e49879371fe18f852c15faf1a75ae4c9228e93d97d7b3c3eac62748c443aaa SHA512 8f009d6bdea418b73a4295e8f66e8b255f6b1b221346ddfe86beb44675fc66954ca2b6fb232f5248e2eb20aa19e7c5bd80b2be25c8ca0c9f5e6f849d34adbeea
-EBUILD xpaint-2.9.10.2.ebuild 1635 BLAKE2B 8cb612fe6cff41992106335bc2bb9bc15def648837f2d174c4c05244e672146a386b4402bdc6d4dfef9ea89a687b3a7de4b5b16c84b0537a1f86b6cdf5754be5 SHA512 63a3808cc6fba26a962f821d140aff7d756be1aa72211d29a2dc65e05dd841640b6a8b81fa6d3dedfff9a27d40936278d8d947052e82b30ef945eb41c62c066f
-EBUILD xpaint-2.9.10.3.ebuild 1700 BLAKE2B 0b7a8b5734e158d365bcef7ecc0cf31bf03945af5e448b9811890af4127b2f63f827a1055742ea12a01676909dcf9269b0d62b8a836acf6c2303bd53f9db2687 SHA512 767027b82623caaf63f312f534b6636dbe277b6ce9ce18ff119eabd6ebe0074ea59e4502afde67f69cbc76b3ff2972e96124537eaf5fddc0787b4d78e7897adc
+EBUILD xpaint-2.9.10.2-r1.ebuild 1634 BLAKE2B fd9d07d153e335a36ad0357348938782f6a887f4b3346ad3191c000cd0237c4f6e1dd3993515686b28da958218f5631c6558ec8b8d7deec8241830aad276823a SHA512 fa3117c3dda557ce2c19717652088d3ad0d7c7546d660ad3e5dbdd788056ffd462905c69f74b3b114658c3f3d7defeeb26307d00425009884a790381f0a259ac
+EBUILD xpaint-2.9.10.3-r1.ebuild 1696 BLAKE2B 140a5a043d216e0350294123b5a9f98da8b36b7648fa4b13c82726392e0fb976015d87fcfe1d2457b28db01ba89b010335d12d5da4c034940c26e3ba9987daa5 SHA512 1fac714e82d6df4f2f0dbe19f5a2fd9751d284496ed3b66487986155d20e4d01de8f0671000214ce87ff7eea09a96f0a3916aa2363c3532837b19f509fe50992
 MISC metadata.xml 1204 BLAKE2B 3cd1cf2062126075b6b4be1b987ab9098ae31b611abe6e81c15e684e62ed0a1133177c4718e5bc51d5be2a0b5b2b58fb4d4a2d67ea77f21ca6d9009f2a4d4150 SHA512 e2b37b1d3381dd97ecdd40f20535426539d7caff8032ffcb5e6b74d65968adb7319523a55e45d31a697a75b9aa384e0a5155059237730ea080cf46532da12c22
diff --git a/media-gfx/xpaint/xpaint-2.9.10.2.ebuild b/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild
index 3e5f5b70aa0d..4ca535290046 100644
--- a/media-gfx/xpaint/xpaint-2.9.10.2.ebuild
+++ b/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ RDEPEND="
 	x11-libs/libXpm
 	x11-libs/libXt
 	sys-libs/zlib
-	virtual/jpeg
+	virtual/jpeg:0
 	jpeg2k? ( media-libs/openjpeg:0 )
 	pgf? ( media-libs/libpgf )
 	tiff? (
diff --git a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild
index f75912276e09..00b7b44564af 100644
--- a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild
+++ b/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ RDEPEND="
 	x11-libs/libXpm
 	x11-libs/libXt
 	sys-libs/zlib
-	virtual/jpeg:62
+	virtual/jpeg:0
 	jpeg2k? ( media-libs/openjpeg:0 )
 	pgf? ( media-libs/libpgf )
 	tiff? (
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
commit	2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree	c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /media-gfx
parent	6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)