gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /media-gfx
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
82 files changed, 813 insertions, 1440 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ac44e19a5bbe..30919e96f33a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index f69f160501ee..9bb9afb8164d 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,4 +1,6 @@
 AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76
 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
+DIST Argyll_V2.2.0_src.zip 14020205 BLAKE2B e278f31de2c09e7d736d13b0ada01a6ff8b0641dcbef2e82ba83987f7835d3cfbe71e479314c76be91725698dbdff8f5a77b607dbdda340a9c583c82477cc9d0 SHA512 42552ebd10280df16ec419e3c7ce6700db2c290e26ab4ab62296bf92abc90dd50265aef04b5b8f0a5bee735d485760bab4278e38d27b2a245c5a3122cbf2ba88
 EBUILD argyllcms-2.1.2-r1.ebuild 2109 BLAKE2B 613f7e41d8f53956e534b962f21f8c0ac95ce5658fc63228b75bc9610a13bfa73c25e18b8c5c0cfaa49af53105a6389ebd2b926337b73cf732bf072dca448db2 SHA512 a2b8af905f634fbebf45073fa5fd7f9885b483e2e9c16015c701b79bdb7802840d5f3fa4ce67fee29c801448efaa7947160a808b9a4e229de56ea4b881d62aac
+EBUILD argyllcms-2.2.0.ebuild 2063 BLAKE2B ca400bdaf37855a91be60897240dacebb6172d42ca39370b88a584295bc5f082d5dd3a21880a6d2399d48fd7ed63700dc0064e938eba27c02c0e644eaec479fa SHA512 0d0a40dc03f4f2564335136eda66b6410ee109f6833f9be5285994c68b39fa580c81acc0a16fdb4379a50c7687e2295fdc861d998371e0ad9f402d28e0b663c7
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.2.0.ebuild b/media-gfx/argyllcms/argyllcms-2.2.0.ebuild
new file mode 100644
index 000000000000..a61fa86e9d2b
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 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="
+	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
+	dev-libs/openssl:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="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/darktable/Manifest b/media-gfx/darktable/Manifest
index 072c970e5c9b..ded2f18a3da9 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -7,7 +7,7 @@ DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
-EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
-EBUILD darktable-3.4.1.ebuild 4478 BLAKE2B cc2a4a83d6d2dbef0fc4c7a52cdfbd8649fdbf39fd8d32886705f711fb72898a5a4ccc88a0c7b98a0a60eb2b8e399d97b993c16bd33bcc5c3bc6470f1a6ace82 SHA512 4ff0d3498ddc6b940d7787fd870546eaee0a42b467cc3f91d75d4af08c25a642f2cf1e27dba480ac04884b6d72d9282ca06f3671eb136e6797cc1478bcfdffc4
-EBUILD darktable-9999.ebuild 4480 BLAKE2B 6d3d2e59331dfe3d44afeccf8616f0f14bf63a8b7a9f8c203416fe6fa907047b059cb09081e26ac216bcd98957c4a9651579df48a4dc1dc79e073a884b421095 SHA512 3f2e5818e2af72ba8ee3c7e82ab947f7a6a36c666b7cbd994be8890e102cbe08247af01640d7f437a67b1a58b955fddf48084375651ad2c48743cd58088eae39
+EBUILD darktable-2.6.2.ebuild 3451 BLAKE2B cbc98737fe7778c37a2637708e34a48cc71d1803652a0585c6110b4468b73d962cc3cb347b2929d5e3ce344b24e2be9b449f5ad555275be90c6b93d9b8313481 SHA512 dfbb22a74bdfb6d6001f32313e954240546a376fae19f489e0530e0dd6f37e3a5fbf39e1ea4144b97403fed2d4e69d67cf7ebe01c2d53f363a0adfa4303ea567
+EBUILD darktable-3.4.1.ebuild 4412 BLAKE2B 402c0e8f4cc2c299e8a2a7b425002993eda544735302c4482c4f4d9fe6b605eaa6c14671e41674c8d64312c1406ff2d59a53a762e28bcfbc40f954c12fcd34e5 SHA512 bd292ddf983f2b23e3f0140e2f7d8d0ce84ce2b1e6dd41945ff9f6657f00e583eafdd60da5e6bb34c23d1d8eaadfa279fc0b0b7a38c5e11600abc2bd189a5e11
+EBUILD darktable-9999.ebuild 4407 BLAKE2B 41e9636ef86761982a80ddd449ee45ef28a7904f751061cafdd68b91fcac28242e581adfc3873ddb86ac534127a2b49611db3560956e4126ef574233cef34f44 SHA512 46111450051510f2de6ce1694978ab36268d9680e82de016feddd40fff0bff470ae5572415493982e6fb68ee62e63ba82655c315244b0a578144e7186e72426d
 MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index 394e2f5295a8..dbca73f7b5f2 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,12 +59,7 @@ COMMON_DEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )
 "
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 "
@@ -93,6 +88,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild b/media-gfx/darktable/darktable-3.4.1.ebuild
index 3506e0d8882b..54b4518a454b 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -37,14 +37,11 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	dev-util/intltool
+BDEPEND="dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	test? ( >=dev-python/jsonschema-3.2.0 )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
+	test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
 	dev-libs/json-glib
 	dev-libs/libxml2:2
 	>=dev-libs/pugixml-1.8:0=
@@ -73,21 +70,13 @@ COMMON_DEPEND="
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lua? ( ${LUA_DEPS} )
 	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
+	openexr? ( <media-libs/openexr-3.0.0:0= )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-find-opencl-header.patch
 	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 )
@@ -128,6 +117,7 @@ src_configure() {
 		-DCUSTOM_CFLAGS=ON
 		-DDONT_USE_INTERNAL_LUA=ON
 		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
 		-DUSE_AVIF=$(usex avif)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index e2dca8478be7..696f97a42ff2 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,14 +37,11 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	dev-util/intltool
+BDEPEND="dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	test? ( >=dev-python/jsonschema-3.2.0 )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
+	test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
 	dev-libs/json-glib
 	dev-libs/libxml2:2
 	>=dev-libs/pugixml-1.8:0=
@@ -74,20 +71,12 @@ COMMON_DEPEND="
 	lua? ( ${LUA_DEPS} )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-find-opencl-header.patch
 	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 )
