gentoo resync : 17.02.2021

45 files changed, 215 insertions, 614 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ff6444bda35b..ae4911150e1b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index a4878461beed..969e32418256 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -2,6 +2,6 @@ DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd8
 DIST asciidoc-9.0.4.tar.gz 1111102 BLAKE2B 3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f SHA512 9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b
 DIST asciidoc-9.0.5.tar.gz 1119318 BLAKE2B 3e5a454f4d47bb3c71e4c180ab05a0d23985473ca83d987435614ddafc9ee0d340a6e6cdafcb7371f719487954233f6d4bae69b4fc7d3818fc1d8e91c94ef36e SHA512 5b79d74c1efd43a960e8a415d3a68f26dcd3a3eee748b830101cec69475b0af40de7ad190ae105cade8ee558a59a643d04f38c1be490d253e3a6740c347d94e3
 EBUILD asciidoc-9.0.2.ebuild 2337 BLAKE2B 19c198213cc90c59641f89cfa9f483b1d5796c2b1e53329ed5a45774607e72cb60dc6a54caab8c32e0061e4d55e9f935dd760cb2106ff7f6cbb063f65aefde73 SHA512 b2491f68d4ebf1fece0af110f465755f8e2bbb97f575923e8f3788f01496a2adb2ec56aa543ef2a2de10bfff3f335fef0b7a2c11b4241cb025b772c31121304a
-EBUILD asciidoc-9.0.4.ebuild 2342 BLAKE2B 786016088e32e9bd3178decee728198552021205125efc7ef33d5d0a7fabd29a7eddd8e1831eef9cdd7f21292f3c794392b73011f68fc3b3a235ab4f51fe81e1 SHA512 73777793fb1190fef6f505bbbfee83916bc5c16e4f72467201c46661e232a97ec9865224253675dd57d4b8786eee7e89ebb6795e69968b9d28f4c296ee1836cb
+EBUILD asciidoc-9.0.4.ebuild 2341 BLAKE2B b713201f9947e9faeb87d48f20027c2757c9e3c436b3210a51575c1a5254c7de0f391a494247feb3add6ee0674db339c5be9425c15733a691988fdb408a59143 SHA512 339e7775de6576a0a623de1fa501ae9ff35a27daeae28f77929cda0ec58916e3c3c148510837bfe9b5be09f8a9f401cae0e7db0960b7ecf3ff543419e80cad23
 EBUILD asciidoc-9.0.5.ebuild 2346 BLAKE2B 80653cf44e489e875e63225de8cc7e5a16690093b456d85503cf81167161623dfc656fbc727b0f6d508a3b52d52e5ca4f3b668b6fbfe12e6b825757aba531b38 SHA512 97ebf07a34348e36fbb56d190978c333b2df2c5b196114bfd8123187f5f86f42024f640fc1825d99a5acf9e5235eddfbf6b436559706db0249ebd426c6809e55
 MISC metadata.xml 435 BLAKE2B c6a62f25ed62fc8bb28f94a51985d44a2b048eed430d1e92670bf257039c15ccf741414f9c64f3a60220217fd8c2e995910c611890664f0118541996d7b9c9d3 SHA512 b18f244fd4bce0103b7a3c6a5d1e063d45fd1f17458d9a8c4cb2b6543bb38d7bb7047105be81b39d309ff0c3d9343e36df44345f31e32c348fc8aff30ef6d837
diff --git a/app-text/asciidoc/asciidoc-9.0.4.ebuild b/app-text/asciidoc/asciidoc-9.0.4.ebuild
index 853b154e566a..a3dc79e0e16c 100644
--- a/app-text/asciidoc/asciidoc-9.0.4.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.
 
 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="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 8e5086300596..03e379222948 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,5 +1,3 @@
-DIST bibletime-2.11.2.tar.xz 2533472 BLAKE2B b116bbefaac8106d1f283d1c1a0c4d4c17e67d1cb41066c219ecca243914b0fa355748ebebb23ec88c1749548c853166d391764a454dd77b43c6617072a648a6 SHA512 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31
 DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
-EBUILD bibletime-2.11.2.ebuild 1304 BLAKE2B 583de78e4e8868c26e509939d2273284db179d41b5207b3ef0bfa31f6abf859031ba239051b4122b42c39fc3a12eb0920786001ee188761fd2422e738e684e3b SHA512 f7b7ffe12fd292e35d910da8323d273c1c69a868ca7a0424f6f97f17f3d0fcb61bb122f3c6c647fd167f20a5f0875166270a3dccd3c0e6985a6eb66936ac2797
 EBUILD bibletime-3.0.ebuild 1466 BLAKE2B 913496634dcfe8e4fa3e3a5bd856d65255ccfed1dda8fbb225bee7ad00cb22f429ba2135cf129d7eaa209dd1910cc316348dd29a7a93162dfc247c916f5d7ef9 SHA512 226d64927296a001d9c8d620c6155daea681c00fd788622f9052d8baad1c3c22b8d2238e93319cbac7c94b5bb7018538f3e01fb5bcac33c294e9a1cd10877b9c
 MISC metadata.xml 656 BLAKE2B 66daf991e55a977a67ff159c7d2bd780308bd580572b8eef8fd5a456cc0932e837c10b175cae7288b0c5097434820b9eb9bdd2b93124f81fe6441e913823674c SHA512 7214abfb4ded4f531e84a2895ece417bb3fe36249fb59ec1d53d231d49d40119c66438931c0cdae79fb4859a70874c3bb03670d554c86f221223530eb12f0bc0
diff --git a/app-text/bibletime/bibletime-2.11.2.ebuild b/app-text/bibletime/bibletime-2.11.2.ebuild
deleted file mode 100644
index f148b08c8277..000000000000
--- a/app-text/bibletime/bibletime-2.11.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED=test
-
-inherit cmake virtualx
-
-DESCRIPTION="Qt Bible-study application using the SWORD library"
-HOMEPAGE="http://bibletime.info/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Some tests fail due to being unable to find an icon directory relative
-# to ${WORKDIR}, some others segfault. Needs work.
-RESTRICT="test"
-
-RDEPEND="
-	>=app-text/sword-1.7.0
-	dev-cpp/clucene
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-libs/icu:=
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	net-misc/curl
-	sys-libs/zlib
-"
-#BDEPEND="test? (
-#	app-dicts/sword-Josephus
-#	app-dicts/sword-KJV
-#	app-dicts/sword-KJVA
-#	app-dicts/sword-Scofield
-#	app-dicts/sword-StrongsGreek
-#)"
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
-		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
-}
-
-src_test() {
-	virtx cmake_src_test || die "Test run has failed"
-}
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index c6f314e15f80..b4d16c363412 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,3 +1,5 @@
+DIST bibutils_6.10_src.tgz 590002 BLAKE2B 91ea6c961978d381a65c1d5071c541409609dd9fdeb664cd7e66eb4871c2ecd0dfd6b06857294ae6ec049751a5939be23518782a5e1f14fdf848918849269402 SHA512 43cf107ee6d1bf6bf27a6bf46e1f4cbd83a4b78ef355730a9f37282fac399ee21d78538248730be85c0a8f724344782dcc6ab68e50f857d8ac4ea24cc4102911
 DIST bibutils_6.7_src.tgz 580792 BLAKE2B 29c5863bc414ef7b2f362d95352c0e042c1bcc3275017df82b0206d96520b3f5c3fe1e12563577b84a8bd94b0677bf1ad04ecbd80dcbcc194a71037bbd6facba SHA512 08db07408eee26bce42dbd00b7e821ef41dc12c7ce847425e81145927bcfc6ea7180ff719056e089917811aa9675a09dd52e1e02b8187b8618f67647efcb1236
