gentoo resync : 02.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
commit: b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree: 9026dffec53f92cba48ca9a500a4f778e6304380 /media-gfx
parent: 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)
58 files changed, 171 insertions, 742 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ad24ae050fe3..0733721718ea 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/cptutils/Manifest b/media-gfx/cptutils/Manifest
deleted file mode 100644
index 7d582bb04d5c..000000000000
--- a/media-gfx/cptutils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cptutils-1.72.tar.gz 629672 BLAKE2B b7acd86962830b49982e53df28fb11595445fa203ff6b852666e87c88cf211726157cbe8fd83e4d79d287b294cf05ec91f1b4d9f6894fb2f60fe7a26f8e85e6a SHA512 521aacb52a181b8e108356b294d2ee6e5068fc6e2d93a37783be1e99ca1e9209e016ea5eb3e2205b8c3d94661197adb314abe1e494e2ce6ca1b07d6517492bbc
-EBUILD cptutils-1.72.ebuild 867 BLAKE2B d3b093846d31230bd6651f26c3aa98671469920e408116490d11f5359a460056f582a3b03aced4df6f61260ff1b1a7c6c07bb13343d16ddd25ab57b72f49354e SHA512 36bbc702827c6e3fe31025176d1f90214c4c396b3106422da4cf0996b15d43e27e63942a82cc0b2a5e645cd4690e684df1f84400e8aefb032c3a1dc4126c2a3f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/cptutils/cptutils-1.72.ebuild b/media-gfx/cptutils/cptutils-1.72.ebuild
deleted file mode 100644
index 6a9a8de47197..000000000000
--- a/media-gfx/cptutils/cptutils-1.72.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A number of utilities for the manipulation of color gradient files"
-HOMEPAGE="http://soliton.vm.bytemark.co.uk/pub/jjg/en/code/cptutils/"
-SRC_URI="http://soliton.vm.bytemark.co.uk/pub/jjg/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="dev-libs/libxml2:2
-	media-libs/libpng:0="
-RDEPEND="${CDEPEND}
-	${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
-	test? (
-		app-text/xml2
-		app-text/xmlstarlet
-		>=dev-util/cunit-2.1_p3
-	)"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	python_fix_shebang src/gradient-convert/gradient-convert.py
-}
-
-src_configure() {
-	econf $(use_enable test tests)
-}
-
-src_test() {
-	emake unit
-}
diff --git a/media-gfx/cptutils/metadata.xml b/media-gfx/cptutils/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-gfx/cptutils/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index ed17ffb8e996..2f12a53d6fbc 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -9,9 +9,8 @@ DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e
 DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
-EBUILD darktable-2.6.2.ebuild 3879 BLAKE2B 58de04e0d0b727c939ece0f11a3fccf30f2cd7e81ef11e6a64a4857d2bdfe77592e2e748dc64f34bd27b20603f1a2270e1af0d78b5d280f5d8c98bc403c38e68 SHA512 176fc9b85a1c4d5c28032e435e92c59299c857731c4c1e01490ca57aca18704187e0b62c5d9b7dcca4ac760cbefdf7a00eb3b66b036902ff7c4a6e3769b27f80
-EBUILD darktable-3.0.2-r1.ebuild 3888 BLAKE2B e402484fa08d1bbb949ad7381d6b0f0a370fd5c644b9fcbf2e190f65b4eded72580a28decb556795ce7aec7a147a3a147ba601162484358925f6f61e69f826df SHA512 d8e34da86742f2fe5cf2e04023dd0ca2b2ec9d22cff984eefca8246fe5dc5dab4c9633e4aa0585376e5c943617e1808b7f04b9355c162652446f42f2b1783f24
-EBUILD darktable-3.0.2.ebuild 3781 BLAKE2B b541810d2da2a8758a77e6d9e4f2e3370c79f099f29b4aa884776b6a515eb5a5f76aa0854821e135eb7271db34ae6d2f0e581f1b896e17e958daa05aa889fc2a SHA512 e88070a5dd82642ea2fa3e1418587f185ab492da20d729db6ebda6b00f74b79fc313789cbb4a87e4f071f9c1da4040041a6477291aace42b2529b5640408dbbc
-EBUILD darktable-3.2.1.ebuild 3815 BLAKE2B ea75d2707a1248dccf730abea89407e790a644cfc60eac6de1ac45529c32ff4c0b623047087bc971c685bee89a4c4874be640ff629569167c1fd8bec71a3117d SHA512 397bb4bbb8eeadcd6bf998fbf7ef5d8d4b7c53b2c4422a9eaf1ead57db9945b4b992e72573cc2ad7766003202ebf345450299761ecccd93c52366a717785285c
-EBUILD darktable-9999.ebuild 3262 BLAKE2B aeadead1b20cd782e263b4f67f20d18255034626b9898273827baa60fb528d632ecb831b584bb0c0ed71e1226a9e32049e2bcc96b4d03c2ee5a9a725ef3858d2 SHA512 c323d686bcd203fc58833fdb89429440c801015dab82f26dfb4133e048a2f59449f6120fb6d0165177aa30a7f7c1d6acad08016286d7b989e7731a9e2f0bc4af
-MISC metadata.xml 1045 BLAKE2B 2094a1de028b4db282941604a3af2e608a4694b47d269293c09c1874594054a2457f44a94d9802eb84502c64c714a5af0499e2d2d67a71f61980906fc78acaf8 SHA512 1e0e67191daac03f5aebed02b7981a4944d4b0da4b00b8781fb79a1a362f260e51d182fdf10cf37494ab854cb7627ea4f7d279fad7191a53c0118e8d3c791166
+EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
+EBUILD darktable-3.0.2.ebuild 3776 BLAKE2B 2148441c564365ed0cf732ca101f7ebbcfb99812bf01170164b8ebcd1d77dcc345ce08784fb3a9c2d8eefc27b9a410d449c45a5ce93449bb87295829156c4e2b SHA512 8cde8a2a1b6fbec34d918f5380068801be7b8cb4a8e8bc8d47bf51281c8f333aaefd63418769beec9b72efb8a9fac59422fe35ef570f25606a2d789e415f988e
+EBUILD darktable-3.2.1.ebuild 3810 BLAKE2B edeaeaeb1d291965a30e95177c39716952572640aeb7dcd42d7ad153cbb4c46c7c9dbafc1961ab32d42863f5c0ada9214d40c9ac41e4eb6b6529863749036224 SHA512 a6427900ba11b3c9acd249c7e14383dd8525e01f8a1baead0a39af8ab75af801a223a4e7613cba341d9ae94ea4b3be9b2f5c24f1270b22cccad81846bada28a0
+EBUILD darktable-9999.ebuild 3264 BLAKE2B a287e05dbbc18377966713eae4272ba0856fd53f43853060e0ccb4a36c0f37e8b8725b258abd17e6f1cb7f278209144fea75c656e3da519007497367ef3a9d8c SHA512 e821a987dde08ccb26d7d94f660abd02965ee0699b5ba30dfe1e33c9b2b6bea540a0cd9a8b2eb255af563cf0bb71bf21d14ffd3c91a22f1380907d5b23a12507
+MISC metadata.xml 967 BLAKE2B b87460be69114c3aa5b23813e4c9750fa03c748343142b880858fa26f9251ba6d9a427eb05d6a6ad16ced258dd5f4376f53f67e4b0345fd1d5bd26c064a8c5c5 SHA512 1ef671b139bbb1019380d0d84ab9a705c145def53186866aba6d2f48d0d1cc107bd1bb5a010706dbefcf7d46a9cbaf350dd85d55b609b8d5b8e2e1566197aa1f
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index ee670e718387..394e2f5295a8 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.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=7
 
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DOC_PV="2.6.0"
 MY_PV="${PV/_/}"
@@ -21,7 +21,7 @@ KEYWORDS="amd64 x86"
 LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
