gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-gfx
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
247 files changed, 1717 insertions, 1781 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9532b0068c45..eebb57307a89 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index 315d0d9d18eb..e6e15d4265e9 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -3,4 +3,4 @@ DIST album-4.15.tar.gz 651380 BLAKE2B da6728f65586b242297bb7c8d8ae676de636177539
 DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e
 EBUILD album-4.13-r2.ebuild 903 BLAKE2B 22e870b231280d06e24bc6912df99a6d752b55f787d7f15e7574a8a2714057a8ba024f4babc7ffd854e6e8585080964599e3e7907980ca421a7ccef383c108aa SHA512 d98825eb26e99da51b43405a9886595c71aa1a6f2ff9701782a931b75ab914127aa2736a17e61d0206b1f3ab9c06154a54fc2eee6b2556d7f6e6482ad13c9e02
 EBUILD album-4.15-r1.ebuild 946 BLAKE2B ef25e0ec0a61d44d3b28a4831bbf45d9dac260020468dabfed2ae24395ea8dac570d4203c9abab48a2145069a4d3e22ee06a7d0b3020c630fd3a3d0317696ea7 SHA512 4975be05ca1d2ca7bda75acd05a4150910eeb8c99f8499019a5fe0e24c4f30dfb1d9a67c1a9e6ca1dd9e2820f4463a0d5efb1eab3122a3c2d356a2041d43d8c0
-MISC metadata.xml 452 BLAKE2B cd720f40a35fbf5fbdc7e5eee9af00169451f76f97a84aa969823c330bdc3a65545c037ed9a478c41dbe5158e8996a2a7b060053d3e15815324001d97694716f SHA512 bced1cebe160580909f57c74c86ac9de7eab5342766763230a381b24da5c4ea08faf0b6e8d3d4e5e7197a55a35477e9ce72a56e72d3188a711135248f003e115
+MISC metadata.xml 336 BLAKE2B 837ab4247c02a88070c8bedd8b3a17666672f15d58c0859571c8d5287dd139c87a00c9cb8443961403a70d41456fbc6bbc6f8c4ed519e8ea7a27528337626377 SHA512 57056eb7f228138441d468ebf9ae672dee62f258c33fde97dd6cafea4b9deadb418a011d4222bf75ff8d6953d070a5096a0981c0476c5302566ccd6e643bea0a
diff --git a/media-gfx/album/metadata.xml b/media-gfx/album/metadata.xml
index 64fc4579cb9b..336b619d715f 100644
--- a/media-gfx/album/metadata.xml
+++ b/media-gfx/album/metadata.xml
@@ -4,10 +4,6 @@
 <maintainer type="person">
 	<email>dilfridge@gentoo.org</email>
 </maintainer>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
 <use>
 	<flag name="plugins">Install optional plugins</flag>
 	<flag name="themes">Install optional themes</flag>
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 0a716d92b711..0f49befba3ba 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -4,15 +4,8 @@ AUX alembic-1.7.11-0003-Fix-env-var-for-renderman.patch 828 BLAKE2B 8e135e4d814a
 AUX alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch 1044 BLAKE2B 49ed2fe0b260e9917f781ed5e1e2fb5ffaad89f567be893ff68580f7ec766ceb7f3ffc884d5f5cf030d467b0fcd096d56363b4273e8d1968c1ed3d5b9016fda8 SHA512 18d32d6b1d611f9ec9f545281f5900f58673cf773b11fbcf457d9a0c39a8c87690e1d39b2dfb910f74696b73d34e23f7adefa8242c29d80595ac3fb0879d87d6
 AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
 AUX alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch 1074 BLAKE2B 1d8b252eb8fcfe18e019a11350d1b9974d30a1d95146d5dd8eda8feb585c4e7d1070543f290d32e41929b17e86fda9a6eca7d045d4b4cf8fc31b4075addedf7a SHA512 059c89cbe402429684e56fa14041cf65974259b4ad1d464edd925bb6353d758402689e8de7021a3b3de6f98b1225a90fc50bbc843639b9be2823527afe77ee57
-AUX alembic-1.7.9-CMakeLists-fix_lib.patch 7317 BLAKE2B 8739f5808cb8821cf8404dcbd492620bd1b0fc4ac09600f345a89b813d07e24fb305a5615a9d58b11ae36f7754a9527bf583586017d1018eff658760370f9777 SHA512 000d31ffd5c5843a33532fbf02c2410cbeb7504fd89d9133f4a91d435682572df0cee7d59f039b0e32e98c05df7685ac2a3880630cebd6782e38161a8bca4c31
-AUX alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch 794 BLAKE2B b19aabcc393e2cd218d055e00b7ca1e0e69206326b756e4ee9f5cc67678f0e519b6f788593e33e833b61b71ee98fbd8e2a3e633548144601ce47b2aa8f625380 SHA512 bd1ebeaf3e1e28badb9e5a6914bf3073cfa8935c74a044ebe5dfb84117c8058696ae10866898fb6dd122fd4b7de926070e422e1487f0f6749226fe87e646b52c
-AUX alembic-1.7.9-find-pyilmbase-python-module.patch 542 BLAKE2B 448114ef30e6131229b6e789af7a231e766e2584c64eca9f4e09cd7bae8555d1c9f00b62c3e53136fa20be25530ed15019ea5f55a32ee286b925b726678092fb SHA512 4dfef7da97b1fe82b7c210ff8cfc7e664d56b7379dde0246ab18311fc28188dd59251b745644f75debaffe9e5eeff61c965ee9bcf6102ff6f50af7f9db4c8a2e
-AUX alembic-1.7.9-fix-boost-python-naming.patch 721 BLAKE2B bcd2857b7afb29017c0e538ea8bf9588c744f1471c106009f225affc576750967a05e42a94f84ca5194823f7abbe3762e5d7b58cee9497218e59927e3ea6b1cd SHA512 a7140894cdcd2d796b0fc514f36e8318ef372f1fbe456f06c80f9697bcd9cc6333d609fd2be2c7788329a60685abd5030ae572f952deb54dfc9f0b6db72b7159
-AUX alembic-1.7.9-fix-python-import.patch 1254 BLAKE2B 091d7fa6b55508425b7017f2bc7832e798ccdf65beb885ad0db9e13e8685458696fcc05dc76477a14907799755aeaf71ca748a14452abb0747df210f549a7604 SHA512 e62bbcf20028c57c41b935e49e947f02905e390fbf0788c668b9a517813bbc259f266f9d14fc2197884d9632739eda7d412267aba44a8c7495125c2f06a184d5
-AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb00c448ce011889d8672ea0df1d666839ff0d515b86bdf01304f0605312bd317140944fc59cbd0fbadab7240655 SHA512 59060bb8b29d2c5e0e2003115e6fecc7744bc11c39419486e3743e810f85256c66af6976b5764cfce04fd87c8b715939ce382e252999ff26a3ad06df2c3550dd
-AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
 DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
-DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
+DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
 EBUILD alembic-1.7.11-r1.ebuild 3159 BLAKE2B 38f7f04e3878247c1caa0200c0cf8043102742db00c09188c44c43828c7c8030394f75b4f632817fa5cd51fa81697d2c220333c3a9d34e605bccb07c49d6385f SHA512 7bd681f7e9d9da198657b66cdf31a4e2f9a32f0140bfbf2553bf7fac8f7513132056f0760951362b5835fea9995b0e54af71925c5dd2c4b79e979155ba525818
-EBUILD alembic-1.7.9.ebuild 3085 BLAKE2B 48e9c79a0d0234be4cf1a2a175813b91d29948a14373ff0f8f5fb62d3f95dbc7937d0bb83024683598c52c898e63a0178d8767560dcf83e6c4b02d7b4b2fa1e7 SHA512 6252f40f1f0ea0c1bbee9cd7f2867b77024bb79a15cf4d01ee98bfdd7c5846ed2e0150f67047e87b1dec2c957df608fa1ea42fc7d06a4014a3f5aafb81f8e9d2
+EBUILD alembic-1.7.12.ebuild 2650 BLAKE2B a35cb1f3c118736fd819598ccb3ca91fdca227d4f3c0a18bc1834658669357ae1e68fff792b5972cdbc8d5e12465e279b3800071a33e0837ee534df85a122f5d SHA512 927614bc9ca4f11a0e1e4db4e162c82bd101865fc4f901444c36583e36d30a95ee85d5168ff82cb53cf86b88df0203a4170f7e68f2b4b663faea6f96f73b7b33
 MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
