gentoo resync : 17.02.2021

53 files changed, 1557 insertions, 694 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 40f3eefec4e5..904a3c0c62db 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index b77a76a93e47..fe04006e9428 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,3 +1,5 @@
 DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
+DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
 EBUILD chafa-1.4.1.ebuild 866 BLAKE2B 24e4c50c2a29e9f3d5451f7b4ec9f4cc176dec6a2b5d4636e8de26e72f514b358957f78946ba0cd9cd9bde26d3c73c6677cac957d8db82733c45ba51e34c7165 SHA512 179ac5f28de859623651bfc30539d2242c2aeb949fd6398dd809a65ca7d4df80430dc1af7d2004f1a8852231d4666da29ed2ea3b404a9e43eb87a3055fd359a3
+EBUILD chafa-1.6.0.ebuild 767 BLAKE2B eb2c4aa4a41b02c12696ef877208c45c338e3b4c9076cb0dade84e0a04cab6c1f1bbabd67d825e546b911ffc657ccd1794144012abb3ab74871a7276804e8c2f SHA512 57b78dbd02a6b49a757cff05e869f8526b07412a837e6056a86b35cb99ec2084ca5711126d9b970ee83c5c04e99403de5c21bcf1eeb17a915318dd87397a95e6
 MISC metadata.xml 516 BLAKE2B ef0a2e140a6d37d3ace556ac5a6d299caa1fae8e37d93fe8aa43104a2f02d14fd4b5ed1bd218b2298616bcbc3c571868cc7e04d0a5f3ac2b091fa5588d833cbb SHA512 57bebde0a948ed0269c4decdf2b6ac8064f90dde344c547a67cbb40191eb3fb444b147ed8122ad79ba1acb487fc93ca1fb33afb5df80a41c7128e314ac4640ac
diff --git a/media-gfx/chafa/chafa-1.6.0.ebuild b/media-gfx/chafa/chafa-1.6.0.ebuild
new file mode 100644
index 000000000000..2c7e6798a528
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+tools"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/imagemagick:0=
+	tools? ( >=media-libs/freetype-2.0.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-man \
+		$(use_with tools)
+}
+
+src_install() {
+	local DOCS=( AUTHORS NEWS README TODO )
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index ba942ab9cbd2..973f14825f4d 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,20 +1,16 @@
 AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c
 AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
-AUX darktable-3.0.2_jsonschema-automagic.patch 729 BLAKE2B fdf306a513cc78fbd2b377d55baa4631b0feb885312252a784b06477afb08f8b43b742b4acfb9da7cb52c20eecf997668ff17444020690671136e17573dc75e9 SHA512 7b2f17827ad099c476f3272d9ffc41dbd3d1e1bdea482beaddb4d654d3555677212ed50df1fd83f94e1274670baecd951878280e1a052f327fce47b12ad720e5
 AUX darktable-3.4.0-xmmintrin-sse-only.patch 748 BLAKE2B 4466070726d011e2522dd939a55e5d8671f927d0c0165e176b3732a8eac17401cfc7d681fa0b97a8ee0f4dd796da1f937a6cf7d4ee2bfb2d828d7a37b92c3570 SHA512 998804a761320db915f96a499136be8abcbf7e906d07f0ed7df62c07cd5ed277ed9bcf0b348660731ecb131feb3611f1435efc485ebcb3c13fcb48020c1d93fa
 AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-3.4.0.tar.xz 4444452 BLAKE2B 98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc SHA512 b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
-DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
-EBUILD darktable-3.2.1-r1.ebuild 4250 BLAKE2B 6b29ac0b75ea866c64f8ee57ace0c85d315537f1df46b705b357b477528917f732e927cb14ce6465d5787b19e113030f62fac68cc1f0d42f626108cbb4ecf4ce SHA512 6f86a3688b660a76af91dd5124540af6333df5625b304f33b4fc3b0d668ea127592bdaf5b6b705420fef905b7e16dc09a9d130f3d96f4938f5a2ad9421147ce0
-EBUILD darktable-3.4.0-r1.ebuild 4584 BLAKE2B a5a88c6d232a309f7b900f76d9736102a7863fed509db5534feef5e66b778195d2bd225ebaec4ab447971ea10a7996c08d727dcbfc3dcb0cac4a7e2f4f0b7da3 SHA512 b9bf993563d4ea36113ebaf911d5b49c55458a6e521b0bf479523d37652d372e290d44451cb30969bc916e30eef1375b64c2e0ad70ea69c8a7be926f56601de3
-EBUILD darktable-3.4.1.ebuild 4475 BLAKE2B 014357ed56681c237b4ed9dc2c2070613298c858a3d996fcf763db981411f6cf7ffdc84ac44fcf5cfa9070af991409e608e742357c476cf387502764c40291bd SHA512 c0e9dee7f87d2d9a6e44406573b7ea0f7ab6dab096adfc1ad6b8edaf55bd5897bde6df086dfa235cbaef0eeed3afbed4cd5170dfa762af8336af19bf20efdc12
-EBUILD darktable-9999.ebuild 4475 BLAKE2B 3afed84176b49c7604c36fc5605a75f7db9bbe0fbde3a438dc964010a184b70031565b4f20914315c934c9d8d1f4e24d2f12e05d8e20a7498a972bb83a2d1ec9 SHA512 5294cb5cf18fe9be1d6b43553ab46759925dbb904c0b0a5fca9349a9b860d6756cb834eb4aa493f0b831a49554387898d5107191f92f05d9f03f35989cae0dd6
-MISC metadata.xml 1296 BLAKE2B 41415c7a013551a7e5cec72b8df9304b446d273f80b1975dd5f15672ec128f20e1b6d94be67d2e8e049674e1f12fae0d85840bd9aced2b62b213fe519b85f80d SHA512 110b05e5c449e0e1bb9fc0228a4b762e2f2fee74215ba0b084d9f719481af682d2a70c8df04313eb89916051f2c3ba1e057321b839144ad70298faf90605acd7
+EBUILD darktable-3.4.0-r1.ebuild 4588 BLAKE2B adc2823c2cf2849c3c93e833817afd023da1ab0060f526651d9e5c5eff955ad3286fd828592fcb2bbf7356dce18ea27b1e0ff34f18027b90fb6aba3f00b0147b SHA512 960511d2f1df6bcd4affb5b02b89378c78277f645b1bfefb36278b22caa6b80b9e1d5f12fb2f2e4eff19756a9dc6d73f2401abc4d71ec6bd42fe485a5edf979b
+EBUILD darktable-3.4.1.ebuild 4480 BLAKE2B f90cf79f6fb5a37556eaeee5d1774d5235e784cde6919463c2f6486f77534cebd55d6901f74fff9f2af3377141d47cb8c7492b039e995caff015006335a11f6e SHA512 d12e9abf350d2bcf70204aac54f79046e24f67c80b9590e90ef01d360e51a29a5658d08730e3fde656aedbcca9bdeb43a987cb8507252ec45d677086518ca97c
+EBUILD darktable-9999.ebuild 4480 BLAKE2B 6d3d2e59331dfe3d44afeccf8616f0f14bf63a8b7a9f8c203416fe6fa907047b059cb09081e26ac216bcd98957c4a9651579df48a4dc1dc79e073a884b421095 SHA512 3f2e5818e2af72ba8ee3c7e82ab947f7a6a36c666b7cbd994be8890e102cbe08247af01640d7f437a67b1a58b955fddf48084375651ad2c48743cd58088eae39
+MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8
diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
deleted file mode 100644
index 05d2a6634f26..000000000000
--- a/media-gfx/darktable/darktable-3.2.1-r1.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
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single 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"
-LANGS=" de es fr he it pl pt-BR ru sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua nls opencl openmp openexr system-lua tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
-
-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= )
-	system-lua? ( ${LUA_DEPS} )
-	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_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() {
-	# As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
-	# GMIC support mostly works but there are several problems with the media-gfx/gmic ebuilds currently
-	# in the tree, and the package itself has got no maintainer.
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=$(usex system-lua)
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DUSE_AVIF=no
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GMIC=no
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=$(usex lua)
-		-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.4.0-r1.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index 7f946caeaa10..36695e589e29 100644
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -25,7 +25,7 @@ else
 	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 )"
 
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64 -x86"
 	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 
diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild b/media-gfx/darktable/darktable-3.4.1.ebuild
index c66c363f4918..f5fe46fb2c52 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -25,7 +25,7 @@ else
 	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 )"
 
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 8405fd125512..e2dca8478be7 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -25,7 +25,7 @@ else
 	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 )"
 
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 
diff --git a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
deleted file mode 100644
index 1aa0aec5163f..000000000000
--- a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -319,15 +319,7 @@
-   message(STATUS "Test-compilation of OpenCL programs is disabled.")
- endif()
- 
--# we need jsonschema to check noiseprofiles.json
--find_program(jsonschema_BIN jsonschema)
--if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
--  message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed")
--  set(VALIDATE_JSON 0)
--else(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
--  message(STATUS "Found jsonschema")
--  set(VALIDATE_JSON 1)
--endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
-+set(VALIDATE_JSON 0)
- 
- # we need an xslt interpreter to generate preferences_gen.h and darktablerc
- find_program(Xsltproc_BIN xsltproc)
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index a46ea727d4c8..b05ca306c75a 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -17,11 +17,9 @@
 		<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="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
 		<flag name="tools">Install tools for generating base curves and noise profiles</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">darktable-org/darktable</remote-id>
-		<remote-id type="sourceforge">darktable</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
new file mode 100644
index 000000000000..ae5a6846c67f
--- /dev/null
+++ b/media-gfx/freecad/Manifest
@@ -0,0 +1,7 @@
+AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch 861 BLAKE2B 305d1e7110e72c0b7e1f4398283816ca8ca01e1fe8460fee9fc002401c5937414d11ee46f0875d0859e57c94b03a67ccb7b4bed1b4935b1032e6db41b9e64a85 SHA512 0eaa8b23a92237648e128304bcb84a227cfb081826266efad9b3afd8a63444a61930dfba465b2d1e205cb43fc616e0a63c1f8bbb1618a462d8a0cff04e764ea0
+AUX freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch 1054 BLAKE2B 8665cad381ba62a792d706acf8bec0d2801435249d9004be8df5a01e4de34c0a5dcd85722d77284fe57b2c341d2d4fcc5b70e3f2380c7de59adb323466498bf6 SHA512 efbd53039803d301a5f76984d6e23a43563d888511cd569cc1a656a7900cc4bd93f8bef6e658f7acb42894501ecf50b941ff4c08a89e5063524813300f503b50
+AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
+DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0 SHA512 457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34
+EBUILD freecad-0.19_pre20201231.ebuild 9028 BLAKE2B 0d1394446de1d57f8072c802ab552feca50f216e72cd2fce0c068bcaa4055ef12dd0a4492c4fb774c6169c684b2a5b42fb79bae4ad68ca251555c0635b25ba4c SHA512 0ff3a13ece5feddc1f4af871ec7c1817e8620d49551b9465e12771d3af719f17729dc3d7b563e7f93e7bd36cd2399ef1dd20c26e967c8f33eea36894daf8c173
+EBUILD freecad-9999.ebuild 9001 BLAKE2B f575d610bf27b8e77ef37f20b9500220d101e4badb0a7998895581efd6088b6587a1852ea231273d71f450cc44d113191add1c602958f69f79881bfb3d4773dd SHA512 037497da3425242b3094d4cd51e21a767260960a3781b642f5cb5735220a4b4758071403f8403107ea177c84bccd4d11b47800911b5358a25be8e62bb4400d15
+MISC metadata.xml 3801 BLAKE2B 45881fcae09c1c9c41c413915c6db4454f72067c798f05e1cfb6ee6342c01834b090c84f5eb350d4b1a7cee58fa06ba03398d45956f9869f45c044140c68b318 SHA512 f1c7100c60a3e82aab72c2dac17b1fbff50a50587db562a7032a62732c1412bf97544015986926d5b3abef0ab966d145001785b714051a887206c30d526470b2
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
new file mode 100644
index 000000000000..9f4131f15a3d
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
@@ -0,0 +1,26 @@
+From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Thu, 31 Dec 2020 13:26:44 +0100
+Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ cMake/FindCoin3DDoc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake
+index c6c92f2..1af53c2 100644
+--- a/cMake/FindCoin3DDoc.cmake
++++ b/cMake/FindCoin3DDoc.cmake
+@@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
+       # Unix systems

+       find_path(COIN3D_DOC_PATH index.html 

+                 /usr/share/doc/libcoin80-doc/html

+-                /usr/share/doc/coin/html

++                /usr/share/doc/coin-4.0.0/html

+                 /usr/share/doc/Coin/html

+       )

+       IF( EXISTS ${COIN3D_DOC_PATH})

+-- 
+2.30.0
+
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
new file mode 100644
index 000000000000..26bb4421077b
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
@@ -0,0 +1,33 @@
+From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Thu, 31 Dec 2020 13:31:47 +0100
+Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4dabf7..17b9fad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,9 +8,12 @@ if (POLICY CMP0072)
+     cmake_policy(SET CMP0072 OLD)
+ endif(POLICY CMP0072)
+ 
+-find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
+-if(CCACHE_PROGRAM)
+-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
++option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF)
++if(FREECAD_USE_CCACHE)
++    find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
++    if(CCACHE_PROGRAM)
++        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
++    endif()
+ endif()
+ 
+ project(FreeCAD)
+-- 
+2.30.0
+
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index 000000000000..ac8d194d00ea
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,26 @@
+From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 13 Feb 2021 14:54:28 +0100
+Subject: [PATCH] [Gentoo specific] don't check vcs
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/Tools/SubWCRev.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
+index 9795450..59938bd 100644
+--- a/src/Tools/SubWCRev.py
++++ b/src/Tools/SubWCRev.py
+@@ -455,7 +455,7 @@ def main():
+         if o in ("-b", "--bindir"):

+             bindir = a

+ 

+-    vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]

++    vcs=[UnknownControl()]

+     for i in vcs:

+         if i.extractInfo(srcdir, bindir):

+             # Open the template file and the version file