+EBUILD bibutils-6.10.ebuild 787 BLAKE2B f9c8ab8eeb0ffd5102b7c0a2131f1091a32a2757e02f6ef31c71570c5bee85286cb1c85cd6748a454d4ea6bcf1f64cdf5f3e2648f6cb20e500170a700dbecb8c SHA512 01d36badaf6b0369d82173e20f50f0c8c27c0255e058e544e6294f0b9e44c4ed1e6fc971dbec72243a34374e2f9e6a7b2932e89378f81da5bc93d987da0ad9fd
 EBUILD bibutils-6.7.ebuild 1358 BLAKE2B 2377af5aaafc016c14a8b0f60d4d292ac334307d5303fca1c6daef64aafc077eaae93cf9c48048681805743f7bd4ab6feb7e91e8746d425037657b0001076ce9 SHA512 42582a705867653304c13bbac9a860892000c6ef3f8d11f69bdc7f6150fea61a27910e18d11fd24f30435be3d5fc1988a3b4d991a790e34a1c67910d107c887c
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-text/bibutils/bibutils-6.10.ebuild b/app-text/bibutils/bibutils-6.10.ebuild
new file mode 100644
index 000000000000..fca15d38d420
--- /dev/null
+++ b/app-text/bibutils/bibutils-6.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate"
+HOMEPAGE="https://sourceforge.net/p/bibutils/home/Bibutils/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	./configure \
+		--dynamic \
+		--install-dir "${ED}/usr/bin" \
+		--install-lib "${ED}/usr/$(get_libdir)" || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		DISTRO_CFLAGS="${CFLAGS}" \
+		LDFLAGSIN="${LDFLAGS}"
+}
+
+src_test() {
+	emake \
+		CC="$(tc-getCC)" \
+		DISTRO_CFLAGS="${CFLAGS}" \
+		LDFLAGSIN="${LDFLAGS}" test
+}
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index a7ea0f7d5098..d801145dffc2 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
 DIST blogc-0.20.0.tar.xz 347924 BLAKE2B faabb51237ff4ba3b431b84394cb8ca6f977770f9ed8c1ffbcc841773dc707b9a51694d7a5f3dbe5c573bdd7a16971004551b8ae2c0347273d8c246ae329bd82 SHA512 3738eb23341deb755dbfb0d2e98a73fe53f0e38b929606ebb0a3210d0564a626375d5c20ebff220e63be1f61299492da9061db5366d9d53a28f7ff18cff678a5
-EBUILD blogc-0.20.0.ebuild 1081 BLAKE2B 8ab3d7d1170f6c9119463ac8297be1dbb40d03326a3dd326014358a07f3b1b5f46618b8266f0b2488e171d37c23b2093552e9fddcc72afd8b53ace29a255eedf SHA512 f36cbbdb143b6a536f136ef84ce2b137afda8131e6b77addbe431fbef4af229325030d95a4ce54e9ff4523d41300f1487737e81f8af46fb12c6b254f98393c2e
-EBUILD blogc-9999.ebuild 1081 BLAKE2B 8ab3d7d1170f6c9119463ac8297be1dbb40d03326a3dd326014358a07f3b1b5f46618b8266f0b2488e171d37c23b2093552e9fddcc72afd8b53ace29a255eedf SHA512 f36cbbdb143b6a536f136ef84ce2b137afda8131e6b77addbe431fbef4af229325030d95a4ce54e9ff4523d41300f1487737e81f8af46fb12c6b254f98393c2e
+EBUILD blogc-0.20.0.ebuild 1074 BLAKE2B e977b86c53d27f2d92a76c79cca188396f36edb55fc979fa32160e71a9397295e33605defe728b2675e38deab596f62dd878c6231246a26fdee2ff7f58762cf1 SHA512 d27b37ea1aec615fe9aafbdc26537e1ae33e7ae9ee6575c48ac1576f89c33782951e049bc345b173cd50f9fa24306ec3cf2ceefa83eba334d7340af537480931
+EBUILD blogc-9999.ebuild 1074 BLAKE2B e977b86c53d27f2d92a76c79cca188396f36edb55fc979fa32160e71a9397295e33605defe728b2675e38deab596f62dd878c6231246a26fdee2ff7f58762cf1 SHA512 d27b37ea1aec615fe9aafbdc26537e1ae33e7ae9ee6575c48ac1576f89c33782951e049bc345b173cd50f9fa24306ec3cf2ceefa83eba334d7340af537480931
 MISC metadata.xml 545 BLAKE2B bf387301e509f40e7c88c80a5037a7d565b36877ad8c477fc7282d51a80ad47e67406fd924c5d0de92c9b6748f4ee93e8e1a83b93c3e9fe68b868337c415e370 SHA512 9b3f2c1ce7eeedef493399cc554eccc51cbe18a81cd87a359fceeecd15c89825a91c09f79ac63d7692fce7c4a319d6c6e5b39f5ecfca2cb2332f756a9fe2ca38
diff --git a/app-text/blogc/blogc-0.20.0.ebuild b/app-text/blogc/blogc-0.20.0.ebuild
index 19396606704a..3b3a78e46d44 100644
--- a/app-text/blogc/blogc-0.20.0.ebuild
+++ b/app-text/blogc/blogc-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,11 @@ DESCRIPTION="A blog compiler"
 HOMEPAGE="https://blogc.rgm.io/"
 
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
 	DEPEND="app-text/ronn"
+else
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index 19396606704a..3b3a78e46d44 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,11 @@ DESCRIPTION="A blog compiler"
 HOMEPAGE="https://blogc.rgm.io/"
 
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
 	DEPEND="app-text/ronn"
+else
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 9fbd866a67a1..a1e029c748fa 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,4 +1,4 @@
 DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
-EBUILD cherrytree-0.99.0_p20200523.ebuild 2084 BLAKE2B 905996191f12009b0dcb8b5064afcadeeb6bafac1a21f197d9461cf8349cf99529f1a0e3a49faffc430fd03d9431f32128dc196635609625e030c364ad9652d5 SHA512 084faf24287e7ec8c80b7a8ecb91b80978da0ce6df012153692ce1b2b9ba084c2f4e1b8e73ef775552752e759a7c5d4e08ad04b3946bcdd3efb4162fc678c211
-EBUILD cherrytree-9999.ebuild 2084 BLAKE2B 905996191f12009b0dcb8b5064afcadeeb6bafac1a21f197d9461cf8349cf99529f1a0e3a49faffc430fd03d9431f32128dc196635609625e030c364ad9652d5 SHA512 084faf24287e7ec8c80b7a8ecb91b80978da0ce6df012153692ce1b2b9ba084c2f4e1b8e73ef775552752e759a7c5d4e08ad04b3946bcdd3efb4162fc678c211
+EBUILD cherrytree-0.99.0_p20200523-r1.ebuild 2088 BLAKE2B ba7d653c4736c3efcdfab9c02bcd5179fc5d15915106b33cd93448e5acb1520822ea6751b60b86820fa38fcd1d573efaa19c4cb7d0802fe1b949bc7a4da18809 SHA512 3f350c0d1f0a7f1ef337d6947775846cab20a829b201c0a003daf861ee355a7b4a32b3f2162dbba82c3881631f7b8e1bb8ba4ee6853fc6ae38e75a4631e7f85a
+EBUILD cherrytree-9999.ebuild 2088 BLAKE2B ba7d653c4736c3efcdfab9c02bcd5179fc5d15915106b33cd93448e5acb1520822ea6751b60b86820fa38fcd1d573efaa19c4cb7d0802fe1b949bc7a4da18809 SHA512 3f350c0d1f0a7f1ef337d6947775846cab20a829b201c0a003daf861ee355a7b4a32b3f2162dbba82c3881631f7b8e1bb8ba4ee6853fc6ae38e75a4631e7f85a
 MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
index a828bbf09173..55a62632c259 100644
--- a/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.0_p20200523-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
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-cpp/gtksourceviewmm:3.0
 	dev-libs/libxml2:2
 	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm
+	dev-cpp/pangomm:1.4
 	dev-db/sqlite:3"
 DEPEND="${RDEPEND}
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
diff --git a/app-text/cherrytree/cherrytree-9999.ebuild b/app-text/cherrytree/cherrytree-9999.ebuild
index a828bbf09173..55a62632c259 100644
--- a/app-text/cherrytree/cherrytree-9999.ebuild
+++ b/app-text/cherrytree/cherrytree-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-cpp/gtksourceviewmm:3.0
 	dev-libs/libxml2:2
 	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm
+	dev-cpp/pangomm:1.4
 	dev-db/sqlite:3"
 DEPEND="${RDEPEND}
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index a62693299eee..5ff18b792a89 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,4 +1,4 @@
 AUX crm114-20100106-fix-makefile.patch 1796 BLAKE2B 370bc77608f77960be4c4ecb88e3729eb62fb9e46e15fcca673ae8f4e4efcaf4425f30cd6beada25d8eb9fdf741dfa449c4e2a5c3ca9d06eab9ea25524e38136 SHA512 3011a85116510fce131bd3c13b5ec1e4faeefdb1eebf114782d417fb9ce8050ce15cae05f8b651728335233641be1e870fe48702fa620b542a8f1c963853b81c
 DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 BLAKE2B ce5c3078030f2c4e78833edfb107d78e134a02c339d28411f2f60d4a67c333904d2ed0cf32a087997a72d961cbc5dabef46fb6c692d99fb509abd4161bd0094b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6