diff --git a/media-gfx/alembic/alembic-1.7.12.ebuild b/media-gfx/alembic/alembic-1.7.12.ebuild
new file mode 100644
index 000000000000..8833c3fbfbb6
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.7.12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake multiprocessing python-single-r1
+
+DESCRIPTION="Open framework for storing and sharing scene data"
+HOMEPAGE="https://www.alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost doc examples hdf5 prman python test zlib"
+RESTRICT="!test? ( test )"
+
+# pyalembic python bindings need boost
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	hdf5? ( zlib )
+	python? ( boost )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=media-libs/openexr-2.3.0:=
+	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
+	python? ( >=dev-python/pyilmbase-2.3.0[${PYTHON_SINGLE_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+	$(python_gen_cond_dep '
+		boost? ( >=dev-libs/boost-1.65.0:=[python?,${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.8.14-r1 )"
+
+DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch"
+	"${FILESDIR}/${PN}-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
+	"${FILESDIR}/${PN}-1.7.11-0003-Fix-env-var-for-renderman.patch"
+	"${FILESDIR}/${PN}-1.7.11-0004-Fix-a-compile-issue-with-const.patch"
+	"${FILESDIR}/${PN}-1.7.11-0005-Fix-install-locations.patch"
+	"${FILESDIR}/${PN}-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	if use doc; then
+		doxygen -u Doxyfile || die "Failed to update Doxyfile"
+		sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_SHARED_LIBS=ON
+		# The CMakeLists.txt file needs C++11 or C++-0x if none of them
+		# is defined
+		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
+		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=$(usex prman)
+		-DUSE_PYALEMBIC=$(usex python)
+		-DUSE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen Doxyfile || die "Failed to build documentation"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	cmake_src_install
+}
+
+pkg_postinst() {
+	if use prman; then
+		einfo "If you're looking for an ebuild for renderman, you may want to"
+		einfo "try the waebbl overlay: 'eselect repository enable waebbl'"
+		einfo "followed by 'emerge renderman'"
+	fi
+}
diff --git a/media-gfx/alembic/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
deleted file mode 100644
index c04e8c9b6f6b..000000000000
--- a/media-gfx/alembic/alembic-1.7.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
-RESTRICT="!test? ( test )"
-
-# pyalembic python bindings need boost
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-	python? ( boost )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=media-libs/openexr-2.2.0-r2:=
-	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
-	python? ( >=dev-python/pyilmbase-2.2.0[${PYTHON_SINGLE_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-	$(python_gen_cond_dep '
-		boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_MULTI_USEDEP}] )
-	')
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-3.9.6
-	doc? ( >=app-doc/doxygen-1.8.13-r1 )
-"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
-	"${FILESDIR}/${P}-CMakeLists-fix_lib.patch"
-	"${FILESDIR}/${P}-prman.patch"
-	"${FILESDIR}/${P}-fix-python-import.patch"
-	"${FILESDIR}/${P}-find-pyilmbase-python-module.patch"
-	"${FILESDIR}/${P}-find-boost-python-for-cmake-ge-3.11.patch"
-	"${FILESDIR}/${P}-fix-boost-python-naming.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_SHARED_LIBS=ON
-		# The CMakeLists.txt file needs C++11 or C++-0x if none of them
-		# is defined
-		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
-		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
-		-DUSE_ARNOLD=$(usex arnold)
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=$(usex maya)
-		-DUSE_PRMAN=$(usex prman)
-		-DUSE_PYALEMBIC=$(usex python)
-		-DUSE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use arnold; then
-		einfo "NOTE: The arnold plugin is highly experimental and hasn't been"
-		einfo "tested, due to missing license. If you have trouble compiling"
-		einfo "or running it, please file a bug report for the package at"
-		einfo "Gentoo's bugzilla."
-	fi
-	if use maya; then
-		einfo "NOTE: The maya plugin is highly experimental and hasn't been"
-		einfo "tested, due to missing license. If you have trouble compiling"
-		einfo "or running it, please file a bug report for the package at"
-		einfo "Gentoo's bugzilla."
-	fi
-	if use prman; then
-		einfo "NOTE: The renderman plugin is still experimental and has not"
-		einfo "been tested much. If you have trouble running it, please file"
-		einfo "a bug report for the package at Gentoo's bugzilla."
-		einfo "If you're looking for an ebuild for renderman, you may want to"
-		einfo "try the waebbl overlay: 'eselect repository enable waebbl'"
-		einfo "followed by 'emerge renderman'"
-	fi
-}
diff --git a/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch b/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
deleted file mode 100644
index 06ebf60b0d67..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 298f4be..18b3ff5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,12 +80,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
- 
- # Set static/dynamic build options
- SET(LIB_TYPE STATIC)
--SET(RUNTIME_INSTALL_DIR lib)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(ARCHIVE_INSTALL_DIR lib)
-+SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
- IF (ALEMBIC_SHARED_LIBS)
-     SET(LIB_TYPE SHARED)
--    SET(ARCHIVE_INSTALL_DIR lib)
-+    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
-     IF (WIN32)
-         ADD_DEFINITIONS(-DALEMBIC_DLL)
-     ENDIF()
-diff --git a/arnold/Procedural/CMakeLists.txt b/arnold/Procedural/CMakeLists.txt
-index 69e00da..47ccf66 100644
---- a/arnold/Procedural/CMakeLists.txt
-+++ b/arnold/Procedural/CMakeLists.txt
-@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES( AlembicArnoldProcedural Alembic::Alembic)
- 
- set_target_properties(AlembicArnoldProcedural PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL ( TARGETS
-   AlembicArnoldProcedural
-diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
-index 451409c..c882971 100644
---- a/bin/AbcConvert/CMakeLists.txt
-+++ b/bin/AbcConvert/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic::Alembic)
- 
- set_target_properties(abcconvert PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcconvert DESTINATION bin)
-diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
-index 511864a..bed92b2 100644
---- a/bin/AbcDiff/CMakeLists.txt
-+++ b/bin/AbcDiff/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic::Alembic)
- 
- set_target_properties(abcdiff PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcdiff DESTINATION bin)
-diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
-index be5f5c1..eca449a 100644
---- a/bin/AbcEcho/CMakeLists.txt
-+++ b/bin/AbcEcho/CMakeLists.txt
-@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic::Alembic)
- 
- set_target_properties(abcecho abcechobounds PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
-diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
-index 815f84f..92f83c4 100644
---- a/bin/AbcLs/CMakeLists.txt
-+++ b/bin/AbcLs/CMakeLists.txt
-@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic::Alembic)
- 
- set_target_properties(abcls PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcls DESTINATION bin)
-diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
-index a963420..a84e00b 100644
---- a/bin/AbcStitcher/CMakeLists.txt
-+++ b/bin/AbcStitcher/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic::Alembic)
- 
- set_target_properties(abcstitcher PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcstitcher DESTINATION bin)
-diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
-index b4f65f1..74225ac 100644
---- a/bin/AbcTree/CMakeLists.txt
-+++ b/bin/AbcTree/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic::Alembic)
- 
- set_target_properties(abctree PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abctree DESTINATION bin)
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index fb3def8..d5bbcec 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -84,7 +84,7 @@ IF ( ${ALEMBIC_LIB_USES_TR1} AND CMAKE_COMPILER_IS_GNUCXX AND
-     TARGET_LINK_LIBRARIES( Alembic atomic )
- ENDIF()
- 
--SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
-+SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
- INSTALL(TARGETS Alembic
-         EXPORT AlembicTargets
-         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
-@@ -117,7 +117,7 @@ EXPORT(TARGETS
-     Alembic::
-     )
- 
--SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
-+SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
-     "Where to install the Alembic's cmake files")
- 
- INSTALL(FILES
-diff --git a/maya/AbcExport/CMakeLists.txt b/maya/AbcExport/CMakeLists.txt
-index 50d2fd2..f8bc850 100644
---- a/maya/AbcExport/CMakeLists.txt
-+++ b/maya/AbcExport/CMakeLists.txt
-@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(AbcExport
- 
- set_target_properties(AbcExport PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS AbcExport
-         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
-diff --git a/maya/AbcImport/CMakeLists.txt b/maya/AbcImport/CMakeLists.txt
-index 6826183..e71e612 100644
---- a/maya/AbcImport/CMakeLists.txt
-+++ b/maya/AbcImport/CMakeLists.txt
-@@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(AbcImport
- 
- set_target_properties(AbcImport PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS AbcImport
-         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
-diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
-index 6b46e91..3635bcc 100644
---- a/prman/Procedural/CMakeLists.txt
-+++ b/prman/Procedural/CMakeLists.txt
-@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES(AlembicRiProcedural Alembic::Alembic)
- 
- set_target_properties(AlembicRiProcedural PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS
-     AlembicRiProcedural
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 91c45c4..c87eec6 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -128,7 +128,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-     )
- 
-     SET( ALEMBIC_PYTHON_INSTALL_DIR
--        lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-         CACHE PATH
-         "Alembic's python bindings install directory"
-     )
-@@ -143,7 +143,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
- 
-     set_target_properties(alembic PROPERTIES
-         INSTALL_RPATH_USE_LINK_PATH TRUE
--        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- ELSE()
-     MESSAGE(FATAL_ERROR "Unable to find Python libs")
- ENDIF()
diff --git a/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch b/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
deleted file mode 100644
index d8abfce72f57..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
-index 21b3515..ba6f396 100644
---- a/cmake/AlembicBoost.cmake
-+++ b/cmake/AlembicBoost.cmake
-@@ -79,7 +79,14 @@ IF (USE_PYALEMBIC AND APPLE)
- ENDIF()
- 
- IF (USE_PYALEMBIC)
--    FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    # At least cmake-3.11 has introduced a new syntax while looking for
-+    # boost python libraries. It might apply to version 10 too, but I
-+    # couldn't check due to cmake-3.10 compile error.
-+    IF (CMAKE_MINOR_VERSION VERSION_GREATER 10)
-+        FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python2.7)
-+    ELSE()
-+        FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    ENDIF()
- ELSE()
-     FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options)
- ENDIF()
diff --git a/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch b/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
deleted file mode 100644
index 4acdc5d7d885..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index 5cb9108..c3f80a2 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -44,7 +44,7 @@ ELSE()
-               SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND)
-             ELSE()
-               # TODO: set to default install path when shipping out
--              SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/")
-+              SET(ALEMBIC_PYILMBASE_ROOT "/usr")
-             ENDIF()
-         ELSE()
-             IF (${WINDOWS})
diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
deleted file mode 100644
index c14d7ad960c7..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 5a75e63..492be6a 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -33,10 +33,10 @@
- ##
- ##-*****************************************************************************
- 
--MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
-+MESSAGE(STATUS "Boost_PYTHON2.7_LIBRARY_RELEASE: ${Boost_PYTHON2.7_LIBRARY_RELEASE}")
- 
- # set core libs
--IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-+IF (Boost_PYTHON2.7_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
-     MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
-     SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
- 
diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
deleted file mode 100644
index ca8bedef57ac..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index c677549..5cb9108 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -60,11 +60,11 @@ ELSE()
- 
-     SET(LIBRARY_PATHS
-         ${ALEMBIC_PYILMBASE_ROOT}/lib
--        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY}
-+#        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY} # this is defined nowhere
-         ~/Library/Frameworks
-         /Library/Frameworks
--        /usr/local/lib
--        /usr/lib
-+        /usr/local/lib${LIB_SUFFIX}
-+        /usr/lib${LIB_SUFFIX}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-@@ -118,8 +118,8 @@ ELSE()
-     FIND_PATH(ALEMBIC_PYIMATH_MODULE_DIRECTORY imathmodule.so
-         PATHS
-         ${LIBRARY_PATHS}
--        /usr/local/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
--        ${ALEMBIC_PYILMBASE_ROOT}/lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        /usr/local/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        ${ALEMBIC_PYILMBASE_ROOT}/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-         DOC "The imathmodule.so module directory"
-     )
- 
diff --git a/media-gfx/alembic/files/alembic-1.7.9-prman.patch b/media-gfx/alembic/files/alembic-1.7.9-prman.patch
deleted file mode 100644
index cfd299c79bb0..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-prman.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/cmake/AlembicPRMan.cmake b/cmake/AlembicPRMan.cmake
-index e02b237..fdbf26c 100644
---- a/cmake/AlembicPRMan.cmake
-+++ b/cmake/AlembicPRMan.cmake
-@@ -66,8 +66,8 @@ ELSE()
- ENDIF()
- 
- # Prefer PRMAN_ROOT set from the environment over the CMakeCache'd variable
--IF(NOT $ENV{PRMAN_ROOT}x STREQUAL "x")
--  SET( ALEMBIC_PRMAN_ROOT $ENV{PRMAN_ROOT})
-+IF(NOT $ENV{RMANTREE}x STREQUAL "x")
-+  SET( ALEMBIC_PRMAN_ROOT $ENV{RMANTREE})
- ENDIF()
- 
- 
-diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
-index 6b46e91..0cb2aa6 100644
---- a/prman/Procedural/CMakeLists.txt
-+++ b/prman/Procedural/CMakeLists.txt
-@@ -65,5 +65,5 @@ set_target_properties(AlembicRiProcedural PROPERTIES
- INSTALL(TARGETS
-     AlembicRiProcedural
-     DESTINATION
--    prman/procedurals
-+    $ENV{RMANTREE}/lib/plugins
- )
diff --git a/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch b/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch
deleted file mode 100644
index b291e839e8c9..000000000000
--- a/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
-index dac8659..e7beb59 100644
---- a/cmake/Modules/FindIlmBase.cmake
-+++ b/cmake/Modules/FindIlmBase.cmake
-@@ -52,7 +52,7 @@ IF(NOT DEFINED ILMBASE_ROOT)
-           SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
-         ELSE()
-           # TODO: set to default install path when shipping out
--          SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
-+          SET( ALEMBIC_ILMBASE_ROOT "/usr" )
-         ENDIF()
-     ELSE()
-         IF ( ${WINDOWS} )
-@@ -97,6 +97,14 @@ FIND_PATH(ILMBASE_INCLUDE_DIR
-     include/OpenEXR
- )
- 
-+FIND_PACKAGE(PkgConfig)
-+IF (PKG_CONFIG_FOUND)
-+	PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
-+	IF (PC_ILMBASE_FOUND)
-+		SET(_ilmbase_libs_ver_init ${PC_ILMBASE_VERSION})
-+	ENDIF()
-+ENDIF()
-+
- # If the headers were found, get the version from config file, if not already set.
- IF(ILMBASE_INCLUDE_DIR)
-   SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${ILMBASE_INCLUDE_DIR})
diff --git a/media-gfx/apng2gif/Manifest b/media-gfx/apng2gif/Manifest
index 936a22492676..1ee697c9e413 100644
--- a/media-gfx/apng2gif/Manifest
+++ b/media-gfx/apng2gif/Manifest
@@ -2,4 +2,4 @@ AUX apng2gif-1.8-makefile.patch 454 BLAKE2B 0ba1973820249c62481e2446d9449c5d9ca4
 AUX apng2gif-1.8-zlib.patch 313 BLAKE2B 46f274dde43fe5c93dd58433cdfc201aeea5e3cf4968acb93580599c1408c5fe01bbe6e7a3037f63f8d0f6470f54ebb4881d230bd2276be9ebad3784f3501357 SHA512 7b3501e6a9f0640aee5afbc3abaa13ee53829081bd800edd007b69af65132b3ee51e4c10c7b8bde748dafe944d478be8b3f0125ec8d3c6ff96836be1c92f00c2
 DIST apng2gif-1.8-src.zip 476207 BLAKE2B 5c0aeb2a9e05fc5aac87650684419a2fab55d393186454491d13fd88251949282ee27b03a7d26b8892a5b17596a320ce7c7983385246fac8ca87e14d4a5c37fb SHA512 54fee0bf1e5448531298a816562a611cb5f2f661d40ade622e2d24e58a30de96fa69254ee891c5329e8b065c999b95620215d6e1ae276f0c596ffe69b0b31cda
 EBUILD apng2gif-1.8.ebuild 651 BLAKE2B 8c0d1c6ad9e1c4fb063026bf1d9bcf35c5c1bf60e14ee6d261fe9ad94b8a659472eebe9c89afd517c80ae308efb115cc471171c1f3a1d7a93f92c247c1117c27 SHA512 7fcb961abee160a1f009640ff4947316936f42ed54262aa731de1873cff46884b22b396f6c497b1ed408342fc5c98fa3e315073fd00ad0667e6860f2b367ee0f
-MISC metadata.xml 337 BLAKE2B 812390fcd457ceaf170090b0f001160bd05abb61faaebd8e5b5a2e1af4d52366bbb8e768348eaa7c232894a0310ad31ac9f18f1ea1ff7bc97424cc1136006845 SHA512 1d3615284e3ad59728df120923dae4e8c7ab1e97968a192495ff781dda33ee98078eeb70cc40dba5901330c42993b4dd025ce5e8a02231e48e0cd81991c2975e
+MISC metadata.xml 245 BLAKE2B 6dacd5b166af4d78e7c80837d9ccf6e39fb7e25569ab14b370d8808e98bf06762c0821dd7299a145273a5ac524203a2cf802da7117ed8e144937d5f1eae1f19d SHA512 ab49834d8823f9c0a0c49d77febf70854de1ee65cb3f694cf9d8df9cf9e6703c4f55ee1592906c9395683d980d1a657e454d224079aa4ac9ed6e5bb6c020289d
diff --git a/media-gfx/apng2gif/metadata.xml b/media-gfx/apng2gif/metadata.xml
index 3310d1f94177..4563e14022e4 100644
--- a/media-gfx/apng2gif/metadata.xml
+++ b/media-gfx/apng2gif/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">apng2gif</remote-id>
 	</upstream>
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index 4f0b781c840b..0cee4bb55681 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,4 +1,4 @@
 AUX apngasm-2.91-makefile.patch 585 BLAKE2B 8972e2c3b59f4d128f522309496ed643046a18684e003503046927db4e1be06219a9c6818b75bcb0497c7ef5057a91c5f4bee837abca95c89eb79fa8da0fa39e SHA512 f3b9b89ee3071c01bdc08f8a09864956d258abf14aac147a754f6259297ce8a479a067ee5d37225b7dee0f4f419bef53e127266ae770063cdafa478c78d6eda2
 DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
 EBUILD apngasm-2.91.ebuild 974 BLAKE2B 40fa7aad5e2fde3388968668a956a1adc6a161de1e32271334a4f938f82adf5665e37ff77db5c56f97e757bb1f5c326cccb1f6085fa6d82e80e1f66625802480 SHA512 0f5a60881ca232d9efea50d3feda4501e5394a52e0411addc61171d248e8b8b309936c8e59ba10bc2104138268f5b9418a7408852861f013d254fc3f63b0bd55
-MISC metadata.xml 479 BLAKE2B 9307c8ff6da1b0010362d8bdb070e6de22c15ba492e71890882adb87c849bd7e3a639bdf8b0d278b0c2df3894f50a71ade73970daba7573b1b4ea968baa5e2e0 SHA512 a630460ee809f9bb4e7ac231cf5d53b9b560926eb515d9a698a1e2d5f6f4318f771cf77e3f47f256b7458a9b1dba67bbc654cf6f9d4bd9e194490b2cd32c8e31
+MISC metadata.xml 387 BLAKE2B f6781e3e1e4edbb83065c12095df05b7bdd9b3e23c7bd0fad5472ddf54622dc5ea77cfb284afcc96fd8ea9cab452565436a5a0e3572c5659bdbfb8aa7aab79e9 SHA512 14c4dc17c95aca67824d93c25f4b6fc334c0c23335598e6667e2816022e451639aa87d8355f151e1e57f98a9cf7070f55ebac8ab4d9d07ee446763678e8c3d75
diff --git a/media-gfx/apngasm/metadata.xml b/media-gfx/apngasm/metadata.xml
index d5affd1eebaf..22e5d4e623b3 100644
--- a/media-gfx/apngasm/metadata.xml
+++ b/media-gfx/apngasm/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="7z">Enable support for 7zip compression</flag>
 		<flag name="zopfli">Enable support for Zopfli compression</flag>
diff --git a/media-gfx/apngdis/Manifest b/media-gfx/apngdis/Manifest
index 86a238dc6d56..db07ca7b8cd2 100644
--- a/media-gfx/apngdis/Manifest
+++ b/media-gfx/apngdis/Manifest
@@ -2,4 +2,4 @@ AUX apngdis-2.9-makefile.patch 451 BLAKE2B 5840a678a21b740e7763a3e14515f453d7248
 AUX apngdis-2.9-zlib.patch 309 BLAKE2B a31f29e21a1855db5929bec245b26620d5009ad4e04c548be57377c792b3ced82a2d81a246735b2834d96124509516379905b7a0271f423bb7eb72ee0f01933c SHA512 e3c3df7e29cab787302d8afada3d8a5509b445ba136aa3b4ac08e15dc9148bcab2b22d4871203461cd67f21aa90b46c17507241c94631fd3701fb00b659671e0
 DIST apngdis-2.9-src.zip 470989 BLAKE2B 2b5dc31350924553709c30e348186477b0efa08f2622ea72025d46977dc282cee750ff371563bb5e3d017e117827159b2579dd81ec573e853fb2876bf05feb38 SHA512 4bcce5066c37ea5e4db0bfaf2f6a81e4d3ba7f5b6c952f598facff27f84cc1a3af778f4db096119cb9f4aa57c0193c90acf7bed28f283b6930f5b3121dd9cf32
 EBUILD apngdis-2.9.ebuild 648 BLAKE2B 7aa61864ebfabea35ac91091389b456ba2e950007e76cd6de6e1f81e600d1e93b95fa0427c228b115527fa24e7d85c14614f36c76816802d989eef089b49dc9d SHA512 879c2f669557667d30475e7901c6469c5eb1e7666d8ff86ae98b5c414995cafc25ad50ad68c5707bf84354d4e44227570d73e6404607565ee50960cbcb3d5625
-MISC metadata.xml 336 BLAKE2B 0b31fff1b468baf8d1751f96a0aa8724633d39d86838a641e0c535643884658748265d4f046e848bba7b5779f37315a9e1c086254a152bc3cac7ad00d9676027 SHA512 9c81f32fdffb922866ffb1b28b334fc11a4958bfcd400d3cd5e43ddc309b61e12e1fcdff79c2997de5f3e158350abfdb50747eaba363b5d194b113d826c4c51b
+MISC metadata.xml 244 BLAKE2B 3a33b875dc93769fc95035cd73cc93b424a539dd5d4a9a654ebcc59c7a9404136caaf511364450acffa441abc9ee4d54db9e7f9195045a16ed3cbea869bd6343 SHA512 dd28f9fd99759324d86016db6ee7ffacda0df7927a08a3f720a2ebc74f655bf0b2e0da6c93be3004d4882e8ad4cedefca4aff2f9299e508bb1799a3f6d8f6eb5
diff --git a/media-gfx/apngdis/metadata.xml b/media-gfx/apngdis/metadata.xml
index 8fc352524266..6aa87f06540a 100644
--- a/media-gfx/apngdis/metadata.xml
+++ b/media-gfx/apngdis/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">apngdis</remote-id>
 	</upstream>
diff --git a/media-gfx/apngopt/Manifest b/media-gfx/apngopt/Manifest
index 206dc88ed96c..2b344c888d60 100644
--- a/media-gfx/apngopt/Manifest
+++ b/media-gfx/apngopt/Manifest
@@ -1,4 +1,4 @@
 AUX apngopt-1.4-makefile.patch 714 BLAKE2B 9755b035d1b8a0515f9713d6a63ba36da25812491ce8e9982b4d25ae6649651470480172c6c2e0ca1c45f1df0ac4ecdb92fcd7af2ec8b6a07d52a259d6bdb590 SHA512 5a6366bc4810295810bd1bd3f0a709f0e78d4d7ac8f3e3ca0b10d8aeb5fd89115a41c835a7d6c2ae878b68ca7dccc5ce1cea96f5e6b4e75c191357e4d4e6a0f1
 DIST apngopt-1.4-src.zip 577703 BLAKE2B 14aaa3fcd7fcd18fedb026248d3d46c774affc09112512a11ac2e51141c4337d130c42cc2a42d044d7ed638732d4e1ae2f04d5c59578c379a55ceeb1cc7425c0 SHA512 8dd97ca6fdd10b1285c3a850ab0f6e14113df0b4a607877a6fb7c5bacded02432504e3af87a43c4aa660bad7226f300af8e0967368ca1eef00c9df7f624d578c
 EBUILD apngopt-1.4.ebuild 670 BLAKE2B 38859b34ebfd3332de18e079b5f5b9825f8d86e5dff5278b17d582423c53fdf6840dfd9e0eaf4c280793075eec62e8a907bb7fcd0512087602f2644821bc2835 SHA512 684bdc63e0fa407734b9c427c8eb5beb3474c6934cc4b7a35afc5f597639d3202abf3416bb5bca3b90347e7be85d7c6fa6b92ac971ad3fb87decca86863c4bdc
-MISC metadata.xml 333 BLAKE2B d7b2ea5ca58e9009f52b945989dda178c310401ed7edcec5fffb117c1da2dad4b6f7dcdf81f0d5ab05479e97cf54f86597895ec13f0bde6cb7db65c58b75f247 SHA512 eea45a9bda635af8b0f721251a1c99cb804236b9d37da04b7f5b7209a1ddd0c62a8bb8b5e2dc7783dbace5c557a1d403d1c5d5d41388b7fb5d5c84a1b6116664
+MISC metadata.xml 241 BLAKE2B 4f04b71487969b3ea52565f56b5b9474ebbf0b67162d3beaa2fbe16a9b9e4d944e17493af97a49cd07ad264737abc2067fe7aac8d86aeb5766ed2683aac79264 SHA512 5d2064e210522490a7bdcc3cdca592b590229dfef416d96e23ff581ac4f9ee3049f8e52db2a1106b24ef12797804fce8a4515fc4650729e2ec9c4d896cad61f7
diff --git a/media-gfx/apngopt/metadata.xml b/media-gfx/apngopt/metadata.xml
index 0ccb02731a52..119b7eaeeaaa 100644
--- a/media-gfx/apngopt/metadata.xml
+++ b/media-gfx/apngopt/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">apng</remote-id>
 	</upstream>
diff --git a/media-gfx/autopano-sift-C/Manifest b/media-gfx/autopano-sift-C/Manifest
index 8b7eb83a6c41..e275de057a46 100644
--- a/media-gfx/autopano-sift-C/Manifest
+++ b/media-gfx/autopano-sift-C/Manifest
@@ -1,4 +1,4 @@
 AUX autopano-sift-C-2.5.1-lm.patch 516 BLAKE2B 79fd443c4c2f321aa93982fb08ee7d8c6c9b588286e5f73d55c89ab014d53f569cd1de93f5846543ec33c2f9616dca65e932ce21cae47eec1c28b9a3c5ef56f8 SHA512 6198eaa686ab22a7707f840cc81c2fc68c9b02ce9d7831d28d255543bd0898b318b5d00b4f7bae487a6e4c70f4d0af75bfd61aeb07825cc70475e2988bb39002
 DIST autopano-sift-C-2.5.1.tar.gz 192267 BLAKE2B 552fe33230d322b5b33c31a6298058d30a8dd63110f15b1af25fa53aa762a5d9924a712523b626ba2381692c643c0bec44534bd5d2cc69b00faaf5b7fbd51d91 SHA512 4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931
 EBUILD autopano-sift-C-2.5.1.ebuild 618 BLAKE2B e2a58d968de9493c676b4f04051c0b9fc46631ab9cf074fa9f40a802f6dfa120c06f112fb1c59c6d895793ac04d6c6489b2a40db989f25c07e6925b295b75bdd SHA512 895c0f448253cdb8ace54fc0c6d9374ea50a76c79b9b468daf95d3b03681a8e9ae8eb01b57c3c6e06a2b11825a62c348afe6bc8200d1b3e70bedfa5bb43cbb56
-MISC metadata.xml 472 BLAKE2B b36bfaf7b7c146cb6c5df0b50983bd6ba0e089f75d04bdc38b331fd0b3bef92380140eaef73db1811647cee1e73b955fdba54c27ae19cdfbecd67099618b349f SHA512 28eab06295fba1917784743b7103fca9ce4a54806ac9609172653896426013f0f2b18a6a4428226aeafca8d0a5de6e493e6288985564331cbc3e0a3e3f2fbb6a
+MISC metadata.xml 380 BLAKE2B fe97d444243215c10fa02a9bf9d314358f971a04152087cc8071221267cb792bbb966bce0a0fe001021cb185a69fb4fc99595699dbdf918a3c36ebff51bc1565 SHA512 3e3130aa488e5a1eb4acfe8faa42ee37856a2b048a81b4829fda4a1376e11ab46cf73b858697cc621780ccb921d60d654864cea0be76f9c19977a1cf55924daa
diff --git a/media-gfx/autopano-sift-C/metadata.xml b/media-gfx/autopano-sift-C/metadata.xml
index e92e12909010..106eda55ad0f 100644
--- a/media-gfx/autopano-sift-C/metadata.xml
+++ b/media-gfx/autopano-sift-C/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>autopano-sift-C is a program to automatically find control points
 		for stitching together panoramas.</longdescription>
 	<upstream>
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index a0cfbe68154d..a8d482d2523d 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,4 +4,4 @@ AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
 EBUILD blender-2.79b-r2.ebuild 8338 BLAKE2B 3511f43b0a51ccb8be44a498baf17b6ea57a7db401bfb5ba356be06f952c3e9ee79ba663df90f56c7a10968818003b6fb5300c40665dae85baf33d304924ca91 SHA512 718fc4cc414961a0dd934e4060a415dd0a55dc06d52f4db3b69a2e777a1c6f4c93cec0ebdb8d8638d443ae409d4f9be86d6f012a4740f31d92dc2e3618e19d41
-MISC metadata.xml 2628 BLAKE2B b6ac04e033bd54bf3b6918737289e0a12ece3f87543b033ff85748934b6cecdb0cf8084a3c0e7fd766965b6defa4a402980244bec1a0ed2772ffbd12bfe96a8f SHA512 a47e7a85cc98bf0befad9b5ef5ad75276a6649bb5949367294177f19ae763a3dd0eae1ce8d179463c18c33533c37c283c7beabe08fe27d861bd54eb761675e35
+MISC metadata.xml 2508 BLAKE2B 1480c808bca37b380c6abd284f2dda8bcb023329d62ee383690adc0887e5e8294aa095eb7178d6ddd6d2e307711b7d4ab8c2fe461ba24cf4153b4e2b96108c36 SHA512 256115d6f93a5d8062758f0740aa1a48327002976df420088281782c6898d0e9c51ab945f26a334f5619a9b288dcc05bdbef5d358249ce350cd3e9d0e6435e26
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 7f510c45ba1f..c00fc6daf3f4 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<longdescription>
 		Blender, the open source software for 3D modeling, animation,
 		rendering, post-production, interactive creation and playback.
diff --git a/media-gfx/cellwriter/Manifest b/media-gfx/cellwriter/Manifest
index 09d1a4f39551..3a09f526d158 100644
--- a/media-gfx/cellwriter/Manifest
+++ b/media-gfx/cellwriter/Manifest
@@ -2,4 +2,4 @@ DIST cellwriter-1.3.5.tar.gz 293241 BLAKE2B 57d287782af21ae8010dc43ea89a2da081ec
 DIST cellwriter-1.3.6.tar.gz 434211 BLAKE2B 2734ee3a7e61f626d253613513675a4f3819724d9f9110af08ff4809f7abe68cb897815f5dc74d686ea6e016453117bc4869fd89ef4396446ea2de830cc9ec7f SHA512 0d564b03454a440e27c72323a4dd7943d6f1c84d1ed2db172ca999f62fdafed599559f9a6dff9df5f37820d489bd7ae2c6dd9a91965e308fcb1d1722bce543fa
 EBUILD cellwriter-1.3.5.ebuild 721 BLAKE2B 808b942a5569059c05b3dec134498a4820aae5465a50c292e6853d09169ba508f0caba59c1d6cb8977bec06f9bdc0ba468c998b6e2e19511282840bbf32a3143 SHA512 170049250eb87307cde5583a8a4452c014e208d460758a8b6b0d61472c7ac9f9a97d34b0385d65061ce4857df56b7637a68bb8999911914ebac76d0025e12b53
 EBUILD cellwriter-1.3.6.ebuild 712 BLAKE2B 7b16b1f30f4a619e1c00b00982fe6a4332b1191a7e5f7d3dc98c146462d88c7875028a71c96d65ea51f87e6cc8cf54c85c84a8051f8895b8792b85ff8e56607b SHA512 5506c4754e9d89ebc86c06b6501512114aecca2f9e2ed82c14450789a36727ea2a83f10909cc5e7d3be07faff4786866f3ed1abbc15e72d0054a6a3ba9948c3e
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/cellwriter/metadata.xml b/media-gfx/cellwriter/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/cellwriter/metadata.xml
+++ b/media-gfx/cellwriter/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 1949f1e0d281..5a59bc6c2f52 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -2,4 +2,4 @@ DIST chafa-1.4.0.tar.xz 388932 BLAKE2B 0ccaae1495bd410b05d291ebcf2b6266374f01353
 DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
 EBUILD chafa-1.4.0.ebuild 822 BLAKE2B 0910f237b704cc9122c8de1466b09d34eddeb94a7765947d6b2d44deaede9cb79641fcba9e2ec27bcab299696c682069d8647ab139e21774526001b4bd541932 SHA512 71f78174ef520ba23215d300944fbb81a25cfb2d43fde72b344cdb9080244981c5ee7e36ba4b8df66e78a1671ed5ee233f901faf1219d20350fac2726b3b3758
 EBUILD chafa-1.4.1.ebuild 822 BLAKE2B 0910f237b704cc9122c8de1466b09d34eddeb94a7765947d6b2d44deaede9cb79641fcba9e2ec27bcab299696c682069d8647ab139e21774526001b4bd541932 SHA512 71f78174ef520ba23215d300944fbb81a25cfb2d43fde72b344cdb9080244981c5ee7e36ba4b8df66e78a1671ed5ee233f901faf1219d20350fac2726b3b3758
-MISC metadata.xml 407 BLAKE2B ac815b6d037374042188d98d563fe87dd98fd052284d42fe594c77d58c97ff3154b0117b982adac9c0831a3b1baf85db7fd721f8dffe7c6b230ba9bb933d2ca9 SHA512 2fbb72618e83f62147fe9ad65115cd979876a461bd8a0601acb990043ce01842ad74e1a1a079759322d97c16295ad321e60fb16361b5b64345be85ebe070b2b8
+MISC metadata.xml 315 BLAKE2B 9ef556cf5e9857a485b26974ed7476d56ae22b35896ee2bcac66d9d73e356a20b1dcc9f44d3d6bd386f3c408cd222daba5719af6745bc883ce744357cbe2bd53 SHA512 fd5f62584e3b463a38b206997d0332e4cd4eb3b926cb66f59a92e3420fa2336937c12881531bc7ca4eb6a9ad00b704b0538c6326b13c34d26fbca550e658aad5
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 3f369d599d13..3816441b1234 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="tools">Build command-line tools</flag>
 	</use>
diff --git a/media-gfx/clockphoto/Manifest b/media-gfx/clockphoto/Manifest
index 75d4aea2a9d8..113267c11d16 100644
--- a/media-gfx/clockphoto/Manifest
+++ b/media-gfx/clockphoto/Manifest
@@ -1,5 +1,3 @@
-DIST clockphoto-1.1.tar.xz 717820 BLAKE2B 8e8847b69bd2e5cdc3381afbc9d097f0a16763f987aa9843360aae327d02080577b371a81d31e888622e2735af271ce3df6aa7a0f014d1f275b06cedb3e30036 SHA512 21a114191445fc3a0d888b4c0288d3fcd49394b3390cc04306136b8e6569d8d039851813cf5e44f38bcadd8a60cd649adaea2fbc881a3182e3aae249c1962d0b
 DIST clockphoto-1.2.tar.xz 717836 BLAKE2B b730ed9cca21ef7c23c6d6eeacbbdb59df6b5ac6c59b5f9821f4958ebc212df6c803cd062400c19e9e66e39c711a80cdf3355d53d6f6f10237cb67e40b818e28 SHA512 db5740b3c291df8cc79dec94196aa912afd316c601ddd6809b76d3a9f12a4df9b6530d4c9a031720cd5f309d7d05cbe62530ce1e2a9d8a7c2997d56a30b97739
-EBUILD clockphoto-1.1.ebuild 532 BLAKE2B 4bbaa046a954fd83eadff39e439405ff2396d8a8131f780c1c0b57bc8ba2a306e906799527701dec74b8fee14c7e11c2934dc24db2f0bc0ac0ee7b2aeae24d26 SHA512 df59cd3a4a1ae930a2fc5a591289f4c2ef556940cb3c9f0b603b8f50c701137f3958f0aab1d244d4343191486753276dee588eae9608b5e4c47dac3a06f22d2a
-EBUILD clockphoto-1.2.ebuild 537 BLAKE2B 8fe0cb498706bd4d025c6ca213d04039b215b6b222d40304e6d0b6dfe0de8b0124e14a5f91f17bdc23a8cb1b6e8f200044563485e0e86412d0ba4908df1a8142 SHA512 3b287250684303f6751af7edb4ba98b9b4af378f288d866af719a06863484047b15372e8bcc5ce96170cf63bd7430557313f16d4e01c209c9be4477398469ca0
+EBUILD clockphoto-1.2.ebuild 535 BLAKE2B 42d9dfd777c29f77636b2d5e8d9e7ae180773d03178eb346d624bbed19dcdad62659ec14c5119f9cf6b469bb14263b92e9ef8df44d2d1a9d2d68af9f2f4fbcd9 SHA512 a80f18adda2f4fc196ccf927d5c52fb14dd01d0251899a941cb48f5c2cb31466b8d97db1e869a4cd2bdb6c18711869eb3413c4eeaac2acd597e4bcccfa117de8
 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/media-gfx/clockphoto/clockphoto-1.1.ebuild b/media-gfx/clockphoto/clockphoto-1.1.ebuild
deleted file mode 100644
index 370c1c81a09f..000000000000
--- a/media-gfx/clockphoto/clockphoto-1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Adjusts photo timestamps based on clock photos."
-HOMEPAGE="https://git.zx2c4.com/clockphoto/about/"
-SRC_URI="https://git.zx2c4.com/clockphoto/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5"
-RDEPEND="media-gfx/exiv2 ${DEPEND}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin clockphoto
-}
diff --git a/media-gfx/clockphoto/clockphoto-1.2.ebuild b/media-gfx/clockphoto/clockphoto-1.2.ebuild
index 3483056e2bd9..65ac45e140a5 100644
--- a/media-gfx/clockphoto/clockphoto-1.2.ebuild
+++ b/media-gfx/clockphoto/clockphoto-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/clockphoto/snapshot/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-gfx/cptutils/Manifest b/media-gfx/cptutils/Manifest
index 2d066b46aa70..7d582bb04d5c 100644
--- a/media-gfx/cptutils/Manifest
+++ b/media-gfx/cptutils/Manifest
@@ -1,3 +1,3 @@
 DIST cptutils-1.72.tar.gz 629672 BLAKE2B b7acd86962830b49982e53df28fb11595445fa203ff6b852666e87c88cf211726157cbe8fd83e4d79d287b294cf05ec91f1b4d9f6894fb2f60fe7a26f8e85e6a SHA512 521aacb52a181b8e108356b294d2ee6e5068fc6e2d93a37783be1e99ca1e9209e016ea5eb3e2205b8c3d94661197adb314abe1e494e2ce6ca1b07d6517492bbc
 EBUILD cptutils-1.72.ebuild 867 BLAKE2B d3b093846d31230bd6651f26c3aa98671469920e408116490d11f5359a460056f582a3b03aced4df6f61260ff1b1a7c6c07bb13343d16ddd25ab57b72f49354e SHA512 36bbc702827c6e3fe31025176d1f90214c4c396b3106422da4cf0996b15d43e27e63942a82cc0b2a5e645cd4690e684df1f84400e8aefb032c3a1dc4126c2a3f
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/cptutils/metadata.xml b/media-gfx/cptutils/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/cptutils/metadata.xml
+++ b/media-gfx/cptutils/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 1af3d7da2f01..eae2294a8b06 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -14,4 +14,4 @@ EBUILD darktable-3.0.0.ebuild 3758 BLAKE2B 6443b09c668cf00d481b48eefe766513b7b49
 EBUILD darktable-3.0.1.ebuild 3822 BLAKE2B 981f9d0f4732719a232064a82713150f83d50dc25ee9da208360272f9c7fe5fa4c9dfa6fa6edf2c03936d807af0e0c46ddd80d7e93ad5a8931c01ae611f13f63 SHA512 343b9312d48cc3f018e4c0a2b87be69d68d669ba847d42a2e0dcc077d6d17a3a069584d053497b7c4462c1cc4799702a0953e38494d56429d108184f3f9b11ad
 EBUILD darktable-3.0.2.ebuild 3822 BLAKE2B 981f9d0f4732719a232064a82713150f83d50dc25ee9da208360272f9c7fe5fa4c9dfa6fa6edf2c03936d807af0e0c46ddd80d7e93ad5a8931c01ae611f13f63 SHA512 343b9312d48cc3f018e4c0a2b87be69d68d669ba847d42a2e0dcc077d6d17a3a069584d053497b7c4462c1cc4799702a0953e38494d56429d108184f3f9b11ad
 EBUILD darktable-9999.ebuild 3135 BLAKE2B 885443963d545004c2d10d49e65bac9d44c22ed1d0414f57ec2dc76a85760e09f06a78ea70a77c6f36739da0c45cc39a133954bccd5ad8af2e1a4149015b7d16 SHA512 da2ac016c0a15b14417a5ee373f6470630e045485738e39bb596365a0013ae48b1d4e0b197d7825ea17faa02e435ef2cbe95dd5b5ccf672cc99eb4cac60a12a2
-MISC metadata.xml 784 BLAKE2B 7e7f55f709fa5d7da777b272232cece75e55e2754701f759630afe0857f971341fa0d4b2b1a6c96391b3de2bd94966ccb0ed6e8fb17089de71f34418ed397cba SHA512 ae9a9f28be76a93c0b5c90892489c0e8397ea84f043fa03787e6ad774b8c79c834059fd5e55d6f46e63bd9a9411218585e99e59acef7e21493ff4543bb0210c4
+MISC metadata.xml 692 BLAKE2B 71a52ed735b9bb4dc7b11a89173418c64b8f35898637519b94966c5708b474e47e24e3c9d914b67a95c0dc1db596e712ea7992912f0fc0743087b86a7abce942 SHA512 4efcb02d1b916d8ddf7bfc5a75c992b0a0785b4421337a613eb80e92e341c8e6d66b66c4cd71c791367560d3d87387fba99231d5e19cc0d755a48b720d4880e0
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 57ab6042d4e3..21e610fbc04d 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geolocation">Enable geotagging support</flag>
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 1bdc15b97a0e..656b99fa5dec 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -5,4 +5,4 @@ DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
 EBUILD dcraw-9.28.0-r1.ebuild 2943 BLAKE2B c7d50b8613f9585bf637c98246a9c40d0df3953330e807b90b17a6c3a86542496814847842d661e7d21b0bf19f0db94aea522e650b1784135d3d9a7322dd1912 SHA512 cdb2b035f760e755c16d608249613d2c94ecde91e1715a9f8380250764f6c0dbee6d92a2de2f5f579de87ff894c238137ecb908dee6b24b94e75a815ae5f4967
-MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
+MISC metadata.xml 609 BLAKE2B a48ebce771f67412c53ed8d2ef83b44c1276600c5634c6f2ce51d677675d6c3f134d0ec7578fd777cd12dd7edd267a70529aa3ffc6875ffccc1ef97d93b72e52 SHA512 16d0cb26ad197852a44c84dbc87964ef441d850ea9fab643395edb027a2abf1a18aaa087890552f0be624678db239a9efbe384d4e3e9605a6fa2dfbf2543bf8d
diff --git a/media-gfx/dcraw/metadata.xml b/media-gfx/dcraw/metadata.xml
index 4bd39cb546fb..fcea6c683711 100644
--- a/media-gfx/dcraw/metadata.xml
+++ b/media-gfx/dcraw/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		This utility converts the native (RAW), format of various digital cameras into
 		netpbm portable pixmap (.ppm) image. Supports the following models: Canon,
diff --git a/media-gfx/duhdraw/Manifest b/media-gfx/duhdraw/Manifest
index ac3add273cfd..7d5766bf6a66 100644
--- a/media-gfx/duhdraw/Manifest
+++ b/media-gfx/duhdraw/Manifest
@@ -2,4 +2,4 @@ AUX duhdraw-2.8.13-macos.patch 248 BLAKE2B ba9bd84d8cf3b271dd8292062894c76ff4e2d
 AUX duhdraw-2.8.13-prestrip.patch 344 BLAKE2B dc84ac31a40a9fc57b2a0edc6454a3b0f1df3ad7b280bad84e9443c52eb64ba6c0396c93b6048561aee0c2d48fc5c02128ee21eb68f3dfaf63e19f479c21b5a0 SHA512 461a167ccc609b96f2a4fc8064cda9a97f22952f17c08a68e4980e7366a1fe91685fce7bdf2a5aa6e59aa8b5ebf0d9ada640c67ad64ba59c8b0d7d10a047b3d2
 DIST duhdraw-2.8.13.tar.gz 51779 BLAKE2B 7d87c9bb7a23b9c520636dacec34ca20281bf68e650dfb133cfaf59e3f71e27fa2086f1aee60ce9c01e5f0a6c6483553fe1103ff503bfbb80df9679057ca8e49 SHA512 fa9102133dcd100b2cde58d4d92aabfcdf86bb16a8066191e92922d6cea470094ff226e569bf92d34e1f0f6a3e657eaf3326cecf091ed1bc37bd2faace340798
 EBUILD duhdraw-2.8.13-r1.ebuild 725 BLAKE2B dc9ec0bdb1a13615f9df2f9da00e8b29cc9fe07a3387e8f950c399f309ef56dbb3bc694055fc9010add162e2454c5b57ab1d4a9ac6b3a7b3cee4a76e3c6ea6eb SHA512 fe078f198a5587af0b56aa8bc27a4c5f31bce6af418c9907256c4f479b6b573bc8ec7da1797060bc5e167599be7d35767ced018a1b6e925b1747d9abf1af24f0
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/duhdraw/metadata.xml b/media-gfx/duhdraw/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/duhdraw/metadata.xml
+++ b/media-gfx/duhdraw/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index df79453b8c47..0a61f5eaca35 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -2,4 +2,4 @@ AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
 EBUILD enblend-4.2.0_p20161007-r1.ebuild 1757 BLAKE2B ba4703076454bc019231877a83feae0971bf755f2d54c4c893731d3bbc0fac47f391cb096a2b0e76c3b8d267c6a36c5977d47160b181c4842cd7e4f8a8b9f99b SHA512 344602f430cfeef0f6cc4998dea06282764dc52eda552bc612dd46dce4b4ae137b0e166c017f9acc8afaececdde53e6d279cba62d19b1ce27d3bf326f0959dba
-MISC metadata.xml 336 BLAKE2B ca7263a1856bc0a6de0a9085fcaa0df5745cda2f678c36984fc2bf11218207214dbad308c39811213d7ce5d376228bc87a60adbfd4fee8f02b2119af0ebac207 SHA512 ac71d3806312b434087a0ce55eadd3db06091e11a195fe90da48570bdb4ad47bf50c864ae2b82e25acb08b6ce78ebc6dc8b33bdd064ee449efcb0995806f2eca
+MISC metadata.xml 331 BLAKE2B 250d878bfbdc95130e185aac19702f35eb370c030b82b012a2dd19206438bf7f7395371304bbe24a2f30a05d86c1613a5fc38f60baaeb019808204d2f119d649 SHA512 539a494eb3a8df413fc4e2e516f68b06f6f1e13e87157c65acabddd076876c2d1f9175f0115dc9a816c5133f15e55d133a8d0924fed3254811f3e407b1059531
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index 9495d45d212c..7d07b118073d 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">enblend</remote-id>
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 9944bc61dbfa..00764ff7a9a6 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -2,5 +2,5 @@ AUX exact-image-0.7.5-libpng14.patch 2435 BLAKE2B ca832920ad7bd1b2f1def6faa04e0b
 AUX exact-image-0.8.1-gcc6.patch 6101 BLAKE2B 3dba7f2688a5c59282486f492131edaf104c3c9e7d335f1893467ef6d968b466e344ae1c1992ea080cee4d267001dd6555aaea3a23dfbb0a5748c5262d364fbb SHA512 e11a9dca3c5c6ac4ca5557e6ca212354346b307c38abe77ceaea9f15ef35f5a8de8d24628b290c4ecfdaf84dee44af49414d57c89b067e78b60a02d4e09a5dd4
 AUX exact-image-0.8.1-libpng15.patch 754 BLAKE2B 81b47c6198103f37cc5f0a382001129a10140bead8f98119eb52079ed97d67d9bfd56b60278023f680d66107aaa6f2dea4a035a194c404e33e548f2e37f90f49 SHA512 7f3d271d908e55e3731b38e072dcadcb0d99cbf3de327d5bd486e232c2827055b8f712052e04c9bc81b20fd42d27cc18627a6bc118c9d1ece58b91c18fa9bf13
 DIST exact-image-0.8.1.tar.bz2 283660 BLAKE2B 49aa68640b785da59fd0e04d0a0892ad06adbc286a98bf908e60e77cfd273263e83dce3c9eb75c30f422c2b6eef2178dd0585aada63f992291abf298b369f3aa SHA512 0adc51c5a29415e236a963cfdaf8f5527e628e9a645e87d00c69a7185e60639cfcd9b1c2b4c3abe1826c5364f0c5d45a0ebb8923cfed53d041d1d36b2604b565
-EBUILD exact-image-0.8.1-r3.ebuild 2591 BLAKE2B 07f2f6c12f8407e28d566194fd625b6f7883859442c5720a33cfa4448e518ae5d04d5d9453c70426db0fbde4fc51fe172181f408c5f33676c33ce7caf2db5b66 SHA512 49c37dac5ce842452dd001842cb957ef892fb2a8b6f9d13d7bd52515146dad5b330d8e9fa7d4b438f4a5d1533ba97766a642708a056d07eed8f0d516879ef488
-MISC metadata.xml 337 BLAKE2B fa437dc19cd237e491f57598a2305280c39b6218eded9646d51220eb6f914ae5928946495f1441c3cfb2c3b6a3b57a3d0b5c22ca5ed5685ccc37e00282cc1a1b SHA512 733bb28cd21c30454b7e0f62ab91f88d6b4df6694eee70d9854336421d905c5babfb7e1d169849ca5109253a16c8fe5c8b7482c65cb1de1bbae038024c2934f0
+EBUILD exact-image-0.8.1-r3.ebuild 2289 BLAKE2B 93a144bd88c5d743e24f34cf9920d97662cd5db725e952012237e2ad89c9f2a53734989a2e94d20346752ec275c940f2ff3ffe8e72c1d134a8d9818f434b1bb2 SHA512 dc14b66c56f7733019b433ac5b7b348bf105dccac9157c3a1ef03789bb5e33d7a2e0d2fd466a097d950c7a50a123581f40d62b81c1d2abce2213cde851465ef0
+MISC metadata.xml 329 BLAKE2B ceb9ef8fb31cd43ccaeec69b64fe88a4894da38dd2c45a1b74dde46161daa3d437fc9e2d7a699c8ca57acd8bb6ad06dbbbe173eefcf243ee2f78233046a7006b SHA512 eb4d23c96cd7e20afb64bf80075a0cfcdb27c69ca075261d54676c47044ca6d120dd5b80cb2217787b71a9db02688764b0b3f2147c6a6e652954e43cafaebf57
diff --git a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
index 5eaeb57c3e47..91c362a6c1e9 100644
--- a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit eutils multilib python-single-r1 toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
@@ -13,20 +12,18 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg lua openexr php perl png python ruby swig tiff truetype X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
 
 RDEPEND="x11-libs/agg[truetype]
 	sys-libs/zlib
 	expat? ( dev-libs/expat )
 	jpeg? ( virtual/jpeg )
-	lua? ( dev-lang/lua )
+	lua? ( dev-lang/lua:= )
 	openexr? ( media-libs/openexr )
-	php? ( dev-lang/php )
+	php? ( dev-lang/php:* )
 	perl? ( dev-lang/perl )
 	png? ( >=media-libs/libpng-1.2.43 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby )
+	ruby? ( dev-lang/ruby:* )
 	tiff? ( media-libs/tiff )
 	truetype? ( >=media-libs/freetype-2 )
 	X? (
@@ -39,21 +36,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	swig? ( dev-lang/swig )"
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.5-libpng14.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_prepare() {
-	eapply \
-		"${FILESDIR}"/${PN}-0.7.5-libpng14.patch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	eapply_user
-
-	# fix python hardcoded path wrt bug #327171
-	sed -i -e "s:python2.5:${EPYTHON}:" \
-		-e "s:\$(libdir):usr/$(get_libdir):" \
-		"${S}"/api/python/Makefile || die
+	default
 
 	# Respect user CFLAGS/CXXFLAGS.
 	sed -i \
@@ -79,6 +69,7 @@ src_configure() {
 	# evas -> enlightenment overlay
 	# bardecode -> protected by custom license
 	# libungif -> not supported anymore
+	# python -> allegedly not python3, but python2 only
 
 	./configure \
 		--prefix=/usr \
@@ -98,7 +89,7 @@ src_configure() {
 		$(use_with lua) \
 		$(use_with swig) \
 		$(use_with perl) \
-		$(use_with python) \
+		--without-python \
 		$(use_with php) \
 		$(use_with ruby) || die
 }
diff --git a/media-gfx/exact-image/metadata.xml b/media-gfx/exact-image/metadata.xml
index 24dec3e96522..b4fce831a061 100644
--- a/media-gfx/exact-image/metadata.xml
+++ b/media-gfx/exact-image/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
 <use>
 	<flag name="swig">Adds Swig support <pkg>dev-lang/swig</pkg></flag>
 </use>
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index bdc726a6973b..f5fbadc6c665 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,3 +1,3 @@
 DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
 EBUILD exif-0.6.21.ebuild 579 BLAKE2B 101f7246e7433ce0bd236426fe87ce1487c869163fc8371292360bf2dd04dd828ee1f84a95bfa29bc0ba8a66cddd44a3c24a4ed6961f8ece531a424fb744605d SHA512 3f1d1ac107570a81238d834852cc9b15fa98aa8a0e274aeb74ae6fb9a2f5b535e4d44ac382f0c4d9a464e99bb934faa9864e444edfea845b3301ac1677ca7520
-MISC metadata.xml 346 BLAKE2B afa06166d278c5157eb097eb2d1c70fb929e86830868eddf353de6d8178f8966fc0ca06b52c95129555c3d0b4e15202f16135352bec3578cacbcaf7a9eceacb1 SHA512 195346710c3ead4bf9c050f5ebe548e0e7bb86bb1f9f61b2c1664cdda094c0523ee3c77769de7819b2d82cc4abd55e3b57c0827fdd0f97cc440f40b7519feec5
+MISC metadata.xml 249 BLAKE2B d224cb8e5d2c5fce97a3b2e5ddd58eaf63652fbd198148263043184bb34e3ecfa58af4a54fcb3e8c388ba4a8c71f6882b9ff214f3f366d5333093e1e6b0d8394 SHA512 7721d48e6ecfe8212f06808ec8cb7cc6f9d3db63c71a3c348f9f1d7db9cc18d74ad70c474861631c08df354c7a57d37bd0cee1e4a0ee62e83296a35c90af0b7f
diff --git a/media-gfx/exif/metadata.xml b/media-gfx/exif/metadata.xml
index 20c42d325f66..7f099d1061b8 100644
--- a/media-gfx/exif/metadata.xml
+++ b/media-gfx/exif/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">libexif</remote-id>
   </upstream>
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 471c3f058aaf..16c947cba6d0 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -2,5 +2,5 @@ AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec1
 DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
 DIST exiv2-0.27.3.20-Source.tar.gz 26462789 BLAKE2B 1fab5636f2ff69a6e61b78e29f8f536ef699bc7eb6e32edfd2f643805205df99502a3e1a9654dd8cd60e4f948d1442aa2bf4c4e71a345adaf310746bce5054c5 SHA512 4efd358adf615b924ef5446b68b7b7e260dd243179c8aa290006ea84d2fa08ab7069aa1af80b594858600660e184c80613c9254e66320d47087e00c9eccc8448
 EBUILD exiv2-0.27.2.ebuild 2457 BLAKE2B 5d610e7e21b215a72a31435a305d5f5dfdb0e9ef3499b6d805ca53729273475ef85c783aa269b106d24bc846007479159551a5cd3b10f8ccf226773c3e44f7d1 SHA512 bfea82132bdad7b89a35114ad4154db0044940324adcf65427306c15ddc1cd2a5152706a11f1613150799d6a1d439f1881bfe9f1dd62f8b4accb96eeb6251bb1
-EBUILD exiv2-0.27.3_rc2.ebuild 2465 BLAKE2B 69b3aa6999e788ccf2a45bdf89a7b02ecec4dc9a0f80ad2c43f3fdbdd7c3afc84116a4f67aeacd2bde78324279bb54d5870ec14a0424992b031776278a33e2e4 SHA512 1a7b08577200674aa7f8c06acf0d1627476b7760184d6f467d740384ed4ff0d70563b36cd3c965345706f6fc3349688a9008ddb049169262afa559f4276e0eab
-MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
+EBUILD exiv2-0.27.3_rc2.ebuild 2491 BLAKE2B 2a24901ccc3a33bda3bccb255ee1e4765b9ae3caa408c37715e5a639542f69e874508054e0bd5d08c5355ac3c14fcafe423b9369c5a7cda465c97c677cda5111 SHA512 fc7c2f129c9c4e3d38dd53d79a8d530694071a9245b9e246dc85e8b63036556478866f5b77a42132936962f53c136fb913e1e250267289cb89b6d71acd39af2f
+MISC metadata.xml 492 BLAKE2B 06b2f7b1d7b50e853ae116ad18f254103116c88c7d6957c1c9323083f0f87d7ed268ee188e91edf8b42b02a996e5c85017fffc12b0680f7522a0eda07ecbf74a SHA512 d0e56dd6585c3f10b14043764313de11545380fb15b18ca1627bbd92db357219aef801af050cbf3466b0b4e97fce25a55293068d21db93c1b6003a802944886f
diff --git a/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild b/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild
index 8c6ab3c5c6d5..276e4ea019b6 100644
--- a/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild
@@ -65,6 +65,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=14
 		-DEXIV2_BUILD_SAMPLES=NO
 		-DEXIV2_BUILD_PO=$(usex nls)
 		-DEXIV2_ENABLE_NLS=$(usex nls)
diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index 934a5a602c59..44e945477c68 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 40fb847b158d..18af65b758f9 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,6 +1,8 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
 DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9
+DIST feh-3.4.1.tar.bz2 2114441 BLAKE2B c24e5f54762439cfbb031b4b24ded03f1c0c9c75233ae5b6dc66a7a56922902c672606a1b36fef9b30789c09946c8ccc5f9a60fe201db07e70bcf0ce0638c0c1 SHA512 d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66
 DIST feh-3.4.tar.bz2 2114146 BLAKE2B 0bc65db77c67c42b693122b877417c3dc4db7a0551cdf62723b3f7c134e5f2bb73ee6d0aa5a0c81402cf5a5f723ceb29a45fb5e4aef1911dc643aeb82c3ef17d SHA512 50cb7fd33b583ee802cbbba8ed7a74e9eb72a141ffa28ab998a196f9f8d030a8192420fc084136f699cb33b1b8c4d8c2c111fa90695dd82a1366330a428383ce
 EBUILD feh-3.3.ebuild 1462 BLAKE2B 6a15abb299ed6f7667e2bb72cc615f8ed9b0c19a85363970f6338703a71650b73a124a6674d2d632ebf282792dc509fd06478cebdcf7cb30d850fed331cfe047 SHA512 0112815c065ba37ad9574bc497d2d6617de4bec7e6fe8a7b2ab94dbdb41fbd1e81631e0d674638026459ff3021a76cab6d1a76370ed87af5b0044ba6eb7f9b4c
+EBUILD feh-3.4.1.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117
 EBUILD feh-3.4.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.4.1.ebuild b/media-gfx/feh/feh-3.4.1.ebuild
new file mode 100644
index 000000000000..cdfb177f990f
--- /dev/null
+++ b/media-gfx/feh/feh-3.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 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 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+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=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_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/feh/metadata.xml b/media-gfx/feh/metadata.xml
index 19bf1be2581e..8072ef2372e4 100644
--- a/media-gfx/feh/metadata.xml
+++ b/media-gfx/feh/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index 201da58d4720..d7ef6fd20093 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -4,4 +4,4 @@ AUX fim-0.5_rc3-jpeg.patch 434 BLAKE2B a0de955643df8602a940f42f1727b4d7ae4ed1d65
 AUX fim-0.5_rc3-libsdl.patch 905 BLAKE2B 5ee899dfa13c362ff4b5de243968376bd9c602f1c4d34763c99556fa0aa8ed523480fe4a65043124d5d65ebf67f376768647284db4a8ccfb812b62b33deee858 SHA512 b96dff8e07f44f24aa2324344889c6828f0d913f40a0b9eab8dffc58e3fddecafa36baa18eee08e19cbf5d1ad3996b1cbcda195c3f58f91537ce309a1345150c
 DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
 EBUILD fim-0.5_rc3.ebuild 2663 BLAKE2B e4e889c479a1e30e50d7c7be2e6e35a028e3f49019532eecbf4ef4194e8e12c6cd52547e91de701dc7e7bbe13f6f2e1da6eed514b59ea9d25d9e73364c36902e SHA512 4237acd6fd0e3df020e764f8666df76240ea68bc99d83745e771a636eeecd29b064db7de2237669ab271a751baf67d5e233b93595ab5fe7a1afebee4044a2d4c
-MISC metadata.xml 610 BLAKE2B ef1a0623bedf204e2f261325be02fbb452355b2a9266afc320f81298cd1ae6b4bcb15f44713cb8640abcbf00b977294a6ca38f702e40fc5b6ce0c78b98b2b267 SHA512 4fdac65cfd930aac84e304c61addb77f7e19db8436ea477035615c93411449b5f3d314ee8b02864caed85d743d0f97c9d93e14dc4e513c048dd65223f788cef0
+MISC metadata.xml 518 BLAKE2B 940685290555926cd37e06fff845887c6097d9507e0f8c6c22b65646f55a299659c092986e3e285b683f200ffdd4a814960549f2a7280b6a458ca2a4505f14a5 SHA512 7fbee2f5d09edb87987c957fcd506e2f1466d1347606ef7a29aec3b78d8c2be1175b87ebf64114e49e76621e2d97fa51df9390ff94345b4109bf271c78352c85
diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml
index d242506999ab..3ee29fb02a4d 100644
--- a/media-gfx/fim/metadata.xml
+++ b/media-gfx/fim/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="bmp">Enable BMP file support</flag>
 		<flag name="dia">Enable DIA file support via app-office/dia</flag>
diff --git a/media-gfx/flam3/Manifest b/media-gfx/flam3/Manifest
index 3acd6916bc13..3f16f9fee2fc 100644
--- a/media-gfx/flam3/Manifest
+++ b/media-gfx/flam3/Manifest
@@ -1,3 +1,3 @@
 DIST flam3-3.1.1.tar.gz 1181954 BLAKE2B 9691647704e96052f04f79b59b55b47285940ada3486ef6828d1e95934c5741915bf0e4f11c3ff39da7b5534b5c6c9ec16a88bc0568ac65c8a4b5d4aff9c8d29 SHA512 8a84840d9cb91d63dd0ba5c8a6725f703f6315a7add0c091502c0dac5c77eb0495054bb4b601f72454dea0def99131ca679095da65eeebaae9b01dc59cf75e7e
-EBUILD flam3-3.1.1.ebuild 752 BLAKE2B a3610475d5b8ca2838ff1e63e8762f6abb33c81300eb1b347f808e1d9f73c883f91303130d6b7dccdb3f7cfe8ce12f7b3c22d41fcbb3262c27d970820e6c7fc3 SHA512 040bd665e40d14196122a32bdc39b60f9d120bdbf7c93e0b4134879fd1d57c6dd9ad0aac4b0c0ca5d4ef9090a54f93e3ba826eba1a3325aa75272fa5cfc518fd
+EBUILD flam3-3.1.1.ebuild 753 BLAKE2B 42ea277494de993383f4b16a383a20a9dc1ff52bfc7cf0f092524b5ad8f62a542ea88e37456afd9b9e521883af62842dbd645433dd43a96514d3a67d37464599 SHA512 afded1a293e601f2873a8c346cbbcc042d627ed254fafb90f54f7f8dadca5930cda1c40fc04160bfa18e19c08c1a56bef1eb3f2a2321eca13fb8e19691456257
 MISC metadata.xml 322 BLAKE2B 8fa31c5e84e310169a863d1d66a77d73cff819cf595acfd7fc8f23c90a2271348899e8a5a5a5a184ea7de9428aebf7d841ab0a035fdc28f0ecd312396dcf3def SHA512 98b61c299f8cfa8c42a5f4b5b51b9eecbdffe3632ef8fd687afab26454fa8fccb71348a42cca69fbae7d154f69814feac61c4109ba671dd2fa413bf75e0445ca
diff --git a/media-gfx/flam3/flam3-3.1.1.ebuild b/media-gfx/flam3/flam3-3.1.1.ebuild
index 4ac1899f81dc..bc2cc8e1aa49 100644
--- a/media-gfx/flam3/flam3-3.1.1.ebuild
+++ b/media-gfx/flam3/flam3-3.1.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools eutils
 
 DESCRIPTION="Tools and a library for creating flame fractal images"
-HOMEPAGE="http://flam3.com/"
+HOMEPAGE="https://flam3.com/"
 SRC_URI="https://github.com/scottdraves/flam3/archive/v$PV.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 888b1c655386..b14bc881d9ca 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,4 +1,5 @@
+AUX flameshot-0.6.0-missing-include-fix.patch 869 BLAKE2B edccee0ef880470652535d65797800dc675e40556e4cdf560e257e60e649924316e5a0fdc271507763d90734fc60290e1ddecab417148542e8b318041ca9690c SHA512 852a3c12e1fee4a90e6a31c5c17a371a2b44fe1a399a6e11f8a760d5436ea73fa7aed9ebb906f67f7efbd4315e9c092c7cdf76a464f916df6893cc13bd361f7c
 AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
-EBUILD flameshot-0.6.0.ebuild 1044 BLAKE2B b54aeb9ea019849b743108c8b8b93b5934488be6e1aeee1d50d6159fef2a6984acec7a98d70fd701f9e29078f16b8ca6218bcd2e5088cfef2a470cc920ca69cc SHA512 c517237fd626e61262772f8b47893302b26d1b0f51d679d9ec656f9f1d02e1e441319e951f79aaccc7816ceb2207e5f270a4019501b44ea47321a41149d86ac4
+EBUILD flameshot-0.6.0.ebuild 1091 BLAKE2B ce6e09d94b1e634f32f8bb2fb59cdad200201aa81845dce1067046c7c86d1ef78a856960c91b16263eb80e6ac8849826dced4a25bb70c517d614cbf7fff05db9 SHA512 97d3a629128bfd55e378147590964e17646e86630e862e9b8720ecf7b271b9e55ff33d9dd06cae1bb13f735a016b6a706fc555163ea9ec882790915dee5b07ba
 MISC metadata.xml 366 BLAKE2B d8c8e83d8fb96199510eb45285312ca146aed73d76fd29ef52cd12cedd3b792621206b8ef064694ee60e12f73b932c6466051c85d0e1e2d8782aa2c00cb0bca4 SHA512 1bf8b212a62d64e14786dcf7ba6f97db414e04655fe0625d5ddc5b86d0e36f0c285f9722cdc1fedd39284e1331b167b947546c37b8a3a5441d59dcdf792a2506
diff --git a/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch b/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch
new file mode 100644
index 000000000000..f6b2ea457cbf
--- /dev/null
+++ b/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch
@@ -0,0 +1,22 @@
+diff -ru a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
+--- a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp	2020-05-29 22:47:56.183333313 +0300
++++ b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp	2020-05-29 22:52:19.147998709 +0300
+@@ -24,6 +24,7 @@
+ #include <cmath>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLineF>
+ #include <QDragEnterEvent>
+ #include <QMimeData>
+diff -ru a/src/tools/arrow/arrowtool.h b/src/tools/arrow/arrowtool.h
+--- a/src/tools/arrow/arrowtool.h	2020-05-29 22:47:56.184333329 +0300
++++ b/src/tools/arrow/arrowtool.h	2020-05-29 22:48:25.688787364 +0300
+@@ -19,6 +19,7 @@
+ 
+ #include "src/tools/abstracttwopointtool.h"
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ class ArrowTool : public AbstractTwoPointTool {
+     Q_OBJECT
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index e3d9daac1c78..08fa91211c6b 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -25,7 +25,10 @@ DEPEND="
 	sys-apps/dbus
 "
 RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+	"${FILESDIR}/${P}-missing-include-fix.patch"
+)
 
 src_prepare() {
 	rm -r src/third-party/singleapplication || die
diff --git a/media-gfx/fontypython/Manifest b/media-gfx/fontypython/Manifest
index 0b608c568ab4..4744d8e1e5a4 100644
--- a/media-gfx/fontypython/Manifest
+++ b/media-gfx/fontypython/Manifest
@@ -4,4 +4,4 @@ AUX 0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch 961 BLAKE2B
 AUX fontypython-pillow.patch 1275 BLAKE2B 0ee668b07c1f7a888753db50373e65879c906d39402a7271be46d840a1a0e9dcb90c19365740b0644971dbe9e4c294074073c1ab5854f83bd6929eb554e6d148 SHA512 6efce50dee7fd69b27803143371bb3bc9c51b1c027a2bcf4bc6543c130e71462ee79b20efa1ac15ad1215c225e053e8cf1203704ba41eefcbac82c93f597432e
 DIST fontypython-0.4.4.tar.gz 361335 BLAKE2B 9e9f3f0e3b67509851fbf0c061af5754991d4087d7f4a5b9ec0ca176690c4f0125fab82546cdbddd39e0d1f2b4631396628df7c9d09a0dabadd9f3f2651bce6c SHA512 a89c654c9dcd8fc89d3ad91772f856d2d2570a96b3b60f52eed9db217f45e91a55f3044f0e4d1736c5402cde3a6598a353ae59285c892e80034f7baba15f9825
 EBUILD fontypython-0.4.4-r3.ebuild 1003 BLAKE2B 1758520625513103adce6e48e7d388a6162e1e2e5f76c88949f99b84e211e007ce3c3edf7e09c5bcecbeb9f727057c99f2d8294f8469d67c64b942d0fcaecd59 SHA512 ed549f3ab5ab4cd9f921d92849327195f057a012c65a1fb38b66cba60a4ca42d1215d5700fdb688a1c24b78acfbdeb81afd1fd10780717b3ae116a4dc6eb7f8f
-MISC metadata.xml 357 BLAKE2B 47da1719c00da1212007063d50c63bc186302d316bdefd26e1d9f0e5c3e448d330294bdfb125afdb8849f77cd61fde0c57b088ec3805a1ac4251501dc7fa576b SHA512 615effa7f81e3a5867919687e6beed7ff4f1c8e4faecc4f2db5c8e93e6f8d3ac15aed2ed2ab3fd40af952281242e637bd14d11cc4187e540b522a7e476590208
+MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-gfx/fontypython/metadata.xml b/media-gfx/fontypython/metadata.xml
index 148a6e835481..cc081897d48c 100644
--- a/media-gfx/fontypython/metadata.xml
+++ b/media-gfx/fontypython/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-<maintainer type="project">
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
diff --git a/media-gfx/fr0st/Manifest b/media-gfx/fr0st/Manifest
index ccbcec58e676..0253bb413e84 100644
--- a/media-gfx/fr0st/Manifest
+++ b/media-gfx/fr0st/Manifest
@@ -1,4 +1,4 @@
 AUX fr0st-1.4-colour.patch 342 BLAKE2B 78ea214d35a1a47eb51d40c8bec3173e8515db69926ee89616703afa832101a5ecba124aac85239c093ea1912ac9298edb6e866a63bef8678985f71b4151b286 SHA512 f3f6fe3af3dca4f709b7fcbd9b8f6c2b089c5cd7b1188a874b16d13eac9f3aae959ed5065a6ecf92ee47080ce25759c8180b86d1c9bd0f85e655217b7bd2f4b7
 DIST fr0st-1.4-src.tgz 1535978 BLAKE2B 1d1700665f6747d0665594e255d8604b1fad576aae21b73a435aa95174ef199bce0fe6d436ee3f5072fe5474657995533675bf7c9b16e6787523b1db4bb189d6 SHA512 d4ececca724bef264097466328e98699efbf82d999107a1ed8b21b938fd5025b888197f021ac56c7fb008226f0230bd058cb94efec61bb59d67f2263d3140ec5
 EBUILD fr0st-1.4-r2.ebuild 1164 BLAKE2B 830cbae5976bb8f9d5b01f4982c9c18f4699ebabc10f41c95fe12e220cfa5a6e8bdb54fd9e1e842fdec2a6c6852899b74e9da7f3a60232648ac7c8643c09b976 SHA512 9e9322bcb75dbf53c78990826418fb4a9fb5c5552f208b0d4053311dde46b5762aae407419adfb19dad3381642ffc32b4371dc84524f3ec6b84171df0022a3b4
-MISC metadata.xml 332 BLAKE2B f3bee4c98bb888697eed1c7cfbacd104938ac1ecca79c31d2c3afb8853bf8e7c61dc6a97a875994e3f5ff6a58eb4a2078fb884ddda4f3c48c1416eae17e26e61 SHA512 9d0d54e496ce20b092cbc4080e326cfc3ccbb9d9f6a5ac2c40a12a3647c702fa018832bb701947819bc09d2704e397ebd391fc74d2010033da379ca18964d4ec
+MISC metadata.xml 240 BLAKE2B 203cfb53065168e358c3d2a5a437f6b1ff784f2e375aa7b25e9b6fad79e15d2bb291e8536ee332cb49b23519eed8113121118258d9f434dc5833b592d44c73d5 SHA512 1248dd2251c4efb2cb36b85654237f2be88561cd2a740e650d263f76f051eb8ebeda0b359790af05dcac3ed8b01c91a0b6d600d03fd376b3a65d706db980d6cd
diff --git a/media-gfx/fr0st/metadata.xml b/media-gfx/fr0st/metadata.xml
index d503ce096805..d8b5cf01c15e 100644
--- a/media-gfx/fr0st/metadata.xml
+++ b/media-gfx/fr0st/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">fr0st</remote-id>
 	</upstream>
diff --git a/media-gfx/gif2apng/Manifest b/media-gfx/gif2apng/Manifest
index 1838c8eb54d3..635bc1b326d5 100644
--- a/media-gfx/gif2apng/Manifest
+++ b/media-gfx/gif2apng/Manifest
@@ -1,4 +1,4 @@
 AUX gif2apng-1.9-makefile.patch 529 BLAKE2B 5e3a0fa8b5e05b0b69f15e4fe6674efa114d09c8abb4c96b538cd19655509573e6d951581afb665ba7568e9460ffb5e5ca98820041f83f559048cdcc34ba69e9 SHA512 f76e3249e8c02b4b4381a2bdfe34bba31f52d4552271b2e66eaab8214366f3464b24624cacc3597b74dfaf7c198d513e18bf9888eb0478e3372e6d3f3eccd809
 DIST gif2apng-1.9-src.zip 258946 BLAKE2B 217cb4eaacf80b9a9ae4eb7ea298106d9763c825110c154b95a80e83f12ea9275c0b5bd7f2998fab6266b3832b5cae76badda7bfff1c992f21d31bba61016041 SHA512 6f161699aad949466c60e0fb6abb2f38e7ec8353dd15e65ccb9944a66dabc5a4acf32523cb64073c73290e54cc2b753db68123c14f3f7789343491a4f65dcd2c
 EBUILD gif2apng-1.9-r1.ebuild 640 BLAKE2B 84943cc21352fd36935b183100e45eec667be7a19632fd86251e17e1a65e28e2d97a8704019494951a467778d156d1dffa821a662b3dc74862cae51d4d6f18af SHA512 ce73b3e42b02b2f669fee62709a8575cd6b1ecfdb559fff4ac979dcd0bac62e5271520bc7974f55412504b8ba2ad5a032aa8f13e014c83e68e1b6e0f2fcae1f8
-MISC metadata.xml 337 BLAKE2B a5a2deba060502265452f5683a5965a92a983c7db45d06ffc0b7998c962f478833a5f7a0ca447804f62effe52f8e4f3967cc5053cb0c1d89502f48d93db9da0d SHA512 f086dad518faacba9371c089e8b97651dd45d5c1fc655975dc3fa2e553c9d1026b41a46bc839df23ef60a5529e0261a9af91de65e763b63b2e3193d67f2df7e5
+MISC metadata.xml 245 BLAKE2B 1529078b6dbd10e5ba2078f221236d8e332fe8c2ab24da1a49b3a657850ccbfaebe24e30c2dc1f2f8f789f7d6bc1486bb3bda058ffa19c9a6cd8f97f09101fe5 SHA512 8904dd32a4c75882261c1a1b1856ac897dd883f50f15ba2659c11b882eb5fc3dc082095dd5f663c60cca06a711badc49870291593bed08c329d150561d8558e5
diff --git a/media-gfx/gif2apng/metadata.xml b/media-gfx/gif2apng/metadata.xml
index 8edecc7643d8..a0efd2e5bb0d 100644
--- a/media-gfx/gif2apng/metadata.xml
+++ b/media-gfx/gif2apng/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">gif2apng</remote-id>
 	</upstream>
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 6761a3fd30b4..1382260654d9 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -5,4 +5,4 @@ DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02
 EBUILD gif2png-2.5.12.ebuild 824 BLAKE2B 9102092ff19c7f7c8e2628a1d93699c628202e50f0d587a2c05bf0c6dbe7cbb51f524403435552ca08b3c98a6666822eda153e363514a73a01f99bfdf9702a6e SHA512 22fd274b541e4779a990009a3365a830f85b26835385c1ece11a3cf266474b90bdab477bd73e15a91e32c5c947565c7519bfc3dba00d1fe87639a06f1e740ca1
 EBUILD gif2png-2.5.14.ebuild 581 BLAKE2B 0df0aa0a58cd5d1121c69601672bc54b7c075bb47f284a09241b18c7d562b0f402a7cfcfcd93ec1b46e867d4f89d62b335d60141329fe10d340b763383d14a66 SHA512 238c5a5e2ddf9268b0788a1335f17b59e12ea3847a399a295a4dbfe61b6dd535c4b71b424602816ffade5dab36f4b0f13fdfa39bf36ffc96c267137f9e923940
 EBUILD gif2png-2.5.9.ebuild 472 BLAKE2B 7e87e3e7bcc682a9d0642882312fce3c9cd70a47a427be947989cad1fe66f49fbb82404b417c8388c60cc4bd313a4ca6a94062a430ee465403f1ad0031e31734 SHA512 e3fed27af7cd3ccfbe2ee618a547fc3a7a5729cef1fa48798a9f8001de6b08a23ce67a239cf33b96ff8a41a49e2941c1f68e93271de626a7a605813ac6745d8e
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/gif2png/metadata.xml b/media-gfx/gif2png/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/gif2png/metadata.xml
+++ b/media-gfx/gif2png/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 4943fa76dec4..3d345a70ddd5 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -2,4 +2,4 @@ DIST gifsicle-1.91.tar.gz 571588 BLAKE2B be3973141e57618d50efb5205f79e485a4450ce
 DIST gifsicle-1.92.tar.gz 575199 BLAKE2B 53716621846b14c0727e05893cb1876572ab80aa4d444c2b75499b541a19a5e45738b817c203b3926301378b2211a3263311c424cd8dd53e71d2b60f28ecdfb3 SHA512 5d9539eb5a6a8b87aed49ff3ca3d62e337845edbd05459b002369d571f74878c99740c34f50b4c86e5b8787ff189d4c21230e4f9019cd96a09db603afd7563dc
 EBUILD gifsicle-1.91.ebuild 664 BLAKE2B 68b81b9e33c05331fa0b57886797b3f5a7629b9736889604c1d284628719bcfec5b446ae43eb2711145ed107681c20896d18d58d2caa5a6a1e39ccab65da0619 SHA512 378e4bb6251fe7ffed3263229aa20a6c4f0d2c3be6154049f91c9535b27f5e0c105b31c82c28870941921c2c42da6d104bf5a877ab36f706b45a3cb463748f8c
 EBUILD gifsicle-1.92.ebuild 664 BLAKE2B c2bb30c984b892252b5c0f6b88197ac976d90d94e9c20075630e4c793e74ff731218e4ac5c819765c6fc61390bc00d44d8294933d2fd2b36f9ab56e2a9ffc8b7 SHA512 5584aa0b1d3cbe06fc693709f8e600b34dddde0cb3febf4a35ebb76cdcdff4be4e76cdace85b47b94fefe7793a0a9d0cfcdc1e629d2c1d1b104dfdc77fca1a8d
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/gifsicle/metadata.xml b/media-gfx/gifsicle/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/gifsicle/metadata.xml
+++ b/media-gfx/gifsicle/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index 8e1c7a27f6f1..82ca3edacba9 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -4,4 +4,4 @@ AUX gimageview-0.2.27-libpng15.patch 601 BLAKE2B fb97fa8cc84927f03df462ec09d3a31
 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 4cdab9a02f7a1c145e05c3b66d8cb686b936bf9cd1be776c9d60c93a0d99d6743ece899044c9aceaea3c317dd37091b7b5974462dfd32530c3f32beb0a01edff SHA512 d4da7255f9981dcc850e76b94bc3cbe7cee8875e3dd346fb9fbdcb59fcc8d1a656340e88d9fd3ab1e01bfd9d2845b373a50e33af4444ba056b7d7fb48f29dc0b
-MISC metadata.xml 340 BLAKE2B 6ffbc043ec8ce9eaeb4554c7edbe786c997c5d1d79f265d0c435d588723a411ee8ec69243e821c2f7ee5aa2af3724e81d8687caa6f5ea781a0ad1ca54ba9879e SHA512 74355232aa8f1b9102de0ef61115dc39ac98890ddc93d9c0a595338bc2d23eb455c2db8fffa150c548ed5e8caa73817c046463c6190bce46761b7e17e66d594f
+MISC metadata.xml 248 BLAKE2B 73b24d9b798f81fcb841c813142b07b7fe872ff2c9dd6a51f7d205dbf4b3f6b9b1c975d22fa265f2749361f4bb058ecf90d8525c36ba28e6f32c3855599a8333 SHA512 61a3b73ed8a3baeb3886b73a3c578eece805577d7708771b09ac4c82ab8cd8c08c65ee185fb1eba8b4ad3c79442b4e769bc9c72a60ba9a6f9438623360058a1a
diff --git a/media-gfx/gimageview/metadata.xml b/media-gfx/gimageview/metadata.xml
index 9e89a41837a8..119745c2ebb8 100644
--- a/media-gfx/gimageview/metadata.xml
+++ b/media-gfx/gimageview/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">gtkmmviewer</remote-id>
 	</upstream>
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 95af278af26d..0385dd3fbb5e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -2,4 +2,4 @@ DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757
 DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
 EBUILD gmic-2.8.3.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
 EBUILD gmic-2.9.0.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
-MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
+MISC metadata.xml 455 BLAKE2B 3854d23d62226a85f06404a3df62db1520a966a921137768f90a64bf2fcb0235f0786b8187154a0758682551eae61550fd571f7dfd940396de6f03fd6be204ad SHA512 95088719b28034519d74495a7232695eedd527cb031f65b808ac30d4cf0fc8ab2bca2271d02ef285f338d60151b30f0b3420eb29a45ac4f8a8922ab6b7e42a5e
diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index 1cd8c96cdcae..aa4cb5a5a511 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="cli">Build CLI interface</flag>
 		<flag name="krita">Build <pkg>media-gfx/krita</pkg> plugin</flag>
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 34ab2622a22e..2efaf114aaf3 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,3 +1,3 @@
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
 EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1666 BLAKE2B ca6a2f20b4cd279798a3a6e3ca9471cc530b131edde088cd511a0ee4f5c0bece2e7e27e5813b91ff66e79856892aa8695a51a764248589ce5661b64b787d1e5c SHA512 eca186d36beba57e9a77e36f8d60224867217f5f3ee6993c16665750a435a32736a82fcbd22077b0d65947dbbc78b6105378cabee51b4d0e294094a269537a68
-MISC metadata.xml 403 BLAKE2B f0bfac9f73e6c64e4535ff9dd389bd65bd622ba3aa0b64d52ef1f3b96a5cf0fbc4913c311b3e227fd9ac91c18f3d78aa9ae085c7610b06e768a39f6f5993121e SHA512 ed69568f628be6a938f2f2cd9a7a2610b881f437ec57eb12baf803b00ddb5f62e7d562a1743eaff5a3fc8d083802cac05ed965aa0d473846e94aa526e66babb4
+MISC metadata.xml 311 BLAKE2B e595489db486352ace6f66c3d72be3f47857ab75d48b8c2c2964bc2466d372eefa5e503f2c089d88cf6aedfd7d076a6595f733b883dfb25276567de67abc6911 SHA512 392ac93a529b535ac58ad270f8d5d4ded4b1cd8914604ef9533dcdf10c08a05e3afc6800f3eb7b546c856e608444a662c6cfea8b436936e1931d7fdfe43b676b
diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
index 38cc24b2d952..052b81b5cf3b 100644
--- a/media-gfx/gnofract4d/metadata.xml
+++ b/media-gfx/gnofract4d/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">edyoung/gnofract4d</remote-id>
 	</upstream>
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index bd2f910c224f..e73dc32ed3c1 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,4 +1,4 @@
 AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c
 DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
 EBUILD gphoto2-2.5.20.ebuild 1327 BLAKE2B 4f3dc6bc23983b0148ddca2dbeb2ce7aba01f2dc0a093e6e910e95992f9b67f3b0d2b1c86aca1e8b730730f6edc220830c60b87488e0356971b58643c70a8a34 SHA512 b1362759378142e6b071ccf90b7391af72bd5edabcd2b57f542b9cdadd10848e34afc3a0d9d49f8f13728368caf0e19c57a81a315bdecf6a6b1166d3190414c6
-MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
+MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gphoto2/metadata.xml b/media-gfx/gphoto2/metadata.xml
index 842fcbe7e761..d2ef3b521ffc 100644
--- a/media-gfx/gphoto2/metadata.xml
+++ b/media-gfx/gphoto2/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
 	</upstream>
diff --git a/media-gfx/gphotofs/Manifest b/media-gfx/gphotofs/Manifest
index 8c44706c5737..41c92d47dae1 100644
--- a/media-gfx/gphotofs/Manifest
+++ b/media-gfx/gphotofs/Manifest
@@ -1,3 +1,3 @@
 DIST gphotofs-0.5.tar.bz2 261357 BLAKE2B 6c8194308b461fe8b88aba3e6d16a15715cbb9f247aed2f57147e7192f342e3dbb26d0ce112b0203f73c078333706f717eb1822b86b1e0b5da4e632174907b55 SHA512 6f5bcaf8ca820c0590ec95af55ec9438c864a298660ad15c6d6e8f59201a7f873d29f16cf77d13538111f6cec3f958ea0ac88c6c51836ab2d8c9d6cca156ed3a
 EBUILD gphotofs-0.5-r1.ebuild 466 BLAKE2B 3f6c561769e8efe34b2c93bd2e8e453b64d073867260f5a6cd3fefbb7bbaeb5b0b272071d57e7cc1ca173c713f40c1a35847e78e0033f2b46844319e3d187202 SHA512 96f96cda5590aca31efdf280a6c77c27d885a94250fc4f968ab81de4d3585168f9010e679e48ed9cb035de2767e5effb215afda8e515f8ecaf329317b6e92812
-MISC metadata.xml 446 BLAKE2B 18f2eb77d8f9427330eacbd64d569781416321b6a92fcee1038000f3c1b5fd09c74be486d2647f310273713fe2fd35f837a8e6dc246882984a02cb655011c130 SHA512 619180d3c610d109b8a379a83995c56b74cfb33af9bfb16c23d4fd95a0790a1f43ad14617f2024a58d7fca5886f51c7129c542adaab0a6db3b1b9583efce036c
+MISC metadata.xml 326 BLAKE2B 3ce95e0564e968381ceda61f22bc9260e6efb19f319be2246775ef1709cf346ff1e46b5ac24054e68a8459173dd4e15cc0872473585521576f863e32794ba2af SHA512 9e097ba9905cc0f6b4987e3f441348d7eac8c156394393d020e70d1620b80c7488389f9618592709ed7c4216249d1a18a89b4483de86f2ba0384e1f413bea9f5
diff --git a/media-gfx/gphotofs/metadata.xml b/media-gfx/gphotofs/metadata.xml
index 3f9c388f95cd..6ad0ffe21943 100644
--- a/media-gfx/gphotofs/metadata.xml
+++ b/media-gfx/gphotofs/metadata.xml
@@ -5,10 +5,6 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
 	</upstream>
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index 656daa3d9943..8a983ebf4061 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,4 +1,4 @@
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
 EBUILD gpicview-0.2.5-r1.ebuild 653 BLAKE2B 838de94b135c79ff24790e6b607b9caf962784b3eede113ab839ddb1353f551a2872980e68f59f82b76bfb1e5971d816b690f952c8896995e1691902175d49ff SHA512 ff7ed4054a9c8d5c77b65c4c2ffbde2016fff9da83e942529e601e88119f5b5a6a1931c869e01256bd3168fa9146cfc56803366c13afd3f5595bf8ea78744068
 EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
-MISC metadata.xml 333 BLAKE2B e47d0b060a5ec16432ef5e75d3e04a18fa92dcd971052fcdab91cf22db89e44133e54afe7825796f460a00abd78d0163749f2723d51819bcf68c97c3f13a278e SHA512 504286d76109997d9e035c004b9f7292dd706b7899f9691c1d6e6c3a96ce04f39b56061fae5b117af79c95c18a21d154a25f46750ff133a88f47bcb79a0b4971
+MISC metadata.xml 326 BLAKE2B dbbd9ecc73f5ec8f23b39346f657c68efd9b673e1faee5930e503a9a5694cc9f8931a97083e282006a931a30bdb577d1b347b6c2a8dd3cc959011e4837dab9be SHA512 0a80530a6a1e3884352fb68ea8e4f0cd0fbf685201ef28de590233fd43b111c23f6f5a2a3eccc450c0bc9f08d58c565c90e80f04418cbf8880b101f93ca1aa3b
diff --git a/media-gfx/gpicview/metadata.xml b/media-gfx/gpicview/metadata.xml
index 2614d4cdfbbe..2d50c260c4ee 100644
--- a/media-gfx/gpicview/metadata.xml
+++ b/media-gfx/gpicview/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lxde</remote-id>
diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest
index f4729b1e8b5f..ee369492b1b8 100644
--- a/media-gfx/gqview/Manifest
+++ b/media-gfx/gqview/Manifest
@@ -6,4 +6,4 @@ AUX gqview-2.1.5-readmedir.patch 257 BLAKE2B 9db86f9542121dd8f0a0c3004b945adae8a
 AUX gqview-2.1.5-windows.patch 561 BLAKE2B 142f068e495c2dcd090649f93b8f3a55ca894c76d31deed0403f99b0830750e133ffb1e6ad651454c6ef01e95c35571b3f30f3502a2eef2d3e01174a20251441 SHA512 f4382d81362efca9decd18f93ffcabc5eeb36251b67377d35a6de87eb0672b24e15d82610b64865415fa23f6e26090c557b7f1df8092cf34b38f7106dd7a33c3
 DIST gqview-2.1.5.tar.gz 1685061 BLAKE2B f47c0e5937ea87223c2110b148c5a52b912d6c65476e5f2d67377e544bb42cae919796d1714992cda6f0e7e7409a7bd0dd6689ac37d2da41254118b699327b9c SHA512 a9e184f9bfbcb789fa732f490b5b1883aaa4c153fb924e2995f36ddef2d170ad9d0695689221d7a0ccae587f5de07b34ca03fa407f774ed3505d0183bf44b555
 EBUILD gqview-2.1.5-r2.ebuild 1126 BLAKE2B 2ed44ec0096fe5c38b3b1106b4cd678c36e2465a67bf60b0902c8cbed95c09da2183194e319c4f87bb9dde1ea8b0919d174a41c17b6ffd01d501bec0ef3664f7 SHA512 bab3680014f333becf847f42645793f794a7561b7db6c3d03810e577d9b39f98e41e25e957d8ea27206efee12b9022a103cc798ab78afddc2716343aa5e956fb
-MISC metadata.xml 447 BLAKE2B 632ee924036fc4dde09ca3a05043ccd38e4fbc9583ee9498c1fdf87f6d91ac944b1c600f9da68d33a498c137d4133c2a53f8d03677c50f228ef30e5c108a42d3 SHA512 f6a5af4d1e5effb6e9cf58edb237be34d69bd9927ae8f2f9fefe88303bd2936e6f58f09367977bf9c9c814d299465e0acf949c045df9177bcae15598fbd6534f
+MISC metadata.xml 327 BLAKE2B ea87b42c500a8abef98a4b3db6f2ee8e328e19d1567f1ef005d6eb13350738028b14e24a32e5f937a72535104145a9a7356d29522070a41258a0a336b96f5330 SHA512 11072de25c4a5e21242befac6ad979c98da602b717a75b3d956c8a575fa1976d06fc4623501873bafdb4a7c5481e02ef108720c9cf3576ac70cd2079729bb366
diff --git a/media-gfx/gqview/metadata.xml b/media-gfx/gqview/metadata.xml
index c5c6c04060e1..ff7e99eb02ba 100644
--- a/media-gfx/gqview/metadata.xml
+++ b/media-gfx/gqview/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 1822745f8f41..bdbabb7027a0 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,4 +3,4 @@ AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc711
 DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
 EBUILD graphicsmagick-1.3.35.ebuild 3085 BLAKE2B c0e6b0a3eae4087a3aa5130866629037ddeae03fb63dc0914b117ac9f7345f1f18c0ba2e41a9fe06fc80fe206013636f75d1a44c62e300487763bab2ed8f58ad SHA512 eeab4b3a5b8a8ffc5ee810125d5161b18339f06e10883a692592b9ec1f7c4296de9a56459f57f033d378a8638da4d8b30f1d04c5d16cff9d108ff99c8e2dc763
 EBUILD graphicsmagick-9999.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd
-MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
+MISC metadata.xml 1057 BLAKE2B ced303553eccbba9ae91f30b3700b331149127c5a17a66bb166bff4139600cf208f3b15f8fa6fdb02594f3278ce7acd2bf6972df42c04dcb4f695710bb3870bf SHA512 9ac680de061b6dc0acd0d3a31587e0b53d3d7bcea7425909a3a4ef074fa0e32a999ecb1f48a64bb2ab55249fb5bbdc72974681fb26a879c4e5a4c9f3a04d0e82
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index f6325c408643..311b330eff12 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
   This is a port of GraphicsMagick(TM), the "swiss army knife" of
   image processing. It provides a robust collection of tools and libraries
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 2bcff2a8f481..192ee7c234fc 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,6 +1,4 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
-DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
-EBUILD graphite2-1.3.13.ebuild 2661 BLAKE2B 22cde90b2406128eef2cb8401471410a0b5a620cffc76f93b30125763aac3012b03f93609a91390190bf21c97dba466d78ac2814f724e5065d28dc817ebe09a6 SHA512 64e799506bc2f08692d377660eb36f09266c6b4f098f8189754a1e844c7ad965fd208a4160552b0850ab6295c6df95b67832ec77be3453acf00a977fd88a4ec3
-EBUILD graphite2-1.3.14.ebuild 2668 BLAKE2B 3b6c68c52dd9b96906bdc8431841b3225484cc4e55ff37515ecf787a8c739faa775fe22109daa3797fbebcff69ba0760d9d1681c118626a825d165a1b1e5f74e SHA512 8fdcb533e80196dbb22628c962821afa7e29ccec8927ac72f54fecb489d77d56c538f4eda2038e66acbd30589da7729afcd8491a57735e1ac1c0a7a83d7d4637
+EBUILD graphite2-1.3.14.ebuild 2663 BLAKE2B a854792c11d2b5e2a1d7d8bb4d7273202fad4a462434d47e4e9c9a87fe7b0602482fc464f327e7861fa5615e60d43725f125e865bc0451528026127ba863883d SHA512 b38a2c21778512f8c390b96868cdd64cc1685c22fb6906be7dc71ece4a5f55c3514668a835105279090179bc8f654d7259934ae95ba4c054bc781034ef61cd77
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
deleted file mode 100644
index 8f59b69ddd67..000000000000
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-CMAKE_ECLASS=cmake
-GENTOO_DEPEND_ON_PERL="no"
-inherit perl-module python-any-r1 cmake-multilib
-
-DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
-SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="perl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Locale-Maketext-Lexicon
-		dev-perl/Module-Build
-	)
-	test? (
-		${PYTHON_DEPS}
-		dev-libs/glib:2
-		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
-		media-libs/fontconfig
-		perl? ( virtual/perl-Test-Simple )
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" )
-
-pkg_setup() {
-	use perl && perl_set_version
-	use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# make tests optional
-	if ! use test; then
-		sed -e '/tests/d' -i CMakeLists.txt || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
-		-DGRAPHITE2_VM_TYPE=direct
-	)
-	# https://sourceforge.net/p/silgraphite/bugs/49/
-	[[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=(
-		-DGRAPHITE2_NSEGCACHE:BOOL=ON
-	)
-
-	cmake_src_configure
-
-	# fix perl linking
-	if multilib_is_native_abi && use perl; then
-		# we rely on the fact that cmake_src_configure sets BUILD_DIR
-		sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
-			-i "${S}"/contrib/perl/Build.PL || die
-	fi
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-	if use perl; then
-		cd contrib/perl || die
-		perl-module_src_configure
-		perl-module_src_compile
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cmake_src_test
-	else
-		einfo "Cannot test since python is not multilib."
-	fi
-}
-
-src_test() {
-	cmake-multilib_src_test
-	if use perl; then
-		# Perl tests fail due to missing POD coverage...
-		perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
-		cd contrib/perl || die
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-	if use perl; then
-		cd contrib/perl || die
-		perl-module_src_install
-		perl_delete_localpod
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14.ebuild
index 6c4aeeac8686..ce5d97c4eeb0 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/grub-splashes/Manifest b/media-gfx/grub-splashes/Manifest
index d54732442ae0..ed2aed7bfce4 100644
--- a/media-gfx/grub-splashes/Manifest
+++ b/media-gfx/grub-splashes/Manifest
@@ -2,4 +2,4 @@ DIST 49074-natural_gentoo-8.0.tar.gz 278632 BLAKE2B 3318f98c80cc9be652fae4e6f115
 DIST 98478-gentoo-splash.xpm.gz 18681 BLAKE2B 65969e247cd7c348c4a1c3cd4de5e4d3c4e888eefa11166b1be75272c66b2c7d88beda3bd25581c52d3f7325dc4821f15350bd826f5974444b48ccca19424ea0 SHA512 ea3b6d284e5d41462dede7705a2aa5b6655c1f6aae630cd508dc653391c741cf0a3f487e5694e50769e23696c16279280f89325cfdb47994d8d7210eb447117d
 DIST grub-splashes-0.1.tar.gz 180413 BLAKE2B 4007da6ee3ce221ca6027354c611bdfe54645b484bedeaa84664a82fccadb46a4de2b3bd0b3c9a8eef4af2fce9df23481e9e2f9a18e1999be28245a4a50a3e37 SHA512 af96ff45778ccf062d26ac1fd0ea9cf47678faf9c0891040580e0563ef5591fc9b2c34d338568b77c0683d7c8814b89ff7d62dec582fb714ae503a86ff6b84be
 EBUILD grub-splashes-20091109.ebuild 1018 BLAKE2B d6de69050ad2bff9aadf8de3bda78be792428c4289bbf5666f3229a01f50307049bf45f1ceb3f9eff088fdabb6705ed7665f61efc1e045ed2ef75e01872d66d4 SHA512 ec9ab1f189473f71d65652a32aafdbee502203be6e1f359d5cb7a154eefa7163d9fb3b859091e6967df777a70410364e2a154d201cfc1cce54f26d314919abb6
-MISC metadata.xml 374 BLAKE2B 9019c81d0ecc6c5783e8d8ef129f4edce968b6b622c6acab24ec3481341bdf0da9479f3eadbfcf714c183b9ac2ba23c8060ee0052e931714702e8f95a6187e54 SHA512 3a7bde7a98a32b728bcc93ff3aca84b44649475559bd06845f6f1d0994c681ee91d42c72bceb5db1eb267a951b3101ce593d23ac477c21d4e68f073d0e6ef78a
+MISC metadata.xml 285 BLAKE2B 3c801bfc26d50b4fc9411d16db1e969d5c4a1a342313f56764cc018d3f251bd4829b07eff39e4a3fb517972fe93a58433c3913c1820d3fad1a265ff1b6b5da32 SHA512 ed2ac793160c53dacf32e536c21c9d138bb7634bf54a31cd8d5efb25de87639afbb80fee2c8d772830845ec207f14240bc6edf233bfb68aa3c8ff74d9b52605a
diff --git a/media-gfx/grub-splashes/metadata.xml b/media-gfx/grub-splashes/metadata.xml
index 3834e3316ab4..a9b4714910bb 100644
--- a/media-gfx/grub-splashes/metadata.xml
+++ b/media-gfx/grub-splashes/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="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 A collection of grub themes provided and maintained by the Gentoo Artwork project
 </longdescription>
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index 848e6744c7e7..497817882eba 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,4 +1,4 @@
 AUX gtkam-0.1.18-desktop-validation.patch 536 BLAKE2B dfb407a715e16af5068cf0be270aadf67c4d5dac81c15dd4de77b410ccaef1f4a56463a90f37773cad95dd47fbcc6e84398ca201451644e970061d67265bb7f5 SHA512 2b6cf0e5c680debb3b724e6fa1afffafce05d2f2bbf022d51157b958ad6d7f71b4027c8ec29ae1115c30bc8091c53173fea40211b494afbccd9cf97cc209f0a8
 DIST gtkam-1.0.tar.bz2 908986 BLAKE2B 941207d7865144611caba41c4c2e87719cf3b7ba50c1b48e9e5876ae403504443801cce2c14d3eaabcca749ef0e3ba9d95184081333361058d9fbde10ad4e935 SHA512 3b2b8aa5114237dc6fd5d6727e9ae76e88afa3257d0f18d790cc706b737c0a1002b86559621b3357629f9a7fb4d8f321c46f9eec83c7aa27998acb0f48904f7c
 EBUILD gtkam-1.0.ebuild 944 BLAKE2B b582149402711676b16ae305fd700bb9ef256252b5adb409364c003921f106595ceb29d36ea363873ab46de1e789f2341eecf5a55a0f44dcc5f89e06a5b380b9 SHA512 94b699f89877e1eb8ae5513e47ac01060adc3a30b2123b0f96b1ec7c69df6d997397b7fe9e1c294943ffbb5991d93f1a56f335006b362f100276060ae8473c0d
-MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
+MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gtkam/metadata.xml b/media-gfx/gtkam/metadata.xml
index 842fcbe7e761..d2ef3b521ffc 100644
--- a/media-gfx/gtkam/metadata.xml
+++ b/media-gfx/gtkam/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
 	</upstream>
diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest
index db45251e00de..c92f8612d5e7 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,3 +1,3 @@
 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
 EBUILD gtkimageview-1.6.4.ebuild 1214 BLAKE2B 3670654ed740e99716ef8fd930b70de468d5868770ad04ac8d5674640978b5013ff9e26d3db652512746646cd73669417cd2c6d2efea4af2146edbaf32279cb4 SHA512 cf47f073e3ce16b5d2b2d0689c69a2929c96b172b423ebf8dcc63e2f92ffbfe42fdc82abc21e24f2bcd6f3c26930a402b2a7e8242d6c26da9b5c6cd70c722800
-MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/gtkimageview/metadata.xml b/media-gfx/gtkimageview/metadata.xml
index 899a49093b0d..7a38bb900964 100644
--- a/media-gfx/gtkimageview/metadata.xml
+++ b/media-gfx/gtkimageview/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index ddbcf2c385b5..6f243ddc0262 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,4 @@
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
 EBUILD hugin-2019.2.0.ebuild 2185 BLAKE2B 25b087eccf301e5540e6e897161e7c1ccbe907a26b22feefd31a40357602c5f9c61f41e41b033958d0df171c2df04c4e49ee4061f9d0e5db002f2f8ed46c1edf SHA512 89c7d596a4fef47dc3d144ae30a4cce0745391b05760108d6755717413a76bc6bf5d790ec50b0af01a88ced13ce1467d4cc311a24c877c9584df14ad712545b0
 EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
-MISC metadata.xml 445 BLAKE2B ac876779272c1b22b648f4231a766d738bedf3b8a5a195fed926e6976531bc4653181a992bdcfaeaa6bdd9c79c21971025f207681490870209852d561aeeae78 SHA512 f2684887481f43030dbe01cf4df354511e4b294d53d7f7fbb9627cdddeb29709d806c6017f2c32557e4e6e288615ab2430fe7d102ea30072e1ea733d60177945
+MISC metadata.xml 440 BLAKE2B edd9beb71ad5ca4b9f911d5fee827b76ff0ea05f3c4397f30b88dc295e49413bb81b33d716a8345d71da556de1f468642b8ee1aa2b34e9f6e0a7280199452a71 SHA512 19ff0167fc23b4372e57925085286be3170a442f5952f5ac4b10a6ff7426923e4b7653bb679416ddcc0df5846b602a0b13420984790de347bcd4e3edd9def932
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index 637ee9b92882..ffcd4b4177df 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</name>
 	</maintainer>
 	<use>
 		<flag name="sift">automatically align images with <pkg>media-gfx/autopano-sift-C</pkg></flag>
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index 52ed1b45085e..47a583039d9a 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,3 +1,3 @@
 DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab
 EBUILD icon-slicer-0.3.ebuild 518 BLAKE2B c188697b87679fdbd637b9a4c038c4cc643bdb18a58bf54b7430c238636c27bee1fbcd801d8461173c7e251e578de0df0eedf36deb829e39ac7268cb4f2fbe4d SHA512 437d4cf772f94d3b0c7b0e4ad045cd8594d4452292fae5c470010686764f5ac18674c2c6fcf1554c7746a5b0ea44c162fb14e215c6fa4f426645d730daf7378f
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/icon-slicer/metadata.xml b/media-gfx/icon-slicer/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/icon-slicer/metadata.xml
+++ b/media-gfx/icon-slicer/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index 767d00d5eaca..7d54c6c316cf 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -1,3 +1,3 @@
 DIST igal2-2.0.tar.gz 27206 BLAKE2B 64683d32d0fc3c16d4e27f6dcd1acb3d1e1b55de8e4362065bda9b9b27e6d54409e115af46da2505dfe79f00e5004ebfb395dc4fe71d91b557c43a0c4d4f01e1 SHA512 663bc4f05fbb226c55c3304126ceb480f050715499a2849567ad1d33da568ed02f85b64ad176f6e1cb1c99c8f50650676a7323f0d0497880802a245274a77a0f
 EBUILD igal-2.0-r1.ebuild 873 BLAKE2B 044dbb37ce303cd88754f29c59f22dbff42d528f84df0d6dd7b3593092f4f86ea87ca90bc3e03e5c882069783eb3b12b4c9f017179f7c1b1582b7084bb624299 SHA512 00d0181d625e5d801c7e4da3fdcad6adbf2599a937586dcdc38f8a0da3f4e9abea462fa96961e96d6089e0cd5c982c20cca90d92f5504c897d762cf8c2eb1f20
-MISC metadata.xml 515 BLAKE2B df57e086f1c3f791956327fcc23a384d29d8c0887abea8b9562e5dde6f041bc68d77f787120d2e20974be17c17d129a0e54078cc774a79934423c573e13b6955 SHA512 379299c58fe3018ce51c1e54302dafcc9c258661368101503c1995d7bd0a435175ffe32ff3e7ac6087fa1fb39f4d6e9623acb4ee3acd73a333c95375cb3de072
+MISC metadata.xml 423 BLAKE2B 905c7a2ccc009d5d86204505bee74fbd334708895b065b2803981edb63432c4a6282bb6cc2b1dcb731519b015efedf1e6e1e4847681eb3663c6c97911de8c8f3 SHA512 5bf4f3547771be1204d5a6bd8f673e4b9352f56b556dab3bde1ff1499db77ebab9be2ef75149d5ef7203e882aaf6d47534ede35e4a3e3c673d8a2fa2b95bb4a5
diff --git a/media-gfx/igal/metadata.xml b/media-gfx/igal/metadata.xml
index e9a0ce3136a7..b5a2274dadfe 100644
--- a/media-gfx/igal/metadata.xml
+++ b/media-gfx/igal/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		iGal is a Perl program that can generate and publish an entire online
 		picture show (static HTML slides, thumbnails and index page) with just
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index fa27e6223b7c..0a032fb95b35 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,13 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
+DIST ImageMagick-6.9.11-16.tar.xz 9075792 BLAKE2B 7cfa4a071ee09b9658e302db963cdcc393395305bd96d04ddc5ce7941bd3b26fec74206525ffb1d93a423a970ee91dcd308041c8cb407c783195dc98a337db5c SHA512 ae4c56afdde8d62f80cfc32e208595f50b4e1d3cdfffbf1f18a5ad1f715998bcc917fe595369cda216d13ebd7121c060376a3ed6c0558dcd508f0142b108e2ff
 DIST ImageMagick-6.9.11-9.tar.xz 9069640 BLAKE2B ab39f4723e4bc843a504ce29a840d24a0497d00ebaaf8a10589813d7bf13f5ef3774e9989dd38d667e1a9ad3dbc5357ca4a53533b5ef338781409c0b3bdde01a SHA512 8f8e6cdbbc4ff367304d29d3098dc208ac17e8037e31426e5e24d918ab13a292660e2944cb830fa814f297b69f8b2d693ac33b94f5ee4b8406cf52605ee00586
+DIST ImageMagick-7.0.10-16.tar.xz 9694880 BLAKE2B 6d0e0baeb99d9815255f10d04176b816694afb9d7e2169af60401eb57b13bc2dbf1223b1b3de6b67c2ed9f1581983801bfec017dee6f4b73319b68d0e16366fb SHA512 e1ba52cde03b1230789a9e538ea93bd8b0713b418cf268ab3c3be0c0da4b6144ff47479e554c27a9348d56b5e94a181944474f77568f502cf31885d871f2ea5e
 DIST ImageMagick-7.0.10-9.tar.xz 9681168 BLAKE2B 0a26df054f6799dcc0cc576dc3d3e30689d3311ce658b220f4575d6ddf31063e8e9b1de57d5065171480dad5ae4f3a0bdde0d5ef7a5a7cdd267f2e76a210f30c SHA512 db19b39c41e3401ce454016a14c83d1188d38d7e4a31848c29344bd86ef14d4250208bcfb4b9e519f7d2d193a61724d980ce39e9d6e2388c872281e9383e2f54
+EBUILD imagemagick-6.9.11.16.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
 EBUILD imagemagick-6.9.11.9.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
+EBUILD imagemagick-7.0.10.16-r2.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
+EBUILD imagemagick-7.0.10.16.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
 EBUILD imagemagick-7.0.10.9.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
 EBUILD imagemagick-9999.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
-MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
+MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild
new file mode 100644
index 000000000000..02b0c9655fe7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.16.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+RESTRICT="perl? ( userpriv )
+	!test? ( test )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/ImageMagick6-${MY_PV}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild
new file mode 100644
index 000000000000..eb7593072ecd
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.16-r2.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.10"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild
new file mode 100644
index 000000000000..4d2561accf79
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.16.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.10"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 0c9668ee1af7..03046b7fbb47 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
   </maintainer>
   <use>
     <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 81562f13f1e1..701e9ab6354f 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -9,10 +9,8 @@ AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716b
 AUX inkscape-0.92.4-poppler-0.82.0.patch 3223 BLAKE2B 6e530a2d2602d61c9f97f61813fad837536ccd3dc25405cf79ebda6563c56ff09e4a98b99c83aced6e8995473b27c7942c5774abafc7c33a2dbe45df58f419e4 SHA512 4a5f2e3ec9f16abe76786945e3085e405bbe7a4c57dfa0e6e7d4ddd4aadd17463766c7392846db08fa41419e05ef8c688d989ded8905755c010db6b08afa2feb
 AUX inkscape-0.92.4-poppler-0.83.0.patch 4167 BLAKE2B cccc3ae0a4196815dcd7c2ff7260ed8ab8f81b4aaeecb557bb2f35d0f01ea616dfe7b0144dbf1638a679dc8642485448f479e6fa0a45274581c812ee792f51fc SHA512 1c6b1bd594bc49b392844d0cc232d79a8478e8f222179444cc197c6b93839cfefeb26b3a4cf702896baaa227d7ef5560dfefddc96ee6a9a1b1ea571fe4374bfc
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
-DIST inkscape-1.0_rc1.tar.xz 31984596 BLAKE2B 7e4a3618522c7bc9bedba8bb2a846e1cbf40e23868f04548e67fa41b9f8f1e8f696af386c0698a43ae6f7033937e1a3d4e772518162f712468b614a5b4d3b4ad SHA512 13e14a6dad1e89e6edf7c0197c43506d127b2e5136a2d8d931ad5ea0671b65b3feed5baf2f631b1a4b8095f285c19ffe5170904c9ce5e3e484d00ca2f0800b89
-DIST inkscape-INKSCAPE_1_0.tar.gz 64306274 BLAKE2B 8bc4e2d156fad99b2b2a700bde29372dd56db6a1a9a8e825d46d214bbd18a1d29365510c16d51dbb2cad88f88fb10232f1bab403da4900beaa72de5d0f8726df SHA512 214c04c7f1d23dd0d296f4262743b2a206fe3b3df7abdb4bc4a4604a7f0caab2d7970d04b5795f121417d0e015e2d42d14be0b67438d752a81c4ad079b486f06
+DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
 EBUILD inkscape-0.92.4-r3.ebuild 3921 BLAKE2B ad0b135b5c24cd27954aa493d45b90eb74af7cd13fffcb919b6af4e9b4c66848bfc8ba5eeec5e36fdb6ca14052fa794f78f801c129c762ef4b4a3f9da43cdb58 SHA512 91705b00b90160ea40e2c055900ff51016f5cb0897ce8c23b9798a7158062a8485fc5077b18b5446baf3c5515e8161df1dc8377925ca2865037b9930656d7e53
-EBUILD inkscape-1.0.ebuild 4206 BLAKE2B 43931848f4450b4076f2d0094a0ef4ae24c4919fee8a4b2f8c8642846712ca6f66ea670ec42c0b80f787a46e109da125e70a3302f77dfef3bf662b1ebbab9dec SHA512 50636054af59a19a1365e8ac8d78970807630ab66c7ba947d3d81b65906297b6e0714a545507a48861d735eae9209004c791b6a139ea2f837e08878a8293316e
-EBUILD inkscape-1.0_rc1.ebuild 4025 BLAKE2B a389779a3554e8ef91f98451ca92e9458d9491c9057845607f2f8c4090e1a8a6eaca2726a0001555a363ac446452059ef32dbe3b409add74947fe653763c903e SHA512 203d90d1d4f8915801d23513c4df476e93427134bd510df650c6484c9408bb0c20dfdb445d0ca4ff36aaeef7f7c73befffcf32c7726b98f5214fad49444bfca8
-EBUILD inkscape-9999.ebuild 4109 BLAKE2B 86555c26d13d9fcffbef05fb3b6a59338d110462b02b501443ec287b09856a9562cd06a466b09a594820c226bc2c0855d951e1b6e2d61f9d58ad60be4c05465c SHA512 181dfe6ce67120b3fcb08ac69838e5eeeb1853e83f55c5d5b78e93c9c448ba0193f36044d95eae242506c68dc3e51ece773225010fcda90a27e1105570cf4abf
+EBUILD inkscape-1.0-r1.ebuild 3929 BLAKE2B ba7493a7f5b5ba208b1bb431f572e755c0ec80fba14dc6b0434749c73618ef36b129024db53ec34f96d2f79d2ff281c5a98d49a9cd65742b911d2e09d87dbc62 SHA512 39caefe0f043463962c75c25499c7fbbfb3b644ddcc039eb744486bb2d59aa377262b61a55903f2233a220d18c7f8131594e40055a40553825f1665ecc0dd85d
+EBUILD inkscape-9999.ebuild 3910 BLAKE2B cfab74f275ac4a5adfba4a19966fda81345f5db7e3cc25ed7222a8c29208e893249dab17887dd7a6fd6a76f27f3f559f9e7181ef229e9c7109d0fa47e0546868 SHA512 b24b3f393c8d66dca3bb29de09cdd44214532c25e7de4d0e45c93a8be2365f1ea7208d9f24311299406da02b9c60ad257efd58795f467a7d6a8ecb3d81a90843
 MISC metadata.xml 1178 BLAKE2B 437e874d080bbd913e0910e0c7dc3a86834ac88b770493d65f29623db9a87d96f2cfc72e04bcdf51fc9f5d688695742d07a19414db55ff2ccb1a1b20cef20ad2 SHA512 007d65995421695c434b0c4a80474c43c95b7604cbe1cf576f5c7c4741777e563daa19bb25421089a979e0d23ce86522efae01e3f12a0b210323fc5306a2d305
diff --git a/media-gfx/inkscape/inkscape-1.0.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index 3af00fe145cb..bd52bf80600b 100644
--- a/media-gfx/inkscape/inkscape-1.0.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -3,19 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://gitlab.com/inkscape/inkscape/-/archive/${PN^^}_$(ver_rs 1-2 "_")/${PN}-${PN^^}_$(ver_rs 1-2 "_").tar.gz"
+SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -98,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
-S="${WORKDIR}"/${PN}-${PN^^}_$(ver_rs 1-2 "_")
+S="${WORKDIR}"/${P}_2020-05-01_4035a4fb49
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -118,6 +118,7 @@ src_configure() {
 	local mycmakeargs=(
 		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
 		-DENABLE_POPPLER=ON
+		-DWITH_NLS=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
@@ -132,14 +133,6 @@ src_configure() {
 		-DWITH_LIBVISIO=$(usex visio)
 		-DWITH_LIBWPG=$(usex wpg)
 	)
-	# We should also have,
-	#
-	#   -DWITH_NLS=$(usex nls)
-	#
-	# in this list, but it's broken upstream at the moment:
-	#
-	#  * https://bugs.gentoo.org/699658
-	#  * https://gitlab.com/inkscape/inkscape/issues/168
 
 	cmake_src_configure
 }
@@ -153,7 +146,6 @@ src_install() {
 
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
 
-	# No extensions are present in beta1
 	local extdir="${ED}"/usr/share/${PN}/extensions
 
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
diff --git a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
deleted file mode 100644
index 348785806287..000000000000
--- a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-RELEASE_SUFFIX="1.0rc1_2020-04-09_09960d6f05"
-
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	net-libs/libsoup
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-${RELEASE_SUFFIX}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-	# We should also have,
-	#
-	#   -DWITH_NLS=$(usex nls)
-	#
-	# in this list, but it's broken upstream at the moment:
-	#
-	#  * https://bugs.gentoo.org/699658
-	#  * https://gitlab.com/inkscape/inkscape/issues/168
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# No extensions are present in beta1
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-}
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index b87ca681947f..1cc566e61354 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -117,6 +117,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
@@ -132,14 +133,6 @@ src_configure() {
 		-DWITH_LIBVISIO=$(usex visio)
 		-DWITH_LIBWPG=$(usex wpg)
 	)
-	# We should also have,
-	#
-	#   -DWITH_NLS=$(usex nls)
-	#
-	# in this list, but it's broken upstream at the moment:
-	#
-	#  * https://bugs.gentoo.org/699658
-	#  * https://gitlab.com/inkscape/inkscape/issues/168
 
 	cmake_src_configure
 }
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 47a62cd72d51..ca7479ad5a14 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -5,4 +5,4 @@ DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174
 EBUILD jhead-2.97.ebuild 744 BLAKE2B 9ccad5df68d98ad6003a3b69a18661fb600de10f7326199ab7784cfb9bfc16b554bef37c5e555083503e09bcfbcc053cf8b018059b3995995ee2fe8d19c3bfd7 SHA512 39f2a2b352dfbdbe74bc4c188a688aa12623e33132a9afe487271e060c0e4eba7063ef28216796f026092449f1e87702becdadc07a7729108f97df6a725e96cf
 EBUILD jhead-3.00-r2.ebuild 712 BLAKE2B 5ab22c7fb0d1137d7a18f4020737dd30934eea11c00509288255205ee574e255af1b0de1092f8f3822d0dd7b86e3a9dc8b5b50fb327df7fccb5b83add9353464 SHA512 1c44c47e0a404a8a0aff91f4e0e97e0d0edbc1e120361fb068bdfa2d9a74e31ed3420d82f006d4d86cdc1bf218904d40a13f45d5ddb46ac66f91694a098728df
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/jhead/metadata.xml b/media-gfx/jhead/metadata.xml
index 19bf1be2581e..80a71f597854 100644
--- a/media-gfx/jhead/metadata.xml
+++ b/media-gfx/jhead/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/jigl/Manifest b/media-gfx/jigl/Manifest
index e44bfe6c8a88..cfa95a1b13c9 100644
--- a/media-gfx/jigl/Manifest
+++ b/media-gfx/jigl/Manifest
@@ -1,3 +1,3 @@
 DIST jigl-2.0.1.tar.gz 35423 BLAKE2B 598371156095a75e20c175dbdb50fd7207d72827f24839c456b96308e876a2d0438ad1191e831efd61d6a62704ab2315c26b2c5c83bc14c5a797eea985da8e07 SHA512 648d00d5c6b57ade66da388dc6168289260006f08f971b9a353529191c06357604a341df371c9638762ad3232efc275cd685c2c3c258472c8503742113c41e77
 EBUILD jigl-2.0.1-r1.ebuild 449 BLAKE2B 384b03c30a1909757c516e2ff2ba14c988b4e38cba494dd7aebc3b60a3de7e0875d8adb3f27350500c2965e8c8f6fba7cea618e7b8287da3fc83016a320e5a7f SHA512 6fc6e01b958d6c3f19e918044b2db3277597547d53d9ec9a4f937193ed3be0e4c2f71b87d6ebaf1a7cdb29562de649d0600b69a42348566c14965ad8b415465d
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/jigl/metadata.xml b/media-gfx/jigl/metadata.xml
index 6ade85e1c642..1b2becffa26c 100644
--- a/media-gfx/jigl/metadata.xml
+++ b/media-gfx/jigl/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/jpeg2ps/Manifest b/media-gfx/jpeg2ps/Manifest
index 3378e2584088..7bf1f07320e5 100644
--- a/media-gfx/jpeg2ps/Manifest
+++ b/media-gfx/jpeg2ps/Manifest
@@ -1,4 +1,4 @@
 AUX jpeg2ps-1.9-include.diff 226 BLAKE2B c290c4810d6cdb5c5ac577e1e55f15bf7a07c74198ee56cc05b43fa70a8d574b02c0fe476b94e079c93529140e6854136070031705a3cf92f3757badd21aee38 SHA512 fe60dfb3c79f3a513d07e3af17c7050cdbe0983e1887317f5ef2d2c7eb3c54431d6d9fec1469b918ac3461ca09cb4c73373b9affa00b43fb8412f464f4d5c3f4
 DIST jpeg2ps-1.9.tar.gz 67105 BLAKE2B 68df39df75525db872c683de7b0ed3e64317ea18a54d51fb478c3e51b26522a97081e6953e5ad92f7a6023829dc5fbc5e1e288f2041e76bdecf0b6ef035d1234 SHA512 babc6183db2c95d0bcfba3d34f924bd2a37d0a566bf684f3af3955b8b3978cd4b94b10e94f366aec641988258476f84ce730e4da43f2bb0a836e81da4892ad3c
 EBUILD jpeg2ps-1.9-r2.ebuild 1266 BLAKE2B c4db33c2e4545c6bfcf895230bceb9de3c3fd73be366900d9eed4d329433bdc8db36100b6a526b0c75060104f333d3a42d621310e236b23aceca4befa768066d SHA512 dccd7d490226819202ab3afbe763ca2f1b05e9e7eb760a46747de2b32394fc319a63c377c580eecbc0b60ab79a096b08f6878411c8aeb1a24b847d7e57fe3e60
-MISC metadata.xml 403 BLAKE2B 2b703ab8fef1b40bd3dcff805110fcb23498cb8c6e6d1909333f376ea0eef4fc77d3f23851bad95be5c1da9b410c9db93c710c6da393d56ab3b5d58acd32b7a6 SHA512 b832dc6fefb1d77e7003de986274b9a1292f301379ddc1cbb6a3d23d44e5a8b8e0489bb812da9379f4dbf8ff13d79c404665427c7c1e21bee0657ea22e3e72aa
+MISC metadata.xml 283 BLAKE2B f4535bdf11cc74477f20fb974f8a8d8ecf54a5162c3924c86297bd9d282b5cadc4c383f43aa3905088d6b7146ad5b963c7d1532551c8e01c6a3e16a9fb61d0a6 SHA512 232e2d76ef464e9392b7e280a48370241a1a5d1bcdb65709fe2e3f764e8ecba551ec1e21b7ec8cbec1956f74e217abcc7630889412ac6d462f2ce5299fe726c3
diff --git a/media-gfx/jpeg2ps/metadata.xml b/media-gfx/jpeg2ps/metadata.xml
index d30bb8339cb3..7b2ed3650703 100644
--- a/media-gfx/jpeg2ps/metadata.xml
+++ b/media-gfx/jpeg2ps/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>ulm@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<use>
 		<flag name="metric">Default to A4 paper size</flag>
 	</use>
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index f14855a626b0..a8b391a09067 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,4 +1,4 @@
 AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
 EBUILD jpeginfo-1.6.1-r1.ebuild 644 BLAKE2B f6b00bb15e3021ae11d12c007a7439a4371451fbd643f5d1a2a433e0b26ce8658d7d18f5279cc14e1a6dca32b47879d1462b1f069f280443f353bed0a039b61e SHA512 9ef1850cb4c8384985ae6af37fa95609f62dca8a480a435e00d59e74864b1b9fa223cb5f32b6d9a82882cd03d8f22fec22a9b530a8be302d8454e0c8f1e3beb4
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/jpeginfo/metadata.xml b/media-gfx/jpeginfo/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/jpeginfo/metadata.xml
+++ b/media-gfx/jpeginfo/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest
index 1cf202bb3eb2..0c5aa3114976 100644
--- a/media-gfx/jpegoptim/Manifest
+++ b/media-gfx/jpegoptim/Manifest
@@ -1,3 +1,3 @@
 DIST jpegoptim-1.4.6.tar.gz 99004 BLAKE2B efe8d4155e6a111ef7f810ddfa9d2ddc2b58d2a54728b81698c47444eebde864662ecc397cd935af47070b84daf36b33815e87a2909fc8b6ba7ca2421eff9687 SHA512 1ebd4986cbfeae19c1e01521862c15de25e078ccb6483c29f0d89b9c8e308c93d8dca7a200a57dd5da793e481ca5dc9c4f0d84b252f5b9408b4e719c35d7e90f
 EBUILD jpegoptim-1.4.6.ebuild 521 BLAKE2B c3ed9280aa0a636ea102a73e681459d9435ed5a7ee689152e1fd9b0a8fe692d16dab2f709c4e100d1006cff90e1b1a1a8497dfba251ee7b6360fcb7d649567fa SHA512 3897cbc3888b8258f547321f1f64bbb2359a4d09bf4133f303a9b25e1172b0347148290e8716f7ecef9db1dfac292aa4f2d9de2f4a1a9330e7eda9efddf834b3
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/jpegoptim/metadata.xml b/media-gfx/jpegoptim/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/jpegoptim/metadata.xml
+++ b/media-gfx/jpegoptim/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/jpegpixi/Manifest b/media-gfx/jpegpixi/Manifest
index f66f771b3845..032e93994855 100644
--- a/media-gfx/jpegpixi/Manifest
+++ b/media-gfx/jpegpixi/Manifest
@@ -1,3 +1,3 @@
 DIST jpegpixi-1.1.1.tar.gz 155045 BLAKE2B 767789f87e7fe29f36c6332cd79f15d3d5109ee84626f8bec3827602c28dcfa55e297611ff565495a4ffabc421247d6e39ea0832721d276394ac7ad607e6bb1f SHA512 e77bb351c5e0c92c8476684be29695bf82f2be043b0e6f40acfc3c692180cfeb625ebf180a6ed48d97b9d895ecb12b5ba34a47f6cb6a352af0fe1767e846ef3e
 EBUILD jpegpixi-1.1.1.ebuild 579 BLAKE2B f2ce7551c6dda703a8e76e0a51ec3caf90c42f24d80bed432b2c7603221a0c7dc8c0b5d42af8f7d80502fc25b56c6871be35752c91cba33c10dd7fc672e30968 SHA512 06d2202db7ae3c83e048ec7e5b3c18f2e14042004c9be3245afcf34bb6243230b0da44d87068bd2b4c14fd759bd5b67cba494c53b291582b28ba32077ae5dab2
-MISC metadata.xml 382 BLAKE2B f3a4ffb2c0ec6e15ec3a352b847697b41b8eab411a7cadb8aa805e99f954c8981d07485e731e90009530976554e0da0bceab7df2be49c508e479ad85dff1fdb1 SHA512 cfa512c9ce0af9841c853d9ee9d0383414bb8f9067041a397900dec9b17534de43fd09c9ccf64162d5f6c88b86bf49e0eb1b82337c1d06a9bb71819b07d26827
+MISC metadata.xml 290 BLAKE2B 64afc02906a82e1d1058845207beb786c4558aa106394bc68eb33bf8c1480b3335a8276605dae945f6c139c4b24be57a92593868189ccf540a3f5687eea17f71 SHA512 2e6892d467c3f23b373f7b4f89178d5ce43f1c54e293fb37530e05de6d29b5a7816aed7d6fa5f31f5ebfcb55edb56c51a79d524a9567656d8847a55fa1b61d16
diff --git a/media-gfx/jpegpixi/metadata.xml b/media-gfx/jpegpixi/metadata.xml
index d115e283ad7d..f60a078ed15a 100644
--- a/media-gfx/jpegpixi/metadata.xml
+++ b/media-gfx/jpegpixi/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Almost lossless JPEG pixel interpolator, for correcting digital camera
 		defects.
diff --git a/media-gfx/jpegtoavi/Manifest b/media-gfx/jpegtoavi/Manifest
index 1852e37cc234..0675d55eb1aa 100644
--- a/media-gfx/jpegtoavi/Manifest
+++ b/media-gfx/jpegtoavi/Manifest
@@ -1,4 +1,4 @@
 AUX jpegtoavi-1.5-Makefile.patch 872 BLAKE2B d3da3b46462bb34e7e04ad12f77bbb9c2c410ba73a79513407f803a0e3538fa68f4f7725de2c0b07611babe1b256a2e699a2986187c622f43ba51e40f0571752 SHA512 ef933465a8e43548339168a0249d714ee3e06ab7e9bb652f39de4923ae95d29da7914da5c6ceb13051aa438555b618735c36f6c22254dec96219a1c7954cfb31
 DIST jpegtoavi-1.5.tar.gz 14882 BLAKE2B 969893d9c1b619021043f33abb88720de832a4ebd2292c05467d143977fc425279c00714b74ab17e55e8b5d47e01da4132302c33336a37dff1829e9c05b7b72b SHA512 7daac756cb2b863cdaa1101e99705a429e08695adf777cf6398150e5b2fd01c5b4b772b2d3f177f6d67592a1dd5d4fdcecd62563cefa58d06ef2dcbc2aa07231
 EBUILD jpegtoavi-1.5.ebuild 525 BLAKE2B d65fc7fdb202bfbddeace64ce796ad5bff491391954fbdf93614f3d0291acb1e30e6a9444d45c3489167693a878b14cc8ec6b30b5d8448106545c4041bde54c6 SHA512 d4c36f8b9702a12c5e2e4fa70a00af5b92972a475f1b8c6996cf000d2ba8edf5ea914c2bcac9d5f5d6d7f717263950bc46f989901a353629e503a7a6576cfbc0
-MISC metadata.xml 436 BLAKE2B 42833fd1a99c5e2466e8048f2d8a23e8fcca9622b74f8e6fd61ebb649803a87964d8a4189ad652d39210abdc193b070ee0915bab2985fd10bbd1b4e37c07b3f2 SHA512 6e34f1a383d6921a5114ea1d850b428ac50f748a7fe6847978409590346198dad15e998c1bc5f97af5550a90b9f51319133fab2788400c7df9d3cb4cbefd4297
+MISC metadata.xml 310 BLAKE2B 7dd7a0801e147afa8f685a98ac222c6819db1cfd779df0e8897c581838b3f4be193bb2389b6efbc9aafc8cc6831f1c11e6d60bef165fdb540d88000441884a05 SHA512 9248b6397acb320d2915f3ae345a32a633b0b9ff6d3be686438abcd783a4723387659f8e161cb6e2a50e620c7a1f64b31d654083e7c5423b401df88137782811
diff --git a/media-gfx/jpegtoavi/metadata.xml b/media-gfx/jpegtoavi/metadata.xml
index d70cd5970240..468b985dc829 100644
--- a/media-gfx/jpegtoavi/metadata.xml
+++ b/media-gfx/jpegtoavi/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="project">
     <email>media-video@gentoo.org</email>
   </maintainer>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">jpegtoavi</remote-id>
   </upstream>
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index a4f29acf428f..e199bf47ac5b 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,5 @@
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
-EBUILD krita-4.2.9.ebuild 3242 BLAKE2B 8ad5bb70d26d718cc9c13ba3b25654bdf85b704a465d4ea8f149916f2d32244d49a03eca45d4663fabbcb9ca6fcf7271706180144c6f30987d22483c0227a34b SHA512 2247dff1ca311cb68bb857bebb7765b961ccca3ac0fe3f3baf8734f216eaa462bb82ce638c252fb19df9cdae7b12630c5191789cf1fcf53ea5694690392a0358
+EBUILD krita-4.2.9.ebuild 3244 BLAKE2B 258e95d2a887e08bf8f57a35fd2a862a409d298f7638ba8c8f3a514ea4620a33ed17f3f390de944d286c2af96333e7ded6a061ce0488ee6fe2a6a8201bbf391f SHA512 3c01812b04489bbd292db164ff55244d237a54e707f43c756d4b2811beded4cb69aee065baa80bf20c67d319d97cdecf3d6a5f50fb761f377fe5cb38c583c034
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.9.ebuild b/media-gfx/krita/krita-4.2.9.ebuild
index e23f6afea053..150df39c7060 100644
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ b/media-gfx/krita/krita-4.2.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 KFMIN=5.60.0
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 40cc334695a3..0461eff07364 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -6,4 +6,4 @@ DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49
 EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
 EBUILD libimagequant-2.12.2.ebuild 1402 BLAKE2B 78bc0307ce586509b1ad63f39c8defb47ee4e94624db279954a11ae0fca2b7511f1ba018f1c3ab72e26e89c29fe81b0c7ad8ae05f142dbfccbaa24793bc90e6a SHA512 f97cbf0ae7c7d293c5340fd996909229ce9cc5664f2f8aaf5409363d7f16e8a45313e8650f908a1965fd7445b931d09c643408b155409dd0fe9bdb91257f304c
 EBUILD libimagequant-2.12.3.ebuild 1404 BLAKE2B 078be497e18f0c0c5c61354a2704ae77dba51d4ff61d1115b46b01bce40f92ff52b3e91ba5206688595a75ffa3556fdaa2bcc3f4077f442cfbb0a5285a049491 SHA512 3051828e6f6767a9ded271a87e1c2a1aa240ca702893eba873863432408b180e77ba550f18b448f09ad5fcb2797d2f511beda25c11b2e757b8e6aff0cf8ae6a2
-MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
+MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/metadata.xml b/media-gfx/libimagequant/metadata.xml
index b0caaab125ff..96bd9789e6c5 100644
--- a/media-gfx/libimagequant/metadata.xml
+++ b/media-gfx/libimagequant/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     Small, portable C library for high-quality conversion of RGBA
     images to 8-bit indexed-color (palette) images.
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index aa34257c0292..a72819c97ba3 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -2,7 +2,6 @@ AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
 AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
-EBUILD librecad-2.1.3-r4.ebuild 1102 BLAKE2B 8f9a34ce4d164d741fd9c053a956eb28b289d2287f1a627ac11362b47799390753db65e32ace5b57bd2ad0c9f2b84223f86fd9fd77160c0f85a31915b7041c1b SHA512 907a94b6d98f6dfc49e33d2fcb1611b76cbb5f309b22c4ed5ae51ffaaefab146379b39e42849f7bcc97bb7a0f394e31b6df82bd720537ddc387aeaced110a40b
-EBUILD librecad-2.1.3-r5.ebuild 1206 BLAKE2B 5934d1af4efa6668916303c85aed2654ab43458a23532167997a2f31bdcfd356c4914ab4ea75e3f77699abae115bdbf6555629038f3d4eb25b132e69f9147100 SHA512 56eae3cd2e47f5f45f496a581f454dff497b2b447afde848b57fae0fa145223191844a872620a012c0b489dc382213d61af8efa13e4baf72a5bc5b31690e0f48
+EBUILD librecad-2.1.3-r5.ebuild 1205 BLAKE2B d67aacabb6f255121b05dc70ae105fdf4e1065ec70965c55e5c7e4d37883a67c01e0826129051514fe9faa2e45402329eb34c980eed41a04d7e4006d6fb0a3e2 SHA512 f7d5a84c94cbe86a9e21c9f97a51680dfc3c0c0897e31ac2b454eadcd0bda469bc6a32f9349a2eaac05d8ce76304d0244336eb2170675618b1e2d6df3378aae7
 EBUILD librecad-9999.ebuild 1143 BLAKE2B 640a03b64ac56e00a3821dc9278efc0cfbb4eb7ca3ca83d428242aff78a0ab1d783b705cef0af939537a281b57db4d1ce640f3baa1eda7086b52a4fad481a77a SHA512 173a061d72db9ec980e13173d7d8caf7583d57a794cbb3c72a42553d4546cc28f45c5ae8ceab19ef71a838739c717a3c75e6506cada23a123c060fa89c04000c
 MISC metadata.xml 408 BLAKE2B 40e860453480281f8a148bfe527530c836bf21801a435f787c4d07ab1005dc9492a96c3dc0fc7dc4362fe35626f653052f0058eaef84336c59c8910256cfeaf5 SHA512 e08b9546617943ae66186e4b99c53c900a98a1950f429f84b525791c8030b1ec1786b4dfafe983537915ed597e3e9fe089bfc6f701a57af9c453293a2db2c2f6
diff --git a/media-gfx/librecad/librecad-2.1.3-r4.ebuild b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
deleted file mode 100644
index f5656b761208..000000000000
--- a/media-gfx/librecad/librecad-2.1.3-r4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="https://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="3d debug doc tools"
-
-RDEPEND="
-	dev-cpp/muParser
-	dev-libs/boost:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/freetype:2"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qthelp:5
-	dev-qt/qtxml:5
-"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	eqmake5 -r
-}
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && docinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
-	doins unix/appdata/librecad.appdata.xml
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index 054af7f65e7a..bc56b908be42 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 BDEPEND="
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index f732b278459b..f09c17489864 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -4,4 +4,4 @@ DIST llgal-0.13.19.tar.gz 96675 BLAKE2B b306eed900a1071898ebe2d0dcbfeb9c505271ec
 EBUILD llgal-0.13.17-r2.ebuild 914 BLAKE2B d52a3d2ae2de6da933bbd651fa215dfd7609bf6e34afcda0b753f5be1dd5a5cf269ceb508c0c50f2b2497f6f8998904ded0f51d639a16f207da495f99d1cd05e SHA512 c7150f19b551b77c7934f4a12fe9b60c0ec2ef96eacdc0e4de192b0d8ba088609373436499ef2351983f8d279fb269908479ee12da26bcb1dbf3b50110cf419f
 EBUILD llgal-0.13.18.ebuild 916 BLAKE2B 0b6156409e0440708cd37e45d7e16c326c643c5ef35090de4e40fa8c802ee5d457db139ffb0149e59d4f80417a6c6b408deea06a1e9802f9589b3eaa67d7a690 SHA512 9960069fcf88897ddbfd5cc026ca9dea6f1bbcfa0fd5ab437af970a260db06bf52268730ea425af451fb0847c070ec07305de126884c8f550f0329c266d52b9a
 EBUILD llgal-0.13.19.ebuild 1071 BLAKE2B b5b2c4b2b548880a68f9bd77bfd50f2e479042fd50578273fc9bc390fc1c832ed726dbb02c81ed9c5aa15de9939daa1012bcb7a3c171f9d579d2b3b3246b2851 SHA512 aecc703b62a977357ba104b11713476f07a6e3982f3c879d2620f7da2bdafc45d1ed47cf913052ab50f018991e2026d35be114e060e1e651380eb75883b0d9a6
-MISC metadata.xml 365 BLAKE2B 91e30c99cee02f64efac65038cd7e3e04b37f466b83d423cef36a31a071ee9ffd38fc1d46b71f736ee87d846d9787348720b49c83fd2aa6e402dd2817b18fec3 SHA512 2abbab6015809e7c8f484a40cfd646173763f54cec04f2aa71a550dcc8c4dde96f8d692d03de6280411b480a0597708da655eaf0005e3f8b4b87e65cbc44f04a
+MISC metadata.xml 247 BLAKE2B 40a951853ad971fb856cb2bc8e102caf52d803f2c07466f49cff536bfa108711f107e5dd89745bd16cc74d90df7022747f27d1e664e17b079f20e3f636b8e50b SHA512 077ebd8acee5d10820d2a4e3f8c5d0f50b7dc0e4c8f8ab749b6b2547b397f30348abc858b0a9d1890d9b3d96949b76bdf2f92e277ba61dfac08e9f83fbc58021
diff --git a/media-gfx/llgal/metadata.xml b/media-gfx/llgal/metadata.xml
index 3d74052b04be..b946dc190e7e 100644
--- a/media-gfx/llgal/metadata.xml
+++ b/media-gfx/llgal/metadata.xml
@@ -5,8 +5,4 @@
   <email>aballier@gentoo.org</email>
   <name>Alexis Ballier</name>
 </maintainer>
-<maintainer type="project">
-  <email>graphics@gentoo.org</email>
-  <name>Gentoo Graphics Project</name>
-</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index cdd16cd93c74..0e360bf90513 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -4,4 +4,4 @@ AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
 EBUILD luminance-hdr-2.6.0.ebuild 1843 BLAKE2B 8bcee6c893debc0e00445e4d2f0f680b87749beda8170543efc48499bc10d234d9b703fa50e0d9de0eb086bfd5d25cfd8d71e85b4dd138543eee2f8eaad4c440 SHA512 e6e72e6ccdf35c57c70350dab1bcad86bdaeea7e1df59bcd0d9596ea4d904654b1eab48b6fda0dd4a13fb3d971a8dc16bd4b932ec64aa90b3725c75836f82702
-MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
+MISC metadata.xml 1271 BLAKE2B 5b8779e6384359fcf4cb1f510adedd1a932ed005eb8f63e9984d9939a822e710adab367967a5c5891faea9f030dd6605dd6e675dc5bb7deffb9f8686f044007c SHA512 32ee3e70caebe2048e755dd0d81ca91570b386e5d0839425b34e6502959ace8ee23086b497c8c88ceccd3333a7d39283c8a8a7f52573a01b9a0a0d5ce3018c6c
diff --git a/media-gfx/luminance-hdr/metadata.xml b/media-gfx/luminance-hdr/metadata.xml
index 0f31a61b3177..98754110751f 100644
--- a/media-gfx/luminance-hdr/metadata.xml
+++ b/media-gfx/luminance-hdr/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</name>
 	</maintainer>
 	<longdescription lang="en">
 	Qtpfsgui is an open source graphical user interface application that aims
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index a21736efe149..066fa409e7f2 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
-DIST maim-5.5.3.tar.gz 40083 BLAKE2B 93392bcec8d1ae5188c27414695b04d0ff94a0824e9ef4a7fe8ca0949a1583b7dc7893346bde94bcdf629d9dc8d3f8350a8484eb8cc5bcbf8ff24cbdcb651b10 SHA512 bbcd4f0276090b9650cda88e527d0d1b80270a50935fbc02aac9a302a64bc3975386f24a97d8eb3c1f97d7d32cc9905d5e1f652915fbe3aae0766bd90bc5f51a
-EBUILD maim-5.5.3.ebuild 830 BLAKE2B 25f8d53c31efa110e7888a683e92486e24a3512edeb7464a0ddbfa4dfbc37e4b5e656d40fdc021b8c0d6653d1799416dadc8a68815e2cad55fca9bda31f75874 SHA512 aefe3f5b3ca17d88aa4ee06455d214e1b07a6f15185380f7c8fdd05857d8f189c6ba3d6488abfb8c4808fd64d6a6beaca13309046f1b41df32b139e9ccabbfa7
-EBUILD maim-9999.ebuild 830 BLAKE2B 25f8d53c31efa110e7888a683e92486e24a3512edeb7464a0ddbfa4dfbc37e4b5e656d40fdc021b8c0d6653d1799416dadc8a68815e2cad55fca9bda31f75874 SHA512 aefe3f5b3ca17d88aa4ee06455d214e1b07a6f15185380f7c8fdd05857d8f189c6ba3d6488abfb8c4808fd64d6a6beaca13309046f1b41df32b139e9ccabbfa7
+DIST maim-5.6.3.tar.gz 40217 BLAKE2B 90f6854d8e54b92f8c6e8d5b597ea287e85e622ad689f1b72361aa919d0ce57bf4f28f289fd0da51b30c1195977b70982837d8b4b81ec5597361bc6ed5f1ad0a SHA512 8e19bd4e89db117bcb74a9b9e35f3232cdd0ef3836a536d170f803d7159fbc4be415d20695e5e61942ff7714d990d027149cee20a689f797d25d01610cc1c3be
+EBUILD maim-5.6.3.ebuild 845 BLAKE2B 03ba5512384fbc25c4c0680a1399d63fd4e349affcfd0d104c020fed460aefb423d83ce44d7ab9aa94ae8fef5d9341bbf42ff67d0aad668ae8ebbf90f6569e1e SHA512 cb4184187848233f19288a9c0438492ff8abc700440888eeec8baac081ac4191875ddc3f9d8cb659b477d9012821b01440c03e3544ea36931d069dd89e1813a5
+EBUILD maim-9999.ebuild 845 BLAKE2B 03ba5512384fbc25c4c0680a1399d63fd4e349affcfd0d104c020fed460aefb423d83ce44d7ab9aa94ae8fef5d9341bbf42ff67d0aad668ae8ebbf90f6569e1e SHA512 cb4184187848233f19288a9c0438492ff8abc700440888eeec8baac081ac4191875ddc3f9d8cb659b477d9012821b01440c03e3544ea36931d069dd89e1813a5
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/maim-5.5.3.ebuild b/media-gfx/maim/maim-5.6.3.ebuild
index 7d5505eca012..561201c54d12 100644
--- a/media-gfx/maim/maim-5.5.3.ebuild
+++ b/media-gfx/maim/maim-5.6.3.ebuild
@@ -18,9 +18,10 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="unicode"
+IUSE="icu"
 
 DEPEND="
+	media-libs/libglvnd
 	media-libs/libpng:0=
 	virtual/jpeg:0
 	x11-libs/libX11
@@ -29,13 +30,13 @@ DEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	x11-misc/slop:=
-	unicode? ( dev-libs/icu:= )"
+	>=x11-misc/slop-7.5:=
+	icu? ( dev-libs/icu:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DMAIM_UNICODE=$(usex unicode)
+		-DMAIM_UNICODE=$(usex icu)
 	)
 	cmake_src_configure
 }
diff --git a/media-gfx/maim/maim-9999.ebuild b/media-gfx/maim/maim-9999.ebuild
index 7d5505eca012..561201c54d12 100644
--- a/media-gfx/maim/maim-9999.ebuild
+++ b/media-gfx/maim/maim-9999.ebuild
@@ -18,9 +18,10 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="unicode"
+IUSE="icu"
 
 DEPEND="
+	media-libs/libglvnd
 	media-libs/libpng:0=
 	virtual/jpeg:0
 	x11-libs/libX11
@@ -29,13 +30,13 @@ DEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	x11-misc/slop:=
-	unicode? ( dev-libs/icu:= )"
+	>=x11-misc/slop-7.5:=
+	icu? ( dev-libs/icu:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DMAIM_UNICODE=$(usex unicode)
+		-DMAIM_UNICODE=$(usex icu)
 	)
 	cmake_src_configure
 }
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index a48096f54c29..76052329b86f 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,3 +1,3 @@
 DIST mandelbulber2-2.12-1.tar.gz 47092910 BLAKE2B 1e5ca64a4819052882bc7cdc047c6d755046f2ceebcf7b26db41511fde219aa523a3c6884f0667aed1365104c4502a6e6b1b2d7d40a4a024fdb5051d5ac13cd2 SHA512 5dc8dcaa45bc8747024ed16379cc4d622535099c925abf3c2aa01c0338fe8c1f272e6113b6bf28da6a4bb087e6d6e6a4c6634feca993d2c89f12b79582ff271c
 EBUILD mandelbulber-2.12-r1.ebuild 1698 BLAKE2B d0aa54f24759d1aee38d434d1e1fa73b36c6176ba917e5800bb28b871c2742c91bb2214070c58e44b69aa14a88383f90d7ea4356996cd44b30e2fdafbbd53bfe SHA512 17c92cd414b1dbbbfc371550bef8a3f4472805b40565e28563ac6fb11e336a02fa0c3ebe37a65a341540ca414086c616b2b537b43b62f022b36709a349093055
-MISC metadata.xml 699 BLAKE2B d9aa974727aa0bb7cf821cc6a982477aaf59d6e2cae666e4476196507a22233feac875347797799df4babd9dffbaa97f0d5fc5d190bcc11a03554f6755e6f458 SHA512 a6d7cfc42cf2bd56454f7834ff4aaa907772052d855f7a471c57ba18d21437af5ff0ec48f0ea1929d18aa2e0eed9073b903dc34b4de19d304d4839f2c267b535
+MISC metadata.xml 607 BLAKE2B f07e994420bcbb2f5922ab7dbb6bc9a6a5790c46623cffd470eb7524496b0fa191a2caff558af0567c7b7e97bb523dfdbddec847a327bbce5e6ea349ac3f6017 SHA512 0b08c6d9022d70bcddb7db5c3448259afbef8e97db0e0a87e7e5ae0c9e3196a44d50bb889649a3dd74469d42b5908d60d83a2147e0f369f0da0115a01a0271dc
diff --git a/media-gfx/mandelbulber/metadata.xml b/media-gfx/mandelbulber/metadata.xml
index 2942a4cc4a6f..3c8534f5b6af 100644
--- a/media-gfx/mandelbulber/metadata.xml
+++ b/media-gfx/mandelbulber/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Mandelbulber is an easy to use, handy but experimental application 
 		designed to help you render 3D Mandelbrot fractals called Mandelbulb 
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 0facf13d35fc..be93c52d715d 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,4 +1,4 @@
 DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff
 EBUILD mcomix-1.3.0_pre20200206.ebuild 1794 BLAKE2B ee1d2db9785b22c23a6a04f74e372a7424421691f69502910e75a05e27172ab246eea29385315e2433f4d24917d06475d89d8488a7489fafef9fefd04098eeff SHA512 9211f7786603df2d7c7ea21c8179d958849ecd7852e5d79f088c078e522598e4170cbc3b9bd05b873be5a253b5e2d958f07c7c43de83c5f4fa1a590cba306ca1
 EBUILD mcomix-9999.ebuild 1646 BLAKE2B 1d3b03cf2a5584f446b8b59501c044be9a7c4a10fd0aa20e8fa2f8fcd71f24c0e4a7b3d24e90e9ad152eccb639daaeba8aecb6e92724e5e6429f5e8fd367434c SHA512 3c5f49c2808abbe48dac1ff1ab6f2d92bf48e8882c972c325c2ab78a6ab4a2120f8c32a32e78bfae73da31fb78aec38e1d854737b8b9032592567fb71ae5e4d6
-MISC metadata.xml 523 BLAKE2B adac37e097094bc3704967b0ecd2c1366168e39e2fb86805846e2a9b92c1aabaff6e36e39d3318d45ed4147f9e8a253e561a75645d9672ec4a0d32f78673a3f6 SHA512 d36ee6da57cd276e16a95507ec3982a8a0f481044695185161b1a37bf95f709e972634397dd2aaa635c64b0dbf17406557a47e9e1f1a85ad18799ebe4eb367b1
+MISC metadata.xml 397 BLAKE2B 35568ccc8d25ece0069a6f8c404ec0a15f6709dbdb13f235c262f70ddab42ef3c3c431ac989c5ccf2c64c924dd22b1d830c8971576ca11f2358050eec98f138a SHA512 72c698bdfa865d64cb9062e7247fcb0b11195a72d19ad83f7295319a665c4b2a36f4f33cf43a84cb03c3308101a0aa4bf0185756c6cc0bb8a14637cefeb33d97
diff --git a/media-gfx/mcomix/metadata.xml b/media-gfx/mcomix/metadata.xml
index dc6d17f3b83c..025aaf951950 100644
--- a/media-gfx/mcomix/metadata.xml
+++ b/media-gfx/mcomix/metadata.xml
@@ -5,10 +5,6 @@
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
   </maintainer>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">mcomix</remote-id>
     <remote-id type="github">multiSnow/mcomix3</remote-id>
diff --git a/media-gfx/metapixel/Manifest b/media-gfx/metapixel/Manifest
index 0d4c62b8dbfb..9b0fbfa04e1e 100644
--- a/media-gfx/metapixel/Manifest
+++ b/media-gfx/metapixel/Manifest
@@ -2,4 +2,4 @@ AUX metapixel-1.0.2-giflib5.patch 529 BLAKE2B 760b6f3c846a48e64e57d650584f56b506
 AUX metapixel-1.0.2-libpng15.patch 4395 BLAKE2B 37f1834c834bbcb2e5f21eb6ef76d9de2e216466c6fe4cc130d477cc44cf609f24067b39be705b732911e21767557b2517b63f230d7710e66e45462802df84db SHA512 5edf6adb335de038996589bbfa799df471aeb8aec41d46f639ff4165fe9574b8a103bfdbdf086ac48de29d11dd263166e0787aad8ebc1298a9865837cc2d3282
 DIST metapixel-1.0.2.tar.gz 63197 BLAKE2B ba5efaed9c3a305b9659af6d910e0c9597637510ed9d1d03a27feaeb1687751609bd60f009761c599593c02904f0c583324fc4b392af100fc60560cb4be2be8d SHA512 88a718fc349b9063c61a8ac24fc41923c742b25fb7e84c6b565ac92a301a04b46870750d5c06f751b2104c3f36108365b45214b52a6ede98da83441e2e30e156
 EBUILD metapixel-1.0.2-r1.ebuild 908 BLAKE2B 6bc4c75bf67abba6cc23eadc4e699062682259c32848e10dd8d4783a6b6769bcc80cfdaf1c371a1cebcadbed1ccf811d9d0403196857124c3911888c87a31227 SHA512 17386b85ce7b0494b49e341217326060c23907896ee3d8d7d3b675705c3d7e983e71533414732139167e43b98534ffec51c553add89d55e08d1c82f167c645df
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/metapixel/metadata.xml b/media-gfx/metapixel/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/metapixel/metadata.xml
+++ b/media-gfx/metapixel/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/mscgen/Manifest b/media-gfx/mscgen/Manifest
index 184d58a0c199..4f2224b872ef 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
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/mscgen/metadata.xml b/media-gfx/mscgen/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/mscgen/metadata.xml
+++ b/media-gfx/mscgen/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 5048a723242b..6e74f37e9bdc 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -5,4 +5,4 @@ AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e448
 DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a
 DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27
 EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 2922 BLAKE2B 5af69be5db5e7bde21b3503e0e65703c03e6473eabf7e48539fc035f917564c57c89433d5df153b46553ddb6a75db5d69f6c1c5bb4b0cfa6f86eae86cdc4244f SHA512 0d438981abc65c0e53f758488372059c12c10b466a8b23a136ef482df219452635db7fd59500d43520d05f50584ce5fdc32a4b718dd3079a84864a2f57e8514f
-MISC metadata.xml 652 BLAKE2B 8bb1f448a07402e9de7b8265b50318595c3b7de92b8b444b92dce29ac428682ab856f6d4ed668579a8fcda48b8d17f975b69d08154a54cefe7dce8916db0e0a3 SHA512 cde9ca3c2c16c3a83593c4fbdd1b05f5b79596f42d77df5f20470d7e2cbca2e445fcac254dcc7f31e41938f756d1bd5b314c7aa1a2dc6a7bc19f170a4d7e1656
+MISC metadata.xml 555 BLAKE2B 61058525eefcbee1f541c94ca943a64d4ce43c4d40da011c566a3728960a921466b98977857b68723b95cb40ab16ef27d9b320cfc171b89a22e1cdf4be585957 SHA512 7abfa35647644f62a53d9facfab6d0e09fbda8f5046ef76841d7bfc9b759e5919597e86c9784e9e5d3979a77030899087bfae073e60729cdaada89cc9a6b54ac
diff --git a/media-gfx/nvidia-cg-toolkit/metadata.xml b/media-gfx/nvidia-cg-toolkit/metadata.xml
index faee03f34c78..91a119f3f687 100644
--- a/media-gfx/nvidia-cg-toolkit/metadata.xml
+++ b/media-gfx/nvidia-cg-toolkit/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
 The Cg Toolkit provides a compiler for the Cg language, runtime libraries for
 use with both leading graphics APIs, runtime libraries for CgFX, example
diff --git a/media-gfx/openclipart/Manifest b/media-gfx/openclipart/Manifest
index e790d5ab8afd..dbcb493195c4 100644
--- a/media-gfx/openclipart/Manifest
+++ b/media-gfx/openclipart/Manifest
@@ -1,3 +1,3 @@
 DIST openclipart-0.20.tar.bz2 367385284 BLAKE2B b308270d6f55573a27d473b63128245b6e5ccdaec7d76598c09e3ad54ab4618b7fbf16bdc28c929856684727330f2edafc22535dd3c57426eee2bce6ef5b3c9d SHA512 2d3e0071e019cc272d220b5a4960d4dd7d8ca1ea36d2de7358c7b21e4b3135630075da032b3e274b88e6be8b7e3d331c02c9eebfd43e4e5b199c6016a8fbbdb7
 EBUILD openclipart-0.20.ebuild 1047 BLAKE2B 1ff0188435a939aa7d9c478c9c2871b9c9274608166bc8eece20f19d205a91f0b885e95df9e317d5c9846655377497b2f63d030ddab130c9a568bc462d84173d SHA512 89c4a4ac01576a2b330377ec19004674eb4b90938e33b5b4883b05383a7d2c0927b5462b4597d9db920475847fcf116a42377d1cee5f4b23c8c9ca39d00b172f
-MISC metadata.xml 332 BLAKE2B bbd9ad47860ce7ed16d880960784854160dafdbd724c61372cae276840c69f1fe2ee7ef1646c877f7836fc46323e666d0a24f2019fb8e3905f7aa4c17f9a67a3 SHA512 58e164a238ec35cf87e8de731d9d7fc797432b0944277e2893d2ea7e70d49c5c82ec15352bcfe2ff8497f7f41d5cfd17f4fb3994bbbe17d9223d3f0c0522b9b4
+MISC metadata.xml 240 BLAKE2B 6ab5bc1b4986b5bca6ee2d191d133897fc0a7b518bd8d95059576b5387b3b7337aadf4125b108b6e9c3fa4d6fb2d885f0f4472d1011846b27ce9019fa6d9f1d8 SHA512 e2f1dcc25eb634cee3a91637b12b9b0b0a5101525a464a547d7603d27bd05a80597a7b5aab154502558a77af99cd2d58892f3e1064601dac930b94b3e6639bb4
diff --git a/media-gfx/openclipart/metadata.xml b/media-gfx/openclipart/metadata.xml
index 083c4f67c8cd..963db72c5398 100644
--- a/media-gfx/openclipart/metadata.xml
+++ b/media-gfx/openclipart/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gzip">Compresses clip art using gzip</flag>
 	</use>
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 1a1a1ab57fe3..d1584fd95e70 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,10 +1,10 @@
 AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
-AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2
-AUX openscad-2015.03_p3_fix-boost-1.70.0-build.patch 697 BLAKE2B 093b04177e9222e6b41cae806bd8feedf1135ffe26f966f291accb1f72e1683cab4b7339827c8720873e6d45475faabb680a3e5b40dee9e4d03f356cc49888b7 SHA512 4640dac7ee1c8dc8078c33141c08948ec45144275db84c07a079d624210516ed4795d7ff0cbea4842aac9342e07fa0ec6ad938d0fd637a2f1bee2e1055e6baf4
+AUX openscad-2019.05-0001-Fix-build-with-boost-1.73.patch 827 BLAKE2B 3450919d7c92e20fccbe61174dcfb56c96930e43a75baa1632bcb706c3c61d2c77bf290098337a6b6cfcdd7f97f47419c62d8153081b3d5951935be07ab34b1b SHA512 8cea77da618ba6a258357640fc1ab479cc3b10a42ce9b2d0f70dbafde959de68a889b6234143b6f43a3b15c8abc0765e658f5cc81cc22572f9a228f089c0eb23
+AUX openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch 820 BLAKE2B abfa2f4067dca1bdd2a1169cb3d9e1b4a804fa27bf8ec3a6a98106861713a3273f401a4e51c2fb8afab397b6326960609ae2700d0755b3b819ede749bc202b5e SHA512 87031a2f1b132434b349ead74e1e6d247f51ed48b0f2f8970dc99d9c47a441022ea169728302f680142325888433f07f4888a52727b31fda8e26e28d8b5d2100
 AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c
-DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
+AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B ae4c7dc441e5a7391ecd2e704c644877fa7d73f8900fbe6082e070a3d9ecce74f368ead39be3f0321fb47095becf60057fafdee2a5e961106402dffff73687be SHA512 7bae2af4c627cc2f465e75890284bcca8e738dcbe5accf0511fcca2ee845ce9ef5602b752d61ecab7afd92f3a45975287db4e42379ede7875123a8c0a721f2c3
 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
-EBUILD openscad-2015.03_p3-r2.ebuild 1632 BLAKE2B 6a44bb34413a6019cf4f51266096dc61deb58d1cbc8767405fcc72fcbadff2df6ea2e1b141c2caa697890428fae86afc4a9ed7c7c0e93da09829e51ad8172c0b SHA512 d1c3a4deb951cae887efe2014d0fa3426e08a8f6ff01f41936824b61c128252baf8123cfbe6237729599a521244db99af297618bba8e3539f365831f3b01139a
 EBUILD openscad-2019.05-r2.ebuild 1589 BLAKE2B e5537b0658a553fb95b55aa972f16e2eead4540f2e50d1cb04c094adc8aed115d092fd525e6cdbdadaa8bc54fc9f77953927a13650e2e8971614c74efd1122a0 SHA512 e6303ba15e877affd22a03d848f7b08e80d61ac9580993c01c0a3c39d51b3d4319b51067a178c9cd48dcd657f9397005794d2d820662b06f97c34e09899883d5
-EBUILD openscad-9999.ebuild 1388 BLAKE2B 3104011bd4978eaefc7ec2a4594007c5fa1ace3d1d4a9d531f56edc4d453e4b8866a4ddb4bb1848fd203a6cad4a3bcd750e3b06a08963dd71e33b34dec5a8f93 SHA512 9f7ddb533d6cfac1193e288c468e499ae77c855ca47ff5c456d479998e3a12143308eda15feabdb70b8e28b537d30a357d48dfa9c2445cc47e532ec5bc403995
-MISC metadata.xml 1025 BLAKE2B f1d33e8f6f5f045c0993882d461e9bd8457fc33ee5c32b115540abe18e66b8020ae2ba0f6a593b3e7feb3e48c1d85554bb8340ee0606541964770a40dafc76b6 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be
+EBUILD openscad-2019.05-r3.ebuild 2061 BLAKE2B 8f0bd7a761adb86a9b627030f2f00a8ebfcf763b4d0a8a7b716db6394ef242d2b8e719faa31e123cc5229a66a92e208d5bee0ffb32c29ec7f03b467ac1508141 SHA512 2085a1a5cdd1617e5e97fe3ac917c4e19745fa1320f03d0c557c2e57337fca6074428c758dfe22bf825fcd384c7a0397561784d5c203b0d805bb9b03fbadf4e0
+EBUILD openscad-9999.ebuild 1979 BLAKE2B 1a7ce40f0f06244a8b420814935dadfacc025a2d899305314bdb827be8152ef85c16069f3e036cb3df263801bc56db729f10d5410fac9b82f8d75583fab549ee SHA512 3a05e021b61e353bd25857d1e238a85f1aa1bf3d34a36ebba2d9b1ce7da578584c19a2b366247088524b1c8e6b7ad447d37d0bab380b5819162b91bcce7f0748
+MISC metadata.xml 1123 BLAKE2B d182b2b81115ec212b553802174d5305dd37af439aaafb25dd05368b1431b960cb4e35e65bec0519438e9c1ed767124fc686e293d07e5d44807bbf4ca8d74ea2 SHA512 10fda921c2d18d8e3a12d986cd2de9eebf47d9d2f843381b4ea2874d2483a42b84c6aa6c216ceb4c1ecf4183bbc8d43d7202bafbfcddc15de1bcd6b0f297f29c
diff --git a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
deleted file mode 100644
index ef0bcc421eb7..000000000000
--- a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/qtgettext.h	2017-03-22 00:17:29.808058905 -0400
-+++ b/src/qtgettext.h	2017-03-22 00:18:55.251184835 -0400
-@@ -22,5 +22,10 @@
- 	return QString::fromUtf8( _( msgid ) );
- }
- 
--#endif
-+inline QString _( const char *msgid, const char *disambiguation )
-+{
-+	Q_UNUSED( disambiguation );
-+	return QString::fromUtf8( _( msgid ) );
-+}
- 
-+#endif
diff --git a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
deleted file mode 100644
index 7684eba92e82..000000000000
--- a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
-index 6416f29..b3753cf 100644
---- a/src/CSGTermEvaluator.cc
-+++ b/src/CSGTermEvaluator.cc
-@@ -109,7 +109,7 @@ static shared_ptr<CSGTerm> evaluate_csg_term_from_geometry(const State &state,
- 			shared_ptr<const PolySet> ps = dynamic_pointer_cast<const PolySet>(geom);
- 			// Since is_convex() doesn't handle non-planar faces, we need to tessellate
- 			// also in the indeterminate state so we cannot just use a boolean comparison. See #1061
--			bool convex = ps->convexValue();
-+			bool convex{ps->convexValue()};
- 			if (ps && !convex) {
- 				assert(ps->getDimension() == 3);
- 				PolySet *ps_tri = new PolySet(3, ps->convexValue());
diff --git a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
new file mode 100644
index 000000000000..74f48b4c1aed
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
@@ -0,0 +1,28 @@
+From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 15 May 2020 19:09:10 +0200
+Subject: [PATCH] Fix build with boost-1.73
+
+Thanks to William T Wilson for reporting and providing the patch.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ src/import.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import.cc b/src/import.cc
+index eef1323..08e46ff 100644
+--- a/src/import.cc
++++ b/src/import.cc
+@@ -50,7 +50,7 @@ namespace fs = boost::filesystem;
+ #include <boost/assign/std/vector.hpp>
+ using namespace boost::assign; // bring 'operator+=()' into scope
+ 
+-#include <boost/detail/endian.hpp>
++#include <boost/endian/arithmetic.hpp>
+ #include <cstdint>
+ 
+ extern PolySet * import_amf(std::string, const Location &loc);
+-- 
+2.26.2
+
diff --git a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 000000000000..1a4903828e80
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,35 @@
+From 2940d8e5c74faa5dcd5279c8166064ade3da5695 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sun, 17 May 2020 21:13:44 +0200
+Subject: [PATCH] [Gentoo-specific] Disable ccache building
+
+On Gentoo we use a USE flag to determine whether to use
+ccache for building or not.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ openscad.pro | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/openscad.pro b/openscad.pro
+index 2d190dd..9c4e67b 100755
+--- a/openscad.pro
++++ b/openscad.pro
+@@ -214,10 +214,10 @@ mdi {
+   DEFINES += ENABLE_MDI
+ }
+ 
+-system("ccache -V >/dev/null 2>/dev/null") {
+-  CONFIG += ccache
+-  message("Using ccache")
+-}
++#system("ccache -V >/dev/null 2>/dev/null") {
++#  CONFIG += ccache
++#  message("Using ccache")
++#}
+ 
+ include(common.pri)
+ 
+-- 
+2.26.2
+
diff --git a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 000000000000..ca21b9322e8e
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,35 @@
+From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sun, 17 May 2020 21:38:45 +0200
+Subject: [PATCH] [Gentoo-specific] Disable ccache building
+
+On Gentoo we use a USE flag to determine whether to use
+ccache for building or not.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ openscad.pro | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/openscad.pro b/openscad.pro
+index cc7f3569..8fbd3a5b 100755
+--- a/openscad.pro
++++ b/openscad.pro
+@@ -208,10 +208,10 @@ mdi {
+   DEFINES += ENABLE_MDI
+ }
+ 
+-system("ccache -V >/dev/null 2>/dev/null") {
+-  CONFIG += ccache
+-  message("Using ccache")
+-}
++#system("ccache -V >/dev/null 2>/dev/null") {
++#  CONFIG += ccache
++#  message("Using ccache")
++#}
+ 
+ include(common.pri)
+ 
+-- 
+2.26.2
+
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 7b83ba148002..5ed7ed33c62b 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -20,6 +20,11 @@
 	OpenSCAD is free software and available for Linux/UNIX, MS Windows and
 	Mac OS X.
 </longdescription>
+<use>
+	<flag name="ccache">
+		Use <pkg>dev-util/ccache</pkg> to speed up rebuilds
+	</flag>
+</use>
 <upstream>
 	<remote-id type="github">openscad/openscad</remote-id>
 </upstream>
diff --git a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
deleted file mode 100644
index c8c9432ff43a..000000000000
--- a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-# 2015.03-3
-MY_VER=$(ver_cut 1-2) # version component
-MY_REL=$(ver_cut 4) # release component, 'p' being the third component
-MY_PV=${MY_VER}-${MY_REL}
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-DEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtopengl:5
-	media-gfx/opencsg
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=media-libs/glew-2.0.0:*
-	media-libs/harfbuzz
-	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch"
-	"${FILESDIR}/${PN}-2015.03_p3_fix-boost-1.70.0-build.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}
diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
new file mode 100644
index 000000000000..73d706525135
--- /dev/null
+++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ccache emacs"
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}_fix-boost-1.72.0-build.patch"
+	"${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch"
+)
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/hidapi
+	dev-libs/libspnav
+	dev-libs/libzip:=
+	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-gfx/opencsg
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-2.0.0:0=
+	media-libs/harfbuzz:=
+	media-libs/lib3mf
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.10.3:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	ccache? ( dev-util/ccache )
+"
+
+src_prepare() {
+	default
+
+	# fix path prefix
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+	# disable ccache
+	if ! use ccache; then
+		eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+	fi
+}
+
+src_configure() {
+	eqmake5 "${PN}.pro"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 6ce960b60bc8..4dc6fbc2617d 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -8,45 +8,67 @@ inherit elisp-common git-r3 qmake-utils xdg
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
+HOMEPAGE="https://www.openscad.org/"
 EGIT_REPO_URI="https://github.com/openscad/openscad.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="emacs"
+IUSE="ccache emacs"
+RESTRICT="test"
 
-DEPEND="
+PATCHES=(
+	"${FILESDIR}/${PN}-2019.05-0001-Fix-build-with-boost-1.73.patch"
+)
+
+RDEPEND="
 	dev-cpp/eigen:3
 	dev-libs/boost:=
+	dev-libs/double-conversion:=
 	dev-libs/glib:2
 	dev-libs/gmp:0=
+	dev-libs/hidapi
+	dev-libs/libspnav
 	dev-libs/libzip:=
 	dev-libs/mpfr:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5[-gles2-only]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
 	media-gfx/opencsg
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=media-libs/glew-2.0.0:*
-	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-2.0.0:0=
+	media-libs/harfbuzz:=
+	media-libs/lib3mf
 	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+	>=x11-libs/qscintilla-2.10.3:=
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	ccache? ( dev-util/ccache )
+"
 
 src_prepare() {
 	default
 
+	# fix path prefix
 	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
 
-	# tries to call ccache even if it's not present otherwise
-	sed -i '/CONFIG += ccache/d' ${PN}.pro || die
+	# disable ccache
+	if ! use ccache; then
+		eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+	fi
 }
 
 src_configure() {
@@ -71,3 +93,15 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/panini/Manifest b/media-gfx/panini/Manifest
index 6335363186b3..29551816acd4 100644
--- a/media-gfx/panini/Manifest
+++ b/media-gfx/panini/Manifest
@@ -1,4 +1,4 @@
 AUX panini.desktop 250 BLAKE2B 2fe866c696c3056ac914242fa14fd378517dc6fce02bdb9b7e2b6716e825ce9b2efe577132e3a1e71808aa7a17de57e9caa1121143e73d4007405b1ed6d7c666 SHA512 6e4cbf1d2a318d4e593e29d78668dd6cdaa37db82dcd7ed0aaee1b6e25a381c524708b404c9bec3902cd101c46c70e0546425eeed33c41c0deb17751df0f0f40
 DIST panini-0.73.0.tar.gz 329164 BLAKE2B 1cd592d7c5cf230398a6496a27f8389375a670b1de1a0f6acdb2027884bc5059798ad86ad4deb7795402654b3eb9edf112c3c177c7c716d55a186e48e1567f1c SHA512 4c12c0af5f94079f0da8f08dd19d99fd06c16c653b21532eba01022ed5b78afdcea2a042902fd50d0ea442483699cfdf9b10fd7f4592e3bae60abd5d2dabf657
 EBUILD panini-0.73.0.ebuild 932 BLAKE2B 5fbe549d028d54a41656c96ae48269a86a7da76074398e0ab8451f0c5736754ace52c2baaf2d912cc40fa65b01d1dfb7c160ff4815a38be2042ad8d0dd5d6cdf SHA512 43a9ce7559094d6115d4b133c4a67dc172924a61e8a2a10628dc540b4d0cb5811ddb2bf275efcd5c0b0d0e2f034cdfcb74ef06f10e9089c3d7d5105feac3690d
-MISC metadata.xml 343 BLAKE2B 0eb728b28f25aef454e224b14b8e26ee899664d5fd45fc59e7aca53b5df155120bccafbd3627db7fe2c7cac91943134879eef0161e17fd5d21aa433105087369 SHA512 1515628627be99d296db85501b7239e87368f24d0a238a190b1d330522d9fe371801b7ee90cccf4d48e09d12b53526549b2774b2603e599075cdf5b53bfc8a55
+MISC metadata.xml 251 BLAKE2B 46d82c29fd27efed76d1cf625f8df6af191fc0a23466fae9f011f0ec97132a98eafdc56636566b3360a16b1e84e41d066d3945e4dbffc37ebd786266c1d1a8e2 SHA512 03110d6c36e68a1a996d59b99665f333654633d8f630c214eaeaa55fc25d13662e486b572901e8c946e34bdcf154bd160ec95897c36218a4ff71a0fbdae4688e
diff --git a/media-gfx/panini/metadata.xml b/media-gfx/panini/metadata.xml
index 5a6248de464d..c6eb0baf8592 100644
--- a/media-gfx/panini/metadata.xml
+++ b/media-gfx/panini/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">lazarus-pkgs/panini</remote-id>
 	</upstream>
diff --git a/media-gfx/pdf2svg/Manifest b/media-gfx/pdf2svg/Manifest
index 7d0320e58af4..da4b1ba2ab19 100644
--- a/media-gfx/pdf2svg/Manifest
+++ b/media-gfx/pdf2svg/Manifest
@@ -1,3 +1,3 @@
 DIST pdf2svg-0.2.3.tar.gz 89461 BLAKE2B 5857935195429f43cf9d6dc3bd66a88945be45225f0ae8324762937b7bfe407f0c4fb4013069d4eda2f0e036710a1a78b261093c18e4693622cc6fc9f7fd7916 SHA512 e8f0cc34c112c7d9ae02396ca587f1354462add882501f003b0173e05ebb09c09456dc1736679674fec5a2c04bdc0ef4141266090ba7efeba8b194ee602f5ee2
 EBUILD pdf2svg-0.2.3.ebuild 803 BLAKE2B a29ed2caf49d719a4777f6916de8b142ca83a94c48fba5b644337d47547aedf6c39c10903f627a0e0b1fd2d58a3f3212edf6876c118d743ce4cd1494db197f97 SHA512 90a225cee6b1268da2d0d0c9d545aeb4ffb80073117878d2a8843e7839c2c7c64e27bfcdb2b41d4469874da0f681e8b19e19401375bdc8f48c436a7af4ea0c6b
-MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/pdf2svg/metadata.xml b/media-gfx/pdf2svg/metadata.xml
index 899a49093b0d..7a38bb900964 100644
--- a/media-gfx/pdf2svg/metadata.xml
+++ b/media-gfx/pdf2svg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/png2ico/Manifest b/media-gfx/png2ico/Manifest
index 6e5f587f5a49..268838f2be49 100644
--- a/media-gfx/png2ico/Manifest
+++ b/media-gfx/png2ico/Manifest
@@ -1,4 +1,4 @@
 AUX png2ico-2002.12.08-memset_and_strcmp.patch 277 BLAKE2B 4661418441743f931cbf8e397a837000a9d88e129e287652ba3ce57a0f67e6e9c67ad623387fe6a28185c249265200705c183218572030f3f393bb8cb787bb19 SHA512 a89d8dc1b65e6cfc3c1201a255a1b16ef22ae0fbc02e3b8a0ac097f1d62c472960f42132d84fc9fada900138a6d49af60455999cd28d2565035a69a5244994c9
 DIST png2ico-src-2002-12.08.tar.gz 26527 BLAKE2B 08f6c733b1dd9000f71a34d85d4f52cda62b3117e5d8a5889d4c3209988522ac3b549b0c295e3c9e17e1d3ac98f9c1c5e69555310d2c488d515bb197204bd0ed SHA512 f9410d2d15a14b5350cab7bf93f91b80f9e1d0b6a1fdae8b8850d11f29c9f4000bc8c3778fe24acec75f1f182d5ea383cff38e22b8ac5da6432c0a7a2d0e3208
 EBUILD png2ico-2002.12.08.ebuild 812 BLAKE2B 75ae9dfc9b0f4a81272a73ba5397df70fbe44f7448059b2b870df3cbcc5241f098cf54c474f471b43e27e1c3c4514d6fc65d1b7c55bb0b0066b2fb3db1e8ba35 SHA512 3982aff7692f98faf43a05176deda7a9d55f7d42393e964fd18bff784d10cbbd3631f51a7d68889c1cf67db93d7edc7473c17727c77473264153713fa4b9540d
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/png2ico/metadata.xml b/media-gfx/png2ico/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/png2ico/metadata.xml
+++ b/media-gfx/png2ico/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest
index 757a7e98f1a4..96fbd19bfeef 100644
--- a/media-gfx/pngcheck/Manifest
+++ b/media-gfx/pngcheck/Manifest
@@ -1,3 +1,3 @@
 DIST pngcheck-2.3.0.tar.gz 59864 BLAKE2B 3c635555f76d22d6949309707b7054608f5e093d3a557eb88eb9fc48aef76326f8e6b0dbcdf8e30213a042416f0e6f798e41411763e7604b12495b6b2748cddc SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad
 EBUILD pngcheck-2.3.0.ebuild 643 BLAKE2B 3ddd07326f91f14c7efc71c9a0b442d050ab3095ed52336f99edee0e34b325def2d14f18e96ce4c1cd726071b1610fdbf629c898f22a26c500e41954d0055f71 SHA512 cfcc71d19d8869482b92d390b9b4a65e81aa1ac9865af2b914a10e57afdc0b71f2df5738e7283c310604b550ebcd6b99edd7a8f7d3a15539bf72d39bb88e9eb8
-MISC metadata.xml 336 BLAKE2B 233943d2b9383cb850bbb7d8230a938527331b28cec37e3dbf6d9455af87fffe547ba6f2b746f7fe05bc40a347d0d697c049dcb97e23ee85a9aeda617fc12c2d SHA512 1b1fb530bcdeb8afc7c5b1edf81cd1d02cfc6829e30273b0270a67a0a263030256b4e6fbe40d3cfdc52e5b709a0b8625d3a06e3dad0667ff88743326c35ef789
+MISC metadata.xml 244 BLAKE2B 5498c23eb35a869f92ff882d6931f50645f2a10ea31c9e22f892e9c5e11b54cbe7063decd5750b2cca2e8737ca7e5e5e7fa154401ddf8a2baadf7037be981241 SHA512 c6d20cd9c770b2ffa18b02ad2495493b61d681c2f1d54716aaf5a22a63db01219db3f4d3f743ec8abd24cba27bf5e3c0da3b80158a1b06b933965d8481349417
diff --git a/media-gfx/pngcheck/metadata.xml b/media-gfx/pngcheck/metadata.xml
index bc31c3af1295..e25fb712a900 100644
--- a/media-gfx/pngcheck/metadata.xml
+++ b/media-gfx/pngcheck/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">png-mng</remote-id>
 	</upstream>
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index b00acee3ce2a..9ca230751f30 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,4 +1,4 @@
 DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e
 DIST pngcrush-1.8.13.tar.xz 404564 BLAKE2B 6e3e9556b40f5616a488cd4d0fbbe788b31d965b748222383741e9dc0c8fe7c12880b2d2a39ef35aa41adbab1fa9f49e7272dadfbe74cc712a7b810a9787d9af SHA512 5fdb7913ec8c90af63d68477f4031c9008dac0d7f4bfd7bd47e971d218e3ef8b0e1a8bf6ba0f5d2cc4c2682c9297efb4f738b11538ad306eee5d01277ce3f628
 EBUILD pngcrush-1.8.13.ebuild 855 BLAKE2B 46788be2557cc7cd96c41f5bf54f40bef735ef0b04dba1abb0c0c834d9ec90f484d6e8404d04616ac3649fad7e43a1bc540b724af70dbb0436e8957cdaea043e SHA512 7fb3990a501ef008f37824318e4b92899857cc77429bb805ca5385b13cefacf76402a19b7c5d306b87e3a91eb6e6f5da6622e3fbafb591e35b1b0582e3f0044e
-MISC metadata.xml 624 BLAKE2B 24563481e49bea22686f679fdf4aa82c780c6be37fc12da2a5236a9832912314e738077ac9a3198a0b3848f6e605bd93a04d8ffd027f1ada7017b40653c0fd70 SHA512 e3b808c02f0ee72bf2f25f09784025614317a7b375ae76c055432f083deef3917c3be713a4cd38d6b9a0b069428f7075f8e12414908934f73833fa7ca6e131e2
+MISC metadata.xml 527 BLAKE2B 171fb4d76df288f8bae876b4b19900a0c60e7dbcf6233cea7385eb96d13a531efacaedbbfd6a5fd2709b3391dddaeff2eb4c97a1ff02b300a5b628eca5502f3c SHA512 659e4b683a9ba43dcc06d8471b74d6c0690bf661898405e722e5ba98620ce354a9ef1e642cee5ed5bd77b180254cef9e29a03c8e42f94058548c39c2116652a2
diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml
index 4cef0cc2d108..293c80b945eb 100644
--- a/media-gfx/pngcrush/metadata.xml
+++ b/media-gfx/pngcrush/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>glennrp@gmail.com</email>
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index a77241fdffbb..33fdb03b95a8 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -2,5 +2,5 @@ AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f9
 DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
 DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9
 EBUILD pngquant-2.12.3.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
-EBUILD pngquant-2.12.6.ebuild 1308 BLAKE2B 81133b1450c339d66e1abb5421fe305bdd15e9eee62a9f5d25ee7f3c6b3f52e676045edfc933bfc9f3313af623cc133d39d752b5be116b49d886d48cafba5a09 SHA512 1a1435dcd69955c2114640097278fb0de6eda7f2ed44c39931980ee47fbcf965d312514f1d15d2c666d90b31d89aba0133ef3ec5c0a6dea0631903aeab88ad98
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+EBUILD pngquant-2.12.6.ebuild 1327 BLAKE2B 474a665e2ab43efc9904450c28edf79f875b49c528555bb7ffd1cc713ffcb0bbd6de56a9279c166435895504df93889e06205500efbc43071c5edbcd7ca4ead4 SHA512 3f8c497cf9963ea3fef36e5ee03c5fde950e80ff0c6819e5a0801625f1276166c7161d055ab3394d5174eea215f19af87a60d5583c64783d35787b6f520a0514
+MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/pngquant/metadata.xml b/media-gfx/pngquant/metadata.xml
index 6ade85e1c642..80a71f597854 100644
--- a/media-gfx/pngquant/metadata.xml
+++ b/media-gfx/pngquant/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
   </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild
index 3fb651b60f57..a3698ccb13ac 100644
--- a/media-gfx/pngquant/pngquant-2.12.6.ebuild
+++ b/media-gfx/pngquant/pngquant-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
 
 RDEPEND="
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index 6a86341c4721..2e6110e2aff6 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -1,3 +1,3 @@
 DIST pngrewrite-1.4.0.zip 149760 BLAKE2B 7ae0acabe8d231233bfab3fe0c6a71da4f835d5c6c6943aa394ec0e83f126c93127d5f798e2206f2c45ed5b9b016a14c45a99ea450b40fd63af09a321fb5d2bd SHA512 9ed9d220a4d8066f752d7ba123dd831ce6550072e7f8dd2327bf257b3d8e886f781c4878896c633a9a251a1311a10af56434e2c9ff773d174233a340a1f37e42
 EBUILD pngrewrite-1.4.0.ebuild 636 BLAKE2B e06e969c4727d71dc64fb57bcf665ceb84601a00d25f9dac7756dab400f98df02160d4c95777b53b28d78cd7c4fcb3f8d088075519b0c5e9725689c532cfedf8 SHA512 057686c8e59d0e7e2408f1199f28a94772adf9c0a587c95df7bd8c861c58cac868414845df4224759dc68d738160bbe9949c96f2be677a888566b75843e2115e
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/pngrewrite/metadata.xml b/media-gfx/pngrewrite/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/pngrewrite/metadata.xml
+++ b/media-gfx/pngrewrite/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/pngtools/Manifest b/media-gfx/pngtools/Manifest
index 7aeb384263b5..6d56a9e941f2 100644
--- a/media-gfx/pngtools/Manifest
+++ b/media-gfx/pngtools/Manifest
@@ -3,4 +3,4 @@ AUX pngtools-0.4-libpng14.patch 1265 BLAKE2B a959b83fe85a10348d815ccccaa17d2e46c
 AUX pngtools-0.4-libpng15-fixes.patch 6722 BLAKE2B 083318ef199f4c07ed1f44ddf95623fd198e10a2b939f86c1bf7a9995fac98080d0dbbe79e2e88817e8f07c5bd2f79ad80d7ee2d41cb0d03ca7aa46b8707ba64 SHA512 aafc4c746efc0ef00e9d9e59acf0dee58b56ce80a9f04ddfa9879f46f342170f4641f23081323299a143d4837367645240f823ba9900592fcfdec71961f3f330
 DIST pngtools_0_4.tgz 1312178 BLAKE2B bff4be34b9a14a459cef2fb5cd1b70bb645c1fca8843bffc2a517b7f56e7a40e104b25b887f8bda227da2e12613c6c568b081b38bf70881b291bb5562eaeb6db SHA512 588b954c7c43ba48442ed4b22ad94fcfb456c7fc84a682e9126ca9d1c9b63dbb8f2d64e6e156664f327efbe11bb2ab1ac29d63ebb8a05329ac14200fb29f95a1
 EBUILD pngtools-0.4-r2.ebuild 703 BLAKE2B 2ce8afd2ce3d957fdd4bf77b3e1cc821523aadde6b2f4995928ece1cae9c633f4c3de60454589929536cc0299b257485de175e7fd73877e2f272f0a161a99086 SHA512 6c618d4ec7c027b1a621d879aa10ff27bab962ffbbe6de42031380fc1343b6a63f6f85a15385232765c9d46d5dc83ce616adcc1aebea8930259529fdb86b5788
-MISC metadata.xml 334 BLAKE2B 1187762760d5f446f3e05d51549d1cd45c5544fbbf12c0ac47b649b3fe3ee569a366fc52c024cbcad263c11b8da4c08bcd54df7c9f92e6eed1530d918ffd78c1 SHA512 348994bfded172670ed4e52da50cec54a3c059a65d8a00e5aca8109c9320964dec238ad3c6439e7eb7556b4ee047423b93ca34c88090dbe1bfbcdd7a5a9e6fe2
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/media-gfx/pngtools/metadata.xml b/media-gfx/pngtools/metadata.xml
index 612ab3f2987c..79d462e85571 100644
--- a/media-gfx/pngtools/metadata.xml
+++ b/media-gfx/pngtools/metadata.xml
@@ -4,8 +4,4 @@
 <maintainer type="person">
   <email>robbat2@gentoo.org</email>
 </maintainer>
-<maintainer type="project">
-  <email>graphics@gentoo.org</email>
-  <name>Gentoo Graphics Project</name>
-</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index b6e0c5545c39..64f9212596c9 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,5 +1,5 @@
 DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
 EBUILD potrace-1.15.ebuild 796 BLAKE2B 3ca9c7636ce5e73b43a0f0b283702baecd5c2c9679bb748154f4b9628b8a5c0da1313541b765a5c6b29c90e2b5ba83983b70baf9f7be9d4e95879f45698148d7 SHA512 fa276bfc2dfe220688168102a2e04118611014b9511b0af6a8a1d38bde81fedac7365a928db71336b9db3b0cd28bd93dce6bab4da3dd4444dc4995f3e4e0fc7c
-EBUILD potrace-1.16.ebuild 806 BLAKE2B 4ebc44c22814b01d2e0bab270554e51ae362c60de11f1b74657df38f84e712aae8d633fa0884165cf86919a2983501db3836b165bcb16d0ad20f2dd88ac63671 SHA512 f471c5488ab1aed1093150b0642fbca2b9bf2d912a90459fac6938ed1e586d469aae487f12aa1b8c9c00be92241232b0d2b061c2f030f27ea861fb21e6260e18
-MISC metadata.xml 534 BLAKE2B 04a21e1af300190548959fc595c0f0ca4918bcc949bb6f5ac6747f79806b3c2f3e57ecf25076e8d8a876ff1ee45b8b816e89c957f8ca4e05292ef390c5de32e0 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3
+EBUILD potrace-1.16.ebuild 799 BLAKE2B 2e274b37600db02c2cb7dcd3b60f121e604c637364f5e1d4a6ee0e8b21d34c545bf66638c5da61509f09e3e7f677a9bc7c776637d51cc4782e3b19588c6dd58b SHA512 a481f13281ce17eec964a398720c4dacb2fee268862cc22f4f388516b686e295cb2627742a3b8c2010310fc2eddb5b55dbe9860333ccb56bb6c334cd6216b5e4
+MISC metadata.xml 414 BLAKE2B 898ecb37a2e19b25b8ff0a2f6b990812556b6902809102c7aac7dbbc8a11b27c74d8955081866bec821829ed499d5841d1dbd5c5829bc40387333135d9c4e77e SHA512 6120a5d57ff58cba2bf2407293def120107d5f58c2757f08c08435d7679ceb4a4174a07fd4813db8dfa0239eabec633c99ed49f860111361baa33995fc3ff288
diff --git a/media-gfx/potrace/metadata.xml b/media-gfx/potrace/metadata.xml
index 22251219aa95..6fe485f4ab7a 100644
--- a/media-gfx/potrace/metadata.xml
+++ b/media-gfx/potrace/metadata.xml
@@ -5,10 +5,6 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<use>
 		<flag name="metric">
 			default to a4 paper size and metric measurement
diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild
index 03f6e9cd2c69..61be1a6b5914 100644
--- a/media-gfx/potrace/potrace-1.16.ebuild
+++ b/media-gfx/potrace/potrace-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-gfx/povtree/Manifest b/media-gfx/povtree/Manifest
index 01c4122c7e0f..9a46cff2ac87 100644
--- a/media-gfx/povtree/Manifest
+++ b/media-gfx/povtree/Manifest
@@ -1,4 +1,4 @@
 AUX povtree 326 BLAKE2B f59e166a4c62e9f7a78a611b49966a30f82b369034ed9c780372e896fc774402ef369a76f048a406df45b3523a68d804138447098a01d8bc2a977b912684ff74 SHA512 9456ed3360de5f57d8d8f25c7f9986c631d90c73829df4be31f3eb7dc4fa1750e8b3e8ed986043bdfc01215a86a675fecdcfcd1c3279bb5df4f98ade57f57679
 DIST povtree1.5.zip 917548 BLAKE2B b8ba7c3006273c67d0c245a76d84a87160153ae35e35d9baf094b9de54d75e93237906c08d92d3442706c33396ad9ab87cb445898a92084bbaf84b5897e213b7 SHA512 ef8de1e1d9b5ffde782bd6bba39a11b57928bdb2b3359613a0ae1bc6ad012876a3a80d8cbbba1df77b366e44a7d2f0b48929f12e18853ec556f5af5780ea7d34
 EBUILD povtree-1.5-r1.ebuild 767 BLAKE2B d4d0ccf6a87d4003973b53e3ed63bf602704bd22854006bd8367fcf28c5b2adaed2b86d424f57d59c24b2a3f896f7fd4c00b63b7d6bd1801782951cc453004a5 SHA512 17d51c5b79b0a33a8f6c576ba9dbe53f9f77db17622bb6401ed9917cced63c5c605c0fbd7059a0346261281c69200b98a22b7b3eccbb17534356e29877f88805
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/povtree/metadata.xml b/media-gfx/povtree/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/povtree/metadata.xml
+++ b/media-gfx/povtree/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index f651b99ea36c..3f3162d931e7 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,4 +1,4 @@
 DIST pqiv-2.11.tar.gz 139825 BLAKE2B 981d472ccd3284b2e9ad3da8e84233c95555a927af797f8421ac820225d3d39cab2275f01269a986bab54994e0fce2095b7c33b1201e7a6117e1c8399617341b SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7
 EBUILD pqiv-2.11.ebuild 1728 BLAKE2B 232ba0e63bc478af137485dbe1868705f55c90d5ac0551682b25e6b63ac7c2087e778b06fdb09a786bd8ead5d662089b68b511a99a0db9ba843c5d1b75e6edd9 SHA512 3d57320d6c1daaf5ca59f2faf3b5676fbf31b753c79b57ca75b8e073ed115384f849deeafce5aae88d4a7c6044729293c0f7a3d16a1707a66aca2ab16b527146
 EBUILD pqiv-9999.ebuild 1730 BLAKE2B 078594b0e5901d7d8657ebd799431aef03418d501df182fabee3f4a288fc402c8938280ad932026668322f82e2823ee6bf6fa1d46b940d1d6dad7acdfc385dfa SHA512 472c909163057c8f0063d14a15b8614ab3d7dcd0b8ceb205c97c679a2cccca3607e8188d2984003665b0ae458658047cd0ee7d6fafca68913bbe7e45b7a920e4
-MISC metadata.xml 584 BLAKE2B 5d617c553a0f5f4be6268f17dae36d3bb52e984c4c7c89df44b40e1bde1cff3e5619210548b93bf6ffc2e0ea32839d6b4fd39714b237aea23f1cad966c92b3ec SHA512 0d589cf085f6e6335aae5f6e32ccd153ddae1f0fa926fd3a135eabcdc20d5c560e2694216ba93b6d8c6c16bd8541f9d7aaa496e7ee4bc82fea90228a28320fbd
+MISC metadata.xml 487 BLAKE2B 96c648191be3764fac506babe5d5dfc570ca99c92a614ce02a51b72308dfe96cea27213196d3ac5c6a7db480d682ebb148c7891536a2456ab63495c7bc343a6d SHA512 6ebd83613e98ec8a5b1212fbc7f26b8e0093bd7fc55c5ce8fc2dd28c6fba1aeb6bd539fd074cd61841c6d6996ab078f47621b8f895f9140bde61c9ac0aced9f4
diff --git a/media-gfx/pqiv/metadata.xml b/media-gfx/pqiv/metadata.xml
index cb5fbcd27582..9a7fe36ac765 100644
--- a/media-gfx/pqiv/metadata.xml
+++ b/media-gfx/pqiv/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer>
       <email>phillip.berndt@googlemail.com</email>
diff --git a/media-gfx/pqstego/Manifest b/media-gfx/pqstego/Manifest
index 8213466935e9..fed208028b96 100644
--- a/media-gfx/pqstego/Manifest
+++ b/media-gfx/pqstego/Manifest
@@ -1,3 +1,3 @@
 DIST pqstego-0.0.1.tar.gz 156170 BLAKE2B 1d86b421c81189a63ec95b6aefdeb9e92189059e8638f118c3918ea0ae9e4fd8800e4b64cccb1a4f8d92fc8e6f2853c4e7d81fb1787f061e2665525b6aa7d53f SHA512 cc29f745ed6f4af27f491a2b97cc614b4bddd88bbfda9d2a2737c8c6a4a013e0ea6cb125cf579b3a792c060f8ed4c176af61a2ea0a309108176b463dd002f999
 EBUILD pqstego-0.0.1.ebuild 384 BLAKE2B 27a1fddebcdb54d8a05e79761c7944a9d2bd151093050887f45eed9d810f36e6550af79baa5afc6c6da2d894643deb913b05b534bb51fc07c8445bd05d25f2cf SHA512 eb6f734a0bb2733171f2417a9270d0220f1582bf2167d0dec9fff01e77c8d8ceab2cd4bec79b095fa76f7a4986cb7e0b2b631758a7dd0325d7adbee2e9b543d4
-MISC metadata.xml 346 BLAKE2B 69416f47156576f7e842d6452198ac2715d5c4ee8fc215cdb7104d071331a767f2b053981e6cc63ba754d769e5f71322d357cc783158bb97ac2329268a66c735 SHA512 f49877aff2dc6429963ac5d9bce07797df793bbd89ef82cbb745d13fa2aed484a0758b6209f554fe3f21b3bde84827c6125cdca6fdaa5d6b6b1a4764c5d34d8e
+MISC metadata.xml 249 BLAKE2B 8898fdd295c177d9bb7f8528a9bbafd98b2af32934a1e3779740e449c78dc278264dcdc7984694b7d4be0cb8adbc6e5c500de5b9ba75c079ba78b8416664d8c6 SHA512 8456e089d75a69f5eb955f4de3133c8507ff9fdffefa27c6de41c588857c8f94a10c4dc1e49673c97c2893df52e7d586d180a2efce3e181f9b8e18648f819d11
diff --git a/media-gfx/pqstego/metadata.xml b/media-gfx/pqstego/metadata.xml
index 0dc38e231139..365722ece28f 100644
--- a/media-gfx/pqstego/metadata.xml
+++ b/media-gfx/pqstego/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">pqstego</remote-id>
   </upstream>
diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest
index da7c0a301152..bc8415448a54 100644
--- a/media-gfx/qiv/Manifest
+++ b/media-gfx/qiv/Manifest
@@ -1,4 +1,4 @@
 AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358
 DIST qiv-2.3.2.tar.gz 135164 BLAKE2B b6b82c3007cd3214bb0b812026d22ab0a3c7fce87e51c1f2e19634fe131656f7adc1e92d2e1fcdcc563f1fd8b7c298307e48823bb26e077b336a6983f31894ac SHA512 a6750ecf26bc5b78fbebfdfcfd7a8ab0a5d3ba4e4b19c4a5563e1631dfaf8cc98f7a0bc9449956bc06f8b98cb307b31f78178676ddc9df4fa03429fa31c174e8
 EBUILD qiv-2.3.2.ebuild 1223 BLAKE2B 586921fac938875cfb54525bb00b134478287143d4f824d5521ca875dfc256fd8ca3252caf2e1b879153837aed78900ab75d0f92ce7da965d63030609281ae82 SHA512 7cb91c24aa67ffab9bf6884a9b4ebc9fec5122ded9638ab76e1e71d66affea869742a266dffbcebee6f8b5bb4cd083fef2c22793804ee3eb6c6a1e7c8f8acc84
-MISC metadata.xml 340 BLAKE2B 60db54083682115072d97b6de47547140bc053790702f949cf84a6a56c5ad30c03de44062e9f4713c60441f11296118623d8757f158659b7fad0ad42ba0359c9 SHA512 dbcb9ab316253fd10aea1ed236e1543c387f3b87a561bdcb7e60899eac0375fe1a197dcee3bed98a0177b6648fb54fb04769faa9809abf875aefc27f00e3a4a8
+MISC metadata.xml 248 BLAKE2B ab7b756aa0b3b6061c7af2ef699cfccf52f3451ea89f7c51e058405391fca28092d65b7d4dd42846b436a4c23b8b620b923410e0efb0a45d636d9aad01e7725f SHA512 e48f83e5e18affc154591383f52d7620c286e5596647e8f2bcfc0fd13a4a1ef1ee90a9d799be53b572812c6e3f38072de31eafa293b5a8e3559f95a32c85a99e
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index f1be52d03dbc..14169f8501b5 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="bitbucket">ciberandy/qiv</remote-id>
 	</upstream>
diff --git a/media-gfx/qvv/Manifest b/media-gfx/qvv/Manifest
index 375167277c65..9a47589bbcb1 100644
--- a/media-gfx/qvv/Manifest
+++ b/media-gfx/qvv/Manifest
@@ -1,3 +1,3 @@
 DIST qvv-4.04.2.tar.gz 4371030 BLAKE2B 960a96023ea968f299e803afe51887c99d2b37a14943772fa98d56c4b912b678c27e0822ed2e5b6675519c05bf04e9f02f3322a77e3e0f22b648796422cb7a8e SHA512 c678eedf945f88bc6d5ecaf8fecfef8ccb7ce741b2201c81b631be9069435552f523f1d2b370197df0230f7b11443b904b4dbe4b7bb0a71f0a164151a0a9ec90
 EBUILD qvv-4.04.2.ebuild 683 BLAKE2B e324e74a5a74802bddedb86b37e50219d229a66f1aa0b42cca79bffeb6b558d599014cb73810d08c6570d539da707e1dfa09b18c64b57008a6c9de8df58cc74b SHA512 90c73c86eb8f130bf311808d4e532cea581035e10e5e3bead04fd1df1a0c37d19b8d8a99ca1b47de4900542c687c7524704e34168a66e4e4a9a4f5d009e8d7c9
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/qvv/metadata.xml b/media-gfx/qvv/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/qvv/metadata.xml
+++ b/media-gfx/qvv/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 634715e67161..fb7ca5ba2767 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,4 +1,4 @@
 AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
 EBUILD raw-thumbnailer-0.2.1-r1.ebuild 664 BLAKE2B 9d0a4ad1cb6deb3f44a18e8440722944dc7b7bbe2c84c7b0f9142223a216ee16d39a39640477a2b932a0b80e81ec9ec934f57e62d00529bd2d2a17709f778753 SHA512 44db2f99c6535e3f8277e15ec7707931d18a5e5b79ee3ea4cf25ba8c7e9241dc79700276a363f2f9be0c78c9c85549fc241e58e80e4437c55b4264a030055843
-MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
+MISC metadata.xml 315 BLAKE2B 6e55b8ff26021b820d737049cf51e56843734634c87ffc084e2f2cb3319603684b535506bbdb05e99b0d4b8fca4606f789a49517d9e20d313203affa452b07b3 SHA512 43c7b768ea53914901e0e44859d8ebe5b5ad3b768a290b8c563843a356ae6b12539dd86c39dd43c50908a76cbe375d3c3032e6cda1b549978ad35b04a6c65cb4
diff --git a/media-gfx/raw-thumbnailer/metadata.xml b/media-gfx/raw-thumbnailer/metadata.xml
index 9829c52dfe9b..8254b1919cd5 100644
--- a/media-gfx/raw-thumbnailer/metadata.xml
+++ b/media-gfx/raw-thumbnailer/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">raw-thumbnailer</remote-id>
 		<remote-id type="github">erlendd/raw-thumbnailer</remote-id>
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 762c9ccaa16a..a87d46ba8840 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -4,4 +4,4 @@ DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a
 EBUILD rawtherapee-5.6.ebuild 1609 BLAKE2B 44239bb8e54a9149b70d36a1ff582b6f0708c0747f9ee4c021c01438092cec1cb9a64bc64b5fd165ddfc338bbfe533506a14d07c695f5bfba57d6848f6a3b719 SHA512 a1dd100d0f59c2a7642e2f85a34773d37c6c7f1e4d95e865d38c9463dc58151347004860dd320acbe944701c0a8170df89ca0180e915cee93cf7581756a9d51a
 EBUILD rawtherapee-5.7.ebuild 1611 BLAKE2B 098b45f91d7944f5b932b583b39579a217c31538d9816c8942efe683d5f0602919e22b7308cf10eb2e6581b4804ac611c336312722abbf66deea4777f59a9e50 SHA512 dcf827bbf5ba0b7ff77a03f1a7558317164355b8acff4596ae27b88f0ef5a6a17245343f7de349c9486cb471d19345b5ebf966c32776bd6728c96210ded9f4d1
 EBUILD rawtherapee-5.8.ebuild 1699 BLAKE2B a89a6c3d0fb17679bd282a1aeef89b103000a89626d14e32d4fb94a883b6e1c46bf7667b5f181147c89318e21cfc354fbd89a13e753da05ec67551025197f04d SHA512 73df4a6a1aa89176f0703afb66d3cfdd74645c752f44817afd6f792ccd769f59574e11db79e6920f41038b8b8a002e57beea5506a7601ba5791bd00d82977dd2
-MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
+MISC metadata.xml 365 BLAKE2B 7f954a20d61ad3c5f034099555edf9141e5d24b3dca5b47f8c9f53ef9f7e9422d10dc458dc3b4693288d182f579173a58b85708920a4b1d52576f07567397306 SHA512 ca26a61740ecd1b5ed7197bbc06c91f48e2955db05e2c7952edac28f99dc394504140672148214d202d61d673e4294ecc037457dc0f77bf4b790fc36e668eee7
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index 370756f32bc0..db7bb13ec0ef 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -9,8 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-</pkgmetadata>
+	</pkgmetadata>
diff --git a/media-gfx/rotoscope/Manifest b/media-gfx/rotoscope/Manifest
index db934ba94034..98fbe7a50369 100644
--- a/media-gfx/rotoscope/Manifest
+++ b/media-gfx/rotoscope/Manifest
@@ -1,3 +1,3 @@
 DIST rotoscope_0.2.orig.tar.gz 108147 BLAKE2B 2f860ec531ac0f4011e078465762e383d175c87a025ac74b5029f4dfa4e25efbb733a5c245ab3a34d6e9a71b6f11aa98afbc683f8cd28c1e174d84282ce7f3fd SHA512 106dedbfb5eb378da3e2082935f2127a84f194437e95cf331081fa45284066f00028c26f09b66848530d76138b6b55e9da46cf62b98a8e9af7e628806559cabe
 EBUILD rotoscope-0.2.ebuild 450 BLAKE2B 03d5ebc819efdbd2651004980f4e2a7fed8f1cfe59d34f4b893f9956f2a1a6b1a97f89a6555fab61e3bc27a34b04324034a59bd9a10824641c73982384dd9bc6 SHA512 1dd0c2c8151651c331de3e4bf6af82c3cd965815be6a6b69c8cb5cd51f2a64589ebb252d2b902f144819f06c92c8b3650d3c2ff7a9f710660b48738769460a2f
-MISC metadata.xml 338 BLAKE2B fbe76d686fc1eac90fa4d29189722970a703277ebb0e0fd26ed13c20d6793e73e3a4871fe3f0c68730e315aa6d733710ffbda74faf5bee67f7856351bacb5940 SHA512 b4f2d1c6ec05bcd5db895bdb3a7427f0aefc5f1cbb2b83b138309fd8bd5a1082209063e4e78bdd3ae811d2bfba6b587f4e13cf1c2d0698ce0508fa94d39d3e5c
+MISC metadata.xml 246 BLAKE2B 4bfd1c73896e7fcf1068dad6daad2f9585bcca1efaaa2e85ba28da7fabfe1aac8e0f66ae4e565ea584bac5584017149587d4a11b19cc03075fc3c3856d6440ef SHA512 25f3045488b3b5163d6a307e45b9947d6b55fe9a04297dc419addeb323fbca0e3b9db2410ef872bc3bedc94015457851e2c3e5d52924f581488e79f5004867ef
diff --git a/media-gfx/rotoscope/metadata.xml b/media-gfx/rotoscope/metadata.xml
index ce31a41e361e..6320e2dd14e7 100644
--- a/media-gfx/rotoscope/metadata.xml
+++ b/media-gfx/rotoscope/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">rotoscope</remote-id>
 	</upstream>
diff --git a/media-gfx/scantailor-advanced/Manifest b/media-gfx/scantailor-advanced/Manifest
index a2c6d0b1d664..0ca27bfd5be3 100644
--- a/media-gfx/scantailor-advanced/Manifest
+++ b/media-gfx/scantailor-advanced/Manifest
@@ -1,7 +1,7 @@
-AUX scantailor-advanced-1.0.14-qt-5.11.patch 4884 BLAKE2B 58c0c2f66c157b4520a1a6ac43a4adc07b3b23bd63c946f546550589ac5d22d18e36f0b55e2ed2fdd92c64e1444fe339c5241e6feb596b90e6c09064b2dacf6b SHA512 03124ada946bdef52ac09aa19c2dec0c4855214bc457c6a126a43c383db125bfd9c1fe1b1f66f42df333e7bed941633bded3e5cbc0236b5510f687106600c4e6
+AUX scantailor-advanced-1.0.16-bogus-dep.patch 1549 BLAKE2B e5e0167e161d1dd737eaca895cf8ab4d1b6536794576d6907d4088829355c0920e9c205d3b690582c7b342894f46814379e435fb100bb0b556db68ece1c0eb3c SHA512 ebfd038d87ebba5752ffa5e72e3bdb4a81aa51e5f5a2e530ef95c99c85b3ae85910cc6625262e15e967511791384cc3941c1c7769586dd01a347c2e94b1611ed
+AUX scantailor-advanced-1.0.16-desktopfile.patch 696 BLAKE2B 0b60cef6aca0d1b5a41cb5b36db1c4e536c2d0393f408fe1345f000b8a2d2f49fd16a17e9f19dd225296c0e1606a2d3aa3f565d6b25bd050db84ee24b325629a SHA512 823456562e02bd303078e2e7c978fe9ff17ee5fadae1b873dd1ec22f6b5f95d9b9cf95dad9e87357d477785f7b0e009fd9b6e51a50021cf7157b2be82a8a8da5
+AUX scantailor-advanced-1.0.16-qt-5.15.patch 3289 BLAKE2B f6acb82963f27a5fd7e94a182809d925ea2a57691a158fdce42321bf363640e0279c6ed775bb55c25321fb85233ab0c4c63246dcb0a0209f74721f4184686b82 SHA512 4436704d801fc8a7016441a9b669d6adb45c6a74c0499e9831881e41389efb97e571e00c0188aa870c202c6b5f49e14caeae8fd2ff36e6162e87677f974faa94
 AUX scantailor-advanced-1.0.16-tests.patch 415 BLAKE2B 2d2b8d5d5db7835f36874f04ab1c72326d6314fb8c851a0995719e9ce942e3f7beee19ba632fd01cf82c38b113684a0f5c695739fb35a5efde58e7fb68de2805 SHA512 a6c0ed32d51e21e326aab38f7027c74b2ac19791294eb69b4389b550024f3274fa7c68e43963a4d9cf906e127971011bedbc7ff432d82690fe02b8556cd40dab
-DIST scantailor-advanced-1.0.14.tar.gz 926267 BLAKE2B 2d901afebf3d9b405365ba71868f7aa29c23c537af72679a89a29351557a1a12692223b961dfd0ced3ea540c45f90dde8ea13bcd1667aa355e90a1c24a21e932 SHA512 113723b8a62da1b7141e03b5ad8ac7c426a2943f882cd229c9c51d10de75ee85d019ac21fc2d9eb4cc0d5bfb9ce66a4c41cf523698adc5a9a5d99da02369baf7
 DIST scantailor-advanced-1.0.16.tar.gz 2792788 BLAKE2B d695f9e62bc83569a320f81d2aee5f77064b791f8d59208ca55b0f4a5f25350552a673adce23ab03b92d893bd57815eb6990c91a33c12cd3652c54998d15e29c SHA512 76f103afa44f5fa03f218d237dfe4565abe1d84937ec2ea5e64662c62d073e93d7b25f1e4f66dcfe13ad36bb08abd081b5d52c092f2f54f12f0bc6cdb4340e85
-EBUILD scantailor-advanced-1.0.14.ebuild 999 BLAKE2B 6c07ef5f2b066e4dedc224e22b65d5ef9c2a1ca876c66e5dab728186e3c8b250c150df21eeaf2aba3efbca4f291fa7b5b9c1bf3b13b8afaeb0de431bf432c796 SHA512 e3a994978db112e8bcaf5ef8b6bd11e6ea64a04d487ebeda4dcf4e71723b92eb77324d4d80bd65e22a3ad0756996fbe8832227439104d0387ca3a26b8611d908
-EBUILD scantailor-advanced-1.0.16.ebuild 986 BLAKE2B 5e024056d38db6eae3b68d7833d75ecfecf99d99ab6354045c4c59eaeacf24db8a33961fdfd5b78b0dc94c7af88ac18d2ab66e6e3c4e19d99fea89056c7f289e SHA512 adc6a395aff42c2952fd143dc22726346f5566387927056a980cb64e6e72a996b650c1df8c2ff1643a18c13b8e5bbf702dc40fee7c44a9322f15849c1ddf8da5
-MISC metadata.xml 349 BLAKE2B 78647c133687609629962b66aad8c9d2507cdba556647750d4f17131be10ebaf2ebc72491ba4d820e9112e9be19be521ced81f6e9f08684ee0b200f0c9843ae9 SHA512 e3482b130afb2fe9fbce9d33eb62fddf11baf938c14c1def86294e8b8fe57a1121c1b917265714868ef55b8035cd02f9e73c7885bd564fec282ad478452186de
+EBUILD scantailor-advanced-1.0.16-r1.ebuild 1031 BLAKE2B 0820849c0011d456a13827f967adf884ed591fafc4a52da9e036ea0cf47e9e3b7f5f3819322a4cc86cc25f48cc029ef9cdc7b8952dced680df87c9a890b184f7 SHA512 4b2a8e305fdc5efd2265804f97922d38a9d6b2142232e5b62b4d1638fe3752a23dd2969299b99a3bdb2752e927cad65f6345c5accac824a9a604d6b1ad2874b3
+MISC metadata.xml 257 BLAKE2B 31c76bde4926bbc4baf620e5a336f6d88def4b546f379a4a1c072e005e161ae79cc1c7af9cdce9b1c3da92946b5590892979d5d4d0e8e3f0cf4893998e2f7798 SHA512 71526f5945b9d773f7fd748374cba9898b0e3a8819162c1a8c33897a0bcda484e2a5bf244c884c0881d45dd667655688cea02786b6f7f3fc4251017b163812cc
diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
deleted file mode 100644
index 6443809c102a..000000000000
--- a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 64a151a3795013f58880d2a5f4ce4688ecb88838 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 10 Apr 2018 11:58:00 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- DefaultParamsDialog.h                  | 9 ++++++---
- ErrorWidget.cpp                        | 3 +++
- filters/deskew/ApplyDialog.h           | 3 +++
- filters/fix_orientation/ApplyDialog.h  | 3 +++
- filters/output/ApplyColorsDialog.h     | 3 +++
- filters/output/ChangeDewarpingDialog.h | 3 +++
- filters/output/ChangeDpiDialog.h       | 3 +++
- filters/page_layout/ApplyDialog.h      | 3 +++
- filters/page_split/SplitModeDialog.h   | 3 +++
- filters/select_content/ApplyDialog.h   | 3 +++
- 10 files changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/DefaultParamsDialog.h b/DefaultParamsDialog.h
-index d9ec86e..043446c 100644
---- a/DefaultParamsDialog.h
-+++ b/DefaultParamsDialog.h
-@@ -2,14 +2,17 @@
- #ifndef SCANTAILOR_DEFAULTPARAMSDIALOG_H
- #define SCANTAILOR_DEFAULTPARAMSDIALOG_H
- 
--#include <QtWidgets/QWidget>
--#include <unordered_map>
--#include <set>
- #include "ui_DefaultParamsDialog.h"
- #include "OrthogonalRotation.h"
- #include "DefaultParamsProfileManager.h"
- #include "DefaultParams.h"
- 
-+#include <QButtonGroup>
-+#include <QWidget>
-+
-+#include <unordered_map>
-+#include <set>
-+
- class DefaultParamsDialog : public QDialog, private Ui::DefaultParamsDialog {
-     Q_OBJECT
- private:
-diff --git a/ErrorWidget.cpp b/ErrorWidget.cpp
-index fb76cc4..6fb4c68 100644
---- a/ErrorWidget.cpp
-+++ b/ErrorWidget.cpp
-@@ -18,6 +18,9 @@
- 
- #include "ErrorWidget.h"
- 
-+#include <QIcon>
-+#include <QStyle>
-+
- ErrorWidget::ErrorWidget(const QString& text, Qt::TextFormat fmt) {
-     setupUi(this);
-     textLabel->setTextFormat(fmt);
-diff --git a/filters/deskew/ApplyDialog.h b/filters/deskew/ApplyDialog.h
-index bf1a055..69f18e1 100644
---- a/filters/deskew/ApplyDialog.h
-+++ b/filters/deskew/ApplyDialog.h
-@@ -22,7 +22,10 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <set>
- 
- class QButtonGroup;
-diff --git a/filters/fix_orientation/ApplyDialog.h b/filters/fix_orientation/ApplyDialog.h
-index dcd25d5..e46d30d 100644
---- a/filters/fix_orientation/ApplyDialog.h
-+++ b/filters/fix_orientation/ApplyDialog.h
-@@ -24,7 +24,10 @@
- #include "PageRange.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <vector>
- #include <set>
- 
-diff --git a/filters/output/ApplyColorsDialog.h b/filters/output/ApplyColorsDialog.h
-index 4c525c7..81f4177 100644
---- a/filters/output/ApplyColorsDialog.h
-+++ b/filters/output/ApplyColorsDialog.h
-@@ -23,7 +23,10 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <set>
- 
- class PageSelectionAccessor;
-diff --git a/filters/output/ChangeDewarpingDialog.h b/filters/output/ChangeDewarpingDialog.h
-index de4f2c3..31ee19d 100644
---- a/filters/output/ChangeDewarpingDialog.h
-+++ b/filters/output/ChangeDewarpingDialog.h
-@@ -24,8 +24,11 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
- #include <QString>
-+
- #include <set>
- 
- class PageSelectionAccessor;
-diff --git a/filters/output/ChangeDpiDialog.h b/filters/output/ChangeDpiDialog.h
-index 7ce6f58..1b86ac7 100644
---- a/filters/output/ChangeDpiDialog.h
-+++ b/filters/output/ChangeDpiDialog.h
-@@ -23,8 +23,11 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
- #include <QString>
-+
- #include <set>
- 
- class PageSelectionAccessor;
-diff --git a/filters/page_layout/ApplyDialog.h b/filters/page_layout/ApplyDialog.h
-index ba25154..07f83c3 100644
---- a/filters/page_layout/ApplyDialog.h
-+++ b/filters/page_layout/ApplyDialog.h
-@@ -24,7 +24,10 @@
- #include "PageRange.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <set>
- 
- class PageSelectionAccessor;
-diff --git a/filters/page_split/SplitModeDialog.h b/filters/page_split/SplitModeDialog.h
-index 2cf9e91..351f1e2 100644
---- a/filters/page_split/SplitModeDialog.h
-+++ b/filters/page_split/SplitModeDialog.h
-@@ -25,7 +25,10 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <set>
- 
- class ProjectPages;
-diff --git a/filters/select_content/ApplyDialog.h b/filters/select_content/ApplyDialog.h
-index f0f7041..a7ff19e 100644
---- a/filters/select_content/ApplyDialog.h
-+++ b/filters/select_content/ApplyDialog.h
-@@ -24,7 +24,10 @@
- #include "PageRange.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <vector>
- #include <set>
- 
--- 
-2.17.0
-
diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-bogus-dep.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-bogus-dep.patch
new file mode 100644
index 000000000000..553c108c19cf
--- /dev/null
+++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-bogus-dep.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt	2020-05-31 01:09:58.634978658 +0200
++++ b/CMakeLists.txt	2020-05-31 01:12:51.011307579 +0200
+@@ -298,7 +298,6 @@
+ find_package(Qt5Gui ${qt_min_version} REQUIRED)
+ find_package(Qt5Widgets ${qt_min_version} REQUIRED)
+ find_package(Qt5Xml ${qt_min_version} REQUIRED)
+-find_package(Qt5Network ${qt_min_version} REQUIRED)
+ find_package(Qt5LinguistTools ${qt_min_version} REQUIRED)
+ find_package(Qt5OpenGL ${qt_min_version} REQUIRED)
+ 
+@@ -311,8 +310,6 @@
+ link_directories(${Qt5Widgets_LIBRARIES})
+ include_directories(${Qt5Xml_INCLUDE_DIRS})
+ link_directories(${Qt5Xml_LIBRARIES})
+-include_directories(${Qt5Network_INCLUDE_DIRS})
+-link_directories(${Qt5Network_LIBRARIES})
+ include_directories(${Qt5OpenGL_INCLUDE_DIRS})
+ link_directories(${Qt5OpenGL_LIBRARIES})
+ include_directories(${Qt5LinguistTools_INCLUDE_DIRS})
+@@ -578,7 +575,7 @@
+     scantailor
+     fix_orientation page_split deskew select_content page_layout output stcore
+     dewarping zones interaction imageproc math foundation
+-    ${Qt5Core_LIBRARIES} ${Qt5GUI_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Network_LIBRARIES}
++    ${Qt5Core_LIBRARIES} ${Qt5GUI_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Xml_LIBRARIES}
+     ${Qt5OpenGL_LIBRARIES} ${Qt5LinguistTools_LIBRARIES} ${EXTRA_LIBS}
+ )
+ 
+@@ -639,7 +636,7 @@
+       qt5_libs
+       ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES}
+       ${Qt5Core_LIBRARIES} ${Qt5Xml_LIBRARIES}
+-      ${Qt5Network_LIBRARIES} ${Qt5OpenGL_LIBRARIES}
++      ${Qt5OpenGL_LIBRARIES}
+   )
+ 
+   foreach (target ${qt5_libs})
diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-desktopfile.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-desktopfile.patch
new file mode 100644
index 000000000000..cececbb84f43
--- /dev/null
+++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-desktopfile.patch
@@ -0,0 +1,23 @@
+From e4125b66138c4258f13e69dc4bd8e6df41323599 Mon Sep 17 00:00:00 2001
+From: 4lex4 <4lex49@zoho.com>
+Date: Tue, 27 Aug 2019 17:30:50 +0300
+Subject: [PATCH] ~ Remove a deprecated value from the .desktop file
+
+---
+ resources/unix/scantailor.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/resources/unix/scantailor.desktop b/resources/unix/scantailor.desktop
+index 9e49d5e..4df7d97 100644
+--- a/resources/unix/scantailor.desktop
++++ b/resources/unix/scantailor.desktop
+@@ -7,5 +7,5 @@ Icon=ScanTailor
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Categories=Graphics;Applications;
++Categories=Graphics;
+ MimeType=application/x-scantailor-project;
+-- 
+2.26.2
+
diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-qt-5.15.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-qt-5.15.patch
new file mode 100644
index 000000000000..4ed357025622
--- /dev/null
+++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.16-qt-5.15.patch
@@ -0,0 +1,87 @@
+diff -ur a/filters/output/OutputGenerator.cpp b/filters/output/OutputGenerator.cpp
+--- a/filters/output/OutputGenerator.cpp	2018-07-17 04:04:23.000000000 +0200
++++ b/filters/output/OutputGenerator.cpp	2020-05-29 12:15:28.759822806 +0200
+@@ -25,6 +25,7 @@
+ #include <imageproc/ImageCombination.h>
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QtCore/QSettings>
+ #include <boost/bind.hpp>
+ #include "DebugImages.h"
+@@ -2666,4 +2667,4 @@
+                  posterizationOptions.isForceBlackAndWhite(), 0, qRound(background_color.lightnessF() * 255))
+       .getImage();
+ }
+-}  // namespace output
+\ Chybí znak konce řádku na konci souboru
++}  // namespace output
+diff -ur a/filters/page_layout/ImageView.cpp b/filters/page_layout/ImageView.cpp
+--- a/filters/page_layout/ImageView.cpp	2018-07-17 04:04:23.000000000 +0200
++++ b/filters/page_layout/ImageView.cpp	2020-05-29 12:14:09.691546103 +0200
+@@ -27,6 +27,7 @@
+ #include <imageproc/Transform.h>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <boost/bind.hpp>
+ #include <boost/lambda/lambda.hpp>
+ #include "ImagePresentation.h"
+@@ -1160,4 +1161,4 @@
+ bool ImageView::isShowingMiddleRectEnabled() const {
+   return (!m_nullContentRect && m_settings->isShowingMiddleRectEnabled()) || m_alignment.isNull();
+ }
+-}  // namespace page_layout
+\ Chybí znak konce řádku na konci souboru
++}  // namespace page_layout
+diff -ur a/filters/select_content/ContentBoxFinder.cpp b/filters/select_content/ContentBoxFinder.cpp
+--- a/filters/select_content/ContentBoxFinder.cpp	2018-07-17 04:04:23.000000000 +0200
++++ b/filters/select_content/ContentBoxFinder.cpp	2020-05-29 12:12:39.023619751 +0200
+@@ -19,6 +19,7 @@
+ #include "ContentBoxFinder.h"
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <cmath>
+ #include <queue>
+ #include "DebugImages.h"
+@@ -1353,4 +1354,4 @@
+ 
+   return m_sedm;
+ }
+-}  // namespace select_content
+\ Chybí znak konce řádku na konci souboru
++}  // namespace select_content
+diff -ur a/ImageViewBase.cpp b/ImageViewBase.cpp
+--- a/ImageViewBase.cpp	2018-07-17 04:04:23.000000000 +0200
++++ b/ImageViewBase.cpp	2020-05-29 11:58:54.720220475 +0200
+@@ -24,6 +24,7 @@
+ #include <QPointer>
+ #include <QScrollBar>
+ #include <QSettings>
++#include <QPainterPath>
+ #include <QtWidgets/QMainWindow>
+ #include <QtWidgets/QStatusBar>
+ #include "BackgroundExecutor.h"
+diff -ur a/zones/ZoneContextMenuInteraction.cpp b/zones/ZoneContextMenuInteraction.cpp
+--- a/zones/ZoneContextMenuInteraction.cpp	2018-07-17 04:04:23.000000000 +0200
++++ b/zones/ZoneContextMenuInteraction.cpp	2020-05-29 12:10:53.079190198 +0200
+@@ -21,6 +21,7 @@
+ #include <QMenu>
+ #include <QMessageBox>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSignalMapper>
+ #include <boost/bind.hpp>
+ #include "ImageViewBase.h"
+diff -ur a/zones/ZoneDefaultInteraction.cpp b/zones/ZoneDefaultInteraction.cpp
+--- a/zones/ZoneDefaultInteraction.cpp	2018-07-17 04:04:23.000000000 +0200
++++ b/zones/ZoneDefaultInteraction.cpp	2020-05-29 12:09:24.276172092 +0200
+@@ -19,6 +19,7 @@
+ #include "ZoneDefaultInteraction.h"
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include "ImageViewBase.h"
+ #include "SerializableSpline.h"
+ #include "ZoneInteractionContext.h"
diff --git a/media-gfx/scantailor-advanced/metadata.xml b/media-gfx/scantailor-advanced/metadata.xml
index ac1f5ba3f485..7e9fa11b9ccc 100644
--- a/media-gfx/scantailor-advanced/metadata.xml
+++ b/media-gfx/scantailor-advanced/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">4lex4/scantailor-advanced</remote-id>
 	</upstream>
diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
deleted file mode 100644
index 902fbb1a3918..000000000000
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop virtualx
-
-DESCRIPTION="Interactive post-processing tool for scanned pages"
-HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
-SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libXrender
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-qt/linguist-tools:5
-	!media-gfx/scantailor
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon resources/appicon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Scan Tailor Advanced"
-}
diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild
index be247dca96bb..f5fe9384bafb 100644
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop virtualx
+inherit cmake virtualx xdg
 
 DESCRIPTION="Interactive post-processing tool for scanned pages"
-HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
+HOMEPAGE="https://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
 SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 public-domain"
@@ -14,10 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
@@ -25,24 +27,26 @@ RDEPEND="
 	media-libs/tiff:0
 	sys-libs/zlib
 	virtual/jpeg:0
-	x11-libs/libXrender
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
-	dev-qt/linguist-tools:5
-	!media-gfx/scantailor
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-qt/qtsvg:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch # bug 662004
+	"${FILESDIR}"/${P}-qt-5.15.patch # bug 726066
+	"${FILESDIR}"/${P}-desktopfile.patch
+	"${FILESDIR}"/${P}-bogus-dep.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
 
 src_test() {
 	cd "${CMAKE_BUILD_DIR}" || die
 	virtx cmake_src_test
 }
