gentoo resync : 20.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
commit: 46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree: db33a91259730be84999e13a8d8168c799f50ac0 /media-gfx
parent: e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)
60 files changed, 709 insertions, 760 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ee15d1e50223..457b6bdbf631 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 20acfc8bd45e..a080bac1c551 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,4 +1,6 @@
 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
 DIST alembic-1.8.2.tar.gz 861796 BLAKE2B 9ea2dea33b3116331dd02802055e8db7faa736bc2674e6b30209a9e178877523d9f14516b35729eaf6fc348b89367e9830ca1b998a8c7d10766b9b2f265b97d8 SHA512 23fec3d51cfd8ac8bc02749550de53a7b699ebe67654336864a8208a6a1d4f69e8e1a2c8e07832665c203788cbabbb65f346582741bac10ceb0d56c16d6b4217
+DIST alembic-1.8.3.tar.gz 862221 BLAKE2B 81639b0968dbcaac0096eac83385b7d6b1dc27b4b1652ede8cf6b6cf3aa3eea3c6f5e53f033708b61f79d99ebfaa766a9cac3345a043d6cc0ba6d6c29dcb9ed0 SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036
 EBUILD alembic-1.8.2.ebuild 1234 BLAKE2B 8fc18141031dcbf54bef2d0323c4a4e7f7315a7f2be9297c2af1683ac073530ae34271c97fb7d2f4961afb05baf5625bdb680caaf64f5da25cdc9dfdbaa55707 SHA512 7d2f20abc3d8d656dfe9b41528bf9ed494accd9678b46fd695637df4baa6bf116b770f21a1494f58370190f2af8ec20876b3e5639e9bd5f67bf15b055fdd9cfb
+EBUILD alembic-1.8.3.ebuild 1638 BLAKE2B 196b6575fa7c97ac01adf354c6f3345a24ce3304c6099e89de4b41f3e6d9c2d1ff8fce38b76c14ed677f4929fca05bfe73d15c1de1cd710ce8b9c91591884d73 SHA512 42603d6e35d7f1b59d13bbdded3e054405293b89d97e5f33d4001c67c6b813dad75dd1ba1fadbb5fe4232491bcf2f679ce466dad935e54ee5e2b22501b601809
 MISC metadata.xml 824 BLAKE2B 55b10435d032292b05af14bde6a69772eaf7993bd1686a0f1489313624d14b3572037d6ba7e9caab7bb69ed36cb61d5f1518d6c945e9e7c3853dcde1e80e3e0d SHA512 55c878337d8297cd8d811443d8821835e4ee5096364014bc43c798a34645076dc47ec405bdfd3c62a03481f8539cca9fadd8f7f15a2bb98471c9f7d0d57450a1
diff --git a/media-gfx/alembic/alembic-1.8.3.ebuild b/media-gfx/alembic/alembic-1.8.3.ebuild
new file mode 100644
index 000000000000..c46c467c35e5
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.8.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Open framework for storing and sharing scene data"
+HOMEPAGE="https://www.alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples hdf5 python test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		>=dev-libs/imath-3.0.1[python?,${PYTHON_SINGLE_USEDEP}]
+		(
+			>=media-libs/ilmbase-2.5.5
+			python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] )
+		)
+	)
+	hdf5? (
+		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
+		>=sys-libs/zlib-1.2.11-r1
+	)
+	python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch )
+
+DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	# PyAlembic test doesn't properly find Imath, comment it for now
+	cmake_run_in python/PyAlembic cmake_comment_add_subdirectory Tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_BUILD_LIBS=ON
+		-DALEMBIC_SHARED_LIBS=ON
+		# currently does nothing but require doxygen
+		-DDOCS_PATH=OFF
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		-DUSE_PYALEMBIC=$(usex python)
+		-DUSE_TESTS=$(usex test)
+	)
+
+	use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} )
+
+	cmake_src_configure
+}
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 7a08e6368b38..6594db4b53a2 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,6 +1,4 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
-AUX asymptote-2.69-info.patch 436 BLAKE2B cf8510e1f0135eb1e16e0e3913572418761a6eec863efff59c29d84a0f5f1b863febdb965120e1661bca743cf5d0d6e752a929cbe197ec7ae8fca162eb47ade1 SHA512 5a7c19d64609ed8c287a598b57331a318fbc47aac8770d0a9e1451b3b4f4f715a4fc30b8dc7238fd3498ca10ab4fcf2bf6373cc2e576c11d5d8eeaeadf9324c5
-AUX asymptote-2.69-xdg-utils.patch 791 BLAKE2B 126fbc6a5b253e536c6daf479d5b422b52e51d874504f2b586df647ecf940f730b6564cab8c5bf5e2fbff1e5eee8b84dd882f312e2492afa0ae6490d401ee7fd SHA512 003dd1867fb4d44d9e9dd414e908adda6f3802d44a614732e28df415c6591aaa4cb053dd7848c857c7b9cc3ae253cf3cc51699242e3d5629395070d29da226da
 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4
 AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc951733fb0718ace6e6807f63585fe8f4aa6f8519c6e03ed75f0176dca87e705d1b7175e0c1c7a1e79eb6c15dc4f2df76 SHA512 f78359aa71adfcea4ba31e3cae4c30aca47e39337b647f6fb2ad5264bd318a45071fcc47b1bbe5cc4c59c6b707b7b17461af62add2ee2477027d95d369f29994
 DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6
diff --git a/media-gfx/asymptote/files/asymptote-2.69-info.patch b/media-gfx/asymptote/files/asymptote-2.69-info.patch
deleted file mode 100644
index 63f2dc281762..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.69-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.69/doc/asymptote.texi
-===================================================================
---- asymptote-2.69.orig/doc/asymptote.texi
-+++ asymptote-2.69/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch
deleted file mode 100644
index f07d23ac6183..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Только в asymptote-2.67.orig: .pc
-Index: asymptote-2.69/settings.cc
-===================================================================
---- asymptote-2.69.orig/settings.cc
-+++ asymptote-2.69/settings.cc
-@@ -101,13 +101,13 @@ string defaultPSViewer="open";
- string defaultPDFViewer="open";
- string defaultHTMLViewer="open";
- #else
--string defaultPSViewer="gv";
--string defaultPDFViewer="acroread";
--string defaultHTMLViewer="google-chrome";
-+string defaultPSViewer="xdg-open";
-+string defaultPDFViewer="xdg-open";
-+string defaultHTMLViewer="xdg-open";
- #endif
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index aa3c087c06c9..280f974959e2 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,3 @@
-DIST chafa-1.6.1.tar.xz 418720 BLAKE2B 5f6c42311d81bf508f5ec890d72508fd2255e226102b8a7c5c71a9bc1293cd75b08c6b640ca4e6fe9ae34ad47e4e408e25a1aeed7057a5bd823550bea4526f4a SHA512 96cf772638e1a6874d94636a69d6c76d1040d956a16be851ea818292f5b2252867acd0891fede3e030de591b5567d820cf062c5a103a0943a0ea2f2ba34eea77
 DIST chafa-1.8.0.tar.xz 435712 BLAKE2B 15a6e64fff13ac32b2f828a68fb12c96856e175eae83c0396b07cbb2ce71d8c1c8eee67db00880372026fe91eaefac2b34376dee597108ffc07c706cf8c98682 SHA512 15ff08a0df82ae8517ac7744b81a39e1ae1eff8c9848128341cc25da94864e89b7101aabcff2d532bf11ea293bfc4c9e48b01f85388dafadbce2d2b2c8b7439d
-EBUILD chafa-1.6.1.ebuild 744 BLAKE2B f45a1b29f5d37253413c759b66888035e16a69318e95c4b46062549f441afecf3d43377d4132ad5c789cea2108fe4e25f69dfaeeb307a19b65cd9ce626f5f63a SHA512 336aa03393a3cccb5e44a317e66f50d0dd86bdec5bba2fd8550f78d0491ed262bb0292c5a23ad292430ab19f0e0063b46bccc93389ab2c77e046da25404c6c9e
-EBUILD chafa-1.8.0.ebuild 747 BLAKE2B a309ab04266e19385050fdf7946296a9426672f5948586f3089d01f544ab6998c0c3f640c9a0c91a0b382a6199878254f3a8b8dd2ec0af7f3cab940211eaac7e SHA512 c5194bd1a700117084dc9f73d5b5466537bf3319ed6b791023b8e2c56398f62b680cf808ecd2a0a62619ea57f658543539ea8e46aacd41c755957837ace72ee9
+EBUILD chafa-1.8.0.ebuild 744 BLAKE2B f45a1b29f5d37253413c759b66888035e16a69318e95c4b46062549f441afecf3d43377d4132ad5c789cea2108fe4e25f69dfaeeb307a19b65cd9ce626f5f63a SHA512 336aa03393a3cccb5e44a317e66f50d0dd86bdec5bba2fd8550f78d0491ed262bb0292c5a23ad292430ab19f0e0063b46bccc93389ab2c77e046da25404c6c9e
 MISC metadata.xml 396 BLAKE2B fc22be32275227f194b224a340dcd08e55a565fa68b102eb9cb55406402ed38d4f593aa6f59f3c40a24480c8d002ea0ce4a9a831055bb6821fdbe1a1dfd103ff SHA512 46617cd84ec16190865a896432df30443d31123b790d871bf634cd446b520ed9b1728951e49217b0619a91d0d46d3013ce7f41e142893298ad7e8c2522d1552d