-EBUILD crm114-20100106-r1.ebuild 1976 BLAKE2B 5c6a24de5ffdb634d170ecca1ca8a08e9df262fd1cae4f3a5ccc614b753ebc96bbebb459959cc4be815c327c5247940abee298709df20c19e037891da3fbe02e SHA512 7f8f8bb01dad899c8976f5a3ea2b068a4ef34e087a63dd14e1710d96205ddfac1f90957da3a6d3fae9dae8857746e191c0840b2701da32a21527e09581d025c9
-MISC metadata.xml 707 BLAKE2B f66efbf9497eb73a927c0cbbd87fa3da5617adae4102940135f983ebbf6ce18d3e2f2a3aa8721aa4395d54977fd0d3ff44387610906bcadcde869e46869ba932 SHA512 9009a38eaab5b49e3ec537785dc2e45601afd2ef0bd1c2f7a0ab7f8f24c80feb7bd99c2e47e6835d8bc4fffeeb8d6628df02c260ff5198905b209c6606c2352e
+EBUILD crm114-20100106-r1.ebuild 1869 BLAKE2B 77f4c7ab196fec4eb2beae1e6ab71ff66b07ffc89d2216949f6d08b5b00146005ff81d8e490338b8152b12ece2514dc7163f6487d8a83c7a0dc53515f905a442 SHA512 2ce9d4478ba6386beaee0159765bb20af4aa75430daece44dace02ab332104e801b9d5db261aa3d09214001e0255dd2b26b647abe7f6fdd7ff923153f672acfa
+MISC metadata.xml 677 BLAKE2B fd893b92e66e8818f3f59515af30d71b2b29b6d503eca08900e7f2f4eac04c999aad41a81a4f427e0f031e7516992b32d0d313647c52b94f28109bb6f6f856ec SHA512 a8378db786011576431c5992f5ecd47268c6ef77f730a55efb5fc17a633573b704284d585389a49ec13b37a29c48b463db838585f1c0365b3d3fcc931e0a3ffd
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r1.ebuild
index c141b5c7c517..5a800a9ab6ee 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
 MY_P="${P}-BlameMichelson.src"
-
 DESCRIPTION="A powerful text processing tool, mainly used for spam filtering"
 HOMEPAGE="http://crm114.sourceforge.net/"
 SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
@@ -14,12 +13,11 @@ SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples mew mimencode nls normalizemime static test"
+IUSE="examples mew mimencode nls normalizemime test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	static? ( dev-libs/tre[static-libs] )
-	!static? ( dev-libs/tre )
+	dev-libs/tre
 	mew? ( app-emacs/mew )
 	mimencode? ( net-mail/metamail )
 	normalizemime? ( mail-filter/normalizemime )"
@@ -49,9 +47,7 @@ src_prepare() {
 src_compile() {
 	# Restore GNU89 inline semantics to
 	# emit external symbols, bug 571062
-	append-cflags -std=gnu89
-
-	use static && append-ldflags -static -static-libgcc
+	append-cflags -std=gnu89 -fcommon
 
 	emake CC="$(tc-getCC)"
 }
@@ -77,5 +73,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "The spam-filter CRM files are installed in ${EROOT%/}/usr/share/${PN}."
+	elog "The spam-filter CRM files are installed in ${EROOT}/usr/share/${PN}."
 }
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index e7411c45f7bb..6948a216bce8 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
-  <use>
-    <flag name="mew">Add support for using the mewdecode mime decoder
-    (<pkg>app-emacs/mew</pkg>)</flag>
-    <flag name="mimencode">Add support for using the mimencode mime
-    (<pkg>net-mail/metamail</pkg>)</flag>
-    <flag name="normalizemime">Add support for using the normalizemime
-    (<pkg>mail-filter/normalizemime</pkg>)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">crm114</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<use>
+		<flag name="mew">Add support for using the mewdecode mime decoder (<pkg>app-emacs/mew</pkg>)</flag>
+		<flag name="mimencode">Add support for using the mimencode mime (<pkg>net-mail/metamail</pkg>)</flag>
+		<flag name="normalizemime">Add support for using the normalizemime (<pkg>mail-filter/normalizemime</pkg>)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">crm114</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index d61847c71e20..def90aab6a47 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -4,6 +4,7 @@ AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63
 AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c264de8c8970fe4cbf5459c5ec651aecd3e3ccb7dcc95bfcc8277686133bc3187a5952edd1bc88dae11c2ddac3aa4060333b4 SHA512 ae08b08a435393bf94039edd8b74457a1d4475d8473fa450b41a993ca4ded08f79566bf2dc78144df977fe1f975e1c60b9d02b2dc4579f8c7d65839946e3de05
 AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
-EBUILD dblatex-0.3.11-r1.ebuild 1814 BLAKE2B 05bb33b428ce07f633428183336ce173ea4c41977803eb356042a750dc6a6f4cdfa6efb82a7119ec9488f7d8d4b0445ef7731df7231935995a1ca46995ac6971 SHA512 eecf1f580dc811a573f48d2b0c45898eac04ccf2de1429cb1b0fd272e68125c01296c4ea40180f9085851254c3b6b06dec06ce0a40bb10fb3459aa018c3eeab5
-EBUILD dblatex-0.3.11.ebuild 1618 BLAKE2B 427f03056dfe0ac8d2b8f80b046c76b5aa0110f85d49ac07bcca8978df94d122f5996d0d02d485af58bd9b031351ca58e6bb688bd166ee7030005166669967fe SHA512 35471efbc664a9002296d8ed5dd1644c246056ed6a1adc40932da3cce05211b7e9917f357902d5c9420e74d87b6fb3910f3257ef6b6baae6009a58880b826032
+DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
+EBUILD dblatex-0.3.11-r1.ebuild 1820 BLAKE2B dae0007360430126d2b962f5545eb13978bd691e5b33194abe73816d065a0918af3cce35e3556bc9cb814ec24322442d81077fb65621ac3e799b2972d706517d SHA512 b407637dca76a9954ff5fa0bba939730b36e990ef4211b989fbb11b538039776b62157cd8e55ebbadc8cebddb89fa16bd2cbaf96762bfa6208911a63035a4dec
+EBUILD dblatex-0.3.12.ebuild 1723 BLAKE2B 0dbbaa553ba480e28b9fda4eb07099bfad6042f9a93b1ca97298f1c0980e896e529e108ed31b46a542a782f862528c337aecd41a7df6561f48ad6de953b4bf9d SHA512 8563fe8fe143f297cf976c1dbfea61a2906bbbcba0312159e671333055e645a3efc6d8b2b1d11717f4cae08eadde715341b3e6c8bc4ea994f9a0fafb74e7ded4
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
index 19c45bd966b6..53b5cafc6a3f 100644
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc64 ~sparc x86"
 IUSE="inkscape"
 
 RDEPEND="
diff --git a/app-text/dblatex/dblatex-0.3.11.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index 7edb8877dcf7..ad230da69644 100644
--- a/app-text/dblatex/dblatex-0.3.11.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Transform DocBook using TeX macros"
 HOMEPAGE="http://dblatex.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-${PV}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
 IUSE="inkscape"
 
 RDEPEND="
