gentoo resync : 29.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
commit: d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree: 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /media-gfx
parent: abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)
56 files changed, 251 insertions, 938 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b7e8b8583d63..e9e66b3fe829 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index c2f3dc976a62..39a93554e5c7 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -8,4 +8,4 @@ DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f24
 DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
 EBUILD alembic-1.7.12.ebuild 2398 BLAKE2B 304acd044f9cc247f99df23810934a2917df21bdc7e7885a52857c458e6419f502460a35f1bebe947bbc4513c47dd1e09dfc4d447fa278ae0fcfd568ae683b98 SHA512 2c31a9759a2725576b0c22745db5cb59b376b5cf5bbe4d72df641666304533d8005d9417702073bbe0570772e56b06687571d45876840eeb899b9f52866458f0
 EBUILD alembic-1.7.16.ebuild 1241 BLAKE2B f4f0a1ea27ae8e8539c0e4c14e399d9d2e546053367a80d7bb6074295257cb701b2affcc01bc614ca516bfe11417f5fd37d3a5ad897eb647fe4645fed91f6440 SHA512 5715deaf8e193709500879591572d4c73734c7ad1c161fe344ce68f3c2d868ab1ebcdf2c50c7f93b2f4c253a7d4e6eabfbc6d213eb86101fdba2225807841ccc
-MISC metadata.xml 1080 BLAKE2B 96c475f6b75a08520843721121d708e9e31dbfa633f7c3ac73621b85ecd139c12bc022aa4719c3390ce61fbd5b55c6444c69ff0a380abcc08685de3052632104 SHA512 fb6d89a0b587010d22fed63b5b281a88282366219c174fff7484176d3a61109b47bb87e49758c185273d044a8f52eb7230b122d145a4ed341c24597d89ff0166
+MISC metadata.xml 1061 BLAKE2B 5b15f06e392250e29645c008123cd23313b91162a4d42f769981249ec31250f5169332916eedb2bd0cbe9388be92adf151b9db8a11aedaaa4afbf9f33551481e SHA512 eb435c88829cdd15a3c993528e291d415c05f56d0b82d95b7b89e389f1dbb62ce50e822a180676f4c9191af4ba72a74a8935619af5ff96828117f72cc10b262a
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 034ebe0790b5..49d1fe2caa65 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -25,6 +25,6 @@
 </use>
 <upstream>
 	<bugs-to>https://github.com/alembic/alembic/issues</bugs-to>
-	<remote-id type="github">https://github.com/alembic/alembic</remote-id>
+	<remote-id type="github">alembic/alembic</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 0c170cd66799..cb79548d7d7d 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,8 +1,4 @@
 AUX cairosvg-2.5.1-no-ref.patch 923 BLAKE2B 4a14bdd5f19f9abbb9415c19cb15aecc6dee8bf34feef0cb551f4185c16e4a93ac29d6e46f81dab03f479b2e982c9d0a85a622c1292cfe6d52c6acc1c896aa7f SHA512 f1a45ba47fc3f1f4b91799d6d45b2388a2ac6b0be08695f2507b4bf34818b6a7e8c23cbfbb270c3d603d81acbe3c9bc0a867e5864b684f67540b449d684e6f0e
-DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
-DIST CairoSVG-2.5.0.tar.gz 40481 BLAKE2B d177570710f54a7d64446de81a700a6ebe5dd475ab75e268575ee2d3a45cb1da14a349d6a5516ef965191093f12ba916a1919fe115fa4b6e4dc0f9a22657946b SHA512 9387273a5531f2e055871d3ccc3b770a46e549dceb443d9d7dbf3635f44da4a752f06ece2f86582f57eac08d59d78f833e1ed2e7badea340d5a0f1eb31beb24c
 DIST CairoSVG-2.5.1.tar.gz 8397716 BLAKE2B f5d307f3019df3b8e19a86c4f185bb6c95ff5f450705a06506f03447f7a4e97091fed4dbbdad7220da0b04c6bed3eb252f3f3e8d91bff55ab6432d0df7f62d70 SHA512 5f6732758ed8024b58173bc920a44fcafa65a2daf301ee07e088d542f1e82d0093bd853e58da2484c392d1b625fd27c0634d07ad58cf00e674741aa413013605
-EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf
-EBUILD cairosvg-2.5.0.ebuild 871 BLAKE2B 6e87fe608e0f1b9e86b72004b826338948762f087cc57042212e75f9e7f0d3928f7be13f071bfffebaa8a3b01236d067376244593359425c2759df888bfa2d87 SHA512 4d009897e43100a958ee7ffade1b4df3f2cf9a658228ba8931deb136f14d3bd1e09d3db690e05b538e0b6fae4fa22d63b0a0284366b8a930c58b4e0e7baf3262
-EBUILD cairosvg-2.5.1.ebuild 1087 BLAKE2B 66f0018bd5b785e25b410cb6d7fa1b5e221165b279ed2e50e78cf03ad4614eef73435df677b9814e273f4d560321f62225958f35568422f5d2f3e884d37f3e24 SHA512 b70dc5fbf78579b81d6ac336b843d3560be264410c4647d5c01860b7d36b177dda90f7cbd9102a0e6f1deb2e8dd39db1c1aac55b7aab4261d5373c20e3c46315
+EBUILD cairosvg-2.5.1.ebuild 1086 BLAKE2B 978ded1faf6d8518636e66522c6f4b28528699b4d4328d80256d69e7abf03ddd9ab1b2e5ee1456f03bdc1ed62b416c21101f101d96de219f85a07bb735c94c77 SHA512 39b6dc1758d0ae13f6f87ca4c88495f7e7f10e381b679e5afa79c1aea8a2b884fd1e07f973e2e25e29ac21d5f3b673ca89a746c9b1a80c0e009cdb028b1fcdad
 MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild b/media-gfx/cairosvg/cairosvg-2.4.2.ebuild
deleted file mode 100644
index 2341e26567f1..000000000000
--- a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="https://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# junk deps
-	sed -e '/pytest-runner/d' \
-		-e '/--flake8/d' \
-		-e '/--isort/d' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
deleted file mode 100644
index 6bb86bcba458..000000000000
--- a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="https://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# junk deps
-	sed -e '/pytest-runner/d' \
-		-e '/--flake8/d' \
-		-e '/--isort/d' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
index 4b84e379a4fe..0dcd811220f5 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 499b6c00fce6..91a7b5bd761c 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,14 +1,6 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
-DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9
-DIST feh-3.4.1.tar.bz2 2114441 BLAKE2B c24e5f54762439cfbb031b4b24ded03f1c0c9c75233ae5b6dc66a7a56922902c672606a1b36fef9b30789c09946c8ccc5f9a60fe201db07e70bcf0ce0638c0c1 SHA512 d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66
-DIST feh-3.4.tar.bz2 2114146 BLAKE2B 0bc65db77c67c42b693122b877417c3dc4db7a0551cdf62723b3f7c134e5f2bb73ee6d0aa5a0c81402cf5a5f723ceb29a45fb5e4aef1911dc643aeb82c3ef17d SHA512 50cb7fd33b583ee802cbbba8ed7a74e9eb72a141ffa28ab998a196f9f8d030a8192420fc084136f699cb33b1b8c4d8c2c111fa90695dd82a1366330a428383ce
-DIST feh-3.5.tar.bz2 2115162 BLAKE2B 8300cfc0e480afb070d40e35390edb30dc451dc5581add5f377a370bf606f7e7730a99c8a4773accb38b01a4e9b47fe5c95d8e9c2dcf9d71e96a71c4fd11a388 SHA512 69b4c73a8009c5b5e031bdf3c6a628da2f3cd71927d6c546ba2b2cfb6d10912e4a44e5d0de93704645a4dd33d71f1445749abe03383cc2298fa10c2d5d88fb5e
 DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811ae0904bbefef873fd54182b94532bf811394964e725f0e45890f65fcfc3dc988135d388ddcf625adbeca4e0 SHA512 b4350f1c5f66a450b2f088affea973abab9e184df110b693e46e1fc532d213d62a52bf08029f345daf92d45c828ff3bd380dcd7b167f319f1ff3b1d04150cd75
 DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