diff --git a/media-gfx/chafa/chafa-1.6.1.ebuild b/media-gfx/chafa/chafa-1.6.1.ebuild
deleted file mode 100644
index aaee185d5da3..000000000000
--- a/media-gfx/chafa/chafa-1.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
-HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
-SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+tools"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/imagemagick:0=
-	tools? ( >=media-libs/freetype-2.0.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-man \
-		$(use_with tools)
-}
-
-src_install() {
-	local DOCS=( AUTHORS NEWS README TODO )
-	default
-
-	use tools && doman docs/chafa.1
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/chafa/chafa-1.8.0.ebuild b/media-gfx/chafa/chafa-1.8.0.ebuild
index 0949da594e0d..aaee185d5da3 100644
--- a/media-gfx/chafa/chafa-1.8.0.ebuild
+++ b/media-gfx/chafa/chafa-1.8.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index e1dbb6bf2f0e..7cce006dccea 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST eog-plugins-3.26.7.tar.xz 482336 BLAKE2B 9cd1d7e16f8e7f1fe06c3bc2ea79ab06c397beaf9d9bfb26568ad5fb90a144ceab11f6250c7dd51ebb5d3962fff47a4c855b85725b95abca07cdc4de739a2b7e SHA512 c9312eccc5529b01cb285a165c833243ea60bb12f8be6f40ccc6da0db1bd951916000a48aa31705b048659e8d637aa7e56d761fe0f9be720a4e0ce81289d2b83
-EBUILD eog-plugins-3.26.7.ebuild 1724 BLAKE2B bc1b80d1d3775b924554435d23188361933ca594cc552794182e617300b673cbfcdd523ae334de644b8d061bd4d4741a6799a714709ddc203c05b7e67118a1a1 SHA512 489b429a9b792c4405c0cb88c2c09178bb35bc5818c644f51641177b24ddbbd1a87969147024cabb310b1b8950a2c8d42983a71ded4fbbedaa8f5c8eb78eaa3b
+EBUILD eog-plugins-3.26.7.ebuild 1725 BLAKE2B 5063f5a3c9e9e9a55749b6df79a1b1dba448e071c517b8eac94dcea955db715f1c4ae979dd49b9c2e549c0b5ca85d6b86fa351936259e399efc3930105a48ac8 SHA512 b4ff645c5af1295765cd2f92bd44ed3fc5a188693e14e2237cd16f6a838940d3e9bc60e6b07e77818296a0ead6c8c0b102f798695c3b4d0092c24e2c7572972a
 MISC metadata.xml 429 BLAKE2B 61e0c5a268c0dbcb1a2b0a0e1d0ceb1b7795db34e022ba9229015ecf05210dcdd247c2c9867549f5c75028dcb20011f7757fd9b4ef507af65b80aa8aa1ca6f18 SHA512 d4b81d9f78bf49afe842990d9c1c9dde1c3f1bc68090f77dde1bd51b2be98ab647be10f8886da7dcc1831cabc4f7c81b18b7e6e5cadb2c5aeeec69db883509bf
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
index 5f727ce583b2..998f6cc3c250 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2 python-single-r1
 
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 017383a13d0b..8552778f9f05 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -11,6 +11,6 @@ EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab24
 EBUILD feh-3.6.3.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.7.1.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
-EBUILD feh-3.7.2.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
+EBUILD feh-3.7.2.ebuild 1515 BLAKE2B 67ecdd1281ba33a13b51fc2c23b4c8efcca57cc678f5cfb77850dd7495cf6a0463db0af547f4c9c7cac74467b063f724b679814e498887eb3431ac1068d8bf47 SHA512 4cde105c3719d084c150a1777b3134fd382f66e55f2df003c5d3e3458168b38dc89598446f2840f4d527a5beae539e620e246803e296d9d33f5884062add972e
 EBUILD feh-3.7.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.7.2.ebuild b/media-gfx/feh/feh-3.7.2.ebuild
index 9ccef7a27f03..33b646356d2a 100644
--- a/media-gfx/feh/feh-3.7.2.ebuild
+++ b/media-gfx/feh/feh-3.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug curl exif test xinerama inotify"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index be4141c7c5c3..88d06b4073b0 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,3 +1,5 @@
 DIST gifsicle-1.92.tar.gz 575199 BLAKE2B 53716621846b14c0727e05893cb1876572ab80aa4d444c2b75499b541a19a5e45738b817c203b3926301378b2211a3263311c424cd8dd53e71d2b60f28ecdfb3 SHA512 5d9539eb5a6a8b87aed49ff3ca3d62e337845edbd05459b002369d571f74878c99740c34f50b4c86e5b8787ff189d4c21230e4f9019cd96a09db603afd7563dc
+DIST gifsicle-1.93.tar.gz 578194 BLAKE2B c5635fc736e2fd97278ab97377663f9702d2891cab5e19b16fa1aa53412ae48945d82ee42e9690208532cb854c99397ec4c1a11d4521454d8d40efd9adfd9d2a SHA512 1ace2c9597a405d69bb9dfa24764a3d7c7dd9864e1832d25a4a7ad2e32780038206b889711846d6e4dbc7189482d0d03874f18d86966ebffbc4ee10569c390d3
 EBUILD gifsicle-1.92.ebuild 650 BLAKE2B 0d9ff8115ef3c7b970fce293ebe3c7ac2d59064885e8aa4f5289652d02234c4772406a0e650305c783aa408926db6fe37a1c3c3cf3f221d6e7d88a7a30cf28f3 SHA512 eb99c7394bf33c104412f73c9e3c2b08564c0ad9164e26484c8f8530064d0a2780ef7c4690e764bef942be600118b605f8d5890c16fd9708fec23499c567666c
+EBUILD gifsicle-1.93.ebuild 642 BLAKE2B 21e2b2c1b724c6c4dc063aabe842ad94cf50717fbc6a1432c43d45e52e57ebe0308865b0ee1c6eda6d3e957f796cb3be9ba0eb09b67ed18cd723c6c79f12267d SHA512 194263ac52acc7405c122c894f477fb9bf7dc3bbb01763dd21c7675475caa0391ee4bd0f1b41b41283ea228b2489839ba97a0f1b8f408e162d5cfffd2e2dc2d8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/gifsicle/gifsicle-1.93.ebuild b/media-gfx/gifsicle/gifsicle-1.93.ebuild
new file mode 100644
index 000000000000..72395ff30f1d
--- /dev/null
+++ b/media-gfx/gifsicle/gifsicle-1.93.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
+HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
+SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="X"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+DOCS=(
+	NEWS.md
+	README.md
+)
+
+src_configure() {
+	econf $(use_enable X gifview)
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e04036d96fde..d6b8281ccbf3 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -4,9 +4,9 @@ DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6
 DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
 DIST gimp-2.10.28.tar.bz2 31675862 BLAKE2B b491b55d5adf08221feb7cee8b3adc1d8b090901e8f43b93a4d2c3d935ce1ca45072b0ccd6840e06b329fbfafc8fe5e3d6056381c5129203fa3c5e781cab0453 SHA512 587f6f46741672f0700fd642a5b779694d2d8bc8ad70e7677ccdbfc2266dc62203ed347d6aaffaa4b8e7d84a84a25f7d5a51507dfd64b21b4c05970856d3ab94
 DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
-EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
-EBUILD gimp-2.10.24.ebuild 5581 BLAKE2B 7639817275bc53b7e08b8f190aa11b2be6d62f2c12f46474fe67c74409fdbb0a4cc2bcaa8c7bdd04721f111ea52d3c8a950efb9d85ee1d22cbaab687207fcbe7 SHA512 c22ff9efa6044e6f0fba4094b0bd9debfb9752464357dbbe7c760ba9901ad36d479c1bbecfcae8c7c6b0bfecb8084cab970d8ee1d458122b2eb9f0b40a0b8054
-EBUILD gimp-2.10.28.ebuild 5581 BLAKE2B 6d8eaf4a6ecb37437f48b9d8648d50fc673d1f16b0660b9e948b323832501f6ea925cb52f33dda150d911c7a526a8a8b4322ed00be1c051fc155ee92fd56051b SHA512 b9a71feb722a970668561225c82c15a31728f93ceb63c6a6503a57e769af05fc1e28ac6c15fee65a4a38257c76a4ca3ca76ed31f14f79c9c468c6aacd83ad8ed
-EBUILD gimp-2.99.6.ebuild 6827 BLAKE2B 9ea9ca8d05654e6e569e42930e3f65c23629ad0218aa26d7368963cf3675237ac7b85c61c745c1d8d97f77ab824f676289c4508618366d4e12084a7b8e021129 SHA512 feb1d24d9ff9a72e0f400a6215254ff780df2c4660b3b4f4e31ea56bbc8da4bed9b6dbe2b518eae91d2963ff9ee7df832a50336e2713c7576ac399f8c9bbc5cc
-EBUILD gimp-9999.ebuild 6995 BLAKE2B 77775a32a461e6147afe35b5e43c540101810dcfe437ff68783d05ce282992eebc9cf7af948bd87a9f1f7b7a73ced2e6ce603e89b4d55a8881c6228a9a5bbdbe SHA512 61a0c945a463f4885cff848d523d17fa1c6ca5b885687244e0d54a7babea76427d67e39c6275788a2ddfc0aeedc8db9dea6d72c0ffd97ec1e33036dc1aeb7fdd
+EBUILD gimp-2.10.22-r3.ebuild 5638 BLAKE2B 1d71a07139f3005de53dce494c3603a7fe84d0b82d52b066e1ca6e7f663ba14d46ce8faed4b31c2bb072202ba2ef28d3004420b5fc637e5cc1f5f0b2cfbf96c3 SHA512 bbb7192ae8f9ddf3ce26f9388e67da042297d8fb42040f49821dae762d6ca16edbabc1b5204de801e857759c032625e39b6945e6a19e674ed6c8dda848216158
+EBUILD gimp-2.10.24-r1.ebuild 5583 BLAKE2B 8da764ad95278c60c962e0254b2a839e35e4222e045a3c17cc4387058037d933b5f07d17def0992b1da7fd3c7baafa19700f79c39b7dd8ab673d7ccdb4672cc2 SHA512 4041817e72d868ccf5faf05643691d543aea7e32af241762cd5364397e47827da8a59eaf38db6b2108c12862989a8a36c95911081c09ff4eaeec0f420f522176
+EBUILD gimp-2.10.28-r1.ebuild 5590 BLAKE2B e68af0cb443a25f79cf0a9fef3ad51de9e1ca806621a2a11bef7a1c8d94e1d9a89dfb0163bcbf2dbc9eec520de41c15ed35d864f5317c41b1e2f28fc10745773 SHA512 6ea6f94eae3de5f58110c4bda728cff83f22bd93f64e2451b0aeb211852d6cc8d4bce73745a28107a111cf8f1cebec4a31d0277bf18b97163d5ffbc594e32fd4
+EBUILD gimp-2.99.6-r1.ebuild 6811 BLAKE2B 51c8312fe6e6e8f4af8bdf2205e1280137ab32b599aa0c57d00d60eb34ec48f8a52d91b66188bbfd97c376d036d83e5290f6e425613e81041942be9663e96eca SHA512 63ad5d670e04875ac3b32a30d372a1441f4f448054c380f5da3f2c177b5ea1aaec77cb083a44b1a385e77d128d8641f4b22610fb007b881809f8b8c08be37d5a
+EBUILD gimp-9999.ebuild 6997 BLAKE2B 8e23f601c64acf308c35373c2277464819127c650a0a3ac525b6b223aaa94678f219896810726a557e952a40dd059d750859bd809f6062fd3c6e27938064f32b SHA512 63be8d9f35f412e98c9bc8548e55eb1337f8a16d18a4ee057cff7c63efddf617bcd62be8367b09cd58ddd871f0197368cea9249192b65abd5369c7824b4662f3
 MISC metadata.xml 577 BLAKE2B a8bfdc064608bf0bb4a2f81a5de928d7eb35da9eaf2db64198ca34ca8b2542116ed1f341fe822354fa60b8d447676eb892c38dc4093b4b9db16622fe9d64bba8 SHA512 12e030815c13bc253aa877c7da837e01f8d259a6297807c0543f05e21edb92fda38b3a54a064b4721172fcc3db9d0ed2ae580118d51f03fc37f6ac4bacde5154
diff --git a/media-gfx/gimp/gimp-2.10.22-r2.ebuild b/media-gfx/gimp/gimp-2.10.22-r3.ebuild
index 7da8cd3f7e7c..9552457f6c17 100644
--- a/media-gfx/gimp/gimp-2.10.22-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.22-r3.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	>=media-libs/gegl-0.4.26:0.4[cairo]
 	<media-libs/gegl-0.4.28:0.4
 	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/harfbuzz-0.9.19:=
 	>=media-libs/lcms-2.8:2
 	>=media-libs/libmypaint-1.6.1:=
 	>=media-libs/libpng-1.6.25:0=
diff --git a/media-gfx/gimp/gimp-2.10.24.ebuild b/media-gfx/gimp/gimp-2.10.24-r1.ebuild
index 7f0d8d959b43..7465abeb55ff 100644
--- a/media-gfx/gimp/gimp-2.10.24.ebuild
+++ b/media-gfx/gimp/gimp-2.10.24-r1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=media-libs/freetype-2.1.7
 	>=media-libs/gegl-0.4.30:0.4[cairo]
 	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/harfbuzz-0.9.19:=
 	>=media-libs/lcms-2.8:2
 	>=media-libs/libmypaint-1.6.1:=
 	>=media-libs/libpng-1.6.25:0=
diff --git a/media-gfx/gimp/gimp-2.10.28.ebuild b/media-gfx/gimp/gimp-2.10.28-r1.ebuild
index 09172d13d44c..834b51637a24 100644
--- a/media-gfx/gimp/gimp-2.10.28.ebuild
+++ b/media-gfx/gimp/gimp-2.10.28-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=media-libs/freetype-2.1.7
 	>=media-libs/gegl-0.4.32:0.4[cairo]
 	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/harfbuzz-0.9.19:=
 	>=media-libs/lcms-2.8:2
 	>=media-libs/libmypaint-1.6.1:=
 	>=media-libs/libpng-1.6.25:0=
diff --git a/media-gfx/gimp/gimp-2.99.6.ebuild b/media-gfx/gimp/gimp-2.99.6-r1.ebuild
index f44f9dad70b0..47068406091c 100644
--- a/media-gfx/gimp/gimp-2.99.6.ebuild
+++ b/media-gfx/gimp/gimp-2.99.6-r1.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/3"
-KEYWORDS="~riscv"
 
 IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="
@@ -43,7 +42,7 @@ COMMON_DEPEND="
 	>=media-libs/freetype-2.10.2
 	>=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.10.10
-	>=media-libs/harfbuzz-2.6.5
+	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
 	>=media-libs/libmypaint-1.6.1:=
 	>=media-libs/libpng-1.6.37:0=
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 4dd4eac9daa1..1519df009bc8 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 	>=media-libs/freetype-2.10.2
 	>=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.10.10
-	>=media-libs/harfbuzz-2.6.5
+	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
 	>=media-libs/libmypaint-1.6.1:=
 	>=media-libs/libpng-1.6.37:0=
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index cf2e0a42f89a..168e1a2985ae 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-font-viewer-40.0.tar.xz 175396 BLAKE2B 33e10646fe31f76696867c0c5e7a99385064f09049390adb78149141f906958a6f14c3e29a9fbbfe8c48879f4600963ec66e9753018d9d7d658f4111c6dad120 SHA512 c82044e6750494d693cf631abe7fb76c655b58965ccd1ca08f512f0e79c40e9f207997465908b99e5813f350ca05ea8e76f029be79f3008173c49f3c5a4ee23d
-EBUILD gnome-font-viewer-40.0.ebuild 697 BLAKE2B f3eb825761342d9df2fb6a0209d7ebd02c36759357364d0c6ece5b65bf0f7ca4ccc5bf04405c57c2052f61443b626b0c48ee8ea9b904f5d39850f1ff666c4c34 SHA512 e0352369afe9cb9c9de95663f1dc537fcccc80ba1f7e2ab478b0ca105b51a9463441ce4dab00f5de31dfc9c307c1bc16ed511d3464229b7a27c1863ca6817a8f
+EBUILD gnome-font-viewer-40.0-r1.ebuild 699 BLAKE2B 5a55f830912dd510f25383881ae27694ebc25ee361522b2ca5289969c3d63e1c68557477c0b8886c32869f7be587e9302dc7f64ca4f4e4f8996ddc60c03f13f5 SHA512 d82268dd1af89a786dce1184a394fb3a259a4a04f0e309424fa76bf029fc8801b8c876ff57cfa723621632995b4869f08a5c512a60f27328d7b884b9f47862bd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
index 675a6dc9c8bc..3780d534f0b7 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
@@ -15,7 +15,7 @@ DEPEND="
 	>=dev-libs/glib-2.56.0:2
 	>=x11-libs/gtk+-3.24.1:3
 	>=gui-libs/libhandy-1.0.0:1=
-	>=media-libs/harfbuzz-0.9.9
+	>=media-libs/harfbuzz-0.9.9:=
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	gnome-base/gnome-desktop:3=
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 291b47fedb41..2c885e5e02e6 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,11 +1,7 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 AUX graphviz-2.47.1-bashisms.patch 407 BLAKE2B 957817776e4ea7a0ae84a64d65c452e1bf632a1a10e18a62a47c238fef3a63aca9fe60c5a8749d63004b5a6a442b55870de201a546dfc8b40e43dd4f47e9aeae SHA512 035312d4910bd063bcffdfa3b921c6398614625381747611603fbeed4e1332e687ba7b12b86e18ffe6ae826ebb99a9916c3ee058a86a240126a230b6cd14242e
 DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
-DIST graphviz-2.47.3.tar.xz 23199524 BLAKE2B 450601995da7ea543c951a6abbdd08878b4698cc2b59105d16255950acaf4585e56102ab952e79dc422efcdcc86bc28eaa3e62731626b1a3ede97480f9aeb24b SHA512 3fd43e91471e4a55212a9fc48775e208aaf64d59b40613b964e7020753b23358ec06bca0d6901d616cbe7c031a2760e9783ddc03070e05bc138b5f1dcad28bc1
-DIST graphviz-2.48.0.tar.xz 23082516 BLAKE2B 07cf4e2d84d6f49ae10dca90ef22c9cc18efdb6b0e2527795db639b2b851cf1b5179d796ed982d2518ea797c9b657c1f5ab379db30d5e37feba4f4628ef5be51 SHA512 9aa4983c9c56e2e2b485fb44d6381fa8769fe836a8e7673a9211cd67171f81c3c534ea6627cfee6b9d9b1127b538ffacdd16ba74401ad531a0e47ec107000265
 DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929 SHA512 5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0
 EBUILD graphviz-2.47.1-r1.ebuild 7746 BLAKE2B b5dc9125734820998a498d3fd48a811e90b88fe4d36b9bd694ac3f2c7134a11ebaea8694a4b0d131f8f6991d009b489dd9cb1bac2f27d0d8afe728a6d1322608 SHA512 11f479ccf853fd1d2e93a8efdb9baf56b00daeb8a8964479faf5b1fc7d77e941187b40519c0b52d1470972878e5ba14954b056e998ca15a5dddb54b098d0af52
-EBUILD graphviz-2.47.3.ebuild 7951 BLAKE2B ada464b9d2de919aa94e14183ef41939e25f55901d2a0ecd72312ab4efb2973f125280f96f348b8bbcc9571a0c280546916d3aca7ac9ee04e84a15c500726bd9 SHA512 7bfa0a63a185548c5c2ed5689b572fa8bdf32c5fb5ff14e15e5f234abd86dfdf6ac3c078de480c77ff7632f28ffe88742498bbcfdaae71f569031dc161b76fb3
-EBUILD graphviz-2.48.0.ebuild 7723 BLAKE2B ef50d78f842cb9eca2b22a2fd014952a80fed033df693261bc1a2fa2b7b19de3e5b10e2713267c8305041f446ccfd2326dc8dd1559ae02bb974474e61d5dcec1 SHA512 f6f75eff167ea686fd0e8ea733545766c5f79611b289874573d4bb383aa343d33fb6f4417ad562edd04fe7ea7eed14380c1170fa34d9e5e98258087b913a4237
-EBUILD graphviz-2.49.0.ebuild 7689 BLAKE2B 969de8ab1319f368e3610d61ddc0cbe319922c88293e308ce995c96fb0994a8d46c5bac909684f9ced1882a97a11f0f54ff79ae833fbaa041d7cb482cc53b9c3 SHA512 5bca460d8bb2a7619774f138ad347ed8fcfbb9c1dc02a6681c8421272accfe39a06da8037089978d508fea0b3aaa2ae57f3dc0284c243d031a6d3e0b4f875817
+EBUILD graphviz-2.49.0.ebuild 7682 BLAKE2B 54530fcb2f1ada5fee4b62b5a67e88e2440dc9d3ae9f6606dcb1f31f8b6ea23e7b314123df00384f07e002976e00b971ab219bbc8c9e90ddbae8f03fca36436a SHA512 039a3fd73d3c4a33ce12cc251bf3a67bf7ddb76fcb746e4509bd9bf38b136965323f3360b049b4cc2e9a46ad9f0e384f1e0d05a4323b58ad967b440605420137
 MISC metadata.xml 2381 BLAKE2B 97971708021091d2d53c49f2f83751cea0aa7e2e0d4c5c9f09fc6e4c187bd23d1bf29b79b953e40601492365b2e592b2481946c53d15190c64a80aeeeffc3992 SHA512 6baa00b4838adda1093799bd773f242258bf0900c9b211336888c94a0c6d4f58d5749552cf0acea79329e0ebcf2f0cf63ae933fa13ed6497d94ea63f961b812f
diff --git a/media-gfx/graphviz/graphviz-2.47.3.ebuild b/media-gfx/graphviz/graphviz-2.47.3.ebuild
deleted file mode 100644
index cf00d300d517..000000000000
--- a/media-gfx/graphviz/graphviz-2.47.3.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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/"
-# unfortunately upstream uses an "artifact" store for the pre-generated
-# tarball now, which makes predictable URLs impossible.
-SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 svg tcl webp X"
-
-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
-	doc? (
-		app-text/ghostscript-gpl
-		sys-apps/groff
-	)
-	guile? (
-		dev-lang/swig
-		dev-scheme/guile
-	)
-	java? (
-		dev-lang/swig
-		>=virtual/jdk-1.8:*
-	)
-	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 )
-	guile? ( dev-scheme/guile )
-	java? ( >=virtual/jre-1.8:* )
-	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= )
-	webp? ( media-libs/libwebp:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}"
-
-# 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}"/${PN}-2.47.1-bashisms.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
-
-	# 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
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--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_with svg rsvg)
-		$(use_with webp)
-		$(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
-
-	# useless test binary, because upstream uses
-	# bin_PROGRAMS and not check_PROGRAMS, creates
-	# a spurious dependency on dev-libs/criterion
-	rm -f "${ED}"/usr/bin/command_line || die
-
-	find "${ED}" -name '*.la' -delete || die
-
-	einstalldocs
-
-	use python && python_optimize \
-		"${D}"$(python_get_sitedir) \
-		"${ED}"/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/graphviz/graphviz-2.48.0.ebuild b/media-gfx/graphviz/graphviz-2.48.0.ebuild
deleted file mode 100644
index 062047851a2e..000000000000
--- a/media-gfx/graphviz/graphviz-2.48.0.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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/"
-# unfortunately upstream uses an "artifact" store for the pre-generated
-# tarball now, which makes predictable URLs impossible.
-SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 svg tcl webp X"
-
-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"
-
-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 )
-	guile? ( dev-scheme/guile )
-	java? ( >=virtual/jre-1.8:* )
-	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= )
-	webp? ( media-libs/libwebp:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/libtool
-	x11-libs/gdk-pixbuf:2
-	virtual/pkgconfig
-	doc? (
-		app-text/ghostscript-gpl
-		sys-apps/groff
-	)
-	guile? (
-		dev-lang/swig
-		dev-scheme/guile
-	)
-	java? (
-		dev-lang/swig
-		>=virtual/jdk-1.8:*
-	)
-	nls? ( >=sys-devel/gettext-0.14.5 )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	tcl? ( dev-lang/swig )"
-
-# 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
-)
-
-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
-
-	# 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
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--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_with svg rsvg)
-		$(use_with webp)
-		$(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
-
-	find "${ED}" -name '*.la' -delete || die
-
-	einstalldocs
-
-	use python && python_optimize \
-		"${D}"$(python_get_sitedir) \
-		"${ED}"/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/graphviz/graphviz-2.49.0.ebuild b/media-gfx/graphviz/graphviz-2.49.0.ebuild
index ba7c9fb7dc05..8e343b19cf4a 100644
--- a/media-gfx/graphviz/graphviz-2.49.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.49.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~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 lefty nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 714e367b56d7..73fb3bfd5594 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,4 @@
 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
-EBUILD hugin-2020.0.0-r1.ebuild 2119 BLAKE2B e697eebaa7c6e6afba08e1edbb179dfc7db8fb60a7f8e07cfe749936f9f943d42b71b21fef88ce10f56050f905fe6c42e53fc989e4685274c6e38e4d476d7559 SHA512 051eb7eff33fb3eb73465d769de6a755c8c3c5136f7191969ec1ab1f84f641caa259dc049b901327121b6ac690492da43224e30a94e2a6373c8e9686fafa69b7
+EBUILD hugin-2020.0.0-r1.ebuild 2120 BLAKE2B c7227cd28ae5f565fd7d0c3a6d929bc6b97b3405dda05ee392556df5d2d093f73740795ea67465f573bcd8002e936483285c07be594d589bbfacd56772b346b4 SHA512 1d37c7a20063e174f15e23ad2a16cebf8a82c95b4114bd6a71e3e949beba1a61628f0775a8d4f434caf9ea0e5b4f410717f3701a89b23649dfcac361371b0586
 EBUILD hugin-9999.ebuild 2062 BLAKE2B 4a24726bf47c3ff2911c29cf6c8fe8fd3632c82ca54a1fe60c562ea3e202260c93e38d76b5ea6a1d934b3ff036019110ee15d45067e91effc43a3aafd426b56a SHA512 359170dfbae430c9210dc75945cc883eea5b7928d22ea191f9179674032a06a3d84bccbf28cefaaafca1dc7b91c1c14040f4c26dad6d0c48506fae41b6f1817c
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 7c550810e7c9..e52816245c81 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -30,7 +30,7 @@ CDEPEND="
 	media-libs/glew:=
 	>=media-libs/libpano13-2.9.19_beta1:0=
 	media-libs/libpng:0=
-	media-libs/openexr:=
+	media-libs/openexr:0=
 	media-libs/tiff:0
 	>=media-libs/vigra-1.11.0[openexr]
 	sci-libs/fftw:3.0=
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 23b5f3fd85fd..cd223260dc58 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66
-DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1
 DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456
 DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
-EBUILD hydrus-452.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
-EBUILD hydrus-453.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
+DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3
 EBUILD hydrus-454.ebuild 4098 BLAKE2B a6b0a5817e577b1539d2b3a047f7253ba6bfe0babcf637f583daae1fe67b51da9350a846f27d04ca492e15e6de7a5a7375d0db31267fba89a52e3bba4690a5e7 SHA512 6be825a196983e5c4888e9a5877a48aea7119b300f068ac3961efc919e12bc8da60a413de8db277f7972765a3e32cec78b179fe6f17ac0596e31d97c7cbed53a
 EBUILD hydrus-456.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+EBUILD hydrus-457.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+EBUILD hydrus-458.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 EBUILD hydrus-9999.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
diff --git a/media-gfx/hydrus/hydrus-452.ebuild b/media-gfx/hydrus/hydrus-457.ebuild
index 0915a2ae5436..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-452.ebuild
+++ b/media-gfx/hydrus/hydrus-457.ebuild
diff --git a/media-gfx/hydrus/hydrus-453.ebuild b/media-gfx/hydrus/hydrus-458.ebuild
index 0915a2ae5436..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-453.ebuild
+++ b/media-gfx/hydrus/hydrus-458.ebuild
diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest
index 59f9dba9d4e7..db0b83676041 100644
--- a/media-gfx/kgeotag/Manifest
+++ b/media-gfx/kgeotag/Manifest
@@ -1,4 +1,6 @@
 AUX kgeotag-1.0.0-libera.patch 1142 BLAKE2B 8a99a340f2542f23314034e7bf3a8f88e9b017651039953ebd5eaf7d370383295838ac9c7b1744b23068aad2565d007bb9a87fc40157027c194604f8819497d6 SHA512 aeef253e1953fa3af659f75044a37652c18adb5e44ced94515ed9d117224916698504022f3651828afd10e212f7481f884188d1f9ef4ab62132f4b12c1f9955e
 DIST kgeotag-1.0.0.tar.xz 266488 BLAKE2B ff69ad02fc72766c4c8aa08dedba681cc6d73bfb9004ae8f12282b3cd09bb074acba2231f41ce4693929c3506a89ff90666c01e0c333450fd827eeb787d48c46 SHA512 8696ffe67abbfa2cefdc78c0bfed6894b3e376323a291b64e0aaf6d11eb8f5f2fc5bf1335ebdebc0f5e9d1c99f1c45972c193f7b91e71c14b1da63d5d845811e
+DIST kgeotag-1.1.0.tar.xz 282436 BLAKE2B 8d59665bc56147f1b1177c15ee5e67823cbff1ede19abcfa2c9c6d8f514a72c5d92a8216920fdfdc58a0880d093b570d61f3ec273868059a1182b9f444affa4c SHA512 b849cd43118f05253352a5059f0c29a9e3db59602455f3413ec5bcbe9c4b72c1e695f077089a2fe048443c04ec31be07540d42ab1f055bb32b3b459da7f7911a
 EBUILD kgeotag-1.0.0.ebuild 857 BLAKE2B af7eec9e333b28f1a6f54031844f36ea8fac6a47ed357b19fd2c2dc17e023bb46e264051d8f1d304801175d160fc9fda35b6b86eb2aaa0db59c3ddc817785f9f SHA512 99c62cc1ddff70adbf4c406dacbb32dd54784376f0665d81290f6c9a756f152b3815e31b780a4cacf057833d519d5375054abb1d60fec9eb36b4e7b4258b2cb4
+EBUILD kgeotag-1.1.0.ebuild 837 BLAKE2B 07604082a7fce27aa8b1ec5c302aa9e3e823188ea70f86d73ab06b33519b967458ecba533f19aa4c3fde3f57cd71655805a0184546842f12273e0a8fd8aef8f5 SHA512 77df24a4a158919b9c860085d236d2c21b658a0073c67f84c5159949ca3a1227577627643b99228b5a3e702a87ff0034670702d49fa55934c75845344a8e6f4c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgeotag/kgeotag-1.1.0.ebuild b/media-gfx/kgeotag/kgeotag-1.1.0.ebuild
new file mode 100644
index 000000000000..2e4f29ade5e5
--- /dev/null
+++ b/media-gfx/kgeotag/kgeotag-1.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Photo geotagging program"
+HOMEPAGE="https://kgeotag.kde.org/ https://apps.kde.org/kgeotag/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="5"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	kde-apps/libkexiv2:5
+	kde-apps/marble:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog.rst README.md )
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 7cdb3075cc13..caedb68a9062 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,5 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
 AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5
