gentoo resync : 13.11.2021

43 files changed, 525 insertions, 314 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 755568459c0d..43a180c7b54c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
index ff05154620e7..b7c72ad21d35 100644
--- a/app-text/bibclean/Manifest
+++ b/app-text/bibclean/Manifest
@@ -1,5 +1,5 @@
-DIST bibclean-2.17.tar.bz2 2253830 BLAKE2B 4d707f8d07f04c45c44fbea2b12bfffc7636cef2a847d90e62f339cb8fdadbb416cd89c2ba1cb04b0fc9c736dd7ca8480a2cbd4dab9c27b1f6804ddd18fc5419 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f
 DIST bibclean-3.04.tar.gz 2712015 BLAKE2B 80d2fccb3b453dfda935bedd73ea2173b6ba1416c425a094c6ca915e86a886fe269b2f0e392274775228b03578ccf19da03291ed644f589edec1692120456a99 SHA512 7cdd22d07f627944d90e04ca73c3c82529e2fa9a011469f8d5b418f7651332b4e8c29aceda32b966bb1778151505d7f135ead6a12db8975ff46f650c4c43b4f3
-EBUILD bibclean-2.17.ebuild 593 BLAKE2B 01d318e8467d69d1d1cce3da545808b10e3c2717a61f4261526145e908b9e2e63200e0bc0af2061501ddfbf4c78c3b6f368cd018f1334420477b894c4827adc7 SHA512 d18ba47f1afefcae8711f1d450a26cbadef08c45a57f4ff971d10d15cd12afa342ccc17c0eda7fa3f3ff32a821ca7f83b61fd101494083857df72a2d18241ba6
+DIST bibclean-3.06.tar.xz 1697732 BLAKE2B c1d9623588e892360eb98e753b44cb54e0eb65d3e3d46a04463c0c3183beacb58fd07542ba06d00eb754061b45ed195a82b90b2843b6ba456c7ba09856090474 SHA512 b167243415f010d7597ffdf52c5bb71de3585f70443c3a04f762a633b2bc276c7aef50e16159c32d8765924be2781b1e60a111305a17c2f42b68ed5216b2e31b
 EBUILD bibclean-3.04.ebuild 576 BLAKE2B 50e3e9effa2d3b4b4c0cde9b14c1ed09fe264f3e52eab76dcfa77dfa9766d99dfa81b236680a9baabdee2576250d362e820209f05e8c573cd435624c7d1e7fe0 SHA512 4c9c8e023595fffe5a2a51e7953d5e5e31c5665e9398b949373eb243e4c3827ba65375f6d51d4d30bf068ea27e90b6ac01b89978007cc58644d715be514c2eb8
+EBUILD bibclean-3.06.ebuild 550 BLAKE2B e3453381c46f49adbfe25ee923fda0582b7636af70cd6e1c734361a2e1aa8211411ec273a63763fcd47bfd54a615340f96455acb9bcf04d11fa31a356fa78317 SHA512 0d0c46e2592677b925e1f495fd433aa406da6834f301e7535d04a0ef421ae93047a882f024bcbaf234ae0de52ca746dd02571fedb7d6f5f5f442efee281ee62a
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
diff --git a/app-text/bibclean/bibclean-2.17.ebuild b/app-text/bibclean/bibclean-3.06.ebuild
index fc8d456dd364..988b9c57cf29 100644
--- a/app-text/bibclean/bibclean-2.17.ebuild
+++ b/app-text/bibclean/bibclean-3.06.ebuild
@@ -1,23 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit toolchain-funcs
+EAPI=8
 
 DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
-SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2"
 HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
+SRC_URI="ftp://ftp.math.utah.edu/pub/bibclean/${P}.tar.xz"
 
 # http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 src_compile() {
-	emake -j1 LDFLAGS="${LDFLAGS}"
+	emake LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index 7ddcc84d7348..647b5601e1f2 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,5 +1,3 @@
-DIST bibutils_6.10_src.tgz 590002 BLAKE2B 91ea6c961978d381a65c1d5071c541409609dd9fdeb664cd7e66eb4871c2ecd0dfd6b06857294ae6ec049751a5939be23518782a5e1f14fdf848918849269402 SHA512 43cf107ee6d1bf6bf27a6bf46e1f4cbd83a4b78ef355730a9f37282fac399ee21d78538248730be85c0a8f724344782dcc6ab68e50f857d8ac4ea24cc4102911
 DIST bibutils_7.1_src.tgz 620141 BLAKE2B f020ea7c8164a870ef4c72defae1adc11558661a7ae9f3b037115cfc4a9e71b4f37c64f3b74641182300c3e921b8a0c309257a468b6b32f4fc2915e4a36f04d1 SHA512 2a155ca60c97d37941c860635d8e6920bd78de84452e1fee93a2f7331392f6a43f2c10055e84349bcac89314025d1524fd5cc73c47ad1613baa7baf2667c3f33
-EBUILD bibutils-6.10.ebuild 987 BLAKE2B 121e71d7e351135fc1d70b3c56706d68d74e8b4f454806e1211f3e428b9d617e885f7d8fd909121b7d6a78e5d82f4a2ecd37e7056f8f4204a8b8dc7b6581efa8 SHA512 04c331b7c4e54dbab631e27ddf2281a6bd8dcb332cbdf212b7adc5ccce61186b920b00f5fbaf231eb5bbad8c613e4f2aeafc5e385a9473310bdcf590a5af624b
 EBUILD bibutils-7.1.ebuild 936 BLAKE2B 1de7dc49b9411818b0f4fb3f6f8e82fc93896c8ca39bc1f4ff1a354b3a4ebbd92c3cb761b64cd9a80196adccd7ee98a1873808b1b6a06b8af22414ae807fd1b3 SHA512 1af29dbc04fc432dc9702f08adf3044d524306e638ee57168d84a9b90a07345b5259728dcf8fbd70a8b8eb3c7cffa96423180b81e60118aa592d95c4911b28b5
 MISC metadata.xml 332 BLAKE2B 543aa8ae8a86a9dce2bed1f5bb05f2f960725d137c638b33ff8a9a33407ae3d50cf96fffde54fb16af359cbe6bc301241c68e5fff46f100b3e0fb97143c81c80 SHA512 dbdbf756fc639e73aa5c0a92df6a873f4ef4feaa6bd0c636d178dd5ef21e59a86872774f06d5c48eb1f1e1dffef16ab9d2cc3973804eb33e111b451f87cab11b