+-- 
+2.30.1
+
diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
new file mode 100644
index 000000000000..9d1447e685a1
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
+	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${COMMIT}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="ccache debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+	inspection material mesh openscad part-design path points
+	raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-cpp/eigen-3.3.1:3
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	>=media-libs/coin-4.0.0
+	media-libs/freetype
+	media-libs/qhull
+	sci-libs/flann[openmp]
+	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+	sci-libs/opencascade:=[vtk(+)]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
+		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
+		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig
+	ccache? ( dev-util/ccache )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# draft, import, part, qt5, sketcher, start, web.
+#
+# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	arch? ( mesh )
+	debug? ( mesh )
+	drawing? ( spreadsheet )
+	fem? ( mesh )
+	inspection? ( mesh points )
+	openscad? ( mesh )
+	path? ( mesh robot )
+	ship? ( image plot )
+	techdraw? ( spreadsheet drawing )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+	"${FILESDIR}"/${P}-0002-CMakeLists.txt-add-option-for-ccache.patch
+	"${FILESDIR}"/${P}-0003-Gentoo-specific-don-t-check-vcs.patch
+)
+
+DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+
+CHECKREQS_DISK_BUILD="7G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+src_prepare() {
+	# the upstream provided file doesn't find the coin doc tag file,
+	# but cmake ships a working one, so we use this.
+	rm "${S}/cMake/FindCoin3D.cmake" || die
+
+	# Fix OpenCASCADE lookup
+	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+		-i cMake/FindOpenCasCade.cmake || die
+
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=$(usex arch)
+		-DBUILD_ASSEMBLY=OFF
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
+		-DBUILD_DRAWING=$(usex drawing)
+		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=OFF
+		-DBUILD_FLAT_MESH=$(usex mesh)
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex !headless)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=$(usex mesh)
+		-DBUILD_MESH_PART=$(usex mesh)
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON							# basic workspace, enable it by default
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_QT5=ON							# OFF means to use Qt4
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=$(usex mesh)
+		-DBUILD_SPREADSHEET=$(usex spreadsheet)
+		-DBUILD_START=ON						# basic workspace, enable it by default
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_CCACHE=$(usex ccache)
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=$(usex mesh)
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			# sandbox needs mesh support
+			-DBUILD_SANDBOX=$(usex mesh)
+			-DBUILD_TEMPLATE=ON
+			-DBUILD_TEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+			-DBUILD_TEST=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use headless; then
+		dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
+	fi
+	dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use plot; then
+		einfo "Note: You are enabling the 'plot' USE flag."
+		einfo "This conflicts with the plot workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	if use ship; then
+		einfo "Note: You are enabling the 'ship' USE flag."
+		einfo "This conflicts with the ship workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature "interact with git repositories" dev-python/GitPython
+	optfeature "work with COLLADA documents" dev-python/pycollada
+	optfeature "dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature "FEM mesh generator" sci-libs/gmsh
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
new file mode 100644
index 000000000000..e2cb13d51fc2
--- /dev/null
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
+	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${COMMIT}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="ccache debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+	inspection material mesh openscad part-design path points
+	raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-cpp/eigen-3.3.1:3
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	>=media-libs/coin-4.0.0
+	media-libs/freetype
+	media-libs/qhull
+	sci-libs/flann[openmp]
+	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+	sci-libs/opencascade:=[vtk(+)]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
+		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
+		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig
+	ccache? ( dev-util/ccache )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# draft, import, part, qt5, sketcher, start, web.
+#
+# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	arch? ( mesh )
+	debug? ( mesh )
+	drawing? ( spreadsheet )
+	fem? ( mesh )
+	inspection? ( mesh points )
+	openscad? ( mesh )
+	path? ( mesh robot )
+	ship? ( image plot )
+	techdraw? ( spreadsheet drawing )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+)
+
+DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+
+CHECKREQS_DISK_BUILD="7G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+src_prepare() {
+	# the upstream provided file doesn't find the coin doc tag file,
+	# but cmake ships a working one, so we use this.
+	rm "${S}/cMake/FindCoin3D.cmake" || die
+
+	# Fix OpenCASCADE lookup
+	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+		-i cMake/FindOpenCasCade.cmake || die
+
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=$(usex arch)
+		-DBUILD_ASSEMBLY=OFF
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
+		-DBUILD_DRAWING=$(usex drawing)
+		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=OFF
+		-DBUILD_FLAT_MESH=$(usex mesh)
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex !headless)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=$(usex mesh)
+		-DBUILD_MESH_PART=$(usex mesh)
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON							# basic workspace, enable it by default
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_QT5=ON							# OFF means to use Qt4
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=$(usex mesh)
+		-DBUILD_SPREADSHEET=$(usex spreadsheet)
+		-DBUILD_START=ON						# basic workspace, enable it by default
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_CCACHE=$(usex ccache)
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=$(usex mesh)
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			# sandbox needs mesh support
+			-DBUILD_SANDBOX=$(usex mesh)
+			-DBUILD_TEMPLATE=ON
+			-DBUILD_TEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+			-DBUILD_TEST=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use headless; then
+		dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
+	fi
+	dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use plot; then
+		einfo "Note: You are enabling the 'plot' USE flag."
+		einfo "This conflicts with the plot workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	if use ship; then
+		einfo "Note: You are enabling the 'ship' USE flag."
+		einfo "This conflicts with the ship workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature "interact with git repositories" dev-python/GitPython
+	optfeature "work with COLLADA documents" dev-python/pycollada
+	optfeature "dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature "FEM mesh generator" sci-libs/gmsh
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
new file mode 100644
index 000000000000..599d1643a221
--- /dev/null
+++ b/media-gfx/freecad/metadata.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>waebbl-gentoo@posteo.net</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<description>Gentoo Proxy Maintainers</description>
+	</maintainer>
+	<use>
+		<flag name="addonmgr">
+			Build the addon manager module for automatic handling of 3rd 
+			party addons
+		</flag>
+		<flag name="arch">
+			Build the architecture workbench for working with architectural 
+			elements
+		</flag>
+		<flag name="ccache">
+			Use <pkg>dev-util/ccache</pkg> to build the package.
+		</flag>
+		<flag name="cloud">
+			Build the Cloud workbench, to access cloud providers (mostly
+			Amazon S3).
+		</flag>
+		<flag name="drawing">
+			Build the drawing module and workbench to display 3D work on a 
+			2D sheet
+		</flag>
+		<flag name="fem">
+			Build the FEM module and workbench which provides Finite Element 
+			Analysis (FEA) workflows
+		</flag>
+		<flag name="headless">
+			Build FreeCAD without a GUI, usable for server-side instances.
+			The Python modules are still available, without their GUI parts though.
+		</flag>
+		<flag name="idf">
+			Build the IDF module to provide file exchange capabilities with
+			IDF files
+		</flag>
+		<flag name="image">
+			Build the image module and workbench for working with bitmap
+			images
+		</flag>
+		<flag name="inspection">
+			Build the inspection workbench which gives you specific tools
+			for examination of shapes (experimental)
+		</flag>
+		<flag name="material">
+			Build the material module and workbench to work with materials
+		</flag>
+		<flag name="mesh">
+			Build the mesh module and workbench to work with triangulated 
+			meshes
+		</flag>
+		<flag name="openscad">
+			Build the OpenSCAD module for interoperability with OpenSCAD 
+			and repairing Constructive Solid Geometry (CSG) history
+		</flag>
+		<flag name="part-design">
+			Build the part design module and workbench for build part shapes
+			from sketches
+		</flag>
+		<flag name="path"><!-- FIXME: auto-enable through robot? -->
+			Build the path module and workbench to procude G-Code instructions 
+			for CNC
+		</flag>
+		<flag name="pcl">
+			Use external <pkg>sci-libs/pcl</pkg> for point clouds support.
+		</flag>
+		<flag name="plot">
+			Build the internal plot workbench. NOTE: This conflicts with the
+			external plot workbench, which you can add via the Addon Manager!
+		</flag>
+		<flag name="points">
+			Build the points module and workbench for working with point clouds
+		</flag>
+		<flag name="raytracing">
+			Build the raytracing module and workbench for raytracing and rendering
+		</flag>
+		<flag name="robot">
+			Build the robot module and workbench for studying robot movements
+		</flag>
+		<flag name="ship">
+			Build the ship module and workbench which works over ship entities, 
+			that must be created on top of provided geometry. NOTE: This conflicts
+			with the external ship workbench, which you can add via the Addon Manager!
+		</flag>
+		<flag name="show">
+			Build the show module, a helper module for visibility automation
+		</flag>
+		<flag name="spreadsheet">
+			Build the spreadsheet module and workbench to create and manipulate 
+			spreadsheet data
+		</flag>
+		<flag name="surface">
+			Build the surface module and workbench
+		</flag>
+		<flag name="techdraw">
+			Build the techdraw module and workbench, a more advanced and 
+			feature-rich successor of the drawing workbench
+		</flag>
+		<flag name="tux">
+			Build the Tux module
+		</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://www.freecadweb.org/tracker/</bugs-to>
+		<remote-id type="github">FreeCAD/FreeCAD</remote-id>
+		<doc lang="en">https://www.freecadweb.org/wiki/MainPage</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 225b71af9f2c..3ce13ff752fc 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,5 +1,5 @@
 AUX freewrl-3.0.0-fno-common.patch 223 BLAKE2B 007d3fcb08acc5da859d28564e54558394a3f5fd23c1662e9d39e3c6d50c03cc5b024f7e4b72cdd6000249a67250a5c70e070c85d7e4f26e312e97a0895df54b SHA512 538bb6a1afdf7103e6ecc01dbd7005e33c14c01437f9c3666e1749bba8612c7cdb998bb4fb4e8d9e22663be97dfa991ac68a3e269c0817d71df8da54a5e417af
 DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