-EBUILD feh-3.3.ebuild 1462 BLAKE2B 6a15abb299ed6f7667e2bb72cc615f8ed9b0c19a85363970f6338703a71650b73a124a6674d2d632ebf282792dc509fd06478cebdcf7cb30d850fed331cfe047 SHA512 0112815c065ba37ad9574bc497d2d6617de4bec7e6fe8a7b2ab94dbdb41fbd1e81631e0d674638026459ff3021a76cab6d1a76370ed87af5b0044ba6eb7f9b4c
-EBUILD feh-3.4.1.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
-EBUILD feh-3.4.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117
-EBUILD feh-3.5.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
 EBUILD feh-3.6.1.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.3.ebuild b/media-gfx/feh/feh-3.3.ebuild
deleted file mode 100644
index 4e3f9e8b8cd6..000000000000
--- a/media-gfx/feh/feh-3.3.ebuild
+++ /dev/null
@@ -1,70 +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="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
-IUSE="debug curl exif test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.4.1.ebuild b/media-gfx/feh/feh-3.4.1.ebuild
deleted file mode 100644
index 7d87a35ace60..000000000000
--- a/media-gfx/feh/feh-3.4.1.ebuild
+++ /dev/null
@@ -1,70 +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="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.4.ebuild b/media-gfx/feh/feh-3.4.ebuild
deleted file mode 100644
index cdfb177f990f..000000000000
--- a/media-gfx/feh/feh-3.4.ebuild
+++ /dev/null
@@ -1,70 +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="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.5.ebuild b/media-gfx/feh/feh-3.5.ebuild
deleted file mode 100644
index 7d87a35ace60..000000000000
--- a/media-gfx/feh/feh-3.5.ebuild
+++ /dev/null
@@ -1,70 +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="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 102ea166a119..be7c7ebb2329 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,7 +1,7 @@
 AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9
 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
 DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
-EBUILD geeqie-1.5.1-r1.ebuild 2282 BLAKE2B 4030d0db0a455bff639f2f6ec1f3d7005240ead319a4ca8882c6417a1a6204839d698859dbd745e13a754130f47d100a3643c824367ecb4cbfc6210fb3244dd3 SHA512 077244b2b9ec5c7db5c96329abf79ef004ba8b497c87f780d5a90689bb931409906e36d56bef0e09467a0dd4ace46db608e7ad03a205d50e1d2c8b98f64e176b
+EBUILD geeqie-1.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31
 EBUILD geeqie-1.5.1.ebuild 2222 BLAKE2B c725f6902608cd0483fcfb056c7328cc3ecbc0b010da93970c14e1f0400fa2f2577c00622e773b9531ee1472d58b9d319bb0f54c870762c852f9f1e8abf1f871 SHA512 69a7e41f601ffba26e13d42fb2b63325293aee00f8c5838d171b26e2c09738a87b4c6c95debbc433b6e357ae202098eeef4e9b9d660d04ce2458696c7280bda1
 EBUILD geeqie-1.6.ebuild 2235 BLAKE2B cf7aff0c366ba4399c5f6622bdb6d1d5c9e74fbd8b29be0526d12a24ce8a577fc160c0388f4c5718bef6ca91cf0070e03a8c32aadea7fd3841eba2e202dcaf93 SHA512 3ba5b3cca3da8b7d14560628983d2a39650cd714df97295ef809f573aa9789f92db3966a517760d5806b4482abf3294d4922c25d2c81d6d36512dc5aaa9bd53b
 EBUILD geeqie-9999.ebuild 2330 BLAKE2B 5663c258cc045098f835f35484648755e87b7223f4caee2bacc746c78bbeaa683e3fa5b7ad8bef4198853bb1628c09e103df94e8d0a98b2961d2a1a36fbbc104 SHA512 e911efd079f9b6c8455302d2f02f55de4050ecda2a17beb2ab945753c8e1c6ce0fb1947f107e4218354441b912970d5687c0ac5c72b5e87346dfc06668a6c2b2
diff --git a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
index f0063ff9ba03..ad5ba6872166 100644
--- a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1-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
@@ -12,7 +12,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
 
 RDEPEND="
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index f21555bad55b..5cd1f79a591e 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -7,6 +7,6 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
 EBUILD graphicsmagick-1.3.35-r1.ebuild 3244 BLAKE2B 20a05ba460b52292328b8152c8b8991653bc5478dde0768085df9b1ed53e16aa74d485a6b49054d97fc4c30eadc7d8be959519711023c495208537d3387bf099 SHA512 a9f44ee9b36fc6859c30a46f6d61338ce5d4d5819508cb2c59e042fab00fbbcccab25219e292413536376e1a7fed734268c50cd1afa1ef68b0ef285a2543cf85
-EBUILD graphicsmagick-1.3.36.ebuild 3126 BLAKE2B 4ae429e70dcb36ac4aa03bc6dd0dc21f5540751faeb531e962cad24402e0ff1aa078193e3f9c2cd34d09858215041d4b03f61245636b43c1909e79eefbf43a84 SHA512 6a53a3861721ae9d305dee052da5637fc570c1ffe9c1f7588701a0f9c612740f1e75b3c6d931414f08ca2332b5b2ab8dd13c93e8570f41bc32490a23b9f861d0
+EBUILD graphicsmagick-1.3.36.ebuild 3122 BLAKE2B b08a76bbfb1311e3d9182ac667dbc11789d9a5bcab67777df59809ef887040329bc57c886a4fdff60eab22df3ef7282358168af04945c12f20d1d996355f472e SHA512 b459f8e06251b42727d324520e96c326ccf9d15d9a7b51ecf820925dfef6e06cbff5ff4c9103c56c7048f785a1b145d9c168ba53e542101a6cf9ce212aff6d58
 EBUILD graphicsmagick-9999.ebuild 3126 BLAKE2B 4ae429e70dcb36ac4aa03bc6dd0dc21f5540751faeb531e962cad24402e0ff1aa078193e3f9c2cd34d09858215041d4b03f61245636b43c1909e79eefbf43a84 SHA512 6a53a3861721ae9d305dee052da5637fc570c1ffe9c1f7588701a0f9c612740f1e75b3c6d931414f08ca2332b5b2ab8dd13c93e8570f41bc32490a23b9f861d0
 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 9881f65ad846..1343203b93f4 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.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