-AUX krita-4.4.5-pykrita-crash-on-exit.patch 1197 BLAKE2B bebb54df49f02056acc43232bcebf6c98a6e93fb7b28fdb6450ebc0b882f0fed13f24ab13b8227de99effea00ae29b7752b17bb07e1bec0a0fd9c4acbcc874f2 SHA512 bfa7cb10c8f81ac119bacfaaec7207a71a5cdd45cf53270f8edbd8164af790ee931b24f6caacf3c66e44a7984503b7c90b0bd80447e1fb2ed680da92893a76d1
 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
deleted file mode 100644
index 12ebb2fa95a7..000000000000
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Tue, 3 Aug 2021 11:57:33 +0300
-Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit
-
-CCBUG:417465
----
- plugins/extensions/pykrita/plugin/plugin.cpp | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp
-index 028798e2f4..cc06c07fbe 100644
---- a/plugins/extensions/pykrita/plugin/plugin.cpp
-+++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
- 
- KritaPyQtPlugin::~KritaPyQtPlugin()
- {
--    // XXX: With Qt 5.14, this crashes Krita on exit. See https://bugs.kde.org/show_bug.cgi?id=417465
--    //      So, for now, we just don't call finalize...
--#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
--    PyKrita::finalize();
--#endif
-+    /// XXX: Don't call PyKrita::finalize here, because that can result in a crash
-+    ///      deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465
-+
-+    // PyKrita::finalize();
- }
- 
- #include "plugin.moc"
--- 
-GitLab
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index f0bf2b07237e..4f702c71cbae 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -3,5 +3,5 @@ AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab71
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
-EBUILD luminance-hdr-2.6.0-r1.ebuild 2075 BLAKE2B 205d6c7414aa36307e4234f8468e490ee2559ee5c7d385a8d98a5448aa8526eddb76ffa4731f86e326ac9683f60de4ef1083bd2c98dffcde1c55a50798493bc2 SHA512 0836f498b93caac775cc9f91af799d4696e2cf50db72021c87c4a5114cddcc5344a490b9a411e1c29cb8e93764a2f095b3410afa726d8e5c8a91488b67769d28
+EBUILD luminance-hdr-2.6.0-r1.ebuild 2076 BLAKE2B d22e0e67e352a2ff518999534223694a383e087250372d9d8b4909f6536df2680fd6c82d98bfab197ebe3964527f6d8d7733026e42eeb7fe15032dd3f7f0ded0 SHA512 09de47154150b2e7cbf1407f64f20b9d673ff4dc2f67abdbc074b224a3901b05ca36bc78b99370dbe33c25b196d73c6582c6fc916586d507faace9f4fea9c0d8
 MISC metadata.xml 1272 BLAKE2B 08d1f2e217eaffcb4419532ed41ba963a971b343e2d0ff7f3718c9df23ac9ffd5299264d5a87b66451acd231965f135bdeebf3b91244e3d9e51763c818b317f9 SHA512 98f1fa351c3e0bc7e47b30263093408cbbebacf8e0eb23d780cd704f5ddfff3d6939aee4d18c06cd083d90dc8a68ea51995352ab1f15ce75b0585230a3f9cbc8
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
index 6ad066bc4226..0a3b97a457c2 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.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
@@ -36,7 +36,7 @@ RDEPEND="
 	media-libs/lcms:2
 	media-libs/libpng:0=
 	media-libs/libraw:=