diff --git a/app-text/bibutils/bibutils-6.10.ebuild b/app-text/bibutils/bibutils-6.10.ebuild
deleted file mode 100644
index 9b7f812f98cf..000000000000
--- a/app-text/bibutils/bibutils-6.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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_prepare() {
-	default
-	sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die
-	sed -ie 's/REPLACE_LIBINSTALLDIR/${DESTDIR}&/' Makefile_start || die
-}
-
-src_configure() {
-	./configure \
-		--install-dir /usr/bin \
-		--install-lib /usr/$(get_libdir) \
-		--dynamic || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		DISTRO_CFLAGS="${CFLAGS}" \
-		LDFLAGSIN="${LDFLAGS}"
-}
-
-src_test() {
-	emake \
-		CC="$(tc-getCC)" \
-		DISTRO_CFLAGS="${CFLAGS}" \
-		LDFLAGSIN="${LDFLAGS}" test
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}
diff --git a/app-text/bogosort/Manifest b/app-text/bogosort/Manifest
index d8935f27cfb3..60fb5777963f 100644
--- a/app-text/bogosort/Manifest
+++ b/app-text/bogosort/Manifest
@@ -2,5 +2,5 @@ AUX bogosort-0.4.2-glibc-2.10.patch 1141 BLAKE2B f920abc08b250297c3569cab2c6bb1d
 AUX bogosort-0.4.2-implicit-decl.patch 786 BLAKE2B cf35c37e2d79e71f56bb0aef7ae6cba8340c4da8eb0cff9e78322e85a8fadb5132c448866cd1aef822c8fbe8fb68c91ef51a7f900da68158fe19aa454603157e SHA512 ec07bea1762cafd6f50706a5a22277305c6e5d856488dd6b9c50dc3e07876329229dd3d16e0de31e8b82f2a3da58cc3f02fea226328351b591c6628670a00eaa
 AUX xmalloc.patch 322 BLAKE2B 577c24ee19016f67f7c7e4510b60c8bdcbfcbb340f34def3efc1d3100f5f4e65dad74f16a6c1052b5c21b3341ba1967b97c95c7dcc56398160884608fb66cca8 SHA512 7a600c173db0502b42163474d75a50b1af539a55d704b000f7c9189af563569db8026499f082e02fe935a6b5fec7dd4a1c40cb2f224c8e96b7b0286ddb798191
 DIST bogosort-0.4.2.tar.gz 161628 BLAKE2B 92abbb809747e3fdfd2a6e33f7f753f1ddccd4ecd9883f0a02fc843f8f680e0a5e6e6b65c3943708ed074a944e5187bb889297365ae0dd34292215b056bd46fc SHA512 2d2f7be36ec08aa78323cbdc5f1030297706c364d6fc82554065cf737295d11c90dd6061323f2732b63c70401d710b2018075bff6d1e6ab0078069b405ea62e9
-EBUILD bogosort-0.4.2-r1.ebuild 835 BLAKE2B 8ae3edd69ecd40f9d3d4b1dee28198d31ee56b7402bae2d8c7fa0fc89be96ad72e51107738edd313f59dd257e2bac649878db8058f3a4bc66ee1c5bd8a6baadd SHA512 ae6fc5959696aa2f3102799592c33035ccb7152d92de7b9ae8836bda327ba4d05c5323fca7a5b191b9fe6861047471c6f72ca4424309270d922175c96b94bcac
+EBUILD bogosort-0.4.2-r1.ebuild 809 BLAKE2B e52bce7534d8d74f249a165c0dc4ea65c18c8d8c9a7f5fc8916158ee4637a05985ceef781c8b02556d09e4ac96d8dae9367344b7ed4bd01333d49d36b2a06912 SHA512 a44906a146d9d1b8b85ebe7ecd507e6f8a8e5a6085d8ab194fc0dacbe8495884ea0bc5ecb78b1059aa90e97e394655283fd0e2a98bb58354d5de48430271ebcd
 MISC metadata.xml 501 BLAKE2B 1f6331e94625b01273e41dfb80640896f3c9571298bc7c7c99f136a101da749baaa232825b47a940a1bbc0ed03b9498e44d1d6b9aba6e7c8b8a4dcdc18f4894c SHA512 88d2f8ac1f4a7ff36be54c3ed7773fc2f2c5816d644af5e1ffb00ef8d5a593da2efd4223e85e616b62a68a374f38e49f9ffb03869a9919aaf661585c85110e5f
diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
index a8a12ad1ae77..36d1547efe1d 100644
--- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -37,6 +37,7 @@ src_configure() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	default
+
 	dodoc README NEWS ChangeLog AUTHORS
 }
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index a937edec2778..841c1170f097 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -11,9 +11,11 @@ DIST calibre-5.25.0.tar.xz 36849112 BLAKE2B f9cb423317ea1f5b22e7f3540708fd4fa6e7
 DIST calibre-5.30.0.tar.xz 37002224 BLAKE2B dc034c54a6ebee838652fe10b467bf8408f8dabd759108d617e2c9f64109e92afe0f2994c5df480ec4346c596361ccb63d0aaab2796edc4993ae0eef4222ba6d SHA512 c2d435ec9a8cfd5f76439f229cd9a7a7f4e829e44d9f2ff37003faf8a925df40cd77471d72d05a8d145bfc104bf92dbdd67ddacabc84e6e3cad055887530d8bd
 DIST calibre-5.31.0.tar.xz 36937976 BLAKE2B 55995aa8fc75ebee5506145ab7995ebcfd04dfa080eae48229a167e404cc4f091c27f9d9401656c52b1620b6d407904a6e454b0b693c6e194a871bc6fda30d4b SHA512 4a2926f86d4bb4e9b66312c9f988bdf9cbcf12096c76578259f9473f69f7e8c16f763934fbd2664ba8e3bd24fbe6a878c1e2a9df43152ea0fe0ba3d447dfed42
 DIST calibre-5.31.1.tar.xz 36943652 BLAKE2B 13fa46d4426f705f7af2de07a38ca2266148291ca054a1de65b11013907fa51eb7ebefb774988a0b471af31d62ba8eb890cd3fe687505976d9d70738fb64f538 SHA512 c9f8e7fef430961f51699eeda009a799b702b740c9999744b982dbd14d971557f76b31897853435f8947199ca3d65622bf974b2d2afadc813d292b64bc048121