@@ -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/graphviz/Manifest b/media-gfx/graphviz/Manifest
index e43b5fd47986..6ff6afca9225 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,4 @@
-AUX dotty_change_button.patch 964 BLAKE2B d59c14fbcd967f28da141037f77ba57241c553f647af3f9bb0996c622b3728f294628279926f012cca4d4381a2ca17af6e4566727afba6568df7ff4a98c5bfbd SHA512 841c4c1eb820a9065f8530e7a5bca3743aaf808705177776b45100fbbeb73899c5c765feb14026866b42b7d5ee2b62de1cac5398edb01ef447451a529e350b3b
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
-DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
-EBUILD graphviz-2.42.3-r1.ebuild 7853 BLAKE2B 87d86b695e3837a820ce1e33a45e71b372da307b19ce1a2baf2e820e99ea95c461826d9ff04e4744c6ff66a2f0ef3554a6808c03d75fd85fcce15a8bbc139772 SHA512 69567f1210ebcf66230f6aec1fe776b01bb4143b9ab212b63c72761db465181b0af08450417d5708ca141c136c8f182fedb01203a20810c76f90784df398d61c
 EBUILD graphviz-2.44.1-r1.ebuild 7817 BLAKE2B 564764858f192744662ad608c67e1db5d1e512d6bffd9c2e857d0832d94546154f2c8ad947c4a47527a953fd456b219b823c76a6a863ac7e42a2006cdfead467 SHA512 836d9ddfa80b5c943135a47d431e2f5e73275dbea3787f5a5d6104b5cc65e47483d4e428c6b5fe494a96a180995220dee2fd2ecf75524a6dcc0a7f83cb7360d1
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/files/dotty_change_button.patch b/media-gfx/graphviz/files/dotty_change_button.patch
deleted file mode 100644
index 8c5f34a2e128..000000000000
--- a/media-gfx/graphviz/files/dotty_change_button.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
-index a8c9116..a708c61 100644
---- a/cmd/dotty/dotty_ui.lefty
-+++ b/cmd/dotty/dotty_ui.lefty
-@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [
-         else
-             gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1);
-     };
--    'rightdown' = function (data) {
-+    'rightup' = function (data) {
-         local vt, gt, menu, i;
- 
-         vt = dotty.views[data.widget];
-@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [
-     'middledown' = dotty.protovt.normal.uifuncs.middledown;
-     'middlemove' = dotty.protovt.normal.uifuncs.middlemove;
-     'middleup' = dotty.protovt.normal.uifuncs.middleup;
--    'rightdown' = dotty.protovt.normal.uifuncs.rightdown;
-+    'rightup' = dotty.protovt.normal.uifuncs.rightup;
-     'keyup' = dotty.protovt.normal.uifuncs.keyup;
-     'redraw' = dotty.protovt.normal.uifuncs.redraw;
-     'closeview' = dotty.protovt.normal.uifuncs.closeview;
diff --git a/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
deleted file mode 100644
index 4f6683ad5e3e..000000000000
--- a/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-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"
-IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
-
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	pdf? ( cairo )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-BDEPEND="
-	sys-devel/flex
-	sys-devel/libtool
-	x11-libs/gdk-pixbuf:2
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.14.5 )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	tcl? ( dev-lang/swig )
-"
-RDEPEND="
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1:2
-	dev-libs/libltdl:0
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libiconv
-	cairo? (
-		>=x11-libs/cairo-1.1.10[svg]
-		>=x11-libs/pango-1.12
-	)
-	devil? ( media-libs/devil[png,jpeg] )
-	gtk? ( x11-libs/gtk+:2 )
-	gts? ( sci-libs/gts )
-	lasi? ( media-libs/lasi )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	ruby? ( dev-lang/ruby:* )
-	svg? ( gnome-base/librsvg )
-	tcl? ( >=dev-lang/tcl-8.3:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}
-	guile? (
-		dev-lang/swig
-		dev-scheme/guile
-	)
-	java? (
-		dev-lang/swig
-		>=virtual/jdk-1.5
-	)
-"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-#   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - go (disabled)
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt5'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
-	  "${FILESDIR}"/dotty_change_button.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -r libltdl || die
-
-	# Nuke the dead symlinks for the bindings
-	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
-	# replace the whitespace with tabs
-	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
-
-	# use correct version of qmake. bug #567236
-	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--enable-ltdl
-		--enable-gdk-pixbuf
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt5 qt)
-		$(use_with lasi)
-		$(use_with pdf poppler)
-		$(use_with postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_with svg rsvg)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		--without-ming
-		# new/experimental features, to be tested, disable for now
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio
-		# Bindings:
-		$(use_enable guile)
-		$(use_enable java)
-		$(use_enable perl)
-		$(use_enable python python2)
-		$(use_enable python python3)
-		$(use_enable ruby)
-		$(use_enable tcl)
-		--disable-go
-		--disable-io
-		--disable-lua
-		--disable-ocaml
-		--disable-php
-		--disable-python
-		--disable-r
-		--disable-sharp
-		# libtool file collision, bug #276609
-		--without-included-ltdl
-		--disable-ltdl-install
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/graphviz/demo || die
-	fi
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python2" \
-		"${D}/usr/$(get_libdir)/graphviz/python3"
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c || die
-}
-
-pkg_postrm() {
-	# Remove cruft, bug #547344
-	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
-}
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 20e995cbd026..2d15bd8e8613 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 2337 BLAKE2B 9ca08518fef5bb7d3167cc01caa64da8bd076142174e000cd3881f855644e8e95021149104d86ef82973c6d073eddbaccaf7ea0e8621e3a8e458562d4b7f5b6f SHA512 a17162e5db9fad823f35f867f96e13bb443e2150da84b54d71577a4c33cdbf9497da3d1b3cc0ee051ee7ed607a877133dd6e4483e2a86f150f27f7558e8627cc
-EBUILD hugin-2020.0.0-r1.ebuild 2125 BLAKE2B 7fed3491685573cf5288d91c1bd8287372eb1b93fd729028a3fdca9d4cbbaf247ece8376eb91ebb4a7ac6bd3af66fcc69f710e714a90e5f42bc7415d838753fa SHA512 d013ac7b751f6d624db2744349fa100fe240b40d106b29c443bc37b2ce30738423da5096babe7d4e37abb17b377b1741a612a40cee58eea8b8aec017b534a4ac
-EBUILD hugin-9999.ebuild 2065 BLAKE2B f64cb2ca7c5eadade0e76545a7f3fe778e41e22509eb8a2149bd2e45efc0de33193dbbcb52820878b85e08b1b977c38ca99b62163196334fc5ca5d90d8eb8f77 SHA512 eeb41148cd7ca8cca9429fa2e231007ba99885790563a266c05730a62ee3be1a513927d632aede8e1e2f10c1965bfc03d66cb6326c0f1a1a239d5c61a194b90b
+EBUILD hugin-2019.2.0.ebuild 2337 BLAKE2B 0b8295d5c6c977294adc9d85595a94487c435e3d92d78cca08c1f974f8d248e127ae2441a22577b97f73cf0578c04012f02081541a54525c7e21ffd20055dc99 SHA512 9a30eaa2363e5dc0c5c44852108442f37fda31fea9693e68d76d70d6b88ab55de4720f32a837eb5df074f47558471697273d2fdaaabf8b145ff2ce19fe8375e6
+EBUILD hugin-2020.0.0-r1.ebuild 2123 BLAKE2B 0e29992ae8996334f351b288b3af9f980373c46ff1e19eb19418aedb048dc394a13183f73cac3e8eacbf86f3acc1f5bee8b0859433ffe043b08405b945991a0f SHA512 afc36a89f9120e018e8c93d9f8190acacf97a8768800c7017748c6080ad759f1a2c9349213b0b3face01922254ab30a60eedc71a70e52eddf698844f489d9737
+EBUILD hugin-9999.ebuild 2063 BLAKE2B d7e4b9e0cfd4f945774e36b62e386d9cf8bdd857b9dbf2f976386ccddbf7808cdc09810f11ac7dd842bebdb54efd495bfc0dee545a433cb839d9cb77eb5cade9 SHA512 6583c87904f2d1e9f4412c108d25b3e41a59ed4550893c6d33c9d65828ca9b244aec57d60141210945223d2c2eab95929e21b63dfbed5535cb2311fa5dfef906
 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild b/media-gfx/hugin/hugin-2019.2.0.ebuild
index 0981ba7e2eef..551c513f4c09 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.2.0.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=6
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 60bec67bbd97..564aa6501c67 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.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=7
@@ -92,7 +92,7 @@ src_install() {
 			*) dir=${lang/-/_};;
 		esac
 		if ! use l10n_${lang} ; then
-			rm -r "${ED%/}"/usr/share/locale/${dir} || die
+			rm -r "${ED}"/usr/share/locale/${dir} || die
 		fi
 	done
 }
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 0c9e3ac20a0f..ee7505448f4c 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -90,7 +90,7 @@ src_install() {
 			*) dir=${lang/-/_};;
 		esac
 		if ! use l10n_${lang} ; then
-			rm -r "${ED%/}"/usr/share/locale/${dir} || die
+			rm -r "${ED}"/usr/share/locale/${dir} || die
 		fi
 	done
 }
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 90abf3f6dc40..7316330e6d30 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +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-52.tar.xz 9152084 BLAKE2B bc50767e3eacc06ccf6168d9cac5666a2836e3b2085ee834594da419c2912cafce7dee84573f1a2062e051afb066529ae79b7bea25242fb055fdd11e734ee0d7 SHA512 79e6ab62722060601283f4c172f7a27b7d3c00f5dbdfaea4c1f5c1940a681ab3fd53e4ea4b736adc3e0662ecccba13f7f86baada3d319733191eda37abee38a1
 DIST ImageMagick-6.9.11-58.tar.xz 9167216 BLAKE2B 48fa4d6ced002a08268bb607bcf5988bb9fdb27c6c5fc20e5c73c06b9e48837c972b884e73d8a57d16dc0a1d9ba0cb4cf6aaee144a7193caa3d9fbd5ec6839a8 SHA512 b116596bb737cf78b9ec27ae4cc8aa3163f4201e68c3bbc9666421766859d2a2d7521697a4fdd94c6276d190667161816d0ee31dde3e06303bf09ffe79409885