-
-src_install() {
-	cmake_src_install
-
-	newicon resources/appicon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Scan Tailor Advanced"
-}
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 59a2369c77f1..fe1a74a69ad5 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501
-EBUILD scour-0.37.ebuild 688 BLAKE2B 310d9780ccd7f0e397ed89819798aaa58d1a75144a70a06ee1782c567eb535769e0ff55f451908d41f6a877a98b1ef812616f6790d9ca487e5c74efe51209ece SHA512 82840425dc89ff6dbd9c16cb46ea2df2f21b4096a6f56685b7fd7ef7602e08c695c9316d3e76fca5047550e96d4e21f1d5e43d0d08825d7fbcbc07b7636d7693
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+EBUILD scour-0.37.ebuild 708 BLAKE2B 0525bd0e25e3c8b958a843ffaf36fb1c2fae11ea73081cce8dff132ab65a1462f28e074b3abcb21a74fe03ce7e4d5d72b3ff3298fb1f048664f82da89fd9ecfb SHA512 0fa8a4115e44a6c3c36ff4ba53426a5f09840e619d5040d6e4cef9de7d5472ceb0fea0bc3bf63c7159d1d7f7f2f09a2155952ae071373c748bacf0db7eed9e65
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/scour/metadata.xml b/media-gfx/scour/metadata.xml
index 6ade85e1c642..1b2becffa26c 100644
--- a/media-gfx/scour/metadata.xml
+++ b/media-gfx/scour/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/scour/scour-0.37.ebuild b/media-gfx/scour/scour-0.37.ebuild
index 8be46ee7714c..385e5c4dbf25 100644
--- a/media-gfx/scour/scour-0.37.ebuild
+++ b/media-gfx/scour/scour-0.37.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 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index a30fc11cc010..fe63cc331577 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -8,4 +8,4 @@ EBUILD scrot-0.8_p13-r1.ebuild 975 BLAKE2B 4f0920e23cada110c426fcd1ef874379f8ae3
 EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1a88acd2fffacd2978145208965afd206012c837ab22126ba7e78990b8760c5a58cccef373d2715991918 SHA512 341f2fbb5f4824b38d4c42e18929173cad358faf4b9b475d0c735ddc1a681962019c3a8a35892c5120afc42895ac1ac654c1faeb7a7fee5010725a61251bc7cd
 EBUILD scrot-1.3-r1.ebuild 971 BLAKE2B f4daabaf37c8e2d6ea724d1b96f12928b4f5ece6301a0fa44dcffbbfdf00d4b213f56b5b066116b64eb45bb78100c9b9fd2fb451e2e8d9da664b9624c7f67c63 SHA512 552252c5ca01774197b34dd862a458399004f5be2f78b5d889176c0ebf072b05b08cfa842953205dc64da4ed3d4d011f81fb964a071992ea5b772c0ae69fcacd
 EBUILD scrot-9999.ebuild 893 BLAKE2B b294cc0496f809a4066f2ddc84687a71b0dc5967dc09460e1dc1477f1d0a519051da24f6504afbdd2d57d66377e8d07178356c261fff7d7a9233b1d6795a1ef7 SHA512 10ee5b7d2afce6b7cf006575b25c71727854899032591725a22c9594e33821ceb2294398153eec59e5e7ff826b0f570e70ff676c5b0f292ea87ae3d6654eb00d