+nls opencl openmp openexr webp
 ${LANGS// / l10n_}"
 
 BDEPEND="
@@ -123,15 +123,6 @@ src_install() {
 			fi
 		done
 	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
 }
 
 pkg_postinst() {
diff --git a/media-gfx/darktable/darktable-3.0.2-r1.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
deleted file mode 100644
index 5b83be05e128..000000000000
--- a/media-gfx/darktable/darktable-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DOC_PV="3.0.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto nls opencl openmp openexr tools webp
-	${LANGS// / l10n_}"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-	"${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
-	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			test-flags-CC -floop-block &> /dev/null || \
-				die "Please switch to a gcc version built with USE=graphite"
-		fi
-
-		if use openmp ; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	if use nls ; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild
index 482ed841310f..4fd99f7da34f 100644
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
diff --git a/media-gfx/darktable/darktable-3.2.1.ebuild b/media-gfx/darktable/darktable-3.2.1.ebuild
index 2ed26c6f2cd4..49e44beeb082 100644
--- a/media-gfx/darktable/darktable-3.2.1.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64"
 LANGS=" de es fr he it pl pt-BR ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 422d45185bb7..b94745a602bc 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.darktable.org/"
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86"
+#KEYWORDS="~amd64 ~arm64"
 LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 08c6f2bb31f8..63e4e905d37f 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
 		<flag name="opencl">Enable opencl support</flag>
-		<flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag>
 		<flag name="tools">Install tools for generating base curves and noise profiles</flag>
 	</use>
 	<upstream>
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 7de89b73a449..940b39a42f25 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST eog-plugins-3.26.4.tar.xz 477772 BLAKE2B 104ddf58d33e5513349839312fef820af20d7a3e64a3a8cbd7d964d8250564d6cd62c58cf95fb5359ab95eac8fe2b83ed051e6f3dc8144a8884ec72c74a12622 SHA512 95f2cf2c6ed84b4801517a708f18e1cd673f814d849029a41491f3719512d6a3a2cb5cb11898a7f972f8b674c682245c99964ba2da19b285ed175b720d5396e8
 DIST eog-plugins-3.26.5.tar.xz 478188 BLAKE2B 655eb9860435775862ba44bd26530edff778a3c8c574e9bf592800b4d57b4e5b0e52d36b7d71d6a6d615d47c320542105dcee9de89250901fcbfa6c255dcfddc SHA512 3b7979d241c2c0b522ffb6c30a6b8c90fed9e899cda8a73fb9d9a9392f474516f8c24fc75f3f35f920c8a6cf04b8bda611a8669839588936c48467813a6227a7
 EBUILD eog-plugins-3.26.4-r1.ebuild 1688 BLAKE2B a8facd636930691003351dc4f962970dcc19509ef2df7f106899ade4caeade426e2e5223856c7ea8f6a9decc80861d12bebfaa66b1ab164a03d016150b492c05 SHA512 86920010db0205fa3aa896a18b371acb4c72c0a277aed032675eff40cbe87b7985847c7bdddb007b5575072e50732da650e68bad315c6724c9d3cb53ba753eae
-EBUILD eog-plugins-3.26.5.ebuild 1690 BLAKE2B 44cad63aad7db7c197dbca6f8950179f66cded046c54ec12cd2c8cb27044a4ad7f5e05ac4cf3bc6ec298201331c2d9d381206e9b771f091094319041edfcf500 SHA512 206fcee5d41e6117b0f5708311aaeb24fb5e5e09e2345cb78efead1c676e9fc39c55b8f86ee07aa6a6cc5715c1c5950c038f9b529c2b59ffb77ee0fd9071b033
+EBUILD eog-plugins-3.26.5.ebuild 1688 BLAKE2B a8facd636930691003351dc4f962970dcc19509ef2df7f106899ade4caeade426e2e5223856c7ea8f6a9decc80861d12bebfaa66b1ab164a03d016150b492c05 SHA512 86920010db0205fa3aa896a18b371acb4c72c0a277aed032675eff40cbe87b7985847c7bdddb007b5575072e50732da650e68bad315c6724c9d3cb53ba753eae
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
index 897a10d8bda6..33ba60e823b5 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index d65c65ada5fd..95a7c1ebb2f3 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-3.32.2.tar.xz 4601712 BLAKE2B 84803acf2e2c2cb7451b357d18c7553854dd9a440ee8f951db479641ebf7fe49d8b8185124301c8b272db22d424c31197146e58d0907248cb87aa822441184d6 SHA512 c1093db4bce6bfde758a42fddc7ce7437d2adf3aa44a633b253ca3cb75c910e8862a323d182394696c617cb92114919dc576b992e7a65aa5fefb504062382d81
 DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
 EBUILD eog-3.32.2.ebuild 1556 BLAKE2B 4a6f2ce822682b8fb164e7b95a26a16fe6bd9f1d09ac21d70a38942673370aa4b3e5007f3b41c37be9badb97f4f2080a1e8e82f0de3ee816ec7300f92d55b957 SHA512 e988399d2027b41da66b5004c9e879238799b24b12e3581229c995b39b51b7c78322a7734f1688f1b8c87f231e339d6cba8507778bd6d9ad18796b3a2e1bd5f1
-EBUILD eog-3.36.3.ebuild 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
+EBUILD eog-3.36.3.ebuild 1556 BLAKE2B 6ba5e5184a6916dcc56b4879ca3abf4e5eff4711fcdc97c3a56a415f3564d1b02ec74dbf270b0586e9496ba421b9bae052591a40aeebb789e22867b1d6443dba SHA512 c59d6e36cec5e04be93567fe493f62885effd1a828240aed0e4d5afe04d31a1615d237294814eef7c774ac009cccf0cadea8c86881908df08a1a312a774f9e06
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.36.3.ebuild b/media-gfx/eog/eog-3.36.3.ebuild
index 75800455eb94..3ece93d2d976 100644
--- a/media-gfx/eog/eog-3.36.3.ebuild
+++ b/media-gfx/eog/eog-3.36.3.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 8427f864890d..eceed3b482ab 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,6 +1,4 @@
 AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7520529ace1aeabf78544aa780d91fe57d8db7aee8934401ede46810a8ee8f53f26d0e7304605386fd6fba080825c70abae SHA512 3a487cbbbfd94240858cb0a7221b9515720aeaab7adea3e7dd8be2d05d0369f5d3ecd5e3afc4ceb1cda0e2aecc0c72d0cae796f70ed181a90944e3d5d76a31f2
-DIST eom-1.22.2.tar.xz 2158376 BLAKE2B 88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f SHA512 1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe
 DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
-EBUILD eom-1.22.2.ebuild 1390 BLAKE2B f9feb1b56216987a705e5b39eecb886bd5cace7ef66b00540a66d06c65a4d9d93e4dc0b013db05b04826835c310ab2c71023757a74f14d7ef10f29763d025125 SHA512 e93fae7450900205833fcfc45b046d536fc119684f992503b99e08709d54a04b81074ff373c49ce00ef7645c7f81edf69a6f82c10f4f7d1cae120f85e9735f14
 EBUILD eom-1.24.0-r2.ebuild 1666 BLAKE2B 7c8b1982b350e085321620d4e155526336e3e05b0c662e4c1547e335883f2919e4192c5836ea5b0121dc8fb64e471c3b1c26493e8cc82526b16092e71029bd5e SHA512 a88659a60d9382a6d3db22ffdb7dcf633bece393ab7d56905ef11f071487933cef476ea6af36fd1d79ed61007520e6fce38837105708f791baec892144f6a2b9
 MISC metadata.xml 467 BLAKE2B 5314ab156ff29533e419e8d6b82d634bd3ffd7898e8125525d2d45460dfa464c8c9a7311f3fb69e33172b523e85816d6ecaba0487087dacafd42e31cb261e3d7 SHA512 d21cd9729f0f8bde3caec98e3a7f75de8075b129651b7c25d386cbd1cf9f4a41972f48a6addb7180ae40a0c2a626a5508dab5736ed71d60b56bdd2132d479854
diff --git a/media-gfx/eom/eom-1.22.2.ebuild b/media-gfx/eom/eom-1.22.2.ebuild
deleted file mode 100644
index 42ba95e06f2c..000000000000
--- a/media-gfx/eom/eom-1.22.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
-SLOT="0"
-
-IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.52:2
-	>=dev-libs/libpeas-1.8.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	>=x11-misc/shared-mime-info-0.20
-	virtual/libintl
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d3e26b2a6c6b..98f431aaad43 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,9 +1,7 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
-DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
 DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
 DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
-EBUILD gimp-2.10.14-r1.ebuild 6140 BLAKE2B df34bd1bc35873d51aaec12fba454170ce08b2b10f183d00eb56adba4cc40f56877481831b319c11fa8cbbe6fe17929c60341c918610c20fca2355607b876c22 SHA512 3f86c2237be7978066780679326395666d96bd22d4e389aac60f2a0989939e809ad51f2f12018b5a4fbd7d1bbe1469b034c74c86e4321ae6fb8f8caacca9a7b1
-EBUILD gimp-2.10.18-r1.ebuild 6167 BLAKE2B 72365a42b68b73f96204e3fd2dcfd61b55f141ce582315f6828ad0c703baec407f376b8d82338d493cf6620facbd1c9bfdb9f4494164c95988419936ecf6f951 SHA512 a557135d986e349bb37a37822b96be7f79c4d31998c978488e72cf5259222357df81961b9981f9274cb54680ea932e2883407025fdd5ef3c97437df44ca77f12
+EBUILD gimp-2.10.18-r1.ebuild 6166 BLAKE2B a0457d562c194faf821e57647a171d1152f35c567332dff9fbde3e5c69a1ad55e547f07ca94d4f3f58178be7c56005655d2c77c342b8fc983968aca93784e033 SHA512 e7dbff03388e9b651851eb54aa5c8fb61736f288747d0ada5986bb9851cd5de7fefa9b57fe81b36363de27f608b254fba3049f759d4d2ccc40b1eaf3f70308b4
 EBUILD gimp-2.10.18-r2.ebuild 6317 BLAKE2B 4ed48f6450955abc83ebfc73605a825d1ab493c27ddc4b389d06c93a092961343c9496712f308aee68f81c48757ec3e44257609127a9218b9f02a4d893b7c347 SHA512 44f765e80996107ca3d4b294c4018e23e8ae5619eb2c7cebe6b1f6f0e7614fa296839d58f5b10a5e3f547b12bd1c2e303edd8893d47b5733fc44816ff3b8a0b2
 EBUILD gimp-2.10.20-r1.ebuild 6022 BLAKE2B 75e149312d91224b99ef93146525509c411a02cf59d87f3c727fcee60504f6769d84dc676439eb59a880edb17cfda65ae5ae2eff0062c9ee4ff74247f1f73cf0 SHA512 d1aec4d39329879101a28769a192dd92cc296c80402d99dfed07c9a5f7974363cd94dfe1765142f146bca43e005a6dad77bac45a86c47be26ae2f46be23f4d62
 EBUILD gimp-9999.ebuild 6461 BLAKE2B ba3eac8a82d0ebac3cc0ae18c2cddfecdb54fb922707e813d9a922d1f466564f50d42ab24a9de9dab1f63a1302dc84bcede6b4ca3dd4e38503cb64fcee565a93 SHA512 97a1d450095bfa7219672c45100403950029a5c0620ce50ab50eee318baf8e0b944fe387d6483f4f5b9a5c570b8f77b346306c62ba6cfaf673d01c9f6232861e
diff --git a/media-gfx/gimp/gimp-2.10.14-r1.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
deleted file mode 100644
index ca8f53ba5a95..000000000000
--- a/media-gfx/gimp/gimp-2.10.14-r1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-GNOME2_EAUTORECONF=yes
-
-inherit autotools gnome2 python-single-r1 virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc64 x86"
-
-IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.0:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/babl-0.1.72
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.18:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.3.0:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg:0
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.3.2:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python?	(
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
-	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
-		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable python)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED%/}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
index 0bca675be274..282b14daa351 100644
--- a/media-gfx/gimp/gimp-2.10.18-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 927892d6e4ba..ad8530cbc6b0 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-photos-3.34.1.tar.xz 636916 BLAKE2B 3d041f3a8349164e12b8788b028edf23c0db1e671c5da4356dbdc01f5129e8dfabd3ee9df3af82b2794e22c1d8d894b7726068d69a605b0d598ec1dc21754470 SHA512 9ee1bf299f82b4a55d2642e34cfa82e0a3a362cd5e415acd5421d54430da5ea5a9f831ecf5ccf6966eea056c851fde57385f9224441be3d06e086be108d53227
 DIST gnome-photos-3.34.2.tar.xz 639992 BLAKE2B f189e7e1a831f4d19416b689733ef6a55822d57b5f1ea29a4dcb4fc06d5f9a450e45aaf53f65e392ac78e9959f7359f3df17827a326cfd6dbf8cc7d77cc0a367 SHA512 6315fb8e7623de48a42f1b47a2935c80f8f9f6db1ab724d1857697f673c4ca0d5ca1afa5c0d147455c3c0ad0224b85b52a220b1dd39a1409804bb75794d0a04b
 EBUILD gnome-photos-3.34.1.ebuild 2303 BLAKE2B 2c1d5d39d8c532b72ea27a6abcd8c35d49638a3c5b0e6ac24fd4ef2069e1fc93c54f8056e55a45d0e82d5becd134e50f4b7b464b13b65d7e9c8a6ff43d92262c SHA512 f49cc3c4c8aea3b6292dcfa858b5ff3f78c13c282e66700d5f5de8dde3bac3ceacce2201d92930aa8a503fc629b17130b484b6da7a4850ee822ec7f2d0fb3755
-EBUILD gnome-photos-3.34.2.ebuild 2305 BLAKE2B 895246524e0f75a98f28f6473aa5c35389428f9534bfe6c511715a3de0771e9468053a26f17b3b94a5b0bda44c19249b2d563ba0d3507edf176f4952e76171da SHA512 2fe9ebc90ee752d6de4a491575a9dd73c2ff0b34a55a13c68a46ca045f50b9a427e0a7432f3b4095070768339a2ad111ff65dd7f1d1a10a312312aaffbf46cc7
+EBUILD gnome-photos-3.34.2.ebuild 2303 BLAKE2B 2c1d5d39d8c532b72ea27a6abcd8c35d49638a3c5b0e6ac24fd4ef2069e1fc93c54f8056e55a45d0e82d5becd134e50f4b7b464b13b65d7e9c8a6ff43d92262c SHA512 f49cc3c4c8aea3b6292dcfa858b5ff3f78c13c282e66700d5f5de8dde3bac3ceacce2201d92930aa8a503fc629b17130b484b6da7a4850ee822ec7f2d0fb3755
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
index 33c329f5adce..66f59c290559 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="flickr test upnp-av"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 0b0cc4c52ede..099fb93eafc6 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,4 +1,5 @@
+AUX missing_atomic_include.patch 319 BLAKE2B 8b122e0f1b61cbe98413b21f90c97826fc75b64c4c12f70b2a3048d4c14151f9f790e5c55fbea6eed518f9bdae57e2620b2be15351d86ae339fd4e38925aa57b SHA512 05f3f392f115d918aae78bb6c82b7461212a26bab826e02b686ad03f8c3f8e4fe0b1c1b89e2982e8912922ef987596501ef4145474e2745bf89487e9ba6134db
 DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
-EBUILD inkscape-1.0-r1.ebuild 3931 BLAKE2B a1c26f535e5826b5546b9352393d74888bb12a8b5c2136909a713591acc5cec8aa0298942801ef19a959258eb5177404ccf750e9815388aa9f9fb6f8c1fef142 SHA512 6afe0c95dfca5b97b6f81bd78bc9828fb637416ee3c07a69e2634f604c5bdd1ada0ccaba2adc6548aa0562c7bccbdfbd5e0b77af3c19d5f660e8e9b5ecf2f937
+EBUILD inkscape-1.0-r1.ebuild 3988 BLAKE2B 22cba5fab527c9bedb32d3428b5bf4bd79d6d052cdf883f8178080e4b3bb200e0e087968ca4e121e3a52044ffa5e37130d203a6472e53da2bc1d92f4a7b62742 SHA512 2361552e58e969bc71a988d59b609fff6c991ccdb4df1948a932c20c62286e8d17618505f2b2785a3e3c6611c209e9e1be2fcf052cb955910ccfc0b2f12824bf
 EBUILD inkscape-9999.ebuild 3910 BLAKE2B cfab74f275ac4a5adfba4a19966fda81345f5db7e3cc25ed7222a8c29208e893249dab17887dd7a6fd6a76f27f3f559f9e7181ef229e9c7109d0fa47e0546868 SHA512 b24b3f393c8d66dca3bb29de09cdd44214532c25e7de4d0e45c93a8be2365f1ea7208d9f24311299406da02b9c60ad257efd58795f467a7d6a8ecb3d81a90843
 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/files/missing_atomic_include.patch b/media-gfx/inkscape/files/missing_atomic_include.patch
new file mode 100644
index 000000000000..b298550c5c89
--- /dev/null
+++ b/media-gfx/inkscape/files/missing_atomic_include.patch
@@ -0,0 +1,10 @@
+--- a/src/ui/tool/node.cpp	2020-05-01 15:18:52.000000000 +0200
++++ b/src/ui/tool/node.cpp	2020-08-18 01:25:05.266412299 +0200
+@@ -7,6 +7,7 @@
+  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+  */
+ 
++#include <atomic>
+ #include <iostream>
+ #include <stdexcept>
+ #include <boost/utility.hpp>
diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index b137a124f305..0e5ca71a8f9f 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -20,6 +20,10 @@ openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+PATCHES=(
+	"${FILESDIR}/missing_atomic_include.patch"
+)
+
 BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40
diff --git a/media-gfx/iscan-data/Manifest b/media-gfx/iscan-data/Manifest
index ca882c3ef078..64ce97f42bf9 100644
--- a/media-gfx/iscan-data/Manifest
+++ b/media-gfx/iscan-data/Manifest
@@ -1,3 +1,3 @@
 DIST iscan-data_1.39.0-1.tar.gz 100793 BLAKE2B 690ce06ed82e817658bd05611a66f9bf6d895bdc17185c585c83c0a8b9c020f0354f782bf991dd4913336799a75d3d424085624e488ca4a77f797088a327fda6 SHA512 15e456d5e64bfe9bea77c3f2a349a2e50c4d8a8cbd1347dfac4ef1f692793561d0d3d32fb3cec10176f013d3b0e46f62d6d24f0870c199088e2e65ec82b4326a
 EBUILD iscan-data-1.39.0.1.ebuild 1006 BLAKE2B ee7e6b83dd81edd9fa0a63e2887468caf230765dd4c26e8566c133e39dc12ac693ba41d0720a5c2209bfd9a4b99ab1654a0067c6ec75e3f18db909dea431d663 SHA512 73305c191e0c80aa7b842745fa03902a739de29c21bea228d76e65acde60bc75db88972e744ba75aa5d2b3caa7735c991869d5ebeb06eeb1c0b8debf16f618fd
-MISC metadata.xml 609 BLAKE2B e0c2521d9bd70daf3bca54713178819db98aea387bc4a6b41c682d044656229ab5cdf2bd3212bd61faabdb5d600dfeb8fa445f57eb0247d694a59b35a663b6b2 SHA512 32ede245d749b0be045e45a5c8a6f68f9487d807f8777c0da84fd93b20ca11aa1ec3d132d2b24a7a58802a112b71ace82fa03f3e618a9d66bc99101eefb7b5df
+MISC metadata.xml 411 BLAKE2B 51da10175843408a77eed2d37895a36c057681b537fc71dbf31774424dcd681e0a516784ae2540fe47ab01f153b023b0d4b2d25d0456a69529be95166f3ef84a SHA512 2bb653fb447f2088d09fd1f84671c7a37cf8a44deada87a2bb0fef792335677c68b8ab77c1d2268b28a3e5dd5438b3e27ab72dfc6dc8f0e492f2d31305311684
diff --git a/media-gfx/iscan-data/metadata.xml b/media-gfx/iscan-data/metadata.xml
index b2d428e4c97a..c1073e27b5c4 100644
--- a/media-gfx/iscan-data/metadata.xml
+++ b/media-gfx/iscan-data/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mattsch@gmail.com</email>
-		<name>Matthew Schultz</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Provides the necessary support files for Image Scan! for Linux,
 		including device information and policy file generation logic.
diff --git a/media-gfx/iscan-plugin-gt-x770/Manifest b/media-gfx/iscan-plugin-gt-x770/Manifest
index c255d5f163e9..642109f0833f 100644
--- a/media-gfx/iscan-plugin-gt-x770/Manifest
+++ b/media-gfx/iscan-plugin-gt-x770/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-gt-x770-2.1.2-1.i386.rpm 462166 BLAKE2B 536bf2dfcf8d9ae7764e95b639aa5aa3a04d0f5b51c2884198d6d4d3105411ab9673bdf19006a4e2586d17dd74d673b57951fee69e3fba257a674234bcc4d883 SHA512 b8c16dd1c3d2d8f01956a72a170fa9b51520c78ab9d2d0cd581ee1b18760a28693d364e3bc3ac50a4f1c794fb4da777d452fe12ae3cf513a06eb5bedd2543b30
 DIST iscan-plugin-gt-x770-2.1.2-1.x86_64.rpm 196426 BLAKE2B 19641d3ef0742f2468df304ef0d151d3fd46408c9e4eb7e4c8ce27604fc5947e73f2448b474cde1a9aa545252561866a9ee61860430ede4ae68234204a5d71b8 SHA512 a69830fb35b2732351b35ef39a6863886bf6bc992242188e57d273444ea17e55294b5b9331c5e770b8af179e4f346e5be74c5fd79e1e6cefd2a1e975c3e68a43
 EBUILD iscan-plugin-gt-x770-2.1.2.1-r3.ebuild 2186 BLAKE2B ef5bd12a59a632b981c6a443567e994f9c297e615878f26ba8c72bc4a6133040c11b2fe137dc210a4c07f928080f22810ad48d1d18355835c561c7324764bfc4 SHA512 405c062938edb045612d4589e9a3d39b87826e931ca19a15ef7093ecfff9ee295c235deebc2581fa733928fbbc893c3a01b491b38449ada022349163143704a5
-MISC metadata.xml 634 BLAKE2B 8c922720235d1f9b289b2f9bbfc5457087c1711b9a1722e972dd4d010517eeede3011ec5147794294e6fc515129fc42819711caf03e6c726cd7786babcf967d1 SHA512 5ec1987c34a9c70cb81ede5b5f91d859e01d036c3a82a2b187fb4553ed6c18f6404954acabc67138e6bd249a3d9ab4e1025be66f660613c21a79aa39fbf07c6a
+MISC metadata.xml 458 BLAKE2B 3c055123ac3d559601ecbb0ad2a8fb18737c86e604f0f932744dec345ab4626e9734a5712888a4922380c6367b1003f812b63da815ff70cdbddb0b71c0fe9c29 SHA512 ade1af441c26e6f3b1c149fbb8a4f8530d425ff28e8d0525826f59985e08dec2cd3de02099ca1be2f3c8f9136d3aa482917b0636158ba46ba5f76649d12a572c
diff --git a/media-gfx/iscan-plugin-gt-x770/metadata.xml b/media-gfx/iscan-plugin-gt-x770/metadata.xml
index 542b0a3df39d..8dfab6ee087f 100644
--- a/media-gfx/iscan-plugin-gt-x770/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-x770/metadata.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mattsch@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
diff --git a/media-gfx/iscan-plugin-gt-x820/Manifest b/media-gfx/iscan-plugin-gt-x820/Manifest
index 8488e46f47b9..e3f2e8af020b 100644
--- a/media-gfx/iscan-plugin-gt-x820/Manifest
+++ b/media-gfx/iscan-plugin-gt-x820/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-gt-x820-2.2.0-1.i386.rpm 490641 BLAKE2B 7618023f7637a8684f928b07217d2fa5df2a6cc1f5331a53a9b57e58b9d1127061b0e14e9af4c7b93746d3511414658bae47b12bc0db505054e6459925bfd566 SHA512 37f72ce8d71d315f51f45cd08c8865a2e613b8a6c6a27e7f4671bd5a796d10f3f9cffb954dd5f3875395f49244b090f5a2a4f2749d6c5d080ce4766faf7ccdf1
 DIST iscan-plugin-gt-x820-2.2.0-1.x86_64.rpm 206774 BLAKE2B 3d3faf1c04742bfcfd96473fc5274423a458c4082526887d5164585274c1ee2fd7606fa351267a7b94b0f632634817dda8e4bd57dcc54a43c307b6a602646706 SHA512 342b034ae7cf1f2b346ffce8719a025e55df2295daaad896acb072e3e36b916f0503106293dc88340d4b1b732b8daa6f4d0681f843754824b757667940b5b545
 EBUILD iscan-plugin-gt-x820-2.2.0.1.ebuild 2241 BLAKE2B 7923a0dbb21e2535e56c05f8318cdeda066681774ba6d4e71bd50a4a1c39970ab64b9b0725fe41427f0e8237260a6eec87721ceecce5b4230144036a084e4295 SHA512 843cf78f8b5c874db81ede7a0a3e78f924ddcf66031bc093c2ec99d33db671b388d40351080b4afa610438f0abe6de9b28ff9fd43d6ee43498c9e2fcf52044bc
-MISC metadata.xml 640 BLAKE2B fb5ddef0218d9718f277658adab22f81e5cf284394a54fd65718d6a93d6cc152d314e1bbf6536368ba6d86df2a1e5bd6b4fe71946a3d18a5b1b2624403964577 SHA512 e9ae09c376840d2cfb75aeaa2fa3414b86ee5e6e3703ae5915950d5d8b5b9699a6d27920a127be2514ad0cac8bd1c9453bf711492a7946fa64d2ba52d71414e4
+MISC metadata.xml 464 BLAKE2B 54e1ca2207c523fdc988369222b6f581807986d5f00206bcf2cd58a7b969c5677b8b1df6ec42a6aeaec7e7a32430f5c1bf4e3a4e583da4e93db45e73d6e1d565 SHA512 42f9ba42888fbd42fdf6197d3b9e59c96efd8b48fafd9eb54cba4aa6bc23df7d45f3a9f0c0157750234018e225560cb34c63cc8b9245fda12bdeb3ce25390871
diff --git a/media-gfx/iscan-plugin-gt-x820/metadata.xml b/media-gfx/iscan-plugin-gt-x820/metadata.xml
index 334d8b9301ef..159e2314469c 100644
--- a/media-gfx/iscan-plugin-gt-x820/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-x820/metadata.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>nitro@legroom.net</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 03f5d4abe8a0..3165d0c7bb48 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -3,5 +3,5 @@ DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2
 DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6 SHA512 c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
 EBUILD nomacs-3.14.2.ebuild 1928 BLAKE2B 65f9e2319a248fbe8a81cd4cca751c26125ba299b9203e369405eb1cca92345ca9c4b2e5c4210ce4424e40d3738fc8bdeab64a90511e8302078ce6b55b00ccb3 SHA512 82000a615de936bd8434a43f4aeb9936aeffa4f833263169dfa6353f0c735814f11c3f62fbe71218c3c7f4bc16afc0d805c453b0c7881ca7a5b096f3a1351100
-EBUILD nomacs-3.16.224.ebuild 1852 BLAKE2B 4a32c5476b1c383df212b0ecd68a53d11b5258c5daa7385802a08520eae6b9a866c35afb9c18aa00e60f821b38663896943b7ec606a8351720fdfe36967117cc SHA512 122cd0267ec28982d5659471ad0d241e5e02f0ac4a2cb94e6fbc3c8512433a61ae22b4b60616c387698d4e561707faa8e08c41aef886f23f688a164b2667d411
+EBUILD nomacs-3.16.224.ebuild 1859 BLAKE2B d414d51449da48f68cee86b29e0a320df1212450f241b49bb1332617a4f41aef6071c06444a052e18820567a65a6863e35e2f37fa2738135446f316a47b609a7 SHA512 2f9f196cfc9aebc83e1038b304ec605c97ad828d2672365dde59f117706249e9e069d7e1312e19baa2aa5946990e6de758867ecc2a7c21ebfb6f7497d33e1ea2
 MISC metadata.xml 594 BLAKE2B 3e4f800e489a388987f8942f433fad19e378644cb2aecd66d7eacbca167fa12597967bc4bef21260d266aa5553c1b103cc4df8167fbba8655a346e25100e66a6 SHA512 2f3ee7d525fff3d6ca2793d96555dcfba34df5b15cd2879e640aa51b5ccd34e2f466c2a5cceab90050af8c3d668c2d57fd88c136d830343da7313c8eaea247c9
diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild b/media-gfx/nomacs/nomacs-3.16.224.ebuild
index 3d0a8e506dd9..694ae3a802b6 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -13,7 +13,7 @@ plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw +tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index e52356efcced..fb2866fd4057 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,4 +1,4 @@
 AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893
 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
-EBUILD opencsg-1.4.2-r1.ebuild 1238 BLAKE2B 0c451658a04a295cf0b0df32eec191cce16510103e5d2fa8e17f1ac25bde88c9223b9911f414bbeddcaa2aff9eae59821260d4dd6b780d27b9bcfd20e6ed6a05 SHA512 d27521a4dff5fdb784b4c19b5969b5072a013256e5d4efeb22183312fb7ed99170a5732cd3885907139501e309707f2a6ac42f7a3bfd51701ecbf0542b1a58f4
+EBUILD opencsg-1.4.2-r1.ebuild 1245 BLAKE2B 29b8ca3a2f400d4ac9296acda2fe7aa25ec9d2de8a3d9efb798279aa6da4c623c2f151e385a035fc84a7596a81c665b84df9427758337a913be8cbbd15b6b570 SHA512 f2a0114ff5f19beab0941af6b67895b8a94372637fe7256f79577980aafec1792d79c3c1529c0bae9050a059a1e5e606e61d47102da3543b18719eb21281a0b2
 MISC metadata.xml 1289 BLAKE2B 7b2ca0df1bdec35319472bdc3b5e9e71412406d6c5bedfa4ceda553ab207e0b8c6027d7c2f4fad9b13c3d850aa976fa94c84b336e69b750f8fb71b0967ec50c6 SHA512 df8a5dc7d1a83728d9bba2be8cc843060c4cc34ff4d3c7e04b1aebd5a05b6c93d844a3e6442620a31760f7763946a1aaeda2cc1e5dc5b6902537425748be58e5
diff --git a/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild b/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
index 29b05428f629..7471f56363b9 100644
--- a/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
+++ b/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.opencsg.org/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 1f221e2d4b78..5b3782bedd2b 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -5,6 +5,6 @@ AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f320
 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-2019.05-r2.ebuild 1589 BLAKE2B e5537b0658a553fb95b55aa972f16e2eead4540f2e50d1cb04c094adc8aed115d092fd525e6cdbdadaa8bc54fc9f77953927a13650e2e8971614c74efd1122a0 SHA512 e6303ba15e877affd22a03d848f7b08e80d61ac9580993c01c0a3c39d51b3d4319b51067a178c9cd48dcd657f9397005794d2d820662b06f97c34e09899883d5
-EBUILD openscad-2019.05-r3.ebuild 2061 BLAKE2B 8f0bd7a761adb86a9b627030f2f00a8ebfcf763b4d0a8a7b716db6394ef242d2b8e719faa31e123cc5229a66a92e208d5bee0ffb32c29ec7f03b467ac1508141 SHA512 2085a1a5cdd1617e5e97fe3ac917c4e19745fa1320f03d0c557c2e57337fca6074428c758dfe22bf825fcd384c7a0397561784d5c203b0d805bb9b03fbadf4e0
+EBUILD openscad-2019.05-r3.ebuild 2068 BLAKE2B c9d48ee8d7dbfca6cee6fb4c0d762b75389bc27b60d07ffeb5fc4ecc0097cd9a7f9a2fba3e3af8825301ba79edb5bdb26e4ee6d1d6adcef96f24a1d8275467dd SHA512 3afa92ce2fa1b3a80e8e7979a1ecb6e6c2e47584ab3231b7d76f9a04395b8964f81d991932ac1eb24dd84032e2551416bf39f2bbf1b07a226ef1dcdeb2efd7ae
 EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
 MISC metadata.xml 1123 BLAKE2B d182b2b81115ec212b553802174d5305dd37af439aaafb25dd05368b1431b960cb4e35e65bec0519438e9c1ed767124fc686e293d07e5d44807bbf4ca8d74ea2 SHA512 10fda921c2d18d8e3a12d986cd2de9eebf47d9d2f843381b4ea2874d2483a42b84c6aa6c216ceb4c1ecf4183bbc8d43d7202bafbfcddc15de1bcd6b0f297f29c
diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
index 73d706525135..359b6566b45c 100644
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="ccache emacs"
 RESTRICT="test"
 
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 085e02467055..014921a2892a 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -13,9 +13,9 @@ DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf
 DIST openvdb-6.2.1.tar.gz 1935325 BLAKE2B 24ca340e513d2f22521994fbb2315a1c3f817bb35a7402ca481b12444e5ced58dfd773cc07b47a56d1ed9f6951e58cf1ef0b5c35917620b031383faed21c6557 SHA512 f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
-EBUILD openvdb-4.0.2-r3.ebuild 2586 BLAKE2B 66ca91b3b90af64436d73dc7447be12ebe705c507a3232a1b41fd883c26eae08751af189e35c9ab423cb3bdfe9fd3a8321adaac9df8da58bdcb4f6aaf0926e80 SHA512 d77f6ad528a3a660fe5553c8b3d545747bd6a6634538ec1b1ceb72025d7da658cc69fa023648ab6781d38da0a9dc80ae606595e4c4bf39aaadf22f71b5c6b9de
-EBUILD openvdb-5.2.0-r1.ebuild 2384 BLAKE2B 878871d565a68418dcf684cdd2464e9bb2c7278f3d1e9b5bc3d543415cd4e00cff63f237eacf2a58af57f287bd7dd70be098a95cb1d84525ab00f662a44ab6b6 SHA512 1b129380efaa23f33fd72fee32e4454b2872afe0bf17794d79bbfd6d58ba082b767a5cba133aa8cb2e2a1b22347318279b1ab17d01f696c39e3ef68ceddca460
-EBUILD openvdb-6.2.1.ebuild 2260 BLAKE2B 5ed0e241c5d038a3c9a013f3d0b55536c06f7c407bb92d0370d84b0d95a16b4c5de168d82719f91db25a789ba9c4fb434378a12d58fa9c25b753f40d794b3d1a SHA512 9eebb465a14d9f1d6b308829cdb0bc4232dcd71df56efc346659d6074e6eac886fef2dbc5cea451c61e546cd0a9c90ea41ba6a1320a29a156a0dcb429c471105
-EBUILD openvdb-7.0.0.ebuild 2762 BLAKE2B be75e5b95da7de9ea2ef4d0db8da198ed586b82fd15aa55e777b7f8b373f7227e526c6caafab4c9d9b8ab0ffe9042198d1f18f489e179e3acd55583b514a4a71 SHA512 2d3dc65ee06f4c2493c3ecfdca53c134c82f580506ea2c0249ee66382cd6909be5cdf8f44cd737a5eb42ad01dee5e036186074c76bf409ab546eb7828247a388
-EBUILD openvdb-7.1.0.ebuild 2684 BLAKE2B cdaf61392caa2ffbfd47c0b731fac60db860710bb9e8916efb3a50476672259626fb90299b995776cccc4a072b13b8ef52b553ddde52d44289ec692cebbdefeb SHA512 c9e371eedcbbd4366d13ca045c8c35c4ff351e325174949a884333a23b8828bb01e8a1333e92cbe8fc95fb4bab404de690a0d20ecc43d9b69e91f6c881d2a6f7
+EBUILD openvdb-4.0.2-r4.ebuild 2621 BLAKE2B bbaafee76eeea4aab92cb434043d069de3b962db271612a882055a9a26369f1f509b220f8ec8eaa3920c9ae42be81e78075516abff2a87eb58cc6f0fab7fb9f2 SHA512 5bbb892bf40e96239efdec47bf256f92bc2a3ef3f3c53c37a928f9fd798c129ecc764bc466d90953670e6ba398bd3fce7ea32ab8a87d68c2112e0b051033bf76
+EBUILD openvdb-5.2.0-r2.ebuild 2419 BLAKE2B 13838290e15d9cfa3f592dcc840fb08d4ee29a03362a23c5dd4df44af4c1c61e3b512485bfd1ba4487dda38edb58171d1457dd24c4c081c69d2b0afa0050e416 SHA512 0fe29028f37bb9a62cfebba9e4048dbd72b54d368d66ff055bbf6f722f2abc06dc115c33bc613cd5c6776d061f9904513c5fa989c9436b55ef7d884d823d378c
+EBUILD openvdb-6.2.1-r1.ebuild 2295 BLAKE2B d80285cba57899fbe0813eaecffcc0eae412bff68001067e35573389497c4117e8378396675fd94e7ac4d0b79119769a07d2cdcdf97fa252981fbed27da0584a SHA512 3c561ff41a27aa0f843afbb6d2031ecef94927e8f6be6f9c2b3a03eea467fbfb62dba25f6fbed65c34bc4b5605f916a8dc24d6414804bbecdd47a510f3e1ad99
+EBUILD openvdb-7.0.0-r1.ebuild 2797 BLAKE2B 42e37529f3381d64850ad32fb885ce8e74fe1a68204d513cd488310dd795330c8155257f580a03c8aeef6a6cd921108e8de6f132dfceb87299b152f5d1b20496 SHA512 7f783e6c4c3a79ca161379773a64a6d79238d265766a1bd0272acb8073c001c2a0bde8631e32e6ec675a7d7fe2c1664d16b8af06488131f938644a246fb89d73
+EBUILD openvdb-7.1.0-r1.ebuild 2719 BLAKE2B 90aca1fa48f509cb569224b0c5bd4da12d9eda40070fa6043eb3d0da75e03e2776dd9c4b7cecfe7a6b42cf848ae9bf9a02c64f4a1f9e0b1f1c11aa7eebeb670a SHA512 4db58bb80bf5468f31e7c0316ad61ad9b331ecdf8a03423e3803b0282dfe305672ce48235ebd20b9806f329f076950c5da50519b3821be91603d2d23ba1584c7
 MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
index f6705df69633..ab2d24826d97 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
@@ -24,11 +24,14 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	dev-cpp/tbb
 	dev-libs/boost:=
 	dev-libs/c-blosc:=
 	dev-libs/jemalloc:=
 	dev-libs/log4cplus:=
 	media-libs/glfw
+	media-libs/glu
+	media-libs/ilmbase:=
 	media-libs/openexr:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
@@ -44,10 +47,7 @@ RDEPEND="
 	)
 "
 
-DEPEND="
-	${RDEPEND}
-	dev-cpp/tbb
-"
+DEPEND="${RDEPEND}"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
index a176389a2a05..e7e00d1db240 100644
--- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
@@ -22,11 +22,14 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	dev-cpp/tbb
 	dev-libs/boost:=
 	dev-libs/c-blosc:=
 	dev-libs/jemalloc:=
 	dev-libs/log4cplus:=
 	media-libs/glfw
+	media-libs/glu
+	media-libs/ilmbase:=
 	media-libs/openexr:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
@@ -42,10 +45,7 @@ RDEPEND="
 	)
 "
 