@@ -35,20 +35,21 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}py3"
+S="${WORKDIR}/${PN}3-${PV}"
 
 PATCHES=(
-	 "${FILESDIR}/${P}-path-logging.patch"
-	 "${FILESDIR}/${P}-setup.patch"
+	 "${FILESDIR}/${PN}-0.3.11-path-logging.patch"
+	 "${FILESDIR}/${PN}-0.3.11-setup.patch"
+	 "${FILESDIR}/${PN}-0.3.11-encode.patch"
 )
 
 python_prepare_all() {
 	# Manual page is precomressed, but we will use our own compression later.
 	gunzip docs/manpage/dblatex.1.gz || die
 	# If we dont have inkscape we need to use an alternative SVG converter
-	use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
-	# We need to fix version information in the docs and some metadata
-	grep -l -I -R "0.3.11py3" | xargs -n1 sed -i -e "s/${PV}py3/${PV}/" || die
+	use inkscape || eapply "${FILESDIR}/${PN}-0.3.11-no-inkscape-dependency.patch"
+	# If we use inscape however we want to make dblatex compatible with v1.0
+	use inkscape && eapply "${FILESDIR}/${PN}-0.3.11-inkscape-1.0.patch"
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index b01f609f0f4f..e1217c33e503 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,5 +1,5 @@
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
 EBUILD djvu-3.5.27-r2.ebuild 1660 BLAKE2B ed005e78e907b2caf89118c2e37448a0951b08db834004f480e644534bf337b5dfa6220697dbf8b07f80f651afcfc6bccabe826242eefb6e05432040582ab981 SHA512 c6d5b6e7997fb7d8ab9ab688c3679ca150d92d2a6c787c63001780a30e51de630fec300911979803c4556e4186096ca4600eb0e2b67a3daa6cc8e1033791063c
-EBUILD djvu-3.5.28.ebuild 1524 BLAKE2B 035be57e17a4f9e27afb7e74114a96fff018ba22ebcccb0da357fe096abac6fc9d953a1ea877f5adb4cd8e843b61269b3f59dddb8c7fee7e95e1ace72de6b954 SHA512 e139a758eddf478e35225338bee012f357992feaab45f3297cda715f76daaf90ecdfc03cdb3ec98735688f6715293fa53d1a2eb1b112d358eec189dd62ece97b
+EBUILD djvu-3.5.28.ebuild 1521 BLAKE2B 5b2cf5c72347e4b7232d7e34152121f4f83b837f1c38b2b59de68959ee4a636294490a010a2b519d07e2bd271e827c327663a6208e09249a0fef6db441ec0206 SHA512 318a4a16aa1a52bf890dae8a6df302c38dde3ab62869201d7e2dff50ea2e90099ef5c80bed3f3ab176bda3a8749c5f032d990375e701c37a35895847206206f0
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.28.ebuild b/app-text/djvu/djvu-3.5.28.ebuild
index 641b140a23f4..d0b67dcb3a51 100644
--- a/app-text/djvu/djvu-3.5.28.ebuild
+++ b/app-text/djvu/djvu-3.5.28.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P%%.3}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 82bdc19f05dc..5e1bbacb4910 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -3,5 +3,5 @@ DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955
 DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
 EBUILD dos2unix-7.3.5.ebuild 2050 BLAKE2B c97f63d9cb7551e5c69c78487cc61fdba549f76c79a91c28b76fbe252e02ec9e34e4c448e6feca677df62a175600e21282816b903c023acd6b4d5a9dc6282514 SHA512 8329df38d2efc3e120b063a0df2505da939437acbb45a091a2bc0abcc52976486cb0e6219a850d3a4f9d298757572f181531490936a6d424cad6333a4f755216
 EBUILD dos2unix-7.4.1.ebuild 2069 BLAKE2B 3b8c79f046a011136ab334b5b8e177802d0519301d00bf8f3362cfded559157e6355bd627a62e7cf0924f741b214a67c310350f916df76a0d16d000a9aa4f6ed SHA512 7fa928c0b91275a08468ea3de683bc16c5ba998a863f5e5ca5a2fc7cef750cc122d1ef1fbae754f0f00d110f43bab3f677b84afe850fe96ffc3c19c7e3f76b25
-EBUILD dos2unix-7.4.2.ebuild 2137 BLAKE2B 114becd07be998e80f8adb82278fc8b3e32ab04b4722a3a8c93fd6096261932bff5de4111039a68c258865ec3f9d0ce0702ef8061b56077f6dd43508d35f65f5 SHA512 2f8012ec3381996cc2390f27e7af9e74215d2341d0dd6f31ef4d35aceb0aaea2df162cfad018e9775fb978adecf3356207ba1102fca001b353b996ae4fe591fc
+EBUILD dos2unix-7.4.2.ebuild 2136 BLAKE2B 66a7561e3fa2d5f498c221fd4e2291d840e1779dcf3f138bc3668d0542459c5c286a652ce12f2bdf076e7fc2e3a16941df1487036a81aedfd543e9542e318bff SHA512 6082dedaf500f71c19efc7c338680eda4f75aff4656f31fbb209ffcaaa8cac8f93f159d0862fe6cd306dd939f9d0b17166650e03a45e6bac809b590bef7a8537
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.4.2.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
index 79eb12cc1460..23c78b39056a 100644
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
index 36805001156e..5db8b3f2d90d 100644
--- a/app-text/ebook-tools/Manifest
+++ b/app-text/ebook-tools/Manifest
@@ -3,5 +3,5 @@ AUX ebook-tools-0.2.2-fvisibility-hidden.patch 998 BLAKE2B 3595aecd20dd3e046d765
 AUX ebook-tools-0.2.2-libzip-cmake.patch 3113 BLAKE2B e3b78d2ab278ff759afec16a57f074a722b3f5ff6aeceac9bd736843981d6de205607a0e89ffad0db4fdc14e3d250959a02b642e07b01a77c24aa494a1b37d8a SHA512 d228d9bd192e5cd46c7a991025d995b33e26049053ecd548ab35edace11e10aef6c7ca24c584680f97bb765d7e3485b5e6ea337a0255dcf1041f804213443b78
 DIST ebook-tools-0.2.2.tar.gz 46889 BLAKE2B 20b6ff048e9e31d2e00db3a02b67e21f3031d74aedfc663331b08f626b1816adecad5039e124462f97ff2ff7dc43f002eb39dd625f031ae42fe2b46338e94fcf SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a
 EBUILD ebook-tools-0.2.2-r1.ebuild 649 BLAKE2B d39c7352b72d1b8143468be21df3e4f2c094ea6c0b9380ae69d1ec0b6a20f62d820caa4a618861a61c2f00f0402ca2cb1c2c05b5c31346f0da3e929ef487364d SHA512 4cd37a92486ff8fe5a6f62db6016ddc888dcbe27d7d88579721e3ef2fdf3183131108ecb3defce86189401ef5979a236ecba6368202d7c67facf2e94de626fa1
-EBUILD ebook-tools-0.2.2-r2.ebuild 774 BLAKE2B 7e04f816f7f11e9653b571ef0652094431e5390cfa0394b899f8c0b104533c7faf83b7e5a2ace646eda0200934db1f96ee00c40f424a49f9ad0db54bd319173c SHA512 ac365508573ea852bdbb481580f314e313e843ef16b4323c961193a9d84fd8e3c4f5c28ba3e80f593d3241ae8fcdbb4c0848bd9dad297d6f8795087b43380ef9
+EBUILD ebook-tools-0.2.2-r2.ebuild 772 BLAKE2B ae2e425bb7d7348f47409443cb671bf8d5eff96bbed6bd9822824d36fec7ae7ef5c8eb82880692f20a670b80538772c5027741bdbe40f0b4dfc7ca892e25913c SHA512 fddf8b752deb90483450a1726206decb87c3b4ba27a4deaf586ba751445878db915d98f852ede53db2668de832741625316bccb5de247fdb93a0ed6edaa9d332
 MISC metadata.xml 400 BLAKE2B c225e8514134fea3843975618d6bb5b6085785eb71a9b0413bf986d752eff783f973c10fb7e6af504a3efa1c0e05475b421ff4c1f4c24bf51d4a948d485ed103 SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
index b8b20f0bdac3..d4268c240f21 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r2.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="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="+lit2epub"
 
 DEPEND="
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index b5c4e3acd6f1..6ec07c5a7fb1 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -1,8 +1,5 @@
 AUX epstool-3.09-no-gcc-linker.patch 763 BLAKE2B e106b30948a7fb12ecf76c58a80336a90ab29602c608a5c966cede91e5ff6034de69957719ff08c7b9942dda81c38459f95430c1c65dfce449774b2f023de6e0 SHA512 9d043a52524a0e15166c0437e11373724068ad1c468bf528eb39fb3d4a3a1e44973e554ec5b82d45fb2e8af8f5768294029fef91eda6b21cad51b3227e6a8a90
 AUX epstool-3.09-no-use-gnu.patch 951 BLAKE2B 22dd85e96cb2ceb4001c0713da541414ab158614352adadc6d523f67abd9fdd28089c8728e52d01659676ac3630c61fbfb467aa1b6a5f95be75aa84c60b058fe SHA512 adcaa0a1f35aaeae8e373147183665ee45db98170784070f7959bbd5e145169bd99ac21fc199a97e93fede6db9ac67eeead4367f434cbc0f46eff727a7d06aa6
-AUX gcc43.patch 632 BLAKE2B 3f4537c7b4e20e50aafa3d8e07379eb8db2e68c1abbe6e096b2e5926b6a3ab539c6478dcff7d03f2c93888abf3dc8c64cd6531c855c9a145fe2c50c9a5a8c144 SHA512 a088a86e2c66469da955a4ba2309142cf54be9d88ca18c8c173d9a285a145c3432ec99d4c212f5f69caeeef17035a063f2ca55d57bf72325258555a0af8ca875
-DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
 DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