-EBUILD freewrl-3.0.0-r1.ebuild 4471 BLAKE2B a2b86cea4dab40bb502199808dda9cfba9d785acd89ba6f6c291fac5e914069156592391907af1022b8a0d8a21f8eeeb2acca0cd9601281d594adfa2f8953fe5 SHA512 0ce97c37fb2eda244645bf9b6e7c9e4fd83a6f3a0e203332062b634a37a012fc7aa0354862f9d9fe03254cc76bb6fb5448d13df1a6992893c0d42c71976d4ba5
-EBUILD freewrl-9999.ebuild 4489 BLAKE2B 8d5f07f5fbb46894e75b62994794738dcf50fa2025eeddc5a0c5c4aada55169e15c2ae5ec90434ed8f96a4a12f1f0b20b1195eee7ffc4a391280f1b9842d56c6 SHA512 9d9dd93cdc9e6dae64d0bdb068b56fa2c6a0f478708be6e48aa771e10526b30c73ae039cc83fe3f62d00bab2571e60bb013ee796c7cd613c8b3c7fa8a7cc60dc
+EBUILD freewrl-3.0.0-r1.ebuild 4460 BLAKE2B 3128a4878d9de0684195cf958a55e3bc4ce5b4ca09268953fd798daeb65557b0face9703e005b39ed82ae47cb47058cc9429a6dac356ad97f2be5a71e33e62b0 SHA512 b46d091ddc13e80d13a47c96bbf7c9658582da825c3b2e1912abe8618167158b2d205257e05bfbb76ecee700220824440d15cc1016cab62e4f9c45b779ca3964
+EBUILD freewrl-9999.ebuild 4475 BLAKE2B cb6bb434408a491065a616020bc46940496996a2f3087eb7f035dab0b783024f408c4f314441b6ece02e9d957f0e51e565331597983fac527358e2851da9516d SHA512 f2fecd0bcb9f98a3ff3ed774ab6bd75be3e24f3cdf3dfe89ae4ac17e690425c97612f16cb91394cfb17f95195e387c7cade1600680c5d1b2b9b76a65a600c1c5
 MISC metadata.xml 1302 BLAKE2B eb8522dbaadd9c9ebc8d3b5e03072fc7b57f6d87046f52104985a5e0e8f40669b53906921286d1d2c79e393853cac4c88f5a351c7bd0c38e3b9905308c0a890e SHA512 f7581007975722b3d16cf349c55ab67b5cf92a47316399adefb38a9413669f544c9fa5cc922f02f5a7473d4570d884d561dc8ef397347eca80494964f2f4faf0
diff --git a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
index 7f33a3b42a41..b7a8547435d6 100644
--- a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,6 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
 	S="${WORKDIR}/${P}/freex3d"
 	SRC_URI=
-	KEYWORDS=
 else
 	SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index 9987dd19fbc8..0f77fc735ce4 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,6 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_BRANCH="develop"
 	S="${WORKDIR}/${P}/freex3d"
 	SRC_URI=
-	KEYWORDS=
 else
 	SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 4151a5075253..5dbca696ec3e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,8 +1,6 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
-DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
-EBUILD gmic-2.9.2-r1.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
-EBUILD gmic-2.9.4.ebuild 4846 BLAKE2B 1b70a21c2004aba565a4e81372930200a373c9985dc47f7a3c23a8cc076bc11c4bc565ebe356384dfcbe94db60c5f568f75c772f4dcb3a885d7b39318309e36b SHA512 bc6dbdb81baef52096e0afe4cec2df0161b227a75a6dac150d07f2b8e37e2d09856b046a9c670db2818eb538b046be21f7eb30512c9b74909c3bdde3d1c09b83
+EBUILD gmic-2.9.4.ebuild 4845 BLAKE2B 998961857815fc1d5c993c96dd2ad74bdcde8353cd561bd5306e7808e2d07db73da4dbe1b020d23b85784a0cc4b0dd57e7e05ae9e530328355a32b699a90d2a7 SHA512 2cbb56d2a4433d63983b494cb5c7047054e2d320fca46b6db32c21c8abc4f389287e67f0ed522ca58a2c2e8c78013adf9df4914fb7a85335f4415284cd307d12
 EBUILD gmic-2.9.5.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
 MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/gmic-2.9.2-r1.ebuild b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
deleted file mode 100644
index 4af6d1c63fa1..000000000000
--- a/media-gfx/gmic/gmic-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli digikam gimp krita qt5 )
-	digikam? ( png zlib fftw X )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	digikam? (
-		media-gfx/digikam
-		${QT_DEPEND}
-	)
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	digikam? ( dev-qt/linguist-tools )
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use digikam || use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use digikam; then
-		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
-		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
-	fi
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use digikam; then
-		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
-		exeinto "${DIGIKAMDIR}"
-		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
-	fi
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
diff --git a/media-gfx/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
index 0c669de12cc1..09772f17dece 100644
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ b/media-gfx/gmic/gmic-2.9.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 0fe26b7fb5ba..1a02dd3781b5 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,6 +1,6 @@
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
-EBUILD graphicsmagick-1.3.36.ebuild 3165 BLAKE2B 45ce77b1bc701748867b55ae2cb14e13901a9e41ee8b0da5c144e227688ee82c0eaafb66b0444bb2fd85067f80b16247f36e986c4cde798bcd9faa3aed7794f0 SHA512 f11cec24ecb3eec4767be8ed08bd25e0c86209c9435a7a57ca7d960049092fd3adf3edd490a4e958a53041f4705215d452804b6d9a9f5e78a7a5eddf48b11ff1
+EBUILD graphicsmagick-1.3.36.ebuild 3164 BLAKE2B cae9c965cfac059d0c065866f117f49761e0b0f49c0cd1d718d5cbf195f30f0eabea216f9cfaafe549ea4ab437ec97c5ab21d5cc0afdca17ea9952b9334668e0 SHA512 caea74a3f09a26518841fffa306ecd62ca50f6be8de25014ae649cbfa3465c8742b11c69109a5335b544670865ea7592639ffd2f69064ba4016c97b65fd2e80c
 EBUILD graphicsmagick-9999.ebuild 3171 BLAKE2B 7ec34831b9d3297e7fe1acf566f735fb733874da436d0a5346b40021e7a6485c08fd8b112ed149a26d8c8276ffdf2eaa75c34c8f19dc9198904b239c0213197e SHA512 a931780d798844c966fdf35afe2698da6085cee5bec3882349947d7c29c08770272918fe47e615ac68267f916f5ef626db0383400977fe6bf33e07bfcae84109
 MISC metadata.xml 1071 BLAKE2B 899c521ae7916dc5702bada0b782b3020084f84397f0ab62aa4ac15d14d74045ee3dca8b9c9c98591481502694a59e33fcfd8467b7da836a8ee16fb16fbd4727 SHA512 50d6c48e7459d3772d0b804785f5b40cce16bc7a1ac6602a1d5475cd5616e725aa111385eab50a5347418073f1c7afc03f66aa4fd8959474835d899b22c9bca8
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index 65ad34f3ab08..61f1c141918b 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 703d0f7e8667..3a8cd19cdef8 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,6 @@
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
 EBUILD hugin-2019.2.0.ebuild 2335 BLAKE2B 34378c7149aa8b9f35956e4f068c50a0ca08803c834beaface0a4ad3ab2b75e744f81ddbd604603a6c890056e0c56abe6d5453feb6d8675120ada61a8307750d SHA512 193b61f6102aa4c6f47370db64255294cd9cf63ecfd4a7f8d0ffa98daeb071ca131ac2550229ff332bf25bec1298651943b91b1b21d41cd5ebf8a2c7eea08824