-DEPEND="
-	${RDEPEND}
-	dev-cpp/tbb
-"
+DEPEND="${RDEPEND}"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/media-gfx/openvdb/openvdb-6.2.1.ebuild b/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
index ebade646417c..43345499ba5d 100644
--- a/media-gfx/openvdb/openvdb-6.2.1.ebuild
+++ b/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
@@ -23,11 +23,14 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	dev-cpp/tbb
 	dev-libs/boost:=
 	dev-libs/c-blosc:=
 	dev-libs/jemalloc:=
 	dev-libs/log4cplus:=
 	media-libs/glfw
+	media-libs/glu
+	media-libs/ilmbase:=
 	media-libs/openexr:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
@@ -42,10 +45,7 @@ RDEPEND="
 		')
 	)"
 
-DEPEND="
-	${RDEPEND}
-	dev-cpp/tbb
-"
+DEPEND="${RDEPEND}"
 
 BDEPEND="
 	>=dev-util/cmake-3.16.2-r1
diff --git a/media-gfx/openvdb/openvdb-7.0.0.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
index db984b8cdbfb..2e79cc7f27c1 100644
--- a/media-gfx/openvdb/openvdb-7.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
@@ -24,11 +24,14 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	dev-cpp/tbb
 	dev-libs/boost:=
 	dev-libs/c-blosc:=
 	dev-libs/jemalloc:=
 	dev-libs/log4cplus:=
 	media-libs/glfw