-EBUILD epstool-3.08-r1.ebuild 905 BLAKE2B cc1ed2eb64d9e6095c861d7a2309110e43eccd23d0d1fcc1f23451cee741b639b75b02df01b2dc3f7c012d44dcb952931fcd27075adf1d59d29a17a6af3386bf SHA512 a3514b43120e27c2512669358652dd6ba2e55645f7525b1024f33cc6ec7259e0145394265dce7da469e38667d06d2947abd73747f15d748004b20089ff4b9f90
 EBUILD epstool-3.09.ebuild 887 BLAKE2B 034788c62daa7083120f6a829c2ba160953a8959ee62553573bce1ac5e257f1ffd5b0fc626391741796fd131138026f31102b39ce302a3397cc3f5b98af58e02 SHA512 62ec1172e8ed6dfb4a3aff5277486b8fe4d0869d834d13677fb4a5d3b653e3c580da9714aede11e9b2509dbe0445ce70b01e49dc50cbfd5a419f290e75ce41b7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/epstool/epstool-3.08-r1.ebuild b/app-text/epstool/epstool-3.08-r1.ebuild
deleted file mode 100644
index 1c92a1aa6a05..000000000000
--- a/app-text/epstool/epstool-3.08-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes"
-HOMEPAGE="http://www.ghostgum.com.au/software/epstool.htm"
-SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/gcc43.patch
-
-	sed -i \
-		-e '/^CC/s/=/?=/' \
-		-e '/^CLINK/s/gcc/$(CC)/' \
-		src/unixcom.mak || die
-	tc-export CC
-
-	epatch_user
-
-	# parallel make issue (bug #506978)
-	mkdir bin || die
-	mkdir epsobj || die
-}
-
-src_compile() {
-	emake epstool
-}
-
-src_install() {
-	dobin bin/epstool
-	doman doc/epstool.1
-	dohtml doc/epstool.htm doc/gsview.css
-}
diff --git a/app-text/epstool/files/gcc43.patch b/app-text/epstool/files/gcc43.patch
deleted file mode 100644
index b50250a9af1a..000000000000
--- a/app-text/epstool/files/gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/epstool.c
-+++ b/src/epstool.c
-@@ -2824,7 +2824,7 @@
- 		code = -1;
- 	}
- 	if ((code==0) && stdout_name && (hChildStdoutWr == -1)) {
--	    handle = open(stdout_name, O_WRONLY | O_CREAT);
-+	    handle = open(stdout_name, O_WRONLY | O_CREAT, 0644);
- 	    hChildStdoutWr = dup2(handle, 1);
- 	    if (handle != -1)
- 		close(handle);
-@@ -2832,7 +2832,7 @@
- 		code = -1;
- 	}
- 	if ((code==0) && stderr_name && (hChildStderrWr == -1)) {
--	    handle = open(stderr_name, O_WRONLY | O_CREAT);
-+	    handle = open(stderr_name, O_WRONLY | O_CREAT, 0644);
- 	    hChildStderrWr = dup2(handle, 2);
- 	    if (handle != -1)
- 		close(handle);
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index c8c41a59dd7e..bf4a1df6ca16 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,8 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
+DIST evince-3.36.10.tar.xz 2430584 BLAKE2B 7c8b5e3dec7168f4ab6976022bb85041fd8cc9f55b8c032bbf03cf492d243dc49f00d6913c1f2f09498c1b4091b4be126a9367dd3ed235635e9d08e6a9ae5a0d SHA512 2a17fc1fbd18e2685c254194d0e195ec0c6126f37212ae64297fb06f30f2e07f926cb768affb4d5c9c407c4dfc43db3578ffd244c9a6e121d1d3c9b5e653b4d2
 DIST evince-3.36.7.tar.xz 2580208 BLAKE2B 76ba6d206289f9981af24e5d82c9567c05984ad71efe83391aa1f8fdd94d31c284e600cf81eab9868e01f120f71cde1ae9b6ee6b7a4b1da47458d17b95b78d87 SHA512 dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910
 DIST evince-3.36.9.tar.xz 2429740 BLAKE2B 7154d473561955df9be545bbda520034e7de1556ea241dd30833ac014af2bb20fc3ef1d7fe6777cdcfab90553eb3f0562e1452df62c1c1eeb6b47b5bb64298bf SHA512 54f2dfc287fa627e1474c4bb23e6127bc5daa7044c2158805e5af487b7d65e776da9b86adbb83ec63fad3ce4c339f57483a3a2d7b95ad14de2dc76e29a29a8fb
+EBUILD evince-3.36.10.ebuild 3085 BLAKE2B 2a03f08a70a2601cf8d7bfec6407467e894c5e90abb44f95bf85c8153cdb08ab15035f4e092329cb381b18724002fcfcde179ce98fc28e9f7a9b5dd95a966998 SHA512 f47f5d5ce87b54ac71d319186b8de8092dad584d8035e98488e63ba62f8c18f9a566e46f777c8dd559a24f6f887340814d529927e3c4b87a94e7a4baeb7246da
 EBUILD evince-3.36.7.ebuild 3133 BLAKE2B d178be50e5460d9d834cbb0b940c19541570fc4b2de8439b06c44db95685ef7e66a95e88c8e42b30b05461586bfbec3188053a7a98fe781d4c514e7aca8cdd0d SHA512 74a824eddcd0caf3c5a87432535bdc779fe1f328baa10f6d3ad3483d4b8e38eaff561785e1920413ee8e4955b259c2755b17ae15b6e2ab0a077d779dd84b7740
 EBUILD evince-3.36.9.ebuild 3085 BLAKE2B 2a03f08a70a2601cf8d7bfec6407467e894c5e90abb44f95bf85c8153cdb08ab15035f4e092329cb381b18724002fcfcde179ce98fc28e9f7a9b5dd95a966998 SHA512 f47f5d5ce87b54ac71d319186b8de8092dad584d8035e98488e63ba62f8c18f9a566e46f777c8dd559a24f6f887340814d529927e3c4b87a94e7a4baeb7246da
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.36.10.ebuild b/app-text/evince/evince-3.36.10.ebuild
new file mode 100644
index 000000000000..55eb01fe8865
--- /dev/null
+++ b/app-text/evince/evince-3.36.10.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.38.0:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.76.0[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	app-text/yelp-tools
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+PATCHES=(
+	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
+)
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_with spell gspell) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index bf9bf05dbc33..68f698de0734 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,3 +1,3 @@
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.6.0.ebuild 669 BLAKE2B 2eee9501484b5b4b1bd744bacef812746012f6b93adeab6975d8f3357e7c9eafd60e3669024bdd6b8cb3e6b9664675c215db8823abea07f141ba6cbbecfd8da0 SHA512 5d720999dcd5faaea8d8dacea17006a0ee627661f48bf7de00a2184d47f414f45730310c08ad6530296c94db011d66ecdb945a84d29d0487f2782717b4249fc5
+EBUILD libgepub-0.6.0.ebuild 668 BLAKE2B da9020893df65ddf5dd807c2fe450420c044f05226d2a993708b317731ac47737d755e0c91d1321c131ed8a4a1f1df4efb5f6e3cb08754b5bec2dba7610580a5 SHA512 1f6675e1dee6af125d045e46497ee5cd18cd66464c46683030857a03f78599f3b1dcbb6850764b3d877caf67eaecf2ebeef1673ff3b3905e49e8b3cff3e96f6a
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index 8410a7df7102..0eb332f120bd 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 5105b1a5b82a..8370393737f4 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,5 +1,5 @@
 DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode-3.7.8.tar.gz 2230154 BLAKE2B 853a53d86a3a3600e5d70a8dc67bab9b0fa7a9dfab79e3f4ae8611f54c955802862689077774f7b21ce360f2d91c65ee238406ffa137a84545157e3a70853f42 SHA512 e6cd9c7d3eb5c179d3f62804018d1d19b71a3fae72b0d76aec730c36e64c50a571cbfda5340ac50244a16ccdd9265f5610deadb8908067c3866fa68cbbf0ac70
 EBUILD recode-3.7.6-r1.ebuild 1006 BLAKE2B 23141789d5bbcc6beabe28c9d45b29f9f0c984c5d8145351dff53cf73cf97192b6c022d74b864a5265d1b90eccf28e0dfdda7aea0d28ffeaf7923bce8655207b SHA512 4d598eacabba0db13ceee3101e738855f8f7bf5560dcfeb18f9bd11433c65c053cc2f79c36a63025297b6fa7309a23962d9340eb6bdeb7bcdcf1c80cc42bbcef
-EBUILD recode-3.7.8.ebuild 1301 BLAKE2B 71139bbc57023317a252b7d1cdb6cca309508c8b83e291cdcf4200635f9b70cceac9f78e7384bbd602c9979577d7331c5864e923b756e493ffd73b19410f1a2e SHA512 eba2ed15223676d58dfcf4580db85eb0e0b9d23eb018a14733b2f5af77706d752d8ee4a1555b701a4f7c300bf200832ec123bcf2a10092420152a6fc8cd77f75
+EBUILD recode-3.7.8.ebuild 1299 BLAKE2B 5f507df510a1d03d4acc5ac5393bedf458db17a8c080ae3596b3a4f269d873ec56312a502cbc085d5b1669f0b42a28ab96a952e2d707c80b5dab97802f1f7989 SHA512 08ce3bfed0aa9cc49702b0390365cc3c962eb1a63dd32e6d673460de13e0cda7af7adfa8d4aa72e8f23deac50fd5a3d41f570fe7feafc23fc305f11020c07ffc
 MISC metadata.xml 430 BLAKE2B 2df5bd5e46e37f7e60a6064a2f13876bc190121189057c703d98354a24de68e49b3a67337bb10a43c419b777af014fc0238940b44ef812862da5eb2250a06a5e SHA512 796421baea5a32814112194ac554251426312280ecd1517076a1b73b4e21026cb149e294df50a00e0c4674066640d0f5fc9f650198cde5b1a44f8f1446715d3f
diff --git a/app-text/recode/recode-3.7.8.ebuild b/app-text/recode/recode-3.7.8.ebuild
index f87d3f94bfe3..15bed5b9e88d 100644
--- a/app-text/recode/recode-3.7.8.ebuild
+++ b/app-text/recode/recode-3.7.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 # librecode soname version
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index e546399a5d1a..75a14fb73a66 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,5 +1,5 @@
 DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 0ded5f2fa4a85a583113d268a0c287727faa9548a95ca3b564efac5db3528e0bf52b0df12f88cda46ae02851b0b85967c23c07cd3cd55073a87bcffbae8dec87 SHA512 fe1cbc2591dbfb54a2c561a3c53684447a4e90d944714bb182ee6ef160df74cc886c4d178d88d24a217643099ff9f409048ea2e5bb8ac88746fd280e48daa1b8
 DIST sigil-1.4.3.tar.gz 24118565 BLAKE2B 4da0829cc82efe48c71c2a5d0be8477fd85291acd9578c14bd26f4521d2fd2322bec4c30002235254b9e731730a56b79787723059ba63884b75b33614cd94f39 SHA512 2f1e13a78a361df9b9031d5c04831d7e3ff09d16ed9cbd198b7735a4700f86e367f607554e805eb50db1a4562cbca33a8fb9cdf8167a95a43cbc2668ceb5550c
 EBUILD sigil-1.3.0.ebuild 2010 BLAKE2B 7e11b1e820ab88865810dfc37c859794864a48240a5663dd4d3167dc5c5d1867c9b0eb359812432af1a65fd32c0ef6069fe6ca67281f888dd2a6a7966cfb7130 SHA512 e85ba0ebb346f6b94127ca8d4c8e4c5dd3c0de2bf58ad3f7c2776881081c7d22c8847ffee376240f377899d34a6e8d47e8bc8c0b9a5d2355ccc08ff31ca0c629
-EBUILD sigil-1.4.3.ebuild 2014 BLAKE2B 35b75074b7ade84ed5c8ea87642eda1795061ea54dfffc625e216fd7b37cfa9ae8e704d53fdd8e4bfe52934c8b0c3d2a98516faed11ca7f646c9e176df4ddea9 SHA512 924d52ce033fbb4417f6b606fcc740dfc1f0c77315a7b1897372fb91215db22c949054a96ded06ada00f717f0a82b71c9be0728270fc57e85f81e474d4ae2613
+EBUILD sigil-1.4.3.ebuild 2013 BLAKE2B 3508ad1a21da1b4dce61c72d69556be29f5b2b118ad8ea7fa31ae38dc0b5a4bb998282a47585d3079997d08fb8ca7b5a548d2378cbce78eaf2c785e8882eea3b SHA512 0442be5c2f6e50044502caaee79a64aa375a96de14b1aadfac76bf44afdfacda3a66ba5c747c0290dcb2a20df52e9661ac3af685483f4f52a19499beaf3abf35
 MISC metadata.xml 932 BLAKE2B c7bf8b421a098f818c9a394cfe656f49fdf6349d762ca2bea588f24dbb0492ca426673f255dffe57dab54fde53408b6fe74bd2cd3b6bfbf31b9814c331de21ca SHA512 0e5c7366b3e0defbc8675c6a33313f6680bb51bc3b67963e79ff03d2f02aa201e5237af43645d1c0e6eb550fad17ca8f9ada9c85a9c4105ddb7a45ef487f726c
diff --git a/app-text/sigil/sigil-1.4.3.ebuild b/app-text/sigil/sigil-1.4.3.ebuild
index 79d3420abcc9..93e1ce09f9fa 100644
--- a/app-text/sigil/sigil-1.4.3.ebuild
+++ b/app-text/sigil/sigil-1.4.3.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 2d96fcc15e2b..cd1d94f1f4f3 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,7 +1,3 @@
-AUX sword-1.7.4-configure.patch 816 BLAKE2B 6b1dc70d5146178be9e2e650b6a46f9a64dfbab2edfddeea7c4f3825c00ccf1af7fe328b86be90c3730ecb928ae9fe1c4558f3a0bcb6acfba6a207a48c32b3f6 SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186
-AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d414424fc3ca7618a098d6e3ee82c440eb95c3370eeb0dbe46a4abe7ccc0c62e7b725cfed0f8ec0951e11099627337 SHA512 7bd545014ea81fa5f6203d39fd1a4125ae163ac51fe76270511b1df65d4dbf44b912fbaf3fa6a6d6a20370efc3abfff9feabe5de7177981ce1b62f4d9c5ce49d
-DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
 DIST sword-1.9.0.tar.gz 2606652 BLAKE2B cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236 SHA512 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f
-EBUILD sword-1.8.1-r1.ebuild 1818 BLAKE2B bfb01f3537feccb057fd34fc0784af7ea955164e2b6f195ad10f85f0a5759ba14e3626895d11f4ed31f43ecb3c0d479330c75bbf9e5622b522827390f76c72d4 SHA512 05577095fb4cede4cb549dc18af636937523bf6089fa70e0c73b91464799e2eb134ab0179c293fa5ec2acb5ee8e328fd5c3e19aef5b298abb2757d15841f2cf4
 EBUILD sword-1.9.0-r1.ebuild 1055 BLAKE2B 3fcb94f066b0b7fb9970342240e07e50e36022a99e933c7b2961d08ec204420ced6a9592346c58cefcacc51426cdcc570cdc5b3186029917619ba0a9af9f1e16 SHA512 d70d86248e9db5a0ac80b7f66ec6d2033716145b5056e91a57dcd76b16c73b398a38198b2821b8659b87a78fea4a0f1a061ba69f85422eca4eb504a2eedb94b5
 MISC metadata.xml 593 BLAKE2B 945677f76cbe16a77999ede8bd2c7ee6926c2aade70dbc1a8125fa30c73130601f21a47e4ec34a70121ea7b61c98c10748ec17933bde0d98d7d32cd5e28cb37b SHA512 4c11d1b66bb60f21d8706f25f4541147ece1a75f5a1676c75d7be39b8af982bb35fd743fe040204415c3a89f8729c7bb6e83e3bd66ccd5114b4d3739b876a4d8
diff --git a/app-text/sword/files/sword-1.7.4-configure.patch b/app-text/sword/files/sword-1.7.4-configure.patch
deleted file mode 100644
index a098addcd0d2..000000000000
--- a/app-text/sword/files/sword-1.7.4-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -16893,7 +16895,7 @@
- # ---------------------------------------------------------------------
- 
- # NOTE the $libdir hack at the end of the c[xx]flags.  Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
-+if test "x$with_clucene" != "xno"; then
--with_clucene=no
- if test "x$CLUCENE2_LIBS" != x; then
-    echo "clucene 2.x found - lucene searching options available"
-    AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
-@@ -16914,6 +16912,11 @@
-    echo "lucene searching options not available"
- fi
- fi
-+else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
-+$as_echo "clucene manually disabled - excluding support" >&6; }
-+with_clucene="no"
-+fi
- 
- for ac_func in vsnprintf
- do :
diff --git a/app-text/sword/files/sword-1.8.1-icu61.diff b/app-text/sword/files/sword-1.8.1-icu61.diff
deleted file mode 100644
index 2129f279ddc6..000000000000
--- a/app-text/sword/files/sword-1.8.1-icu61.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5cbd06a..1d3a2d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,4 @@
--# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system
--#       limit pkg-config version to >= 0.14, demo, utilities, doc, tests
-+# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests
- #       use BUILD_SHARED_LIBS
- #       convince perl swig bindings to build properly
- #
-@@ -13,7 +12,7 @@
- # all posterity and eternity, wherever such transfer is possible.  Where it is
- # not, then this file is released under the GPLv2 by myself.
- PROJECT(libsword CXX C)
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0)
- SET(SWORD_VERSION 1.8.1)
- 
- # Make sure it's an out-of-stream build
-@@ -56,7 +55,8 @@ IF(MSVC)
- ELSE(MSVC)
- 	FIND_PACKAGE(BZIP2 QUIET)
- 	FIND_PACKAGE(XZ QUIET)
--	FIND_PACKAGE(ICU QUIET)
-+	FIND_PACKAGE(ICU
-+	                COMPONENTS data i18n io uc)
- 	FIND_PACKAGE(CURL QUIET)
- ENDIF(MSVC)
- FIND_PACKAGE(CLucene QUIET)
-@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE)
- IF(WITH_ICU)
- 	INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
- 	ADD_DEFINITIONS(${ICU_DEFINITIONS})
--	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
-+	MESSAGE(STATUS "ICU Version: ${ICU_VERSION}")
-+	IF("${ICU_VERSION}" VERSION_GREATER "61")
-+		ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE)
-+	ENDIF("${ICU_VERSION}" VERSION_GREATER "61")
-+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES})
- ENDIF(WITH_ICU)
- IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
- 	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
-diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
-deleted file mode 100644
-index 451c2f3..0000000
---- a/cmake/FindICU.cmake
-+++ /dev/null
-@@ -1,68 +0,0 @@
--# Finds the International Components for Unicode (ICU) Library
--#
--#  ICU_FOUND          - True if ICU found.
--#  ICU_I18N_FOUND     - True if ICU's internationalization library found.
--#  ICU_INCLUDE_DIRS   - Directory to include to get ICU headers
--#                       Note: always include ICU headers as, e.g., 
--#                       unicode/utypes.h
--#  ICU_LIBRARIES      - Libraries to link against for the common ICU
--#  ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
--#                       (note: in addition to ICU_LIBRARIES)
--
--# Look for the header file.
--find_path(
--  ICU_INCLUDE_DIR 
--  NAMES unicode/utypes.h
--  DOC "Include directory for the ICU library")
--mark_as_advanced(ICU_INCLUDE_DIR)
--
--# Look for the library.
--find_library(
--  ICU_LIBRARY
--  NAMES icuuc cygicuuc cygicuuc32
--  DOC "Libraries to link against for the common parts of ICU")
--mark_as_advanced(ICU_LIBRARY)
--
--# Copy the results to the output variables.
--if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
--  set(ICU_FOUND 1)
--  set(ICU_LIBRARIES ${ICU_LIBRARY})
--  set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
--
--  # Look for the ICU internationalization libraries
--  find_library(
--    ICU_I18N_LIBRARY
--    NAMES icuin icui18n cygicuin cygicuin32
--    DOC "Libraries to link against for ICU internationalization")
--  if(MSVC)
--    find_library(ICU_DATA_LIBRARY
--	  NAMES icudt
--	  DOC "Libraries to link against for ICU data")
--	set(ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARY})
--  endif(MSVC)
--  mark_as_advanced(ICU_I18N_LIBRARY)
--  mark_as_advanced(ICU_DATA_LIBRARY)
--  if (ICU_I18N_LIBRARY)
--    set(ICU_I18N_FOUND 1)
--    set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
--  else (ICU_I18N_LIBRARY)
--    set(ICU_I18N_FOUND 0)
--    set(ICU_I18N_LIBRARIES)
--  endif (ICU_I18N_LIBRARY)
--else(ICU_INCLUDE_DIR AND ICU_LIBRARY)
--  set(ICU_FOUND 0)
--  set(ICU_I18N_FOUND 0)
--  set(ICU_LIBRARIES)
--  set(ICU_I18N_LIBRARIES)
--  set(ICU_INCLUDE_DIRS)
--endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
--
--IF(ICU_FOUND)
--	IF(NOT ICU_FIND_QUIETLY)
--		MESSAGE(STATUS "ICU: Yes ${ICU_I18N_LIBRARY}")
--	ENDIF(NOT ICU_FIND_QUIETLY)
--ELSE(ICU_FOUND)
--	IF(ICU_FIND_REQUIRED)
--		MESSAGE(FATAL_ERROR "ICU: No")
--	ENDIF(ICU_FIND_REQUIRED)
--ENDIF(ICU_FOUND)
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 30818a8..08bc573 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -75,10 +75,12 @@ ENDFOREACH(TEST ${test_PROGRAMS})
- 
- ########################################################################################
- # The following tests require extra libraries to run
--# 
--FOREACH(ICUTEST icutest translittest)
--	TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
--ENDFOREACH(ICUTEST icutest translittest)
-+#
-+IF(WITH_ICU)
-+	FOREACH(ICUTEST icutest translittest)
-+		TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
-+	ENDFOREACH(ICUTEST icutest translittest)
-+ENDIF(WITH_ICU)
- 
- # Excluded until I know we have the tests working
- ADD_SUBDIRECTORY(testsuite)
diff --git a/app-text/sword/sword-1.8.1-r1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild
deleted file mode 100644
index 7da3c1961d47..000000000000
--- a/app-text/sword/sword-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic cmake-utils
-
-DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="https://www.crosswire.org/sword/"
-SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
-IUSE="clucene curl debug doc icu static-libs"
-
-RDEPEND="sys-libs/zlib
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu:= )
-	clucene? ( dev-cpp/clucene )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS CODINGSTYLE ChangeLog README"
-
-RESTRICT="test"	#Restricting for now, see bug 313207
-
-src_prepare() {
-	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
-	eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
-	eapply "${FILESDIR}/${PN}-1.8.1-icu61.diff"
-	eapply_user
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug 618776
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DWITH_CLUCENE=$(usex clucene)
-		-DWITH_CURL=$(usex curl)
-		-DWITH_ICU=$(usex icu)
-		-DWITH_ZLIB=1
-	)
-	use static-libs && mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE=Static )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use doc; then
-		rm -rf examples/.cvsignore
-		rm -rf examples/cmdline/.cvsignore
-		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
-	fi
-
-	insinto /etc
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "Check out http://www.crosswire.org/sword/modules/"
-	elog "to download modules that you would like to use with SWORD."
-	elog "Follow module installation instructions found on"
-	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index 75f03135847e..ffc61972e384 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,6 +1,6 @@
 AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
 DIST teckit-2.5.10.tar.gz 2112617 BLAKE2B fe38bbecfeec61f2c926fc033230a753ce1435fdf77bebe3c6d6c427a46bd5019d23605ee3d73f733d6345301a26ad3b1fd207daa46fdf66a7728be4569758aa SHA512 c2d3bcf1245723bb3bbe9c147fc3024e667ab4d1280aa0f8b5394b2dd9bb75e3f2bf42f057744fa86ed551ebf3e0f13300072a0325888cb8f9501d874c356f34
 DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
