gentoo resync : 29.01.2021

30 files changed, 102 insertions, 239 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9cb0e880b998..4244ccace658 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index cdb975dc73ff..4275506790ab 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,3 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.21.ebuild 1040 BLAKE2B 33cbe98d5fead501192276d369261c87d051dd10b09935c67f0df8e5b4608c371bc3cd77dd1f21be608ac4e50bdb19ebdbd4b711a137186171d2cf03b5af85c1 SHA512 1751d566f0965b9b5de0b294d974ae696ec267c6027eadea25377feff17190013293bb06168f7e3417616e5f9270f9825bc1893640e095f2654d258d9579e9a1
+EBUILD build-docbook-catalog-1.21.ebuild 1049 BLAKE2B f7c9c9c542e8705a70e44377cebdf73857557fd900ecc785bdf0a15e0b96e53ac14cd8b173097bb06527812a87adbfe9d9132350c4bdd0172a75cbd63e1ff946 SHA512 25597ab5211ef0bb3bc1125bcd9626d920c4e0a92229ff7551791d3b9c8f1d5dc84fd63c43a8d1b9625e16c4b53006d0cbb9e37c660d8d7f028d97c2f4a61dc0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index debf2a49806b..e742d2865f52 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="DocBook XML catalog auto-updater"
 HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
@@ -11,23 +11,27 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
+RDEPEND="
+	dev-libs/libxml2
+	|| ( sys-apps/util-linux app-misc/getopt )
 	!<app-text/docbook-xsl-stylesheets-1.73.1
-	dev-libs/libxml2"
-DEPEND=""
-
-pkg_setup() {
-	# export for bug #490754
-	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
-}
+"
 
 src_prepare() {
+	default
+
 	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
 	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
 }
 