-	media-libs/openexr:=
+	media-libs/openexr:0=
 	media-libs/tiff:0
 	sci-libs/fftw:3.0=[threads]
 	sci-libs/gsl:=
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 59e8fdf4cd78..5a7e3ae45ae2 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,4 +1,4 @@
 DIST pqiv-2.11.tar.gz 139825 BLAKE2B 981d472ccd3284b2e9ad3da8e84233c95555a927af797f8421ac820225d3d39cab2275f01269a986bab54994e0fce2095b7c33b1201e7a6117e1c8399617341b SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7
-EBUILD pqiv-2.11.ebuild 1728 BLAKE2B 232ba0e63bc478af137485dbe1868705f55c90d5ac0551682b25e6b63ac7c2087e778b06fdb09a786bd8ead5d662089b68b511a99a0db9ba843c5d1b75e6edd9 SHA512 3d57320d6c1daaf5ca59f2faf3b5676fbf31b753c79b57ca75b8e073ed115384f849deeafce5aae88d4a7c6044729293c0f7a3d16a1707a66aca2ab16b527146
+EBUILD pqiv-2.11.ebuild 1735 BLAKE2B 4807d79e856314ae9562de15bd7a13a985d651d3faa2fa5e5aff6f950fe716f2aeabc234cfb3dbf5d4c4143de8e5515fe94084e96771ad88e3ff6cc804171181 SHA512 f6b08179cc084a3ec3b9714c1158a804a3726509e8dabc13069f0a119135cd6a4760f4c15a63e24581ff72b82f7ea1aa5073f487cfa564102895f2c7ba70c82d
 EBUILD pqiv-9999.ebuild 1730 BLAKE2B 078594b0e5901d7d8657ebd799431aef03418d501df182fabee3f4a288fc402c8938280ad932026668322f82e2823ee6bf6fa1d46b940d1d6dad7acdfc385dfa SHA512 472c909163057c8f0063d14a15b8614ab3d7dcd0b8ceb205c97c679a2cccca3607e8188d2984003665b0ae458658047cd0ee7d6fafca68913bbe7e45b7a920e4
 MISC metadata.xml 488 BLAKE2B f2e983c8214ea274f0920a2f3449b1ed3cad7246a1ba60ea976063ee5f11d6a827d9be993cdaedcaeb1f86cfeaf6301e7826f60dafc4eebd5b10c5890cec9966 SHA512 45e5496e534774e3b892576823d37f49a6cb0486287b8a8149964cf513b524205b0abd4b04f644702c741f3c5ca495de26ddc150c212ca1ace67bb720e573859