-MISC metadata.xml 327 BLAKE2B 44a3d3f80ed251d0864c6aabb7192146c942a2bab99a4e643189eb74445c52a92fc153e4f198b591e628697df09774a2576cf5678a58774295c881eda04e33ad SHA512 bed8805eb922c213b73629ec8c430a7825ec1451edcd332fffeaef9b855b71b9e57e490775fe462ef2234ad9b534a23f19a373f0f2131d84ff2f965b8a2ed25a
+MISC metadata.xml 211 BLAKE2B 3e8296d37e4cf92be5d17d7f263807fad2fc9685607894f9f269f3123987c3baeff7fce17f80480419fb68f2eac48919541cd7aaa21de659d95dd647e05ade48 SHA512 58d7fc7dd62d18c69c3b30062d76c291bc795b7a53804d1380fc49ed6f6a4389805c327633297b9c56c40cbae9a6e5608e12d8a64c01e370954e551246c4b486
diff --git a/media-gfx/scrot/metadata.xml b/media-gfx/scrot/metadata.xml
index ed83e476a262..132a3b9b4743 100644
--- a/media-gfx/scrot/metadata.xml
+++ b/media-gfx/scrot/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
 <maintainer type="person">
 	<email>jer@gentoo.org</email>
 </maintainer>
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 92f4f62ad27d..3f426357cafb 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -2,4 +2,4 @@ AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 1351 BLAKE2B 00dc9e14b8742a7aaa16b
 AUX sfftobmp-3.1.2-boost_fs3.patch 538 BLAKE2B bb2ea6156f3572f2da8ffd2f2bfd55fa89afe99af3f358d56b978e98160bd7b90c72cae8490687fc0b9c0509f896f5c6a7bfe41677f42652d77d52860b56e46c SHA512 75158af4ff574fe5112e4057ce0c2bca2f49afaf63862c42add85b8ee8e843f0a08b8c3d9f658f999024643d95ffcd65085bcb0607213722eb021b102037872e
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
 EBUILD sfftobmp-3.1.2-r1.ebuild 779 BLAKE2B 6bec6ef6b6e45a4dce5cced32592287571c219fdac698723e876fa0fddbf7c1df3e2ccc5144c3deba65d3db8050f0699f6eb0ed09fc68ed807b010c993b37ecb SHA512 89449a9ad5737348348b82005230d9d72fcde123c08908d1d0f6af51926db4cca510fc2221a958450948aaa59650998da0829b344154014ba612b81d6ac55c9a