-EBUILD teckit-2.5.10.ebuild 1036 BLAKE2B 11c20a6adf34511ed79344330a6b613d4ef6d81daf67eccf82ab12ab2e795ca4a89c0a5f2463a0a9d77921ed2c43446a5552d98405fcea3ceeb1c95c8f6ce53d SHA512 2ada9bb0c4d45e807608a27388a68caf9c62791ce1cc7d71052ac9285956ed107ddea9649ca7d585fe963d721a59b485aad9f8576ab6314b475811f31d569adf
+EBUILD teckit-2.5.10.ebuild 1034 BLAKE2B 5ddfe892d089762edc148c54aabafb19a6a20571c4069f9f8b90dbce472521a377bb765a7e18cab6370545fc38a97ea79dc45b4c088c6d49a79f559bbdfffd01 SHA512 1b60b75fb4a2870a75996e5fd68eaae851ef65d209464d3bd5e2a73ca0cdf0c06a9585af68d94eb86d49c277b38b1a47e08cc162ab4b28f6971a98b1a563a799
 EBUILD teckit-2.5.6.ebuild 1098 BLAKE2B 9436882972ea3e20da426aae4bb5c68864bb339287cc71fd78f53ea1bc1b04b6ef7dbcfb067adbf96cf494efb0d82b852e66062449feed67f52d2873e072eaec SHA512 bad1481c8080d3639edaddea4d698d4fd45138e8aea40c21ce51fe86799f21e610460bc749cdbaba6376031a3a5b2ee3ba5672525507fa4f689ba28024545da2
 MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/teckit-2.5.10.ebuild b/app-text/teckit/teckit-2.5.10.ebuild