diff --git a/media-gfx/pqiv/pqiv-2.11.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild
index bb2e9b03aec6..a339c0069333 100644
--- a/media-gfx/pqiv/pqiv-2.11.ebuild
+++ b/media-gfx/pqiv/pqiv-2.11.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
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 44a9e337f0bb..e006c3d41574 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,4 +1,4 @@
 AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79
 DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
-EBUILD pstoedit-3.75.ebuild 1293 BLAKE2B f549f1af21a983957a6101676632123994fa7c57014ef76133f05bcfec37cd37d9c4e5d620688746fddad0577d4077406f5e4639253fa5d8b803f2e35932e2e4 SHA512 d01f29f8263591a0aee8996d17575163c4602f07443c855230da9323d998a068aabffb406d73e5bedd3268c407472da278c587cd6bdf0cc9222140ce188b1427
+EBUILD pstoedit-3.75.ebuild 1300 BLAKE2B 7614bc471896e99ac154c612bee2d111f10a1975b14268d81e2e6f894f062e718ec7d4e1f8d7fbaee5769b39c4a5fcd259c6f9c1337d27ea9bfffeec67c9c514 SHA512 47fa2e7eb1a7e6b893c9d5e6dedd93b451020dbd644e72c4d31cf091c092eade02005a8cd6341b37d391559bfe732b1773863d554bfa612922cf1563103b1e5d
 MISC metadata.xml 634 BLAKE2B ea6bd21397a45a3591572e803513b32361761a9872800027ab779c2a9f0e214db9e70dc9fed0acbf6dafe3769cd8525e21d2875e62f4b8711bfc03f38bc47214 SHA512 d8d509f442aee8fbb9036dab15fba870e18b8d6b0b120d3c82bb50e7d86379425f5b91161e4f37137f43710fd50ac2c8481b47b0dd5ab39654729a7280258465
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index c876af5e5c68..6469d052b2b6 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx"
 
 BDEPEND="
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index ffcc43fc6101..b8708104a159 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,5 @@
-DIST ristretto-0.10.0.tar.bz2 586447 BLAKE2B 73e4be551879d58e0c43b7a039b3173e96df8a7c367bb1696dd27a6b20fc675465e6a78019e11498f0dc55286b605c7ab9545dd7d13e2607bc0fc05527947568 SHA512 1727025bbc056a71475d91505cc141661b011c3944cf4ca4d96b48a9ad7e1b28b8f4b0c856fa789cd2c877c1faa27aa57441e35e06f38fd2b81ddcd3284dc2b6
 DIST ristretto-0.11.0.tar.bz2 589169 BLAKE2B f1a0a28e7fdf83f05fc3b0a99f0c4ac0e48d07af3f9ff46f849e3768ce7b7978873cef8d028a74f5eff806cc0305d36c57e7ace99d56b61cc7acb3645e501161 SHA512 d38e3c488f106f5a060478e08fbba75fd0420fe1d1af40383118c9674f8acc079da6efdae4f41366d4cc8f34dce61e8eba89342e56747e697fd9c89b2689267f
