gentoo resync : 30.09.2020

25 files changed, 162 insertions, 527 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index efc28010e967..e5c182bfa828 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index eceed3b482ab..509b52dadd91 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,4 +1,6 @@
 AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7520529ace1aeabf78544aa780d91fe57d8db7aee8934401ede46810a8ee8f53f26d0e7304605386fd6fba080825c70abae SHA512 3a487cbbbfd94240858cb0a7221b9515720aeaab7adea3e7dd8be2d05d0369f5d3ecd5e3afc4ceb1cda0e2aecc0c72d0cae796f70ed181a90944e3d5d76a31f2
 DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
+DIST eom-1.24.1.tar.xz 2408284 BLAKE2B 70d660896dff42d5a91ea651697b50d4c90ced92023d5df48dfbed374c3777676f1f2dc99a0cb071a4eaa13353f31b11346136b963cf723397632cceafa64301 SHA512 70654b99f474d1b214cbbf8e799f82f3c38f47938df34cb5c8227c116b412364c568ae989b96d7082fb0d2fa319b3dba9b8dd499d19140a4d421bd09a46bffc0
 EBUILD eom-1.24.0-r2.ebuild 1666 BLAKE2B 7c8b1982b350e085321620d4e155526336e3e05b0c662e4c1547e335883f2919e4192c5836ea5b0121dc8fb64e471c3b1c26493e8cc82526b16092e71029bd5e SHA512 a88659a60d9382a6d3db22ffdb7dcf633bece393ab7d56905ef11f071487933cef476ea6af36fd1d79ed61007520e6fce38837105708f791baec892144f6a2b9
+EBUILD eom-1.24.1.ebuild 1666 BLAKE2B 6229dc67a7a2b6056387c2082e00ac37017e01b5c128f2661c1b551134f492f42a54ea18db0417cb5f170b6999b14ce277ff923ee6995ba26aa5c677696ebd77 SHA512 644cbd982fc0dedb92b03f206b416ae1b517a72540155f23117441cc61f0ef178907d13fed3c5b3c93e48c34b45c80c20b6aa740f6382aedf67f18816421ecc6
 MISC metadata.xml 467 BLAKE2B 5314ab156ff29533e419e8d6b82d634bd3ffd7898e8125525d2d45460dfa464c8c9a7311f3fb69e33172b523e85816d6ecaba0487087dacafd42e31cb261e3d7 SHA512 d21cd9729f0f8bde3caec98e3a7f75de8075b129651b7c25d386cbd1cf9f4a41972f48a6addb7180ae40a0c2a626a5508dab5736ed71d60b56bdd2132d479854
diff --git a/media-gfx/eom/eom-1.24.1.ebuild b/media-gfx/eom/eom-1.24.1.ebuild
new file mode 100644
index 000000000000..c7ad21aa5f6f
--- /dev/null
+++ b/media-gfx/eom/eom-1.24.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
+SLOT="0"
+
+IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.52:2
+	>=dev-libs/libpeas-1.8.0[gtk]
+	>=dev-libs/libxml2-2:2
+	gnome-base/dconf
+	>=mate-base/mate-desktop-1.17.0
+	sys-libs/zlib
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	>=x11-misc/shared-mime-info-0.20
+	exif? (
+		>=media-libs/libexif-0.6.14
+		virtual/jpeg:0
+	)
+	imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!media-gfx/mate-image-viewer
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--enable-thumbnailer \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_with X x) \
+		$(use_with exif libexif) \
+		$(usex imagemagick \
+			--without-gdk-pixbuf-thumbnailer \
+			--with-gdk-pixbuf-thumbnailer \
+		) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms cms) \
+		$(use_with svg librsvg) \
+		$(use_with xmp)
+}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 5450edce88be..99c8b021eac6 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -3,10 +3,12 @@ DIST fdm-materials-3.6.0.tar.gz 23037 BLAKE2B 842edbbef94dbf8a775d81bae3b6621dfe
 DIST fdm-materials-4.2.0.tar.gz 29011 BLAKE2B cd167506070e5609b0e464cb547271008b9f500312e378c9d8a16ae71cdcbde0efbd91bc0149f56ea9d9c9cf97f4a946810c542a4a0d8350344b48393dacc070 SHA512 02981374d4abcbfbcbace5b6b5d5542d4a5cc65ddf3a47569e34ad94284df56fdcc5f674801ee74c12034c502df8e5cca84a077f648f81557067f0044bf7bf9c
 DIST fdm-materials-4.3.0.tar.gz 33208 BLAKE2B 5505a885e03130757134557525e30ecda7091d3238aa5be753065c8bf81dd08914acf22ba85b95f3c78818bf5defedf97ea083d22f1886fc5113d692d70b14e6 SHA512 420accb4ff3eba754e96ceecda4980f121cab22ca3aeefe0781be47cce2ed64cd93df2a2bd974ea611e71ea45a944692e7b27bfbb6f9b0e9dd971e7621e4ff58
 DIST fdm-materials-4.6.1.tar.gz 36321 BLAKE2B bbdc28bf9d05b14f4b0545c4c50c67c31668f97aa9b6fcb8d51c5c958523ebe3307deb07587239df6a73e47c523db6c15f0ea4eb3c2560931a055c784d2b30cc SHA512 784b89acfb2a5bdc6a0e8ce864326ab21f4785887baa215ffcfe472853cc8386d32ed237199df3744c25d12abbef89605445e74b104770f0f3f8363944008c6e
