gentoo resync : 08.10.2021

47 files changed, 292 insertions, 274 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 683a28cfab65..96dabf895e23 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index ab22f8ea6ec5..64991bd3daf3 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,5 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.21.ebuild 1047 BLAKE2B 1177894ea7aae61fa11faff28d57446d3bb4122eaf981c534965b0c9cb4c0ce63ca350cc931bade5a43c4eeb09f9bd5f7b8fe508fa0e088df6bd06676dff9e2b SHA512 0275ad1fd268dc1fe65ca15bb74f22dfe6dd739b9a8e9f15556524d151346f190ee2f557a94be9a1610acb9fbacad796e82e124045f4352a33de8c12cb6db352
+DIST build-docbook-catalog-2.1.tar.bz2 4731 BLAKE2B 38864866f03052386a0ba2fe832c750b851a5a0730df54fbac5253da682e92c0d865333c136d9c169a843e2a1ce291b2e5b5af657e7dba0dbf8d2fda213f6891 SHA512 8399652841f25feefa9ad3c138580f31da34410a44f2bdbdb4d63cb6efd1be445c7c4df6ed93629e53df4a4c6d988ed32a6a709f1abb059ccac0bc35b3b516a5
+EBUILD build-docbook-catalog-1.21.ebuild 1155 BLAKE2B d8b4c8b5da15b768d2035cd6be5ecd87b8464b06d6b1170dd95916f83e7bce3c7dda519d204beb82d001a693456984bc790e952dba24fb63f81b17e5595c1835 SHA512 c3d583f8a38c1992dc7afc750a797ad17d14700331d2717244ff46f86cc859c8b91c5d899b58388b389ab34e2db2fbbc599805b1815476d093d7430d349c597b
+EBUILD build-docbook-catalog-2.1.ebuild 1120 BLAKE2B c8e9e18687d7cd93e99e4587f7dcee1e9d7b48b05972d28f647d445ad1269f23a4c8d9b2b882dfcbdf1521583283c97c80b1c425bc14fe3e22008055c56edd1e SHA512 de0acf25ef5e5fc7266bdbf65098e8d83c9c455afc43e9f13f9bfc6e10023c05ad533e70f155667b7a12318a654ebb0919aeb99d8e9bca80921d1ac51d15bb6b
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index faaa5b36fd23..ea434173b02e 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -34,5 +34,6 @@ src_configure() {
 
 pkg_postinst() {
 	# New version -> regen files
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
new file mode 100644
index 000000000000..d3143b3652b1
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-libs/libxml2
+	|| ( sys-apps/util-linux app-misc/getopt )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+src_configure() {
+	# export for bug #490754
+	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+	default
+}
+
+pkg_postinst() {
+	# New version -> regen files
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index b5b761c97c13..a3ee3b50bc6d 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -7,5 +7,5 @@ DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbc
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
 DIST calibre-5.25.0.tar.xz 36849112 BLAKE2B f9cb423317ea1f5b22e7f3540708fd4fa6e7dff2d6d2c667755c74c4f46b72f52aac7672933c51efaf56a5ef57e573c8927649fe30570481c2057e5f757cdfde SHA512 7913fec188d8a8c40cf2768671836f6431d233ac53d1d683222a12f8a753a11cc4023fcfc1dd5ca8b27fd049fb579563b1cdd89624b824ce4eec7b438e25006e
 EBUILD calibre-5.16.1-r1.ebuild 8634 BLAKE2B e1f1420019a36ed08b72b4ea29c542824a02484133c0e400c25e6df535eb02cbd45d34b631196b4ffb1b616a920af8441cff028bdbe84163663abbea924b859e SHA512 ff2e79c6b2275782c9e3d0b24698f96c87489f67328df3894ebdf85ee4d1edce33e34bfbca19d0791a76bd82150d57d1f36f526def18ce0ccb41c600e943e81a
-EBUILD calibre-5.25.0-r2.ebuild 8505 BLAKE2B ee97e40be431c2fa039f20975c67665cbc7fc0cfb2a0e9162cb00b1dcb3f689055060ca73bc3de414c50512856d3c1f02f4f4ecee679c9d46d770a96be55aecd SHA512 4c08bbf5dbf5febab5b0368619e26b63acbac4513fe6249c52f137d8257d8cecb0869c0309ca3408d727eca4522954225c3d023271562620a7098401a9c92943
+EBUILD calibre-5.25.0-r2.ebuild 8521 BLAKE2B e8aadd09100a88f08a2555faf10b399ca14b9cc1a514c37e548db7a659ff76d24a25085a6549b9aa07a7c9f106f6198940390c9eb1362afd28745055e461f347 SHA512 600ddb23b1a0360fbb04cc1b84cdcfcbaae4f40b6b52f8385364a8bd5e1aa13678eb97a43600a08ca50c13aef58564a3398f0919232e395a7d4c3cd96556da7c
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.25.0-r2.ebuild b/app-text/calibre/calibre-5.25.0-r2.ebuild
index 475b78a4790c..40fa50fcc405 100644
--- a/app-text/calibre/calibre-5.25.0-r2.ebuild
+++ b/app-text/calibre/calibre-5.25.0-r2.ebuild
@@ -72,7 +72,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
 		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
 		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
 		dev-python/regex[${PYTHON_USEDEP}]
 		dev-python/zeroconf[${PYTHON_USEDEP}]
 	')
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 512f534c1356..d8028ed023e7 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1588 BLAKE2B 73d9a0d59518e3acb6a1dc3ec01769029161400642e1f686a7ea33a4cc0d409a88790d5f53418328b7bd07025f9eb0aa7da15a65717aaa20b7fe7e432f3a69ff SHA512 c02b1444770ea6ecdc73f194f9d1ea2d6651885465836f0a847ff90ae8ed727c58cfe7985b969c7158ff859b7a1e82a86f5f2cd9ee25020d507334bfa902a6d8
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1582 BLAKE2B 2b6bac21849b642d48efe05e64652697f956a726c34c396b7934baa2d1d360f510961dd64d401cd0c68070481c10cbdcf936d0e51c05d3ad999a1f3ac130f732 SHA512 264f0f2599dd323eee76760573b83ec3e5f9230e2e85a4aa3c5a9b2fac3b17f3022010ff24c59198c54bf411aff8d6d5ec67170a4b476a10447c07459b06ac4c
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1582 BLAKE2B 2b6bac21849b642d48efe05e64652697f956a726c34c396b7934baa2d1d360f510961dd64d401cd0c68070481c10cbdcf936d0e51c05d3ad999a1f3ac130f732 SHA512 264f0f2599dd323eee76760573b83ec3e5f9230e2e85a4aa3c5a9b2fac3b17f3022010ff24c59198c54bf411aff8d6d5ec67170a4b476a10447c07459b06ac4c
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1615 BLAKE2B 367eda96ba82a870d66e72d7e1d808be2505caf6bc264ff6bf6996e1d8cef8733078854aa42f324b7ae7ca16f0cd99c4c8a399aeab8100325eeb965c4cd9ccf2 SHA512 d5d109e9e80efbea312ae0669c1d050e0e0291f5877ffbfe522c01872accf833e0a9f2a45295b1ad51f585a949e47c25cb2d6e49ba9b4117c003cef64ae729ed
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1615 BLAKE2B 367eda96ba82a870d66e72d7e1d808be2505caf6bc264ff6bf6996e1d8cef8733078854aa42f324b7ae7ca16f0cd99c4c8a399aeab8100325eeb965c4cd9ccf2 SHA512 d5d109e9e80efbea312ae0669c1d050e0e0291f5877ffbfe522c01872accf833e0a9f2a45295b1ad51f585a949e47c25cb2d6e49ba9b4117c003cef64ae729ed
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1806 BLAKE2B 8017f7637b75bd1f93cd79afd4a2210119046afc36686bf5c970ba2e8f23040e6250fcb7347ce45f4999cc7f408432a8fddfe641f30799b557261c884835779a SHA512 fe7abd8eefb51b9123d91d1e1804bdf8ff62795eb19af0556b4c4d6e293ad864cd8f577131514e892318d7c76d4934c636a071dcf3164c595116fb8ac54d918f
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1800 BLAKE2B d2266ff1659bb71a0ce95854c028327c47e34faec2842c3f479a822d8818daa8eef152108eb5eb49931d53ca07fbab5dfb3ca60a69c94acfc5edfd33d5d47a30 SHA512 524ee2896ae4bbdb463eff7f6c9f3c6707a91b121e194b2528b9d1c287e56f588ede2f1764c5412e00fc1c3c793b01fcd18724a81c3874d814f5bf3caef5ac5a
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1800 BLAKE2B d2266ff1659bb71a0ce95854c028327c47e34faec2842c3f479a822d8818daa8eef152108eb5eb49931d53ca07fbab5dfb3ca60a69c94acfc5edfd33d5d47a30 SHA512 524ee2896ae4bbdb463eff7f6c9f3c6707a91b121e194b2528b9d1c287e56f588ede2f1764c5412e00fc1c3c793b01fcd18724a81c3874d814f5bf3caef5ac5a
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1833 BLAKE2B b3e8e7cba229bb5b1d7204a9a78c0cfb592cc5caef91b85257960a6e37515782e692a8396db3fa3b8ef7fdb8cc2dd734cff2134e2f18d5b2875bd1ae6ab44a9d SHA512 06b575f8767ece925d8c25265f168a7fc0532026a194f913e2cbca1fd2e3464a2aeb33c9c285491e6f5713b444ebab520c289eb4c3e387f29842ba4f496d49e5
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1833 BLAKE2B b3e8e7cba229bb5b1d7204a9a78c0cfb592cc5caef91b85257960a6e37515782e692a8396db3fa3b8ef7fdb8cc2dd734cff2134e2f18d5b2875bd1ae6ab44a9d SHA512 06b575f8767ece925d8c25265f168a7fc0532026a194f913e2cbca1fd2e3464a2aeb33c9c285491e6f5713b444ebab520c289eb4c3e387f29842ba4f496d49e5
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index f049bf68fffd..e3188ba498f9 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -51,14 +51,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index ee06649a6b4a..ee19a3db01c8 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -51,14 +51,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index ee06649a6b4a..ee19a3db01c8 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -51,14 +51,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index 175a7581c5ed..b9ce7d99daff 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -52,14 +52,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index 175a7581c5ed..b9ce7d99daff 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -52,14 +52,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index cd19983fa4fb..cb47845a2eea 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,7 +4,7 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf142
 DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
-EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1320 BLAKE2B 9c142f3d07dbfee91d0a27ff4cb3d008709ede3f49a9b16286c55ae20e399159f1eeed59be9cbfa1200b8787c43b9718a0f16b03a7d7c9c0a3e27afcbfbf2e80 SHA512 9c38e5734ded013118f177941951b2bef44c72985a0408d2eabdb93b49fee56cb1231d5a936a8f79e27c04dda7686bfb5a3d1500b5ffaffdc9ba968e180a1d05
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1350 BLAKE2B abb9778b960e710c2728fae81d7563752293524dae12f53ab3b045d0fd17c998b9a7a96ba0a3c19dbb23d54e19210ef3f4349c1022838437e1ce5eb0a33859d4 SHA512 c72e793f3bfbd02b99d1b4f5fd256f99ce8bbc3450fd4d05338c5070ddfe646461a27a7a61b643826267db1e3d480144f84e907de972d6dbf350618e32f28ecb
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1338 BLAKE2B 6647d37f1db0b92f2e525f66d5405bebb2116aedef70b73f5f37c8df9c57894922e6e84ac6ba8282b54878af5cca9aeefc6331f42dc49d8665ded6bef0de4380 SHA512 11e8cb45644fc5b44a120a02e7e0d53bbf92bb5c2fd3952fc6287422b3420884385f27e344081ba2bf4af67e60d27bd8f1029c9deb4191313091e6b6e1f1af1c
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1538 BLAKE2B bd536da328a3f3141ce3da4d434d98d930c41c01b58f3faa3ec93b1ee71bb2b92f84b63a11c2d981bdc6a139ca4335ba4a5b109a4ce405618707d27870b78594 SHA512 cd60882749253b2d278a7391a32267ec040380665b6e5311b3fad5f94268d1cf07e46e8254be3e019be8149a6620277efb869c3f302b9c3ecee125444cb693f2
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1568 BLAKE2B dbe179184c847cf96ea6d3aea95535e382c22f052152aeca08fa7c231984e1b5f390dbae8d8932d9a92d194b44566f8d7687d96a8c605d9be4c45dd08a213855 SHA512 b1bd816d015a1978b4c6f41dc258f2c4f98fdabd5e75b9b8c9360872505e43f316c06033068b0fbbf755e8a0b57c075170de1bf1b9c1de609d6f800ad0e820bc
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1556 BLAKE2B c2f146a7ec4ae1cdb8098f950f1e4eef50885108e70adca7b22784030addca7d45db99bc9c4609a8f5e8c12b3caa45d21cc04da59848c8303ccf3dde3ac6869e SHA512 977ddfa6016af159453f44249b0430e60966dd58d1060392e7e75d344b0910889f03f33cefa7d70499f990291f7655bab6b7245807c4a0e0f2861908225e2432
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index 2f7d18739a29..4650a13e7f00 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -38,14 +38,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-simple-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index 8e164c62c157..ebc3aba11d40 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -41,14 +41,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-simple-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index 64ebd01a1246..5e77faad0799 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -38,14 +38,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-simple-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 1a471dde80c5..35e26d186808 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-xsl-ns-1.79.1.tar.bz2 21962317 BLAKE2B a68cc31ea8cb98fc07e198fe55f242c6438284d6fa75d4920a9ca7b5038732f966cc6653e058d7fafb26c0ff49f2039025a48a0f8c0392ee892951723703bce3 SHA512 23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9
-EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1671 BLAKE2B 9d8b39c43e3df381c3ce296852d00e61ba7c3fe697c561f353f5fe38b23652eb91d7f0526fe1955a6796c069b8c595da3557e389e1adb4ba22d0f75f3288ff17 SHA512 d60a0a7992b08c7375f4f77724c68cb36cbe95a9ec4a8c018fdface92608f319424eb7b5e38607c6ff454df3f8da7e204483c868b411d0ba4990e8c58b597667
+EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1887 BLAKE2B e899f312a1a51e526b88473c5877661b007e4bb63cdbd67393d6e3bf3cdffdef6bc62b3fc69cd027278fe3da37aec14e013cc4c5453a4ac9efe5b47f588bae75 SHA512 5ed405ecaea3a22892301decab1132358bf3663d38eda397ed678e53645f7b4d57b07753f16885d9ca29cc33e10bd6978b853de7407c1d4f65ec6f44a718cdee
 MISC metadata.xml 436 BLAKE2B 610646d879825882245b28a831edeaa1bd6be5a50d134b0dd6ad3a0208100d714edff378f126cc5934fa475aa7b16b35c005e7e9af5f21949d6b9a374c6e3c11 SHA512 588a431b9a5fe8f9deb16d8cc1aed1b2042b9e7d6fc23ea33f6b8fdf0a6a0c0407422feb6b17916495387a997bf1fb203e57aaf9a833ed85a938119d49129c54
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
index 1755483b705e..d45bb7f26562 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -72,9 +72,11 @@ EOF
 }
 
 pkg_postinst() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 8f3ad2936996..0e5a2289820e 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2118 BLAKE2B db74883504a3e5690f3b01ef19daefc2d8d1436e2b4681a4926881b8323aad69d5ab69751080ed1b9abb60e61566ddea8f6bb358a1476aeaf4bcdd612681b5c4 SHA512 a952d27cef1b2970f7c312029575c4591aeb649b7319f41c581e627ccd3d33adbf8a70580b40f6438c6494155d80f0b9dfd4d80fafda6b13db21a282e2bfb3ca
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2334 BLAKE2B 658b7b6398ab89a0df0467d454156d5c4c88bfc359151f62963b029235baf1edf2d3659629060b23118d60867858f35c2a54d861d96485174b81fda82fb8ed92 SHA512 fd31fb510e337ae775a6866b46bcbd4acc8f18dbb1bdd8315052acc5b884fe9d1dd9bc5b02c75887f16fd04017441ff20f705155aa08d0b532e09e4c65bf3274
 MISC metadata.xml 414 BLAKE2B f10f5576731ded90514b956bb032bf6472634a509e709e998b0120ced275cea6d7027b18623b8f7d8198b6137a9566eab1b0462626a20693655c791b9763952e SHA512 f844b8d60c1c3413b8eb647bdffba6fb08e09e7f62df9e122ad6d69f9f67ec67711a66ec840f1ef92edefef83bd5e77103a10b0feeeb4a08f98680274c3dd93a
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 572429784248..1e1416abedfa 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -94,9 +94,11 @@ EOF
 }
 
 pkg_postinst() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index e38a353f1654..4b01c3605656 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -4,5 +4,5 @@ DIST enchant-2.3.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f0
 DIST enchant-2.3.1.tar.gz 987361 BLAKE2B 86d6f384ada861a1df40a3241d2d32ef8513784c9dbca3b71bfdc52e2efc94c4d9cfb38e752970dc31a36545c1f9bf32f0550316b969d9170363e8b52c030819 SHA512 c6fb8498d34a55040c2791124c2975952497e5a1b8999958691279b1a60a37473a1d2e3e11504f7cc877370be7772c2db621022040ea7035b21e40e8367606f5
 EBUILD enchant-1.6.1-r1.ebuild 1625 BLAKE2B 8f42b0410fa9b7565c5eebb849fa32c8850e8d77d65d34cc5f69a6ae553acf3bbf702e85d134387e8b2a75ad22f43426021d65b5ef4ac4f8e92cd6b3236c0d9c SHA512 fb0da3b82a95b9af44b7f35c05c204f6eaf2529fe72dcfe00b2e9a0ba6edfccdacda4f87e0e167548d66b2256beef4177bf4ee7fbad9a4817ed5688270531de3
 EBUILD enchant-2.3.0.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
-EBUILD enchant-2.3.1.ebuild 1241 BLAKE2B be853d1f72faf5dca852318b15cf3c61c5b0b2938a76863df67602dbc244a58d651c080e5f367a8e6ad226367808de6415b931781a2507a5d0440c27de635f1b SHA512 3f4176267b8e7cbd0278bacccafc89c4ee3210947db628a4dc919c418541f47ba46685c31eb5378b978205c30de406c424507dadaa01ca7a506844fcc1b054a1
+EBUILD enchant-2.3.1.ebuild 1238 BLAKE2B aa80e5d46a23aaf9cbd8be56804876206aecb6965610d224f359e99077e43c12cd04481d2c9abc90754d6a9f24bf6ffa100d2f591fc0379832e3da7d1db37a1d SHA512 8fc169ffd7425e3a789836731d2d51e5eec2ee91fa7e865bb26953b35d97962faae8943300f4a55036845612052540f8aa55269705c0e6f99d46cd6abb38dc0f
 MISC metadata.xml 537 BLAKE2B 6cb7c6968b6f90f2c29d2f7d3d731f947431b0648e7de6300599ca1f6d67544300484cc794309d27ce8878c068c2e8b5aadaa9fd6670d4388aabba2c1ef470a3 SHA512 140143a602063450d3ad55cf0374d42c255f689326978aca64f9c9f529eff6bb97b31bcaa798f34322d4e8c541478796f227e2c164cf1fa6e8538158c0f9fc60
diff --git a/app-text/enchant/enchant-2.3.1.ebuild b/app-text/enchant/enchant-2.3.1.ebuild
index 1c7845af2065..66d254be6a25 100644
--- a/app-text/enchant/enchant-2.3.1.ebuild
+++ b/app-text/enchant/enchant-2.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test voikko"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/fb2edit/Manifest b/app-text/fb2edit/Manifest
deleted file mode 100644
index ab3f86960c13..000000000000
--- a/app-text/fb2edit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fb2edit-0.1.0.tar.gz 244667 BLAKE2B 332ba2801a346ef667760ff9f116aec6ae3ef93c7d862884514982bcc6adfd5413b22beb40859cc28ca297548e2e8f1c95885c2e68734c554922965d53c8f7ab SHA512 f13d45987a513fa9ea8139b195cda77dd39d4d680b5a826882b8b9d6d5704f10ed4b447070f1de39997b3be0fafa8378fe1261ff2d1e53cf9b3225c07a293d08
-EBUILD fb2edit-0.1.0.ebuild 598 BLAKE2B e369fac1b21cafc9d44603642ba32103465c982fc100a86583b77d1fd2ba5ccf6148086f9308c9d11100b9e59ec4ffdcdc57d8d4895ffa9ea53b874ffdd6df22 SHA512 e550a48bb2dc946425bcc1d421e1b143936636bc879075f8741e17e87a75e8f6346d6cafa12cc983a849d2a1e18e8d15b33728e6fccdda47b75f8b44ef501065
-MISC metadata.xml 305 BLAKE2B 1bdf5c5607384f9c72679c508c49571f382ab245da0578649978ad98e7a37a4dfd3788e231ffe4608bb8d49417dc39a13e4acca803b666b8595b896cca8d8e19 SHA512 4dffb7f68c1f7467b07f6a8b0aadb114411d1162fca6344fc17e4e1218b984ec4a634cf04934810f638fb312ce352384fadaea4e4af6ed14985bff5c3d85cfaa
diff --git a/app-text/fb2edit/fb2edit-0.1.0.ebuild b/app-text/fb2edit/fb2edit-0.1.0.ebuild
deleted file mode 100644
index 1eaa7cee867e..000000000000
--- a/app-text/fb2edit/fb2edit-0.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake xdg
-DESCRIPTION="Create and edit fb2 books"
-HOMEPAGE="https://github.com/vitlav/fb2edit"
-SRC_URI="https://github.com/vitlav/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	dev-libs/libxml2:2"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare () {
-	cmake_src_prepare
-}
diff --git a/app-text/fb2edit/metadata.xml b/app-text/fb2edit/metadata.xml
deleted file mode 100644
index 21848a4c2fc9..000000000000
--- a/app-text/fb2edit/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">vitlav/fb2edit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 4248ab0007fc..b935f90eab56 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -11,6 +11,6 @@ DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c08431883
 DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5176 BLAKE2B db5d5ca4785c48ca75d55c980f9e1aae1132f3e68dd52e2443fe8bf0202b7c82367893167a8cc8a700c7ef12ff9d8743eb41732b8ba450b9fd9606a274210a36 SHA512 44a43ed682065164dafcfe7eb62918fb9906197569be216bfcc800d232d2ffc33702090844ad8b10f65492c60cb90a5b162560ad26b828973ca46ea85f993a8c
 EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
-EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5290 BLAKE2B 68bed51c9e011285e6c11ddc29ca85ac589dc900d41be3c6f61f34df9e097168e604c3e3b251eded5589e1bc4b69f84ac60bb483dc61a4cf0a858bde7a489483 SHA512 29cdd0de17180962172f6efb92e18483765899ec0815f4a43b5f27ec49824fe0b0c5a68e4172e761995a6418fabccc3bc9647dffb521cb57bf99614c3459f828
+EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5289 BLAKE2B 0ec2dd40b3a8347214a4be30f3606de48de7dc1e9058d05510c874053b2ffb6a3059164cc9dd5c244ff717cd30d8260b2ea8a38ca85a8cf2772a69385cf6ae89 SHA512 e2d26a81f2741064fa4f3345b34c19c70b1ea12614f93bcba392df2b8bf68881db48c1d17695dfd58f7223d68649fe0c3a77305be30d53ded5c12d0f6e0f1d12
 EBUILD ghostscript-gpl-9.54.0.ebuild 5143 BLAKE2B d9f1444bc320b4c7747722ffafdf5b8d47edc9ec60abc682d0ce91c53d8ff3e047b51a06af5d3acf2d09603b775bce0a199c9647f3ba2a61b3a249891327b29e SHA512 a6a5623daad8e504a8afe6e18a1fc9783ce9eb6dc2b8504eaa161d4d51dfedda2a45c85802eb72519ddb47fa2278c104946fc66dd9feafd763fc999d54e90be6
 MISC metadata.xml 765 BLAKE2B dc8466ca08f1fa1891cc60e886bfdd4cccc517c4b355ba6d7697acdece16657982adbfbd4f5709b3850dfba1293ce269b17f9c05bb92f5e5531f3c7debd13613 SHA512 7f4dba7c256642b532cb7418507169a2554e0c4058011ff8dba802f93d677a824b8ae7896840369f06c801ca4a7d27fda86f8c6a344127f65f61ca6e3a02c0ee
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
index 94be6c18b807..c5e6900b4f22 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-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 ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index f6b4131a0afd..77c53acc8720 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,10 +1,4 @@
-AUX htmltidy-0.99.0-CVE-2015-5522.patch 1387 BLAKE2B 0a33769a37f78693025a3fb7e2bdcb6d02634df7c7cb417bad760ddc6318a51d1def3dc318a06b4182a916e664a0b47e2e3b8e40dfaff3616745c668b5b81a56 SHA512 d543dcf963fca7eaf644033a6f0252ec16b628984e1acd86fdb6d4657f01a2b3010c4c5f41b48126ce91cd38b5902349289ae4e11376cdc827813aac84b83f2c
-AUX htmltidy-0.99.0-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
-AUX htmltidy-0.99.0-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce68cc97488dd0fda0214b4437b6f9bc29e0e29f046328bd1df4eb0143757d7b866df06fd302d2b2c367817e0deec5202a SHA512 2acef36a990196c4c995a4678988f5f4bc51b87c17a01843b1f7cefc4ff1062425d366b29ace0839ea8b6b64a8923c5f56ac4048106825b946059eae8951e326
 AUX htmltidy-5.8.0-no_static_lib.patch 1282 BLAKE2B 6c5dd8ce16b0e05ce0cca9ea268b85bffa371f99e20d909f606c20c5fb6d06464f65daf7a297989966656f3eda0d5cc920a8f9e60dbbbba21927aab180567f9b SHA512 8742a0db922098f46d377861d56c6202144ed02c9603e3899817c9d1b5a903bc10e729066c2bc95b0a9c9b63603c6ed42a3b8486264d3560b78255b096b62000
 DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44
-DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
-DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
-EBUILD htmltidy-0.99.0.ebuild 1970 BLAKE2B 3070aed3a7fd97500449b0a9d15e94310d0fc6e1132031eb780c219341906c9c28d18c17510768a39f7c0abeada96ba536281d4e363cd9a5dee333cf05d80ef5 SHA512 c2daf06a319549320e4510df60f240e9f6a9504657fc230ca3d6af535804b1daf47fae2c6f92bab84fdc31b3968683e30228196249b60e92d480540006c89c2d
-EBUILD htmltidy-5.8.0-r1.ebuild 1498 BLAKE2B e63b5bb8587b4f61bac9d28df3fbf85727fa69474d35115dd6636fe0c10e53f1cd8aa3f888983a235a2e187d72c803cb376697003b593cf00ba20d1c72b5dc6c SHA512 80b109025beb7e87a30a81fe1f32a9a6ea53da24245c22ad4a9fbc4313d0f0ebd15a9bd2bf4fb7e9d26ed732c9b8353c88eb5243e6c5acaf25c5a86ce28cb281
+EBUILD htmltidy-5.8.0-r1.ebuild 1495 BLAKE2B 87a6a9bb3d30778e0a9af6c28e11545fe7c8b34315fbeb803a2c4b69e1d5845fc036dd358227b1434609d7de5f1601d5716049d995457d49b3a799b1acb0f9a5 SHA512 8612acd8125b83e671157cebbaa60e0c06c3ba2b8e3c64bf430743294c0998ca4b90a743ecb1af5554fcef87ec6a2c3c4dc06bdfaf997bb0a493c35a70aefc4e
 MISC metadata.xml 608 BLAKE2B 7fcc3eaa3f24191606776cc3a92f97d58f1ba27c3ebeea50727bc334d504ef09ff4387208222080574856db1e6d1d8689a9b22f1ef0f0347f3bb82d9a38a6afc SHA512 adc1857b273dc8bb8fd7215cd733e56dd41eb7e9eaf82ccf183f001afeeaafd2ba4cde4f9b75c2882427ebed7cfcb60a16408d19f9f6c6ad91b6beacc9edefeb
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
deleted file mode 100644
index b4d6158ea04a..000000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c18f27a58792f7fbd0b30a0ff50d6b40a82f940d Mon Sep 17 00:00:00 2001
-From: Geoff McLane <ubuntu@geoffair.info>
-Date: Wed, 3 Jun 2015 20:26:03 +0200
-Subject: [PATCH] Issue #217 - avoid len going negative, ever...
-
----
- src/lexer.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/lexer.c b/src/lexer.c
-index 376a3d8..664f806 100644
---- a/src/lexer.c
-+++ b/src/lexer.c
-@@ -3739,16 +3740,17 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
-         /* and prompts attributes unless --literal-attributes is set to yes      */
-         /* #994841 - Whitespace is removed from value attributes                 */
- 
--        if (munge &&
-+        /* Issue #217 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
-+        if ((len > 0) && munge &&
-             TY_(tmbstrcasecmp)(name, "alt") &&
-             TY_(tmbstrcasecmp)(name, "title") &&
-             TY_(tmbstrcasecmp)(name, "value") &&
-             TY_(tmbstrcasecmp)(name, "prompt"))
-         {
--            while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
-+            while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
-                 --len;
- 
--            while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
-+            while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
-             {
-                 ++start;
-                 --len;
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
deleted file mode 100644
index 4c805cf2226f..000000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN tidy.old/configure.in tidy-26/configure.in
---- tidy.old/configure.in	2006-02-13 17:17:49.000000000 +0100
-+++ tidy-26/configure.in	2006-02-13 17:17:20.000000000 +0100
-@@ -72,7 +72,7 @@
- if test $debug_build = yes; then
- 	CFLAGS="$save_cflags -g"
- else
--	CFLAGS="-O2 $save_cflags"
-+	CFLAGS="$save_cflags"
- fi
- # 
- # =============================================
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
deleted file mode 100644
index 942a61e1464c..000000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: tidy-20090325/include/platform.h
-===================================================================
---- tidy-20090325.orig/include/platform.h
-+++ tidy-20090325/include/platform.h
-@@ -24,7 +24,7 @@ extern "C" {
- */
- 
- /* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */
--/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */
-+#define TIDY_CONFIG_FILE "/etc/tidyrc"
- /* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */
- 
- /*
-@@ -33,7 +33,7 @@ extern "C" {
-   It enables tidy to find config files named ~/.tidyrc if 
-   the HTML_TIDY environment variable is not set.
- */
--/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
-+#define TIDY_USER_CONFIG_FILE "~/.tidyrc"
- 
- /*
-   Uncomment the following #define if your
-@@ -48,7 +48,7 @@ extern "C" {
-   Contributed by Todd Lewis.
- */
- 
--/* #define SUPPORT_GETPWNAM */
-+#define SUPPORT_GETPWNAM
- 
- 
- /* Enable/disable support for Big5 and Shift_JIS character encodings */
diff --git a/app-text/htmltidy/htmltidy-0.99.0.ebuild b/app-text/htmltidy/htmltidy-0.99.0.ebuild
deleted file mode 100644
index 8cacda80a2a1..000000000000
--- a/app-text/htmltidy/htmltidy-0.99.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="tidy"
-MY_PV="20090325"
-MY_P="${MY_PN}-${MY_PV}"
-
-inherit epatch autotools
-
-DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
-HOMEPAGE="http://tidy.sourceforge.net/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	# Required to setup the source dist for autotools
-	einfo "Setting up autotools for source build"
-	cp -R  ./build/gnuauto/* . || die "could not prepare autotools environment"
-
-	# Stop tidy from appending -O2 to our CFLAGS
-	epatch "${FILESDIR}"/${P}-strip-O2-flag.patch
-
-	# Define /etc/tidyrc for system wide config, bug 154834
-	epatch "${FILESDIR}"/${P}-tidyrc.patch
-
-	# Fix security bug 561452
-	epatch "${FILESDIR}"/${P}-CVE-2015-5522.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		doxygen htmldoc/doxygen.cfg  || die "error making apidocs"
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# Now the man page is provided as an xsl file, which
-	# we can't use until htmltidy is merged.
-	# I have generated the man page and quickref which is on
-	# the mirrors. (bug #132429)
-	doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1
-
-	# Fix name before installing
-	mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
-		"${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
-	cd "${S}"/htmldoc
-	# Install basic html documentation
-	dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
-	# If use 'doc' is set, then we also want to install the
-	# api documentation
-	use doc && dohtml -r api
-}
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 972050738a1b..f398e94701dd 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0/58" # subslot is SOVERSION
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="deprecated test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 04ec17f13f36..06d62c1f46d6 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f
 DIST iso-codes-4.7.0.tar.gz 14122654 BLAKE2B 5dfcf4a0b39ff7b696f157a3938b7c1d35015c346ba4b046dda6b6b5bdcb02e561161afecfd2909fdbfbff6378cd4940335543d0ca7313bb9e80e490ad901abb SHA512 77ceb2ba9f3290f9409efdb50112beda2872ed163a86912b46480407f1135c0263cb70bf84bd2635b304d1af65e5b60f97a20b305219ead9ac98423b5abb255d
 EBUILD iso-codes-4.6.0.ebuild 2637 BLAKE2B 96372d652576a4070b2c72792d4596d040e95c857a688612b92eba596433267274aee5b0d07cf86516ccc5ba40860468523b8ec3bf0a1658a020a166cc2580b5 SHA512 51a092a6c6a712e4a862b5735c439d8e8f079e098cffa883aebcbd531468456be49a7a0f20f313dd359ecc3e59f1b783ce2a7ae18e0c603919afa1103cbd0779
-EBUILD iso-codes-4.7.0.ebuild 2645 BLAKE2B 1e045a1379fbbd86f88215fab9f0fb539d3a89336ccd20c46f437653f0ee67d0f8660ef3287574f8b81f3c8cda93d3e1e7b8b3e8ecb176049c793b79b85f2202 SHA512 664d02decf8bb5f8c603e949cf9b50e92e4801b83be61c925f31382e85173fce17e66801a5d289a682fc9e9e26c2bb2b243348d7cef413617028736a3f911281
+EBUILD iso-codes-4.7.0.ebuild 2642 BLAKE2B b91930f702479a5afd75d9985d5df66717764f40a515afef639e7216622475301ad8b8b8ebba3b65399f1846f5fcd5b576c6d670d9743d946f592f1698d85786 SHA512 fd7d5e192c32369a58557e0ea1673b0880408d58957486d4eb44508262a887d758ae76033d8fc1bca7d0807780b1553bc0ecdec90b0889c2d3076db3b946a566
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.7.0.ebuild b/app-text/iso-codes/iso-codes-4.7.0.ebuild
index b89d5b65020f..fde78634b315 100644
--- a/app-text/iso-codes/iso-codes-4.7.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 858d8ecc1ee9..7f6236b1315f 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -8,5 +8,5 @@ AUX mupdf-1.18.0-darwin.patch 1001 BLAKE2B 1d6f8452cda38dfca3b0e62069a560ed6119d
 AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.18.0-r4.ebuild 4266 BLAKE2B 840bcff549d8911c422580d8ba07dcaabc5e036840bd4ef3cd2346703465365d91d7cf58fa55d4860dfd6c39f7f32b23a1ae97c32184dfdfa8e5c11e4e65bf7a SHA512 b62fe1022ba26fcd7f2f9e7ea0b6b7f94bcc1e80cc5d8dbb086436afa46c4978249214bfc46d4057263a0a5f6c06a28eeb40c31206355379a442979e857cc722
-MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
+EBUILD mupdf-1.18.0-r4.ebuild 4358 BLAKE2B 67d3b045314556eb3e81a668015e36115e7729436a91bfebededdf316bce062bac229c64b63f0aebae7553b8a5595fa0d4db53bb7a7a9b452a087967cd04547c SHA512 90dd0ae5d0376dafbce8b19d711d92ab9debceb467578f0e529881b219e8b3166fe5ec1f0b535036300a1e4a60d9969ba21450ca54b6f7e18f8631b035b8a4b8
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 641cbd3703e7..115e9d64a669 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
index 66511fc715fd..85aad834e2c2 100644
--- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=7
 
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
 inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index 06e134310189..57fa8a731f2e 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,10 +1,11 @@
 AUX 50namazu-gentoo.el 72 BLAKE2B 1047f37bcd89dd27714342af9e88ef186860efe6de8be767f37a81164b8d6b821bba292a1785617b1da249f76171d449485b107a315ea4ef0342173d0ec74a65 SHA512 8e316add3dbe93049fd879bc93829b2c141a752133d065c2ee724e180b38f171f5b11dfa72b8651d7721e825e3ff35439c6afc33c6043ce42738739ff4988e8c
 AUX namazu-2.0.21-memmove.patch 2050 BLAKE2B d5a12989489c4db9a6a7c6288ce29ecbe654731bfd84e3baa40c02ad802aa975704dbab2b05dc8f496e30cc76a1cb7bfaf9f2d8a2f0484160465fbb1f41af9c9 SHA512 d445d77c45a30d4e71dd9129ebf7938f48058f89627e4130e0f921ca719918fdd654f8369d0ae24edcbfb5d3801d68eeeaee4b55c887b9d208e0d8df00effae5
+AUX namazu-emacs-27.patch 422 BLAKE2B 613d43536da45a8f7df12b1e2eb0c7644702a0c2ba8a8f6b1a9806f343dc467b5c20b501a38e7abe732947ebe35c7ec47ae346003c26a8271f88709c62943105 SHA512 65456a1d4bc3a54ddda7360c370fe1c3847711e5e78858e7a35628148fa38a6e844df8bc2e1f1b963697eaedfa0354cedecdc24badeaffb3da02eab5fe241555
 AUX namazu-gentoo.patch 1471 BLAKE2B 949429187d765e37a3fcfbcb9c455d4b92e5d1af11a4b0550a40240523b3862de8cf3b2cbab85c15be9848d1614cdccbeb0df346a006f445eea35aad35a05bc1 SHA512 bdc4946197f48fe87fe1e2eacbefaaf775458e28a96f2c5af70c1264e883f29c89673feaffd71afff9d9744bb7b81c3b3ede3258f585dab3b7f117c8fa77f93e
 AUX namazu-perl-5.18.patch 1761 BLAKE2B 38941d15556c229de19592ba2660b9a79782588a79811d0a651599b0e4d22ff4a8a515aca2047684e988d6a434025aca40d744c2aabe310f20ebbbb4ff43af72 SHA512 4a5faf2a889f9eb02a57db80c834a60560bbe2df718f541a24fbfc137145121336055c157458b5d3c4d9c5f573cf3964329adc1ae1e2448c254531df4fee8267
 AUX namazu-perl-5.26.patch 632 BLAKE2B f6b4a0838d6ca529adb9330f7221ebb014e50f289be144920a24a6656fb3abc604a0dc39f6f618a02b25c1cbf2065331f57f80d4120fba69042692a3dcb8a673 SHA512 78c655dfb0bfee51e339a142e71685b0599a58786899a151279834b7e9523dcff8359df8addb2a1e40a162f2a412cbd10e178a8215f3a178527392c2a8fa7be7
 DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
-DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
-EBUILD namazu-2.0.21.ebuild 1701 BLAKE2B da0cf2173235fe7efd2aa5b44ad1c79a7e32e204816e64e01e9480bff2082753d157bb1fbf5fc7be0993b185073eec5c176344dd46c91b57001fa6fb6ba876c6 SHA512 af0cf876363779efa6dd32b948bcc717bed8693f6365768c6d66cbf09663aadbf8a2f7fbd4181b76c7d2d7e6fa460b8959dd0293a51911645f37ce6dd38c4282
-EBUILD namazu-2.0.22_pre7.ebuild 1617 BLAKE2B f0eac6cbfc2842de4934c14aee296942a49b8f305a1c5ae408a5a07f6588814f2f6c1c6e589e5e409af3a3619035ca95aeaf6577de263742968f34ce3963588b SHA512 59be3e7022df5db40f6517915aed1ef9f1e4347d0e88fa86bb23fdce8dd224b4f0b532cd1c2ddc631c5faab113b6b64084fc69e65d5f929e3b412c2c2efc65f5
+DIST namazu-2.0.22pre8.tar.gz 1975653 BLAKE2B 91e07e576fe7f8dc93db2754726f0fa286191dae44e885abafed5887d741f3291fd79665294dcae23770d2f42b5b35a323f7896209a62e802ac4253d729c3f23 SHA512 2d891cd2a4eae8246753511f3e2323093139be917edef9e2c3481ac7a0de9b9200906d7d56bbcd7bf1861ede44ae6bca72820b8086b2be93ad9d8f20cb56cae0
+EBUILD namazu-2.0.21.ebuild 1763 BLAKE2B cc3fcd4711e10d41f92a80293d6393af310fd0a95ac51f3b0444aa7ae7242a25ecce511d461de74ba88763ff232d50337320b1cfb9be1aab45a2b0d9dad327ca SHA512 72068431e7a77021767dc3a72556e1fdd1d789d43f6428ddcedfbbba90569dfa78d7a817b70733bc0d08a73304543257df6f1c9c962c9428c940a8a7f449dfe9
+EBUILD namazu-2.0.22_pre8.ebuild 1643 BLAKE2B b87f7691dbc8ab191751d5b66819cdc9c409d4f35d312f0f94ca9a2e65d80ba94a391853135601242cfbbb73ce18feff71b8edfbacede7c1275e0a41c4869858 SHA512 3274b729bb781e93cd8fb692ed36e15350a0a6386bff264be2da11512c69290e54c5229b9a0a1867b16a48668fbdc32426d3da70053e8d8bd084b2d3ca714d22
 MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
diff --git a/app-text/namazu/files/namazu-emacs-27.patch b/app-text/namazu/files/namazu-emacs-27.patch
new file mode 100644
index 000000000000..cb9dd4de9590
--- /dev/null
+++ b/app-text/namazu/files/namazu-emacs-27.patch
@@ -0,0 +1,14 @@
+--- a/lisp/namazu.el
++++ b/lisp/namazu.el
+@@ -99,9 +99,9 @@
+     (defmacro defgroup (&rest args)
+       nil)
+     (defmacro defcustom (var value doc &rest args) 
+-      (` (defvar (, var) (, value) (, doc))))
++      `(defvar (, var) (, value) (, doc)))
+     (defmacro defface (var value doc &rest args)
+-      (` (make-face (, var))))
++      `(make-face (, var)))
+     (defmacro define-widget (&rest args)
+       nil)))
+ 
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index 5d0b4d0d14e3..ef46e76118df 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools elisp-common
 
@@ -9,7 +9,7 @@ DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/"
 SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="emacs l10n_ja nls static-libs tk"
@@ -30,11 +30,12 @@ RDEPEND="dev-perl/File-MMagic
 		dev-lang/tk:0
 		www-client/lynx
 	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-emacs-27.patch
 	"${FILESDIR}"/${PN}-perl-5.18.patch
 	"${FILESDIR}"/${PN}-perl-5.26.patch
 	"${FILESDIR}"/${P}-memmove.patch
@@ -43,8 +44,8 @@ PATCHES=(
 src_prepare() {
 	default
 
-	mv configure.{in,ac}
-	mv tk${PN}/configure.{in,ac}
+	mv configure.{in,ac} || die
+	mv tk${PN}/configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -64,7 +65,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	default
 
 	if use emacs; then
 		cd lisp
diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild
index 8517c8554367..4c8146e3b313 100644
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools elisp-common
 
@@ -11,7 +11,7 @@ DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/"
 SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="emacs l10n_ja nls static-libs tk"
@@ -32,8 +32,8 @@ RDEPEND="dev-perl/File-MMagic
 		dev-lang/tk:0
 		www-client/lynx
 	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 S="${WORKDIR}"/${MY_P}
 
 PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
@@ -41,8 +41,8 @@ PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
 src_prepare() {
 	default
 
-	mv configure.{in,ac}
-	mv tk${PN}/configure.{in,ac}
+	mv configure.{in,ac} || die
+	mv tk${PN}/configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -62,7 +62,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	default
 
 	if use emacs; then
 		cd lisp
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 2b56a7f84552..b879cad60b74 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -4,6 +4,6 @@ DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d8
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
 DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
 EBUILD po4a-0.57-r1.ebuild 1290 BLAKE2B df2dbc33e75186c1e578cc4ba02ae7df6aeee4e14139d8b9174791a747ae4064012df67b169f11ea5ca84f3b5d96abefd92faf39a0810a9b8e7dbe865bac4c3a SHA512 28847b243fb6a82d9650a1088db67d118ee53808231d2907ebe349e79e66f754a15747981d59faff82365363be613a42e8b5691a9a0118060c9df2e875b053b0
-EBUILD po4a-0.63-r1.ebuild 1381 BLAKE2B 892af19ee33f8f87b7ba6d7c895a8845993584a609527fbea1ee2d17673366edf303b330ca99802f2a97fdde2435b06f12b809ab3ef7a0c731ab7d25fac741e3 SHA512 ec970f1a73305b7c51656e75e70bdc539f143554bf8365f26c726b9a8382f099c5f0a1775e37de44a0acaf5bc545ed963f0c0463087f928d0c5b2e197c08994d
+EBUILD po4a-0.63-r1.ebuild 1379 BLAKE2B 69a7969a88f555ac4ea1b3a27cd99ca145f06c0accb67f6643374ddeea67e86590c54294de671350120bd6e7cca7af5ab57879baa147be1b1d0d138dfa98f7ee SHA512 d0d3afb9ddc10971ebef10faf3df5847a1a4c135311da11b504fdf4e0069073efaf86fd366680297edf46cd42f352d497c60da6e97665755f366d0345270bd8b
 EBUILD po4a-0.64.ebuild 1397 BLAKE2B 4aeba42b51780c8eae9fe0d594a286aa2febe52cd07cfe2b905742fe3aa44b7200f03fc242eb318a59142897a7b8a2badcfefe6d60eabf7fea04c994b583f32c SHA512 b6f5a4b8581599f3f2eb1d9ec36eba749be90c2c58e373cbb4030a56667c940d8430b836af329d6daa222c269b6076864461d85794e13f39770aff8ad8fa2e75
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/po4a-0.63-r1.ebuild b/app-text/po4a/po4a-0.63-r1.ebuild
index 796236689b7a..6299fac79ffc 100644
--- a/app-text/po4a/po4a-0.63-r1.ebuild
+++ b/app-text/po4a/po4a-0.63-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 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 ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index e1c78533894e..93e434f4311e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,8 +5,10 @@ AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203
 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
 DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211
 DIST poppler-21.09.0.tar.xz 1722828 BLAKE2B 02bb35a051fadccd6e6d071b74f169fa8aca0f83aa27aac420fdb7998537b42747134efe6562ee2a09598761c55494e30dabf5785f70f84029c5662bbd7311a2 SHA512 e63181b98cbcb71e5b1beefce3aa7c196f69a7adc4304c8ced70eac7ab8a7edf918988faeb2a23727ecaafd6f4a809f561fa1c86f1fda0ab7e5e2dc882a5ab55
+DIST poppler-21.10.0.tar.xz 1779668 BLAKE2B f4464b70ba031ed697443803c435a79498184fc9a74381f5ac7c6ee0f856d77d6e270fe0cea70ee9bbc54713ec69d45ea0ffc66e820d80061856d6711d584e04 SHA512 4a125784716ee578f5be39830cc5903c27eeb707d3756c2ff04ef97328ed8d9e35d3873b7731d2144997cb31794674a1bd35461c84d4237335db27c8df43e4f1
 EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48
 EBUILD poppler-21.08.0.ebuild 3347 BLAKE2B 700214c4ab1e71cc530bb084915ffdae2dbb4b56a30eed2ae599c0bf8f71fc03f5357ab105c41123c075397743ee86b0cc920b0356c642ca7e4ad1ccc663e293 SHA512 2964d203250ad578b09895582fdf02e855b2355944bc318384db76d39701582233382c436f9d2f22e643a88db98dc891070edabe3a11c94614ace4fc224cfb95
 EBUILD poppler-21.09.0.ebuild 3338 BLAKE2B 19302304b8554918ccda77631c54210be4725675dae60d03a9d2b42e92d8de25d699d1f92ff90537fa74a262952cb6b9e99c055e5ad38148ff8c28853d1792b7 SHA512 cb51c79668fbe081ee739f30f31baad7ff189e887d83ef5049cb0842dfe432a8e25d43414560e342ce366f937bd44e9ca49b25c387809b7b0ea4b4d39c667ddf
-EBUILD poppler-9999.ebuild 3338 BLAKE2B 19302304b8554918ccda77631c54210be4725675dae60d03a9d2b42e92d8de25d699d1f92ff90537fa74a262952cb6b9e99c055e5ad38148ff8c28853d1792b7 SHA512 cb51c79668fbe081ee739f30f31baad7ff189e887d83ef5049cb0842dfe432a8e25d43414560e342ce366f937bd44e9ca49b25c387809b7b0ea4b4d39c667ddf
+EBUILD poppler-21.10.0.ebuild 3338 BLAKE2B a45906f684c33587ca42f00082f7ec413c5045d0ae1f19a563d68ef5b30d14b1f265c93a1f29d56833bfc43f21e09e5d91273feae4070e036ef805f7adf5212e SHA512 56ef6abe3f91ccc3d4578a9cc84644d96ab8ab357f7c4c3fcc0a8301cd0b859d0b4e733560ab88c5e060d78a282fffc57da97f5dfd71f75518fe50c8b5457810
+EBUILD poppler-9999.ebuild 3338 BLAKE2B a45906f684c33587ca42f00082f7ec413c5045d0ae1f19a563d68ef5b30d14b1f265c93a1f29d56833bfc43f21e09e5d91273feae4070e036ef805f7adf5212e SHA512 56ef6abe3f91ccc3d4578a9cc84644d96ab8ab357f7c4c3fcc0a8301cd0b859d0b4e733560ab88c5e060d78a282fffc57da97f5dfd71f75518fe50c8b5457810
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-21.10.0.ebuild b/app-text/poppler/poppler-21.10.0.ebuild
new file mode 100644
index 000000000000..2ca5838c2b0a
--- /dev/null
+++ b/app-text/poppler/poppler-21.10.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/114"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND+="
+	boost? ( dev-libs/boost )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DBUILD_MANUAL_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 20065b9bb13c..2ca5838c2b0a 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2005-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake toolchain-funcs xdg-utils
 
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/113"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/114"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"