-EBUILD ristretto-0.10.0.ebuild 874 BLAKE2B e07b94b57833859413826556f0b18150b2fada428c24b6fa33a57c1f0b4188bd2bc29ec1a3b2ead30d5b9c68192b4d29f62c11582e94322dcf8d0d5be8e40f92 SHA512 9d8917e11a0d27ba3f975c007b6e8661ce5cd2727b82990b80436495d34209df5d0e7f47581d1f53493524fd3898592f5322f829a4a634d0fe4b1c269acfcb1a
-EBUILD ristretto-0.11.0.ebuild 876 BLAKE2B e9a409488993ec8a2e8487013426c8009c4cab7e616f6ab969140d507ab56a7aa4fe02f1f122a8980d984bf36cabb4cc65d148e9c32c89fd34667421f709428b SHA512 2c5596d7b95c1ffb449814aff4887c321185b2d0c4ac7839be97e18fbef2108411fbf37257220698792259eca685d9754cbe9f22e6bf59623c567e85d1b902ca
+DIST ristretto-0.12.0.tar.bz2 600522 BLAKE2B 3af1c81ee881148b44637262aa45aec071b281be227a29a23d3baae10963e7bc328acd2ba875dd2ff2e3f3eed109e63f0af3d35f727237cd6f3ce54bcaa02495 SHA512 24782959f8560c6b3d78725b7bf99f61c5d4b16abb196d3b9d0fcc542de938ac1a26b0c76f5671149a1f1a9e0925e71b7000b1abc12e658470beb48cc51d5193
+EBUILD ristretto-0.11.0.ebuild 874 BLAKE2B 0b4d7463db35d79714c33d1f294d055e0940cdb1a6b65e5c1fee2e6b579c33aa35669616d90e3eac4fc8c2a4a8e2f8db14f2ce9d13927465aae3d2e90b8b7830 SHA512 02a09ed5cac0e73aa4317b2ab61f0fcd3430f0f524f60aa1255d4455e156de4c602d882b5fb708a7399fff9646961605d5a6a64442a574f20c3a21ce4cf5f659
+EBUILD ristretto-0.12.0.ebuild 886 BLAKE2B 116a3cb9f8cb99942e8e64f09f7918ed2c080be76a1d3fcb5da4d644368017377c1dcd3c2e4306954017a093e285cef76daf8a7a58b0fcd543399079544e890f SHA512 80e0d3625002b7da7b4f5f7adf815b5b21327740fb5ed57a73fa639083c9e72c1bdb5a9d5529af71c25e8830b5d2e41d63ea2fc8965574b34382f50666ab0a5b
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.11.0.ebuild b/media-gfx/ristretto/ristretto-0.11.0.ebuild
index ada9033aca5e..0023c6284f53 100644
--- a/media-gfx/ristretto/ristretto-0.11.0.ebuild
+++ b/media-gfx/ristretto/ristretto-0.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2
diff --git a/media-gfx/ristretto/ristretto-0.10.0.ebuild b/media-gfx/ristretto/ristretto-0.12.0.ebuild
index 4377e583baec..9bc62d72c2bf 100644
--- a/media-gfx/ristretto/ristretto-0.10.0.ebuild
+++ b/media-gfx/ristretto/ristretto-0.12.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI=8
 inherit xdg-utils
 
 DESCRIPTION="A fast and lightweight picture viewer for Xfce"
@@ -11,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2
@@ -20,10 +19,11 @@ RDEPEND=">=dev-libs/glib-2.42:2
 	x11-libs/cairo:0
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
+	>=xfce-base/libxfce4ui-4.16:0=
+	>=xfce-base/libxfce4util-4.16:0=
 	>=xfce-base/xfconf-4.12.1:0="
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index d3b3438c18ae..df9c2d98639e 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,5 +10,7 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
+DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83 SHA512 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
 EBUILD sane-backends-1.0.31-r2.ebuild 8554 BLAKE2B 20ef534583a3052e699693472bca958e49426353f6f1cf8e721690657c657e1411fcbf7c49ed28a84367afbd5e1f40a70bf3551a06d3d0e169b3dbdf6d89075e SHA512 690006aef47beaaad149199cef5ee694a6fa74913e30dc61d14aedd1558ef8e14f238e88d71c316a4c38f29f4e6a069f9ccd8508f5ec536864d192eb504105cf
+EBUILD sane-backends-1.0.32.ebuild 8378 BLAKE2B 77be0023958ecc1ab0d7b5540d64ddde7e47199a78d9f9dfdcb20a0b613b4734f80ce3ff3439956038f4beb05822ccaf91c1fee6124bb2ad780e058c760a4eb3 SHA512 bc66b785de5b525eaa37b80437a80b70b3353aedc86227ad74cfd8fdaa59919ba8801b5e5f8b73c55b25062cb8ea47b00728100b25ceb40f741d396ab29942e3
 MISC metadata.xml 267 BLAKE2B cf3ca2583acfc7c5d4b3e053cef4d72bf240aa58c54e8a0f72b9393ee8587bd587d4a88bad4b041cfd50d4465879ed546afa71b6e4570477b376a92ab47bb415 SHA512 d471748b0a9f7d7d4aca203c6bd1ff222f3faa455e7d1df2f8437a188922a40e3a656a5e20032256caf58d664e0f723e25055871e62d102e0c677264942b6fb1
diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
new file mode 100644
index 000000000000..36bb18f0a982
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_lide70
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	escl
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pieusb
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	ricoh2
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+	case ${GBACKEND} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm|mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${GBACKEND}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${GBACKEND}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_escl? ( zeroconf )
+	sane_backends_kvs40xx? ( threads )
+	sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+	acct-group/scanner
+	acct-user/saned
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_escl? (
+		app-text/poppler[cairo]
+		|| (
+			net-dns/avahi[dbus]
+			net-dns/avahi[gtk]
+		)
+		net-dns/avahi[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	snmp? ( net-analyzer/net-snmp:0= )
+	systemd? ( sys-apps/systemd:0= )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+src_prepare() {
+	default
+
+	# Patch out the git reference so we can run eautoreconf
+	sed \
+		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
+		-e '/^AM_MAINTAINER_MODE/d' \
+		-i configure.ac || die
+	eautoreconf
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+
+	# don't bleed user LDFLAGS into pkgconfig files
+	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
+}
+
+src_configure() {
+	# From Fedora
+	append-flags -fno-strict-aliasing
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local lbackends=" "
+
+	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 ]] && [[ "${backend}" != escl ]] ; then
+			lbackends+=" ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+
+		$(multilib_native_use_with sane_backends_escl poppler-glib)
+		# you can only enable this backend, not disable it...
+		$(usex sane_backends_pnm --enable-pnm-backend '')
+		$(usex sane_backends_mustek_pp --enable-parport-directio '')
+	)
+
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	myconf+=(
+		--disable-locking
+		$(use_with gphoto2)
+		$(multilib_native_use_with systemd)
+		$(use_with v4l)
+		$(use_enable ipv6)
+		$(use_enable threads pthread)
+		$(use_with zeroconf avahi)
+	)
+	ECONF_SOURCE="${S}" \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${lbackends}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler ; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null || die
+	fi
+
+	if use usb ; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi ; then
+		if use usb ; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		udev_newrules tools/udev/libsane.rules 41-libsane.rules
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use systemd ; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb ; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS PROBLEMS README README.linux
+	find "${ED}" -name '*.la' -delete || die
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	optfeature "Epson-specific backend" media-gfx/iscan
+	optfeature "HP-specific backend" net-print/hplip
+
+	if use xinetd ; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	if ! use systemd ; then
+		elog "If you are using a USB scanner, add all users who want"
+		elog "to access your scanner to the \"scanner\" group."
+	fi
+}
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 942093bf3da8..e500820d8a3c 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
-EBUILD scour-0.38.2.ebuild 722 BLAKE2B 03409f6b1eb636c2e91332a9381b9910005a94f1faf1ee347f3b24c9a7a685d0f51e87ae0df0067e2bef7fc2a800fc3e6bcea6f495cd810bb471c7a5c9997f50 SHA512 bc76ea87a3b2e4fab6884c8b59c981214464eb9f89693a31b7f1c72c848f62e3c2d30145444503309fa5c1d2f8c5524f0e38a780ca5cd8b2368f485d2f1c3b9c
-MISC metadata.xml 194 BLAKE2B 52e2f299addb0e889c54f25eb300fc9ef4ae70672255d191c49f06f60d3e0a564f7dfb500aaeff99600bb12b9c3744e40b4db69601644e4221f442fd13296431 SHA512 049195acfd7f7fd614f142947dfa0ba848267c4dcfca30cd9d24a668b9416de2745a3a7fdc499c041403e2b28e7f9bf051a4c784e0b4c8585e53d3ed6e1e0e7b
+EBUILD scour-0.38.2.ebuild 621 BLAKE2B 6a2f9dd5b5a85de1d9f3aa7fe38fac6eda64aeef6332ab2e8762d4dcf33f18135fd4bd361d23d9bfd80fa2ed7166ff7a798a72b65e25da64e0c3bd582b3b8bfc SHA512 cafe74e84c706b40dafc8f5da74c45bb996be1ba0974a71cac4d52e8c9c19f7d3b648b8d6168af2f8f191fe4efdb08f8449198d04e32ed0abc036eb0d6e86ea7
+MISC metadata.xml 282 BLAKE2B 6620cd1197d43d2a968e882186c2e144bf20ee709d4f3c812cec56f48899477fda8fbdd7f198d5e2bc9e9a3b7e8f72b547013e31b6d0d2fdc6271dc7680d48e1 SHA512 41c21e7c62696f6a337d3ed21585284972244e0cbb6b92247a1f745e75ce1a901d4b290f0e99ac6f866f110c08d926375f107e4eabbae000c918fe9f939af2cd
diff --git a/media-gfx/scour/metadata.xml b/media-gfx/scour/metadata.xml
index 70c16c0f82d3..b229b50ca604 100644
--- a/media-gfx/scour/metadata.xml
+++ b/media-gfx/scour/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <stabilize-allarches/>
+  <upstream>
+    <remote-id type="github">scour-project/scour</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2.ebuild
index 79258e63799e..1aa5120da935 100644
--- a/media-gfx/scour/scour-0.38.2.ebuild
+++ b/media-gfx/scour/scour-0.38.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
@@ -14,11 +13,8 @@ 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 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
 python_test() {
 	"${EPYTHON}" test_scour.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 4c96d40a2a04..7c73ecff11e6 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -1,5 +1,6 @@
-AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 1351 BLAKE2B 00dc9e14b8742a7aaa16bff964d6c183c81856298b205df97c5028081046b6cb0b0687ef0a3649d3560f6a5eafab6e62f5e276d41afc70e57398917828482ece SHA512 bd92e0f3e6743941080319da764ce6bbdb0b8d0694a9e5dd113e3a64c0deb0a86ce33a9a9f306c8a2c75d08f6fb33c78c1fe60f36309acf9c6223ec02b158f5b
-AUX sfftobmp-3.1.2-boost_fs3.patch 538 BLAKE2B bb2ea6156f3572f2da8ffd2f2bfd55fa89afe99af3f358d56b978e98160bd7b90c72cae8490687fc0b9c0509f896f5c6a7bfe41677f42652d77d52860b56e46c SHA512 75158af4ff574fe5112e4057ce0c2bca2f49afaf63862c42add85b8ee8e843f0a08b8c3d9f658f999024643d95ffcd65085bcb0607213722eb021b102037872e
+AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 749 BLAKE2B 3bd8d52ed467c188f8b0545dfbce8be3d7093c25ba7c9882701751a6eef18c9e43d9b83979669457ef337d857866754be750de44ffe0482880275a7f294751b2 SHA512 ad6c0bf2a2c0c44ab9f7fe0226137061561b943d59167f9de0adc6d1998d1a938166a2120b24c6499466a310736310a5e05be8b7d4575ea1121d99604fc56cdb
+AUX sfftobmp-3.1.2-Wformat.patch 342 BLAKE2B 1e6db3a432fce740f34f2cb2a3f3662f59c0fedd84e6b63a1cc58dbf2f5d9e48858ad0f1e25e0a9b2ef493eec4cdc8587cb24430026ad3c51190ddaf2213e8b3 SHA512 afde9e1a0acabe7d4fa51b6a533f09afe93deb5c8015c1cb322849feb543ccd45bf0639a61928c6c8641a741b348e119528ba1a03d6c201d12b4be98d49eb85e
+AUX sfftobmp-3.1.2-boost_fs3.patch 542 BLAKE2B 032a3f526407bb7e4c94176b914b8dfc298a250b468322561e6f0fa9b37578cd8872717080469eb147bd7fab2c9239d8a06ce9e2b937b87899355aa231e3a459 SHA512 1829c9cbfef93e9a019c2b92aa60e45c9f32498fba15ceac456ccd0fa6244e92aa8dc2b5ddff3cf56ad01e7e7111f0553807b4faa94c3d1ddeb2ab7328c8c915
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
-EBUILD sfftobmp-3.1.2-r1.ebuild 776 BLAKE2B 57ddfa11e0f88cff41ce693309b478594a57e353504cd2476a527bc25ed977885683c32d764271babd15897b0fe3364ffb55942d3ca86d0395b8b9b4f20f577c SHA512 8c0a30b354a613cf39a404cab80a1c56b67e8d01f1617dbb4e53a23f8d63c86062b66dfc6584e9cb7a0fa395e573607e9e227c3819080ec8d558fc59b4a4c930
+EBUILD sfftobmp-3.1.2-r1.ebuild 827 BLAKE2B bdc6c0a4f3d12d1bdfdfe6bd018d773958722e40102a25c5306ce0805a7d344fb7d06f7061456231bc2ce90e86f1ab48054add8ee3b33506b3a1f82ab4be35ac SHA512 3f4e8e8c92c9b1fb214ffa13ddec3715a1ad8696327926428262c9f835d7277b3d904bace7fa5902b819312e0be339539deaaf393e450f4b64a06713abe043a9
 MISC metadata.xml 246 BLAKE2B 7c25526b9240c42e9e0b41a00848ca2311c8edf487c120d4bdb03b78e15f3e773c8437e037ee3000ad437d5d12b237b2fb09e6c151f0be7e1cbe06f448f07a70 SHA512 f0ff62e58d57dded6e30f61f7734cdc744f9a727a7e2435f225b38990217690713eb50dff49920235efa94547e9a6aab32ba5c3a599fd80689e0c4d841eaa043
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
index 3ba832afaed6..226b717431de 100644
--- a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
@@ -1,8 +1,5 @@
-Only in sfftobmp3_1_1: Makefile.am.orig
-Only in sfftobmp3_1_1: Makefile.am.rej
-diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
---- sfftobmp3_1_1.orig/src/cmdline.cpp	2007-10-07 22:01:21.000000000 +0300
-+++ sfftobmp3_1_1/src/cmdline.cpp	2009-05-09 00:33:06.000000000 +0300
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
 @@ -35,6 +35,7 @@
  
  ---RCS-Info--------------------------------------------------*/
@@ -11,9 +8,8 @@ diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
  #include <vector>
  #include <cassert>
  #include <iostream>
-diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
---- sfftobmp3_1_1.orig/src/common.cpp	2007-10-07 22:01:20.000000000 +0300
-+++ sfftobmp3_1_1/src/common.cpp	2009-05-09 00:28:37.000000000 +0300
+--- a/src/common.cpp
++++ b/src/common.cpp
 @@ -49,6 +49,7 @@
  #include <sys/utime.h>
  #endif
@@ -22,9 +18,8 @@ diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
  #include <cassert>
  #include <iostream>
  
-diff -ur sfftobmp3_1_1.orig/src/Makefile.am sfftobmp3_1_1/src/Makefile.am
---- sfftobmp3_1_1.orig/src/Makefile.am	2006-10-24 23:14:19.000000000 +0300
-+++ sfftobmp3_1_1/src/Makefile.am	2009-05-09 00:27:42.000000000 +0300
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -3,4 +3,4 @@
  INCLUDES            =  -I$(top_builddir) -I$(top_srcdir)
  bin_PROGRAMS = sfftobmp
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch
new file mode 100644
index 000000000000..a7ab1c185751
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch
@@ -0,0 +1,11 @@
+--- a/src/output.cpp
++++ b/src/output.cpp
+@@ -163,7 +163,7 @@
+   m_pFile->Write(acBuf, strlen(acBuf));
+   sprintf(acBuf, "%s", "# generated with SffToBmp\n");
+   m_pFile->Write(acBuf, strlen(acBuf));
+-  sprintf(acBuf, "%ld %ld\n", aWidth, aHeight);
++  sprintf(acBuf, "%u %u\n", aWidth, aHeight);
+   m_pFile->Write(acBuf, strlen(acBuf));
+ }
+ 
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
index f39d157e1972..7ae13855def7 100644
--- a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/425364
 
