gentoo resync : 27.03.2021

28 files changed, 112 insertions, 381 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 95cc87b64971..c99eb77a6480 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asa/Manifest b/app-text/asa/Manifest
index c4f4894854a9..5842a9c5dfb1 100644
--- a/app-text/asa/Manifest
+++ b/app-text/asa/Manifest
@@ -1,3 +1,3 @@
 DIST asa-1.1.tar.gz 9893 BLAKE2B 72bdaef2652f9420c310d9fbcb632a12e021d7c6d2faa0b71d25a6db6a1f697ff3c5fa5df78bf127f29ef72dc98eb06c0cd5c038912c455b5a5024d7566b826c SHA512 70452783da23929d9a02cdf9cefd7403698fc8ae703ee5403dd84834b3ac39febf1edc02cb59b233cbdf51cd2f8c04922a77833dd8d851e2106de2e2fe444728
-EBUILD asa-1.1-r1.ebuild 582 BLAKE2B da2d5e70875440144286591afeefa5b6306affda921a0ab475898a8cc43debd8949e73872abeffe800eac68b61024afd5954d9912243669c8625fea73a67aeb4 SHA512 c8a99e085e4cc2ba763c7fe93c71476f66e7c1b9ce5e61418b79e8b784f117e4c69f4c36bb42a1ac93ece6ab53c3665197f626939963c918b94f9551e0a2edf1
+EBUILD asa-1.1-r1.ebuild 584 BLAKE2B 60af67a55d8a664f7259f9c9ee0b9b2fe9425bd3fed37093b3d6df3069bb6148c8694b99d125c65103e62b6815131e80c8adabcc19fee44f1dd2d2e16f55995c SHA512 773cadd6157ab263786ad8783c5f74c8f5ddc81713c5b97f4ded58a75631cc4862dc3fac7553825781f0febfd17ca67df5aa037fb3a2e4ac56c755ef7cec3e7c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/asa/asa-1.1-r1.ebuild b/app-text/asa/asa-1.1-r1.ebuild
index 83a488a04c1c..64afb7597cb3 100644
--- a/app-text/asa/asa-1.1-r1.ebuild
+++ b/app-text/asa/asa-1.1-r1.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="ASA Carriage control conversion for ouput by Fortran programs"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/devel/lang/fortran/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/devel/lang/fortran/${P}.tar.gz"
+HOMEPAGE="https://www.ibiblio.org/pub/Linux/devel/lang/fortran/"
+SRC_URI="https://www.ibiblio.org/pub/Linux/devel/lang/fortran/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE=""
 
 src_prepare() {
+	default
+
 	sed \
-		-e "s:-o:${LDFLAGS} -o:g" \
+		-e "s;-o;${LDFLAGS} -o;g" \
 		-e "/^CFLAGS/d" \
 		-i Makefile || die
+
 	tc-export CC
 }
 
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 4275506790ab..c0bb35677dd6 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 1049 BLAKE2B f7c9c9c542e8705a70e44377cebdf73857557fd900ecc785bdf0a15e0b96e53ac14cd8b173097bb06527812a87adbfe9d9132350c4bdd0172a75cbd63e1ff946 SHA512 25597ab5211ef0bb3bc1125bcd9626d920c4e0a92229ff7551791d3b9c8f1d5dc84fd63c43a8d1b9625e16c4b53006d0cbb9e37c660d8d7f028d97c2f4a61dc0
+EBUILD build-docbook-catalog-1.21.ebuild 1046 BLAKE2B be8bc32f58722ad67f4599bef10e847b75d43068c03c2be0ecfa6d8598f04cf73dea0e1c15b9be3b248bc9f19135d42f55990adecf28b4b9f4c98afe4b76e276 SHA512 4762c79b15b211e3afc0bf0389deada685b538334d5b05413d6c782f7292cac7d12a7e81b38d74ade14299523fd964389f27adf5e76ca413b8640da53171693f
 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 e742d2865f52..00efd553725c 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="DocBook XML catalog auto-updater"
-HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
 SRC_URI="mirror://gentoo/${P}.tar.xz
 	https://dev.gentoo.org/~haubi/distfiles/${P}.tar.xz"
 
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 6d14b719eb0b..594e9eaf6c38 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
 DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1924 BLAKE2B ba0be106829b14815f4403763d1dd7398b731723f02f729d6dd1fd99bddb96f6b611046952e2879f16de46a388eaea910334a2f6ab5d0fe32bb48429b68af53f SHA512 fb70def20b6f1ef231d7c23b51a1891f63edaedf876346f1cc729189aaf51157882e581da46cb78a47aa40257dc277d265bcb22f3681e707da840d80958cd587
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1925 BLAKE2B 656a3a1d6a296cb911a76ac7a607633e7cd0787cfed2369f2e4f14ed98aa739a13698dab5928ee77db4de653e8f4609a160ac5aff6dbd594638e76738a2e714f SHA512 2632966c042420b28a96f4510164e501b471896d6d0dd42575e89b8f2ba29b7da9bf6e05cf717225fc027cbdfdbaabd9646ed750d0bd7e03db1910eb334484d4
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
index 70bce93bbeab..a0119126f7ec 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome2 multibuild python-r1
 
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index b34ca79aafd3..916452430323 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,7 +1,6 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
 DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e871e21eacef88416f98226046e99a2a0a27c3354119715f320df1653ad7065c1c9a4a23b3081971df4d72c6fa19c SHA512 e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b
-EBUILD highlight-3.57-r1.ebuild 2797 BLAKE2B 58e774538015b0a194f6ecc7704b65f33ece3163f3e27d63aa32bdcfd12c3d4a2cce678f723f97e6d77ee73f6465f1e1bf1aff3e1f0ea77bf5e43cac5e03389b SHA512 4799a93b1588e7392f2953579f71ffdadb37e3d5caa8fee686dc2f204d1bdc1cda9c17219eff8c81482925ee2b2a3b0445f45c30cb951323af2b55cbbecb91fc
 EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 EBUILD highlight-3.60.ebuild 2411 BLAKE2B f54d453c059429ff41b94df35d81dba0c790a0217da0587bb031e4fd19f4cc05259514100987b5685d4596c1d498c2e9cbe043819d2211b9e8b993822e666d3b SHA512 5cbd35e733755c4bc11fce2f830bcf848fbf30b0822dc6ed271642177c72581ee7a20b491933627dc70c3de8640715079b81b6f7b32e36abb05102c9ef7ab6b5
 MISC metadata.xml 330 BLAKE2B 3e7c157a3d1763cb2b5c6c65a9259c03ac3863056d55ddb6eddbb76e66f98bcd11f87a04ddae616657f88e0a6b1f7bab0d028b97c8b0091ab8daa9e8fb5bc70a SHA512 3b6739ebce190bd586ad2e1657460b3540ae5056f2f90fdeb68121da3215e32dc382a1e965038968ec23f0c46d4626231f1e261aa7aca184dc8e08d80a82a681
diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild
deleted file mode 100644
index f72d80ed7772..000000000000
--- a/app-text/highlight/highlight-3.57-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils toolchain-funcs
-
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-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"
-IUSE="examples qt5"
-
-RDEPEND="
-	|| ( dev-lang/lua:0 dev-lang/lua:5.3 dev-lang/lua:5.2 dev-lang/lua:5.1 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-myhlopts=(
-	"CXX=$(tc-getCXX)"
-	"AR=$(tc-getAR)"
-	"LDFLAGS=${LDFLAGS}"
-	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
-	"DESTDIR=${D}"
-	"PREFIX=${EPREFIX}/usr"
-	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
-	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
-	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
-	"conf_dir=${EPREFIX}/etc/highlight/"
-)
-
-src_prepare() {
-	default
-
-	# disable man page compression
-	sed -e "/GZIP/d" -i makefile || die
-
-	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
-		-i src/core/datadir.cpp || die
-
-	# Use the correct pkgconfig name for Lua
-	# Upstream codebase supports up to and including Lua 5.3!
-	if has_version 'dev-lang/lua:5.3'; then
-		LUAPKGCONFIG=lua5.3
-	elif has_version 'dev-lang/lua:5.2'; then
-		LUAPKGCONFIG=lua5.2
-	elif has_version 'dev-lang/lua:5.1'; then
-		LUAPKGCONFIG=lua5.1
-	elif has_version 'dev-lang/lua:0'; then
-		LUAPKGCONFIG=lua
-	else
-		die "Could not detect Lua version"
-	fi
-	einfo "Using pkg-config ${LUAPKGCONFIG}"
-	sed -r -i \
-		-e "/^LUA_.*pkg-config/s,\<lua\>,${LUAPKGCONFIG},g" \
-		"${S}"/extras/tcl/makefile \
-		"${S}"/extras/swig/makefile \
-		"${S}"/makefile \
-		"${S}"/src/makefile \
-		|| die "Failed to set Lua version"
-
-	# We set it via eqmake5, otherwise it forces clang...
-	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
-		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
-		-i src/gui-qt/highlight.pro || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/gui-qt > /dev/null || die
-		eqmake5 \
-			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile "${myhlopts[@]}"
-	if use qt5 ; then
-		pushd src/gui-qt > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake -f makefile "${myhlopts[@]}" install
-	if use qt5; then
-		emake -f makefile "${myhlopts[@]}" install-gui
-		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
-	fi
-
-	if ! use examples ; then
-		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
-	fi
-}
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index ac282af098e5..24eccc28e9e3 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,5 +1,5 @@
 DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
 EBUILD lcdf-typetools-2.106.ebuild 853 BLAKE2B acb7103b146925009b3e9b0d48cc3c28b47cec11cbc1a95769c79e908934d7f3755697dae11cbedd169a34e25f54b937009af6bed6eaaded1aca9da156399910 SHA512 d85c7af83d30ac65b2aee65fcf057e950a41e62bcd4e73f7b2b1cba1044c678232b8db3b616438af97cb1563627bdd2f10f361567e3da42a35a3b9dcbd550d70
-EBUILD lcdf-typetools-2.108.ebuild 859 BLAKE2B 5bef7e0d7cba6432f90026502ad1bf9b599cc926e6682d71d05e4eda9486437ae38340f4f9882e1a3fc8402d1314599e42843929ba3c6ca1eebf884429b882ad SHA512 13250fcc28d710c2b8462d3918bf1e2b4e12ced6ac46e11c25a6ed7b673244f4281f2302a5717735cbbdeab505c3a44c5fe4b480b38c9e4d189383db97717d52
+EBUILD lcdf-typetools-2.108.ebuild 850 BLAKE2B ad1f8d6d2a1247a5109a5dcb63c780fd7e5e9d2236aa35fee82350838909fc7fd582e531135bc67818bae22751abf64c01b7faf20e8c8bbacb319b2bb3356628 SHA512 bd65ed23271d55f8a0e807072535c46f6c240eac36fb82c6f35d12ac0b9903a28480353be6b4100a950fe6605660417d70edf0c413c135263eecd162da8fda9e
 MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
index ea6d68087c1a..c83aaa454cd3 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
+HOMEPAGE="https://lcdf.org/type/#typetools"
+SRC_URI="https://lcdf.org/type/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+kpathsea"
 
 RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	use kpathsea && has_version 'dev-libs/kpathsea' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
 	econf $(use_with kpathsea)
 }
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index bc209fc8d900..0023287af477 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -7,5 +7,5 @@ AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799
 AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.18.0-r3.ebuild 4203 BLAKE2B ef284a8c1fc030e1bf14eada0a7cad0ff329a3192b3fabb901cba04549fc0e5cd9bd3b45c0b72c5c11f3d4cfc36be40814af7d11117abd5496de7257c25e4da0 SHA512 2c4138f9a512341b3f9de4122b92e239d8149f017617007cd50eafa807665ad3e0bd9da0d92c36fdc651725a4ca418fa8852a6c54bec56e124a72b6a181e88a3