index 45e26dfe81cc..133bacfa632c 100644
--- a/app-text/teckit/teckit-2.5.10.ebuild
+++ b/app-text/teckit/teckit-2.5.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index a348c8f51d45..b3a019c9434d 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,9 +1,7 @@
-AUX xpdf-CVE-2019-17064.patch 760 BLAKE2B 59e9c01ecc107345cd3bf360cfd04611f997bbc18eb9cc1cddb6b5ca95aceddc0b013b074367b153ee5cfc4b562839bcb90ff9d93262cb558f5515bae6f71746 SHA512 328dcfa5f01f9621f8da6995f2ae63a6184bef38a1bfb73fb89c330fced2b52602cfb45b0e8f72f09bac8050f8abc94ba5bbd76c13b39189a086485888c4deda
 AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21fccf60d5f2db959a7a2e2e64eb36cc7cbc0aea7e1cd21bdc6a11cb0ae7ae43e9293164ba5ef88685aa1653 SHA512 8bdeafe1553fea67b6d30afd1eb6e6abbd57f470a79b982b2b545fc91f12bc00c34a1639a05e8ef589ce1518886cc8de45c54303c4528c7e3d721ff624a0d27e
 AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c
 AUX xpdf-visibility.patch 414 BLAKE2B 835bdfdbb39297859d1886a5ebd76bec23a8b8df744f627a475d8c00ae3cdcfe219ec039f00b7b6a7305e6c451399c422fafdea0599bf22d2ef34bd4912eae4c SHA512 a1f87523aeb657484181005b3e40a90eaaee2d00452bfc50bc23913d6e1e5a9117600959b3800e789be50f6d12d726f875caf02b73ec41dc9d98e1215b2e964e
 AUX xpdf.desktop 3300 BLAKE2B 9e7ce7533fc7f44fce84475c7c95265633d158311c69dcc5b2d2a63cb8b0cb8fe324f46a461627362eabec275129557ac12a97e3c01d374f0189a8b71973ebee SHA512 ef7cdfa09fa18e7dd3a126a07fcf246ac766adad3d67fbdf5a1aa0edd76f4b533ea6a2016a7d53208b0d18e84a143aaa0e40c0c625c78276499c1bfbad144775