-EBUILD hugin-2020.0.0-r1.ebuild 2121 BLAKE2B fee2a47849558bf5a06aef44195b04e87875bf2eb11710e0becbb953151783899b7ac843a17474111186a7c9558e68ba7915b337a1d706efe53716f3e0906966 SHA512 6cd95ce4ec127c0873c5605a220f68360227784d028a00e7bfde3b0e326e3c1b303c6a17b05387651a927b72839760f1e3a77cb0ee01afddd4906bc91395bb8c
+EBUILD hugin-2020.0.0-r1.ebuild 2120 BLAKE2B f50e2d96fa5efac4a39e6f2a86dc1ddb4ffeddf3b79fa21ba096db4893053d14f074c03d46e4c5044c16e7be2db8811fbda2f24ecf86d16d49f6c1568d4ecd1d SHA512 53e5a9a7f45b0158fcfdf55e54fba08c99f4d058016349ba6abcbc1e47c1fab352f652e799fe5031a87308eaebe601f8b0d9807d91b86fa08f23ae0fe1c16b6c
 EBUILD hugin-9999.ebuild 2061 BLAKE2B 02d3b47b6a75b0cb1618a04f6267535bdf2e085eb01f24b50e943f1b2d1fe524224fb9d30a971ad901db6c4e2d4856c102b13aae6cc094b52265dd2dcbabe6ca SHA512 d15b5933ceb4e15a16a4cb437a0f09cb0655311daab2f21645a8700ec4d808174975e70b6966a796bb30f0255f1a0e2e7492d6e88ec813a9007b2a3e1eb029c3
 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 511fe35e84ff..e90610cc03a1 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 22458b53fb75..f3e1bec06c78 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.11-61.tar.xz 9171260 BLAKE2B 89047378e414a7455baa28d413f49dfce3eb54e462211ba5e61f786111c569b26166217ca7e9f5e12c0602bde64c8e9726a67ee3c6be4366d692c2b6232dbbbf SHA512 742fb0b3ff4da98ff05a7fd48b1c5db038bf276975575c4e549f30d61001384c6b508cff526f621467d38a29a9cf015f0cc8c42801720f1b47d6737afb4bac78
+DIST ImageMagick-6.9.11-62.tar.xz 9172472 BLAKE2B 4be79ca6024f6d8e12fe492e6a541dfc4c6b70bf33dcfa8b3d2bb4d9a774a39bb974683e7444c47ee82349ae21e05fba458bcc45b71656f55084c9354ef7ddf6 SHA512 92987953b01c8ecdc3be0b78ee7bdc9e50e0a581f9682f283fcc2345a66ab2b75d678e2b989f90bcaf6eba95581b6234cb86ae33ee44faf6090760e72f838232
 DIST ImageMagick-7.0.10-61.tar.xz 10143308 BLAKE2B bc343b72567d326f30825637366e5d5614e8d53e5222fce357acf0acc9aceae84fe99d67bc7ff2d593e754b990d1e8449785a04724437b61a35e9282f9af799b SHA512 f90d8847fed7f1a5ca3fa247eb1ea115d6afe6fe379fb48733c539456663ca89426336f7ef8be087c1caa0eeafc7d63285f3c35c400fa94b30459796650421c3
+DIST ImageMagick-7.0.11-0.tar.xz 10147348 BLAKE2B 7237808a9352fd1e5988b3b91245335202e78576beb1ed07362adee4320e27ad2253dc4e2f0afe5a5510a17210488a60d2a6920634475908c75823986ca9ed03 SHA512 484a1f53c0d49359fc41d681ddb3fe5bcd0fa8a9b89db1f6f19df5cba0596ab1d8c035d6e7e8d000370ebdd040c6a50ca3d867cf6e50ac29c03471bc34bb4e0e
 EBUILD imagemagick-6.9.11.61-r1.ebuild 7059 BLAKE2B 15ee8b4d1965bbae05ff93a7ccbbf2e40aa70f8111984895c85e1e78941f8b8403f94c423ed439e2ff3593f48964a481aa02f96e436f0f4bbc93e197018f3c45 SHA512 a868f2837298bd861abf52e88d1ead03c533a5f68a080ed2367748a409bb90ceb68415f9837be68f8f03d859e31aef34347594a22ba4250196e259a64be82126
+EBUILD imagemagick-6.9.11.62.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903
 EBUILD imagemagick-7.0.10.61-r1.ebuild 7368 BLAKE2B 399ea3aa93222b7639b2eebae045bb5ba3b6d98d6725c8a5daf6de62c98c8f8ef5a9841c74a29b48c84a61be2b747fa59c4be3c190e3755649254544682f7c29 SHA512 e6b19106e96f8e7350c828d45678a18c352b3097828987bb924842878628404573ac530490c108ee7be2643033de06beff5da0f6e93ce2d71d2f2df93ebc3546
-EBUILD imagemagick-9999.ebuild 7376 BLAKE2B 7e8ca320022e06c6a086f1db7feaf0aeb6d08b5b56246e254a481e612e93adff13ea5fda44338bae4c57eb140128b14911c2c47456e26fba4467dcbd7038a355 SHA512 6262bb1875caeb3f6aa40849f1dc8686846ac95c5ed6e476f355bdf1eea30880deea6fc29c861ef959eb788963c091332362f87d19d6b1024b03b5a43652258f
+EBUILD imagemagick-7.0.11.0.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
+EBUILD imagemagick-9999.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild
new file mode 100644
index 000000000000..7ff90f249dff
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2021 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-60"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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="!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
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || 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/card0:/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.11.0.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild
new file mode 100644
index 000000000000..5256a3f29d2f
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2021 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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.11-0"
+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
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || 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/card0:/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-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 7ac9327f5a45..5256a3f29d2f 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/7.0.10-37"
+SLOT="0/7.0.11-0"
 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 )"
 
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index f2b11f9eaa70..d8bbe22472e0 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,6 +1,8 @@
-DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12daa9a9c89c679f558b4d31f206f7eb03a8b0435a3f05974949029ebfc6e1b1fe4d7d2859bbd722ecb6366 SHA512 f946346638d4314956e86f0e7dfa38baf0ebbb80970f1738749e6c7b80642c2315256738b94ab04d45784c0930edadfc7cc339d2bcfd6eb80fd2e1e98b2d9b28
+AUX imv-4.2.0-add-string-inc.patch 275 BLAKE2B 40e46bd1e7531477d6701ac14013405ee37562305286223a4b5800f3f644f63d366bb1ae08a0ee575b088351013605c9ecaf0356a046976d6a520d55dcaaf2c0 SHA512 2ef9ae3e8a6543476000a2e19fee4f383e01a25b5ed6ffb674f12f843761f9d8fa6ae394e2043260ba88d88fa300ebe3bb03027a02aa3afde5d4cdf897174958
+AUX imv-4.2.0-wayland-roundtrip-after-scale.patch 583 BLAKE2B b71b428bc7c3fd566ab9fa650cb714a2abc455df0512aa7372f82e1c331530bf8515cd0f005d54aa9d20de2156eddf7a0fb3b892775825a4a8af64a0bc66735a SHA512 c081fa2656d2611ef78df072826718ccca56fc376860277f74a9248e0b9771547af28e9379dbf820c4e67f33ffad021c10b5e178f1da2c309e33d25692a38218
 DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
-EBUILD imv-4.0.1-r2.ebuild 1668 BLAKE2B 15349164bbf9db90387a806b7a93546321865f1b0ab9afceae73cb8a19f5c3c91868000babc6ecc07ebd799b09f43f3392937b53b9a7ee587d5591a74cf140ae SHA512 2d35ea2a80e63dea404172db166ff394afc052ed063d88fd3d5b35e592bffd6d2154461caab979104a414a39b908e6dd5e362d7f99146f683ba3c3fa8b445e2b
+DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
 EBUILD imv-4.1.0-r1.ebuild 1767 BLAKE2B fe2541d3bce172e6fc1c559ed0593a4c52b1536b907459d2e5842db5c14ec356e7523cf3d91225ab6b5d3261b8ff3fa4ab9724c8d95979e88078b5b7617d897f SHA512 7484d434a44818bd131ccecd484bd88e6ed8867eacf48f94e863b9dc480f197005a5f8bc519207afd82f3fca7d02416dbd7fc7ff966520b7a57c726317af4cdd