---- src/cmdline.cpp
-+++ src/cmdline.cpp
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
 @@ -264,14 +264,14 @@
    }
    do {
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
index 4f2ebeb017fe..1bc93102d377 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
@@ -1,37 +1,45 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools epatch flag-o-matic
+EAPI=8
+
+inherit autotools flag-o-matic
 
 MY_P=${PN}${PV//./_}
 
 DESCRIPTION="sff to bmp converter"
 HOMEPAGE="http://sfftools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sfftools/${MY_P}_src.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
 
-RDEPEND=">=dev-libs/boost-1.49
+RDEPEND="
+	dev-libs/boost:=
 	media-libs/tiff:0
 	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch
+	"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
+	"${FILESDIR}"/${PN}-3.1.2-Wformat.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch \
-		"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
-	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+	default
 	eautoreconf
 }
 
+src_configure() {
+	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+	default
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dodoc doc/{changes,credits,readme}
 }
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 8ed3d2a89823..350221901b45 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -7,5 +7,5 @@ DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df
 DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
 EBUILD slic3r-1.3.0-r4.ebuild 2744 BLAKE2B b6bf1e8b964ef877d3b11e02bc636265820a36dcacfa84a912fe5533511feb205e1ee91657da46ce73160279fb6cdc9a44c054edbbb2e6bf485c94382f80cd3f SHA512 353b0cb79919ad64ef7dd90d29372e9d7e796102b9759adf80bf7bd8f3bef82e2e4260083448d6568e07643f3e0c47f800f69996db231f58e99c83461756ae36
 EBUILD slic3r-1.3.1_pre20200824-r1.ebuild 2780 BLAKE2B 8f41a258bdbd10da0fd8479ca2752e45240a47f6b69c70825fda69f7ec938f4a1b28878041e548d095d541ce71ae506f7f0318b10fe8f359745aff157949a615 SHA512 da9e0ff4cf0207c5150d1d668390e4a6be172a090397f18d64acf2ae4579682cc4d7a2b43a2bd2c7110ef8fb44fc53a321a620ae487c0c1de257d50730787223
-EBUILD slic3r-9999.ebuild 2691 BLAKE2B b14a5b90f76f4fbad343e58c4e021aa9aa7cbc24266b186af3498fc11819f171fb113a96bc181163181e54afcd22e2468b44a2a55e215f5c832974a0e07ebe6f SHA512 0d369a847ba58c9f6cd732c3694974e6901a16c2cc05e793fe3c01f586fdc216117ca88168ce18e2a93fd98bf006245276c96814f6497a738d2647f3c3ba69e5
+EBUILD slic3r-9999.ebuild 2735 BLAKE2B 894915ab09547a131f4435a786202d06b30c039c88dcee170c0cbbe2409a213079c1b10bf8d9e4aaca69b4bc69e2aa95b0aff0cd5eb251fdd7d91c74c5e530b8 SHA512 9c825dc76c78a3aa48f7dbbffdd974cef17077b37558209daa3512aa0957abd1748a1e61a8e6b253835be2ccfdb166ffa93e5b1f64852d5956b15a200d9c9152
 MISC metadata.xml 977 BLAKE2B bc737e1255bc2204a44b1aee62c3e342a8ac0c4844279c5cf404f52f6f052c6da1fcd490fc12cfa5d2158f79dd921c9c6bd29a4b99d7c62ff77a55d4073666fe SHA512 f09ea6f44124ebc24aa0d009d48af8d40190fa0d1fd9c2935341ac84f4ae900619b9557718fc38f399fcbdbe42924afc4ff6fb4676e19b3a3bfec6a7e9f6d1a6
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 16f8d66dac36..3d418fb61e12 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -69,6 +69,9 @@ DEPEND="
 		virtual/perl-Test-Simple
 	)
 "
+BDEPEND="${DEPEND}
+	dev-perl/Module-Build
+"
 
 PERL_S="${S}/xs"
 
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 1b82b83765b2..9d4aa910353d 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,6 +1,9 @@
 AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d
 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
+AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
 DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda
+DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
 EBUILD xpaint-3.1.3.ebuild 1941 BLAKE2B 5e739c74c5341e48c973cb0786b96f56724ea602cf463855d2e587ce67a5437620585bfa84b8b6de2707c882453c43e3f1181e3f76fae69ad6ca73725d60caf4 SHA512 3b073c54cc13783430d34d6777eab200953dff07d01c529fc6ba1a5ff21de390a98758b588388fcc217c06783f335033f2de71275961b5563d68aa231fdc7dbf
+EBUILD xpaint-3.1.4.ebuild 1833 BLAKE2B e0059015e593960e104a5270bc7122d51c4b0589cdc0d6bb3c617b3b0845de5b7a0a92c09d12fff5abe813646622307edfa5e67f1c87da6c0a9e2d152c131963 SHA512 afb301b6c6e0c93cb1157acfbdf91f7240d786e36a06319a41cba49c438597832dff70bc66380903a155fc77f33bf5d08fcceb7665ab4c434c0adf6dfa303a3d
 MISC metadata.xml 1440 BLAKE2B 54c11ed5ec99921d5ff28f23ee6be2df1fb2d21b3a994c92a94f0edfb2b69116620767bb51811c095736c1f1a7fb4205d6f1971997d81ca9f3c17c6c394d3068 SHA512 34c889965c22aa055b0205d0f93b45f51572958bf0ac992a781a3a5c679303081c368e4af35fa4c4699e8ac4724e125b4048b2d2856c408092cd4c7859728880
diff --git a/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch
new file mode 100644
index 000000000000..b05500ea6f75
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch
@@ -0,0 +1,15 @@
+xpaint was compiling and installing a shared library but it was not using it, linking with the static one instead
+This patch attempts to link with libxpaintrw.so instead
+So we can pass --disable-static to configure
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -79,7 +79,7 @@
+ 
+ xpaint_SOURCES = $(BASE_HDRS) $(BASE_SRCS)
+ 
+-xpaint_LDADD = xpaintrw/.libs/libxpaintrw.a @X_LIBS@ @X_LIBS_EXTRA@
++xpaint_LDADD = -Lxpaintrw/.libs -lxpaintrw @X_LIBS@ @X_LIBS_EXTRA@
+ 
+ docs: INSTALL README TODO ChangeLog
+ .PHONY:
diff --git a/media-gfx/xpaint/xpaint-3.1.4.ebuild b/media-gfx/xpaint/xpaint-3.1.4.ebuild
new file mode 100644
index 000000000000..64e86898d496
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/netpbm
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2h[unicode]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pgf? ( media-libs/libpgf )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch
+	"${FILESDIR}"/${P}-gentoo-shared-lib.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		--disable-libdvipgm \
+		--disable-libopenjpeg
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		includedir="${EPREFIX}"/usr/include \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
commit	46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree	db33a91259730be84999e13a8d8168c799f50ac0 /media-gfx
parent	e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)