-DIST xpdf-4.02.tar.gz 912885 BLAKE2B 70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f SHA512 72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
 DIST xpdf-4.03.tar.gz 936046 BLAKE2B bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144 SHA512 5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1 SHA512 91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
@@ -16,6 +14,5 @@ DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 3c3a4397f25ae74ed8bd68d0736144b9
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.02-r4.ebuild 3649 BLAKE2B 575cdd3db727f7efbe4f6146c5edafcbe763616e480cf28a7a078347e74d6570f817d5fe9db31a770b3dd014c370fa362521d0608e26a94d11b0bd49be8ea02c SHA512 c8b8a71667e9e42c401f74e9b609f867eff1eb0adc629b8ebc9726de389f17873ebdd321a1c0f694b366476deb41e4c907e383668655c490591892ada33ca428
 EBUILD xpdf-4.03.ebuild 3637 BLAKE2B c2ff73425db4cd26b2b8b4cc655a074341384e11ff2784a390ef6a4e7e4b38c09f8c5db72c84f60978edca8cf7ea3196230ff77d4a9747ac5db71ae9ff2c738a SHA512 36c8c9ddadca31aa673135c9cf361d9889a2e81a00b3377c5150982919b05dac439cca40d23a9f898bb0317dc5ecb69153abf7330dead28f3cd867734a8f204f
 MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568
diff --git a/app-text/xpdf/files/xpdf-CVE-2019-17064.patch b/app-text/xpdf/files/xpdf-CVE-2019-17064.patch
deleted file mode 100644
index c4f84a4604c0..000000000000
--- a/app-text/xpdf/files/xpdf-CVE-2019-17064.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix CVE-2019-17064
-
-Fix NULL pointer dereference by initializing field before use.
-https://forum.xpdfreader.com/viewtopic.php?f=3&t=41890#p42672
-
-diff '--color=auto' -Naurd xpdf-4.02.orig/xpdf/Catalog.cc xpdf-4.02/xpdf/Catalog.cc
---- xpdf-4.02.orig/xpdf/Catalog.cc	2019-09-25 22:54:33.000000000 +0300
-+++ xpdf-4.02/xpdf/Catalog.cc	2020-03-01 12:05:43.235486706 +0300
-@@ -159,6 +159,7 @@
-   baseURI = NULL;
-   form = NULL;
-   embeddedFiles = NULL;
-+  pageLabels = NULL;
- #if MULTITHREADED
-   gInitMutex(&pageMutex);
- #endif
-@@ -241,7 +242,6 @@
-   // get the ViewerPreferences object
-   catDict.dictLookupNF("ViewerPreferences", &viewerPrefs);
- 
--  pageLabels = NULL;
-   if (catDict.dictLookup("PageLabels", &obj)->isDict()) {
-     readPageLabelTree(&obj);
-   }
diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild b/app-text/xpdf/xpdf-4.02-r4.ebuild
deleted file mode 100644
index 00c9ecd93881..000000000000
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com"
-SRC_URI="https://dl.xpdfreader.com/old/${P}.tar.gz
-	i18n? (
-		https://dl.xpdfreader.com/xpdf-arabic.tar.gz
-		https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
-		https://dl.xpdfreader.com/xpdf-greek.tar.gz
-		https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
-		https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-latin2.tar.gz
-		https://dl.xpdfreader.com/xpdf-thai.tar.gz
-		https://dl.xpdfreader.com/xpdf-turkish.tar.gz
-	)"
-
-LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
-
-BDEPEND="
-	icons? ( gnome-base/librsvg )
-"
-DEPEND="
-	cups? (
-		dev-qt/qtprintsupport:5[cups]
-		net-print/cups
-	)
-	fontconfig? ( media-libs/fontconfig )
-	libpaper? ( app-text/libpaper )
-	utils? ( png? ( media-libs/libpng:0 ) )
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/freetype
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-	media-fonts/urw-fonts
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-automagic.patch
-	"${FILESDIR}"/${PN}-visibility.patch
-	"${FILESDIR}"/${PN}-shared-libs.patch
-	"${FILESDIR}"/${PN}-CVE-2019-17064.patch
-)
-
-src_prepare() {
-	sed -i \
-		"s|/usr/local/etc|${EPREFIX}/etc|;
-		 s|/usr/local|${EPREFIX}/usr|" \
-		doc/sample-xpdfrc || die
-
-	if use i18n; then
-		sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
-	fi
-
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DA4_PAPER=$(usex metric)
-		-DNO_FONTCONFIG=$(usex fontconfig off on)
-		-DNO_TEXT_SELECT=$(usex textselect off on)
-		-DOPI_SUPPORT=$(usex opi)
-		-DSPLASH_CMYK=$(usex cmyk)
-		-DWITH_LIBPAPER=$(usex libpaper)
-		-DWITH_LIBPNG=$(usex png)
-		-DXPDFWIDGET_PRINTING=$(usex cups)
-		-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use icons; then
-		sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
-		cd xpdf-qt
-		mkdir $sizes
-		local i
-		for i in $sizes; do
-			rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	domenu "${FILESDIR}/xpdf.desktop"
-	newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
-	if use icons; then
-		local i
-		for i in $sizes; do
-			doicon -s $i xpdf-qt/$i/xpdf.png
-		done
-		unset sizes
-	fi
-
-	insinto /etc
-	newins doc/sample-xpdfrc xpdfrc
-
-	local d i
-	if use utils; then
-		for d in "bin" "share/man/man1"; do
-			pushd "${ED}/usr/${d}" || die
-			for i in pdf*; do
-				mv "${i}" "x${i}" || die
-			done
-			popd || die
-		done
-
-		einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
-		einfo "with other packages"
-	else
-		rm -rf "${ED}"/usr/bin/pdf* \
-			   "${ED}"/usr/share/man/man1/pdf* \
-			   "${ED}"/usr/$(get_libdir) || die
-	fi
-
-	if use i18n; then
-		for i in arabic chinese-simplified chinese-traditional cyrillic greek \
-				 hebrew japanese korean latin2 thai turkish; do
-			insinto "/usr/share/xpdf/${i}"
-			doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
-				! -name README ! -name add-to-xpdfrc || die)
-
-			cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
-		done
-	fi
-}