+DIST fdm-materials-4.7.0.tar.gz 41139 BLAKE2B a372d8273809a7d1a14e0b6e35a9c7266d626f26013f53a5d6c8462e2b1054bd65c72745ed1afdf96b17d6573f74b8555c946ef76c94acb8d860efa459d9955e SHA512 cbc42e2777d1332b5187cf1f826f73bf5c1c5a1106d851dc08d8082f41bde6846f349ed2339ae60ad00b2005b0983f01850931adc765d545de0a700f1d9cccaf
 EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
 EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
 EBUILD fdm-materials-4.2.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 EBUILD fdm-materials-4.3.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 EBUILD fdm-materials-4.6.1-r1.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
 EBUILD fdm-materials-4.6.1.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
+EBUILD fdm-materials-4.7.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
 MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
diff --git a/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
new file mode 100644
index 000000000000..99506a67b867
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="fdm_materials"
+
+DESCRIPTION="FDM materials for media-gfx/cura"
+HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="embedded"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DEMBEDDED=$(usex embedded on off)
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index ce07cbf04ffb..50f61adcb787 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -3,11 +3,7 @@ AUX freewrl-1.22.13-fontconfig-match.patch 666 BLAKE2B 5e4a1e818214c3f4361d3a90c
 AUX freewrl-1.22.13-java-fix.patch 1942 BLAKE2B 2358d7862f179f8c98babfb241fdc281a84eaf0073529f549f435bcbd363f0aad7d44027f221b3ea85109fa06721d7cacb7584d1aaefe4333dc982964b5c940d SHA512 e8224e249e28918e04117542c710b093f90e31666312c7b3f62444d68158832893cf81237c8d9c7677ac4e0b571c0a74457721f0778996a975fbdacffdebb82a
 AUX freewrl-1.22.13-mozjs187-config.patch 486 BLAKE2B 4d130a4f8adc59ae97c83dd697d543b3fdd8bdd5c9b9e6253b8c1aa936648a9212e0a1d3c899bf5dd217579142e84714d1d783901e3aa61184122b2530e99fca SHA512 69985ba98ca8c12e59b6aba2fda004931778f138dfd90a45fd9a65027961401f6a377bfbc55f9fb2614ada5ac291922809dc87ea8ad7bdf93bdc78ddb3c3b298
 AUX freewrl-2.3.3-ld.gold.patch 1120 BLAKE2B 86f6b8baf403b70b3fd346265b20bd39b76fcdeb9f953b8a653c1999c7f8ea0be1faed609ddb5a74c01f4536f7cfae8484815422a2fdfa21cb9debabc0dd9f3c SHA512 010369ab9ec5f03f3055594b88001deb14a58e3d69cd5f8312a7a25d34ec4bef81940d911a7c13aa8872c82fe66c14284d292a33e1629ab9dfe52cd9a4412e3b
-DIST freewrl-1.22.13.1.tar.bz2 1830305 BLAKE2B 6b4a777fa8afff1547282995fb21fdf84ba821133e81f7f6a63d93661a0c2c5e7971a3d0d3fee5ff670ed253157e8975cc758755fa4348f8458244dcbf9e6a86 SHA512 6e751835a256ce08d4099e5301c0702e28e5cae2e77d8a51ab38f6f0c08680f22a9ef25ef9d2bb860680fc8c1fc22cfebf14cfb14b50ee514b5ef76e71ab1192
-DIST freewrl-2.3.3.1.tar.gz 1731651 BLAKE2B 2ee197ee4633719dafd0eece94b852c21e5a7eddb0b32f6da38de5473b781a6205ef38ce57bd0df4eb25a8f91b7685a4e26e9911bc00fcb5efeaf3b61c4fdc15 SHA512 e205e8d11a3650ddf4f7dd089bdca36fc1879424c88392229ca8c0d532ebc4662f4f2e3bc491a0a1d6300e78c55cebbb57eeef2145a8c96c727c35dfb2a7d00a
 DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