-MISC metadata.xml 394 BLAKE2B 81ce08c237aae8e212ecf897a9a52d28a423ecd0eecac34c867f68a490356aec7056d029488af6847c5ce37e391bbd1057f683a8aab2fcd35b38b4a65dbdd5b3 SHA512 0a55c57ccd8c0ab9a1344f16c7aeec7bccfbbbcffd3634ab908deb62e996ff16ddf0a8cc6a2591b768330cd67d242379f2a5b8fab71534fbc31d4360e68db4ac
+MISC metadata.xml 302 BLAKE2B 9d6aba0d209ba1d319177b887ff81b5130539ad3db60b810f488277c756da398c4dd53966c4e8a428838a41bfaa6926f26410f33b42c07c9e5e9e0a0a8b70db7 SHA512 6ac3921ad7d5ca5703915d8ad5f6f1f477bde3c6b7566904ee9775ecccfb783ed2cc82238bde81d6be63304da1afad2b5afe2a5e860e4290d0d4e42f4645096c
diff --git a/media-gfx/sfftobmp/metadata.xml b/media-gfx/sfftobmp/metadata.xml
index e9834a5d4681..fd38410961d5 100644
--- a/media-gfx/sfftobmp/metadata.xml
+++ b/media-gfx/sfftobmp/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>sff to bmp converter</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">sfftools</remote-id>
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 1e9a9aa69b59..109002185826 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -2,4 +2,4 @@ DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d88
 DIST shotwell-0.30.9.tar.xz 6465508 BLAKE2B 9b302d156b350d5cfa961afaa5d75e71db8b34a65a27de0d3b298841ca9be96d502dc98c85c681ca336965fce72db8034609f3f9c6c04fea1127db6c397e6499 SHA512 a232d717356d7e9f0a6b1ad825f4182dd9f6ee4cca9745717e3bd18ded03cdaba94c32256d055389ce2b0cda0c5828b25d1448c10598a474dc3ea0817fc303ee
 EBUILD shotwell-0.30.8-r1.ebuild 1783 BLAKE2B ea068d6335d7b5d4af0fef2bb571275f0218d384fb118706a948e79177814d6062cb2990ecb43fcf62352986d9f8fae0d02c0318c3481b1277d24524573f90d6 SHA512 c90464d3bd7749d57b3a36aa6352cea07ac47a487c0e7317d1717fb53cfc183dbcb438a22f0314b73d43a31b9555f08acad4eb27d73046d030ef6f3e041d6be4
 EBUILD shotwell-0.30.9.ebuild 1782 BLAKE2B 84211b71a3a4747a7cc42f7d8b2b5e873bdea2ef8abe7fd7b4ae1e3ac9cab0fdafe1de78a7ab09ae7b40d0591c78f715fb447ce3df86c7dbae80a2d758229bbf SHA512 02cb56548ebe4d6fe3efbedf31a5c6d02cb7f5424bc595f46dde6be8390bfb99dd58eb68b1b147bdb3d64cd893d083bbf877fa75ed2c9ec582b00865fe03fa9c
-MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
+MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index 3e46be14231f..7cee5435cd2e 100644
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Nicolas Bock</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Project</name>
 	</maintainer>
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index b1d0e3367795..381d0ede373b 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,7 +1,5 @@
 AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
-DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb
-EBUILD sxiv-25.ebuild 1293 BLAKE2B 715b77644c20bae1c82681a17ad3dd2d2faa8944148c5df2bd1fe13394aa579fea2ca6d1e903d1512c010a3042e6314ab98a03c59dfdf9079a7413981b177eb6 SHA512 1a1c372246eba6f11fff1fd4821b2f9e20e2fbf45d222d05480c4761417302e05b427654b5ec632b92d4b4865e5749348985dae4c3e09725729bb45d92e2d9dc
-EBUILD sxiv-26.ebuild 1239 BLAKE2B c860e96538e8bfe6712ce11d13fcd27d91af12a463dcb6963314d4757f96fa271b0f2bbe403f96cba534c5f3700d551653ac1d765dd7273ffe16cdc9be3739a5 SHA512 f5fed5f22046c485b8f7b621f10a29aaa44496287199752ef26e59db3b5980d307440afcce925ded90403e13d2de689f5eb844660725693864fff9060a603d44
-EBUILD sxiv-9999.ebuild 1239 BLAKE2B c860e96538e8bfe6712ce11d13fcd27d91af12a463dcb6963314d4757f96fa271b0f2bbe403f96cba534c5f3700d551653ac1d765dd7273ffe16cdc9be3739a5 SHA512 f5fed5f22046c485b8f7b621f10a29aaa44496287199752ef26e59db3b5980d307440afcce925ded90403e13d2de689f5eb844660725693864fff9060a603d44
-MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
+EBUILD sxiv-26.ebuild 1242 BLAKE2B dace256bd75c7e7421929c73c8ac19aa1efff88272ec252978cdda82c6b0569caf8accd2064695776d4e4a9a5e71c7770718f8406aeefc2a7e7ae52ea049a8de SHA512 5137f18cf6724384fe870261efd191235d45c272f5d0e1cd5d587ac726b53778bfde1327456fa71207a29f260a7bbb2d8a30a8533c94173607e1d62940f00c3b
+EBUILD sxiv-9999.ebuild 1246 BLAKE2B e373fa15d8406c1322909cce4e283d16ca518b44b9891b262be92ff91f07cea6f14fb74e2d4981c6ba4d447890a8fd5f44fbff6fb1927eca92b97419849cd49d SHA512 1302dde4adaa04764b067c9003c3bb5fafeee1d85e28f4508d8f22c393343b788410f0ad23dc6570dca2f11d32ec7ae5b4187384a39be82c7d2f172df1bebbb5
+MISC metadata.xml 329 BLAKE2B 56d76981812833d6dbdb0624928ad01d11cd9ab2c29b5214be020babd7cf0a75b80b0c8a7ef3c68a71ea9b387214b07254519e19717a0eb4e5b4f06f1116ebaf SHA512 b575d697e5a580b68cd5780f68dd2024357fd89510eba100faf5e63f4aa904488a4c9317369e4909eaebd41ab67af8bcaeddc2fae04f2239abc6ddfe4d8473fd
diff --git a/media-gfx/sxiv/metadata.xml b/media-gfx/sxiv/metadata.xml
index c8196c0a0547..98e54fd27945 100644
--- a/media-gfx/sxiv/metadata.xml
+++ b/media-gfx/sxiv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">muennich/sxiv</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">muennich/sxiv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
deleted file mode 100644
index 2c633fa3bd9c..000000000000
--- a/media-gfx/sxiv/sxiv-25.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="exif gif +jpeg +png"
-
-RDEPEND="
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	media-libs/imlib2[X,gif?,jpeg?,png?]
-	x11-libs/libX11
-	x11-libs/libXft
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	restore_config config.h
-	default
-}
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX=/usr install
-	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
-	dodoc README.md
-	domenu sxiv.desktop
-
-	save_config config.h
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/sxiv/sxiv-26.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
index 890ffab338b5..9899cc4c2634 100644
--- a/media-gfx/sxiv/sxiv-26.ebuild
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 890ffab338b5..aec37a2bfba8 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest
index fd312e56b0d5..a9956829a057 100644
--- a/media-gfx/tintii/Manifest
+++ b/media-gfx/tintii/Manifest
@@ -1,3 +1,3 @@
 DIST tintii-2.10.0.tar.gz 620863 BLAKE2B 61127bfe1ce1eca87cea7fcd5cc6ef95c445ad0cdf32fd2d752a27818df8132ee0d7e6eab355c37ff3535be416a79b34652e8a28d8f93e0bd523a15396f6a4cd SHA512 884a9a3393080ee064069288afc13b2f72272571efaabf013ea2029627fc2ed922dcb791b8316c1d2117faf553d6bf333cf35f0486ba82aa2dc0987f9ce5f9a3
 EBUILD tintii-2.10.0.ebuild 526 BLAKE2B e614a533c6d023328a5c54e570528f7ca358eb6a938bb6fd8196f1ead7ab3c183010c587afc100f35495476cf6d33d0928b96b425890402938ef47a271438866 SHA512 f4e0258502d19ca630df8b54cae11704c4aeff27bac1020407d790944d9112d50741e55295b1e81981e2e5963699408cb0cd67298bc6408df986b0788c7ef8fa
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/tintii/metadata.xml b/media-gfx/tintii/metadata.xml
index 19bf1be2581e..6f49eba8f496 100644
--- a/media-gfx/tintii/metadata.xml
+++ b/media-gfx/tintii/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 0305f596b77f..ecca7e396314 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -2,5 +2,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e.ebuild 2994 BLAKE2B c12dbc9f3687485588ab94e6a0681c7d3a24b31835dbf049dfc2992a1268bea34a92db7f0dd5f3e1016f1ab873cbbb5262d813e607054b9fe5dfa249389338b1 SHA512 5e4a6f4c01a208a8bacd49b88e55ef511e01aecf7fa6abf025a1a82c5c2b827130e517e8e7697f4d57e0456cf580fb00653347a00af70fb0b9fac04713fc56dd
+EBUILD transfig-3.2.5e.ebuild 2995 BLAKE2B a50fa8614a2326e7a427c538d41dd0e589e2129544045919042a0ca8821fa4b29322c23606b143bb2f51e95ee7c6b2e89e8abb4e3c0c2536d926cf1d355d39f1 SHA512 652a8b602eca4c66b26e5bdb4bac9b3c390d0b71be482b18230db5c5561e4ca56d2b842e1867fec368a891b200a365e167a0ba9808c0e246c9be24c610c10ff1
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
index 995ddf174764..da2af8a5f308 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs eutils flag-o-matic multilib
 MY_P=${PN}.${PV}
 
 DESCRIPTION="A set of tools for creating TeX documents with graphics"