+DIST calibre-5.32.0.tar.xz 37115596 BLAKE2B c26340a87f77f373de619a1120f572b21530ebb69ba47975c5fd27e00dc5e72bd23c7265065e25d82f8e964fbeac8a05cc6a08c2d361c4f0105702993230ebd4 SHA512 4ad46e169a0ce23b354d2443b615f2fa80ef69aa763a5f26431968c49af433becf736659daaeb8d8d07e4a2326698c920cafa9a74ac5a8b7bb2f82f0fee2f532
 EBUILD calibre-5.16.1-r1.ebuild 8515 BLAKE2B c9dc7b66d93d6020cde09a360b0aa92894eafab75e7ca4f18a1a9a9286c6eb4f2af17fb162583fcc05088775abd0fa28ff849888775d964a396ab09cfcc02eea SHA512 cd76c560e8acfeb4e41de7ae8cce3fd4294b54ac7bee585ed562a596791054a7ad2918f09105b86587271002f7690b681ac9bc3e53bf1e5657b80f94aa37cbe9
 EBUILD calibre-5.25.0-r2.ebuild 8521 BLAKE2B e8aadd09100a88f08a2555faf10b399ca14b9cc1a514c37e548db7a659ff76d24a25085a6549b9aa07a7c9f106f6198940390c9eb1362afd28745055e461f347 SHA512 600ddb23b1a0360fbb04cc1b84cdcfcbaae4f40b6b52f8385364a8bd5e1aa13678eb97a43600a08ca50c13aef58564a3398f0919232e395a7d4c3cd96556da7c
 EBUILD calibre-5.30.0.ebuild 8535 BLAKE2B 6fa6447889c1ec42b79a78a85997b6edd10f938ccc0aa319f9f9e0cff43590ffc8520844cea70526b6e67cd31a2dd4ff62bce9340b6bb6b86c38eb190c244e8f SHA512 a0758ea6888c9def11b0835301e5f6b32b8315c07b66d718125f9cc8c2d3d8e66e270b9382d825c8e40e5330bc5599c163182f180419b02130db369167482fb8
 EBUILD calibre-5.31.0.ebuild 8535 BLAKE2B 6fa6447889c1ec42b79a78a85997b6edd10f938ccc0aa319f9f9e0cff43590ffc8520844cea70526b6e67cd31a2dd4ff62bce9340b6bb6b86c38eb190c244e8f SHA512 a0758ea6888c9def11b0835301e5f6b32b8315c07b66d718125f9cc8c2d3d8e66e270b9382d825c8e40e5330bc5599c163182f180419b02130db369167482fb8
-EBUILD calibre-5.31.1.ebuild 10215 BLAKE2B 210207e389214ff9889512db52cfd7fa2ac1966b6114733e3767b91e2b6a549ae20d131ac6842307317ed60fb0114b08f9ff71d355999f931810cd4916ce436e SHA512 bbb8e5774f520d1981a85db901362dae5fba080e2b2d7812369d8cdae64716ccbb5dd63119fb41c0785df661af7eb058823f534597068afc9d5478063b3d8998
+EBUILD calibre-5.31.1.ebuild 10375 BLAKE2B 6e8e273664d2e2f926cfc2a01aba692c9b671267de9008517242b3c3f61a51ff0d184417ae9b69a32fbfa7e172c26fbb553f927cd0dffe573df8288d780e1318 SHA512 0075d57a1b2f9e734a90e2427aa8e11548af33d925b4b646a6bee54b104c02af66bd82a009c79d5c429b8d2c42f69ab00d55a7f247cd4f644df6a2a76f67b3b2
+EBUILD calibre-5.32.0-r1.ebuild 10358 BLAKE2B 5a45a111ce35949075dd77b7f3113456f22613fb4957f031cce2878eb5706c47393b09cdc75846ab89047f87a4f644df6f723b577663a0f8b0c06043590b4009 SHA512 95f4c46743d61ce1deef6f32e4eb7bc703da29e35064703e1a9d7b5990b3147bfa7c6f3a445746a2eff1712f77ec9940bc278b7d0a409ec3953149384a657337
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.31.1.ebuild b/app-text/calibre/calibre-5.31.1.ebuild
index 283305d4191a..4c142f046ab5 100644
--- a/app-text/calibre/calibre-5.31.1.ebuild
+++ b/app-text/calibre/calibre-5.31.1.ebuild
@@ -191,6 +191,10 @@ src_compile() {
 	# TODO: get qmake called by setup.py to respect CC and CXX too
 	tc-export CC CXX
 
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+
 	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
 }
 