-EBUILD freewrl-1.22.13-r5.ebuild 4479 BLAKE2B b4db6b9254ab462d4dc3495e04408d066dae2ff0813c8d0d2d086e8b80299bf55b99be08a9dc8a0ef5d674f42ed0893ce245a6d40bb2f7c44e32a7e7400084d5 SHA512 33ffa5c86551c708663f56cec08d50351a8c1af2c7b2e19efe16fea09caac0e58feb206f81b85588163dba8e7eacd1043f9767364e323ce84ca12afc3fcda6ca
-EBUILD freewrl-2.3.3-r2.ebuild 4358 BLAKE2B 364e0702ef6d664ac25b10f06d6841c6e4128fa4c14fe288551fa289672cfdc02561b231468550b1c8b9e4b4bc8d2e942b09e5a952cdaccb211aaa3be2bbda27 SHA512 99a49d8d51cb37c7a462235506c2edcf02f27bef0f508f16e31fe9c2010f4339350bda9baaddba0aa1d438af649e242f865ca56dd50fd82015a8663c36965142
 EBUILD freewrl-3.0.0-r1.ebuild 4430 BLAKE2B 7145155adf968a057b3ab817fe496fd8fa7e618e53996a27967d7937ecaa1c0f45e318e83d470d9bfc225aca797675a95f78160e07aa46afbb81e98750fd389b SHA512 0a02299bc0698e022b8eaca0aa6e9151cdb08b16155137d05a4404a467ef66ff04e0d1e0a22b86ad9d557a61210966b7a960f63c6cc478cc889b93e39f775c3a
 EBUILD freewrl-9999.ebuild 4489 BLAKE2B 8d5f07f5fbb46894e75b62994794738dcf50fa2025eeddc5a0c5c4aada55169e15c2ae5ec90434ed8f96a4a12f1f0b20b1195eee7ffc4a391280f1b9842d56c6 SHA512 9d9dd93cdc9e6dae64d0bdb068b56fa2c6a0f478708be6e48aa771e10526b30c73ae039cc83fe3f62d00bab2571e60bb013ee796c7cd613c8b3c7fa8a7cc60dc
 MISC metadata.xml 1431 BLAKE2B 85ddccbf801a54f7ff8956e7bd1bbb453ea4c79ff3cc56e52a46633416153be9b1af1ebc602ba36f07971bccecb679cc9933a023a7c7060495b86d1c9667a2cd SHA512 7290fb74f164cf5e520a024171f43d9edb4d31f09b9806a6939d5a3e1143cd2240dc1a3bea7d02ec18ee9351f6e3e27d7117b9289e0a5eaabdb42c5ed74c9d2a
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r5.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r5.ebuild
deleted file mode 100644
index 29ffb3ae4676..000000000000
--- a/media-gfx/freewrl/freewrl-1.22.13-r5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
-
-DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
-HOMEPAGE="http://freewrl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug +glew java libeai motif +nsplugin osc +sox static-libs"
-
-COMMONDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	motif? ( x11-libs/motif:0= )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	glew? ( media-libs/glew:0= )
-	virtual/opengl
-	media-libs/libpng:0=
-	virtual/jpeg:0=
-	media-libs/imlib2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	curl? ( net-misc/curl )
-	osc? ( media-libs/liblo )
-	dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-	media-fonts/dejavu
-	app-arch/unzip
-	virtual/imagemagick-tools
-	java? ( >=virtual/jre-1.4 )
-	sox? ( media-sound/sox )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fontconfig-match.patch
-	if has_version ">=dev-lang/spidermonkey-1.8.7:0" ; then
-		epatch "${FILESDIR}"/${P}-mozjs187-config.patch
-	fi
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-java-fix.patch
-	epatch "${FILESDIR}"/${PN}-2.3.3-ld.gold.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--enable-fontconfig
-		--without-expat
-		--with-x
-		--with-imageconvert=/usr/bin/convert
-		--with-unzip=/usr/bin/unzip"
-	if use motif; then
-		myconf+=" --with-target=motif --with-statusbar=standard"
-	else
-		myconf+=" --with-target=x11 --with-statusbar=hud"
-	fi
-	if use nsplugin; then
-		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
-	fi
-	if use sox; then
-		myconf+=" --with-soundconv=/usr/bin/sox"
-	fi
-	# disable the checks for other js libs, in case they are installed
-	if has_version ">=dev-lang/spidermonkey-1.8.5:0" ; then
-		# spidermonkey-1.8.5 provides a .pc to pkg-config, it should be findable via mozjs185
-		for x in mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js; do
-			myconf+=" --disable-${x}"
-		done
-	else
-		for x in mozjs187 mozjs185 mozilla-js xulrunner-js firefox-js seamonkey-js; do
-			myconf+=" --disable-${x}"
-		done
-		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
-		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
-			# spidermonkey-1.8 changed the name of the lib
-			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-		else
-			JAVASCRIPT_ENGINE_LIBS="-ljs"
-		fi
-		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-		fi
-		export JAVASCRIPT_ENGINE_CFLAGS
-		export JAVASCRIPT_ENGINE_LIBS
-	fi
-	econf	${myconf} \
-		$(use_enable curl libcurl) \
-		$(use_with glew) \
-		$(use_enable debug) $(use_enable debug thread_colorized) \
-		$(use_enable libeai) \
-		$(use_enable java) \
-		$(use_enable nsplugin plugin) \
-		$(use_enable osc) \
-		$(use_enable static-libs static) \
-		$(use_enable sox sound)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		insinto /usr/share/${PN}/lib
-		doins src/java/java.policy
-		java-pkg_regjar src/java/vrml.jar
-		# install vrml.jar as a JRE extension
-		dodir /usr/java/packages/lib/ext
-		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
-		if ! has_version "media-gfx/freewrl[java]" ; then
-		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
-		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
-		elog "java policy:"
-		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
-		fi
-	fi
-
-	# remove unneeded .la files (as per Flameeyes' rant)
-	cd "${D}"
-	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
-	elog "path.  If you do not have firefox installed or you wish to use a different"
-	elog "web browser to open links that are within VRML / X3D files, please be sure to"
-	elog "specify the command via your BROWSER environment variable."
-	fi
-}
diff --git a/media-gfx/freewrl/freewrl-2.3.3-r2.ebuild b/media-gfx/freewrl/freewrl-2.3.3-r2.ebuild
deleted file mode 100644
index 9a8ce5245a4d..000000000000
--- a/media-gfx/freewrl/freewrl-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
-	S="${WORKDIR}/${P}/freex3d"
-	SRC_URI=
-	KEYWORDS=
-else
-	SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
-HOMEPAGE="http://freewrl.sourceforge.net/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
-
-COMMONDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	motif? ( x11-libs/motif:0= )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	virtual/opengl
-	media-libs/libpng:0=
-	virtual/jpeg:0=
-	media-libs/imlib2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	curl? ( net-misc/curl )
-	osc? ( media-libs/liblo )
-	opencl? ( virtual/opencl )
-	dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-	media-fonts/dejavu
-	app-arch/unzip
-	virtual/imagemagick-tools
-	java? ( >=virtual/jre-1.4 )
-	sox? ( media-sound/sox )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ld.gold.patch
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	# list of js libs without .pc support, to disable ./configure auto-checking
-	local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js )
-	# list of .pc supported spidermonkeys, to disable ./configure auto-checking
-	local spidermonkeys_pc=( mozjs187 mozjs185 )
-
-	local myconf="--enable-fontconfig
-		--without-expat
-		--with-x
-		--with-imageconvert=/usr/bin/convert
-		--with-unzip=/usr/bin/unzip
-		${spidermonkeys[@]/#/ --disable-}"
-
-	if has_version "<dev-lang/spidermonkey-1.8.5" ; then
-		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
-		myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
-		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
-			# spidermonkey-1.8 changed the name of the lib
-			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-		else
-			JAVASCRIPT_ENGINE_LIBS="-ljs"
-		fi
-		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-		fi
-		export JAVASCRIPT_ENGINE_CFLAGS
-		export JAVASCRIPT_ENGINE_LIBS
-	fi
-	if use nsplugin; then
-		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
-	fi
-	econf	${myconf} \
-		$(use_enable curl libcurl) \
-		$(use_with opencl OpenCL) \
-		$(use_enable debug) $(use_enable debug thread_colorized) \
-		$(use_enable libeai) \
-		$(use_enable java) \
-		$(use_enable nsplugin plugin) \
-		$(use_enable osc) \
-		$(use_enable static-libs static) \
-		$(use_enable sox sound) \
-		$(usex sox "--with-soundconv=/usr/bin/sox") \
-		$(usex motif "--with-target=motif" "--with-target=x11") \
-		$(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		insinto /usr/share/${PN}/lib
-		doins src/java/java.policy
-		java-pkg_regjar src/java/vrml.jar
-		# install vrml.jar as a JRE extension
-		dodir /usr/java/packages/lib/ext
-		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
-		if ! has_version "media-gfx/freewrl[java]" ; then
-		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
-		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
-		elog "java policy:"
-		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
-		fi
-	fi
-
-	# remove unneeded .la files (as per Flameeyes' rant)
-	cd "${D}"
-	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
-	elog "path.  If you do not have firefox installed or you wish to use a different"
-	elog "web browser to open links that are within VRML / X3D files, please be sure to"
-	elog "specify the command via your BROWSER environment variable."
-	fi
-}
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 6b3373cf2d95..4bd3cdf285e1 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,3 +1,3 @@
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
-EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1670 BLAKE2B 0aa8cdc1939247d7bd32712e84cfeda733cacef5902a52f5c0bffc44d7a8e15855bdd74405b98dfec0261413ed13d91a3dc0fb87fbd0ec84526d2c977ae34dcf SHA512 0ee9619276e583ace4c893e762da5f89fdca65b28f2170fb73e79a54a5da5621c50398a31f5c23987c47362a99414c99041c0ee3ad15a41d0d94ecebb391625b
+EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1694 BLAKE2B b3d643bcea4ff74a339d4015b7f3747d8accd17e3c33f464d03252b2d0ba1106e47d6ce7162b1343259850c34b3a6b206cb62b5d546abf83fcae53e1042b05e5 SHA512 6504876211812d61e6868a5633d1b293d5d5675845720e605c39cbd535dba7d71305ba1227760ee7a926a58968a5c6898b338e86eeacc883bdd8c11b4cb4cd2f
 MISC metadata.xml 311 BLAKE2B e595489db486352ace6f66c3d72be3f47857ab75d48b8c2c2964bc2466d372eefa5e503f2c089d88cf6aedfd7d076a6595f733b883dfb25276567de67abc6911 SHA512 392ac93a529b535ac58ad270f8d5d4ded4b1cd8914604ef9533dcdf10c08a05e3afc6800f3eb7b546c856e608444a662c6cfea8b436936e1931d7fdfe43b676b
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
index 752aa4114bef..aff5c5c7b18e 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
@@ -12,8 +12,8 @@ inherit distutils-r1 optfeature virtualx xdg
 COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
 
 DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://edyoung.github.io/gnofract4d/"
-SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fract4d/gnofract4d"
+SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -69,6 +69,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
 	elog "Optional missing features:"
 	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
 }
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index f09c17489864..40a122544452 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -1,7 +1,3 @@
-DIST llgal-0.13.17.tar.bz2 81365 BLAKE2B 3af18f6f3ae699a1ddd577cd97780e9795ff77faffd50866cb11a9ee6170b718144806fb01b7959e2fe1dcfeec39bb0a34482a75e64d5eeb7df73c99ef14547c SHA512 2b100053a804985e7f59674e6a0886bffe5231cf3735a8dbbf7c8db56285a5a4ca88880299aac25d5cecb6a4f0cc024dc87fdf084eb281f7cb578f0d7cba5293
-DIST llgal-0.13.18.tar.bz2 81674 BLAKE2B 96b48e9d6ad91ad2b11cd898563c7640f047ddbfd7f5ba8d6e4fb2d304199936b3fdbc6c8bf2647ec7141b85857c79d4e2e76bab2b3c6daa07ee0b4933b79aed SHA512 d01c1060616bb602af8b75aa5ae04384c19ed4bcc717112b9d5cfe48a9a823ce9ba381d675b4f4e89f35a56d7cbf580f27405fcb65b785e8ea6b6732784b0655
 DIST llgal-0.13.19.tar.gz 96675 BLAKE2B b306eed900a1071898ebe2d0dcbfeb9c505271ec8d5889e75fcf189dee22489fb8d671ede05a1af74a7761b604d8af8e3b26b8771ec50c8e49036000e90258fd SHA512 24f247071678f21c79e37002a443ff222e9e99e9bf04363fc123c5d9538a35db100ea814408e2bcc9e20781982145301df3337e521413651547828654a92d169