@@ -128,6 +117,7 @@ src_configure() {
 		-DCUSTOM_CFLAGS=ON
 		-DDONT_USE_INTERNAL_LUA=ON
 		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
 		-DUSE_AVIF=$(usex avif)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
diff --git a/media-gfx/dmtx-utils/Manifest b/media-gfx/dmtx-utils/Manifest
index a9fb45d90c7a..93eb9cf653f7 100644
--- a/media-gfx/dmtx-utils/Manifest
+++ b/media-gfx/dmtx-utils/Manifest
@@ -2,4 +2,4 @@ DIST dmtx-utils-0.7.5.tar.gz 54754 BLAKE2B 0eaaa75dd8f650492f790aa960a6df93509e2
 DIST dmtx-utils-0.7.6.tar.gz 54888 BLAKE2B 721d67f85e73d245595d189acf1f974b518b079d02b7c57fa786b15ed075bd08219a2720b5152341449d517eb93e238274b440388557a64056de6cf6db9fc392 SHA512 201f8f5bbe5a1edd23104883d03e09842252ad7d07dd416b67c11740275ebe32c26b7fde904fad8bf2b18f1b3f574dedde1cc85f0e987f93d293d030e4f8a79e
 EBUILD dmtx-utils-0.7.5.ebuild 546 BLAKE2B 8a699e4dd6ccbe4e208736e9f2b7c74858fc8f852b7a1b80865017d9c23828bbcd532e5510aeea65134e5a47a8a12b6c0af72c77ee64b0d4af1ef866e701957b SHA512 2c3ceb32ae801fc1d07f349078b6feb4c8dfd5bfd9b3ea81d6c429af54269b3da7203834bcf90982cb4b6add9b19ed32a4c13266e6377a68d65ba4156df79820
 EBUILD dmtx-utils-0.7.6.ebuild 588 BLAKE2B 0c2de7fe60aacd6af505a21a55e0fb7aa6766c04a0cc8d89af73a440d2478b93ee3b7919a442dbd29be5f0e0e2d32f85ebf01813f729b11143c0489b7e4a0630 SHA512 1a98592502070d1f3e4f808f47a2abcaab8fa1b1f235c2451f7b11f224d65ebb7169628067755963d734c0f30fcbe34ee819383f9ad7a05c411a579ad12141ae
-MISC metadata.xml 814 BLAKE2B f0fa37f0d673f117190e7009d52e4a7374cfda01db1f14f345231359c7c2413729e0e0b33409fe480aac2c0b9598c773051815547ae1b6e535576d572a10a9e8 SHA512 9a4f521b124852d9610d8a84862b1daaff3b5d8fe3f16a36ad048526b53430ccab3246d45cb2d3c2ec76ae1b0d78e73fe6dfde246d7fb9d82fbce53157e2206f
+MISC metadata.xml 810 BLAKE2B f77ec91e2d0dab00376f8c295daf13589deaa26b533d248a3d61e4309da67be6fbdc936e33f409aaa56c075c3129d7f7ba3e714175cb3a8610a0a5160fa802df SHA512 75d091a9206ee4364719f84becce8397cf4de3df149ee124e3e033125957a39f111e570e2d33936e43d934bfd7593a12616961bb4bf1dca79aaf31c6278337c8
diff --git a/media-gfx/dmtx-utils/metadata.xml b/media-gfx/dmtx-utils/metadata.xml
index b3e87979920e..d00d373ad118 100644
--- a/media-gfx/dmtx-utils/metadata.xml
+++ b/media-gfx/dmtx-utils/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person" proxied="yes">
-        <email>ahippo@yandex.ru</email>
+        <email>ahipp0@pm.me</email>
         <name>Andrey Mazo</name>
     </maintainer>
     <maintainer type="project" proxied="proxy">
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 9a2c4d057792..32b077758cd0 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST eog-plugins-3.26.6.tar.xz 482004 BLAKE2B a70a7d1b69b7d5e6e4d44e79a4305c08ab95c06596512bf458628a65b1a8b5f7fc6c3caf39385ce722de7fdabcf0cc5e620f9dfbc53dfc377fe29252fb21a23c SHA512 67b3cfcc071ef5a196f87041039f65c9ef8e7ba2ef1cdc8dd9ea4d67f64c8b1ee0990446c5cec4fe229aabb35d106a4c0804ba6e8cbd2edfe5a91ddc3765527a
 DIST eog-plugins-3.26.7.tar.xz 482336 BLAKE2B 9cd1d7e16f8e7f1fe06c3bc2ea79ab06c397beaf9d9bfb26568ad5fb90a144ceab11f6250c7dd51ebb5d3962fff47a4c855b85725b95abca07cdc4de739a2b7e SHA512 c9312eccc5529b01cb285a165c833243ea60bb12f8be6f40ccc6da0db1bd951916000a48aa31705b048659e8d637aa7e56d761fe0f9be720a4e0ce81289d2b83
-EBUILD eog-plugins-3.26.6.ebuild 1611 BLAKE2B f8f089076446c44fe38708f31438f2cbe8e7eb12038655aba5b987d1c3452589c635f2635df01f46fd16f7edf8cba88f118df94c2d500c05bc86d78531aa7de5 SHA512 506b53a23216432f0de1dd1065477dc93f71d513d9a5a08850d1158eb9a6b6ebdc2978ffd3526c8ba2ec8abc1c3e642cc2719a1fb22f07b68e8dc58e10918247
-EBUILD eog-plugins-3.26.7.ebuild 1732 BLAKE2B 5648b640cb74b390d0267eed43f27caaa45856a270ddc2ff9cde42214d17e7cfc3a800c68a24be97baf5429ca1f6a7bf30b4f3891e6694137aa182014cd1f437 SHA512 d8d3db885432bd48a67c57c8fde71b69326f162231965098fdc8a5e9b0d3e7bb8892ca2182f7fbc12c4e6d984f9eec53a323493531a2d0840e634be4e834ed0d
+EBUILD eog-plugins-3.26.7.ebuild 1730 BLAKE2B e7d93342118cb931baece78a6539ad3f58286242cf73568c4c95a822c9b0e5a0c931cad91660f16f35ed44586b9b24c28d2ae677e22950fc89d3f2ea17b13a10 SHA512 8b97359f433862a7df076f2e0eeb45929d121129ad5677b317c0703f4dc7cdf875bd845439de5d0b3943b2c26352ce82bc2b487fc15daf86340a6b86c7fccad7
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
deleted file mode 100644
index bc43c210a772..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		')
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
index f667eae22ba1..abf23601ba1f 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index ec3327658fa1..81210ac369f5 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,7 +1,3 @@
-DIST eog-3.38.2.tar.xz 3614956 BLAKE2B ab442006b2eca1550d072c57af989e748f130b07088e724ccf8e2d6e6b2cf132e06ff2ff89d9333f6fa3cd701c27cdb616dabf125f14dc5a4d1b92d14a85be56 SHA512 f9af91a76b85b8e1250f3ecf04cfc30ae35892282fe65c810358d27cc7e0aac3cafe50dcf815c54c6056c24eb1107d6f5ecf8131f78559095cda5024d255ebe6
-DIST eog-40.0.tar.xz 3601476 BLAKE2B 149b173cb46c46c445b72cc118456e5fb957e48179176daafd3f1726a75353b30fb8750af2fd259235378127c48c2d44e769744c84b7ab9c3d57c679c7ef5828 SHA512 8f395caf4a5eb9ba9f5da6d7dd60c4383b029fc10041abc559afe7c45953f4ef8ddddc64604807df59d61178fa8a16e5a62526e91bfc19c8c57fbf654612d7d9
 DIST eog-40.1.tar.xz 3601652 BLAKE2B 6e3ec73742a0de864a131b25b2ed2c3346aecea9455ccbae701d70a50a45dace90d4002c56829e9a831a16ec827df6e1ab257c9ec5b755b863e98d63cd8a59bf SHA512 1fd2f6689f8a74254f4436fedf8a5ee7c1488d70b467dfb94c3ca3e0e269aaa75a77d15d5bb3544e699f5c8759e30a25942857188cb98b4d9537165b67d6d14c
-EBUILD eog-3.38.2.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
-EBUILD eog-40.0.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
-EBUILD eog-40.1.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
+EBUILD eog-40.1.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.38.2.ebuild b/media-gfx/eog/eog-3.38.2.ebuild
deleted file mode 100644
index 8b0331ef5a00..000000000000
--- a/media-gfx/eog/eog-3.38.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22.0:3[introspection,X]
-	sys-libs/zlib
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2 )
-	jpeg? ( virtual/jpeg:0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	svg? ( >=gnome-base/librsvg-2.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.16
-		app-text/docbook-xml-dtd:4.1.2 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif libexif)
-		$(meson_use lcms cms)
-		$(meson_use xmp)
-		$(meson_use jpeg libjpeg)
-		$(meson_use svg librsvg)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dinstalled_tests=false
-		-Dlibportal=false # Not packaged
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/eog/eog-40.0.ebuild b/media-gfx/eog/eog-40.0.ebuild
deleted file mode 100644
index e0fd2241d634..000000000000
--- a/media-gfx/eog/eog-40.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22.0:3[introspection,X]
-	sys-libs/zlib
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2 )
-	jpeg? ( virtual/jpeg:0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	svg? ( >=gnome-base/librsvg-2.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.16
-		app-text/docbook-xml-dtd:4.1.2 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif libexif)
-		$(meson_use lcms cms)
-		$(meson_use xmp)
-		$(meson_use jpeg libjpeg)
-		$(meson_use svg librsvg)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dinstalled_tests=false
-		-Dlibportal=false # Not packaged
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/eog/eog-40.1.ebuild b/media-gfx/eog/eog-40.1.ebuild
index e0fd2241d634..8b0331ef5a00 100644
--- a/media-gfx/eog/eog-40.1.ebuild
+++ b/media-gfx/eog/eog-40.1.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 4b3e5e03d65b..f45b6d2e1f66 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,8 +3,10 @@ DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811
 DIST feh-3.6.2.tar.bz2 2116515 BLAKE2B c813f1bcee2170b509c4579472f2106ed01bcba49a91eaec2f48b2f41b10f43de59ab0d114ee9a04faa9b8d73c13636e49bac4730ff2275bec55cff56379e1fc SHA512 d3a14d7880387575a224bc5cdf1b63bfc5bd793c52fdc07620ddd80e1309a6b9a0c93f3f66ad08a0221f04eabb226372fcb14849a8682c4a2b4691981bb80c40
 DIST feh-3.6.3.tar.bz2 2116771 BLAKE2B 062381cc744617f0c8e0a4a7aac7e0841ef78993d3f65e9853dce6b81d6ce36caf4c72ce35785b96c8e0644da41a6ad12706e6a740740fb27cddf281d780e749 SHA512 53e9e1903f256fee9d49af2f8ce4bf153317e7d5de6b396448f16fd54ae1a13217edb44566cd0433e25675a25175cc412a726f058856136f19629661e2f62ce2
 DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
+DIST feh-3.7.tar.bz2 2118355 BLAKE2B 40cd0e53249d474cb8ff8e236bdaf8be322253600f2233a5748379fefe8592a22a43ccc47d44380b2c84038272c1c194e50fb8ad4892a61e48d54ac18c6ba143 SHA512 687d0863bb6bf99bc88ca22760ab670525e6d8ee4c984fa00d686adabd39b7bee2449d93beeb8863a161d2b1dfabed3cff035911711eb445b358ff5a4b77da3f
 EBUILD feh-3.6.1.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.3.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
+EBUILD feh-3.7.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
 MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.7.ebuild b/media-gfx/feh/feh-3.7.ebuild
new file mode 100644
index 000000000000..9ccef7a27f03
--- /dev/null
+++ b/media-gfx/feh/feh-3.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama inotify"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+		inotify=$(use_feh inotify)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 8adb9159abb3..1e99ae91ab70 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -7,7 +7,7 @@ AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.pa
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-EBUILD freecad-0.19.1.ebuild 9049 BLAKE2B 3b63090e5fb618d45171eb616c77657ee9f398e5459cb38664b95cca80486e6697aca645652cfba38ac4a5f20c750bcb06c8840565a295e8079a59763e49ba20 SHA512 34ba9e577377f9e5f687813a4a5629bfdacdca1a62c82bb4d71a7ceb726afd7de9ccbf1041f83fadaf3a6394ed7aa32c7d4f08d695523842cc56b72b0450e064
-EBUILD freecad-0.19.2.ebuild 10393 BLAKE2B 4679857372c60eeb0b784cd234324fd9919ae2c5cb211877098e1a4c48108402a5963d949f066abe4a1c8d7678eada175c08b30351666181398a7111873a91ef SHA512 228cab06a298c4c6ec557874e48bd8e128008b6dae14941bee8ab194d538f566542815658423a5910e28ff694b102dabaf114e4ff13e7bfa1408a0f0e9b81ce3
-EBUILD freecad-9999.ebuild 9091 BLAKE2B f56e1e6230b94b06e73b6a57d8d38d1096924969dd553b18f14c11760bd5de0602d2bc33a9264e8ba201ea70b53a2122b64f82448216d769ce57d5cff1cbdd22 SHA512 9dbef04ebc1448d6f32525d19205f05ff2eb55253acc7c7551030f02e29e384b87627c4e81da3a6bf0df84cc3c65178d82a7c2c2d6a46ca03281663e55990d28
+EBUILD freecad-0.19.1.ebuild 9127 BLAKE2B cf69851b05e27f24c98381faf0c6c2f93d6d37054de040d0e57a1ec18d03366ebf493fd82d3d8772a877b694f6407f566b29d15380032025623cb4c6a9f34955 SHA512 7017c98834efe6f77cc1829a8e2c8ddcf6d9cd3cec8a87a9e3772ddcdacef0eb7e580796025bf27eb4bcc2f8ddf0e0cca188283970aafa66d417448dfe3d034e
+EBUILD freecad-0.19.2.ebuild 10911 BLAKE2B b362b77de9951f3677e5630f1b2003584e994415cf6b174a921d0248e934468eb5482784782c777d5cef63d36827ea4a79b3ac2d0c20b31eec024363848ffb01 SHA512 1b9bf200a7b1f5842cf8613385f4afe3cefdb184651a137263d8854be35c97e5e1b0c581c5378e113410b2fa7d713b0a9b80fac744ed32a0158e0f9880c60373
+EBUILD freecad-9999.ebuild 10865 BLAKE2B d1b8847121b361ef3bc8029889f41167507817ed31b3da398946b0cbaa5bf4c666d76d5f6c0c77ce4226fcd2fead9e2e7af0fd63ca1a24468b9123abce65b43c SHA512 eaebf90283467263aab13341993c300ff70aeb8c9b697e502f114fd3bb55838115bee227892c8bd0c124a5afee12c8ef1f77e329633742274111fe547954ddfa
 MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3
diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild
index 4a113baa2293..5ffecf7de50a 100644
--- a/media-gfx/freecad/freecad-0.19.1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -275,6 +275,7 @@ pkg_postinst() {
 	optfeature "dependency graphs" media-gfx/graphviz
 	optfeature "PBR Rendering" media-gfx/povray
 	optfeature "FEM mesh generator" sci-libs/gmsh
+	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
 }
 
 pkg_postrm() {
diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild
index 4238e819f095..4719298feb3b 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -141,11 +141,20 @@ src_prepare() {
 	rm "${S}/cMake/FindCoin3D.cmake" || die
 
 	# Fix OpenCASCADE lookup
-	# TODO: check this for opencascade-7.5.1 locations, which have
-	# changed since 7.4.0 after that package has merged
-	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-		-i cMake/FindOpenCasCade.cmake || die
+	local OCC_P=$(best_version sci-libs/opencascade[vtk])
+	OCC_P=${OCC_P#sci-libs/}
+	local OCC_PV=${OCC_P#opencascade-}
+	OCC_PV=$(ver_cut 1-2 ${OCC_PV})
+	# check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced
+	if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then
+		sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \
+			-e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \
+			-i cMake/FindOpenCasCade.cmake || die
+	else
+		sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+			-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+			-i cMake/FindOpenCasCade.cmake || die
+	fi
 
 	# Fix desktop file
 	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
@@ -227,14 +236,16 @@ src_configure() {
 
 	if has_version ">=sci-libs/opencascade-7.5"; then
 		# bug https://bugs.gentoo.org/788274
+		local OCC_P=$(best_version sci-libs/opencascade[vtk])
+		OCC_P=${OCC_P#sci-libs/}
 		mycmakeargs+=(
-			-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1
-			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1
+			-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
+			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
 		)
 	else
 		# <occ-7.5 uses different layout
 		mycmakeargs+=(
-			-DOCC_INCLUDEDIR="${CASROOT}"/include/opencascade
+			-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
 		)
 	fi
@@ -313,6 +324,7 @@ pkg_postinst() {
 	optfeature "dependency graphs" media-gfx/graphviz
 	optfeature "PBR Rendering" media-gfx/povray
 	optfeature "FEM mesh generator" sci-libs/gmsh
+	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
 }
 
 pkg_postrm() {
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 47d3587ffec5..8b29013224e1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -11,14 +11,16 @@ inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
 
+MY_PN=FreeCAD
+
 if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	S="${WORKDIR}/freecad-${PV}"
 else
 	MY_PV=$(ver_cut 1-2)
 	MY_PV=$(ver_rs 1 '_' ${MY_PV})
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/FreeCAD-${PV}"
 fi
@@ -31,9 +33,9 @@ IUSE="debug headless pcl test"
 RESTRICT="!test? ( test )"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
-	inspection material mesh openscad part-design path points
-	raytracing robot show spreadsheet surface techdraw tux"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+	openscad part-design path points raytracing robot show surface
+	techdraw tux"
 
 for module in ${FREECAD_STABLE_MODULES}; do
 	IUSE="${IUSE} +${module}"
@@ -48,7 +50,7 @@ RDEPEND="
 	>=dev-cpp/eigen-3.3.1:3
 	dev-libs/OpenNI2[opengl(+)]
 	dev-libs/libspnav[X]
-	dev-libs/xerces-c
+	dev-libs/xerces-c[icu]
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -65,6 +67,7 @@ RDEPEND="
 	media-libs/freetype
 	media-libs/qhull
 	sci-libs/flann[openmp]
+	sci-libs/hdf5:=[fortran,zlib]
 	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
 	sci-libs/opencascade:=[vtk(+)]
 	sci-libs/orocos_kdl:=
@@ -77,7 +80,6 @@ RDEPEND="
 		net-misc/curl
 	)
 	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
-	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
 	openscad? ( media-gfx/openscad )
 	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
@@ -85,10 +87,11 @@ RDEPEND="
 		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
 		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+		dev-python/pybind11[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
 		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
 		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
-		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+		fem? ( dev-python/ply[${PYTHON_MULTI_USEDEP}] )
 	')
 "
 DEPEND="${RDEPEND}"
@@ -97,35 +100,31 @@ BDEPEND="dev-lang/swig"
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
 # We set the following requirements by default:
-# draft, import, part, qt5, sketcher, start, web.
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web.
 #
-# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
 # Fem actually needs smesh, but as long as we don't have a smesh package, we enable
 # smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
 # reflected by the REQUIRES_MODS macro, but at
 # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+#
+# The increase in auto-enabled workbenches is due to their need in parts of the
+# test suite when compiled with a minimal set of USE flags.
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	arch? ( mesh )
-	debug? ( mesh )
-	drawing? ( spreadsheet )
-	fem? ( mesh )
-	inspection? ( mesh points )
-	openscad? ( mesh )
-	path? ( mesh robot )
+	inspection? ( points )
+	path? ( robot )
 	ship? ( image plot )
-	techdraw? ( spreadsheet drawing )
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
 	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
 	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
 
-CHECKREQS_DISK_BUILD="3G"
+CHECKREQS_DISK_BUILD="2G"
 
 pkg_setup() {
 	check-reqs_pkg_setup
@@ -139,9 +138,20 @@ src_prepare() {
 	rm "${S}/cMake/FindCoin3D.cmake" || die
 
 	# Fix OpenCASCADE lookup
-	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-		-i cMake/FindOpenCasCade.cmake || die
+	local OCC_P=$(best_version sci-libs/opencascade[vtk])
+	OCC_P=${OCC_P#sci-libs/}
+	local OCC_PV=${OCC_P#opencascade-}
+	OCC_PV=$(ver_cut 1-2 ${OCC_PV})
+	# check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced
+	if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then
+		sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \
+			-e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \
+			-i cMake/FindOpenCasCade.cmake || die
+	else
+		sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+			-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+			-i cMake/FindOpenCasCade.cmake || die
+	fi
 
 	# Fix desktop file
 	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
@@ -152,16 +162,16 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_ADDONMGR=$(usex addonmgr)
-		-DBUILD_ARCH=$(usex arch)
-		-DBUILD_ASSEMBLY=OFF
+		-DBUILD_ARCH=ON
+		-DBUILD_ASSEMBLY=OFF					# deprecated
 		-DBUILD_CLOUD=$(usex cloud)
 		-DBUILD_COMPLETE=OFF					# deprecated
-		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
-		-DBUILD_DRAWING=$(usex drawing)
+		-DBUILD_DRAFT=ON
+		-DBUILD_DRAWING=ON
 		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
 		-DBUILD_FEM=$(usex fem)
 		-DBUILD_FEM_NETGEN=OFF
-		-DBUILD_FLAT_MESH=$(usex mesh)
+		-DBUILD_FLAT_MESH=ON
 		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
 		-DBUILD_FREETYPE=ON						# automagic dep
 		-DBUILD_GUI=$(usex !headless)
@@ -171,10 +181,10 @@ src_configure() {
 		-DBUILD_INSPECTION=$(usex inspection)
 		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
 		-DBUILD_MATERIAL=$(usex material)
-		-DBUILD_MESH=$(usex mesh)
-		-DBUILD_MESH_PART=$(usex mesh)
+		-DBUILD_MESH=ON
+		-DBUILD_MESH_PART=ON
 		-DBUILD_OPENSCAD=$(usex openscad)
-		-DBUILD_PART=ON							# basic workspace, enable it by default
+		-DBUILD_PART=ON
 		-DBUILD_PART_DESIGN=$(usex part-design)
 		-DBUILD_PATH=$(usex path)
 		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
@@ -186,11 +196,12 @@ src_configure() {
 		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
 		-DBUILD_SHOW=$(usex show)
 		-DBUILD_SKETCHER=ON						# needed by draft workspace
-		-DBUILD_SMESH=$(usex mesh)
-		-DBUILD_SPREADSHEET=$(usex spreadsheet)
-		-DBUILD_START=ON						# basic workspace, enable it by default
+		-DBUILD_SMESH=ON
+		-DBUILD_SPREADSHEET=ON
+		-DBUILD_START=ON
 		-DBUILD_SURFACE=$(usex surface)
 		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TEST=ON							# always build test workbench for run-time testing
 		-DBUILD_TUX=$(usex tux)
 		-DBUILD_VR=OFF
 		-DBUILD_WEB=ON							# needed by start workspace
@@ -203,42 +214,74 @@ src_configure() {
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
-		-DFREECAD_USE_CCACHE=OFF
 		-DFREECAD_USE_EXTERNAL_KDL=ON
 		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
 		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
 		-DFREECAD_USE_FREETYPE=ON
 		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
 		-DFREECAD_USE_PCL=$(usex pcl)
-		-DFREECAD_USE_PYBIND11=$(usex mesh)
+		-DFREECAD_USE_PYBIND11=ON
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
-		-DPython3_EXECUTABLE=${PYTHON}
+		# install python modules to site-packages' dir. True only for the main package,
+		# sub-packages will still be installed inside /usr/lib64/freecad
+		-DINSTALL_TO_SITEPACKAGES=ON
 
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+		-DPython3_EXECUTABLE=${PYTHON}
 		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
 	)
 
+	if has_version ">=sci-libs/opencascade-7.5"; then
+		# bug https://bugs.gentoo.org/788274
+		local OCC_P=$(best_version sci-libs/opencascade[vtk])
+		OCC_P=${OCC_P#sci-libs/}
+		mycmakeargs+=(
+			-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
+			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
+		)
+	else
+		# <occ-7.5 uses different layout
+		mycmakeargs+=(
+			-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+		)
+	fi
+
 	if use debug; then
+		# BUILD_SANDBOX currently broken, see
+		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
 		mycmakeargs+=(
-			# sandbox needs mesh support
-			-DBUILD_SANDBOX=$(usex mesh)
+			-DBUILD_SANDBOX=OFF
 			-DBUILD_TEMPLATE=ON
-			-DBUILD_TEST=ON
 		)
 	else
 		mycmakeargs+=(
 			-DBUILD_SANDBOX=OFF
 			-DBUILD_TEMPLATE=OFF
-			-DBUILD_TEST=OFF
 		)
 	fi
 
 	cmake_src_configure
 }
 
+# We use the FreeCADCmd binary instead of the FreeCAD binary here
+# for two reasons:
+# 1. It works out of the box with USE=headless as well, not needing a guard
+# 2. We don't need virtualx.eclass and it's dependencies
+# The exported environment variables are needed, so freecad does know
+# where to save it's temporary files, and where to look and write it's
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	export FREECAD_USER_HOME="${HOME}"
+	export FREECAD_USER_DATA="${T}"
+	export FREECAD_USER_TEMP="${T}"
+	nonfatal ./bin/FreeCADCmd --run-test 0
+	popd > /dev/null || die
+}
+
 src_install() {
 	cmake_src_install
 
@@ -249,6 +292,10 @@ src_install() {
 	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	# compile main package in python site-packages as well
+	python_optimize
+
+	doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {
@@ -277,6 +324,7 @@ pkg_postinst() {
 	optfeature "dependency graphs" media-gfx/graphviz
 	optfeature "PBR Rendering" media-gfx/povray
 	optfeature "FEM mesh generator" sci-libs/gmsh
+	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
 }
 
 pkg_postrm() {
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
deleted file mode 100644
index 1563e850ae2f..000000000000
--- a/media-gfx/freewrl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX freewrl-3.0.0-fno-common.patch 223 BLAKE2B 007d3fcb08acc5da859d28564e54558394a3f5fd23c1662e9d39e3c6d50c03cc5b024f7e4b72cdd6000249a67250a5c70e070c85d7e4f26e312e97a0895df54b SHA512 538bb6a1afdf7103e6ecc01dbd7005e33c14c01437f9c3666e1749bba8612c7cdb998bb4fb4e8d9e22663be97dfa991ac68a3e269c0817d71df8da54a5e417af
-DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
-EBUILD freewrl-3.0.0-r1.ebuild 4476 BLAKE2B 80bd01f1a801d177fb4db154611037dc51e05809ae47d139936dbc74f9f53a60a5d5f56704a2222df8ac71b9621113bf1e1bfe7f4b2bea6555217d99032a6275 SHA512 3dab57e3c992fffbb27a70f87ff762330077579952e7d3dd36a2b1db56405213c8423013ea8f4054e5588208c449213f547488349f16335d16b100c188885fd3
-EBUILD freewrl-9999.ebuild 4490 BLAKE2B a3d0c2830ef600d27162fc568dfe54a41c708e6675e5ad9387c884d7f83fb615b7c19b4e7ece397558b000a1fd8e7333ec44f576f6a664db3564c6d9d65beb3a SHA512 1c7ba90270113d7ba20b5e1f919bd008d5a1da91158cee7d3667238c288090d02ff274a68d0aa2691ca7439914cd09c336d807c932cff5b687c9d0ab9dcf74a4
-MISC metadata.xml 1302 BLAKE2B eb8522dbaadd9c9ebc8d3b5e03072fc7b57f6d87046f52104985a5e0e8f40669b53906921286d1d2c79e393853cac4c88f5a351c7bd0c38e3b9905308c0a890e SHA512 f7581007975722b3d16cf349c55ab67b5cf92a47316399adefb38a9413669f544c9fa5cc922f02f5a7473d4570d884d561dc8ef397347eca80494964f2f4faf0
diff --git a/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch b/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch
deleted file mode 100644
index e3fbc2d736e5..000000000000
--- a/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/desktop.c
-+++ b/src/lib/desktop.c
-@@ -233,7 +233,7 @@ enum {
- 	url2file_task_spawn,
- } url2file_task_tactic;
- 
--enum {
-+typedef enum {
- 	file2blob_task_chain,
- 	file2blob_task_spawn,
- 	file2blob_task_enqueue,
diff --git a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
deleted file mode 100644
index 545457a35528..000000000000
--- a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools nsplugins epatch java-pkg-opt-2 multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
-	S="${WORKDIR}/${P}/freex3d"
-else
-	SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
-	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/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	motif? ( x11-libs/motif:0= )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	virtual/opengl
-	media-libs/freealut
-	media-libs/openal
-	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_user
-	epatch "${FILESDIR}"/${P}-fno-common.patch
-	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
-		--disable-mozjs-17.0
-		${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 $($(tc-getPKG_CONFIG) --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$($(tc-getPKG_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/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
deleted file mode 100644
index 3e3d9594c1e4..000000000000
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools nsplugins epatch java-pkg-opt-2 multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/freewrl/git"
-	EGIT_BRANCH="develop"
-	S="${WORKDIR}/${P}/freex3d"
-else
-	SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
-	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 rbp +sox static-libs"
-
-COMMONDEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	motif? ( x11-libs/motif:0= )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	virtual/opengl
-	media-libs/freealut
-	media-libs/openal
-	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 )
-	rbp? ( dev-games/ode:0=[double-precision] )
-	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_user
-	eautoreconf
-}
-
-src_configure() {
-	# list of js libs without .pc support, to disable ./configure auto-checking
-	local spidermonkeys=( mozilla-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
-		--with-javascript=spidermonkey
-		${spidermonkeys[@]/#/ --disable-}"
-
-	if has_version "<dev-lang/spidermonkey-1.8.5:0" ; 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 $($(tc-getPKG_CONFIG) --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$($(tc-getPKG_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 rbp) \
-		$(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/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
deleted file mode 100644
index 46c0887e1b14..000000000000
--- a/media-gfx/freewrl/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-FreeWRL is a VRML97 (VRML-2.0) and X3D interactive viewer, providing both a traditional Xorg application 
-and a nsbrowser plugin for use with many available web browsers.  The package depends heavily on OpenGL 
-support for rendering.  When developing your 3D world or model, you can program with GLSL Shaders using the 
-X3D Shaders Component, put your model exactly where you want them with the Geospatial Component, or just 
-throw triangles to the screen as Extrusions, IndexedFaceSets, TriangleSets, Circle2D, Disk2D, Spheres, Boxes, 
-Cubes; the list goes on and on.  With royalty free open standards, your models will continue to render, year after year. 
-</longdescription>
-	<use>
-		<flag name="libeai">Build EAI C library</flag>
-		<flag name="opencl">Enable OpenCL support</flag>
-		<flag name="osc">Allows for OSC-based control and communication between multiple freewrl instances</flag>
-		<flag name="rbp">Enable support for Rigid Body Physics</flag>
-		<flag name="java">Build and install java EAI/SAI support library</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">freewrl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index f091811dee8c..900cdb68fcc2 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -3,5 +3,5 @@ AUX gimageview-0.2.27-gtk2.patch 624 BLAKE2B cd23a3c07bb885010fc01a0cc211ab12b93
 AUX gimageview-0.2.27-libpng15.patch 601 BLAKE2B fb97fa8cc84927f03df462ec09d3a312e06dd2b5554e0c62c90e739f72917dd479f1d2ec3cf50d5d4e1f558cbab1a1eb221a150940efa1494c9239b6e9aa086a SHA512 390bf474bbf300cbd9c18ec3475769185f16226dfdb9389f62cd6e60bf33529009de68ee8bf387f690fc6a9e87f315f022f4f0b2fb6ef6ebfcdf49d96b5c49f9
 AUX gimageview-0.2.27-sort_fix.diff 714 BLAKE2B 2ea9e8eba6a0253bb4990b083e00013f40eb049028f0ecd700bd56193400ec6ef366d4c2360beea5b3314df2ea207cf782c1bc6e32221a3e73a83f9e92d94a23 SHA512 ab3ce0f2bb9b4c1d52d05c78db4d42fa2e77e7a5d7655b82a036279c9049de609dedebdea8422596ebf91080e91ac6ce42babb4aaf22877ec3dc808cfc37a3ea
 DIST gimageview-0.2.27.tar.gz 1348286 BLAKE2B 51538af8bdc85243e825e58b6bbefa285bdefad95b05228e08a8500a5fc9f7036a53f931689543a30841f9cbd54ad4576fbf5a29dd79d7b1f05f07cdaa8c9aa7 SHA512 36ac16f4fffcde34b608da35aa089d40225129a2f9dcd70cb024713738842600c7231522093b3d0bf5a7c4c4dcb7ba4b14d550e417e8b52030d43d4b51145220
-EBUILD gimageview-0.2.27-r4.ebuild 1739 BLAKE2B fd6828bdd7bb7f453414449b107cdd7efd2945e56a58cad20495718589612431fa7f55aa451acc476edfd12039e285396c1f69af25431678d0460e83ab0ab3ed SHA512 7a06d43a74b5b767d47bc0967f697e6f1a15f9e42b5b4b278090a5b8f0ecd12981f03acda22a07b6d5c5d14776aa71f052026d89a929e5492ccb6b3f76b885b1
+EBUILD gimageview-0.2.27-r4.ebuild 1746 BLAKE2B 39a74caca173b7a099fcfad4161c27e22e6a78094c65b1cf49dc394de99c3b3d2b3217f5b2b7eef76aea197cb530d6cba0f10c902fd2e746a188c44def0dd317 SHA512 9585958c48adc020e5dc61c9e78063e78d97be49b0e11b5686a6962b70a763b31397274f43aba8829eed60a8b041c2042fd05aaba18327fd39fccf70f0b1a0fc
 MISC metadata.xml 248 BLAKE2B 73b24d9b798f81fcb841c813142b07b7fe872ff2c9dd6a51f7d205dbf4b3f6b9b1c975d22fa265f2749361f4bb058ecf90d8525c36ba28e6f32c3855599a8333 SHA512 61a3b73ed8a3baeb3886b73a3c578eece805577d7708771b09ac4c82ab8cd8c08c65ee185fb1eba8b4ad3c79442b4e769bc9c72a60ba9a6f9438623360058a1a
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
index 4af34c5a9f87..e44c2b09390d 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=6
 
-inherit epatch libtool ltprune
+inherit epatch libtool
 
 DESCRIPTION="Powerful GTK+ based image & movie viewer"
 HOMEPAGE="http://gtkmmviewer.sourceforge.net/"
@@ -72,5 +72,5 @@ src_install() {
 		libdir="${ED}usr/$(get_libdir)" \
 		install
 
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index d69c5af86ad0..cfdfb52fb93d 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -2,5 +2,5 @@ AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
 EBUILD gmic-2.9.5.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
-EBUILD gmic-2.9.7.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
+EBUILD gmic-2.9.7.ebuild 4260 BLAKE2B 96fd28e34efc81a51e21aad3b89a913e4d4a5a427a6913da38f5bce4d559d995b8cbbdd08701880a61572a6f9e8c5d63ed6538a1af0aff7fb03f6ae86f5b6336 SHA512 4d908e35ad53b771bbd6373b74218480dcdc48ae94dd389e525bfa239d9faedff4ae78b151da44123a5777efad51be81743383e7b57d80412d958f50231e21f4
 MISC metadata.xml 533 BLAKE2B 29dc054d7e7f718782ad0bb914bd8ce7b2dc6519826c4fe21be1cc20c4ddd21b99355c565106123de39bec8dadb08c1ca1fcb10989cc6fe984e6a6ea7e611c5f SHA512 2eb6d59dfa0d092625b755e952dbddf6c6dda811ae19768811ea7dc8a07771cfd3e4d074e8e996ec2de5e74243721c8b82d7cb8fc86300246096e18b782b5a2c
diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
index 20cad100504d..cd2efec6e1b2 100644
--- a/media-gfx/gmic/gmic-2.9.7.ebuild
+++ b/media-gfx/gmic/gmic-2.9.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 518c54c98fe3..d7e114382605 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-font-viewer-3.34.0.tar.xz 157756 BLAKE2B dabda5516fc5461d382f6ac6ed2ac6177dee137983833e3643d029e2370b76ef586223a41b591ef0f6c21024f1e42fe7b234c8ef9cdbbbf9845c46b9a55222eb SHA512 1be6230da5ff47a129db43b5f5467d3fed8925fad7a6637f24d72c8c99c80d8dd1635eaef1b7c7f650a86132a54cde8326d3418075f5818d0154dc8d503927c7
 DIST gnome-font-viewer-40.0.tar.xz 175396 BLAKE2B 33e10646fe31f76696867c0c5e7a99385064f09049390adb78149141f906958a6f14c3e29a9fbbfe8c48879f4600963ec66e9753018d9d7d658f4111c6dad120 SHA512 c82044e6750494d693cf631abe7fb76c655b58965ccd1ca08f512f0e79c40e9f207997465908b99e5813f350ca05ea8e76f029be79f3008173c49f3c5a4ee23d
-EBUILD gnome-font-viewer-3.34.0.ebuild 663 BLAKE2B 72c32fe0f9de0424a9b40675c517aefd39b5215a6c4fd6e3e5ad0af7591a33654d46b34fd31ecbcf8355c659d3093648e7ce30e11d153af32ff98d6b3b8bfe00 SHA512 38610161484b35700354930c782f7cbbc1d13bf6bc8d5a185d50a071db91b789633ba74c47a381b9f8bc12c720347e423a2112005d84d2cd7682edbe93e7b4e9
-EBUILD gnome-font-viewer-40.0.ebuild 699 BLAKE2B 44e15a20602247e43041686ea628b6eb035e97325877260f873eeaa707549f84dfe7b6f7bdd14d86e175b62d78d84f6e7c45c4a2e859cc5c66b5db25dbdf6377 SHA512 bd752e690c49ffce2df4494bbcd9f8f000b2da067e784cd25bbcdce851fd7eeedcb79237509572203424f6225f5cea9e593db07108403da1bbaa288801dc73fb
+EBUILD gnome-font-viewer-40.0.ebuild 697 BLAKE2B f3eb825761342d9df2fb6a0209d7ebd02c36759357364d0c6ece5b65bf0f7ca4ccc5bf04405c57c2052f61443b626b0c48ee8ea9b904f5d39850f1ff666c4c34 SHA512 e0352369afe9cb9c9de95663f1dc537fcccc80ba1f7e2ab478b0ca105b51a9463441ce4dab00f5de31dfc9c307c1bc16ed511d3464229b7a27c1863ca6817a8f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
deleted file mode 100644
index 99dbeed9c0db..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson xdg
-
-DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.1:2
-	>=x11-libs/gtk+-3.20:3
-	>=media-libs/harfbuzz-0.9.9
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	gnome-base/gnome-desktop:3=
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
index 0fdb36355a6f..675a6dc9c8bc 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 90d7d2792ca2..e5a97f118d4e 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-photos-3.34.2.tar.xz 639992 BLAKE2B f189e7e1a831f4d19416b689733ef6a55822d57b5f1ea29a4dcb4fc06d5f9a450e45aaf53f65e392ac78e9959f7359f3df17827a326cfd6dbf8cc7d77cc0a367 SHA512 6315fb8e7623de48a42f1b47a2935c80f8f9f6db1ab724d1857697f673c4ca0d5ca1afa5c0d147455c3c0ad0224b85b52a220b1dd39a1409804bb75794d0a04b
 DIST gnome-photos-40.0.tar.xz 632440 BLAKE2B 4a3be35e627169afa4b3b9aca2c675f6035f3e46822450fc479550a3e48aebba6f9e335dc528a6593f1bd844fde501b8535ed368be9825f229280a08d5ead7e6 SHA512 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814
-EBUILD gnome-photos-3.34.2-r1.ebuild 2306 BLAKE2B 0975c84b46f2dbff95b983abcb2e4913872a644a9734853d74379dcd9e07f3730bacf19fb403b80fe43e419cc5334d214ff278cc5f61e17a3ee7cf3789be4822 SHA512 e03f425e66164cd3c1b588a62a76340496567d82f21992d4d00306a7cbac4600efa146f0bb03f39462f45a24a8a87f6ba2b235d2c28326ef5658551d0d9b9b7b
-EBUILD gnome-photos-40.0.ebuild 2362 BLAKE2B 32f52e14fba2762e02175b6d82640f61af8c566abfcb23f567771b9d031bba44c9f06223df4ac1c40fd9469b7e140aa20265419866d6ead4edb386313fada0fc SHA512 d8002fc69d2847e54083027f3146e40c4abc2b98b932e333e9000918e895dca99978a911c45acf9b0608992d80b56263d5a2af2a5bdbc3cb5589c52d39198942
+EBUILD gnome-photos-40.0.ebuild 2360 BLAKE2B ab2f06fcf84dc5b0264d556a762a6209300b0a83ec70f06e3f55a3b9d78d9b006a2923dd5027a320a9cd1bbffbdbf5102405d9cd87fe86d33e72fe2287035700 SHA512 b934b9bcad8e5393444caeff68dc4e8a9ac356a0379162d8c1be594bd72e43fd40d4df64579d5fb1bfc4a49a7541ca8c46a6ebb7c2e9894327580089f68de469
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.34.2-r1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.34.2-r1.ebuild
deleted file mode 100644
index ead6423224bf..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.34.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="flickr test upnp-av"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	media-libs/babl
-	>=x11-libs/cairo-1.14.0
-	>=x11-libs/gdk-pixbuf-2.36.8:2
-	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
-	sci-geosciences/geocode-glib
-	>=media-libs/gexiv2-0.10.8
-	>=dev-libs/glib-2.57.2:2
-	>=net-libs/gnome-online-accounts-3.8.0:=
-	>=media-libs/grilo-0.3.5:0.3=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.22.16:3
-	>=dev-libs/libdazzle-3.26.0
-	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	virtual/jpeg:0
-	>=media-libs/libpng-1.6:0=
-	>=app-misc/tracker-2.0:0/2.0
-	sys-apps/dbus
-"
-# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
-# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
-# so don't pull it always, but only if either USE flag is enabled.
-# tracker-miners gschema used at runtime.
-RDEPEND="${DEPEND}
-	net-misc/gnome-online-miners[flickr?]
-	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-	>=app-misc/tracker-miners-2:0
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-DOCS=() # meson installs docs itself
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test dogtail)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
index fd086220f9ac..782a6ec611f7 100644
--- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="flickr test upnp-av"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index a157c752d3d1..12ea9c96d28c 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-screenshot-3.38.0.tar.xz 356716 BLAKE2B 31f2a0cdf16a9f967c789ec1f698140f78a5c4d66489bc8a47b8b61b5e536e6b67fd60b9cb241221262eef5b3117ce3e1a59fa162a7f193de440f7de9db0afc3 SHA512 183f81b9b481d1afb4a3c8e37b25a78652e599d4c5a4f1a2cc9449cd1efdf3b613018c17de9ab61304ba19ad7152d696aeed475c0184a4728ea1359ca2be2ecf
 DIST gnome-screenshot-40.0.tar.xz 358088 BLAKE2B cad407f471e953667946b741ed59fe210d7ba3d079f2db8101974e565a1d0bfaec0cb1b40791be0e183dd399a82db5f15bbbec741ef16b4b572b043fcaf8ea8e SHA512 0889d7701711f17de68f8a55f512b7764fed087b1b2f86b372d1a38ee956f05ca8c833ca16a1de2396b07c01de79204d988192036780f521b82733436d019cb0
-EBUILD gnome-screenshot-3.38.0.ebuild 1332 BLAKE2B 781c43ba1a3f6d0365500eef7da33ed2ba3d610702cf1be844333f02ca5a8e26a5dd7f673c5fdaaeb710f931a285bd489c72a169b0a3c894f909cee9658a424d SHA512 66126fef44e6d6b6a6c060e4bd8ab92d6943678554a0dc264e6141cacc0d688746b12c10f482b6fd728014a503db7dce0c145cb1cd222fca0787908f7edda880
-EBUILD gnome-screenshot-40.0.ebuild 1245 BLAKE2B dbed2f6b436bc243e18fb44155ceea506e9dc455ad0b75bca9456950ed180af0b3ecc8360a6fd27d3f2c657cbab085b91421e4fe206255e9d3b86c69f1ea35bf SHA512 44f9a2bef1f17809313368c185a13117b28b577ad135ea43dfb2aa7cbdc85b0c941724e2209264d27f5129241a32af41717b9e5c479747dd95388c066a6b28a6
+EBUILD gnome-screenshot-40.0.ebuild 1243 BLAKE2B 63b06fb6a2e40510e5d8301744eb8a3bb860fd36c46e546dba6ea78dd72017574d8ec78efdf33c731f5f0f34258617c656039dc7f9052dafb8e87c9bbb1308f2 SHA512 ad608f1e60dd59631895a0868e9a4ebbfb9cd063c45db01e1f72eeb29611828b153edf7dcc796efc571531a2dd5402eb7be017dd642d5ba21a5b5adcec02b262
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
deleted file mode 100644
index 882eeb1a8d81..000000000000
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="Screenshot utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="X"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
-DEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	>=dev-libs/glib-2.35.1:2[dbus]
-	>=x11-libs/gtk+-3.12.0:3
-	>=media-libs/libcanberra-0.26-r2[gtk3]
-	>=gui-libs/libhandy-1:1=
-"
-RDEPEND="${DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
-	non-interactive mode when launched from a terminal. If you want to choose
-	where to save the screenshot, run 'gnome-screenshot --interactive'"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature X x11)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-40.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-40.0.ebuild
index 56de65187634..81b2edf3ae23 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-40.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	X? (
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 1bda9cf1f961..d1760c4addca 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,6 +1,3 @@
-AUX gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch 883 BLAKE2B cdbc9626b09610eb98cc32e04e68f6d4ea7d13709258ea6d23e9c1a800be1c7bb02589da354234ad523f43d9c93335eeaf8bbd42c26ffe8747a19fbd5fec3b2c SHA512 b2f3e36d151fefa78b63ba478efa17ab419a4f9d60c03a5951b149cb045495d4cd5e102a2977af6097f6d902449c5c56a8b1c0ac55eaa924f08931d08488b0ab
-DIST gphoto2-2.5.26.tar.bz2 804521 BLAKE2B 20ddf39ad8668543864119cb1cf8dd5db4be5a773ccdd73efe434fe790ce001842512acf9a9f3ad08bad43460b42e4de257b2ca5561b5d7727f0703dba8f8098 SHA512 fbfc8d860db830be423271a0f569d51a296e9394884fe1a9e22eafd4ba0b7e4e68d86ba0391df81a64d4a4976b2644b2c39339532bd0e8e01f461b9a89cceb47
 DIST gphoto2-2.5.27.tar.bz2 803602 BLAKE2B ad62abc3e91ce3cee1edd8f991ac84616144997bff425eef5cea10c340f9c98694ecda783ec5762f4583d05f38cfecbb7b47e0884c05f114f931a7af8b0a676d SHA512 47001025d3647ac809ab7fd2d9319a2966d72b00471f9a9c865dfad7091c7cac2e299ecd41dfc7997a6665cf2612d4317591964f51a9d336f848e8199e3928b7
-EBUILD gphoto2-2.5.26.ebuild 1266 BLAKE2B 0e2827440e0571d77bd1ba084b14d327c8692606aaeb17fade74de960fa97dc565d22b88af7d94496e61de793f0df0c38b730ecba263c29b61108675b2088973 SHA512 54de9e62b9c74b5d7cffc396c94ec09a63a401d75b464b9d1717dd70f70d7429dd4438eb6f81368c767283da0ac58630910b6ea49bfc9f3a022114bdd2bd4cb3
-EBUILD gphoto2-2.5.27.ebuild 1213 BLAKE2B 651dcb8ec325c67075b4fd85454034f4bd761827b1ebfa0c863e562b6c3e3e945a1ec79c2dc83c5651bb9f937f9ab497d6aa15909c2aff754ec333315552d92b SHA512 8fdcdd4dbd262bf9dc4a24b677c08cf129ac87e000e7a662af07f10a4ba6896588a6dbc2627e3fedc74d47a9afe8088882aaac5e29b60e84ae60862b777cb7fd
+EBUILD gphoto2-2.5.27.ebuild 1209 BLAKE2B f1f3547bffd426b36772ef930f7294f65f9877c23d4d7458185b75a1445dda1efd4a0ddabdee591354cb6ef5bbc9e2f795bf576f5ea4c1c49a44ff3d2a31ed4f SHA512 428e2f4abf2a68d3ed4db3be9041eca736ce0073e8d611e6f5bf69cc0b2afa6860861354c5bdb27f9b38c0284a3e334ad808f8c94f973fb3b7dd8463a70a620b
 MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch b/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch
deleted file mode 100644
index b68e618cc018..000000000000
--- a/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/679332
-
-diff --git a/configure.ac b/configure.ac
-index ed76a66..b0db85c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -141,7 +141,7 @@ AC_ARG_WITH([cdk-prefix],AS_HELP_STRING([--with-cdk-prefix=PREFIX],
- if $try_cdk; then
-         CPPFLAGS_save="$CPPFLAGS"
-         CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS"
--        AC_CHECK_HEADER([cdk/cdk.h], [
-+        AC_CHECK_HEADER([cdk.h], [
-                 have_cdk=:
-                 AC_PATH_PROG([CDK_CONFIG], [cdk5-config])
-                 if test -n "${CDK_CONFIG}"; then
-diff --git a/gphoto2/gphoto2-cmd-config.c b/gphoto2/gphoto2-cmd-config.c
-index 360fd61..c801604 100644
---- a/gphoto2/gphoto2-cmd-config.c
-+++ b/gphoto2/gphoto2-cmd-config.c
-@@ -29,7 +29,7 @@
- 
- #include <gphoto2/gphoto2-widget.h>
- 
--#include <cdk/cdk.h>
-+#include <cdk.h>
- 
- #ifndef MAX
- # define MAX(a, b) ((a) > (b) ? (a) : (b))
--- 
diff --git a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
deleted file mode 100644
index fe0d36cbfff3..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-RDEPEND="
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.17:=[exif?]
-	aalib? (
-		media-libs/aalib
-		virtual/jpeg:0 )
-	exif? (	media-libs/libexif )
-	ncurses? ( dev-libs/cdk:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-s-cdk-cdk.h-cdk.h.patch
-)
-
-src_prepare() {
-	default
-	if ! use exif ; then
-		# Remove tests that require EXIF to pass, bug 610024
-		rm "${S}"/tests/data/test0{35,36,37,40}* || die
-	fi
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure{.ac,} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with aalib) \
-		$(use_with aalib jpeg) \
-		$(use_with exif libexif auto) \
-		$(use_with ncurses cdk) \
-		$(use_enable nls) \
-		$(use_with readline)
-}
diff --git a/media-gfx/gphoto2/gphoto2-2.5.27.ebuild b/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
index a48879567c57..7e2fd259acb4 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index e587886f67a4..9305c3447eff 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,3 @@
-DIST gthumb-3.10.2.tar.xz 7582448 BLAKE2B 29c6e74706e0f78c4a641841861f9e4d996c5baa7e9a26e12352e6c124402bad24af1ee45871f413de4935abe53109ffad484ed8d853c131cfa438714e4226b5 SHA512 3b4d23a744e0663a0358d41697b1b01ec2faa3f12fc29853c82de8109dec5ef66c3827ed6e0efb97147e34ab9643b42daedc3ee7babe03f486ba589323604b74
 DIST gthumb-3.10.3.tar.xz 7582472 BLAKE2B 1e8274720428db05d4e14bb6a37ff55a74fe009ea551bda6fe75506f7187e03685903c2743fb6e66a33da73c974188528afad866c568bb14cc6f05749e08af7c SHA512 2d157644c6efbf4f4ab31c525a4eecc69fbdf31003f922d5fdf8866ca6bbb44e5b8bd7f809be12de41178ddcef30bb49029ea06eb4feb8398a6aa1b052c6ae38
-EBUILD gthumb-3.10.2.ebuild 2245 BLAKE2B 28314db4585b015cb840a5518fe88029b3bd5367c4001cad2b30456903bb3c55165e3e2de162159c5a93a7983c534b15a93b70a9155048888d67107db3bc7905 SHA512 794bc6f1e88a4a0d9c3deda091d0dda93ed5cf85c8f21c2d9ee6de0c98846b8002522fac9a6132e857abcf7746b04c7b7a7c3781a7b5b1d120f96402dd787bdf
-EBUILD gthumb-3.10.3.ebuild 2317 BLAKE2B 9f28dffa29d393041d1eb3f52677afca13dc427916b493313f61dff79420fe0ee71485f67e215926ab27acc9e8d208ffc386dda1fd5c1042cde15aa5951dec07 SHA512 f6404fc7513201b42eba5589b27bd96d27369931abc7f9095c5e61f3ee84177d7de954e2842f01c97deb382a99580d54452df47e552a72a4477c5991c7b2f667
+EBUILD gthumb-3.10.3.ebuild 2315 BLAKE2B e60ab33332e0296ef56c20420489a6b35d2c27372d263beb1007cf381988349d7219f6637dd7fc27576809cfba97bd78758def1659378dcfb418c72116e419ca SHA512 a47743acb43b1582085e769074e66d62b1b97fceeef388f714bb80497247d170b03f67ed74e27848c2071645233896c2b61ec06f05140a1499985f7a62ed6209
 MISC metadata.xml 420 BLAKE2B d43a138708de7341b7b449d8bc7cbd6dedc471844ee9edac0b4cfa075ba582d5079d6eeacef69031cbfe9ef78493e50cc8f6810f3b80991cb552ffb3a2ca2757 SHA512 856096108784110fbbeeb1c3c5072697f7555edd733f31cfa4820f57e24a1e384f4ab609c77c3ce3a0d8e873c0193e493ea90085509b77686ab46e3f9ff3fc2d
diff --git a/media-gfx/gthumb/gthumb-3.10.2.ebuild b/media-gfx/gthumb/gthumb-3.10.2.ebuild
deleted file mode 100644
index aae8425356f4..000000000000
--- a/media-gfx/gthumb/gthumb-3.10.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
-
-RDEPEND="
-	>=dev-libs/glib-2.54.0:2
-	>=x11-libs/gtk+-3.16.0:3
-	exif? ( >=media-gfx/exiv2-0.21:= )
-	slideshow? (
-		>=media-libs/clutter-1.12.0:1.0
-		>=media-libs/clutter-gtk-1:1.0 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-gtk:1.0 )
-	raw? ( >=media-libs/libraw-0.14:= )
-	http? ( >=net-libs/libsoup-2.42.0:2.4
-		>=dev-libs/json-glib-0.15.0
-		>=net-libs/webkit-gtk-1.10.0:4 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
-	cdr? ( >=app-cdr/brasero-3.2.0 )
-	svg? ( >=gnome-base/librsvg-2.34:2 )
-	webp? ( >=media-libs/libwebp-0.2.0:= )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	colord? ( >=x11-misc/colord-1.3
-		>=media-libs/lcms-2.6:2 )
-
-	sys-libs/zlib
-	virtual/jpeg:0=
-	tiff? ( media-libs/tiff:= )
-	media-libs/libpng:0=
-	>=gnome-base/gsettings-desktop-schemas-0.1.4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Drun-in-place=false
-		$(meson_use exif exiv2)
-		$(meson_use slideshow clutter)
-		$(meson_use gstreamer)
-		-Dlibchamplain=false # Upstream still doesn't seem to consider this ready
-		$(meson_use colord)
-		$(meson_use tiff libtiff)
-		$(meson_use webp libwebp)
-		$(meson_use raw libraw)
-		$(meson_use svg librsvg)
-		$(meson_use gnome-keyring libsecret)
-		$(meson_use http webservices)
-		$(meson_use cdr libbrasero)
-	)
-
-	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
-	if use lcms || use colord; then
-		emesonargs+=( -Dlcms2=true )
-	else
-		emesonargs+=( -Dlcms2=false )
-	fi
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/gthumb/gthumb-3.10.3.ebuild b/media-gfx/gthumb/gthumb-3.10.3.ebuild
index 79d24ac86c01..a8f88cc18f64 100644
--- a/media-gfx/gthumb/gthumb-3.10.3.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
 
 RDEPEND="
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
new file mode 100644
index 000000000000..f495d85c36df
--- /dev/null
+++ b/media-gfx/hydrus/Manifest
@@ -0,0 +1,6 @@
+AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
+AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
+AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
+DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba1003962b065883ec22fd68f46dc250b2bccf47005731fcc964b75e07977aed45023da1c7e4513fcfcc29d1b4d1a97 SHA512 81eeb59006644b9b33c33c8da3e003640116488509ce2e1426d2a5c0161adf208e31a45c2a5efc2902769bf91e3db56aabc6384f77e8354e0e113bcc6df3a131
+EBUILD hydrus-441.ebuild 4618 BLAKE2B fd91ab5d42d41be8ce0fad57469d48856a70948622fba6dd858592c86ca555aa416d35faff7c1ce742529813973db9925de65f05e3dc5ac82177e88e6d08e3bf SHA512 d4bee7075943660d83657901d29e327109e4415cca315c39cd4fd504d9459773a6c0ccda5af9e484b4a18e316f538be28444cb85c63952d962413812d44ab889
+MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3
diff --git a/media-gfx/hydrus/files/hydrus-client b/media-gfx/hydrus/files/hydrus-client
new file mode 100644
index 000000000000..7a6e42747c5c
--- /dev/null
+++ b/media-gfx/hydrus/files/hydrus-client
@@ -0,0 +1,3 @@
+#!/bin/sh
+export QT_API="${QT_API:-pyside2}"
+exec /usr/bin/python -OO /opt/hydrus/client.pyw "$@"
diff --git a/media-gfx/hydrus/files/hydrus-server b/media-gfx/hydrus/files/hydrus-server
new file mode 100644
index 000000000000..cecb9adc1a2d
--- /dev/null
+++ b/media-gfx/hydrus/files/hydrus-server
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/python -OO /opt/hydrus/server.py "$@"
diff --git a/media-gfx/hydrus/files/userpath-in-local-share.patch b/media-gfx/hydrus/files/userpath-in-local-share.patch
new file mode 100644
index 000000000000..8b4c12be071e
--- /dev/null
+++ b/media-gfx/hydrus/files/userpath-in-local-share.patch
@@ -0,0 +1,12 @@
+diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py
+index 05fff23..d68fc06 100644
+--- a/hydrus/core/HydrusConstants.py
++++ b/hydrus/core/HydrusConstants.py
+@@ -67,6 +67,7 @@ if USERPATH_DB_DIR == desired_userpath_db_dir:
+     
+     USERPATH_DB_DIR = None
+     
++USERPATH_DB_DIR = os.path.expanduser ( os.path.join( '~', '.local', 'share', 'hydrus', 'db' ) )
+ 
+ LICENSE_PATH = os.path.join( BASE_DIR, 'license.txt' )
+ 
diff --git a/media-gfx/hydrus/hydrus-441.ebuild b/media-gfx/hydrus/hydrus-441.ebuild
new file mode 100644
index 000000000000..ae3f806847c6
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-441.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="http://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			 media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			 dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+				|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+					dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+# Delete files only needed for testing
+delete_test_files() {
+	rm test.py || die
+	rm hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ || die
+	rm -r static/testing/ || die
+}
+
+src_prepare() {
+	default
+
+	# If tests will run, leave the files until tests are run.
+	# They will be deleted before installing the package.
+	if ! use test; then
+		delete_test_files
+	fi
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	export QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local DOC="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${DOC}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	if use test; then
+		# Delete files only needed for tests now. No need to install them.
+		# If the tests didn't run, the files have been deleted already.
+		delete_test_files
+	fi
+
+	# These files are copied into DOC
+	rm COPYING README.md Readme.txt help_my_client_will_not_boot.txt || die
+	rm -r help/ db/ || die
+	# The program expects to find documentation here, so add a symlink to DOC
+	ln -s "${DOC}/html/help" help || die
+
+	insopts -m0755
+	insinto /opt/hydrus
+	doins -r "${S}"/*
+
+	exeinto /usr/bin
+
+	sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" > "${T}/hydrus-server" || die
+	sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" > "${T}/hydrus-client" || die
+
+	python_doexe "${T}/hydrus-server"
+	python_doexe "${T}/hydrus-client"
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png"\
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}
diff --git a/media-gfx/hydrus/metadata.xml b/media-gfx/hydrus/metadata.xml
new file mode 100644
index 000000000000..0b2b3b928087
--- /dev/null
+++ b/media-gfx/hydrus/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>vaartis@kotobank.ch</email>
+		<name>Ekaterina Vaartis</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The hydrus network client is an application written for those who have large image/swf/webm collections. It browses
+		with tags instead of folders, a little like a booru on your desktop. Advanced users can share tags and files
+		anonymously through custom servers that any user may run
+	</longdescription>
+	<use>
+		<flag name="charts">Support for bandwidth charts</flag>
+		<flag name="cloudscraper">Support working around cloudflare anti-bot page</flag>
+		<flag name="ffmpeg">Show duration and other information on video thumbnails</flag>
+		<flag name="lz4">Enable memory compression in the client</flag>
+		<flag name="mpv">Support playing videos with libmpv</flag>
+		<flag name="socks">Support SOCKS proxies</flag>
+	</use>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index f074a2f9b843..a2ed9f0a5f80 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,5 +1,7 @@
 DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e87061fca61eb7d5e25d6489662fc2bae94d9a6d61d531a77f41b9e94492d0db1f32570f6d471fa9f8cb0816630d SHA512 2a9d31b9de52123941fd650123a483f4dc0757edda304da994353b5f3167bddbb25fa1ed8fededcf859c5d07b65b9c2d5185000949002a68dcae1e7bf0f1547d
 DIST img2pdf-0.4.0.tar.gz 107027 BLAKE2B 0bf13e2d4a5aff68779130bc14100a5c6d1ac4eaca9da28ceb50104550b6e4331f6a2202514bcdac0480c0148794d18e9f2dd46ded68bbaa301a207460f91c85 SHA512 bab9ee6ef5273a686cb10e52bdeb62b6df3c0da99d0f0558677e07dc7ad776c2d62829a2f5e9c5639acfb9fc6e9c5e3a81aed42dc288c2a39d245775f1d4391b
+DIST img2pdf-0.4.1.tar.gz 96699 BLAKE2B f5a41a3a3d1b1ae7caadab4f37df644ad28a3ef4bd7a56a339253f0aead4d2427f05373dcfd16b10d82a6167243b3b03906e9f95b7ae0dcdbea6a666905c45a2 SHA512 e71833250509d52b8782a8bc9e12a8de6ab7ae06d5e6e235c0b3787bfad1070b5ed90934b21e4decc9b2c7008eeb0424f9df27e44ec66259916d3a2fdb73d1f1
 EBUILD img2pdf-0.3.6.ebuild 561 BLAKE2B 2a2400caf780866c957a7f102bf587eab18fe4f3906b585d24b173b07ccb8f40e9c29844e5e40a58d8555707e0943fea7ae098f2e186133a08cbafb1e14f9621 SHA512 6d03d49992770664c2cd3cbd25e6416d07bce3b084c5ea8ef45863b6f0beb5d8d0f9d07e03ab10f2c56f373fbda308d02a98927cebae89e0d5fe9132662e6429
 EBUILD img2pdf-0.4.0.ebuild 1234 BLAKE2B 121a5c328b846954b7b10ecc4f0561677f260fdd109b672ca3d76f547cd0362cd34794f8d5b599e1d39ef226b64beb5d54669cbb4777794d112b79f9402d6df8 SHA512 4a0e069457d40140e05e4a8caca931d8da22fa0885d16f5b2ee9279ce8654ee0c1b4a77db1cdb615b1b415dae52d33f79897ead0e324379cb2a1c89206d468a2
+EBUILD img2pdf-0.4.1.ebuild 1196 BLAKE2B efc374a4b091c1f169dbf0f166ce1a753db695407150f98aca398e8569685f453263903eb8a2ccf0718dd6f06042305428a5ff4b755606838f8cbcc53e62e817 SHA512 3c7c2c21794fa6ec33b9dcf6e1d391ba5478e963d8f212d0d892fbe3fb4ae3697cff68d49eb3bfe28bddcdb75dfbbbe59a09ddf18d50f1253c5c0d213765aca9
 MISC metadata.xml 1150 BLAKE2B c2965f6da972330edd169a1503dcd77cfab0b870a5a6a3cf5727e80692088ceac35b559bb52580e50a70c1298eaa3484cecb380b912636fe5262f7c95e2dd19f SHA512 bab59fd09cd1eee4fb3f3896f9c0553a89ab878f9cb34a87efd324467712958bf5213c8e9d3d5de84b7a39d09c6e4d5dc0bc15281896c09da2858446761217d3
diff --git a/media-gfx/img2pdf/img2pdf-0.4.1.ebuild b/media-gfx/img2pdf/img2pdf-0.4.1.ebuild
new file mode 100644
index 000000000000..b4b9173611f3
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+# missing dev-python/pdfrw dependency and
+# require old version of imagemagick
+# waiting new version
+RESTRICT="test"
+
+#BDEPEND="test? (
+#	dev-python/numpy[${PYTHON_USEDEP}]
+#	dev-python/pdfrw[${PYTHON_USEDEP}]
+#	dev-python/pikepdf[${PYTHON_USEDEP}]
+#	dev-python/pytest[${PYTHON_USEDEP}]
+#	dev-python/scipy[${PYTHON_USEDEP}]
+#	<media-gfx/imagemagick-7.0.0[jpeg,jpeg2k,png,q8,q32,tiff]
+#)"
+RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	gui? ( $(python_gen_impl_dep tk) )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+
+	# Remove gui executable if there's no demand/support for it.
+	if ! use gui; then
+		sed -i '/gui_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	epytest src/img2pdf_test.py
+}
diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest
index 99e16c1c75a1..67e37f2a58fc 100644
--- a/media-gfx/jp2a/Manifest
+++ b/media-gfx/jp2a/Manifest
@@ -1,3 +1,3 @@
 DIST jp2a-1.0.6.tar.bz2 306975 BLAKE2B 284925e791423a1871347f8dfc9574c209192c8a583a0b3221142adb35ad32c2d00a47412c85df038237f4e1adf604324fb15440c33ca06290ee382fd90930ff SHA512 00c7f7b62a3d1f4238d7513167eebd6ead9447ac90b66fd3f9529f6e99dd1a021385ff970aabd005a88db1614636be57547494dfe00c7e687a11953066a6ecce
 EBUILD jp2a-1.0.6-r1.ebuild 526 BLAKE2B a160c878c48b3cad1f39de403b5bdb1287af5eb913a66bc8be06d52a906ba44d038595a4b4d242594eca23b3849209740dee6c9c7cf95c167b9a705b75562678 SHA512 01792bef0209bdd3c5f6161b29b0e421aa70eece0312ae7573f903d4b692cfd393f721b7b7dfb261e0b88335127c38b3b4f2c0c3074acf451015d9f54eb960d4
-MISC metadata.xml 329 BLAKE2B e3d5c2031cac3a1017505e8298894dad149c0e00e63e2c50876c2ab5d1ab5817232971d107356ecd54ced58c1321d743f4eabbba3be412e0f048128aa41e6314 SHA512 c86c3d7a051e7b1b89fbaa8315f073490e5fbfaeac9cbef1551d453d485f52cc4f1a664e5ec14be9b751d7771780e4a8a891bc0d6558c3154e9d3b04835a63b0
+MISC metadata.xml 246 BLAKE2B 9c836b45597472ea38d4c1bbf8edb43ce8e8749521e814657b15ca2af6f958f896eb0099af318b4a3afb9726f2936ccacfa882cff134d0eb7ff3cc924c3e5058 SHA512 0b7150343e173da9b52971752e9ebd776810dc6cc55f60bb3c9bf3d9517ec03b9998e2747f0779d5259d24db6bf38be8017fbe942b86a1203dddd3c0cf368ca3
diff --git a/media-gfx/jp2a/metadata.xml b/media-gfx/jp2a/metadata.xml
index a8764429bc70..d5e9d1142faa 100644
--- a/media-gfx/jp2a/metadata.xml
+++ b/media-gfx/jp2a/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">jp2a</remote-id>
   </upstream>
diff --git a/media-gfx/libredwg/Manifest b/media-gfx/libredwg/Manifest
new file mode 100644
index 000000000000..6862634c78e1
--- /dev/null
+++ b/media-gfx/libredwg/Manifest
@@ -0,0 +1,3 @@
+DIST libredwg-0.12.4.tar.gz 18318912 BLAKE2B 21ff443881c19782c747ddf880eba23090295432edf4367161472aeef970e1b93983967e667ca2c3e140bf0b97e7b238bbe4a342815df365cee10bde83a04178 SHA512 df9424f475be512a6e9e02a1156a7d6a966f684f5753f420843593ee9dc236bd33bd10dbd627bab1b9adab9b8e7cb3a6b464c15e643ae755bc7e11974c05cd7a
+EBUILD libredwg-0.12.4.ebuild 1890 BLAKE2B 12511d396de500179724a8b26b42fa4f2e280b7d12c8101c21843e2654e6c585eb03349355b29e21bdf76136dac76ed7484b14aead21d57d0de72078f69502ec SHA512 8d77ddcfbbdd6d33122af2263ee8a0536c06e349833a0e28861094fa395cfcc57458104376b7bf50ef79439963515150bd3d7eefb7b8825670aec9ce264fbb30
+MISC metadata.xml 405 BLAKE2B 41ee7b222f85ca930fcf5d84f8c75dc99a72f9fe32457b3384fbd4f58606949438d2371d182af0256637cbfd6e20f008d43cd8608e4d9f9b392709ac2276bf79 SHA512 107e0c7e4c27421bcbea9aa7784c1bc1bec84abd27602621a9d17ed62555324d584769994ed13dec8856ecc9955dba1b2080315a46c494a3c0cc4e0b62ffdd83
diff --git a/media-gfx/libredwg/libredwg-0.12.4.ebuild b/media-gfx/libredwg/libredwg-0.12.4.ebuild
new file mode 100644
index 000000000000..f6d7f18dea12
--- /dev/null
+++ b/media-gfx/libredwg/libredwg-0.12.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DOCS_BUILDER="doxygen"
+# File is hardcoded to be run from ../ so we use this instead of DOCS_DIR
+DOCS_CONFIG_NAME="doc/Doxyfile"
+
+inherit docs python-single-r1 perl-functions
+
+DESCRIPTION="C library to handle DWG files"
+HOMEPAGE="https://www.gnu.org/software/libredwg/"
+SRC_URI="https://github.com/LibreDWG/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# https://github.com/LibreDWG/libredwg/issues/342
+RESTRICT="test"
+
+IUSE="debug python perl static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	perl? ( dev-lang/perl )
+	dev-libs/libpcre2
+	dev-libs/pslib
+"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	perl? ( dev-lang/swig )
+"
+
+src_configure() {
+	perl_set_version
+	local myconf=(
+		--enable-write
+		--enable-dxf
+		--enable-json
+		--disable-gcov
+		$(use_enable !debug release)
+		$(use_enable debug trace)
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(use_enable python python "${EPYTHON}")
+		$(usex perl "--with-perl-install=vendor" "--with-perl-install=no")
+	)
+
+	if use python || use perl; then
+		myconf+=( --enable-bindings )
+	else
+		myconf+=( --disable-bindings )
+	fi
+
+	econf ${myconf[@]}
+
+	# Fix variable references itself error, fails in src_install otherwise.
+	# Can't put this in src_prepare and use eautoreconf because eautoreconf
+	# only works inside a git repository for this package.
+	sed -i -e 's/TEXINPUTS = "$(TEXINPUTS)$(PATH_SEPARATOR)$(TEXINFO_TEX_DIR)"/TEXINPUTS = "$(PATH_SEPARATOR)$(TEXINFO_TEX_DIR)"/g' doc/Makefile || die
+}
+
+src_compile() {
+	perl_set_version
+	emake
+	docs_compile
+}
+
+src_install() {
+	perl_set_version
+	default
+	use python && python_optimize
+	use perl && perl_domodule bindings/perl/LibreDWG.pm
+}
diff --git a/media-gfx/libredwg/metadata.xml b/media-gfx/libredwg/metadata.xml
new file mode 100644
index 000000000000..a65951be2662
--- /dev/null
+++ b/media-gfx/libredwg/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LibreDWG/libredwg</remote-id>
+		<bugs-to>https://github.com/LibreDWG/libredwg/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/mscgen/Manifest b/media-gfx/mscgen/Manifest
index 4f2224b872ef..ce2f8d8f2eda 100644
--- a/media-gfx/mscgen/Manifest
+++ b/media-gfx/mscgen/Manifest
@@ -1,3 +1,3 @@
 DIST mscgen-src-0.20.tar.gz 204818 BLAKE2B c4ae701ead1ec5845ea80e1fd19b88ff77e3cf2f462c843a2561cf06a5a3faacd8fcd891031256f9014b069ccae02c82221b3b6bb173a68aa747fe7051bc2225 SHA512 12fdea38633a42d6d235520550b16bea0cd3fb67d198b1f956845f4057239d7f80fa961e37f6f8bad9fb03f29ff8c6ffab4f4ae7402eea3083dfddeaf39687e3
-EBUILD mscgen-0.20.ebuild 834 BLAKE2B 402b2e18d34beb0fc7db68865024a6db50bb82591b8df41435285bce15c1c2a609451f96a1256c4eec7e75193d0407895c5393f06fad762003744621f44f0532 SHA512 d66d519ee8c18edbba470f26f7a1db5be583bb199b079821243a9cbd34bf32bf051b43f5274d77da4c0a9ce90b86d9e4ef2428838a23279b066118648aab278e
+EBUILD mscgen-0.20.ebuild 915 BLAKE2B 79c5c96f43223038f634433d258c969d0a246313fae56cf2f8ede2b5408a462522d56480663eab951f3bae62a294339d5a89239ada845526eb1394b58efe720f SHA512 536327dd9a5fa3cd54ca0b80539b4012ba6d19f14bece72a27e382dca5ad7fb93b6a43163e0379412552ff75ed3fe955fb5936c6a564464fecf0b736e0755cb0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/mscgen/mscgen-0.20.ebuild b/media-gfx/mscgen/mscgen-0.20.ebuild
index 974df47549b7..fa0e6c4a4a2c 100644
--- a/media-gfx/mscgen/mscgen-0.20.ebuild
+++ b/media-gfx/mscgen/mscgen-0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,12 +14,16 @@ KEYWORDS="amd64 arm ppc ppc64 x86 ~x64-solaris"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="png truetype"
+REQUIRED_USE="truetype? ( png )"
 
-RDEPEND="png? (	media-libs/gd[png,truetype?] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+RDEPEND="
+	truetype? ( media-libs/freetype )
+	png? ( media-libs/gd[png,truetype?] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/bison
-	sys-devel/flex"
+	sys-devel/flex
+	virtual/pkgconfig"
 
 # Workaround for bug #379279
 RESTRICT="test"
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index daf64f4379a2..1aaa8e5ef1cb 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
-EBUILD scour-0.38.2.ebuild 709 BLAKE2B d91839546133e6cf088d15186564d367ab3706b52258104f6191cb4c7b2b5748b79194112db2b14bd9a8d4a52ab2332fc97172ea9b7738a8f26cb3192ec17500 SHA512 1ae91e01a60e683209fdbc19ab8426156f586518acc48c52efc672290044bf07c7c8c44ec36aa1b4bc3267cc8ab4c961053976522a24582446e28a95c5a829ba
+EBUILD scour-0.38.2.ebuild 715 BLAKE2B a774b0e84b580c9662521a8006ccbf242b86c9f948249a4c9af36d17a24fce9ff3286a0eb6b4d457eaef88ed642212ce7582e7109bb97d931e509c189a3638b5 SHA512 570b328744316789daf592262e1718c390ff4549b5b8ddf7a176361239a25e67ea53c3e0601d3ba4917026be7a26efa239897822ded2c3b6d628c7ac357314e8
 MISC metadata.xml 193 BLAKE2B 7acb137a1e8618cd92414ef5f9b789a55acfd26c37e7cf00181c62dd8471e217e97670719fd5d6c00834cadb75a5ad8c8cac7fd06c87ea61551d77eb8af1e6e2 SHA512 e34d92e02e423c37397982d7865e381b6eacd66dec5dd4e360697cb8ea326638ca3b2b88c23277f7fa6248ed31081e2938fbe6fc5178ffc52bdc4798c027341b
diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2.ebuild
index 7e6fca0b8290..434b45dc49da 100644
--- a/media-gfx/scour/scour-0.38.2.ebuild
+++ b/media-gfx/scour/scour-0.38.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index b33996128339..2d8f47ed6b40 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,3 +1,5 @@
 DIST shotwell-0.30.11.tar.xz 6499416 BLAKE2B 8b63b2ff64ae41560221d9bcca2c88d0dff8c40416278d3344dbdbf50e4352e999e3ae52ea9fbcc871d5023ffeeb6ee954ee91a2d7eddc1a8f1df45dc4e12cf8 SHA512 71a057aa1ae2b432f385e174429e29f46ca29055aa6003b6017f3da54551027536c70e9f8ca605719e8e008233bdb6f17981462a54495d91e94aebdbe5718c9f
+DIST shotwell-0.30.12.tar.xz 6519996 BLAKE2B 7417f1bf0057b4974b45be675b177f6fba232d60d56c3d98cc6d5a7a95a31281add5190a04eab965739759aa7d826515996f2fd62350352a54ebf969dc732d95 SHA512 3274f15969be7f75ad2fa44e78773b76e11ee6cf8d4990c7f658fa8ce7e84a8fa5f06542fbab4b585c70e41c097c7b07ba702540102e4d0dfca8e927e00180cf
 EBUILD shotwell-0.30.11.ebuild 1769 BLAKE2B ce81642084c5b8ac1b41b72842ac4c798ab3a2a136e95f899735bd4dbab8d013809c1a0b6139f366b2f0e6a76d7a26a314b80ea453405e2a2f4eb1dbfd2e5d3a SHA512 e8aab87360f510ee71ae3b06f9904a7895223ea31ec1b7a5e29f9f8238668e523d5654bad84c4f459fdad78cc6853f4478994c2383535b834c342a4c6469e081
+EBUILD shotwell-0.30.12.ebuild 1771 BLAKE2B 301664fc4c7ee4412d7f026ecb18a0acba139aeca6b84c64d2f76fb9f3d86b8fe421369a47cbf8f706e6961cbb1785ec3dbc7577363c2f193efdff459a52f572 SHA512 788ac87b1fc37afb3e14848279311be0886093559fde326ca738e2421dafe0e1394977309fe752ff014156ac914e6ae8716569d3f5e8e55b8a84f54a9ddec296
 MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.12.ebuild b/media-gfx/shotwell/shotwell-0.30.12.ebuild
new file mode 100644
index 000000000000..3397e5e68673
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.30.12.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+IUSE="opencv udev"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8
+	>=net-libs/webkit-gtk-2.26:4
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=dev-libs/libgudev-145:= )
+	>=media-libs/gexiv2-0.10.4
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16:=
+	dev-libs/libgdata
+	>=app-crypt/gcr-3:=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-2.3.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:2.4[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity-support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		-Dextra-plugins=true
+		#trace
+		#measure
+		-Ddupe-detection=true
+		$(meson_use udev)
+		-Dinstall-apport-hook=false
+		$(meson_use opencv face-detection)
+		-Dfatal_warnings=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 8f224005bae4..c84ab278c256 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,7 +1,4 @@
-AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
-DIST simple-scan-3.36.7.tar.xz 914572 BLAKE2B dee363c08b0454bc6a4990fc14831069162f74365549a081421c286658cce130957b91030558d1232c979601be00e955996f702e8bafeeeb30710b89ee3e42c0 SHA512 ff0dd82d0db30dbfacfd8b04d7bcbc0599c1b1b47f845e1176ec7ffce0aa44253735431c2c531ef428dae0cee80818acfbba4fb2514f501623c0c0242aa8a7a2
-DIST simple-scan-40.0.tar.xz 1469740 BLAKE2B 120da2785066abf010b7f5a1dba902f596f28f7b89f667dc00c8117f36b94688ef3d1582bdd47aa93e42d6a4946a71ef1b475e482a660e708e06fbb050741f0d SHA512 978c11b789219cb08a961b1bc1428150d023e823ee1f7fd39a3bee714f0079e25559a918ef98f42a464f8a22f4a93a59893b7b4c054dc28d343479d3fc593d8a
-EBUILD simple-scan-3.36.7.ebuild 1325 BLAKE2B e5a2408a96d33bd695c4c071c6cd449bb6319f3718eeecb2f3813c76280168815ed02fad0ea2c45018500d1abb43d2aa61c7e07cb7964dc2b4549605d63c3425 SHA512 bf91d3186657701c3bdee611373879f86ed02ddcc4697c46528d68536435c09ee21b6cf2b22735131d7032b636cd86be717aeeef25c437ce9b9c38005ef2b361
-EBUILD simple-scan-40.0.ebuild 1448 BLAKE2B 413062a72b35d163c7c99d30687687da6ffadcbf7c22b3497e70ef2311bbdf4035c859649493ffd92d92099f105f2771b68d72474810fcfc2250932904cd8a84 SHA512 5bf293d0e9f8284d5fe75ca1211dccc2651c1560d42646bf8b887ca767c2abeb4a7d47624057d57eea3beb336272c74e8cc7e0cd9d8561a87f4162aa611c72ba
+DIST simple-scan-40.1.tar.xz 1471116 BLAKE2B 4e9071c497cf47600cef7dcbf4c47dff6f8cd8cbd8a72ae45e4ac68b749f5fc89d0e97912e174cab02959efe2e30451403ab0336221ead44fc87747dbe4e29e1 SHA512 1ccd512ce84ed0d2f97f4e2e5220a2e8a850e575cb9dac58ef446f8cc37575a72a2e80ffa240874532433667225b632cd1dd4e68f66dae3dd26be118f3ec21cf
+EBUILD simple-scan-40.1.ebuild 1444 BLAKE2B 035a45eec8130dad0ea1abf7947b3249f6977d5836b2590bd10478e4220265d8428b12323faa874430e11ffc6759aabcb65a0e7dd852408d88f69d7c964c8cb6 SHA512 4721404d5f5a89286d3113a6e2ebbc2bf82787bc54ad19c3f11042ec44ef780304fd523e484f2353de9a017155695675245c04df33b0c61da8ed3282b55ce832
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch b/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch
deleted file mode 100644
index 868ef9a76a1a..000000000000
--- a/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 02845c57b2bf1b6170efb57c59db5ea0a2b60091 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 30 May 2018 08:44:18 +0200
-Subject: [PATCH] Add control for optional dependencies
-
----
- meson.build       | 18 ++++++++++++++----
- meson_options.txt |  3 +++
- src/meson.build   | 12 ++++++++----
- 3 files changed, 25 insertions(+), 8 deletions(-)
- create mode 100644 meson_options.txt
-
-diff --git a/meson.build b/meson.build
-index cd2e452..f39ca51 100644
---- a/meson.build
-+++ b/meson.build
-@@ -25,10 +25,20 @@ zlib_dep = dependency ('zlib')
- cairo_dep = dependency ('cairo')
- gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0')
- gusb_dep = dependency ('gusb', version: '>= 0.2.7')
--colord_dep = dependency ('colord', required: false)
--packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false)
--webp_dep = dependency ('libwebp', required: false)
--webpmux_dep = dependency ('libwebpmux', required: false)
-+
-+if get_option('colord')
-+    colord_dep = dependency ('colord')
-+endif
-+
-+if get_option('packagekit')
-+    packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5')
-+endif
-+
-+if get_option('webp')
-+    webp_dep = dependency ('libwebp')
-+    webpmux_dep = dependency ('libwebpmux')
-+endif
-+
- sane_dep = dependency ('sane-backends')
- msgfmt = find_program  ('msgfmt')
- itstool = find_program  ('itstool')
-diff --git a/meson_options.txt b/meson_options.txt
-new file mode 100644
-index 0000000..570ecdd
---- /dev/null
-+++ b/meson_options.txt
-@@ -0,0 +1,3 @@
-+option('colord', type: 'boolean', value: false)
-+option('packagekit', type: 'boolean', value: false)
-+option('webp', type: 'boolean', value: false)
-diff --git a/src/meson.build b/src/meson.build
-index 9e40e42..83ca3a9 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -4,17 +4,21 @@ resources = gnome.compile_resources ('resources', 'simple-scan.gresource.xml',
- 
- vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
- dependencies = [ glib_dep, gtk_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ]
--if colord_dep.found ()
-+if get_option('colord')
-     vala_args += [ '-D', 'HAVE_COLORD' ]
-     dependencies += colord_dep
- endif
--if packagekit_dep.found ()
-+if get_option('packagekit')
-     vala_args += [ '-D', 'HAVE_PACKAGEKIT' ]
-     dependencies += packagekit_dep
- endif
--if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord
-+if get_option('webp')
-     vala_args += [ '-D', 'HAVE_WEBP' ]
--    dependencies += [ webp_dep, webpmux_dep ]
-+    dependencies += [ webp_dep ]
-+    # Webpmux only required if colord
-+    if get_option('colord')
-+        dependencies += [ webpmux_dep ]
-+    endif
- endif
- 
- simple_scan = executable ('simple-scan',
--- 
-2.17.0
-
diff --git a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
deleted file mode 100644
index 69bdf0601327..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.22:3
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
-	webp? ( media-libs/libwebp )
-	>=media-gfx/sane-backends-1.0.20:=
-
-	virtual/jpeg:0=
-"
-# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/3.26-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/simple-scan/simple-scan-40.0.ebuild b/media-gfx/simple-scan/simple-scan-40.1.ebuild
index 05268ac37b55..edb7364a65fc 100644
--- a/media-gfx/simple-scan/simple-scan-40.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index 2f27df705ca0..e74512568593 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,9 +1,5 @@
-DIST waifu2x-ncnn-vulkan-20200224.tar.gz 34063828 BLAKE2B 9fa00abd31f0d81dd785be5253e44f5bd4082ae9b2fcae747562eb6c577fd7cccdfeaf7421d09c54119fd36285dffcc68d2889ddc06d1a6ddf47ea418066367e SHA512 13531a186817da99efb60fc0b16d0d3f455d0f2d2c9b4b53ddaedf7c50f622b2e5385e4f5dd29668cf845444b39645f0b7e810ab5084aa1e3ca6dbaf424a4e13
-DIST waifu2x-ncnn-vulkan-20200414.tar.gz 34063752 BLAKE2B eb52cc3cf857bdb428497acf8721d51abd6e067b4ae2f126833dfcf8402eae118cfa112b310b366e3e945b871b8c3306e5d826426c43e66b6e1055729644f222 SHA512 c0c5d40fdbf0b643b589d5bca5460ec59fbf38ede33af510c4b30b3211f18cd44d665980a11c13ee922cacf7a05d89b076078bcb8fa59c0523ad6b985a804d97
-DIST waifu2x-ncnn-vulkan-20200818.tar.gz 34073325 BLAKE2B 125c0b975e6aab20fc20563c1edc669a4741779366f9aff20d0f695f56f29d0e1728c1fd1130cdaf4adb6a2c8dad348e262580702519004581b2055ae38ac315 SHA512 6f40885fd91cde3206198da3bf2103d1867a8f35549340cc697819dea2b3e06932203a95a7fda2c636658b40fdc1d3f0f4c4e3e13ba142f9a8ad8475ff1b8f58
 DIST waifu2x-ncnn-vulkan-20210210.tar.gz 34076481 BLAKE2B 821b59d5e681caf4bbdeb0e3576a6df0e257a0f8fdc68c3f4152c5f35cb2d288245051dce874e009af6556b4c7e4fffe1fa261872baf2493e056a78c847acc0d SHA512 56ed4dfda71054f3ebfd6c4c11bcb9351a676ace8405cdc309bd16d18eb65ad0fd230fb943a0ba1dcb3afdb517e7f86bf6df2eadff6e754d296304135cd885be
-EBUILD waifu2x-ncnn-vulkan-20200224.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
-EBUILD waifu2x-ncnn-vulkan-20200414.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
-EBUILD waifu2x-ncnn-vulkan-20200818.ebuild 1045 BLAKE2B ff8530866c99de62b34a885361e10616fa54b8689d9e690941ac01397bde024204ac70801109b0b945afb28086c17a2ee33ff9284b62528d2f95c3d399e0f560 SHA512 7115cf9671e25838e1d160c55e552ba0e405584c961549c728a2f86481a062b88f02b11bb7d46f6d5a30057d19497ad49572a1a1e18a53bc455324a499351acd
+DIST waifu2x-ncnn-vulkan-20210521.tar.gz 34076523 BLAKE2B d04c3ac1152be899292730fe06f317c92f1334ea3f91cc6208444574c271d401152b4432bf5293f7193f0c318ca1685145754dd78ad0a8523aefa0fd56d40b4a SHA512 b1a0202a94deb9faadda34c5d46bceabec7ee00960676ca98090af4101bb63648fdc266cc608bfc621a3ec65c8c5f9503a02a4db4e51e9b2048d574c7a7f368a
 EBUILD waifu2x-ncnn-vulkan-20210210.ebuild 1045 BLAKE2B 6a82c95e27af54e06e38adc6616612f276a12a2510516c2a166b95872f63a0b33e4a764bb0293184bb87b9c14f9d6570ce321a090266037b35f7c13ec990bd55 SHA512 d18ebedcdd5ef779c75ac2281b3f787309b74710d38c3d36da3e723bcc22243b216a3fa63fefc760b12a5d70c191511302e919aa8e513f88ae7eae1121358ab4
-MISC metadata.xml 342 BLAKE2B 718aec175f149d204eb6afabb3a2a59e47366538f16d346a1baeeae03afdfb68bd4c5c39d642af862400f0736644141eb156b43014f4125df61a0b9979bdb83d SHA512 a9b596ab9b9e2bd6052bbb11d7b19e2b6a4fbf69935345498cf5f5fa4934731bfccaf3e3391da0260e6f165198f71545ae8f86b1b01b8507fb9b003cd7e56809
+EBUILD waifu2x-ncnn-vulkan-20210521.ebuild 1107 BLAKE2B 83be2724db19d19ae98b403949d38573e825234a74e8709d4deecbebdbfbe2b002af5eb1a9bbae57ebe959e2294eac4810ad908d417f4523fabb456e1e73cf33 SHA512 06521bb7ab249d3bed620343d34b7a869b2dc8b8e847c577bc66d3a7d2aa28e359efe3c9defec17d9b3c4d282ef3975eb3125c64a8ba32b63b7d25f3d1ec6720
+MISC metadata.xml 464 BLAKE2B ac1978d9a9aa3202c24dedf74bc70aa2956396c89da177c2d63bc3f8f0cbb50fa74a991c887bf5cdc75733bd7d3ffdc0ee4d96fffadae2e9f657d3799c05af7a SHA512 278b4b063cedc5d27b208bb055e54bd2261e0265c09b6046b25af1c448e9b60eef925889986aad5bb1c7c9670ea9eb82652c249f6d585bd29502565e2943f177
diff --git a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
index 7c9fd1249e8c..6dafc8f991c6 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
+++ b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
@@ -5,6 +5,10 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nihui/waifu2x-ncnn-vulkan</remote-id>
 	</upstream>
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild
deleted file mode 100644
index 77225416ea89..000000000000
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="waifu2x converter using ncnn and vulkan"
-HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan"
-
-SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/ncnn
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-#S="${WORKDIR}/${P}/src"
-CMAKE_USE_DIR="${S}/src"
-
-src_prepare() {
-	# Make finding models actually possible.
-	sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp\
-
-	cmake_src_prepare
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
-
-	insinto "/usr/share/${PN}"
-	doins -r models/*
-}
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild
deleted file mode 100644
index 77225416ea89..000000000000
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="waifu2x converter using ncnn and vulkan"
-HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan"
-
-SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/ncnn
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-#S="${WORKDIR}/${P}/src"
-CMAKE_USE_DIR="${S}/src"
-
-src_prepare() {
-	# Make finding models actually possible.
-	sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp\
-
-	cmake_src_prepare
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
-
-	insinto "/usr/share/${PN}"
-	doins -r models/*
-}
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
index 5800b9b7f2e3..3079c5c096f0 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
@@ -7,37 +7,36 @@ inherit cmake
 
 DESCRIPTION="waifu2x converter using ncnn and vulkan"
 HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan"
-
 SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
+# Pin dev-libs/ncnn near bundled copy until more stable.
+RDEPEND="
+	~dev-libs/ncnn-20210525[vulkan]
+	dev-util/glslang
+	media-libs/libwebp:=
+	media-libs/vulkan-loader"
 DEPEND="
-	~dev-libs/ncnn-20200727
-	media-libs/vulkan-loader
-	media-libs/libwebp
-	dev-util/glslang"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-CMAKE_USE_DIR="${S}/src"
+	${RDEPEND}
+	dev-util/vulkan-headers"
 
 src_prepare() {
-	# Make finding models actually possible.
-	sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp
-
+	CMAKE_USE_DIR="${S}/src"
 	cmake_src_prepare
+
+	# Update all paths to match installation for models.
+	sed "/PATHSTR\|model path/s|models-|${EPREFIX}/usr/share/${PN}/models-|" \
+		-i src/main.cpp || die
 }
 
 src_configure() {
 	local mycmakeargs=(
-		"-DUSE_SYSTEM_NCNN=ON"
-		"-DUSE_SYSTEM_WEBP=ON"
-		"-DGLSLANG_TARGET_DIR=${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+		-DUSE_SYSTEM_NCNN=ON
+		-DUSE_SYSTEM_WEBP=ON
 	)
 
 	cmake_src_configure
@@ -46,6 +45,8 @@ src_configure() {
 src_install() {
 	dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
 
-	insinto "/usr/share/${PN}"
-	doins -r models/*
+	insinto /usr/share/${PN}
+	doins -r models/.
+
+	einstalldocs
 }
diff --git a/media-gfx/word_cloud/Manifest b/media-gfx/word_cloud/Manifest
index 60f7c53ecaae..d6cbf7b2fbed 100644
--- a/media-gfx/word_cloud/Manifest
+++ b/media-gfx/word_cloud/Manifest
@@ -1,6 +1,6 @@
 AUX word_cloud-1.6.0-bundled-font.patch 238 BLAKE2B 0c62c4e8d76b3f5beb5e7e031bf25727809e2cf3c4c5954dfd748a0c60d1c118531321664c146889c88f8652c9a0ef05e1fc63c06bcac97719f6db937af6cea1 SHA512 f28a37c1c48ea878c6ba702a5bac100c6204b4f2ce9452cb93f37da62b0bf961e78f3ac082a6d1fd238da362f9019e29f337c6bc6f01e65749e2a836c7d6963e
-DIST word_cloud-1.6.0.tar.gz 27524706 BLAKE2B 751b78fca97ec6e93c6a766c5b960dbb5fd91c012637e9c905ef96eea0dc60882ef1604a9868cfb3ca91a2c9ac6f50132ad5d820e6dd52114e68112bbe6decb0 SHA512 cb67570e2f6206c92316ef398382703b4ff0f1740688cd4a9ec66a093a663e903da66daaef666d634a7fddc5ec19da859d706693940a963a3bf58c52e9054056
 DIST word_cloud-1.8.0.tar.gz 27691477 BLAKE2B 26f1a9da8382fb1865d939bf87ed91911a1d5c1f0c38294d514e9ca9917d4293a9c8c7bb304fe68889127becb01eca77c0fc5e1d3588b9a5015971afee4f8aba SHA512 25b30b88953e8aca8ec5c7ce156fd1519c3b10e7d9dd0160d22136513ae28be9eed8bcfcbca0292879c43a115b2b7eac8324640590d571aa27549973fa8b98c5
-EBUILD word_cloud-1.6.0.ebuild 619 BLAKE2B 44b4d7af2136bd2dab1bdcf0294e222b2c62754f9956c4a5bba72c59576d98dfed2843eda17822ffc14eb4a4dfc61be9ae545dc7b172af4bcd4de667c4eb4266 SHA512 7847c0b92ad53c890d26570039eb4fa1860133f537435101f12941df3599a58093a15029d72556341b505f11ecc4637c54880661ee6873c68981a6ce92ca2a23
+DIST word_cloud-1.8.1.tar.gz 27693428 BLAKE2B 5eba31fb89497e94166ac65e12944d13bc4cff9e01f4c4fb5932079ddfa160b287fe780eb25f7fb815e3d334757bd795b41c44f951e964fd6369981be97190a8 SHA512 76feef59e1c270a17152c69d0c531c5982cdb037c6c13da3823274113cfa7a10f1f31406fc8fdc9bfba6b05bb3b7f308926657f9bd5c96398fbc5ce8499c041a
 EBUILD word_cloud-1.8.0.ebuild 630 BLAKE2B 6a01d221fe6d4cb210c804549fcf60d137be53d5a64856de47ce05a9660a937465394c084d30f732b07dd4c1e8cb40fb8aed7510aaa19ecab20ce38349eca8e9 SHA512 1a9bb92ee89f2ebbb4b4160e049a1decd6e5fa408ef4a82c974f67670b96314244a42a18692a6a64854ada4a8dd4b22cbb5c5544c8c26ba9f93ef49086b7fc1f
+EBUILD word_cloud-1.8.1.ebuild 632 BLAKE2B 21197e36c7293a5391250a276243913af19fd05a38192ef6658a972448eb096438119c9e6c6d2708fbbf7453c0f6bd461e0b0d279f1444ad22362cb42400e9b0 SHA512 03250132be775fdf73b214a566dd15f3b9cd43d794a1c2aa87eac281cda527f5d61defd68cc512759d9193593ee9a0bf01f30853c89dbba1e1d92616aa03db63
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/media-gfx/word_cloud/word_cloud-1.6.0.ebuild b/media-gfx/word_cloud/word_cloud-1.8.1.ebuild
index 03cc7ef9b3e9..566b07c3986f 100644
--- a/media-gfx/word_cloud/word_cloud-1.6.0.ebuild
+++ b/media-gfx/word_cloud/word_cloud-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
@@ -21,4 +21,4 @@ RDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	media-fonts/droid"
 
-PATCHES=( "${FILESDIR}"/${P}-bundled-font.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.6.0-bundled-font.patch )
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index fb8671fddc59..983242583388 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,10 +1,6 @@
-AUX xpaint-2.10.2-libtool-clang.patch 416 BLAKE2B 021018cc53dd726cc943cf316a69c3e9717f08e3f15de2c3acac0343a1ef1ee519d497cb8e497d432c4dfe9d68b06f67dade7c5992ba6fae318025759255aad5 SHA512 79eaa418eaab3253149d9ddfc7214af03a222ab406f85711600bba2d2b79f56c13c7c35abfeabba172b073896558a6445f5cfc26f97b8f501b2a0e08043c50b5
-AUX xpaint-2.10.2-respect-ldflags.patch 936 BLAKE2B d91ad744ec49ba4226255050a38bd6441f2087868e1f3f542c997736663a822f26c1f5ff4fdd8ae7b1c39581a3627bad28ec8743611f4366879b77397e0b5922 SHA512 9a2de804b7b940fd8a58bb1d0780cb05ad206560c224fbb007cf23f628a5ebeb37cc9cca39b1be4e33aaa5611bd7a7f5aab6267e07d2e11b667007d505f8debf
 AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d
 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
-DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614
 DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda
-EBUILD xpaint-2.10.2-r1.ebuild 1627 BLAKE2B bcc7cc7bf254149c0a86633644700b4b2c109913f9c5c1587bff6d83a4a16db876975910b8e61c55a6fe6b79790eb709ddbb13aea7fa61da9e5b1ace2608aacd SHA512 869b6bcf1cf93fa0a64663bdaf38cb18aa0258005767bfc2087440f2acc9b506e824526d1684fb151a6220bc30d33cf545188aed0b52e40217078e952d7cd716
-EBUILD xpaint-3.1.3.ebuild 1897 BLAKE2B bcb42a0d09a8bbca4579966ab89e9abb101140e54944600fe7f6fa7e718fce557a13b3a212179fe880e8357a83e1c9ce08a600d391296fe67e139581f252ae3f SHA512 150c481b08f0348d9055dd9063648483b843616b69d2debef5cd4347fe1569708768c43791fa2243e9e9c5ae11aecbe958010983e1a1bdf6a005268dceb9ab31
+EBUILD xpaint-3.1.3.ebuild 1941 BLAKE2B 5e739c74c5341e48c973cb0786b96f56724ea602cf463855d2e587ce67a5437620585bfa84b8b6de2707c882453c43e3f1181e3f76fae69ad6ca73725d60caf4 SHA512 3b073c54cc13783430d34d6777eab200953dff07d01c529fc6ba1a5ff21de390a98758b588388fcc217c06783f335033f2de71275961b5563d68aa231fdc7dbf
 MISC metadata.xml 1439 BLAKE2B ca0b1f7ca10f9329bd535358cd6d683bdcbb793277a3c494c50b86d6e5a85691f2ebaefcdac49b5fa5dd610ebca07d30c16f9045db0cbb079dde142fadca4dae SHA512 74c75e26fa1ba697c15dee5c76048c99e104fff2492194ef71ebbe472c15790a5ca2a28f1ee2697b8c0dea1ff7b2e36947e52b03a9d885a338687353d6c555d3
diff --git a/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch b/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
deleted file mode 100644
index d6a3dab07830..000000000000
--- a/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-libtool doesn't work if compiling with clang.  Need to add --tag=CC
-See bug https://bugs.gentoo.org/731010
---- a/xpaintrw/Makefile.am
-+++ b/xpaintrw/Makefile.am
-@@ -25,7 +25,7 @@
- 
- xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
- 
--LIBTOOL = /usr/bin/libtool
-+LIBTOOL = /usr/bin/libtool --tag=CC
- AM_CFLAGS   = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
- AM_YFLAGS     = -d
- CLEANFILES    = 
diff --git a/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch b/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch
deleted file mode 100644
index 11a0b0e9a84e..000000000000
--- a/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The original Makefile did not pass CFLAGS and LDFLAGS
-See bug https://bugs.gentoo.org/727632
-Also remove -O3 and stripping, leave portage control that
---- a/util/Makefile
-+++ b/util/Makefile
-@@ -10,10 +10,10 @@
- endif
- 
- pdfconcat:
--	$(CC) $(CFLAGS) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
- 
- ppmtops:
--	$(CC) $(CFLAGS) ppmtops.c -o ppmtops
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ppmtops.c -o ppmtops
- 
- ifneq ($(WITH_PGF),no)
- pgf2pnm: main.cpp pnm.cpp
diff --git a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
deleted file mode 100644
index 425586764ea2..000000000000
--- a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop toolchain-funcs
-
-DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pgf tiff"
-# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	x11-libs/libICE
-	x11-libs/libX11
-	>=x11-libs/libXaw3dXft-1.6.2c[unicode]
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	sys-libs/zlib
-	pgf? ( media-libs/libpgf )
-	tiff? (
-		media-libs/jbigkit:0=
-		media-libs/tiff:0
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libtool-clang.patch
-	"${FILESDIR}"/${P}-respect-ldflags.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tiff) \
-		--disable-libopenjpeg
-}
-
-src_compile() {
-	# clean up
-	emake clean
-	emake -C util clean
-
-	# parallel make still fails sometimes
-	emake substads
-	emake xpaint.1
-
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		-C util
-}
-
-src_install() {
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		DESTDIR="${ED}" \
-		-C util install
-	doicon icons/xpaint.svg
-	make_desktop_entry "${PN}"
-	find "${ED}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
-}
diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild
index 6c62608de446..1c03f7e9b5fb 100644
--- a/media-gfx/xpaint/xpaint-3.1.3.ebuild
+++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pgf tiff"
 # jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
 
@@ -95,8 +95,10 @@ src_install() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /media-gfx
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)