diff --git a/app-text/calibre/calibre-5.32.0-r1.ebuild b/app-text/calibre/calibre-5.32.0-r1.ebuild
new file mode 100644
index 000000000000..7b6a8c3a07b4
--- /dev/null
+++ b/app-text/calibre/calibre-5.32.0-r1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
+
+inherit toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	dev-libs/snowball-stemmer:=
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cchardet[${PYTHON_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=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.15.5_pre2108100905[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=[jpeg]
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Don't prompt the user for updates - they've installed via
+	# an ebuild.
+	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
+
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-5.31.0-jxr-test.patch"
+
+	# TODO:
+	# test_qt tries to load a bunch of images using Qt and it currently fails
+	# due to some presumably missing dependencies. This is important and
+	# we need to look into it, but at time of writing, none of the tests
+	# are even bring run, so I'd like to return to this later.
+	# We don't want to skip test_qt entirely, so just skip this particular
+	# assert for now.
+	"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora or Arch Linux's packaging
+	# is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
+	# contributor. Or just ask them.
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+
+	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+}
+
+src_test() {
+	# Skipped tests:
+	# - 7z (unpackaged Python dependency: py7zr)
+	# - test_unrar (unpackaged Python dependency: unrardll)
+	#
+	# Note that we currently have a hack to skip one part of test_qt!
+	# See PATCHES for more.
+	CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
+			--exclude-test-name 7z \
+			--exclude-test-name test_searching \
+			--exclude-test-name test_unrar || die
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index b1fac140faa9..f449c2a5bc89 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,5 @@
 AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
 DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
 EBUILD discount-2.2.7-r1.ebuild 1690 BLAKE2B 710bd40dc677328a0f8aaa6ad3a387d75fe939b289186d889f35002c08c82b52bfaa5fe138816eb7ecdbfd6ec437b863df0c248448cd99e92452a2cafeb995a1 SHA512 27008019ccf6fb42d7e364990baa6facb7f0c8d8e40375dcc44594ccef7c792648f8d1dcd6c69a895c5a059c3799722d43338bbbc1c443dc284433ac0da4156d
-EBUILD discount-2.2.7-r2.ebuild 1696 BLAKE2B cfb7a7bad5acd5e08d4a3600eacdbb6990def006b87e2f86ff8b37495260bddab4ce45871367299575d8d58401e4d52f2db9632d0e40bca04c42e0c64b799728 SHA512 5baf0d566839378f454dbf06b32289c215772f8b4dbaeb97c97869c597a69e49cf03c2393030f918a069b9cacab69e29c7f8908fe8d21298f4703a2f2bbce4e1
+EBUILD discount-2.2.7-r2.ebuild 1703 BLAKE2B af50240cd50012f25f990b08e38707f1c1bd81630bb77d11bc55c848b6f9e9f61ab156c42a236f809d069b6982bd429a0c19338169e49db7706c9b028499d07a SHA512 d576fac4c47cff8b91ae64d8da0212e35edef8eda8aa2203f1727f4e78e4feab1efeaba79bdcde76a0434e879ebffdb0794afc2573c0b28cabb375a4df96c607
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/app-text/discount/discount-2.2.7-r2.ebuild b/app-text/discount/discount-2.2.7-r2.ebuild
index 10b47fddbbbe..1af369708c03 100644
--- a/app-text/discount/discount-2.2.7-r2.ebuild
+++ b/app-text/discount/discount-2.2.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 4b01c3605656..2a65fc2db7fa 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 1238 BLAKE2B aa80e5d46a23aaf9cbd8be56804876206aecb6965610d224f359e99077e43c12cd04481d2c9abc90754d6a9f24bf6ffa100d2f591fc0379832e3da7d1db37a1d SHA512 8fc169ffd7425e3a789836731d2d51e5eec2ee91fa7e865bb26953b35d97962faae8943300f4a55036845612052540f8aa55269705c0e6f99d46cd6abb38dc0f
+EBUILD enchant-2.3.1.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
 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 66d254be6a25..148aae6be617 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/fbreader/Manifest b/app-text/fbreader/Manifest
index 3951f911f2dc..470ba43a0e3f 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,4 +1,4 @@
 DIST fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r5.ebuild 2004 BLAKE2B 50a43f8a9dc9cecf7e695baf2a29343e3e0bb88f47306f2f8226ac648c9c97992511e24b8b4dde17a05b08982113cc10ceb01b1893b74b23ea0e5699e466d39a SHA512 bf2e6d50be1739b7e69375c125d1bb7e43b607231620c93085392b4794ac5461bd4daf88e840130601e479d62b8feb8502374935ac8fdc1d8c7e4f634b9d2327
+EBUILD fbreader-0.99.4-r5.ebuild 2056 BLAKE2B bd7c72f5f531e5b031cf8b383fa6299732b246086b9fd0797a3d3cd64c428a444ec435a425f3b32d24c9e19792cea7f9a70b06dd2240e4e879ac51ecd3285126 SHA512 7dcced0eaca3e997c2c28ecf5c9c8d07faa17af02ba4dae95621ea6de970bc5c75030870fb15dcf76c5c6c884212b51c140ea3224e86cf75b8d314c345bdd218
 MISC metadata.xml 300 BLAKE2B a3ec1e9fd7a06ee661f79b8b7296673807f6886d1615bdca34342bdbf6804f408be32775f92a3201f6244150376448c9027bfd598a18b72bd2205406e53f3c83 SHA512 95cf37aa6b0dc778091e1b899af1cd7031deb5f24d0d152c8c11244be68d87e7d2fc8a5a0fa5aa539a89244c8f1722443c365bbe49070c9605f69d17953ba2a9
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 76413d99296f..44288fac4896 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils xdg
+inherit qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="E-Book Reader. Supports many e-book formats"
 HOMEPAGE="https://www.fbreader.org/"
@@ -71,6 +71,9 @@ src_prepare() {
 	else
 		echo "TARGET_STATUS = release" >> makefiles/target.mk || die
 	fi
+
+	# bug #437262
+	tc-ld-disable-gold
 }
 
 src_compile() {
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index 48d3119df1fb..a6791ad94ac9 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -1,4 +1,4 @@
 AUX gv_icon.xpm 2837 BLAKE2B d4e15bbf39e183b0093c7f9effa2725e558b6f0fad3d44fc3831c7c142081e668c727cc1688d0bd2b61e1702b50351f841f7390d1873cf27c21474549eed87d3 SHA512 6aae3a463fbf3484028f7ca8f50cb7a332f5566f3bb84dd5c17843b581e1b6013b4f99a1de8600e9d4a0ba5b9b7ce131ee37b0fd80b97e32ef018d272f756076
 DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
-EBUILD gv-3.7.3.90.ebuild 1053 BLAKE2B e473bb00cb90f2ac251f9314314be3d2d1095db327fe749f27a820e123f23a0395b8b71050ed82746cc73e77ea3e26e17d27f920fb8d85f8aaead498dac69036 SHA512 7e9bc62d33f90bacb78dba44b3f6d6405f75a38c27da5f97adb489a2d4978f3e565be7c23280e3b0549bbcdd83bff27e7803256c512792f7a786bcacb2a93bd6
+EBUILD gv-3.7.3.90.ebuild 1060 BLAKE2B 90f49d25a87d7c5d60c0965158a24de76871381651d0788975c24748304461277359cdba5577d0355a100a39741b0087430f74043c4029eafc43acd96f25b6bb SHA512 62ea7a9af6e7bd8f80a7224e6feb92e5943ec45b9050991758c13dfb55fc359b01a811d1d9a4f85e160948a305bec1b1b0c0e0874421e023f72e45bd62fe4af9
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
index fb9fe32c8378..697602c649e7 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://alpha.gnu.org/gnu/gv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 06d62c1f46d6..7e7738488d58 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 2642 BLAKE2B b91930f702479a5afd75d9985d5df66717764f40a515afef639e7216622475301ad8b8b8ebba3b65399f1846f5fcd5b576c6d670d9743d946f592f1698d85786 SHA512 fd7d5e192c32369a58557e0ea1673b0880408d58957486d4eb44508262a887d758ae76033d8fc1bca7d0807780b1553bc0ecdec90b0889c2d3076db3b946a566
+EBUILD iso-codes-4.7.0.ebuild 2638 BLAKE2B 82ece660270b8b61bc7fad445d1f11f6f1c3fa39b67772be4d3edf1251e766752bb87fde75b429e22ff0f017f5b0f0282c1d1578d9eaa09505066e7413c7822a SHA512 efc173f44bc56f3410f9daa01b416fdb1ba406207444e8bb24319a37da9be291f074b23e8111302b576a9c71fea2398adc2208eb838c692f2194d5e21f978160
 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 fde78634b315..37abf9cc8729 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/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
index a8da39e15144..eb9c00e56591 100644
--- a/app-text/kramdown-rfc2629/Manifest
+++ b/app-text/kramdown-rfc2629/Manifest
@@ -1,5 +1,5 @@
 DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a
-DIST kramdown-rfc2629-1.5.13.gem 49152 BLAKE2B b5e8b04327eb03354da557bae2858ed5d46bf3a63bbed90b7b7c55c7521180e22d772b87c4bfd1bff24004793e5edae579f055975114143dc78806075abf6d65 SHA512 0ca8bab3e29d50b5c5b41e059a81d7a4e7707ec658e4918153e18d4499e1481eccbc3a3b332e4f558ebc6dd1a052edb55953a61866b66938f561018c3dcac658
+DIST kramdown-rfc2629-1.5.16.gem 50176 BLAKE2B 455fd60221af2abae6afbf8ef5697fd06fc47ba7a7b7a48e793c724a2c4e38992e881e68dd3986f3b01a17f98bd8940aa82bf5e0a7350a7e3d86dad69d0617b4 SHA512 9cdacd9eac5dcea118834c699d08b87d4d899333173d14233c855477fa59db690e64a34692306ec6b1fb86e68255d97a9c713ee53d449f884539854681e5b8d1
 EBUILD kramdown-rfc2629-1.4.19.ebuild 615 BLAKE2B cefdf9146f455535b25cee3168dfd48770e2710200dcd6f7d1b5a65a73c653a76cb266f09fe952bf481f68f647ac1cd4794c67eae7a98bdcef4556cb0f342998 SHA512 92f772c80ccf2778c80542ee189f8f2528e85657bc4519fcbda10b3c9083fc4a55336d7a7d10e7fe4a211510d6d95099d0180e513e696ca50740e097bf5f0951
-EBUILD kramdown-rfc2629-1.5.13.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
+EBUILD kramdown-rfc2629-1.5.16.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
 MISC metadata.xml 247 BLAKE2B aa1ac899418ae6358314e4cbda5c7db1a4f1e7fd8587e101508aa77bfe6d127e1c7bc762c52a81810f22baf7cf6a3a3a22da3810beecdccc5307c42d028dbbcc SHA512 b93f40a4fe9148f409cb20b5db2233ef29cbd27ce7dfeac19e0f3d9cb6b81c6eb2fcb19ce31739eb83911298f089f0bec7e372b5581fc3c839174129f3ab36cc
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.13.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.16.ebuild
index 057efaabbd87..057efaabbd87 100644
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.13.ebuild
+++ b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.16.ebuild
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 8d19e0937801..fe0284af9c83 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,7 +1,9 @@
 DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
 DIST lesspipe-1.89.tar.gz 121118 BLAKE2B e730b6e8afc767a0118abbcc6221d2c18467393119c26baf71b8758b5826ba52230526b9c5cd67704aadda07b63a62dfe006db10de1dbae0a73ede1885b03ed0 SHA512 b8d7c92d3dae77f2ccee8e314af4354fefc9f3aaec1566af02c9be2640f11ebf7ea1432334470c5d5dbce39d2ac7c3e9f4074bcf9ee4a502dc59b370a21b54f5
 DIST lesspipe-1.90.tar.gz 121098 BLAKE2B 269f4193f423e4ac5770171156e2f63d14966d7dcc77bf015c3100f281206424ef334acc1edf2edb6fe31f73aed80b9c3ba6c715d6e97993c5a90dfc1ce42405 SHA512 d402bd46c37d2509c90530e9da0560fa3e5da9002c37a515451a8ab9275576d1af44793a10914e74e804f10a3352439815c6763d2d77e5e41a0e9840286f518e
+DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
 EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
 EBUILD lesspipe-1.89.ebuild 1699 BLAKE2B 5a2f7a3ce059c3907fcc929f764e25545318d46d7f819bb3be3316946c6201fb7c1c3ab99c62c6205280fcdd4a578b30f4f7d2f872c1064ecea3620996566f66 SHA512 e6c9ddef87efbe09e4dbd03e71173e290a9436730106878c31507cd670edbde6937aec79cd45ccc0177a57eede30d2978d7a7fa0c42abfb21f52ca1edba77fa3
 EBUILD lesspipe-1.90.ebuild 1699 BLAKE2B 5a2f7a3ce059c3907fcc929f764e25545318d46d7f819bb3be3316946c6201fb7c1c3ab99c62c6205280fcdd4a578b30f4f7d2f872c1064ecea3620996566f66 SHA512 e6c9ddef87efbe09e4dbd03e71173e290a9436730106878c31507cd670edbde6937aec79cd45ccc0177a57eede30d2978d7a7fa0c42abfb21f52ca1edba77fa3
+EBUILD lesspipe-1.91.ebuild 1754 BLAKE2B 1fceb92955affd2c975babae33f58b8e6e8091bebfab68a878e3a8c62c64bdeac85dbae57693f23f8470c32c8f3af76ed884af0e3b9e8bb185ae390bf681192b SHA512 8028cfe92e60595e23d5cbe46bb763f09c97663a24272fadde3ecb22461e6f20d2dba94ec1fdabd1fb8e547557ca28f512bae0e3325942d5d3ff7d214ced2f53
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-1.91.ebuild b/app-text/lesspipe/lesspipe-1.91.ebuild
new file mode 100644
index 000000000000..ecc7dc9e5b7d
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.91.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Tests are broken in 1.84, 1.85.
+# Still fragile in 1.88. Passes when lesspipe is not installed.
+# ... and in 1.91, things are being overhauled still.
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+src_prepare() {
+	default
+
+	# Drop a failing test. Not ideal, however:
+	# The test suite for this package is pretty fragile; it's more valuable
+	# to have _something_ failing/passing overall, than relying on a single
+	# test which seems to fail due to an unpredictable external command.
+	#sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die
+}
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build (avoids the "all" target)
+	:
+}
+
+src_test() {
+	# LC_ALL=C manages to fix one test failure
+	LC_ALL=C ./test.pl -d || die "Tests failed!"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 3c2cb2673b24..824fe75a29b9 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,4 @@
 DIST libmwaw-0.3.20.tar.xz 1425812 BLAKE2B a708ce4a28a0d5a5a5ee9d178c67119189add0180e61d67af6821c509d95b9f8bfb60eeb1afcdf8e2da5bed26053108b12db57db98912d97dc7e0ef0f7121f18 SHA512 d6cd28629b6482dd61e070036e94568ecc44d9064dddd9c699c7362caa8ef36652ce84cf0f199813854636f2e39ab19d47f4e148990822791b88cd3f17f68b3b
-EBUILD libmwaw-0.3.20.ebuild 990 BLAKE2B 458e4695a6b2747587b73a2f952d0771ccd31d7410c869f5021955e87101f3aa0f3e5fce16e7770a24474f7790f0eb5615dcbe0f03286d42afe2a6f91f6b4021 SHA512 a492deef4a74ffaaba4adb3705d772c513c0551ab25f66898f7335fdaf15a90a09d9207f5314ebacbd7cc765560361253984e1a200961af77ccb055a1e08754d
-EBUILD libmwaw-9999.ebuild 993 BLAKE2B 67267f5263a9c98540db6033727d6276f9c033265d1afe2dcde1a9918ff3181ca2b8ae34ec96ffdd9ef0027cb8523ed54f9550dcdf86eaffa5af6c036793ec12 SHA512 dcdcefdb014c8a08ba5415fe53674371f0255fc49c8a070ffd2047b164b7083c280dd039287ba48c3b3be5e68f7cda543ea33e7ec53d1784041c7346c76519ba
+EBUILD libmwaw-0.3.20.ebuild 1013 BLAKE2B 3c741c8bc6e6c1a65ea8ed24d32a8f0d00286c93f92b80bda796cdb040c98080b29be016c8b548b720fc5f14447a225847a48e55a4a6a5f8c4678a4cbfaf8c7e SHA512 32f096bbad136c93920fdd74594b22ffd448030660fbb602be6379da3b66a36194ec5a4412a692a263be8bbf1c50d3ba51aac4efe5cfdaa018267a87244106c5
+EBUILD libmwaw-9999.ebuild 1016 BLAKE2B 9000ed0395fe4a35c333a638eb6dd96974b7a6471ec29d5904f4b4686b23a6593ee82c94516e0efff83c4861e4a013ba875499fb1ec1d53c10764d37b1c5d650 SHA512 b9a1c5684dd554884f8dab0b84c4cb7d5d68470cae41153988176a3954de510b660d54223a14e28d13ac5568afb02c80e5d79ddbdca0633f6c975f4627988c82
 MISC metadata.xml 404 BLAKE2B 95ac1c73023ff52b4a0d1754f9d37b6c2ffd82f49f16122058f853e40ce15dd9b2fbe6ecc24bdf86e82addc27b4a6f9cd7478560fde845b696f62a1645abdca7 SHA512 858235729f5091f06699f4b32ff14890c139c5e0adff30172da79e3fec4b4452e8529c401a0273b1799706e0ade449451f10b84555ade12022bf62e37098ac07
diff --git a/app-text/libmwaw/libmwaw-0.3.20.ebuild b/app-text/libmwaw/libmwaw-0.3.20.ebuild
index 31e61e239233..f78b63dd62cb 100644
--- a/app-text/libmwaw/libmwaw-0.3.20.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.20.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=8
 
+inherit autotools
+
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
@@ -31,7 +33,9 @@ BDEPEND="
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999* ]] && eautoreconf
+
+	# Refresh stale libtool, bug #814512
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
index f0bf404e1fb2..4c609720e0df 100644
--- a/app-text/libmwaw/libmwaw-9999.ebuild
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=8
 
+inherit autotools
+
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -31,7 +33,9 @@ BDEPEND="
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999* ]] && eautoreconf
+
+	# Refresh stale libtool, bug #814512
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index e1a7cc727825..1d478be99a46 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -3,5 +3,5 @@ AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
 EBUILD opensp-1.5.2-r3.ebuild 2010 BLAKE2B ee4008fff75f756f431bf13d49cd26e079b21aff80b5eb12d5644899bb691fe9fa5e4d1050c4541db7be49ff3c4083fe7b25f1c6c3e9414787cbf055658d1383 SHA512 e076ab203bb3f86f15647a85c99dafe128f6ad46aba9d4ace4b89c96b2647ee91af3f1f50b7f595a8ea23d960eb9ee9c00bc87752412f7f5e8e7c52e064e0725