-EBUILD llgal-0.13.17-r2.ebuild 914 BLAKE2B d52a3d2ae2de6da933bbd651fa215dfd7609bf6e34afcda0b753f5be1dd5a5cf269ceb508c0c50f2b2497f6f8998904ded0f51d639a16f207da495f99d1cd05e SHA512 c7150f19b551b77c7934f4a12fe9b60c0ec2ef96eacdc0e4de192b0d8ba088609373436499ef2351983f8d279fb269908479ee12da26bcb1dbf3b50110cf419f
-EBUILD llgal-0.13.18.ebuild 916 BLAKE2B 0b6156409e0440708cd37e45d7e16c326c643c5ef35090de4e40fa8c802ee5d457db139ffb0149e59d4f80417a6c6b408deea06a1e9802f9589b3eaa67d7a690 SHA512 9960069fcf88897ddbfd5cc026ca9dea6f1bbcfa0fd5ab437af970a260db06bf52268730ea425af451fb0847c070ec07305de126884c8f550f0329c266d52b9a
 EBUILD llgal-0.13.19.ebuild 1071 BLAKE2B b5b2c4b2b548880a68f9bd77bfd50f2e479042fd50578273fc9bc390fc1c832ed726dbb02c81ed9c5aa15de9939daa1012bcb7a3c171f9d579d2b3b3246b2851 SHA512 aecc703b62a977357ba104b11713476f07a6e3982f3c879d2620f7da2bdafc45d1ed47cf913052ab50f018991e2026d35be114e060e1e651380eb75883b0d9a6
 MISC metadata.xml 247 BLAKE2B 40a951853ad971fb856cb2bc8e102caf52d803f2c07466f49cff536bfa108711f107e5dd89745bd16cc74d90df7022747f27d1e664e17b079f20e3f636b8e50b SHA512 077ebd8acee5d10820d2a4e3f8c5d0f50b7dc0e4c8f8ab749b6b2547b397f30348abc858b0a9d1890d9b3d96949b76bdf2f92e277ba61dfac08e9f83fbc58021