-DIST ImageMagick-7.0.10-52.tar.xz 9642352 BLAKE2B c1a86214978da88d66ef90b91516482fe67ee5e215fd5d76c79dbbcd9e33cc2d417d8f5d8e29056743737dd2275fe7a8d891b6ad2f3c8d7d5ab0adfd83f60dd1 SHA512 da1a8d53af0dc8f0dc8f71a7d41c5277c1e17f81e03a3c54852ced65d5d379577989e274bac66926c8a10f4d2f2834f7456b79635007252308ca593e98ef6d43
+DIST ImageMagick-6.9.11-60.tar.xz 9167220 BLAKE2B e212c2435414ef052de478c3c65c25291dac2f7b8d213b4408a1971d9c3b57180269a430b6f9fbe9da45587dc52fe62cd9b520f2b2a8e5b03fd86260107c2d0c SHA512 5a4de32a76cca71ae1ccbdc67f160aa451fbf44cf77fb7476ba3a2a6116783034a334f9dec7b8fbb328f06a2a4bec2423f72e4a6b452436b6953bec83a49a8b5
 DIST ImageMagick-7.0.10-58.tar.xz 9655792 BLAKE2B b16db99046427bc0c764588fbf7d10f9f7cdf665d8662b03103ec69c75d44aea80575ae1b8381b15e33dc6a393216918cecbdbd93ea61639b4b09ec15d1588c8 SHA512 ec58eba8a35d78e481d98ae6e13daddc81a8e28904b1524735ce54a7d1557b4ec22d314ecdfcb199685ba55604e6fcdc3cbf9193775627dbd42bf61983c98593