-HOMEPAGE="http://www.xfig.org/"
+HOMEPAGE="https://www.xfig.org/"
 SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
 	mirror://gentoo/fig2mpdf-1.1.2.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
diff --git a/media-gfx/ttygif/Manifest b/media-gfx/ttygif/Manifest
index 92b36e2c67b6..ec56b0a98a7f 100644
--- a/media-gfx/ttygif/Manifest
+++ b/media-gfx/ttygif/Manifest
@@ -1,3 +1,4 @@
+AUX ldflags-support.patch 550 BLAKE2B 1cf7bc0cb2a9ce13654524204e7b3d47e9df1a0d4ceb5e60e63c52c2d8508d6d8dfb353be35147d8419fa57d4fdde2bc00b9b12292de789d0d559caa25c60b5b SHA512 ec238c42a9b7574ee7b18b8fd2d2aedb23bb4b86981fdccb09aab8e5671c4f9494d448f9d9ecb5f4279cc1c2ca850a64d80364de002430278986155332116dbb
 DIST ttygif-1.80_p20181218.tar.gz 8428 BLAKE2B 376b6dca4d13120b90e3055e8a37acd017aa7966267d6ad76af6eb2cc4155c8b8ce9d618c682cf1c999095c96ae78e11ec343e0752362851f9a2b660820dc403 SHA512 f992094c0baa625106eefdebbde1d91f2686c0b01c4b3ec22ec9339c88df42c830e4417338c685b375646b212db0213983b41b8d6ee9bd9644dfb56f6db31f52
-EBUILD ttygif-1.80_p20181218.ebuild 589 BLAKE2B 609ad213d3a3efff6875f2d9911d3f535ef047659751385a4d6567649f3feabc49a60b9cabe9cac13e664bb1b7976bb1c79006ca829e917bdcacb807b7e24938 SHA512 248560bd9b524f1fd36a4b11a69675b18cfaecce6e73fa1a94176746fc6a9ba0e6c1a3ca16964b523b5a8fb0b27f4c2e94e373f1594dc08626d12874d57a6ea2
+EBUILD ttygif-1.80_p20181218.ebuild 776 BLAKE2B 57a41aa243d7f75e628cebeac04c0c27609f033be1c667c8e0f9b9ad28d373bf3d53a541b72e401d4a07455634be692a097d7bc506a512fe36c0828d66d58997 SHA512 9ac733ac43d720f1fd7f81e820dcb398409e69f30e3392bb21f0edfb964cf53446162bd7a72c86a4ec76ea08d27a57cbdccab35a3f405d15df87761743298308
 MISC metadata.xml 339 BLAKE2B b66a558314f330d1c45e41a7630fe5e454270bf14a9cc038cc3f94c8ecd8dd9a51946c9f7faf39a96756c72df41c4847a7894c0373d39cfc3b1a06523a3f7219 SHA512 db977e98c60cbb3aa265263d0f400999bcbb9977f63c5ef6ed8a303e4c63ba652bbcfde2cc41697b0bd6b4063de90fb74eacd327a7053f0823f1ee485ea8b451
diff --git a/media-gfx/ttygif/files/ldflags-support.patch b/media-gfx/ttygif/files/ldflags-support.patch
new file mode 100644
index 000000000000..201f72fb04a6
--- /dev/null
+++ b/media-gfx/ttygif/files/ldflags-support.patch
@@ -0,0 +1,19 @@
+--- a/Makefile	2020-06-09 12:07:21.881455454 -0000
++++ b/Makefile	2020-06-09 12:08:43.984010587 -0000
+@@ -2,6 +2,7 @@
+ VERSION = '"1.4.0"'
+ CFLAGS += -O2 -Wall -DVERSION=$(VERSION)
+ PREFIX ?= /usr/local
++LDFLAGS ?= -L/usr/lib
+ 
+ UNAME := $(shell uname)
+ ifeq ($(UNAME), Darwin)
+@@ -14,7 +15,7 @@
+ all: ttygif
+ 
+ ttygif: ttygif.o io.o string_builder.o utils.o
+-	$(CC) $(CFLAGS) -o ttygif ttygif.o io.o string_builder.o utils.o
++	$(CC) $(CFLAGS) -o ttygif ttygif.o io.o string_builder.o utils.o $(LDFLAGS)
+ 
+ install: ttygif
+ 	install -d $(PREFIX)/bin
diff --git a/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild b/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
index 32b4aa70ac51..a88b74156eb8 100644
--- a/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
+++ b/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit vcs-snapshot
+inherit vcs-snapshot toolchain-funcs
 
 # Commit Date: Dec 18th 2018
 COMMIT="362bc381c1c2449509e732d68f07656caf46b420"
@@ -18,11 +18,19 @@ SLOT="0"
 
 DOCS=( LICENSE README.md )
 
+PATCHES=( "${FILESDIR}/ldflags-support.patch" )
+
 RDEPEND="
 	x11-apps/xwd
 	app-misc/ttyrec
 	media-gfx/imagemagick"
 
+src_compile() {
+	emake CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS} -DVERSION='\"${PV}\"' -DOS_LINUX" \
+		LDFLAGS="${LDFLAGS}"
+}
+
 src_install() {
 	dobin "${PN}"
 	einstalldocs
diff --git a/media-gfx/tuxpaint-stamps/Manifest b/media-gfx/tuxpaint-stamps/Manifest
index c3d66341d916..efbd290e290c 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,4 +1,4 @@
 AUX tuxpaint-stamps-20090628-make-382.patch 365 BLAKE2B d427c1867b47fde62f1dfb568240727fbef151fc6af6d45e33b5f83a8c30d0dd4e67ea91ee34af248dc6bbbf1a17d7da876dd848033757cad87d4e84116c351f SHA512 17915d5b7aaf9857a6e15a51a2039b00edd6a9adda27f529a10a5422b37df5e9ec500dd497c6e6df45fdae6617717f90d166fb04d5401d9bfa767e09fea31e49
 DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B a9c11b846d60bb4de5bfaa721a24254fb6510bfddeca54f398ebf941f2fd74f546eaf3cdf7cd65932835e2e72993d6627f6247c7dc4a4488d2d2b2174c04455a SHA512 ca059275484bec045c4f2bad414ea5359d2a8812cc1c8d1e11ad8f3b7e63e107c1fccc347291ffe95d81a5192b39198c56d319ef6a0f475fb128d9a2d0e5e027
 EBUILD tuxpaint-stamps-20090628-r1.ebuild 626 BLAKE2B 4531c55c9a3febee023974ac4386001a779bfd487d367dad37fd58690780345ce46c3a679b270f6554e85817c47e61269bf34140c71dbe89e0f2da0c89e2fd68 SHA512 0cb6a1e8b249ee3970c888c7aae9030746003d177b7f14b8541e4b213e5fc7d5b50abb0a3d278b8c6b180f643b8ee3057338cdd5acfee0d85f752402ba2f614f
-MISC metadata.xml 451 BLAKE2B 65a95d2b7b8d856945f27d0ba716502c266b114aa517908d87feeb6d613dae24dd2dd20f1a268d6592492038408198956f8cdc24488c3eb1e3dbe3484dedfa29 SHA512 5236357c1909fd5a6ce60a110ee8d81297e4f98d69f93c06e4fdda27d34df91693cd5b9f71746f84337a4005c56d95479e7de9684f4fc564a421d3f83af86461
+MISC metadata.xml 354 BLAKE2B 9e9c851dd7a87ea893f20c4fdeeae447eb7efd6f3688419c417a1d38782e5c53743dc4de664ca0bd462b83450553fa0aa161ef5d9cef344f3361d029cdce35ff SHA512 e47edc76f8fcdf36abba39af57e5af6c2c1c66bb8f430f86248b3491680b405e866faf946477974b908903fce9d2d8adbc737dc737bd493a671c4db7ee372e15
diff --git a/media-gfx/tuxpaint-stamps/metadata.xml b/media-gfx/tuxpaint-stamps/metadata.xml
index 5527db74016c..4b198127c379 100644
--- a/media-gfx/tuxpaint-stamps/metadata.xml
+++ b/media-gfx/tuxpaint-stamps/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
   These are additional stamps for the Tux Paint drawing program.
 </longdescription>
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index b1dd9a0a7a47..064ebfe83903 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -4,4 +4,4 @@ AUX tuxpaint-0.9.21-libpng1.5.patch 838 BLAKE2B bbc335be723205a673896279fdbe21c1
 AUX tuxpaint-0.9.21-underlinking.patch 592 BLAKE2B 1af0a14e4512b748fb2294e9ebe7ce0f72fa7b9df269ff1ac6c7756327f7fa3728ffd2808e888ab035d6f56ddeae20b269a75ef76e1560b4ce391c60372ea02d SHA512 66f0cea73c2e89353bd0085ae9de280ccf197dd3e253e00b05f4c0aeac2e2489ec94e21ad26a41ca09cce717533bd0010c655498cf9267bba6019bf78e2a836f
 DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
 EBUILD tuxpaint-0.9.21-r2.ebuild 1687 BLAKE2B 8129f5e37296aa3bce37269fa3d99f3d3b97b274d2ee0fa0ddca06322009a514a58a29ebe0a77b58a5f1bafe0f381d061da1681f5c78e1b2fb72a70197cadfd3 SHA512 0cf622a7f6eb1867905de448d7f4448b3c071e513b38195e5921ad6c01a777e41d4fc9b563fe9ff855418af1037abf7c5535c9d8f5f0f702f4f435d9f1bb6980
-MISC metadata.xml 715 BLAKE2B c0f5080575ab237355510f12f2592d4389b20ccf44ce60733570f510dc24ee26e6036f5eefa73c303772bdb778b87d76d0cdcdb8de3e7725bc1d4a6aef510b3f SHA512 1230a0b47a1e315e22dfb367454200018aad9936cee1e9c54a3dbe24ae4cc5c01fe5e76beeed02329a056396f0a28bbd54982064708c044f7bdc0884b1f62f04
+MISC metadata.xml 618 BLAKE2B 41214f92d2223b2791c7f79b8add3c494549a9f7e4048d17ec74aa13a56c460d3c83df08bd2f93358e8aa4eb6b497a6f3b9e49cd422a6a17a211341bd44e4bdd SHA512 e1be803667ac0a7a2a364f05f08e0514826292f11b3ff261a215864cfa50d61538f4535a83b0903e85c942098155231725db6e664aee4cfca812a36d670c0f72
diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index 74f07e4640c0..cf4d63d4273d 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/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="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
   Tux Paint is a free drawing program designed for young children
   (kids ages 3 and up). It has a simple, easy-to-use interface, fun
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 0f6ddf6c2dfb..9c45ff273c85 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -10,4 +10,4 @@ AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 EBUILD ufraw-0.22-r3.ebuild 2072 BLAKE2B c49e11e2877256db8ad2bfa46a51e2ffd8449c5dfa8f9ca99cbc2a150f5f29169439f314539f727eceaadd1c23e5751b56fd0c9e5034a4020c9f3cd11075028d SHA512 eafd4eaa8d5570ae8fe06e014133b7a3fefe9030fde5d68dbbaab56fcc9c8b7ca0046411ea0c3ba3211d035e982fbee44946b45775877c4231dcab1b7ebf2521
-MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
+MISC metadata.xml 496 BLAKE2B e14f04b9daf2f209851e28ddf26240225cb2e65f675c5903f512a3aeaefa8a7fbfc1c4140c9ed0aec699c2ec3ff53b0ea72e777f6836b4069db12e8ca3b9dd6c SHA512 cb35076b463c212dc7ba1d015ee3a04633ba6564f6fe8b569dc364123a5487b1b17219e523d7d2ccb725bb75815bdab1b1271135ee5624ec4177af327df397ff
diff --git a/media-gfx/ufraw/metadata.xml b/media-gfx/ufraw/metadata.xml
index 284cb404dd5c..6cf2734b4a8b 100644
--- a/media-gfx/ufraw/metadata.xml
+++ b/media-gfx/ufraw/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="contrast">enable contrast setting option</flag>
 		<flag name="fits">Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg></flag>
diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest
index de7cfc4e9dbc..34af9e1076ea 100644
--- a/media-gfx/uniconvertor/Manifest
+++ b/media-gfx/uniconvertor/Manifest
@@ -6,4 +6,4 @@ AUX uniconvertor-2.0_pre379-test.patch 1544 BLAKE2B 16e8b1ddd6d0ca064a2f1be12ac9
 DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea
 EBUILD uniconvertor-2.0_pre379-r1.ebuild 1519 BLAKE2B 7b6256848790e4009ee8c63e76d7c859ada926ad5dd465f3a69495eed9dd24e53d80e9807358a656b626116372087eefbad542f8f011ae93ea4a002ead01e719 SHA512 ab5671f8724ed3b1a09d616ac4bf1f58e4cfd29c72717565b4967fc26fac8b5ff2edc0a72efaaa38e2c1a6d13cceb47fa105061093e0702d5db4dfebcce164f1
 EBUILD uniconvertor-2.0_pre379-r2.ebuild 1842 BLAKE2B c90a6f269ad8891c05ff22016b2d1d95316fec86c16e06200679597b804745d4fb18b202196ad5444a40e51d8701a98c33626a532ec88263c2580369e6af2db2 SHA512 65198e23b0f6c3dcd047dd9541d700cfab5104e977679249a80a72feb3042ab213b812f5100587df1283d9833e8252a4dc86da925af9c960d02ec622bbac2bf7
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/uniconvertor/metadata.xml b/media-gfx/uniconvertor/metadata.xml
index 6ade85e1c642..1b2becffa26c 100644
--- a/media-gfx/uniconvertor/metadata.xml
+++ b/media-gfx/uniconvertor/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index db111c5802d0..d3134b7fbf89 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -10,4 +10,4 @@ EBUILD wings-2.1.6.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c27963
 EBUILD wings-2.1.7.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
 EBUILD wings-2.2.5.ebuild 1034 BLAKE2B 5ad8926041f33e1eaf6dacec8c12acfd5668a4ec9149cb964096e88e921b5e41bc41cee8a7a2c55ee0e5d2948d6fabf887c5483f2fdf46a3c640c894350494bd SHA512 1a2717be399c5ed478e2099a82b0953eac8b4675c2078b5bc7659023df0f6902f6e99c2136682a7faacadcf7dfaf01b74731c9cacbd31d1f69d46fb77ff6fd8f
 EBUILD wings-2.2.6.1.ebuild 1034 BLAKE2B f3216f917744465ace1882b970b6501a197059953cce001d72f525825bf44c7d01a5f0ebd3db5671c09be5e2a0a94fad30d331e4251590c9da8b2ae6e6e8eb5f SHA512 1cf1d639585abfe8237caec443b277ed112c454d94eb5ebdd0450b57ab7c7eedc7558e3b43b292b2fa1b8333c173ad9835a5a806ba93036dc7001071a3db7460
-MISC metadata.xml 730 BLAKE2B c74a1bbba0f4b98683e0d3d1d5045ffdfc7ea81b6180cd7ee967bb3846f446e5bda5528bec501e7941c076d6bc755cc0fb1b005506203d7ef57ccb15378724bd SHA512 7672ac58e0f7ba153b0a5939cf8e426e8c3f8c97366436340e1bbb65e85a785add4c6394e81e1aade634f58d8751a85ba75cbb1bb57fa822773a632736d96086
+MISC metadata.xml 610 BLAKE2B d2119ccef4d09c2b0114c626a6d04e655a09ea9683a1eabd0016531dee81a63bf15018547e33749b8d4aba2720a0824089dc9cd8c53f1e695067eb7f7645d463 SHA512 b4e380f9dd075cf85c13e6ed4caf1b44e9239ce9cc1914a66bb40acb07310c5dae12e21d2cb9b42b9d261f50a4b8972e9d5c5cb81bda0eb775e5e4e60aacdf26
diff --git a/media-gfx/wings/metadata.xml b/media-gfx/wings/metadata.xml
index 5c5921bc8ade..eca4d413b357 100644
--- a/media-gfx/wings/metadata.xml
+++ b/media-gfx/wings/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>jer@gentoo.org</email>
 	</maintainer>
diff --git a/media-gfx/wkhtmltopdf/Manifest b/media-gfx/wkhtmltopdf/Manifest
index 342ce5d16cac..58c0b4ff1198 100644
--- a/media-gfx/wkhtmltopdf/Manifest
+++ b/media-gfx/wkhtmltopdf/Manifest
@@ -1,3 +1,3 @@
 DIST wkhtmltopdf-0.12.5.tar.gz 511181 BLAKE2B f52d56fd932dfa514cc2711d22f99ea29960a3c4da2522be9f58f3197cb12494f1cdc8856399e328cfc39956282b8174886ee8edfc7417ba5c5d65ea353f6046 SHA512 3f982a6964085b36f62988b618d88d4339f03ad8d2e733c1fcba5e2e7cb545ccc99313ce35474605df818f91c289a87ddd952f21974fdbe846f990bf03fc2fdb
 EBUILD wkhtmltopdf-0.12.5.ebuild 894 BLAKE2B 9fb89715477e0fc29ef9a8043a5a330c133c4cb3820a02de0a89f34df189b0eff715adac588fbb981cb9affaf89cc6a9871c2870f9429a9c67cf17a16fcd89fd SHA512 2cf388f46e5f220b7498bc007240c3735ff094b069200fac34a0c1c892a0faf62bf008cc800b536330948518273a817ba741f20e4015fd8b16cb3c352e8ebb9f
-MISC metadata.xml 347 BLAKE2B d7124ab4db60733f87dcb83d4d12ae47352d5b672a82a949426c3f0c8498c7178fb04ec91ddaf9639b3f1f897f623f7d1e76a10c46af4a0c2a94b8b15efc196e SHA512 b642c6b896856dca084c706f397b6fed8537b126105356365ec0eb14fc6bd51229fece832800f2ab18d8d64a1f22c4015d2fa6467d067ffc58c001af6e216828
+MISC metadata.xml 255 BLAKE2B 41d673cb572930d29b1d30c4404af2491be6fa7e30b48d209e2e8ab0006f139073dcddb8b3764c8f88e74ec278e1f0873354131a8c166b8d16a977a571f4a8cb SHA512 a2db8323ddf16099d9fa32b0831c81a5946122b4fe9830c1a22cabdf74b39e6f947b617b5b4da1fb4a7c0d06df3ae8413aaa883de38984e62ea3621e1938f830
diff --git a/media-gfx/wkhtmltopdf/metadata.xml b/media-gfx/wkhtmltopdf/metadata.xml
index 8fb57a5f0bfa..ef3087b58eb3 100644
--- a/media-gfx/wkhtmltopdf/metadata.xml
+++ b/media-gfx/wkhtmltopdf/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">wkhtmltopdf/wkhtmltopdf</remote-id>
 	</upstream>
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 7fb40d6eee6c..cf4651d403c0 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,4 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
-EBUILD xdot-1.1.ebuild 1114 BLAKE2B 513ae720f7a58fa9fa7bc47fd819a5f1d0ed10c3ca0814d7542efe04699a4a003f80a02ffae942e97cbe173fc32babb20169620b8f7d9af35b9ba39cd5686edf SHA512 a63a6f0eb7bda0625ae297ddf3b59a991988d7732ab1a96c64935028e0e234b8c83a32e6a498e3c0d103d8301bfb34b4d28a4bd57caef06a67ebe38cdc60aad6
+EBUILD xdot-1.1.ebuild 1130 BLAKE2B 643ba4bae26a1f433b26709c4dd8761ac8bc8b0d44295d805e927fa5babf3a21ca7b805091f58f2c43570ddc293750b14d8d314643a055a65b7bd7ec759256b8 SHA512 1da4a96976c1d0928648e4c99a774366025373368b6e45a1500557cb63b3fc384d18432c906bb63565303f2fc5470941b2343f4f25ffa254630c06587ce81f73
 EBUILD xdot-9999.ebuild 1102 BLAKE2B 154a7034a320211af04a977697e0e8fd7ea53ab37de9ef0e5d34fc60f13ab8c7e8861c1d4e24ae8a0a2a2e727ab3cd57070338ce058f693946eacfc98e7b2ef7 SHA512 86d2c030cadded62e64e90466ade5733919487fb07e816b089e6cd98f88345ad5f0d00460e47dac10dbe536c84292b347e3b916e12fafa6c97448759ca92daed
 MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index a17f9dbf4fcc..e7945acb3221 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index dc1f2d08bc34..7c40e7ac02c7 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -4,4 +4,4 @@ AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
 EBUILD xli-1.17.0-r5.ebuild 1955 BLAKE2B 0e55ca414d96e0b467320301fc78c75d4c67578cb04802d3293cb8da952e8d618b0af21785202f0362e4edd4a80b4637eb177b690b206bf0a98f9758ba86d939 SHA512 b1ac31544d7044df876f41377719eb5cc35f5ea584b737e9c53436427815342cc706e2df7bdbfbf901804064aad1d1f675e421f7bf865f61e872ea0164d7d273
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/xli/metadata.xml b/media-gfx/xli/metadata.xml
index 6ade85e1c642..1b2becffa26c 100644
--- a/media-gfx/xli/metadata.xml
+++ b/media-gfx/xli/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 9d00cd81daea..360ff0278fb3 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -9,4 +9,4 @@ AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
 EBUILD xloadimage-4.1-r12.ebuild 2504 BLAKE2B 9a14aeed6e18ba4d0a4037806bba53a66e0666c26494f15ceddb66baacb0a1791a0e7234a4c8af67180c65775356da87a053cc58fb7d7cdf52d9c4f2cce37874 SHA512 8b15c89bdbf40381dda09f0c1efd4f64716f1408e468775f248257fb45a94356d81c8e359f3a4c6e83da37be7694ae550de13bcbb7f97fb8f9333ceadff8314b
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/xloadimage/metadata.xml b/media-gfx/xloadimage/metadata.xml
index 6ade85e1c642..1b2becffa26c 100644
--- a/media-gfx/xloadimage/metadata.xml
+++ b/media-gfx/xloadimage/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index c72269f2fbee..5b4fd2e1c824 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -3,4 +3,4 @@ DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b3
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
 EBUILD xsane-0.999-r2.ebuild 2209 BLAKE2B e87b97733e6d5a6670334901b08dcba2aec60abb479b96b02af0344e4b74c0b3659bb546cae84f13896d3762997bf93b42853a8382e6bea76d123401a90dd905 SHA512 90b876433b8b3aa2f4d5190ee2d8de527105c3184d7a90110308a1db694a6836c5f487ea8bc5997f1b6af543c81382071c3d81fd8d59dab4d433961737900b46
-MISC metadata.xml 500 BLAKE2B 9eec3d7fa81661bc2035035649e602539db5c45451576a452562a9980811424e93999d34cdb64a0eb8fabf7c4408bc47d402654abb53d26b0e4779c8c501b318 SHA512 1f304a2fd92fe512a70e104c02fb72c9518e4f9e6eed795aa6462eb06a26f314673b9964b8c576a07f11e64eea0031ad607070bc1c167d5058d5ef34f867e383
+MISC metadata.xml 370 BLAKE2B 800a5ac17360397771b4021cdd36777cd546b8f32132f5edc380cec9c1aa41d10daa1d67da06230b447f5115c6296e36aa1ca881f923d3238ace1f8a48584891 SHA512 c00b90634545ce757206fa7d23b345e11afe409813f16312bb4dea494f8d0342996f994623dec0939bc40e13395a1be8a40b014064dcc039f669efcd7fd7b19f
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index 83d97d0e07f2..05e8d7f7eccd 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -5,10 +5,6 @@
         <email>printing@gentoo.org</email>
         <name>Gentoo Printing Project</name>
 </maintainer>
-<maintainer type="project">
-        <email>graphics@gentoo.org</email>
-        <name>Gentoo Graphics Project</name>
-</maintainer>
 <use>
         <flag name="ocr">Enable support for Optical Character Recognition reader</flag>
 </use>
diff --git a/media-gfx/xzgv/Manifest b/media-gfx/xzgv/Manifest
index 0e2dc259d205..77a3a92a87e0 100644
--- a/media-gfx/xzgv/Manifest
+++ b/media-gfx/xzgv/Manifest
@@ -1,4 +1,4 @@
 AUX xzgv-0.9-asneeded-and-cflags.patch 976 BLAKE2B d83aaa182b8e27f8883d6512f657cc34300b8d5e08521cf6f8e11db67bcfe6f8052ba18d17a4ebbd1181d09e7607e2a5ad8b632c03c4c60c78b86167beacfabc SHA512 05fa8d01d86e5a3e4be7c7226ce21e041f80e9ea8beeaf57f9e4624237b87e39447c07019e8b6530681ed8583c370737f50583941ed939195553ce81110742af
 DIST xzgv-0.9.1.tar.gz 163419 BLAKE2B 6b97136a8e9b8228f849d5f905af6654a876b044e39dbacfeb01e89ac64d03920cd9f0bf17ff2e2ad4a59cb690d601db34488c72280fc0743799e7ed0c0288a0 SHA512 e57d0eb3f34bc63cb9f2d033856eefdeb6363ce55589b8bc52a8c253e211a4e36d3c0691b4559581d4052810fde445c6ec1832b964c40c5365c3869ce72f7361
 EBUILD xzgv-0.9.1.ebuild 672 BLAKE2B 60d62e57389262c964ae0bf0ac75c630431728b55a46c2d6545dc90465a5d6b09cf44cfe8daeee31df016c7a7d494dd43c697dc692172ee0f40332a49ebcf074 SHA512 991be7ef2638495e84110c449fa7d0bcba7703e6f3fbb25e64f6935454bd24782ffe22513657550f2fc7db0332488abbda23e790be0010eafe9dca6a721cd748
-MISC metadata.xml 333 BLAKE2B a84dd435e081d860eb46ef1d40895321b63b528f13b635486ffccfb6487788050f7bfb4be718b4f14fd18ac11670ddb4802bf075c48e8b7b237619e9975eaf39 SHA512 06f260fee9abc0645a167fe1e3b7ff17bd6d1d4dfdecc94d98a4a3341434b51cc037a837554c0377c137a45e62315853b93f6b81249938005a7272f496351b43
+MISC metadata.xml 241 BLAKE2B d46a91c71c0348dbb312757885169dd5cd781957192054db8e43e4e0027dfd127f6ad5830d3452e40a7d5200016bf1b9d1bee268941c3c920445ee3e31278c84 SHA512 3dba82b698fa750dbd8847b3f22334c288688f5ce73b940f6073ae962754cadffc7fa8b9fcb8a5b60021481e970abc95d93d5f148ce60293b289f7e32ad28c2b
diff --git a/media-gfx/xzgv/metadata.xml b/media-gfx/xzgv/metadata.xml
index 6016eec00608..5778315c9cb2 100644
--- a/media-gfx/xzgv/metadata.xml
+++ b/media-gfx/xzgv/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="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">xzgv</remote-id>
 	</upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-gfx
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)