diff --git a/media-gfx/llgal/llgal-0.13.17-r2.ebuild b/media-gfx/llgal/llgal-0.13.17-r2.ebuild
deleted file mode 100644
index deae0d906025..000000000000
--- a/media-gfx/llgal/llgal-0.13.17-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Command-line static web gallery generator"
-HOMEPAGE="http://home.gna.org/llgal"
-SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-# Package warrants IUSE doc and possibly examples
-IUSE="exif"
-
-RDEPEND="media-gfx/imagemagick
-	 dev-perl/Image-Size
-	 dev-perl/URI
-	 dev-perl/Locale-gettext
-	 exif? ( media-libs/exiftool )"
-
-src_compile() {
-	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man PERL_INSTALLDIRS=vendor
-	mv doc/llgalrc . || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
-		PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
-		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/html/
-	perl_delete_localpod
-	dodoc README llgalrc llgalrc.5
-}
diff --git a/media-gfx/llgal/llgal-0.13.18.ebuild b/media-gfx/llgal/llgal-0.13.18.ebuild
deleted file mode 100644
index f1a01aa8d536..000000000000
--- a/media-gfx/llgal/llgal-0.13.18.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Command-line static web gallery generator"
-HOMEPAGE="http://home.gna.org/llgal"
-SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-# Package warrants IUSE doc and possibly examples
-IUSE="exif"
-
-RDEPEND="media-gfx/imagemagick
-	 dev-perl/Image-Size
-	 dev-perl/URI
-	 dev-perl/Locale-gettext
-	 exif? ( media-libs/exiftool )"
-
-src_compile() {
-	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man PERL_INSTALLDIRS=vendor
-	mv doc/llgalrc . || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
-		PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
-		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/html/
-	perl_delete_localpod
-	dodoc README llgalrc llgalrc.5
-}
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index db5cf1c36e35..6d9678c88683 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,5 +1,3 @@
-DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
 DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe SHA512 89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 558 BLAKE2B 6850bc1a3e94d52faff03b029efaa481e4f1cc436053fa96499994450ee486c4276bcae2db56ac997ac40fd3eff8c914fa1a0b8ccd55947d0906a6db182180fe SHA512 ff4b72bbae9c2fa8b217de2513b186a75865bda8dba2acf19db7c93f0da126c068983f88737f3ef3d4e30f6b48a98e59f4f4e65955ac7aea439aefeab7a83f68