+src_configure() {
+	# export for bug #490754
+	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+	default
+}
+
 pkg_postinst() {
 	# New version -> regen files
 	build-docbook-catalog
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index b0873338bd02..3a760372840c 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -5,5 +5,5 @@ DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
-EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5226 BLAKE2B 2b1d6f5835e87b87307337b062179b38742b8094b9e5bbef175c23b3799bfd1e7c10400e3f92e4e6d0f461ed7f26008822464429901ec1f077bcb4624e0a49aa SHA512 d81ce6ceb51cbce7d9fc5b61e19e2ea8825140d367bb7891046fdedee6cd2b1bda7fd96ed9468750426782765ff38f1bf47686e0a06e92fd6ace8e68fc588809
-MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
+EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
+MISC metadata.xml 764 BLAKE2B 671576c7e04062ade59bc49bfedcf642db7aa809e778bede37948486a2657cf69b3157ccec611257ec0fc09664b796408a0feb4ffcb456e967708b8480628956 SHA512 7eb765287556a16c9f15d19c69f8eb99ecffe5a2cda3d4acd8a5e90fae42bc5e9364d5aaf57810a1704bb5698f59498fd5d905094afe3f2ddfcac53e5458efcb
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild
index e201db027681..cdb280036d23 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild
@@ -22,9 +22,9 @@ if [[ -n "${MY_PATCHSET}" ]] ; then
 fi
 
 LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cups dbus gtk l10n_de static-libs unicode X"
+IUSE="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
 for X in ${LANGS} ; do
@@ -38,13 +38,13 @@ DEPEND="
 	>=media-libs/jbig2dec-0.19:=
 	>=media-libs/lcms-2.6:2
 	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/openjpeg-2.1.0:2=
 	>=media-libs/tiff-4.0.1:0=
 	>=sys-libs/zlib-1.2.7
 	virtual/jpeg:0
 	cups? ( >=net-print/cups-1.3.8 )
 	dbus? ( sys-apps/dbus )
 	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
 	unicode? ( net-dns/libidn:0= )
 	X? ( x11-libs/libXt x11-libs/libXext )
 "
@@ -142,13 +142,14 @@ src_configure() {
 		--enable-dynamic \
 		--enable-freetype \
 		--enable-fontconfig \
-		--enable-openjpeg \
+		$(use_enable jpeg2k openjpeg) \
 		--disable-compile-inits \
 		--with-drivers=ALL \
 		--with-fontpath="$FONTPATH" \
 		--with-ijs \
 		--with-jbig2dec \
 		--with-libpaper \
+		--with-openprinting \
 		--with-system-libtiff \
 		--without-luratech \
 		$(use_enable cups) \
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 61a1c44676ca..7fc1cdd53b9f 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -2,9 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
+	<maintainer type="project">
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
+	<slots>
+		<subslots>Reflect ABI of libgs.so.</subslots>
+	</slots>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id>
 		<remote-id type="sourceforge">djvu</remote-id>
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 25a251baa77d..309865c65857 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,4 +1,3 @@
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.5.2-r1.ebuild 690 BLAKE2B b5ba74597c21354fb0a52a7945497df8e942f1429d731b897b7792eb5e50033610ef7cc0353bd789a50c3035e56c10e536e8841a6fdef5653242670089d560de SHA512 f7f2dbf2a3c2e8edfd6c478d8e55691b931e5731b92a36e74430ad59756882ecb9c115e76694ba5cc515d28c38fcfbc1ad9dddfdc2a4836b5cc8aafa1b96003a
-EBUILD grip-4.5.2-r2.ebuild 798 BLAKE2B aff3c69e54c7ba0e12d1635fc7f19be3d77523880b80170e6bf48156bc22c13cdd481d047e2449ce974208fceb3409d3a89131b6960e00bddf5f2aea8f1ebaa7 SHA512 e9d167472601a29f352b5cfb9edb9057d7371fbc5611f70bfdcc9e73029069d634196551daaae9a2792cf4409b64af12cf8a26a73a60e3e0257485f41155a8a4
+EBUILD grip-4.5.2-r2.ebuild 797 BLAKE2B 24ce3ffd49c9345553e92435d69ffe4056c2f215754dd61965ad608cf04237b472e6b6065b45fa38c3b8c45ee22c91021b92f4cae1d4608f61b834cf22dc7812 SHA512 dbf618f1964463a1fedeb9229a489c45d07d713e69d58d19a97b21c87e6696161aba5abb6ebfa40f752363af6a88cbe46a611d7139da9fe32a13309cedce8544
 MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.5.2-r1.ebuild b/app-text/grip/grip-4.5.2-r1.ebuild
deleted file mode 100644
index 883099d1abd2..000000000000
--- a/app-text/grip/grip-4.5.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
-HOMEPAGE="https://github.com/joeyespo/grip"
-LICENSE="MIT"
-
-SLOT="0"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	!media-sound/grip
-	>=dev-python/docopt-0.4.0
-	>=dev-python/flask-0.10.1
-	>=dev-python/markdown-2.5.1
-	>=dev-python/path-and-address-2.0.1
-	>=dev-python/pygments-1.6
-	>=dev-python/requests-2.4.1
-"
diff --git a/app-text/grip/grip-4.5.2-r2.ebuild b/app-text/grip/grip-4.5.2-r2.ebuild
index 12692b8ffacc..bcc8bb3ea4c8 100644
--- a/app-text/grip/grip-4.5.2-r2.ebuild
+++ b/app-text/grip/grip-4.5.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
@@ -14,7 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index bf7393831171..d5b978fb3903 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,5 +1,5 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
 EBUILD highlight-3.57-r1.ebuild 2796 BLAKE2B 5f381d9e9fe5b6268e61c54e9abb5b67bf83d58caab1261f2c904d65ddda3455a5e0b453bb2c3a7a46461e28b2dc656c71c293064af1a15368d4205edc44faa4 SHA512 69646dd692daa9c7b458c489d77b8d372e7603b5a2809e3cdf49a55e5eb512e3f274054512da668f0dfdcb1c908dbc9a9da376f827259854dfb0d27f5b9ac7ee
-EBUILD highlight-3.57-r100.ebuild 2411 BLAKE2B 1c2e1bf90ec8614e7f15dc05ea0fbd8ce469ecb15f57d480ccf3c082a5b3213784a35adf95147de16b5993ad30f66cc2e4b7cb256626943f7a257974b3f887b4 SHA512 1516ac86f493d0fffd0e7d8de90d3ab044b7439bf68ec0cb7c1ccba19d255e1eb440b42a8505cf385973155badafa2fb1fc0bdebc76b018a544f52c145a80fac
+EBUILD highlight-3.57-r100.ebuild 2404 BLAKE2B 6fbfa8a99cb1f37104a3b865dba125bcf356240a6c55772ab7e69997fbc6a0ca57ca77238149ec3497b5fb194354f3787ff61622190eca6a03e93132a41b0092 SHA512 171cde8c66962d09b4be1f28c5409e680a535d3ec2b67dd12d0c99d90f9f04f4225b90ea97dd4788cf7fe4868ebdc4bcaedcef65ee8e10995d73b0e6b466e821
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
index 4755abe9c040..7cfbb9f2be8b 100644
--- a/app-text/highlight/highlight-3.57-r100.ebuild
+++ b/app-text/highlight/highlight-3.57-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 9f1d50a74104..501673f91237 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,5 +1,3 @@
-DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
 DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
-EBUILD htmldoc-1.8.30.ebuild 1111 BLAKE2B a5b0b23b01e65a7e525a7d2a078728d4a6e08f0c16659724c3a05d82c64a78261b90b82b14f4704b13745d324589311c28215a0bb982b52698a61c46c9e5e336 SHA512 809df0ddefdbd700eb51e7d23a81b24390f497a7592bd93b737ffd41416ae317ae6d5b3d1e83c29f0ebb667af49188037d87f98c1e7987e440751589080ae7b4
-EBUILD htmldoc-1.9.11-r1.ebuild 1380 BLAKE2B 79e277f05ef278ae821f7539d6fa34d976913e11050a19977c5246b83bbdaa6b845db1c9be80213aac2ff5e00ec7d84ef51d5729b9a33727e34f763972b45a21 SHA512 41f78a9c16e5325ab896d085abc2e6b290252ff0be9f5d96fa559743db3dff7dfb734c21260997aeb9dbb8b2495573a05ded4d6a273ef3f5bbeaff7b025bc6d1
+EBUILD htmldoc-1.9.11-r1.ebuild 1376 BLAKE2B b09aefd7605db06c5b429d2cb68ca9192c50ad2880c7fe07f7e307a1a7ae67489bf26a0e809b5ca3396b2968f8a69f265656c5eb1718811754e815abe93bdee7 SHA512 1c678bdcbd3e222caa8bb925365adc06ae237638d70b37a34243e286dab248951fd5ecdf4942bee62332a049241d089717de28d0e9b4e02e88343e2e18c0b3a9
 MISC metadata.xml 253 BLAKE2B 866785a39539e5da350fc5ce3c2039b8e906bb106c7eab83df24a7a66f576e530ade48e9d63e1115ff5cb55617da9bb615f164ffc46f5f16bb93055419d4229e SHA512 cc9791ffe80b6f6064de254903f73d298247a57455a3031fc089abdf5a291a0546e6d8f64fb7886ce5d543af487971149ccf68092a8418e25ed58feece9fc033
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
deleted file mode 100644
index cbff036765a3..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="https://www.msweet.org/htmldoc/"
-SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
-IUSE="fltk"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=media-libs/libpng-1.4:0=
-	virtual/jpeg:0
-	fltk? ( x11-libs/fltk:1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# make sure not to use the libs htmldoc ships with
-	rm -r jpeg png zlib || die 'failed to unbundle jpeg, png, and zlib'
-
-	# Fix the documentation path in a few places. Some Makefiles aren't
-	# autotoolized =(
-	for file in configure doc/Makefile doc/htmldoc.man; do
-		sed -i "${file}" \
-			-e "s:/doc/htmldoc:/doc/${PF}/html:g" \
-			|| die "failed to fix documentation path in ${file}"
-	done
-}
-
-src_configure() {
-	CC=$(tc-getCC) CXX=$(tc-getCXX)	DSTROOT="${D}" econf $(use_with fltk gui)
-}
-
-src_install() {
-	emake DSTROOT="${D}" install
-}
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index 0ae71c6d5922..f34baa19af19 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="fltk ssl"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index a565b4d901e0..f5b28e14e7ac 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,4 +1,6 @@
 DIST libodfgen-0.1.7.tar.xz 384760 BLAKE2B 93066e52c0651e3714843764f0d023178cf0ddb52c1185f085c70180f4123cd26d79b9ea2c211a82f2681c42c8795c3f062f081161effa7fe821b64b54b82cd8 SHA512 eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
+DIST libodfgen-0.1.8.tar.xz 386156 BLAKE2B 8cc55cd6ad39927ca1fec459cb484362877f0eb0a044d806a93ec573ca2d840fece17fdbb58b0b30869af945fe9ddaa23a88729c1802b2b1321d5551f94a32c5 SHA512 e4a15aa7f1db483cdbb9c531bfb234b4794890cc583c70e8aa3374771be8928e7917105d48dab80d1ab6d57e43fa78415097d9b897cb12fb2a609f4647ee99d6
 EBUILD libodfgen-0.1.7.ebuild 835 BLAKE2B 43fc3f7b2c4e7bad4d5e11fa8070e8b173c20956a5c22c51a8861982ab24194555840ce02fe9e83e64f4cb0b4947196d1818a88c8ace31d254e3e9f5efc9213c SHA512 067986c043c2e4966d25e3fd9722718c30a670cbdbdd6980b8d7ec6da604cfe5fd239d28dfe67a46bd0a1abc606d22749347ab777551c46be440a0a636f21160
-EBUILD libodfgen-9999.ebuild 838 BLAKE2B 0550b7d1cfeabb1d2224e7a6df1527c1ba4592d64de6724a4a81c97ed9cb65ea6eae573c93a1b9ec447da2d0940a7892e12f8af926b95dd2075635889b23aa0a SHA512 23ffdea142a61bdb48461ae73a883de8a51d7225fe016f41270c630301485b8140aba193bf8046a418ab2af3b8b05817cae1e8915694f266e78778e49c9a1d40
+EBUILD libodfgen-0.1.8.ebuild 863 BLAKE2B 60fa18c07806a0a8a09e68f0d6aa116eb637dc8df08b813ea17c6f360b5aab8a5c5522c72b6b3a567deacbe3f9eda4ead76043a5ed89438c5749a43040bb769d SHA512 008322ed33958c52ee33e5d902a3f01cd60875ee208a2292ebad92bd2e259b033131a1246b6d965afe922c2729919c7eea1db755feb441d3f169f5715d4d514b
+EBUILD libodfgen-9999.ebuild 863 BLAKE2B 60fa18c07806a0a8a09e68f0d6aa116eb637dc8df08b813ea17c6f360b5aab8a5c5522c72b6b3a567deacbe3f9eda4ead76043a5ed89438c5749a43040bb769d SHA512 008322ed33958c52ee33e5d902a3f01cd60875ee208a2292ebad92bd2e259b033131a1246b6d965afe922c2729919c7eea1db755feb441d3f169f5715d4d514b
 MISC metadata.xml 331 BLAKE2B 4bb9537b8eacb393e4dd38a4199d954aa12aa917f626ffd125cecb49c2fe4b4e866bc33c941323eae45c2b804fdadc1e7200a1dfe6f57472a5e1a7881bf68bc1 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d
diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild
new file mode 100644
index 000000000000..6c33ab30007c
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sourceforge.net/"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 03f14c4c7029..6c33ab30007c 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
 	inherit autotools git-r3
 else
@@ -13,12 +13,15 @@ fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
 HOMEPAGE="http://libwpd.sourceforge.net/"
+
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-
 IUSE="doc"
 
-RDEPEND="dev-libs/librevenge"
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2:2
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 4afbed5ec466..8e0795f8ac0c 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,5 +1,5 @@
 AUX podofo-0.9.6_p20190928-cmake_lua_version.patch 522 BLAKE2B b911b2ab2b35f5eccb58b32e575a775fe43cac1576831bb4e47d10c666a1e7040d8c01c865ee63ef1c3ff3c1a1feb2059dc25c71924b61995302dad21c32c868 SHA512 953f41b44468918aa96af42ecf3de8e3dd0d7721ed7c6283d8a6d44941caf70d9ef63d7d59ee1d94081fdc91a915ba8770bc335f8af5d60b24cd1f6c04698f6f
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
-EBUILD podofo-0.9.6_p20190928-r100.ebuild 4846 BLAKE2B b61750e756ecb2bc82bac3d5efdfbd04f1086956de60c982f9c75b4ad02eecd11de12c13bd791a03c345adc48a187eb8b4c9739317b506a55ae4121f51fe10d3 SHA512 d6f532ddf3f86d1ae9658b3b7468fc10022edf905ec8431c3e4f5c7bcac0f34cb9387b94e542b3f0dd303cb6fb7536f0138604bc05433a799488fba2eaa36c4d
+EBUILD podofo-0.9.6_p20190928-r100.ebuild 4842 BLAKE2B ddc2274791a3c42af1ec1fdff1e02797c755fe1db4a37f08ebbd4be44dda679811bdd1e97309c4dd8ffa96b3c3be53d87941777e726920b6514a8d31c7286d79 SHA512 ce64fc63bd56dcc9c207bf07288c0780683ba9504e1a22c26f57f4c8ba79f52e3bf601f08aec4e6deb5b14b8b50c0a6441b05dd788d4c9613e1ecfc78d32154e
 EBUILD podofo-0.9.6_p20190928.ebuild 4667 BLAKE2B 307406fc1d69c45c58bfbb812a12a9cbf07719161076a9ac21c46c9555efbaafe81b32c13fa1c743cb5f349b68d90cf506c3afda9944eb59d7736a609ada0fae SHA512 e56d71764c1fe8e50c417febc9d0a1a8f741378586957c43d152847b61f101f1ccba3bc515b3410fba1b423785e792ce9e0dbfb786010762a594420bf70ffbe1
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
index cf6bcc0de02b..722fcecb298b 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 454bdc38123f..77ef45b7c4ec 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,11 +1,5 @@
-AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
-AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
-AUX recode-3.6-recode.texi.patch 445 BLAKE2B d612b6b513908fdd7756cf3b0d8bf2730071d71acd91d330f32b149bb42fcdc2da353f00bd77e5d39d87abfce3ecb917b97c5471ceb79f6777778f36854fcd9d SHA512 bb25c3d36e77e415577518561f1c4060e923c0f2a992eaa4cf561cc27372820810e7bc8ae3db70dcbf20dc1ba7384370a51c6072a71b1a22c4b71d5a1369fcdb
-DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode-3.7.8.tar.gz 2230154 BLAKE2B 853a53d86a3a3600e5d70a8dc67bab9b0fa7a9dfab79e3f4ae8611f54c955802862689077774f7b21ce360f2d91c65ee238406ffa137a84545157e3a70853f42 SHA512 e6cd9c7d3eb5c179d3f62804018d1d19b71a3fae72b0d76aec730c36e64c50a571cbfda5340ac50244a16ccdd9265f5610deadb8908067c3866fa68cbbf0ac70
-DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1673 BLAKE2B fd3d0fcaf3ee85cd8a27f2f9ce203bbbd59a7c4ce31a9c4f7ceb58f12f4b0ff2b196ce236975bd6848b71e669765347a1b6757994b69d3e432fcc256f03a3f7f SHA512 644dd61fd3f6989d561aec93cbc44dc01c9293fff5845945564b5d22a2a57a8eb7c5f0505a31f39e404d8059e6002243091a0b62087d396894624cdb6326bee2
 EBUILD recode-3.7.6-r1.ebuild 1006 BLAKE2B 23141789d5bbcc6beabe28c9d45b29f9f0c984c5d8145351dff53cf73cf97192b6c022d74b864a5265d1b90eccf28e0dfdda7aea0d28ffeaf7923bce8655207b SHA512 4d598eacabba0db13ceee3101e738855f8f7bf5560dcfeb18f9bd11433c65c053cc2f79c36a63025297b6fa7309a23962d9340eb6bdeb7bcdcf1c80cc42bbcef
 EBUILD recode-3.7.8.ebuild 1306 BLAKE2B aed00a09f17165e8a0f5d491c3166a718a50fe8a6d7040716c809e46dc6c6ecb819c31d986aa1178d0e1b1be863c96d2712c84c017a6ad6e942b8ccbc7e676fb SHA512 b2eea5e29f2da46efc389b8b49c584144c40af5a40bc24ca0ce7b3879ce15db1953a1c79d5d33a90d0fc865bcf779082a89d8e174246dfbb2e1db43ee6628890
 MISC metadata.xml 430 BLAKE2B 2df5bd5e46e37f7e60a6064a2f13876bc190121189057c703d98354a24de68e49b3a67337bb10a43c419b777af014fc0238940b44ef812862da5eb2250a06a5e SHA512 796421baea5a32814112194ac554251426312280ecd1517076a1b73b4e21026cb149e294df50a00e0c4674066640d0f5fc9f650198cde5b1a44f8f1446715d3f
diff --git a/app-text/recode/files/recode-3.6-as-if.patch b/app-text/recode/files/recode-3.6-as-if.patch
deleted file mode 100644
index c7bcc27c8750..000000000000
--- a/app-text/recode/files/recode-3.6-as-if.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://bugs.gentoo.org/283029
-
---- a/m4/flex.m4
-+++ b/m4/flex.m4
-@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
- dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
- AC_DEFUN(ad_AC_PROG_FLEX,
- [AC_CHECK_PROGS(LEX, flex, missing)
--if test "$LEX" = missing; then
-+AS_IF([test "$LEX" = missing], [dnl
-   LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
-   LEX_OUTPUT_ROOT=lex.yy
-   AC_SUBST(LEX_OUTPUT_ROOT)dnl
--else
-+], [:
-   AC_PROG_LEX
-   AC_DECL_YYTEXT
--fi])
-+])])
diff --git a/app-text/recode/files/recode-3.6-gettextfix.diff b/app-text/recode/files/recode-3.6-gettextfix.diff
deleted file mode 100644
index 3b7eb8ba20e6..000000000000
--- a/app-text/recode/files/recode-3.6-gettextfix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/239372
-
-patch by Dmitry Karasik
-
---- recode-3.6/m4/gettext.m4
-+++ recode-3.6/m4/gettext.m4
-@@ -109,12 +109,12 @@
-     else
-       ac_items="$LINGUAS"
-       for ac_item in $ac_items; do
--	case "$ALL_LINGUAS" in
--	  *$ac_item*)
-+        for supported_item in $ALL_LINGUAS; do
-+          if test "$ac_item" = "$supported_item"; then
- 	    ac_print="$ac_print $ac_item"
- 	    MOFILES="$MOFILES $ac_item.mo"
--	    ;;
--	esac
-+          fi
-+        done
-       done
-     fi
-     AC_SUBST(MOFILES)
diff --git a/app-text/recode/files/recode-3.6-recode.texi.patch b/app-text/recode/files/recode-3.6-recode.texi.patch
deleted file mode 100644
index bb5b1bcc274d..000000000000
--- a/app-text/recode/files/recode-3.6-recode.texi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/recode.texi	2020-06-23 07:43:20.959074594 -0000
-+++ a/doc/recode.texi	2020-06-23 07:43:32.262338563 -0000
-@@ -3713,7 +3713,7 @@
- between HTML and various other charsets.
- 
- Here is a list of those HTML variants which @code{recode} supports.
--Some notes have been provided by François Yergeau @email{yergeau@@alis.com}.
-+Some notes have been provided by Francois Yergeau @email{yergeau@@alis.com}.
- 
- @table @code
- @item XML-standalone
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
deleted file mode 100644
index d68206176512..000000000000
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE="1.11" # bug 419455
-
-inherit autotools eutils flag-o-matic libtool toolchain-funcs multilib-minimal
-
-MY_P=${P%_*}
-MY_PV=${PV%_*}
-DEB_PATCH=${PV#*p}
-
-DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
-SRC_URI="
-	mirror://gnu/${PN}/${MY_P}.tar.gz
-	mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.debian.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 ~x86-solaris"
-IUSE="nls static-libs"
-
-DEPEND="
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# fix #571106 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	rm "${WORKDIR}"/debian/patches/series || die
-	epatch \
-		"${FILESDIR}/${MY_P}-recode.texi.patch" \
-		"${FILESDIR}/${MY_P}-gettextfix.diff" \
-		"${FILESDIR}/${MY_P}-as-if.patch" \
-		"${WORKDIR}"/debian/patches/*
-	sed -i '1i#include <stdlib.h>' src/argmatch.c || die
-
-	# Remove old libtool macros
-	rm "${S}"/acinclude.m4 || die
-
-	eautoreconf
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# on solaris -lintl is needed to compile
-	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
-	# --without-included-gettext means we always use system headers
-	# and library
-	ECONF_SOURCE="${S}" econf \
-		--without-included-gettext \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -exec rm -v {} + || die
-}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 1f0cbada38bd..efe9e87639ad 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,6 +1,6 @@
 DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
 DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de
 EBUILD scdoc-1.11.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
-EBUILD scdoc-1.11.1.ebuild 1185 BLAKE2B 461515e1fe30b3c6213e9d58c9d005ba3a8866c493a90785b6907a30d3ba2dc819122ed44a79c38d11141ec4df14edb56e998a469776e0cb619db26ba838c37b SHA512 f740888fa375d7ee55730b3ed099ff3f233e88f0d8f80deb8ce063f717ab1dc9eb7df945aef834b026aa2fa9243b9a2658b6015683213ec08b914ed20f9ed7ab
+EBUILD scdoc-1.11.1.ebuild 1190 BLAKE2B ad23f7d61db3cc4a223e9dd192dbf90c77a55dde5a61b172e89582b939df6a4051c7ca616e9a72a4ae4a8bbf28c83099ab4c8d4b612f4894b01c8ac95fcd9350 SHA512 7346bdd524f6a04bc39d554a4b73aa6138489302e4fc31aa8a463008c1ec3274527fd432e6fe01ed8d8a17074d575b60c01860c27522112bd7d37a44a43a1e38
 EBUILD scdoc-9999.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
 MISC metadata.xml 422 BLAKE2B ec662d4bd34390be05318e8816524f206decf6e3cf97ee6e132405a7a2bdd33839b5b82e8083bd3fedc8d390871275ecc9490252cdeb883994e35d511cb8b7d4 SHA512 09dc27076a9ffd2c3f94b40b9df84cbb02317dee7235cb0ce358890c93667dacfc3a7adfe09cf949b8f63970983a7ed7ff654a9ec290b58c6f4ac6b05f9579e1
diff --git a/app-text/scdoc/scdoc-1.11.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild
index cb6340289500..8c4bd7440b60 100644
--- a/app-text/scdoc/scdoc-1.11.1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index fb3f3e21698c..2d96fcc15e2b 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -3,5 +3,5 @@ AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d41442
 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 1056 BLAKE2B 9c02924e068469f1d1a8d25d255f2c51865405a8b2eb342c2f0e01773fbee6d846c153721c9dafc1a3dba53d669c32c46cb73737a5360ecadce4b0240d8b83b9 SHA512 e55a53f40063e1797485161b6eb957fb8325bd661062a9b4bf55ac24bd164e135a9439ccd7ad311428e493abcd621e9930826e12888f197e7ef111fec446456e
+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/sword-1.9.0-r1.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild
index 2b00098f030a..e07a03691560 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 85eb096a38ae..7969927deaff 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -7,5 +7,5 @@ EBUILD xapian-omega-1.4.14.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6
 EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 EBUILD xapian-omega-1.4.16.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
-EBUILD xapian-omega-1.4.18.ebuild 1161 BLAKE2B 744676b9a717d1c3959fc0d1b896a95e1d6bf5004f141fb46445f3053df7813d3da20abf9bf59246e4e4bdc03af74a76ae573e7821043227d256f72bc05e5cd5 SHA512 76d476db67cb3f0f35c3e8465126aaf3e9be968d1a5e480318864d5c1d69333af2aef1125cb7b1e8cb53bb697543e91cee721265b724f5c778dd492ec4ee30ce
+EBUILD xapian-omega-1.4.18.ebuild 1169 BLAKE2B 5466a3404b1a84d9c4e6b55c4cd5ade7148d3655dc5586b2e15902a1b64b3958cb246376aa2cedc5ceef711b8577484044523b7cb8bb1d4b802354e84b77f399 SHA512 baded5aa583a65c65969eec5355e47a77da16740f2b29dfb88fee53e6b4bbe07d8a80e152ff378feddfe21306b296e7d5ff5f5a5ed84fe7eb95ceaa6b7ac8672
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild b/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
index 5225e3e64c6c..6623cc6dbeba 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="dev-libs/xapian:0/30
+DEPEND="~dev-libs/xapian-1.4.18:0/30
 	dev-lang/perl
 	dev-libs/libpcre
 	sys-libs/zlib"