+	media-libs/glu
+	media-libs/ilmbase:=
 	media-libs/openexr:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
@@ -44,10 +47,7 @@ RDEPEND="
 	)
 "
 
-DEPEND="
-	${RDEPEND}
-	dev-cpp/tbb
-"
+DEPEND="${RDEPEND}"
 
 BDEPEND="
 	>=dev-util/cmake-3.16.2-r1
diff --git a/media-gfx/openvdb/openvdb-7.1.0.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
index 912824ece66d..4ad1b89c2ce6 100644
--- a/media-gfx/openvdb/openvdb-7.1.0.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
@@ -24,11 +24,14 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	dev-cpp/tbb
 	dev-libs/boost:=
 	dev-libs/c-blosc:=
 	dev-libs/jemalloc:=
 	dev-libs/log4cplus:=
 	media-libs/glfw
+	media-libs/glu
+	media-libs/ilmbase:=
 	media-libs/openexr:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
@@ -44,10 +47,7 @@ RDEPEND="
 	)
 "
 
-DEPEND="
-	${RDEPEND}
-	dev-cpp/tbb
-"
+DEPEND="${RDEPEND}"
 
 BDEPEND="
 	>=dev-util/cmake-3.16.2-r1
diff --git a/media-gfx/printrun/Manifest b/media-gfx/printrun/Manifest
deleted file mode 100644
index 171487b2a591..000000000000
--- a/media-gfx/printrun/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX printrun-x11.patch 1075 BLAKE2B 171019c49324dbf8618152abdd409b2e8105f8f9d3d9435a1fa7d08a4f65c2551138f8068f65d0a9a518bcedef4ab9a8df366079d034d9ff0fca842383c3d071 SHA512 8e3924fe0b77e361bedc52cc91a827abb0f72c45df42d243e3762e0759b59715cf0687b4ea1991a8567b5bdcb5e12f3c3b218d1cec2dfc434f81a1c479689203
-DIST printrun-20150310.tar.gz 906153 BLAKE2B 60671cab6661deb4f4d127f276b4ce545df161023e57e6ef8ca857c0fd8a41ccdfc1f1811fe854dc156fa8b328b4e3d12038f07bb43aa1b20f03ed612c15aaa4 SHA512 359a4a6128b274a6709fb5c35a2d6c510bb57e010cfb12ddefa39cdb371f2141e2cab394be7d9d2f1dbc0175cc24deba61941d73b6c19fb299083afbf1141f1e
-DIST printrun-gtk3.tar.xz 3824 BLAKE2B cc45bcc7f7ddc8a961e86b83d731a9860285206d06f3a2b2bf70327b88d1e496f6bda3756182d99d85ae237d20188959e0efa94002371c0ffaa3a185fbe32c4e SHA512 8eece239ac40fe293709117b42111a5bc31e95edd0cbdfc52ae38c5d91dded777a365fdd52d996c159fe83ecbd9fb6b3318a7622eb524db316771756a684cc9e
-EBUILD printrun-20150310-r4.ebuild 1048 BLAKE2B 7faa81a1dda46d6dc9a05a3a67a0b212b297577db164d0743674fe6e3b557b893b7b3b2a44490deb657bfb8d74b2850d6152bdfb1e8ec53aba6648ad25794784 SHA512 fa9a7af2dd583ff8ea4db48c9e9ca30a31707397ffe4ce9547dd7b9da9c96b0120f866f15e61c52d4778f6689afe8753a4c7c82d7dde3d88b7464aedabc7b870
-EBUILD printrun-99999999.ebuild 989 BLAKE2B e775307b94b2100d8813f04fe481da9bdb18257996e3733a03e0246e04ea0bc262a69b4b9c1d17e70e0fb7c85c6ce06f62a5aa1de90743c162675c6fe4f7b9f8 SHA512 d2d683d96415060be7be4b7d9c4f7ac27562dd4b1221414ff9611e07bf368c49ce2c6f2511138292bd8da839240265d0124344438ca6c4592257219462141bc2
-MISC metadata.xml 733 BLAKE2B 974af1352e4ea808c0160859b515c005fca1c18f1324f248eae861570f37a55aa38c85425e6dc0e754a1d82bb86a3d891f3fc8fd4c9452cc0850f0bfdacf1ce2 SHA512 93eb29b57b903a06fddc055e0699782265dc7e1603872954ac6581fae061089f0368d7b46c6c37811bbc197ce2edf8395090e1ada742920eec0e20c5be6176f8
diff --git a/media-gfx/printrun/files/printrun-x11.patch b/media-gfx/printrun/files/printrun-x11.patch
deleted file mode 100644
index dd9597a126e1..000000000000
--- a/media-gfx/printrun/files/printrun-x11.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/plater.py b/plater.py
-index 469eeb2..bfcc975 100755
---- a/plater.py
-+++ b/plater.py
-@@ -15,12 +15,14 @@
- # You should have received a copy of the GNU General Public License
- # along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
- 
-+import os
- import sys
- import wx
- 
- from printrun.stlplater import StlPlater
- 
- if __name__ == '__main__':
-+    os.environ['GDK_BACKEND'] = 'x11'
-     app = wx.App(False)
-     main = StlPlater(filenames = sys.argv[1:])
-     main.Show()
-diff --git a/pronterface.py b/pronterface.py
-index dbe295a..4152288 100755
---- a/pronterface.py
-+++ b/pronterface.py
-@@ -15,6 +15,7 @@
- # You should have received a copy of the GNU General Public License
- # along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
- 
-+import os
- import sys
- 
- try:
-@@ -32,6 +33,7 @@ not yet available for python3. You should try running with python2 instead.""")
- from printrun.pronterface import PronterApp
- 
- if __name__ == '__main__':
-+    os.environ['GDK_BACKEND'] = 'x11'
-     app = PronterApp(False)
-     try:
-         app.MainLoop()
diff --git a/media-gfx/printrun/metadata.xml b/media-gfx/printrun/metadata.xml
deleted file mode 100644
index e071fa596fc7..000000000000
--- a/media-gfx/printrun/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>amynka@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D print</name>
-	</maintainer>
-	<longdescription lang="en">
-		Printrun is a set of G-code sending applications for RepRap.
-		It consists of printcore (dumb G-code sender), pronsole (featured command line
-		G-code sender), pronterface (featured G-code sender with graphical user
-		interface), and a small collection of helpful scripts.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">kliment/Printrun</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/printrun/printrun-20150310-r4.ebuild b/media-gfx/printrun/printrun-20150310-r4.ebuild
deleted file mode 100644
index 0cf2154043a0..000000000000
--- a/media-gfx/printrun/printrun-20150310-r4.ebuild
+++ /dev/null
@@ -1,43 +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 distutils-r1
-
-DESCRIPTION="GUI interface for 3D printing on RepRap and other printers"
-HOMEPAGE="https://github.com/kliment/Printrun"
-SRC_URI="https://github.com/kliment/Printrun/archive/${P}.tar.gz
-	 https://dev.gentoo.org/~amynka/snap/${PN}-gtk3.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-text/psutils
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/wxpython:*[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Printrun-${P}"
-
-PATCHES=(
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1231518
-	"${WORKDIR}/${PN}-gtk3.patch"
-
-	# https://github.com/kliment/Printrun/pull/790
-	"${FILESDIR}/${PN}-x11.patch"
-)
diff --git a/media-gfx/printrun/printrun-99999999.ebuild b/media-gfx/printrun/printrun-99999999.ebuild
deleted file mode 100644
index 4491857f4d6a..000000000000
--- a/media-gfx/printrun/printrun-99999999.ebuild
+++ /dev/null
@@ -1,43 +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 distutils-r1 git-r3
-
-DESCRIPTION="GUI interface for 3D printing on RepRap and other printers"
-HOMEPAGE="https://github.com/kliment/Printrun"
-SRC_URI="https://dev.gentoo.org/~amynka/snap/${PN}-gtk3.tar.xz"
-EGIT_REPO_URI="https://github.com/kliment/Printrun.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	app-text/psutils
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/wxpython:*[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1231518
-	"${WORKDIR}/${PN}-gtk3.patch"
-)
-
-src_unpack() {
-	default_src_unpack
-	git-r3_src_unpack
-}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 7c38c1f8ce6e..0f54bc43f0c1 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,5 @@
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
+DIST qrencode-4.1.0.tar.bz2 449040 BLAKE2B cff4e950a436e2bb3a73543ce11639861426840db6861eefd3d641dcb14cd6b4be7c2045468a002f7599a89aa71c77f7dfc971dd726ecce0d524f9b792ea6e91 SHA512 50ccc65f748cc1007dccd8d0eee0063b870c3e8a5fe5b8b2a813881151a86748a36844bcfa6ab08c82674b80e9b5bcbfd564ade92562cc49e01cbfa45376b4a9
 EBUILD qrencode-4.0.2.ebuild 791 BLAKE2B 59ae47be368e05d95bcc77a0a18165b5d1c961aa181aea6c3c1882c3d6969a99cce6d6e31272a45bbeb478e85d3f732e21d5b9fb7f91e87306fc0d94b3feb15b SHA512 7698b6d3d99e70e37abb1a43bfd643019b411343a578bed7e1905e19db40263158710968e3e9833da20f45412dbce0fcb5f4b3d4c9b1179ce9b20b4356699fee
+EBUILD qrencode-4.1.0.ebuild 799 BLAKE2B 162c9977a8fc2ede9aea8fdca4caeb5a031150b9a6aab825ad48882bc103a4f3c39fee4db434421d3597462deece7260eaad21b461714608f15f7d6df58478c6 SHA512 22404cdc9ba4492f0351cd6fe5788c28fe0f49c6c44df0b7ee526cf3ff686489eda8905d1cac4ccf85c742593fc7e6eb246cac5c0f99af1646567b91bc23bfe7
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.1.0.ebuild b/media-gfx/qrencode/qrencode-4.1.0.ebuild
new file mode 100644
index 000000000000..0c26d1d08ecf
--- /dev/null
+++ b/media-gfx/qrencode/qrencode-4.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="C library for encoding data in a QR Code symbol"
+HOMEPAGE="https://fukuchi.org/works/qrencode/"
+SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_with test tests)
+		# TODO: figure out how to make SDL check fail as the SDL test
+		# program is not useful
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	cd tests || die
+	./test_basic.sh || die
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 6e315505bbbb..601c5c632674 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -15,5 +15,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
 EBUILD sane-backends-1.0.27-r3.ebuild 8101 BLAKE2B e6ff1e73fad9d33c8b9d4a475de311b5ddf60a66fe2604f6c8573bfd593688292a84ac554dc06d0c9d1181f443f31e0e9fc6e6e520a0e76fe62f373129f92388 SHA512 1434b237b354d84eecfab48624805dcbd8dcaaf42e5315ca25c980942551a2cb0cae39453907982d96ffe2a4042def9eb7d44b9ad768750aa35d65a18057c06c
-EBUILD sane-backends-1.0.30-r2.ebuild 8226 BLAKE2B ffc58ff6ba7064d1c75578136824af3701bb10d4fd717c98c77d5c74442e235ac90d3d0e851da2ca2c3a8d4dcb27f8e4e9b79629f8d815adab3ebf50b9653155 SHA512 0b0ce0411abace6eeb61be6d497dfbc54c07400300f5bde8a6e0c0e2f8cccdb26abd45f9dc0e1590ff996854d77071dc9720da528eaa99377dbf53d5a14891e6
+EBUILD sane-backends-1.0.30-r2.ebuild 8225 BLAKE2B 7f24aae8530d41ceb9890e2c1c1d34b1250303dc8b47f2e5f68d329d4782ba8c667ec04e32c743528b50034a58c94a05a725db01c94964bae33205c2464952a3 SHA512 86fa4ae0347a8c2dac06a34e0f26b81e582d201e3556e57c18e01388dd3697b62bb22d24cb445344f7752fa2fb8b358a2ba9a3b64002f66dbb5220d28be46349
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index adeb389d709b..2b959ff201cd 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index b0997b66a18e..649d8e0f9df2 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 DIST shotwell-0.30.10.tar.xz 6465992 BLAKE2B d6be2a2b34cf4adbae4ac1f2bce5a29bfe059c546b8ab76f35b3ac9159a9233f231ee1ac4b3f81e8016278fcdec6b222af3ba7a62b2eb8d15dd82ef2cfb544c1 SHA512 4c84b5702476f264bd475fa93eff2e58f2876b076f186fc19b3dbddaae76b80485793b887f668788ac3c7f7230eb0c6a61fef2c0c70d52c665d0e49f6deb0b11
 DIST shotwell-0.30.9.tar.xz 6465508 BLAKE2B 9b302d156b350d5cfa961afaa5d75e71db8b34a65a27de0d3b298841ca9be96d502dc98c85c681ca336965fce72db8034609f3f9c6c04fea1127db6c397e6499 SHA512 a232d717356d7e9f0a6b1ad825f4182dd9f6ee4cca9745717e3bd18ded03cdaba94c32256d055389ce2b0cda0c5828b25d1448c10598a474dc3ea0817fc303ee
-EBUILD shotwell-0.30.10.ebuild 1770 BLAKE2B e350fb9b6f1dc16162124ad047b954c0be8433d16e2d36031145ed649bc8e5b45168f3ab00396d5d8bc3c71b5cd6f32d931b45938159975095b32cb9237d8a69 SHA512 cb8918d88b5649661610cdaa269239bbd6f9a03dcc4c9d5d2d62f3a516ad89424f2fd020de7e55d2cd9afc0e2d0c42263131eb32bdd5058662259b50bf33fbe8
+EBUILD shotwell-0.30.10.ebuild 1768 BLAKE2B 0330351fb22d25299ffeffbfd1d202d2fad725619157fe0ebfae5859f5a6ddcb5fea9c845d7c41d990d8f1205dbf36c99600a1f707a2ac1c202a38de3742ab01 SHA512 46dac08f76651649c187833065dd1ce7829f42f4ddb84e829bacaa25eb7ab5d9f22397f392ca1e60e796940490b396e461c93c08e1289f1085725d842643f29e
 EBUILD shotwell-0.30.9.ebuild 1768 BLAKE2B 0330351fb22d25299ffeffbfd1d202d2fad725619157fe0ebfae5859f5a6ddcb5fea9c845d7c41d990d8f1205dbf36c99600a1f707a2ac1c202a38de3742ab01 SHA512 46dac08f76651649c187833065dd1ce7829f42f4ddb84e829bacaa25eb7ab5d9f22397f392ca1e60e796940490b396e461c93c08e1289f1085725d842643f29e
 MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.10.ebuild b/media-gfx/shotwell/shotwell-0.30.10.ebuild
index 906964fd3761..37d81390d3f9 100644
--- a/media-gfx/shotwell/shotwell-0.30.10.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.10.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index fae161eb5383..a53fadd2d56a 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -2,5 +2,5 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defe
 DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c
 DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
 EBUILD simple-scan-3.34.6.ebuild 1327 BLAKE2B 9fc4b9c2f9d3536f3bd43c6902576f8241555a98ce6a0789572ec3169f783053e5a30462021221a324547ff5e8e19d51fd0bfe63c31875173b5e612fb3c7d192 SHA512 99364ee3c39e21e47bdb790780f48c74b2132a9f2c658f7a6dd87a2c634981372c0499e72b4f6aee28b90d3ffe2901b3381e8252d6d86413ddeb3079be9b0ee7
-EBUILD simple-scan-3.36.4.ebuild 1329 BLAKE2B 21944ee06e8464b55a1ff8240f6e0c8816fb736093614b698ba7a964e013214aec8c3c010867dc7c3d5ac6688d8a21cb2d0a457dcbfd033d0e41bc203551d908 SHA512 accbc4335878c4c83b2e9dd98821fd5594683456750f3f169d38c261f6c4410f9b09856cd2c78d84df50787f1aa70446704f5ef567a145a252569b2d7af19362
+EBUILD simple-scan-3.36.4.ebuild 1327 BLAKE2B 9fc4b9c2f9d3536f3bd43c6902576f8241555a98ce6a0789572ec3169f783053e5a30462021221a324547ff5e8e19d51fd0bfe63c31875173b5e612fb3c7d192 SHA512 99364ee3c39e21e47bdb790780f48c74b2132a9f2c658f7a6dd87a2c634981372c0499e72b4f6aee28b90d3ffe2901b3381e8252d6d86413ddeb3079be9b0ee7
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild b/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
index a7a3d720bbeb..a519c8b9e1ba 100644
--- a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index 7bee840cb080..b1fb3903302f 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,5 +1,7 @@
 DIST waifu2x-ncnn-vulkan-20200224.tar.gz 34063828 BLAKE2B 9fa00abd31f0d81dd785be5253e44f5bd4082ae9b2fcae747562eb6c577fd7cccdfeaf7421d09c54119fd36285dffcc68d2889ddc06d1a6ddf47ea418066367e SHA512 13531a186817da99efb60fc0b16d0d3f455d0f2d2c9b4b53ddaedf7c50f622b2e5385e4f5dd29668cf845444b39645f0b7e810ab5084aa1e3ca6dbaf424a4e13
 DIST waifu2x-ncnn-vulkan-20200414.tar.gz 34063752 BLAKE2B eb52cc3cf857bdb428497acf8721d51abd6e067b4ae2f126833dfcf8402eae118cfa112b310b366e3e945b871b8c3306e5d826426c43e66b6e1055729644f222 SHA512 c0c5d40fdbf0b643b589d5bca5460ec59fbf38ede33af510c4b30b3211f18cd44d665980a11c13ee922cacf7a05d89b076078bcb8fa59c0523ad6b985a804d97
+DIST waifu2x-ncnn-vulkan-20200818.tar.gz 34073325 BLAKE2B 125c0b975e6aab20fc20563c1edc669a4741779366f9aff20d0f695f56f29d0e1728c1fd1130cdaf4adb6a2c8dad348e262580702519004581b2055ae38ac315 SHA512 6f40885fd91cde3206198da3bf2103d1867a8f35549340cc697819dea2b3e06932203a95a7fda2c636658b40fdc1d3f0f4c4e3e13ba142f9a8ad8475ff1b8f58
 EBUILD waifu2x-ncnn-vulkan-20200224.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
 EBUILD waifu2x-ncnn-vulkan-20200414.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
+EBUILD waifu2x-ncnn-vulkan-20200818.ebuild 1046 BLAKE2B 503c4c9a540a48bc54c9ca3b791377bb48c92730f8fb8678aade074bfcabfff2d4e952bf3471cff9379611488d31e30007a54c34d2efcfc78bee09508ed5fb33 SHA512 e7fb66910a10a1fe529bb5a251693fd2aa66b0ad4ed534da1e9665f5b2d4a31456ec0a60bf9997446090e48ffd120130a8ec7aee91f2153a5c89790fc51db8ee
 MISC metadata.xml 342 BLAKE2B 718aec175f149d204eb6afabb3a2a59e47366538f16d346a1baeeae03afdfb68bd4c5c39d642af862400f0736644141eb156b43014f4125df61a0b9979bdb83d SHA512 a9b596ab9b9e2bd6052bbb11d7b19e2b6a4fbf69935345498cf5f5fa4934731bfccaf3e3391da0260e6f165198f71545ae8f86b1b01b8507fb9b003cd7e56809
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild
new file mode 100644
index 000000000000..028da39f4e2d
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="waifu2x converter using ncnn and vulkan"
+HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan"
+
+SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/ncnn-20200727
+	media-libs/vulkan-loader
+	media-libs/libwebp
+	dev-util/glslang"
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+CMAKE_USE_DIR="${S}/src"
+
+src_prepare() {
+	# Make finding models actually possible.
+	sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DUSE_SYSTEM_NCNN=ON"
+		"-DUSE_SYSTEM_WEBP=ON"
+		"-DGLSLANG_TARGET_DIR=${EPREFIX}/usr/$(get_libdir)/cmake"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
+
+	insinto "/usr/share/${PN}"
+	doins -r models/*
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
commit	b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree	9026dffec53f92cba48ca9a500a4f778e6304380 /media-gfx
parent	3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)