+EBUILD mupdf-1.18.0-r3.ebuild 4204 BLAKE2B 830de2bc9308efbe316af379c226f011c48318130094e7e3766ffb883b86b522712d7f094948cce82b7a18e4e25a8e66ba532a1146b7d28d0b30a6d15a02df4b SHA512 ab4f14683ef92059f40ac96dc44cbe198c5e09ecef4c15b3a1c714d7fb3086c2965de578bea18917fd8cfe03a5b71b3edbe668629b18dfe80487410836c14070
 MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/mupdf-1.18.0-r3.ebuild b/app-text/mupdf/mupdf-1.18.0-r3.ebuild
index 72d2fde1d19e..21ae5eb3fcf4 100644
--- a/app-text/mupdf/mupdf-1.18.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}-source"
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86"
-IUSE="X +javascript libressl opengl ssl"
+IUSE="+javascript libressl opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of
@@ -37,7 +37,8 @@ RDEPEND="
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
-	)"
+	)
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -112,11 +113,11 @@ _emake() {
 }
 
 src_compile() {
-	_emake XCFLAGS="-fpic"
+	_emake XCFLAGS="-fPIC"
 }
 
 src_install() {
-	if use X || use opengl ; then
+	if use opengl || use X ; then
 		domenu platform/debian/${PN}.desktop
 		doicon platform/debian/${PN}.xpm
 	else
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 058f3fd343b4..1e116d254d25 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,8 +1,4 @@
-DIST pdftk-v3.0.0.tar.bz2 546821 BLAKE2B 1d1935322f1468d9e2e8044e748fbb816e399599e445e078866d416d5e99866739134fb794ff42dbfcc37271d66655440f706db46f152722ab7030cba16edf38 SHA512 3b487f7532140366c9ac41222cd366d387b93e67aada845772f60ff20601e25611e34a190a65fbcec9d776a0b5683100fdd54453357bf7c43cebea7dda0c6229
-DIST pdftk-v3.0.8.tar.bz2 1147182 BLAKE2B 3832445eca456c4880dfe0eabab50be0b8e53acee1eb67c871c3c6b6d44d723869662fcb9cbb28acb7847c11be2d3d456b7bca5a18e4ea6069d73717986771ca SHA512 1b7f8b07e97877fe3a7ff42f425da5b1fdf1397f7abf88ef06c5033a3b849f03fed89f02f15c770bcd581537a7b5442e5693a93ff903efc9588ed60e85cdcdc3
 DIST pdftk-v3.2.2.tar.bz2 1245439 BLAKE2B ac1991e60ad06308cb7be1e74f9b3772c80416e490fe525e806efb6d30c6bbc9d310b98c255ef9e3eb3f814541d7388140210c4df2b694bd4a9ee325c27b3f24 SHA512 03220ac3036098768dd4250bbfeb6675561e9126697b99703ab5788b2cee7551256c301d9191745c5fdedf429056b46641351d1fb92631ef17673d7e740c5431
-EBUILD pdftk-3.0.0.ebuild 904 BLAKE2B 1639a85321d6fe453d7b16c9c6bb3d4becda977a6cf624feff4abc3aa3964c05eed4ce22c8f74f54c5f1a1edc3ec14c0198d71f0f725482f518f8efc18c52357 SHA512 f0866fb18062a9e7110a7f654747be14f3ebc58a9f20a6bd32fd591851096bac0b5ee33c04b648ec412744b2dcf7e30062696c329d305109a3d1706aa8a2b57b
-EBUILD pdftk-3.0.8.ebuild 895 BLAKE2B 3a609096f8507a832952aff28bde0c668b40294dc85c7c2af84355fb610b954f0d73d0a1ad718055aad8339ad1698c6cb7d6b97f1d90b19beb2c76570b5c2b2b SHA512 36e768c17cd479d0a8d00d10c7de5598cdcc82939fb3460949315ebdd3aadf67f52293eca53dd8a3e69f3c5284eb30931b7158cbd59ea97dd8fc9be6f55fff98
-EBUILD pdftk-3.2.2.ebuild 895 BLAKE2B fbfcf5e64c6c2096316ff31cb34fed7d1aa5ecb5c201e7cdf4986a0f15e70f5e976153c822a00c5f107c73dd74117d30d274f41be31c49efc8c01413c24d1ee2 SHA512 87b5b60061859e0edd11c50e5bafafe5a946b90bbca0475c75b9ed77cceb79362e3464e020048f4833d4a3481743c78d71a28586255bbc9f7d93a265bdf53f37
+EBUILD pdftk-3.2.2.ebuild 894 BLAKE2B 251c4f945e0a818f1db0c2e5043db5cf2abfb7d6595bdff4888f6a24cdfcd44d6f8e783a496ae96a673065c79927d44593774eb87c8c1a66058c0b0992cc36e5 SHA512 590422bcaf897d40412b8c45f245a93062d878196e953e058038eedf1b37443a6c9481fef2c35bf3b83542382939702cae2e0decdb610cd61c5e5361b8efe9a0
 EBUILD pdftk-9999.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
 MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/pdftk-3.0.0.ebuild b/app-text/pdftk/pdftk-3.0.0.ebuild
deleted file mode 100644
index 1f8c20acf72c..000000000000
--- a/app-text/pdftk/pdftk-3.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="gcj-free version of pdftk written in Java"
-HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
-else
-	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="amd64 ~x86"
-	S="${WORKDIR}/pdftk-v${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-JAVA_PKG_STRICT="yes"
-EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-CDEPEND="
-	dev-java/bcprov:0
-	dev-java/commons-lang:3.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.7"
-
-src_install() {
-	java-pkg_newjar "build/jar/pdftk.jar"
-	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
-	doman "${PN}.1"
-}
diff --git a/app-text/pdftk/pdftk-3.0.8.ebuild b/app-text/pdftk/pdftk-3.0.8.ebuild
deleted file mode 100644
index 21f0c92265ce..000000000000
--- a/app-text/pdftk/pdftk-3.0.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="gcj-free version of pdftk written in Java"
-HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
-else
-	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}/pdftk-v${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-JAVA_PKG_STRICT="yes"
-EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-CDEPEND="
-	dev-java/bcprov:0
-	dev-java/commons-lang:3.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.7"
-
-src_install() {
-	java-pkg_newjar "build/jar/pdftk.jar"
-	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
-}
diff --git a/app-text/pdftk/pdftk-3.2.2.ebuild b/app-text/pdftk/pdftk-3.2.2.ebuild
index 493a76696305..b21ad2a678f4 100644
--- a/app-text/pdftk/pdftk-3.2.2.ebuild
+++ b/app-text/pdftk/pdftk-3.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
 else
 	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 	S="${WORKDIR}/pdftk-v${PV}"
 fi
 
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 8e0795f8ac0c..f5791a8b4642 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,5 +1,4 @@
 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 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.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
deleted file mode 100644
index 7d7ba64de6f6..000000000000
--- a/app-text/podofo/podofo-0.9.6_p20190928.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-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"
-IUSE="+boost idn libressl debug test +tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tools )"
-
-RDEPEND="dev-lang/lua:0=
-	idn? ( net-dns/libidn:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/fontconfig:=
-	media-libs/freetype:2=
-	virtual/jpeg:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	boost? ( dev-util/boost-build )
-	test? ( dev-util/cppunit )"
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
-	cmake_src_prepare
-	local x sed_args
-
-	if use libressl; then
-		sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
-			 -i tools/podofosign/podofosign.cpp || die #663602
-	fi
-
-	# bug 620934 - Disable linking with cppunit when possible, since it
-	# triggers errors with some older compilers.
-	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
-
-	# bug 556962
-	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
-		test/unit/EncryptTest.cpp || die
-
-	sed -i \
-		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
-		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
-		CMakeLists.txt || die
-
-	# Use pkg-config to find headers for bug #459404.
-	sed_args=
-	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
-		[[ ${x} == -I* ]] || continue
-		x=${x#-I}
-		if [[ -f ${x}/ft2build.h ]] ; then
-			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
-		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
-			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
-		fi
-	done
-	[[ -n ${sed_args} ]] && \
-		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
-
-	# Bug #439784: Add missing unistd include for close() and unlink().
-	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
-		test/unit/TestUtils.cpp || die
-
-	# TODO: fix these test cases
-	# ColorTest.cpp:62:Assertion
-	# Test name: ColorTest::testDefaultConstructor
-	# expected exception not thrown
-	# - Expected: PdfError
-	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
-		-i test/unit/ColorTest.h || die
-
-	# ColorTest.cpp:42:Assertion
-	# Test name: ColorTest::testHexNames
-	# assertion failed
-	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
-	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
-		-i test/unit/ColorTest.h || die
-
-	# Bug #352125: test failure, depending on installed fonts
-	# ##Failure Location unknown## : Error
-	# Test name: FontTest::testFonts
-	# uncaught exception of type PoDoFo::PdfError
-	# - ePdfError_UnsupportedFontFormat
-	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
-		-i test/unit/FontTest.h || die
-
-	# Test name: EncodingTest::testDifferencesEncoding
-	# equality assertion failed
-	# - Expected: 1
-	# - Actual  : 0
-	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
-		-i test/unit/EncodingTest.h || die
-
-	# Bug #407015: fix to compile with Lua 5.2
-	if has_version '>=dev-lang/lua-5.2' ; then
-		sed -e 's: lua_open(: luaL_newstate(:' \
-			-e 's: luaL_getn(: lua_rawlen(:' -i \
-			tools/podofocolor/luaconverter.cpp \
-			tools/podofoimpose/planreader_lua.cpp || die
-	fi
-}
-
-src_configure() {
-
-	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
-	filter-flags -fvisibility-inlines-hidden
-
-	mycmakeargs+=(
-		"-DPODOFO_BUILD_SHARED=1"
-		"-DPODOFO_HAVE_JPEG_LIB=1"
-		"-DPODOFO_HAVE_PNG_LIB=1"
-		"-DPODOFO_HAVE_TIFF_LIB=1"
-		"-DWANT_FONTCONFIG=1"
-		"-DUSE_STLPORT=0"
-		-DWANT_BOOST=$(usex boost ON OFF)
-		-DHAVE_LIBIDN=$(usex idn ON OFF)
-		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
-		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
-		)
-
-	cmake_src_configure
-	mkdir -p "${S}/test/TokenizerTest/objects" || die
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/test/unit || die
-	./podofo-test --selftest || die "self test failed"
-}
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index b927eb09d7e9..16f2356b225c 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1,3 +1,5 @@
 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.ebuild 629 BLAKE2B a439eab0e94c83d7ce3773c6517d13bb100444465c0c18ed22f48d5fe9bc93b8013ac46f629e8b43a1ab80418170973cd50e22925e55f0d493308645a397c486 SHA512 46bcf18c55ec48c715ec8ccbae7f8fa917d30e3f048b1fa878bd2fa93cd8be8590f171b99af4615c4c2e83cd65d862da59a01a554afced75675f84c6ad847025
 MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
diff --git a/app-text/tidy-html5/tidy-html5-5.7.28.ebuild b/app-text/tidy-html5/tidy-html5-5.7.28.ebuild
new file mode 100644
index 000000000000..2ac01ddec292
--- /dev/null
+++ b/app-text/tidy-html5/tidy-html5-5.7.28.ebuild
@@ -0,0 +1,25 @@
+# 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/vilistextum/Manifest b/app-text/vilistextum/Manifest
index aa22fb41194a..f0aec7561ede 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -15,5 +15,5 @@ DIST vilistextum-2.8.0.20191023.tar.gz 219395 BLAKE2B 5e3962b4b18b9e6e3896f26e04
 DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917
 EBUILD vilistextum-2.6.9-r1.ebuild 1795 BLAKE2B 3a9b4d9462338f2524f649aedb4945012c093f7275f3a9ee1f5852f049318ac06634c74362f6eddae65cca4e339aff8d87801b18628785f3c72b6eba794b983c SHA512 ce2733938218ede9fc6577567887cc9d6d6668ee04a1c077ad125ddc4f3db263cf96d863ff9402a3200370d10552bbf5a21433aa72746c034fda5e337c545697
 EBUILD vilistextum-2.8.0.20191023-r1.ebuild 2042 BLAKE2B 43f180fa1d9526d2b86d33512195ca3601808bd82cbbf9ec4f6bcf19c1b00edd30cf05a148070fdbe455dd851da0ebe84b27b6715e0f702518eed32364803bf9 SHA512 b68a906d38a98ea2a69d1d1eead9588f181a118c83ea84a6ae05d768b54d29718af2b8549e6ed98b45064b1e0ea6b45bf8b7258d61e6baf7a5314b4523b2fa56
-EBUILD vilistextum-2.8.0.20200411.ebuild 2072 BLAKE2B 5f2a8e4838deb1216f89d15c0652c78e9c9e46684345a46299e1f7a2a8c107e66b2b34b1af37d2f831a6488f1b01dd10263b2f7cad7e670eb45f667f6d80532d SHA512 6301cab1fb083038645a4a71c46cf1a2bc0ebfde46421a08a8cfabec73a847461fc4027cc89008f3b7a6ca1654f64d577032a5f4457a8bb53acceedebbcc8ccf
+EBUILD vilistextum-2.8.0.20200411.ebuild 2070 BLAKE2B d379fafb8e698a88aaa526d05ced264f3e0299c37e7255c96c951da3dd0e45fcadffb07b4503f2944dfcb5c0e0aba051bb2283a3c64b8371d224b815e68434b2 SHA512 097d99abbd9d5344143d5177d4bbb4ae0d19f51f29ab4fd08344d986fcca09506769c975a6a3babc9a50fb1455d8c1f65eb3065ae2baaacc49aadc4f6f6b168b
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
index e421c8382737..6a712147389b 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITID}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 
 # Known test failures nobody cares about
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 4cdcdeb1c4c5..27c3e1e5d1d1 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,6 +1,8 @@
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
 DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
+DIST xchm-1.32.tar.gz 986604 BLAKE2B f2a1d27ee747bb2d599452f1fa91864afbd2d604e9c27322d70c0925c9c313d4c80ab647ed5bb7ae3672687decfaafb2be23f7b9ed09fb95ae7490b0a65d7cab SHA512 e8250660ff28c80ddda62b886b296d98fb60e8d482ad6791c775a51a860ca78e310222bd0f5baa40c941a3f345c0bb07edb932c0417835ab0b090d14b7b4c0f6
 EBUILD xchm-1.31.ebuild 946 BLAKE2B 3a79a20c9adc1a6263549c3449fa1c1f36ed7c99808b08007b34d15006de214c0bd34e1b134ef3c77350ab84c890bebfac4a9b78e43f251353b0315f507042c3 SHA512 03e41fdc435f95c64017bd39177997b2e6c40c17f4de4fd9fa295ac050203f9c156913fb8e333b267279d151276a718e070a2f24d76dbda1846c408b9ef307a5
+EBUILD xchm-1.32.ebuild 949 BLAKE2B 8137ecb8e880ad711b8aa559b97cc98b05ec028cda5343f65521d7ea2d2ea1a74d0ae1aed4292eac6e93919767372cb1bb7a71b6f7268d6795ac7364945c0843 SHA512 cc2c09cc3dffc9c43c76673218a0cfcf106d5d1590a80d15a8ef5a83c1254032cfbc8376e3b31f4e691fdf7ae1f83e5caae75168968d2acbb1d29164dc1c57fe
 EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
-MISC metadata.xml 370 BLAKE2B b7a2c5ee6e02f758f53ae1f67a982d8e3c0ceffed66524c9072801bc3cb803419824ce0a30b59f9dd16cae6381ae3b1a28a9b084c6dd71ab8d68a3a9be36e5a9 SHA512 f926ec5a7690046f0c1e73da64d5ab9eb662491cdb2ad24d44455ee5a4e94693188a3c8c17f777a0da120a44d57ca00f5713f5472c75f44215213ce41aceef2d
+MISC metadata.xml 321 BLAKE2B 65dacec7a8a5eb1d29ea9ed172e9d5d50077d3e39669a1250197b4f179f33112402be8e9c31b7070ba64bde942487a569cc521e920aa9dff612e3b74081096ff SHA512 9af4d9876f239fa7d85a360814bc0f188c30b117aec2aec3847df1974d94e304979f700301605abdbf868906d364060712d5035992a52e20b69ff88f35716727
diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml
index 82e69e9cd642..4834790e1a24 100644
--- a/app-text/xchm/metadata.xml
+++ b/app-text/xchm/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">rzvncj/xCHM</remote-id>
-		<remote-id type="sourceforge">xchm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/xchm/xchm-1.32.ebuild b/app-text/xchm/xchm-1.32.ebuild
new file mode 100644
index 000000000000..acd284a2aea4
--- /dev/null
+++ b/app-text/xchm/xchm-1.32.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit desktop wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 302a6be7ba95..9781aa7a7fd1 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,5 +1,5 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r3.ebuild 1420 BLAKE2B fb16508bb472a89a2312c7fba3d61694f59fbbf28f6a011fcb000439146ac40f7175a85fe416958bb0cc491d8388b02ddfa9782a3ee90f898f1c56b57dc37b51 SHA512 5d40affae036b2dc9e1d44136c00b3cd68327a06d7946cebb219c597acadabd0b64f006481e439693e28ba28373c44c7c89e5f5ef9ce758274791edc82642ad5
-EBUILD xmlto-0.0.28-r4.ebuild 1360 BLAKE2B 7341ea47241f06db2bb73113a3f5fde6d5cb1456d773d6121ddbf7bcceaff5b66b85f4d5553af208b7681706d2ec5d1add76e1d34590abc23d5850f647c980df SHA512 2a8348c52a358101705f928b2d98b1924a8665cc01b4b9562b66e739ed09dd9e6952ea5a241aa5b24373612ce2d6b142ecb39530fd7750c5e074736dc205045a
+EBUILD xmlto-0.0.28-r4.ebuild 1356 BLAKE2B 38104dfcdd90a36e4dfffcc1022e7666fa8da4f74cfa00321bc685b5ccc59a640e04655edde22f5e906584c0afddbe7b8fc63839b3104087d578274261830c85 SHA512 2a57acfed31b948c578d923d04d676d1ff4c3f116ba226cf1cf322e85dfd3aec34ca4ef6c881f44399dd574f55899dce5ae52184a688889b812c2ae014980bd2
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r4.ebuild b/app-text/xmlto/xmlto-0.0.28-r4.ebuild
index 0bbb710eeaec..0659a3d55d97 100644
--- a/app-text/xmlto/xmlto-0.0.28-r4.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r4.ebuild
@@ -9,7 +9,7 @@ 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"
+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