-EBUILD opensp-1.5.2-r6.ebuild 2102 BLAKE2B 3f651da075538b68d1a71ba104199416d25479780147ee05cfeff305ae8ea3ea768017f1ba5adad23a9aec88289eee3caf48030b16417b8b442e32e2bd2104e8 SHA512 2666abd2946ede1881d9b09492dcb9620696a88f07a827337a1929994633e317063692ef85f6674b57a39adbdbe4925a1fc98cad5b3704418d8de2dd7d5b0258
+EBUILD opensp-1.5.2-r6.ebuild 2094 BLAKE2B bd575321e925ca92dbeac261135c2e496f2c29eeee7aa1ef62978871648ce42118773e46cf15cf549fbf4395948d57f337159676ea9328ba4916b3e89d973821 SHA512 bcf5f1df2f2043417003c9e3c403efccedfb0bf40f956129d7238eaf138a3e7f36e34b75fdc38ac16d278c996ab29e03617d29fa2ebef12a4441a90d0acd6127
 MISC metadata.xml 321 BLAKE2B 5571226bba817c3d5cc47e0bd7d67e82399403e24e7773104f33b13bf40d95113da9613db2bd77408557e6793b9efb6d435402a7b680d07e1e3e6952614bdedd SHA512 95c0d6759a91874b81b707e479eee48bf67ba762584587b4027b583e42d63a83018a3243fe81b6649090d1e0167ab825b591dfccbd3a8db9078b1a80f729de15
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 97aa575d2dc3..c3e31ea99fd9 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 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 elibc_glibc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
index f9a2a5fe149c..f8e8e1a1f451 100644
--- a/app-text/pep/Manifest
+++ b/app-text/pep/Manifest
@@ -1,5 +1,5 @@
 AUX pep-2.8-gentoo.patch 521 BLAKE2B f5dd34e1e46c40986b74e0707ce88fc2d98b6ffb8361af44c50f025696ee28fd60883faf0016b92b7f9dfab0eae0870a62a6e611ec1f727578944fee0241eba6 SHA512 f25ee35964b158dfaa22721f28f01ebcd90bca963a8564926c6050014c4104f9aaea5cf6594028d7700d8a13c95c336dbd95ea05fff9ba05245937a725d09ccc
 AUX pep-2.8-include.patch 239 BLAKE2B fd411d4e3753314ae93634bd24093524f364b1603671149722d31fb42e70977e3c97a76a2902a891aebd4e0f69632c5cd6da7996732195cf4a2d5005f5996fd4 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80
 DIST pep-2.8.zip 84665 BLAKE2B 529ce27e819e1f4aa683516b71e1b391169647dc477980db5e6f334559f265f6427d20043edf42047286c46724cba578a961a305bfecd24cd72692ebca061e6a SHA512 553efb3f6ca113d96313cfaa7efc7142e3f87d1eb746478aa5f112bb09d6e5d863cd8fa2a34d866777d6724b525d9b94a0978842afc6198fa70fe59c2a8d1169