-EBUILD mypaint-brushes-2.0.2.ebuild 550 BLAKE2B 756b9a767da9891e34b38d1df5fc1aafbec00a76e14e570dc8fecba410ac075ea158cd4d7af0088924d48fbca9f2d51bee1d8eb794eb3bdf8b0ffa0674ea4b0a SHA512 6f43f61c67d41c366a411eb39e944d0114e2e6f453820400aa642ce411f4832123618dc01ac3ebe1bfe18124fa7f72ec0a7278922133a220e07b88de8b93bd13
+EBUILD mypaint-brushes-2.0.2.ebuild 549 BLAKE2B 1f74b819805240361e6217da37aa5c8945b55cd420dd9bef7f5d1241a8509d1f228c25f0b5b8f54d3940613f560082ca6b4b9af4d4cac8efdf5a3e7ec1b7055f SHA512 bd107f540acbca1e910bcbff4a976a6d146492c6e71621a43c840e2e23dd5924d918ad086931fc95444d34fd22e4e0528d0c538b38d21ac87ba606d8d21c1bca
 MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
deleted file mode 100644
index c217baafef18..000000000000
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Default MyPaint brushes"
-HOMEPAGE="https://github.com/mypaint/mypaint-brushes"
-SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-IUSE=""
-
-DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index 4a806df9a314..635c072998e9 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
 
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 6de7ea08b36a..ea34ba704f2d 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,8 +1,5 @@
-AUX mypaint-1.2.1-json-c-boolean-defs.patch 1189 BLAKE2B 7cc9728fbe01195b0c95bd844592d4fbae29a7a26758d242933ed712b940d8a893cd41bd2987952e2a817208efbffd779e9c39d4dde42d809a1e11de06a234fa SHA512 8e5815c281a6c63c7818f378d0e75a94860dd24ea69e9fff8e5951b05c407f12e2e19fefeaa559476a4dab46c88eab8821eff061e8c8eadd1f3ce150e42563c2
 AUX mypaint-2.0.1-GIL-hold.patch 5153 BLAKE2B 3d70b414bfb6396fffb9ebfc9c1fe6791878a97a999355b103fd848993172049db7f97f81d96e253294b9629a2a5dfe7c6710f29561f45b89f4fb26d4cf9a788 SHA512 aa64bb4ffb907516af811bb8ef4c0bccce9b785f94e0d71a44be30e7c96ea3a35dcceeac618956bf11c9d2c5c4e05524c8492ed14967148e2d6b9646b1ed5c15
 AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
-DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
 DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