-EBUILD imv-9999.ebuild 1798 BLAKE2B a1c931a83c7b2444d33341e74fa50c4fa532ec3b215e3010eb250a1cae7c2f0f439068d725d3e3bc17eb4cc2cc97fe0e96924d606225cf783d7c009938ca0832 SHA512 c35f9417fe15cce3947ff334aaadae2c76fa9c4084e321bf903bda5cb9e3c9d6341fe709e9b8dcf2cdad84c48e7b848463c75a508ee8fbcce66261533dcf77cd
-MISC metadata.xml 490 BLAKE2B 6b48ec3d26724e518dff34a3cd7b6a121f023c2b78b39777abc71d85192bd27877a7bd058b564f10528765b18c823aa01bdf3f9537468112c2384e66bd2b02e3 SHA512 b53c973037b89ba73e2af0d181bf23b5fc881c73fa2645f3bdd880a948e2d250feb5398a41910b6695cde1b5171b60951edf5e1c9e82279253e356a7d1748618
+EBUILD imv-4.2.0.ebuild 1897 BLAKE2B 8fa164e9e1eb6b8856774c7e863a725749b4316ff3dda0a8906540910c371625406a2ef0b0b4fd281032970f07e764bb7feb899d819c30e1bc35839cdfd031cb SHA512 611ad4cdc876fa7e36a84ffad250d76e291df8fdb0dc4b1f78b9ded7c097708f41a2f9f9ab6fa5e3536a98acd80940b1cf46e6163f1e120abedafd2da6ad73d5
+EBUILD imv-9999.ebuild 1773 BLAKE2B 8e12bc1176341dd3aeafc8cc3347d673e79f154e699fd423967f0841930fa02efd17d601220b3688791cb9d753a69da25ca007c130967e4bfab94c5d08c75cbe SHA512 b5be092d1e4b1acd2542e5a19881f2a4c836e040df6bedbade6022e06db2af21971c167e9162ee72c61c27bd83ce258ff7aa353c711c438960e056afd5816c9d
+MISC metadata.xml 662 BLAKE2B a0da452f9b0ae95ba99c7b3b05ad2a4b3530c25f1ed833bc3d394e409d80d44310d58684735eccfe522aa452d94c6a362bc3210dca7790960a571c0425cdd2c0 SHA512 3a7c33c7fc5cf71e874546212bc90e8969d112b3b2bb2b15564fa42e980ba18be42ddb14f57db508a45ea62640b625d0d84a2274617de08150058c86e6bbb266
diff --git a/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
new file mode 100644
index 000000000000..e726d7b093a2
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
@@ -0,0 +1,9 @@
+https://github.com/eXeC64/imv/issues/299
+--- a/src/backend_freeimage.c	2020-12-17 15:30:42.000000000 -0500
++++ b/src/backend_freeimage.c	2021-01-23 12:03:46.175921640 -0500
+@@ -8,4 +8,5 @@
+ #include <FreeImage.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ struct private {
diff --git a/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
new file mode 100644
index 000000000000..381013329062
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
@@ -0,0 +1,14 @@
+https://github.com/eXeC64/imv/issues/305
+--- a/src/wl_window.c	2020-12-17 15:30:42.000000000 -0500
++++ b/src/wl_window.c	2021-02-02 19:03:52.598901093 -0500
+@@ -545,2 +545,3 @@
+     wl_surface_commit(window->wl_surface);
++    wl_display_roundtrip(window->wl_display);
+     size_t buffer_width = window->width * window->scale;
+@@ -636,4 +637,4 @@
+         .height = window->height,
+-        .buffer_width = window->width * window->scale,
+-        .buffer_height = window->height * window->scale
++        .buffer_width = buffer_width,
++        .buffer_height = buffer_height,
+       }
diff --git a/media-gfx/imv/imv-4.0.1-r2.ebuild b/media-gfx/imv/imv-4.0.1-r2.ebuild
deleted file mode 100644
index a93b2f9f6269..000000000000
--- a/media-gfx/imv/imv-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
-SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X +freeimage jpeg png +svg test tiff wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( X wayland )
-"
-
-RDEPEND="
-	!sys-apps/renameutils
-	media-libs/fontconfig
-	media-libs/libsdl2
-	media-libs/sdl2-ttf
-	X? (
-		virtual/glu
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbcommon
-		x11-libs/pango
-	)
-	freeimage? ( media-libs/freeimage )
-	jpeg? ( media-libs/libjpeg-turbo )
-	png? ( media-libs/libpng )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff )
-	wayland? ( dev-libs/wayland )
-"
-BDEPEND="
-	app-text/asciidoc
-	test? ( dev-util/cmocka )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	local WINDOWS
-	if use X; then
-		if ! use wayland; then
-			WINDOWS=x11
-		else
-			WINDOWS=all
-		fi
-	else
-		if use wayland; then
-			WINDOWS=wayland
-		fi
-	fi
-
-	BACKENDS=(
-		BACKEND_FREEIMAGE=$(usex freeimage)
-		BACKEND_JPEG=$(usex jpeg)
-		BACKEND_LIBPNG=$(usex png)
-		BACKEND_LIBRSVG=$(usex svg)
-		BACKEND_LIBTIFF=$(usex tiff)
-		WINDOWS=${WINDOWS}
-	)
-}
-
-src_compile() {
-	emake ${BACKENDS[@]}
-}
-
-src_install() {
-	emake ${BACKENDS[@]} DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/imv-4.2.0.ebuild b/media-gfx/imv/imv-4.2.0.ebuild
new file mode 100644
index 000000000000..25863200b0b2
--- /dev/null
+++ b/media-gfx/imv/imv-4.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://github.com/eXeC64/imv"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/inih
+	media-libs/libglvnd[X?]
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb:=
+	)
+	freeimage? ( media-libs/freeimage )
+	gif? ( media-libs/libnsgif )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
+	svg? ( >=gnome-base/librsvg-2.44 )
+	tiff? ( media-libs/tiff )
+	wayland? ( dev-libs/wayland )
+	!sys-apps/renameutils
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	app-text/asciidoc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-add-string-inc.patch"
+	"${FILESDIR}/${PN}-4.2.0-wayland-roundtrip-after-scale.patch"
+)
+
+src_prepare() {
+	default
+
+	# allow building with libglvnd[-X]
+	if ! use X; then
+		sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
+	fi
+
+	# glu isn't used by anything
+	sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+	local windows=all
+	use X || windows=wayland
+	use wayland || windows=x11
+
+	local emesonargs=(
+		$(meson_feature freeimage)
+		$(meson_feature gif libnsgif)
+		$(meson_feature heif libheif)
+		$(meson_feature jpeg libjpeg)
+		$(meson_feature png libpng)
+		$(meson_feature svg librsvg)
+		$(meson_feature test)
+		$(meson_feature tiff libtiff)
+		-Dwindows=${windows}
+	)
+	meson_src_configure
+}
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 65f50d9221c2..735366ed5332 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,89 +1,81 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 meson xdg-utils
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-LICENSE="MIT-with-advertising"
 HOMEPAGE="https://github.com/eXeC64/imv"
-EGIT_REPO_URI="https://github.com/eXeC64/imv"
 
-KEYWORDS=""
+LICENSE="MIT-with-advertising"
 SLOT="0"
-IUSE="X +freeimage +png jpeg svg gif heif test tiff wayland"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( X wayland )
-"
 
 RDEPEND="
-	!sys-apps/renameutils
 	dev-libs/icu:=
-	media-libs/fontconfig
-	media-libs/libsdl2
-	media-libs/sdl2-ttf
+	dev-libs/inih
+	media-libs/libglvnd[X?]
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
 	X? (
-		virtual/glu
 		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbcommon[X]
-		x11-libs/pango
-	)
-	freeimage? ( media-libs/freeimage[png?,jpeg?,tiff?] )
-	!freeimage? (
-		jpeg? ( media-libs/libjpeg-turbo )
-		png? ( media-libs/libpng )
-		tiff? ( media-libs/tiff )
+		x11-libs/libxcb:=
 	)