-EBUILD pep-2.8-r2.ebuild 1057 BLAKE2B 4b0b52565f875e31df68f775b223ecf6a5574140117be445e27c8dbf472f602c042bfea498e7b9673a86b44371b0bf1bbcdaa39108d2236d1786b3cb0f48c4a0 SHA512 97f82534ea09531b3d4e545fe75b09db35bd30151a3ca3d8d86cdb76b6e99429c220057f7267e7b1eaca9445174c6eea0d0d65a15f77b94bf9ca49182bc05f46
+EBUILD pep-2.8-r2.ebuild 1029 BLAKE2B 269e6616d63e54a4123ee3fa50e4286eb620757b2c68ef9a4f477b11913d49f20aeb5d3b036688a7ce47614011e353557432d17a1b94ebc53d5893610d762807 SHA512 eaf5362b5d8c46dcc0fd122a4e8677a31a592f2054388f48f68d48d433bd1f9c60629bedbf4d292e47fa02e36cf3df7eb767a8bd4001e7d3a6f74e5a0c915565
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index e38782d4b5f2..288dacb2649b 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -17,7 +17,7 @@ BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}
 
-# pep does not come with autconf so here's a patch to configure
+# pep does not come with autoconf so here's a patch to configure
 # Makefile with the correct path
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
@@ -35,7 +35,7 @@ src_prepare() {
 
 src_compile() {
 	# make man page too
-	make Doc/pep.1 || die "make man page failed"
+	emake Doc/pep.1
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 93e434f4311e..e9bc773e7e85 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,12 +3,10 @@ AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78
 AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
 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
+DIST poppler-21.11.0.tar.xz 1783592 BLAKE2B b0448ae0456ffda29c18732e6dd94cb285af67cf4adbaded05a4abe2e465cb63a17e0041240c82c83c89b313ec8c7bf9d68fc8d727b7d41c1ee70722529ce45d SHA512 354d6372093e7ecedf95c43e8d203e9b2781ff7ecd81cd3920cb8c72a37463b47423ce7ab3c8233c0f031f2c024ac1ba5c8d442c80e6643722192fb9638e5d3a
 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-21.10.0.ebuild 3338 BLAKE2B a45906f684c33587ca42f00082f7ec413c5045d0ae1f19a563d68ef5b30d14b1f265c93a1f29d56833bfc43f21e09e5d91273feae4070e036ef805f7adf5212e SHA512 56ef6abe3f91ccc3d4578a9cc84644d96ab8ab357f7c4c3fcc0a8301cd0b859d0b4e733560ab88c5e060d78a282fffc57da97f5dfd71f75518fe50c8b5457810
-EBUILD poppler-9999.ebuild 3338 BLAKE2B a45906f684c33587ca42f00082f7ec413c5045d0ae1f19a563d68ef5b30d14b1f265c93a1f29d56833bfc43f21e09e5d91273feae4070e036ef805f7adf5212e SHA512 56ef6abe3f91ccc3d4578a9cc84644d96ab8ab357f7c4c3fcc0a8301cd0b859d0b4e733560ab88c5e060d78a282fffc57da97f5dfd71f75518fe50c8b5457810
+EBUILD poppler-21.11.0.ebuild 3338 BLAKE2B e4d5451cffda510fe65615af575175011627ef6116e822c00e8d2ac6c5dd50177ec14709f64fecbdde55562ac77cf895160d8a6239e254a3e9ee0e63058184f0 SHA512 821eb6517298d9f5a10fdf1aef8c6072f00ce7f5757cd2b41d8bad927ee44c95bd2f5ef0a13efe18484764fcf883b27364e128611aa0f9601dfe1bc427411fbb
+EBUILD poppler-9999.ebuild 3338 BLAKE2B e4d5451cffda510fe65615af575175011627ef6116e822c00e8d2ac6c5dd50177ec14709f64fecbdde55562ac77cf895160d8a6239e254a3e9ee0e63058184f0 SHA512 821eb6517298d9f5a10fdf1aef8c6072f00ce7f5757cd2b41d8bad927ee44c95bd2f5ef0a13efe18484764fcf883b27364e128611aa0f9601dfe1bc427411fbb
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-21.08.0.ebuild b/app-text/poppler/poppler-21.08.0.ebuild
deleted file mode 100644
index be72663ad68d..000000000000
--- a/app-text/poppler/poppler-21.08.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/112"   # 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"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-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 )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.04.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 [[ ${CC} == 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-21.09.0.ebuild b/app-text/poppler/poppler-21.11.0.ebuild
index 20065b9bb13c..337023d962c8 100644
--- a/app-text/poppler/poppler-21.09.0.ebuild
+++ b/app-text/poppler/poppler-21.11.0.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/115"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 2ca5838c2b0a..337023d962c8 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -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/114"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/115"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
deleted file mode 100644
index d9f143576969..000000000000
--- a/app-text/tidy-html5/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
-DIST tidy-html5-5.7.28.tar.gz 670474 BLAKE2B f1f030bda478f09f1786b34f62ac547249cbfe9d7d06aa7a3a07fb993ee64cf9911d04e4c487c9854e86493da08ef8ca5ee65faf0ce6473cd5914c74ad8c9251 SHA512 557cae0c00d581c9272649e0b3c143b70bc1941a59c497dd0b7266d70b3b2ff652dea075a855737d2d02ea58bb57d9403d61287c1ae40ec0281e7801991b57d7
-EBUILD tidy-html5-5.6.0.ebuild 622 BLAKE2B 365c2b9c65a461c6bd460d8a1a74071968c63576256b901fea5ed1a3b309a6ab5f0beb92029418aa938b2f61c1565e2e334f7b8d49a687c3a190297636f11e58 SHA512 819f2d445f0eef9ed960f72d714299b1fd8652e1389cda4d029eb8fe801405f1f27bb2349afeab57af995057b70707bf2f41441156da324b434c1b89c8a83f67
-EBUILD tidy-html5-5.7.28-r1.ebuild 657 BLAKE2B 56d93051d4a52625a04378a25a580a2c5becbe17054cc981e661266e5cb622109cb4409777643523cd4cad1626f3e1a6aaf37dd817e3e17d1f9ae8ae46b73e51 SHA512 742b207ab47895fe8f658a835ed7f8d7bc93c22f813877efae9d3f97314b409422b4644141475e3f4ce25a43255547be05406d0718d215cb38736dfa0a6e5b5c
-EBUILD tidy-html5-5.7.28.ebuild 629 BLAKE2B a439eab0e94c83d7ce3773c6517d13bb100444465c0c18ed22f48d5fe9bc93b8013ac46f629e8b43a1ab80418170973cd50e22925e55f0d493308645a397c486 SHA512 46bcf18c55ec48c715ec8ccbae7f8fa917d30e3f048b1fa878bd2fa93cd8be8590f171b99af4615c4c2e83cd65d862da59a01a554afced75675f84c6ad847025
-MISC metadata.xml 333 BLAKE2B ab8e7b19f5faee36ecdf53b1ff84745eca5de48a57ae7340e4ffcf41de8b1122954056731c3332149051258bd86fded7a59e59d2251ba69704a2a9d923ce275a SHA512 88610a32e62fcb5995d66f78060384f44825d65644da4fae79cba5e5f93bfa150767873b0864dc7317d7e84c563ba54e48f53cc7d15c448a65d4bbe3154380f8
diff --git a/app-text/tidy-html5/metadata.xml b/app-text/tidy-html5/metadata.xml
deleted file mode 100644
index 541e52bb72b7..000000000000
--- a/app-text/tidy-html5/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">htacg/tidy-html5</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
deleted file mode 100644
index e4bc1edc7095..000000000000
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
-HOMEPAGE="https://www.html-tidy.org/"
-SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="!app-text/htmltidy"
-
-DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild b/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild
deleted file mode 100644
index f3f78ced3cec..000000000000
--- a/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
-HOMEPAGE="https://www.html-tidy.org/"
-SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="!app-text/htmltidy"
-
-DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DTIDY_CONSOLE_SHARED=yes
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/app-text/tidy-html5/tidy-html5-5.7.28.ebuild b/app-text/tidy-html5/tidy-html5-5.7.28.ebuild
deleted file mode 100644
index 2ac01ddec292..000000000000
--- a/app-text/tidy-html5/tidy-html5-5.7.28.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
-HOMEPAGE="https://www.html-tidy.org/"
-SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="!app-text/htmltidy"
-
-DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 062a3c04b69d..99c402265a41 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,6 +1,8 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
+AUX xmlto-0.0.28-dont-hardcode-paths.patch 782 BLAKE2B 400e85b97d2683943279b2f88f87cd3074f575376a69ca068d29b35cce266351847f267b4039a640bf8c2aafca39b48dc0cfd997db6e1ed64b847524d117e25a SHA512 f621d70836db82e300473679d7a5f88e13886273de48d87a8e77b790641d0142e7cde02fd5fd3e5f37d363fe93000025ac3d7df6991b9c151f5700769ccd9da6
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 82f75b7468184f59b6b7edbecf2b9a9a06daf91c61f163f0c6501ea5ebb1cec4922d309f4bfb5962ec7192035dc9daa887aa967a1f46e88f390f478ea5565091 SHA512 88c76795131133792a8de0591b183682418e7c670b347276eab3bfc7f1c966d980d9d48de407bc0de746aa7ac5e0371bea5bb149c9a302984de042ed79a674f6
 EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
+EBUILD xmlto-0.0.28-r7.ebuild 1496 BLAKE2B 1169a22eb7e73831633e5cf73817a95c05b214cbfc846570392ce98e089fbacbe1c87f9383a39bb8f5e1981b08df7627ddac43095d6157e5f423fb5482721f9e SHA512 4cf19496ccf9ff462da5547d2df92edd80dde84c409ac594dc2187068c150cf7d074ebe84ba88b823e71f5c10e1208632a21061a7a9d545e9a9a62b3f135d0b8
 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
diff --git a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
new file mode 100644
index 000000000000..5823b7350749
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
@@ -0,0 +1,35 @@
+From: Sam James <sam@gentoo.org>
+Date: Wed, 10 Nov 2021 04:53:33 +0000
+Subject: [PATCH] Don't hardcode paths to utilities
+
+The path to e.g. links at build time is not necessarily
+the same as the path at runtime.
+
+TODO: Could chop out the checks from configure but
+this package is fragile enough. Leaving it for now.
+--- a/xmlto.in
++++ b/xmlto.in
+@@ -272,13 +272,13 @@ then
+   USE_BACKEND=DEFAULT
+ fi
+ 
+-LINKS_PATH=@LINKS@
+-W3M_PATH=@W3M@
+-LYNX_PATH=@LYNX@
+-GCP_PATH=@GCP@
+-SED_PATH=@SED@
+-GREP_PATH=@GREP@
+-ZIP_PATH=@ZIP@
++LINKS_PATH=$(command -v links)
++W3M_PATH=$(command -v w3m)
++LYNX_PATH=$(command -v lynx)
++GCP_PATH=$(command -v cp)
++SED_PATH=$(command -v sed)
++GREP_PATH=$(command -v grep)
++ZIP_PATH=$(command -v zip)
+ 
+ # Process any options
+ ARGS=$(${GETOPT} \
+-- 
+2.33.1
+
diff --git a/app-text/xmlto/xmlto-0.0.28-r7.ebuild b/app-text/xmlto/xmlto-0.0.28-r7.ebuild
new file mode 100644
index 000000000000..c54987d45d2f
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28-r7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+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"
+IUSE="latex text"
+
+RDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	|| ( sys-apps/util-linux app-misc/getopt )
+	text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
+	latex? ( dev-texlive/texlive-formatsextra )
+"
+# We only depend on flex when we patch the input lexer.
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+	"${FILESDIR}"/${PN}-0.0.28-allow-links.patch
+	"${FILESDIR}"/${PN}-0.0.28-dont-hardcode-paths.patch
+)
+
+src_prepare() {
+	default
+
+	# fix symbol clash on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# We don't want the script to detect /bin/sh if it is bash.
+	export ac_cv_path_BASH="${BASH}"
+	has_version sys-apps/util-linux || export GETOPT=getopt-long
+
+	econf
+}