-EBUILD mypaint-1.2.1-r5.ebuild 2016 BLAKE2B 0a00318c334adc4c97021ca1e52cb089075b1db667f0ad431fcf758345756d7d3558e50a353c8578d5749172ea4bbe396a99041c026cecce6174cb7cc6e4caf3 SHA512 5b1a703cf2efb5e0d729315ea092c58954975dedc177472467f03726956211b34744018cb3ef730f4b5a8ff2053f30218f838609ef225dd05eab21f5d8a683d8
-EBUILD mypaint-2.0.1-r2.ebuild 1819 BLAKE2B 118b55b447bff16f992272017b3df8e28e9929c8904fb5417646c643f32eff5df4b1b266237fbee9b914da942482a7b33fae71af5bc7993ee83f98c8b95e3d36 SHA512 c6015d2ab888f48a32c5fcea45dd6532ec315ef61226e8ddb5ddfcb2b7ea2efcb0d3147a23b361c04553c71bef8863ef4508946707619e08f5bd52cb0d3d628c
+EBUILD mypaint-2.0.1-r2.ebuild 1818 BLAKE2B 834cc6863ab6c57876cdb2e56aab050be451806da7192a53bcd99d306e86cff9de0389ff5d35310ef4c45afed763109246e800b9ad4d744f0e8f1face0784362 SHA512 63e3c76f051c261b3c6a429a6629798673a36142dbb8756e8595651ebfc8379ed16c0f9c76e7fe38990c33f64ceb4c10c3f2393a859cdb1be3cbdb8668012275
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch b/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
deleted file mode 100644
index caa2df4de6ee..000000000000
--- a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit a2b3f56b347c1897454eac1b5bdfe9d228302b80
-Author: Jehan <jehan@girinstud.io>
-Date:   Sat Jan 26 12:50:31 2019 +0100
-
-    Boolean #define-s removed from json-c in 2017.
-    
-    We don't need to #undef TRUE and FALSE before including json.h as this
-    redefinition has been removed in upstream json-c.
-    See json-c commit 0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
-    
-    Note that it still works even if using an older json-c since the
-    original code was alreadying #undef-ing these 2 values before redefining
-    them. So that was anyway useless code and this change should work both
-    with old or new json-c.
-    
-    Note: the previous code was still working fine when building on Linux,
-    but not when cross-compiling on Windows. But this is the correct fix
-    anyway.
-    
-    (cherry picked from commit f4fd97445d3b6843af57ff8ba5f02cbdeb3942e9)
-
-diff --git a/brushlib/mypaint-brush.c b/mypaint-brush.c
-index 4759d11..7a1380c 100644
---- a/brushlib/mypaint-brush.c
-+++ b/brushlib/mypaint-brush.c
-@@ -35,9 +35,6 @@
- #include "rng-double.h"
- 
- #ifdef HAVE_JSON_C
--// Allow the C99 define from json.h
--#undef TRUE
--#undef FALSE
- #include <json.h>
- #endif // HAVE_JSON_C
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
deleted file mode 100644
index 4c5a1859342c..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic gnome2-utils scons-utils toolchain-funcs python-single-r1 xdg
-
-DESCRIPTION="fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.org/"
-SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/pycairo-1.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-libs/json-c-0.11:=
-	media-libs/lcms:2
-	>=media-libs/libmypaint-1.3.0
-	media-libs/libpng:0=
-	gnome-base/librsvg
-	sys-libs/libomp
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/${P}-json-c-boolean-defs.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	# Workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	strip-flags  # scons upstream issue #3017
-	escons
-}
-
-src_install() {
-	escons prefix="${D}/usr" install
-	newicon pixmaps/${PN}_logo.png ${PN}.png
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm -rf "${ED}"/usr/share/locale/${x} || die
-		fi
-	done
-
-	python_optimize "${D}"usr/share/${PN}
-	# not used and broken
-	rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
-	# already provided by system-libmypaint
-	rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index d0e52bef58bf..494d4ce80a0a 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="openmp"
 LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
 
diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest
index bc8415448a54..d558344dcb98 100644
--- a/media-gfx/qiv/Manifest
+++ b/media-gfx/qiv/Manifest
@@ -1,4 +1,4 @@
 AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358
-DIST qiv-2.3.2.tar.gz 135164 BLAKE2B b6b82c3007cd3214bb0b812026d22ab0a3c7fce87e51c1f2e19634fe131656f7adc1e92d2e1fcdcc563f1fd8b7c298307e48823bb26e077b336a6983f31894ac SHA512 a6750ecf26bc5b78fbebfdfcfd7a8ab0a5d3ba4e4b19c4a5563e1631dfaf8cc98f7a0bc9449956bc06f8b98cb307b31f78178676ddc9df4fa03429fa31c174e8
-EBUILD qiv-2.3.2.ebuild 1223 BLAKE2B 586921fac938875cfb54525bb00b134478287143d4f824d5521ca875dfc256fd8ca3252caf2e1b879153837aed78900ab75d0f92ce7da965d63030609281ae82 SHA512 7cb91c24aa67ffab9bf6884a9b4ebc9fec5122ded9638ab76e1e71d66affea869742a266dffbcebee6f8b5bb4cd083fef2c22793804ee3eb6c6a1e7c8f8acc84
-MISC metadata.xml 248 BLAKE2B ab7b756aa0b3b6061c7af2ef699cfccf52f3451ea89f7c51e058405391fca28092d65b7d4dd42846b436a4c23b8b620b923410e0efb0a45d636d9aad01e7725f SHA512 e48f83e5e18affc154591383f52d7620c286e5596647e8f2bcfc0fd13a4a1ef1ee90a9d799be53b572812c6e3f38072de31eafa293b5a8e3559f95a32c85a99e
+DIST qiv-2.3.2.tgz 133614 BLAKE2B f06f36524db8cdde1baf3e118e8ceeeb654dd49a674b55d661255734c0bedaa765fcf8bb77b03d3c2bac8d75a9088b3290f1d802d670393b6795fee85dd4f778 SHA512 c4636591f79e8e4c13807433a4101a461e614439e497a5637b958bd9d0937b04515854483d4060d9b1004d6c6060b437d634fdbe491eb0747a660ba65240472d
+EBUILD qiv-2.3.2-r1.ebuild 1190 BLAKE2B 61f3e570e1f1a4d85a3003ea5ecffcbe4b61e90a01197c6d8d62ec664377e5f94e2218ffa130114459350231b06af08ccf175ad3974b4baffb2ca532476a782c SHA512 d928309a2fd8afd32ad6ca6a1becc18ae38657050c2406eefd79012d3f5601a2d1cf27b111ed466bdd51b6a7c8acc731a17925a1e5dfaf186303e22b6562400f
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index 14169f8501b5..7a38bb900964 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="bitbucket">ciberandy/qiv</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/qiv/qiv-2.3.2.ebuild b/media-gfx/qiv/qiv-2.3.2-r1.ebuild
index cd62b56094ca..bb8d07f04ab6 100644
--- a/media-gfx/qiv/qiv-2.3.2.ebuild
+++ b/media-gfx/qiv/qiv-2.3.2-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop toolchain-funcs vcs-snapshot xdg
+inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="Quick Image Viewer"
-HOMEPAGE="http://spiegl.de/qiv/ https://bitbucket.org/ciberandy/qiv"
-SRC_URI="https://bitbucket.org/ciberandy/qiv/get/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://spiegl.de/qiv/ https://codeberg.org/ciberandy/qiv"
+SRC_URI="https://spiegl.de/qiv/download/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,8 +24,8 @@ RDEPEND="
 		virtual/jpeg:0
 	)
 	magic? ( sys-apps/file )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch )
 
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 0f54bc43f0c1..185afbdef80e 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,5 +1,7 @@
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
 DIST qrencode-4.1.0.tar.bz2 449040 BLAKE2B cff4e950a436e2bb3a73543ce11639861426840db6861eefd3d641dcb14cd6b4be7c2045468a002f7599a89aa71c77f7dfc971dd726ecce0d524f9b792ea6e91 SHA512 50ccc65f748cc1007dccd8d0eee0063b870c3e8a5fe5b8b2a813881151a86748a36844bcfa6ab08c82674b80e9b5bcbfd564ade92562cc49e01cbfa45376b4a9
+DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
 EBUILD qrencode-4.0.2.ebuild 791 BLAKE2B 59ae47be368e05d95bcc77a0a18165b5d1c961aa181aea6c3c1882c3d6969a99cce6d6e31272a45bbeb478e85d3f732e21d5b9fb7f91e87306fc0d94b3feb15b SHA512 7698b6d3d99e70e37abb1a43bfd643019b411343a578bed7e1905e19db40263158710968e3e9833da20f45412dbce0fcb5f4b3d4c9b1179ce9b20b4356699fee
 EBUILD qrencode-4.1.0.ebuild 799 BLAKE2B 162c9977a8fc2ede9aea8fdca4caeb5a031150b9a6aab825ad48882bc103a4f3c39fee4db434421d3597462deece7260eaad21b461714608f15f7d6df58478c6 SHA512 22404cdc9ba4492f0351cd6fe5788c28fe0f49c6c44df0b7ee526cf3ff686489eda8905d1cac4ccf85c742593fc7e6eb246cac5c0f99af1646567b91bc23bfe7
+EBUILD qrencode-4.1.1.ebuild 799 BLAKE2B 9d085069ad33bbf42477e5c490b7f5be148a4e50682aa613f696b7b56448565b098f7b97daa694482027420879f6a23d861c67df35ba98eefe46fe087b3791e9 SHA512 9a412c5f7a58b6d2625a4099e144d719fc3ed76c3051ef41a184130decdc347f54d45a6d9fa2d03a5a36f524bfe043e3f73d36f9cd454b68d02710924f1a17e3
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
new file mode 100644
index 000000000000..0872a1336274
--- /dev/null
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C library for encoding data in a QR Code symbol"
+HOMEPAGE="https://fukuchi.org/works/qrencode/"
+SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_with test tests)
+		# TODO: figure out how to make SDL check fail as the SDL test
+		# program is not useful
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	cd tests || die
+	./test_basic.sh || die
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}