-EBUILD imagemagick-6.9.11.52.ebuild 7027 BLAKE2B 86b4d7cff818d7528e3c73998a3ab7c4637df1891cd877bd5cd05711f367848f77ccc601cae4026245b7b8e178ce1fc8f2f4f6d5eca4c84abacd2eb9baa09f7d SHA512 86cc4771514ce326102f7d9a6189a875e9195f8ab682a136cec94e739ce9981175559505a84395973af18f909c8f0acafd814efa78699b464ad3cacf474638c9
-EBUILD imagemagick-6.9.11.58.ebuild 7034 BLAKE2B 41bc3bf174a47d092ce5f21e044eef416e80a46cdcf7a72412e43d7ed962e07ae5b4962a7a76da4b5fc8ed58d79acee9fe2fbf46252fadf95564ddbe1da68466 SHA512 b6f314ac6ce9fc39851668c3ac14ca6541acedf973612f03a93dfc26865f11b15d6b871481b5a99563b9eadfb206fd6eaa986140d493bc931cd9b63ae008962f
-EBUILD imagemagick-7.0.10.52.ebuild 7336 BLAKE2B 6da2a0d1f45ccf002d9ef542dee22c43211035a0ee6e1eab6a4895b26a15832168f8293fda9f2ff918bcabdd407f4815964c070df4c100cb4e196a722d807d68 SHA512 816d1559730011b20cb0b68c93937e9ef92ba861fbe8699e3584ac5b4d21d5c684922c334c545b0cce188f0d2c86d82c07e96afe36cad36c2b1cd8f15f49029e
-EBUILD imagemagick-7.0.10.58.ebuild 7344 BLAKE2B 717b9fd4e01bd0acb08fda48b89f9c061b01aaf493e2765ab0a053f1905907d2a01d66e6c79b199351d2f8b0625030369c674324b4b2ed5e95751fc6ac5cee60 SHA512 53988544b8b7beb7986274144b66ea220a7f2e53c2d1a98597e3a3d2efc10736b3c1b23b598829bb2cae5acd3292b18eff12cd298444b295bdc4aa0dffe67276
-EBUILD imagemagick-9999.ebuild 7344 BLAKE2B 717b9fd4e01bd0acb08fda48b89f9c061b01aaf493e2765ab0a053f1905907d2a01d66e6c79b199351d2f8b0625030369c674324b4b2ed5e95751fc6ac5cee60 SHA512 53988544b8b7beb7986274144b66ea220a7f2e53c2d1a98597e3a3d2efc10736b3c1b23b598829bb2cae5acd3292b18eff12cd298444b295bdc4aa0dffe67276
-MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
+DIST ImageMagick-7.0.10-60.tar.xz 10143800 BLAKE2B 665cb5517cf9864ffd7e132bdeb01df02fbc5211b73be568751ef3cdd2638a9052862a6607e0b5236cd44df3a796e107f4f0ec5d088b032d6829342f937d56b1 SHA512 bfc3192ad465511ed8b88947cf4b8f306202b6ed3ec230ac524a13a17a5adcab44788d79b659d071df82d4da7833d1e9bca0481c83de51dfdfb9cc16b97537d6
+EBUILD imagemagick-6.9.11.58.ebuild 7058 BLAKE2B 9c8142d44c502984ab0c4f27d4f2013997fae642170a03516b2cb0443c79486dd70f603d66080f7cfb6c5c79add8acaa8e5e6c3002dd02994f57c9b7909bcf88 SHA512 f7933e87df9ba40eca3b71a3fdb78effb79293062cb1e7ac821b7ce3a90309623efaad40048daf2d5f13be26d186aa78c00b3bd54db80b20a394b040edea5dcd
+EBUILD imagemagick-6.9.11.60.ebuild 7065 BLAKE2B 0b37c67158ae3b4bce0fc69f2d891f6de22d5546aaed84666465cb34f2faf00af94c33dc2576e3680a7244cbd96f909e05785e22131121f6037d139db3f3395a SHA512 1c3993e04b1189cd20781f01b651a28e64360a2db7bdaa654ea54b6fdd4fa9371014f2e3312bc5d5138e0e192b20223120912bcd6acb67352ff5f498cd63dce6
+EBUILD imagemagick-7.0.10.58.ebuild 7367 BLAKE2B f35bd66be7bbbe541c44f790a02c4afbfa7f74da18c4c938eb8741fd4536f10fa93bb18243c1b8ebecfb520254657ff824e3e7ca8f07e69dfb2d6f90f665fa94 SHA512 46423ee52a846340dc791a1faea012883a8d58b9858874fb12d4fea4a26890195b3b0848035e88fa7e482dfa694fe799914de8322fd6cbeae226c8be9d1130df
+EBUILD imagemagick-7.0.10.60.ebuild 7375 BLAKE2B 3b5c65437c1e0cec41a5b001a03941962c2fba2e8e78ba013b03fc6b75bb7f5773f734ca493287d26e31feee50d299d787b7f2bb1d53911a77214c1217a3a394 SHA512 d02334f79bff26688d48be19d66293201ecdc833e306efeb6d39e8f7299ace14d5e320db0c075abf0a8fd19ae59c82129b1322544df0055a28b661bbe426a2df
+EBUILD imagemagick-9999.ebuild 7375 BLAKE2B 3b5c65437c1e0cec41a5b001a03941962c2fba2e8e78ba013b03fc6b75bb7f5773f734ca493287d26e31feee50d299d787b7f2bb1d53911a77214c1217a3a394 SHA512 d02334f79bff26688d48be19d66293201ecdc833e306efeb6d39e8f7299ace14d5e320db0c075abf0a8fd19ae59c82129b1322544df0055a28b661bbe426a2df
+MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
index 1ad14695c634..8b0ce8fdad51 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-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"
+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 )
@@ -206,7 +206,7 @@ src_install() {
 
 	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
index 203c905e1c68..d80bdfa74e82 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-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"
+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 )
@@ -206,7 +206,7 @@ src_install() {
 
 	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
index e5a1d02609e0..5d7a1d8dc05b 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
@@ -13,7 +13,7 @@ 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"
+	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"
@@ -220,7 +220,7 @@ src_install() {
 
 	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
index 88889b42904e..67687ea276c1 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
@@ -13,7 +13,7 @@ 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"
+	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"
@@ -220,7 +220,7 @@ src_install() {
 
 	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index e5a1d02609e0..67687ea276c1 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -220,7 +220,7 @@ src_install() {
 
 	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 03046b7fbb47..b8cb95f4c2a3 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="project">
+    <email>codec@gentoo.org</email>
+    <name>Gentoo Codec Project</name>
+  </maintainer>
   <maintainer type="person">
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index bc136e75f16e..e11e9f1873b6 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,3 +1,5 @@
 DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e87061fca61eb7d5e25d6489662fc2bae94d9a6d61d531a77f41b9e94492d0db1f32570f6d471fa9f8cb0816630d SHA512 2a9d31b9de52123941fd650123a483f4dc0757edda304da994353b5f3167bddbb25fa1ed8fededcf859c5d07b65b9c2d5185000949002a68dcae1e7bf0f1547d
+DIST img2pdf-0.4.0.tar.gz 107027 BLAKE2B 0bf13e2d4a5aff68779130bc14100a5c6d1ac4eaca9da28ceb50104550b6e4331f6a2202514bcdac0480c0148794d18e9f2dd46ded68bbaa301a207460f91c85 SHA512 bab9ee6ef5273a686cb10e52bdeb62b6df3c0da99d0f0558677e07dc7ad776c2d62829a2f5e9c5639acfb9fc6e9c5e3a81aed42dc288c2a39d245775f1d4391b
 EBUILD img2pdf-0.3.6.ebuild 563 BLAKE2B 37031fdbc0276e3e64bb865377a717334892f926a1bf97ef320b0bf8b7b894e8a3a1a86c7b90ab30e11683712ea10a0ba545dfb2b2dff67f5f78c1852518a14f SHA512 c4f94db0ce5e98bcdb0eab1b72eb4b04c3a8061f5cf82bcb8520b5eeef8a2d98dc98a81420e73b5323688d036fc00471d20c5897532c1bca54d34f416ef12471
+EBUILD img2pdf-0.4.0.ebuild 1229 BLAKE2B b11202968dfce6f9c1aceecf4b4c1befdafdfc464e059ba1f3cee9798c671028bab6554587065d3a4bae8c3a676cd6ff209a2640967fadece11a6f8dd2dc33df SHA512 97e9c28fd8f0d91058233958f239286990347c4e6b88678821a6b48519fd3ffd7f622e4bed892920dd5a4ace5748262f4454fa24f5386703156f1210ca4e6169
 MISC metadata.xml 1120 BLAKE2B df864ac9c560f0e55a889701014713ecc210b15b094ad729b94bfbe29fcadbf6d31f37d4b2761a538fa6e4a9617a0b030f487b2e2d5c3b347d834a2c287f07ec SHA512 825a15bf571a32a1b458a4d731fdc578ac024f8a067ff61e9cdd85066fcae5f92bb48a3fcb4bf0e78c5b01f5d4550b6a3b7bd6c1951f7e7264fb4c8078c216e2
diff --git a/media-gfx/img2pdf/img2pdf-0.4.0.ebuild b/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
new file mode 100644
index 000000000000..aeda8aad1be4
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# missing dev-python/pdfrw dependency and
+# require old version of imagemagick
+# waiting new version
+RESTRICT="test"
+
+#BDEPEND="test? (
+#	dev-python/numpy[${PYTHON_USEDEP}]
+#	dev-python/pdfrw[${PYTHON_USEDEP}]
+#	dev-python/pikepdf[${PYTHON_USEDEP}]
+#	dev-python/pytest[${PYTHON_USEDEP}]
+#	dev-python/scipy[${PYTHON_USEDEP}]
+#	<media-gfx/imagemagick-7.0.0[jpeg,jpeg2k,png,q8,q32,tiff]
+#)"
+RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	gui? ( $(python_gen_impl_dep tk) )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+
+	# Remove gui executable if there's no demand/support for it.
+	if ! use gui; then
+		sed -i '/gui_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv src/img2pdf_test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index ba923e0bab8f..83b705ee5c01 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,5 @@
 DIST lximage-qt-0.15.0.tar.xz 91444 BLAKE2B a5ccd9afdd4ed1ec60a5da8ec3390e5d93f018209ce62a1fbf929c6984a056539751f576a15e0b81e4f1ba003d35379791066832f02a45de1a5d5e8e8eb8f0b2 SHA512 980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23
 DIST lximage-qt-0.16.0.tar.xz 100920 BLAKE2B 17a41013b7d7e599662a698fa24b6b15a550b2211dd818fbfda19b0fb9439bf77b63b2d8248ad8a65605fee8fc73c78d294ae86401d5660f6d798aa775273709 SHA512 2da46d23567cff7044a884e14b30de36b3a19d802768585b7c3332897b0af2fc42993ed9bb9d062db7988a0526cc7357a09fbac5f283a615b109ea8dfbf474b5
 EBUILD lximage-qt-0.15.0.ebuild 959 BLAKE2B 4c3c897be70d6fc8742774536ce838d2d06860530bcf15ee893892aebdad64a90d13d16f2ca259113539233996041ff9d2b86bdf3c6fb88f67c9f9766054bc95 SHA512 9353543981a42e1574c82b146c6bbed904bb2fd57cff2e251ad347c8ce8d2a7e6964dd2bc745f09e7f5107833464bf82c11d81bf4452f5430efd87289672a630
-EBUILD lximage-qt-0.16.0.ebuild 960 BLAKE2B ca15fcb74bf4457a1bd3f67e723a101989c22d3d2f4e1a9c50ffd757082e31f3106602904d15ff748dae63ea33b6d81bf5604b694b741d011493c681124f243f SHA512 e94aa07c174b07d338a601a745425a1e215479fa5718c7c7ae05e9e74c9d3d92e9f6281f290eceb068e73081a392d02ce78ed80a5a8c9dd76350aaaaf82239e4
+EBUILD lximage-qt-0.16.0.ebuild 959 BLAKE2B 3a34d5641750e187e535301f03c17e1658c05e8601eae6d29f3b93be0767cc5961a8880a8653a90ecd90ee92947169bc42687f2c5c3acf8c92dd064dd86ff5eb SHA512 d3bf56b433b6a1350d6c721dad015a336f6f3c5614f5c9b86e4856fd131e45592d744beaa9266c5b84e1e16da3655076ee51cb20b4734600fcacc09ad2566763
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
index 3ae75554c3f4..8bd658c7b2f6 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index edf22fb397af..226d4847885d 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -17,5 +17,5 @@ EBUILD openvdb-4.0.2-r4.ebuild 2621 BLAKE2B bbaafee76eeea4aab92cb434043d069de3b9
 EBUILD openvdb-5.2.0-r2.ebuild 2419 BLAKE2B 13838290e15d9cfa3f592dcc840fb08d4ee29a03362a23c5dd4df44af4c1c61e3b512485bfd1ba4487dda38edb58171d1457dd24c4c081c69d2b0afa0050e416 SHA512 0fe29028f37bb9a62cfebba9e4048dbd72b54d368d66ff055bbf6f722f2abc06dc115c33bc613cd5c6776d061f9904513c5fa989c9436b55ef7d884d823d378c
 EBUILD openvdb-6.2.1-r1.ebuild 2295 BLAKE2B d80285cba57899fbe0813eaecffcc0eae412bff68001067e35573389497c4117e8378396675fd94e7ac4d0b79119769a07d2cdcdf97fa252981fbed27da0584a SHA512 3c561ff41a27aa0f843afbb6d2031ecef94927e8f6be6f9c2b3a03eea467fbfb62dba25f6fbed65c34bc4b5605f916a8dc24d6414804bbecdd47a510f3e1ad99
 EBUILD openvdb-7.0.0-r1.ebuild 2795 BLAKE2B 440272791f4a53f323eee0f4050614d05f989d57c5dc315d0a640a909943472b4a35c108aed40af92809401cf57458cf9a8ce4c891f097dd2bf95bd2af33d38a SHA512 6a2791a989bcc851a1f250da50dc118502029be02e6fe7dc6965c8595644d4921f7622b1e08b029514573163148e5a4df3aecbde2258e1ded373313a70bae910
-EBUILD openvdb-7.1.0-r1.ebuild 2732 BLAKE2B 271a8d6e6bd1a900c42d6042598d62def51febaa5a472bbbcd915252eb4a7dd6d8a4798e0d52c568b59b13b4f03e2731a9bb0fa2ab7fcb03f5a8ac1476874ac7 SHA512 c67742bee3b499f32c616e5d07f2452e37ae6dcfd55729de40fa6e0e4318dc1505b7438a7f818e0a1a61de73abda3c2a0c0642d9930d59e3e59bf4a003f497e1
+EBUILD openvdb-7.1.0-r1.ebuild 2737 BLAKE2B 87f02ab6d0d1bc20a0986752008bbb6814eb197a258b0ea49a61065aee9407c96adf5fc365a532cb2382f134e7a2c903f5cf1fb0105aa7ee1c36ce8d7e461d87 SHA512 91da3d843851ee08a6694c4863e3bbce55a30aa7e57f1026376c8b62b7fd603e171557220a8d48411657fa8f576b775c0ed540daa191b91b8958a5b86716a9e0
 MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
index 50f2feb253b5..0b228501008f 100644
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.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=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 1ee961644e88..8ade99d481de 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -7,5 +7,4 @@ AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00a
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
 EBUILD povray-3.7.0.0-r1.ebuild 4591 BLAKE2B b4f021ddee8d71229d8da5f5c8de887d7b48aacab6ad7d205626a33395e9fdecf34e5f7be52a13dd9823b0a6052e8b99afcae307169b170b9bbca76c3063e381 SHA512 703f21c9dbe850608a50b9b96f1c1ee570a0ecfec4687069623f0543f44305be930453f1063cca5420d5adc1c1e7e3cc5514f2d7c1dfbc28d9bc8e58e7cacf81
-EBUILD povray-3.7.0.0.ebuild 4370 BLAKE2B cc4cc0a86bab78ff481f4ae63c6a522bd34659774c8e6ff1d291da5cdbb3cc82fd191c0e5afd0fe1371169717c6a2b6c83e8fa153772a711c50d65f1d596bfd2 SHA512 f1ff9e45b4b853613e5aeec844f6f7843f77669e8ac432b22e1d8b89a80e9e761a22cd59e3e272425cdfa43a411a41e996ada8b66e809e2e69692ecf574bc5d6
-MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
+MISC metadata.xml 409 BLAKE2B e2a6e08275a5f651f9f01b40d2b65a96ab4e339913a436310ff628c16c4b75c2c760ffd83fc028b4b281c86eb21097f8a4f837b33c44ea86c7c5c179377e824a SHA512 fdd7e78c78ae071ae955489caf83beff36f2db53a85bae66a2660db005bb40ff27a4a34312ea293b319c346f5ed68c55ac488abfd09eece266eb003362a56987
diff --git a/media-gfx/povray/metadata.xml b/media-gfx/povray/metadata.xml
index a23bbb8953d4..fbb9f48050c7 100644
--- a/media-gfx/povray/metadata.xml
+++ b/media-gfx/povray/metadata.xml
@@ -5,7 +5,6 @@
     <email>sci@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="mkl">Enable support for Intel Vector Math Library, part of sci-libs/mkl</flag>
     <flag name="io-restrictions">POV-Ray's mechanism for control of I/O operations</flag>
   </use>
   <upstream>
diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild
deleted file mode 100644
index 18e8cc6886ce..000000000000
--- a/media-gfx/povray/povray-3.7.0.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic multilib versionator virtualx
-
-POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
-POVRAY_MINOR_VER=$(get_version_component_range 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
-	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
-	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
-else
-	MY_PV=${POVRAY_MAJOR_VER}
-fi
-
-DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="http://www.povray.org/"
-SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug +io-restrictions mkl openexr static-libs tiff X"
-
-DEPEND="
-	>=dev-libs/boost-1.50.0:=[threads(+)]
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/jpeg
-	mkl? ( sci-libs/mkl )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr )
-	tiff? ( media-libs/tiff:0 )
-	X? ( media-libs/libsdl )"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	sys-devel/boost-m4"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-user-conf.patch
-	"${FILESDIR}"/${P}-boost-1.50.patch
-	"${FILESDIR}"/${P}-automagic.patch
-	)
-
-src_prepare() {
-	[[ ${CHOST} == *-darwin* ]] && \
-		PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch )
-
-	cd unix || die
-	bash -x prebuild.sh || die
-	cd .. || die
-	rm -rf libraries || die
-
-	# Change some destination directories that cannot be adjusted via configure
-	sed \
-		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
-		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
-		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
-		-e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
-		-i configure.ac || die
-
-	sed \
-		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
-		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
-		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
-		-e 's:mkdir_p:MKDIR_P:g' \
-		-i Makefile.am || die
-
-	# The "+p" option on the test command line causes a pause and
-	# prompts the user to interact, so remove it.
-	sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
-
-	autotools-utils_src_prepare
-}
-
-_src_compile() {
-	einfo "${LDFLAGS}"
-	autotools-utils_src_compile LDFLAGS="${LDFLAGS}"
-}
-
-src_configure() {
-	local non_redist_conf
-
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	# The config files are installed correctly (e.g. povray.conf),
-	# but the code compiles using incorrect [default] paths
-	# (based on /usr/local...), so povray will not find the system
-	# config files without the following fix:
-	append-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"
-
-	if ! use tiff ; then
-		non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
-	else
-		non_redist_conf=""
-	fi
-
-	local myeconfargs=(
-		${non_redist_conf}
-		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`"
-		$(use_enable debug)
-		$(use_enable io-restrictions)
-		$(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with mkl libmkl "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with X x "${EPREFIX}/usr/$(get_libdir)")
-		--disable-pipe
-		--disable-strip
-		--disable-optimiz
-		--disable-optimiz-arch
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	# For the beta releases, we generate a license extension in case needed
-	VIRTUALX_COMMAND="autotools-utils_src_test"
-	virtualmake
-}
-
-pkg_preinst() {
-	# Copy the old config files if they are in the old location
-	# but do not yet exist in the new location.
-	# This way, they can be treated by CONFIG_PROTECT as normal.
-	for conf_file in $(ls "${ED}/etc/${PN}"); do
-		if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
-			for version_dir in $(ls "${EROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
-				if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
-					mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}"
-					elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
-					break
-				fi
-			done
-		fi
-	done
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index fd1d311a3bf7..e65f927e4247 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -14,5 +14,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
 EBUILD sane-backends-1.0.30-r2.ebuild 8229 BLAKE2B d7f2e41ea54e06aaabd9a0abd47210c45ecc891e34f9563aabf19b11df0e3d250741f1a557465d5fb2f1e5de99f18d292212b160bc52224c5026544f7bd17f0f SHA512 08ba6b7bd2b5a28a8be809794b5b720075d1b3ba383d2b8bdbb763322f9b01838374ac3c152feafe9d49edd9d135cf184e8ccd8f5adfc4b7a4b546f5a1e194ea
-EBUILD sane-backends-1.0.31.ebuild 8564 BLAKE2B 3e1238d0720b75ce26da8e2526052661969f6cb58adc7c8462d9fa6c3cfb91276f62af045f730cd7b3d2947873df78d6a6bbd4c2cb3f3cbe4b479326a4f865f8 SHA512 98d4fd0e1b1f64197f2a5f4111750991fca180d2854d00a3a18f0333b8572926e613d6487d4627e5b45a1b6ba76dbaa7453d2e7b8418ed9b071c6657ac5035e1
+EBUILD sane-backends-1.0.31.ebuild 8666 BLAKE2B 6caae9f8da58305d5f4abab01c065e49baa39544e720fc4d5a8f3ea4ac9c34d9acd470b86b0e2949939bcfe8730178704a89501d3d0797e020cb9c49d991f8de SHA512 fed927a991b52670d25e155f36cff93c5063d99432a76c7d84e6ad707e4f35964717c3c99ddc434dfb0e455bfa5a4542d53a787259655d9637bb121baf5a8ac0
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index acb6d8ba149c..c8b16df1f939 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -231,9 +231,10 @@ multilib_src_configure() {
 
 	use gphoto2 && lbackends="gphoto2"
 	use v4l && lbackends+=" v4l"
+	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
 	local backend
 	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
-		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] ; then
+		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
 			lbackends+=" ${backend}"
 		fi
 	done
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 5b8cc5561b83..af406bb14f16 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -3,5 +3,5 @@ DIST scour-0.38.1.tar.gz 99693 BLAKE2B 33c344bd68f54352723b769e289c0caf90d8de11e
 DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
 EBUILD scour-0.37.ebuild 708 BLAKE2B eb167bbc3cd3d00b6cbca53f6bcefdf792bd47172476b0c0f996378ec52c4e1138e9306c5cb49c872a3731774632d2ed626a827f9714bc2698960d1fe7f0581a SHA512 22579cc30021e688528b9afb44240322946ca97a11bb0a3df876f38911f10fca7a2bbec8c78234aefec61093d83100b498577f02e8f919b8f532dd6cf18e4c0c
 EBUILD scour-0.38.1.ebuild 714 BLAKE2B 1091dd0238b572d62f3808fdaf913140d0bf72011a0a9afc912251fa67860f99f0c65a051a6473d7f4a6a9896fe78208bc4ce4536f64e525088c45954b149257 SHA512 8c27a9ddf4601cb7810d68b4e899435c91affb586acaf75fcbcd92736de2e0a5fa14b057eec7d69042e0b53584ba223c76080b955f7298703f12280c0c48b42b
-EBUILD scour-0.38.2.ebuild 714 BLAKE2B 1091dd0238b572d62f3808fdaf913140d0bf72011a0a9afc912251fa67860f99f0c65a051a6473d7f4a6a9896fe78208bc4ce4536f64e525088c45954b149257 SHA512 8c27a9ddf4601cb7810d68b4e899435c91affb586acaf75fcbcd92736de2e0a5fa14b057eec7d69042e0b53584ba223c76080b955f7298703f12280c0c48b42b
+EBUILD scour-0.38.2.ebuild 709 BLAKE2B 0db961a19b93dbef534eee619b5373fb3e714e2e905335dc5d7aef4544023d70a5a034428826b7f71d14e677cf0e2eb8fca55063ac74d3496f71db04283dd4fb SHA512 661b9a8e07a10dc785021bf895ad51d06ec4c3bdc606451fb61e1eaec023b96220d5e35ef6de5a5cadda899d28997249a51bb5835bde98f56ff7af1fff6772ab
 MISC metadata.xml 193 BLAKE2B 7acb137a1e8618cd92414ef5f9b789a55acfd26c37e7cf00181c62dd8471e217e97670719fd5d6c00834cadb75a5ad8c8cac7fd06c87ea61551d77eb8af1e6e2 SHA512 e34d92e02e423c37397982d7865e381b6eacd66dec5dd4e360697cb8ea326638ca3b2b88c23277f7fa6248ed31081e2938fbe6fc5178ffc52bdc4798c027341b
diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2.ebuild
index f03ccfc7acb5..d55ddb1cfc19 100644
--- a/media-gfx/scour/scour-0.38.2.ebuild
+++ b/media-gfx/scour/scour-0.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
new file mode 100644
index 000000000000..964ebe7ad0cc
--- /dev/null
+++ b/media-gfx/svg2rlg/Manifest
@@ -0,0 +1,3 @@
+DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
+EBUILD svg2rlg-0.4.0.ebuild 950 BLAKE2B a17634c9d1bd786ba001686f2552ffb3a70a23cf1f246b98629d0b79e9c1319aac83f51dec503846d2a808ad3e5ba3d51004b2770b400d4fe7013c80a12da20c SHA512 e5ab448ae74dd1b0ddf07a16208937f38a587b1b466efb4d2aa6306e5b935924ffb0f4d17689cdfa06ceda2ca0282f68e4288b78109f74054722ec1bc4e9d23d
+MISC metadata.xml 435 BLAKE2B 959a42ebbe8dcec9cb5617c869387268b1fbac950540fd47b2e0121a36dcd763c269ea26d09d617843aa2d665412fd677d1833a42d98cf3e33d6c9cdc82c2e55 SHA512 8b83221cf8e9bc87dc62da2f4a18b85afca886b62cd3cc742ef258d7e6e462a9abd23cbd497ca6236100302d0b483cf07e0a2b98d45c8687fcb10ef615a18846
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
new file mode 100644
index 000000000000..3e0a25ba5a56
--- /dev/null
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nerdboy@gentoo.org</email>
+		<name>Steve Arnold</name>
+	</maintainer>
+	<longdescription lang="en">
+		A tool to convert from SVG to reportlab graphics objects.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sarnold/svg2rlg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
new file mode 100644
index 000000000000..dd314bc752d8
--- /dev/null
+++ b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Converts SVG files to PDFs or reportlab graphics"
+HOMEPAGE="https://github.com/sarnold/svg2rlg https://pypi.python.org/pypi/svg2rlg/"
+
+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"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/reportlab[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	nosetests -sx test_svg2rlg.py || die "Test failed with ${EPYTHON}"
+}
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 2f8364665c9c..e8c51488825a 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -5,5 +5,5 @@ AUX tuxpaint-0.9.21-underlinking.patch 592 BLAKE2B 1af0a14e4512b748fb2294e9ebe7c
 DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
 EBUILD tuxpaint-0.9.21-r2.ebuild 1701 BLAKE2B 8d08863971b633e62022a4264bc3cb22bc20bd9469c35378960f07a0eb606481715ac6924d360648e75f27109283c4fb93de44ab504ee533a2ad6fa9bf06b737 SHA512 53ba744c47ab39730e6db19fea50e44818ed0fee483aa1e4e3a7e1d6cd8b679e1dfd453523956b0cbd447d92808c6c861dcb5109af2470a14fd228eb85d6b945
-EBUILD tuxpaint-0.9.24.ebuild 1677 BLAKE2B d56b983b9b76f5bca8dc108ec7e78a8d3a336e2f6fac1196d593a88343de777b2526ba0ddf87dd97922518db9e31e91f4773d31f50a82a91c762e0e12d23fda7 SHA512 2ff6a1124a6580733e90898dec8bb3f59db143e348d73865f6cdd846a7b3cbea2e267333f1f6a4388a1fea8985b717675f73d09e3cfeb42b80e94cabb5eaa019
+EBUILD tuxpaint-0.9.24.ebuild 1676 BLAKE2B 2311eb8e10745b07998a53cab43d967a623d70e62cb942bd818c3cfa7b605e05fb26269fcd61838fa5ae0ad379901ca3ce51c5603b976524158d81dbe6a5a692 SHA512 c84371c466b600c4326f7a82337e48242bc41d6805acb3d0a1cae61a410d95aba1b4ea5342427faaeee27f9d170ff4ed1600cef1f15dfa79eb0b28d9fee77c88
 MISC metadata.xml 618 BLAKE2B 41214f92d2223b2791c7f79b8add3c494549a9f7e4048d17ec74aa13a56c460d3c83df08bd2f93358e8aa4eb6b497a6f3b9e49cd422a6a17a211341bd44e4bdd SHA512 e1be803667ac0a7a2a364f05f08e0514826292f11b3ff261a215864cfa50d61538f4535a83b0903e85c942098155231725db6e664aee4cfca812a36d670c0f72
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index b7dc34d66933..f36eec6c6984 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	app-text/libpaper
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index f735ae50a7c2..3343c98e355f 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,7 @@
 AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c
+AUX valentina-0.6.1-disable-vcs-version.patch 2623 BLAKE2B 30ed726eabcbf18269fb41f7cb32230b0f498364b6e2922de415cc93c4fce49dca2b5db7d28cc8fb34efbc11e7b8f136f601fc0d552b52869042c496cf627463 SHA512 906f82b0793919be6a846030b4b5891e716967e9c2bd8b01bf81671383cc5f20d50ddc0c6d174c08b5e5f31522acf7283b2cc6d11e29bca60d45a64cc7418e98
 DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720
 DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542
-EBUILD valentina-0.6.1-r1.ebuild 2143 BLAKE2B 5f3b0e7038c3809c97ff5ab5ffc139897d68d822a201c792b0d235588f33a97dce4a3b1e260e05b19ce44a39bb2812659a960493febde39029837316220e50c4 SHA512 459aaa638771b0312dce45786b7f7074e74d7cc28115ba5d27080174c0695ffaf3ad00f07e3e5a41fc296b364fbd292943591349ae3326864680a2f3176fc0f5
+EBUILD valentina-0.6.1-r1.ebuild 2189 BLAKE2B aea847aa2313d46ebf889531806f1f9c2a5e1d4865c78faed42587ff76d5908e3012da8af7add2f794c1aba39e924d88800a638cfdaa6f791275cadb06bb1e9c SHA512 d52df819ca46613b322b6de0470180b689e954334838adddd61b12aae3d3217facb731f957c5799830461caa03deaf8463a89ca3b1767af4bc8e2b4632cdc8ff
 EBUILD valentina-9999.ebuild 1945 BLAKE2B ba3f8e84d5654d312910d83d7ba2a2d875477b08e85b140e3e9d9bbf43ae25dcc67b32cc3933dd66bb2201e464b853c935378d70583e7295c3c3269c32311a74 SHA512 10651225c740f0a513c3733b7f6a5417510062a30f08743c0d8e50fa6053ec708c29b7e2ec5740fc8ffbff7333b7a8ec987f758924a9bc25a401fb25dda2bb49
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch
new file mode 100644
index 000000000000..471d7a85313c
--- /dev/null
+++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch
@@ -0,0 +1,75 @@
+diff --git a/common.pri b/common.pri
+index 523aa7c..33be789 100644
+--- a/common.pri
++++ b/common.pri
+@@ -212,37 +212,7 @@ defineReplace(enable_ccache){
+ }
+ 
+ defineReplace(FindBuildRevision){
+-CONFIG(debug, debug|release){
+-    # Debug mode
+-    return(\\\"unknown\\\")
+-}else{
+-    # Release mode
+-
+-    macx{
+-        HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS.
+-    }else {
+-        HG = hg # All other platforms are OK.
+-    }
+-
+-    #build revision number for using in version
+-    unix {
+-        DVCS_HESH=$$system("$${HG} log -r. --template '{node|short}'")
+-    } else {
+-        # Use escape character before "|" on Windows
+-        DVCS_HESH=$$system($${HG} log -r. --template "{node^|short}")
+-    }
+-    isEmpty(DVCS_HESH){
+-        DVCS_HESH=$$system("git rev-parse --short HEAD")
+-        isEmpty(DVCS_HESH){
+-            DVCS_HESH = \\\"unknown\\\" # if we can't find build revision left unknown.
+-        } else {
+-            DVCS_HESH=\\\"Git:$${DVCS_HESH}\\\"
+-        }
+-    } else {
+-        DVCS_HESH=\\\"Hg:$${DVCS_HESH}\\\"
+-    }
+-    return($${DVCS_HESH})
+-}
++return(\\\"unknown\\\")
+ }
+ 
+ # Default prefix. Use for creation install path.
+diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro
+index cf8db51..fff1c0e 100644
+--- a/src/libs/vmisc/vmisc.pro
++++ b/src/libs/vmisc/vmisc.pro
+@@ -98,10 +98,7 @@ CONFIG(debug, debug|release){
+         HG = hg # All other platforms all OK.
+     }
+     #latest tag distance number for using in version
+-    HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}')
+-    isEmpty(HG_DISTANCE){
+-        HG_DISTANCE = 0 # if we can't find local revision left 0.
+-    }
++    HG_DISTANCE = 0 # if we can't find local revision left 0.
+     message("Latest tag distance:" $${HG_DISTANCE})
+     DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources.
+ }
+diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro
+index a336d48..c943fc5 100644
+--- a/src/libs/vtest/vtest.pro
++++ b/src/libs/vtest/vtest.pro
+@@ -92,10 +92,7 @@ CONFIG(debug, debug|release){
+         HG = hg # All other platforms all OK.
+     }
+     #latest tag distance number for using in version
+-    HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}')
+-    isEmpty(HG_DISTANCE){
+-        HG_DISTANCE = 0 # if we can't find local revision left 0.
+-    }
++    HG_DISTANCE = 0 # if we can't find local revision left 0.
+     message("Latest tag distance:" $${HG_DISTANCE})
+     DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources.
+ }
diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
index d6decfb393ab..e770ab6d6e98 100644
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-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
@@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV}
 
 PATCHES=(
 	"${FILESDIR}/5823.patch"
+	"${FILESDIR}/${P}-disable-vcs-version.patch"
 	"${WORKDIR}/valentina-5858.patch"
 )
 
diff --git a/media-gfx/wkhtmltopdf/Manifest b/media-gfx/wkhtmltopdf/Manifest
deleted file mode 100644
index 58c0b4ff1198..000000000000
--- a/media-gfx/wkhtmltopdf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wkhtmltopdf-0.12.5.tar.gz 511181 BLAKE2B f52d56fd932dfa514cc2711d22f99ea29960a3c4da2522be9f58f3197cb12494f1cdc8856399e328cfc39956282b8174886ee8edfc7417ba5c5d65ea353f6046 SHA512 3f982a6964085b36f62988b618d88d4339f03ad8d2e733c1fcba5e2e7cb545ccc99313ce35474605df818f91c289a87ddd952f21974fdbe846f990bf03fc2fdb
-EBUILD wkhtmltopdf-0.12.5.ebuild 894 BLAKE2B 9fb89715477e0fc29ef9a8043a5a330c133c4cb3820a02de0a89f34df189b0eff715adac588fbb981cb9affaf89cc6a9871c2870f9429a9c67cf17a16fcd89fd SHA512 2cf388f46e5f220b7498bc007240c3735ff094b069200fac34a0c1c892a0faf62bf008cc800b536330948518273a817ba741f20e4015fd8b16cb3c352e8ebb9f
-MISC metadata.xml 255 BLAKE2B 41d673cb572930d29b1d30c4404af2491be6fa7e30b48d209e2e8ab0006f139073dcddb8b3764c8f88e74ec278e1f0873354131a8c166b8d16a977a571f4a8cb SHA512 a2db8323ddf16099d9fa32b0831c81a5946122b4fe9830c1a22cabdf74b39e6f947b617b5b4da1fb4a7c0d06df3ae8413aaa883de38984e62ea3621e1938f830
diff --git a/media-gfx/wkhtmltopdf/metadata.xml b/media-gfx/wkhtmltopdf/metadata.xml
deleted file mode 100644
index ef3087b58eb3..000000000000
--- a/media-gfx/wkhtmltopdf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">wkhtmltopdf/wkhtmltopdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild
deleted file mode 100644
index 3fb400e2f185..000000000000
--- a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Convert html to pdf (and various image formats) using webkit"
-HOMEPAGE="https://wkhtmltopdf.org/ https://github.com/wkhtmltopdf/wkhtmltopdf/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5[printsupport]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtxmlpatterns:5
-"
-
-src_prepare() {
-	default
-	sed -i "s:\(INSTALLBASE/\)lib:\1$(get_libdir):" src/lib/lib.pro || die
-}
-
-src_configure() {
-	eqmake5 INSTALLBASE=/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	use examples && dodoc -r examples
-	einstalldocs
-}
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 428d18b6b9cb..f869f5fb6d40 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,3 +1,3 @@
 DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614
-EBUILD xpaint-2.10.2.ebuild 1510 BLAKE2B 84c90679da7f4d8f48a57ad494d6a9914f4fa47a97e3d18bfa4f71c13619c94018e49879371fe18f852c15faf1a75ae4c9228e93d97d7b3c3eac62748c443aaa SHA512 8f009d6bdea418b73a4295e8f66e8b255f6b1b221346ddfe86beb44675fc66954ca2b6fb232f5248e2eb20aa19e7c5bd80b2be25c8ca0c9f5e6f849d34adbeea
+EBUILD xpaint-2.10.2-r1.ebuild 1562 BLAKE2B 3bdd005d1615418f4eca8947d5d42beef5c4b9a195c8366918599be1a8bb731bca66c43389602bc014e9dfc5f0cdee7bc5837190309ad5eb997acb968ebf48ce SHA512 5d07821b01cc4a49cf5b3ff05520b109bfccde7fcf2cca64c6ca7bdd39df1b5784d6d4a7609af01d662f951da96957a14a23cbd8685d5d9faf1e8530ec142cd6
 MISC metadata.xml 1204 BLAKE2B 3cd1cf2062126075b6b4be1b987ab9098ae31b611abe6e81c15e684e62ed0a1133177c4718e5bc51d5be2a0b5b2b58fb4d4a2d67ea77f21ca6d9009f2a4d4150 SHA512 e2b37b1d3381dd97ecdd40f20535426539d7caff8032ffcb5e6b74d65968adb7319523a55e45d31a697a75b9aa384e0a5155059237730ea080cf46532da12c22
diff --git a/media-gfx/xpaint/xpaint-2.10.2.ebuild b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
index a49d1d20aec4..dc92f046b92f 100644
--- a/media-gfx/xpaint/xpaint-2.10.2.ebuild
+++ b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit desktop toolchain-funcs
 
 DESCRIPTION="Image editor with tiff, jpeg and png support"
@@ -11,7 +12,8 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="jpeg2k pgf tiff"
+IUSE="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
 
 RDEPEND="
 	media-libs/fontconfig
@@ -26,17 +28,17 @@ RDEPEND="
 	x11-libs/libXpm
 	x11-libs/libXt
 	sys-libs/zlib
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/openjpeg:0= )
+	media-libs/libjpeg-turbo:=
 	pgf? ( media-libs/libpgf )
 	tiff? (
 		media-libs/jbigkit:0=
 		media-libs/tiff:0
 	)
 "
-DEPEND="${RDEPEND}
-	sys-devel/flex
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/bison
+	sys-devel/flex
 	virtual/pkgconfig
 "
 
@@ -48,7 +50,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable tiff) \
-		$(use_enable jpeg2k libopenjpeg)
+		--disable-libopenjpeg
 }
 
 src_compile() {
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
commit	d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree	1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /media-gfx
parent	abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)