+	freeimage? ( media-libs/freeimage )
 	gif? ( media-libs/libnsgif )
-	heif? ( media-libs/libheif )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
 	svg? ( >=gnome-base/librsvg-2.44 )
+	tiff? ( media-libs/tiff )
 	wayland? ( dev-libs/wayland )
-"
-BDEPEND="
-	app-text/asciidoc
-	test? ( dev-util/cmocka )
+	!sys-apps/renameutils
 "
 DEPEND="
 	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	app-text/asciidoc
 "
 
-src_configure() {
-	local WINDOWS
-	if use X; then
-		if ! use wayland; then
-			WINDOWS=x11
-		else
-			WINDOWS=all
-		fi
-	else
-		if use wayland; then
-			WINDOWS=wayland
-		fi
-	fi
+src_prepare() {
+	default
 
-	if ! use test; then
-		sed -i -e '/^dep_cmocka/,/^endforeach$/d' meson.build || die
+	# allow building with libglvnd[-X]
+	if ! use X; then
+		sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
 	fi
 
+	# glu isn't used by anything
+	sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+	local windows=all
+	use X || windows=wayland
+	use wayland || windows=x11
+
 	local emesonargs=(
 		$(meson_feature freeimage)
 		$(meson_feature gif libnsgif)
 		$(meson_feature heif libheif)
+		$(meson_feature jpeg libjpeg)
+		$(meson_feature png libpng)
 		$(meson_feature svg librsvg)
-		$(usex freeimage -Dlibjpeg=disabled -Dlibjpeg=enabled)
-		$(usex freeimage -Dlibpng=disabled -Dlibjpeg=enabled)
-		$(usex freeimage -Dlibtiff=disabled -Dlibjpeg=enabled)
-		-Dwindows=$WINDOWS
+		$(meson_feature test)
+		$(meson_feature tiff libtiff)
+		-Dwindows=${windows}
 	)
 	meson_src_configure
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 5ae50d4b1eeb..196a224f7464 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> as image library</flag>
-<flag name="heif">Use <pkg>media-libs/libheif</pkg> as image library</flag>
-<flag name="libnsgif">Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
-</use>
-<upstream>
-<remote-id type="github">eXeC64/imv</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> for additional image support</flag>
+		<flag name="heif">Add HEIF/HEIC image support</flag>
+		<flag name="libnsgif">Add animated GIF support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">eXeC64/imv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 51d9e08839a1..3344f3c76232 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +1,7 @@
 AUX missing_atomic_include.patch 319 BLAKE2B 8b122e0f1b61cbe98413b21f90c97826fc75b64c4c12f70b2a3048d4c14151f9f790e5c55fbea6eed518f9bdae57e2620b2be15351d86ae339fd4e38925aa57b SHA512 05f3f392f115d918aae78bb6c82b7461212a26bab826e02b686ad03f8c3f8e4fe0b1c1b89e2982e8912922ef987596501ef4145474e2745bf89487e9ba6134db
 DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
-EBUILD inkscape-1.0.1.ebuild 4131 BLAKE2B 7f0f16514898019220b8e924cc773a27ee870d80f396000999f943ba51ebe06ca79865ffdb6b6893e24d048234dfca72f8cfafd28825997c3cfe746583e47763 SHA512 57b7272b22d9f6f5719415b1570d46839a4635693d043316b0ad53d20165f399da9d905478fa62fa2970e0afafdeba28962b3fa3e8141928a08fee62cd0ca230
-EBUILD inkscape-1.0.2.ebuild 4098 BLAKE2B 93e7513b2661039ef925503dc3bce84c4a28646b981d5d7f10329c494975a11d57c7800b78cc46ee3e36720b8576770e75066cdc48efebad1e856e35b57febe7 SHA512 6135c8c41600e97c25773b322e33db9851100e064105461f83be958893311e0fb8365aa6a5eca7bda2083e27898496567e334d32dd5fbcba44c035742c0406f1
-EBUILD inkscape-9999.ebuild 4052 BLAKE2B 3381b7768c38b2015cdbce053cf58ba0ddf6ae11ff942e41ac892cb26a0fac21f6afa1e6a189a95782250b300e009f466ebe81ed3e7944a9bcff7c179ddef33b SHA512 e3aac077bba4efd085083d8c55b62e5b501270091ad20ca688509c66fde8e6e48a415d083eb40cc936532c108d43c3231de0ebb5070e05c289de452d9fe307a4
+EBUILD inkscape-1.0.1-r1.ebuild 4141 BLAKE2B 09e9fd9978b22e2a7fd25562570c37b7283dd53641571a113cb32fad32bd4a4e2a33686d56a7a630895cb728933e9bbd28c0a50b1950a180219d3ae3823443a7 SHA512 70636fd302b86c1da68d240c0febb15720e0ae0f51901fc9189b41d0f35cadae2790c5bfe2d5a221b40d3ecb108419a060a255092cb2280f7128da35f71fc313
+EBUILD inkscape-1.0.2-r1.ebuild 4108 BLAKE2B ac7e2d31b2501d803a0aaa837f9d43781537bc6cb9ac9b6739a0111e51250f199b2a93fc24b5ff0af68c5571ada89799dd50914c5fba7c2d3b7bf63f6a5928db SHA512 9bc3c6556758de0e8d4ba85863f3dd04ca37b73922ee3b1264c57ed9c5214d56887eaa2fa1a3120353c1871db727400cef56c27bc905cd9256e7bff6717d784b
+EBUILD inkscape-9999.ebuild 4062 BLAKE2B 95b6edfd2512eb33365bf8c19968a51f02cea399569caeca8f20bf6a000936fd7c2932e2fe389c05b931084e9133f01ef6cd8a28d6e8cc9137a5538e9254f151 SHA512 f871de44af448c640f208637bb65eba87dfde5d992e1f7886ba54b31e322054f2069d818fb5b6032d4b5a59177ec9e2cf46f0ce964ec90f56d6370146ed55fd0
 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
index 01a5f16bfc2d..861ac2210cd7 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
@@ -32,14 +32,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
diff --git a/media-gfx/inkscape/inkscape-1.0.2.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index ed4d6019f5e0..6e4e248cea3a 100644
--- a/media-gfx/inkscape/inkscape-1.0.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -28,14 +28,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index d9978ad99f8c..e29603e7c82f 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -28,14 +28,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 5e8a2860b516..e032ea4d5a91 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,4 @@
 DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
-EBUILD nomacs-3.16.224.ebuild 1857 BLAKE2B a2e81270aca33f91efa823b838b0c194d763a8031d559cab8e32b412432d0ffca660dc18550769c083efe1f2d9ea4c80b77341dc8740ddb8576459ea5387cdb3 SHA512 68e42c71845989c8551f01bab2d13aa3216ec4ffeac30e2351676d1355f1ee69af5f874d49e6438ed9756cfe01c5dedc8c194f3abaea38455ebfd45cf510bf82
+EBUILD nomacs-3.16.224-r1.ebuild 1859 BLAKE2B 3ace96921a28506b8a143c320e36bf6d558339f06e5b185cb2d60948d6215cfd68cc6aab54a6b7dbbe0311fce78671b17638ac557df40891a568c3b5c50addec SHA512 a8476b8ed5ebe3fa8feb5c151245327650f3c63f652129aa407d70658a2ad41195992c64d2ab1ad24fbb4e6cee7d5e63a935668adb909f190bf0189d5a6e706e
 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-r1.ebuild
index 252958e43a9a..efac4a65c05b 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 		dev-qt/qtimageformats:5
 		media-libs/tiff
 	)
-	zip? ( dev-libs/quazip )
+	zip? ( dev-libs/quazip:0 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index a900641f5b9a..255c336abb8c 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -6,6 +6,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-r3.ebuild 2069 BLAKE2B 04ea91d2e612adf7ed8b4d94c30c769713a99893da2120eb8675081c862a2804c0aabf21da51dfa78a10240d01b71144c1586d7859b69f4a639e22a5e090138c SHA512 0663545e9fb542b534bd7fcc98ca8e131de799a8f8ceac29a8aad31e5a1283fff22efa1a5a4677f991b8319ff824643e088e124d5b07d0fe7105f649e45e04d3
-EBUILD openscad-2019.05-r4.ebuild 2369 BLAKE2B 95903f34bfe2c81a4449cd1e63b1a4bc3b3abcb806bda09ee237ec56cd784f10e669f863f2672e0c45531d31d59ccb8e36d5bbd7b18f8df445a4ba9345b15dcd SHA512 ba74ea5aadf631a650756f30fca4781dec31b459799f3fcf0637156df3e31d292c4532fc3630c31316a2df4a70dfb8b1ce869c1b02018075001b4e5b961892db
+EBUILD openscad-2019.05-r4.ebuild 2368 BLAKE2B 83ced6412ce7a206dc767bf8c56109394524bbf525b15621f1891f4cf3ecea489c9447e18c0ce9e6ca4271c2cffcccbe3c767d406564b1503990740e9b98fa70 SHA512 8ed91ac665aa58c8ebaf6bbd4eeb7b4efbc4819c12e0a643f9bb92fcaca2491f7a84169b8cc0291fcfc9024ddcca6b9ef7e434ca4131d1149bb2c5f3da25987f
 EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
 MISC metadata.xml 1131 BLAKE2B 5ac140803c4f9b522ccb4649a1247323a10d397885c0ae780379483832dc85a6c4d50ee3cf6c85dced42aa0debcaa559039f7c911eda7630cbd11a13c3440c96 SHA512 1f5a48746b34e61dd451ec8bd6fb9b3678ce9901e4ca8784dac19eeaea5e7e1bc636b6d9c528bf06af1aed1fb37a5d1e6b190b465b6170cd713f494874e8a807
diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild
index 2ac3f77c9665..0d287ea36a25 100644
--- a/media-gfx/openscad/openscad-2019.05-r4.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="ccache emacs"
 RESTRICT="test"
 
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 3a1e019bed8e..3f5522fbebb6 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,5 +1,3 @@
-DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
-EBUILD opentoonz-1.3.0-r1.ebuild 1899 BLAKE2B fafe1a38973cf8e8687b705b91d496c1897c1536e17f978e6bfdef122c8b43e045c34f71e0d942843093881b138630a342e4fe3a4c11483faeb4acc30bea82d7 SHA512 1f3e0f7a9db57c9a4150f490c82c186698e4fc56eac11ec725dd2e4b518166eb0e91e359f3d863dfa49dd52f5125c57074f28e2338438367478e4e1702d81e06
 EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B 63407ff2f79ce44b991ca53ffa0d606f605f203cae9ce95749293afc29e25f9802061884d1425e82c5a43da4a6fd477087dff9da03faa53e11e92482ce74cf4a SHA512 66e8e879c11a5bd55a9125f786bf2bad513def93eb95113f79c1172202365bcad8a9f655a9fc39459d529427590e1182e0b636eb3bc1ef5187e4c2e6e0c265a3
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
deleted file mode 100644
index b9eb63a13837..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/libjpeg-turbo
-	>=media-libs/libmypaint-1.3.0:=
-	media-libs/libpng:=
-	media-libs/libsdl2
-	virtual/cblas
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-src_configure() {
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-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/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 6ac7ca1e061d..da77ca5c7bf0 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,5 +1,3 @@
-AUX PrusaGcodeviewer.desktop 208 BLAKE2B e7d041508b4dfb155748319d3c166ed1ff891cc3cf05d748d5d4ef03e90100dbb4c48a5c8daa3c5e04ad98e578e34e433caa9a1b2a85000feb16d9804832a531 SHA512 6f69d47a0f6adf3912de2ce8766c74d7654d3f8442cd269b098769d186a2345cdc6da310f10f4568d2de5ea1633bab22ac05203488617fa2e906d6c25b539964
-AUX PrusaSlicer.desktop 401 BLAKE2B 1c9bded4dd9e5e0be33c1bfb66bf8b54adc7898595fb6064d81f30dab9de7b9d6fd406ee48d45cb0ba665b1a03d02035c164d82d5b7cf13ec088b02176989777 SHA512 0777e5eda98d9931f5b289187a144f217f1279af498d8563414fa1485a24eb466a1b801498ec9af652355206543ae4b41012ed8ad8a22577680b088c6c39cc5a
 AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27
 DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d
 EBUILD prusaslicer-2.3.0.ebuild 1812 BLAKE2B 1d34a7cd0dd5fcb40dce9d8fcab86d8b643722a8ebe4810ce0b83172304d2a8aaaea76ed8a6077ed30dab134152294ff42b54476b401b5482691beb41bc8aeb8 SHA512 df62be529a5b69d88e44ac219e6a5e9a51738509f4946397aa7771a29a544aeb9bca84213525c5f6540de3649f5742ce759d2d5303783b2e9f7a70e7f6921997
diff --git a/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop b/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop
deleted file mode 100644
index 4b73cc905c6c..000000000000
--- a/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Prusa GCode viewer
-Exec=prusa-slicer --gcodeviewer %F
-Icon=PrusaSlicer
-Terminal=false
-Type=Application
-MimeType=text/x.gcode;
-Categories=Graphics;3DGraphics;
-Keywords=3D;Printing;Slicer;
diff --git a/media-gfx/prusaslicer/files/PrusaSlicer.desktop b/media-gfx/prusaslicer/files/PrusaSlicer.desktop
deleted file mode 100644
index dae507b54abb..000000000000
--- a/media-gfx/prusaslicer/files/PrusaSlicer.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=PrusaSlicer
-GenericName=3D Printing Software
-Icon=PrusaSlicer
-Exec=prusa-slicer %F
-Terminal=false
-Type=Application
-MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
-Categories=Graphics;3DGraphics;Engineering;
-Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
-StartupNotify=false
-StartupWMClass=prusa-slicer
\ No newline at end of file
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 6b7ed852f4ad..76e4916e6283 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -1,3 +1,3 @@
 DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
-EBUILD svg2rlg-0.4.0.ebuild 948 BLAKE2B 9da582ef3f53b2e90a3f0557c054aae7d8c3dfde2e708cfd1176caa62534cfbc1c16dec04c01a411d48a34c24d2c61f09b4bf1124a5e47317c3efc9046c2b9fc SHA512 4f908ab494a73519b985501d2b8e3c51d29e2675a102109f0faa13b0b62315204a9de790da73c39bb4726e287d3c55c3cb619997c552367ef61b768bbce0014c
+EBUILD svg2rlg-0.4.0.ebuild 935 BLAKE2B 11635d0debe0fe4827612f9f7fb6c3e9b9974079eb69cd1f0cc55e74b7d5cc1cb2c65ae6992b0b5cb3f5ed0193b81a709e3ae2a89b8f68fd667d975a2b8a8170 SHA512 dcc6deb2b431162666ad6bbdcfd6d40503d86930f9ab9032ca62d14acbe84ef0fd023a9d9b2a8d73905fb8e6b8a966eefc593b1c08216a4b000154cef32fcd8a
 MISC metadata.xml 435 BLAKE2B 959a42ebbe8dcec9cb5617c869387268b1fbac950540fd47b2e0121a36dcd763c269ea26d09d617843aa2d665412fd677d1833a42d98cf3e33d6c9cdc82c2e55 SHA512 8b83221cf8e9bc87dc62da2f4a18b85afca886b62cd3cc742ef258d7e6e462a9abd23cbd497ca6236100302d0b483cf07e0a2b98d45c8687fcb10ef615a18846
diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
index 131461d19d20..4e172fabb657 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
@@ -14,7 +14,6 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/sarnold/svg2rlg.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"