gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /app-text
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
71 files changed, 501 insertions, 1826 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 30d6267bfd69..6e54228cd8d4 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 1903a4ed72ac..e9a7cc00edba 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1,6 +1,7 @@
 AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3af122826d7250d9cec4df9ef48a3564cb522911d56710394eaa183b6180e08eae939b9f00a73fe061f21be4142520689687ad4c SHA512 72ebdc63cbb2c56bd8274f92501cbbae8c66e7d81b11b8fdeda38149da4bf44ab88699d248093eedc9813f6cd60e2a1f360fb39d778b4b7827777b1d003ab1dc
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
+DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1-r1.ebuild 962 BLAKE2B 6a889b5c824b1ba1fb3f236538a7e1c223784191ee745dadabcb753e6d0dee6552dd7955c5a75eae0075fd84a92203185b1c2d6a65166018a8ff94b7406532d7 SHA512 c914886adc6268dd82db8740a611f8737cbcab5c752db551d9282d782b1ed8767094efa95e7dc85304ce0837143d93bf06689132fec3ed7f79ebce99b2481639
+EBUILD aiksaurus-1.2.1-r2.ebuild 1040 BLAKE2B c9e0aafd7def0606780ea4c6871680fd86559a9e374734de4164981e9d00eb61e6d63039ef16ffa0c1a08bebfd952610e9f9df6062427dcb8435178323b6b3a1 SHA512 807a439e6b87ce940ed325b524bce9ed3eac0ecfbaff259a86d364d3f18d7bd75bde68af963051df585e89e383914115a711e1d57fcd1e5a7fb21ac709fc5baa
 EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B bb46c201ab41502c8a3b24a2ac2d97f62244131a95efb3a9d8968f397dac06b3d86ef0b43dc5d56499c5770d95e786fb64dbf1427cd08dc026e9bb740a7381ab SHA512 fd0ff4456cd07621f294830397f7221cfc0026e2062dcde149d1595cb2922b5858a0b38317ac6ecc4ba78488798d0d9273e26561d9f36980bd3d1d503fe04867
 MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
index 3bc1986d9baf..0062ee0b9a9e 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
@@ -2,11 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic libtool
 
 DESCRIPTION="A thesaurus lib, tool and database"
 HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}-patches.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,13 +17,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-"
+DEPEND="${RDEPEND}"
+BDEPEND="gtk? ( virtual/pkgconfig )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-format-security.patch"
+	"${WORKDIR}"/patches/${P}-gcc43.patch
+	"${WORKDIR}"/patches/${P}-format-security.patch
+	"${WORKDIR}"/patches/${P}-c++17.patch
 )
 
 src_prepare() {
@@ -32,12 +35,10 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -fno-exceptions
-	# bug 787899
-	append-cxxflags -std=gnu++14
 	econf $(use_with gtk)
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 6feb49e62051..ca8319b76221 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,21 +1,8 @@
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
-AUX calibre-4.22.0-icu68.patch 1552 BLAKE2B 481b2c1f61aadab677360419f56dc6db8fa54c3d36ad1c01a9cca42f929a75b13948a417c763a5ee36a72df316db360990ec1f83cbe74df3b45794c6839a145a SHA512 3f8d29294b4bdcd1ddb1de68ce38dde52508889721f897b93afd7f595e2f405c7636e421d9d4ad3a8406593f3ada8d32bc5b7570812c5190d5ed7150e8484ca3
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b6736be01f55874951a9a0c81a70c82e23e723db1d81d13917eaf615e65752a100fbc1cb43bdca0b3c4543e3b17cf43 SHA512 b9db1c72cf010c25563e3f86a75478ac872249034b3c8b09bb8f0c2519487bb78dea821c9e45564fb645d17431bbee96459a28ee036e57830faedea4cd94b423
-DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
-DIST calibre-5.13.0.tar.xz 36746972 BLAKE2B b011114fa558c2dd7418a449b2a43bbbbe6e850ad6ba14bdb8ee70d63b475839a6f489eb273c1c88eb841156feee1f0a6f13b19a38eab11820e8e14a05242a6d SHA512 99f2e007af70e4de9ffc05fc4ed41ac3e62ed5196d05e066ab2624e15694f8a0aa149769e0a2cf163f59e330ed7ab43bc938e65064ac2a9825d641b1735f13cf
 DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
-DIST calibre-5.4.2-SIP-v4-04ad7b.patch 1534 BLAKE2B a0d3a49e13499ec55098c8639ba93c21e04a1b23b857ca8c7e0cb665f6e40b138f44a13c78b7a240784919effa9870817b2ec7ce5b494448807a4b77dd95b06f SHA512 f0acd97fc57bce9b22dd2061be7a85f4b39b7a9c3492304dec4108ede087a9e58ee886e21734823021709686dc1317f41eb1ac99a947a7dc07660b5c1849bc1b
-DIST calibre-5.4.2-SIP-v4.patch.xz 4640 BLAKE2B e8d20d9e23922885ecc3d24b7dd83579911dc83520037bad4e9323725c3127d348dc745dc725d137a3172e8891764355d3fcdee640a26cd6b142a2c26d00da0b SHA512 e79ee69ba0ca7e44c10c6670743889d0391d708e75c798e345e6228f483347f72b070e01e2a258590420a1eea6313d88d816817886747c699e6783bd965ab557
-DIST calibre-5.4.2.tar.xz 36596800 BLAKE2B 00373cdc9af56a8dacc70096d1e7925f8d3da4eaf37727ad58c211d18e6c593a21c3ad0f283048ae28b1bb83889c8c801baaa5e240eb65d972ebc78a79922ec1 SHA512 ef3839f5ff4ceecb3bbd6c84819d6f57cc4bb2a1ae789a9dcf8f029680bc778ef86f9c2eb01832c4990f68c2de892eedafa449205470cec4d86a3bbe9d4b4527
-DIST calibre-5.6.0.tar.xz 36653328 BLAKE2B 44941c50873c285aa552c5b4ac716e5d3dd6bc3e1a4f13b1003d42adb808566ec3a5083c683a40d9679524e4ae70eed6ec8bc4c70770991f9791bcea25387c42 SHA512 5d06b60467bbf332acb8666d4117407c2876cfe2726dca3e9d9ed5d77561614406c7150c2800aacefe3cecb0869c1cd7b2681eba27830248b3c32e362123d50f
-EBUILD calibre-4.22.0.ebuild 8777 BLAKE2B b78353ba501d4ac3368da8299922e33fe2d7fc58664ff5ca05b266b0925118c866fc2716f41a9c106c8a3c837826c2980bdff44459fef341625515e8fdc768c6 SHA512 88b39be1bbeafbf26b4b0ffd1e0db7384dcbacf6a70c38b0faed20b60d9e1cbaf78630de58876fdd8aa92d54c8d22861ff94a4c489f44448ebcd7aa0ea9877b2
-EBUILD calibre-4.23.0.ebuild 8820 BLAKE2B 0261c81666ec54dfe6f57f39c8ca053fcec41a1c517fb529114c9717821279dc3ad3b0ea58c27674db50af66bacb5a45149ca4713890915b90d98cea35b95005 SHA512 664e403f05da722425f51d6d95dc7acbadabbbffd2f82aee483b3cccee83ae5f13d13108987e82020625e018278c5f42626f78cdc2d851edf3e1fdd2c2c00a4c
-EBUILD calibre-5.13.0.ebuild 8749 BLAKE2B 409524828435e53a9e6db54d1c53db7a1279090473667cf8efbdc2ef7fbfe24696bf77ad079352b7af5a0cf36d9dca600fde92fa47045546c881a922e0b3ae4d SHA512 ecca2407914b1b9a94a8cb6a52759154e01669b5187b00364a544f3c18d1132373670747362e99f0c1d4c7de4c5a37d8d9efae5d614ec1f1eb8c50ca8edd889a
-EBUILD calibre-5.16.1.ebuild 8628 BLAKE2B 477566a3d3684c72262d590ea023fd7be0fdccfda30a81413c8224c23c942e3dc4eebd0ccd4fcb6f91ae0b698571c46e93fbf1deb6422b25adb81ab90afc63c4 SHA512 2c0cd4373590dbcf441b634d70a55facc4115723f9b2252773044869c2aa2783030717adea3a9f9b645b083fd447e622f73b709be1e0eae31e74b9cf34c3b3fd
-EBUILD calibre-5.4.2-r1.ebuild 8769 BLAKE2B 89ceb815e215bded42d3be69be882a973fc86f4bcb30871c7cceb527113e83185f71a7c230af5320e44b20f433c84d3ebe71d937c7b3af2c83cc902fca20e1ce SHA512 d445de23fa2826877e562f9b95a21bba21a173dc244d68320c39110215b58a0ee32cabf57edd4184ed571b50ce898a1725877122aab195f62a813a638d4b4a2f
-EBUILD calibre-5.6.0.ebuild 8713 BLAKE2B a26ee08f18f7e819a6d28e18162036b67a1bbb6459a7a3be5afee012ee9fc254f83c29fb0953ed9310cda882dbdd36a6819101e707418be2b70f26077a78d6a4 SHA512 592fce01d289f6c3206e0ba9d7139122f767bb035acff99bc5c73a88752759458b03eb50c93c99b941b6b39b59b1dc6a16b3cceb8929dd501caace7c38d829f7
+EBUILD calibre-5.16.1.ebuild 8750 BLAKE2B 128ae61e290363b2409e7b8bef448b1b91f66c69cf6ab9cf9116a8978e17a553e18e237cab21d5f6d83f6e9e21bd87c270391060fb5fd8839d4f958765261860 SHA512 f1d3b025ce5e9426f773520613b434d66a211ab5bfd4047dd2c3b4cfc96300d7dcdd5de58b88f37c8e44218db44bef99853cec4b17e8140708766e7095e41657
 MISC metadata.xml 303 BLAKE2B f50da5b3e8c1e9b4553180ccce38939e7c8e11e5a0527f94c3df7ac4d93a37d5e838c633e58b3fe960dc60ce52c6c6ec6901eedbcd99039c0cc1ccf6dc8a0a44 SHA512 38da4e43d91a3a1d1adf6daf32e4ec69696ab7df6179788fbda75a40219acf01cedbff28943c0b169b2de9f490f3a324285294a9b2783c90757c8cd23aa9e847
diff --git a/app-text/calibre/calibre-4.22.0.ebuild b/app-text/calibre/calibre-4.22.0.ebuild
deleted file mode 100644
index e2294a1a47dc..000000000000
--- a/app-text/calibre/calibre-4.22.0.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop 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/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_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}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-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() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch"
-
-	eapply_user
-
-	# 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 "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', '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_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.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{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}:${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
-
-	rm "${ED}/usr/share/applications/defaults.list" || 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/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-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/calibre/calibre-4.23.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild
deleted file mode 100644
index 1b65bc4a6c39..000000000000
--- a/app-text/calibre/calibre-4.23.0.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop 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/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_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}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-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() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch"
-
-	eapply_user
-
-	# 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 "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', '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_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
-
-	rm "${ED}/usr/share/applications/defaults.list" || 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/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-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/calibre/calibre-5.13.0.ebuild b/app-text/calibre/calibre-5.13.0.ebuild
deleted file mode 100644
index 0f9dbc728c7f..000000000000
--- a/app-text/calibre/calibre-5.13.0.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6,sqlite,ssl"
-
-inherit bash-completion-r1 desktop 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
-	https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4-04ad7b.patch
-	https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4.patch.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
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_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}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-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() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${DISTDIR}/${PN}-5.4.2-SIP-v4-04ad7b.patch" \
-		"${WORKDIR}/${PN}-5.4.2-SIP-v4.patch"
-
-	eapply_user
-
-	# 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 "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', '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_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/calibre/calibre-5.16.1.ebuild b/app-text/calibre/calibre-5.16.1.ebuild
index cb40b52ae21f..6f924cf6720a 100644
--- a/app-text/calibre/calibre-5.16.1.ebuild
+++ b/app-text/calibre/calibre-5.16.1.ebuild
@@ -105,7 +105,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
 		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
 	')
 	>=virtual/podofo-build-0.9.6_pre20171027
 	virtual/pkgconfig"
@@ -123,8 +123,12 @@ src_prepare() {
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
 	eapply \
 		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	if ! has_version ">=dev-python/sip-5"; then
+		einfo "Applying SIP v4 patch because SIP v5 was not detected"
+		eapply "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
+	fi
 
 	eapply_user
 
diff --git a/app-text/calibre/calibre-5.4.2-r1.ebuild b/app-text/calibre/calibre-5.4.2-r1.ebuild
deleted file mode 100644
index 124c0b0ffd79..000000000000
--- a/app-text/calibre/calibre-5.4.2-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-PYTHON_REQ_USE="ipv6,sqlite,ssl"
-
-inherit bash-completion-r1 desktop 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
-	https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4.patch.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
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_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}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-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() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${WORKDIR}/${PN}-5.4.2-SIP-v4.patch"
-
-	has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch"
-
-	eapply_user
-
-	# 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 "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', '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_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
-
-	rm "${ED}/usr/share/applications/defaults.list" || 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/calibre/calibre-5.6.0.ebuild b/app-text/calibre/calibre-5.6.0.ebuild
deleted file mode 100644
index 1547c3b7358e..000000000000
--- a/app-text/calibre/calibre-5.6.0.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6,sqlite,ssl"
-
-inherit bash-completion-r1 desktop 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
-	https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4.patch.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
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_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}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-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() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${WORKDIR}/${PN}-5.4.2-SIP-v4.patch"
-
-	has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch"
-
-	eapply_user
-
-	# 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 "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', '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_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/calibre/files/calibre-4.22.0-icu68.patch b/app-text/calibre/files/calibre-4.22.0-icu68.patch
deleted file mode 100644
index c4b3baf05703..000000000000
--- a/app-text/calibre/files/calibre-4.22.0-icu68.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c211f9b17af410463ce9cfc9b1b100228b51720f Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 31 Oct 2020 10:44:36 +0100
-Subject: [PATCH] Fix build with icu-68.1
-
-icu-68.1 removed public macro definitions for TRUE and FALSE
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/calibre/utils/icu.c     | 4 ++--
- src/calibre/utils/matcher.c | 1 -
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/calibre/utils/icu.c b/src/calibre/utils/icu.c
-index 62d05de310..4e918492d9 100644
---- a/src/calibre/utils/icu.c
-+++ b/src/calibre/utils/icu.c
-@@ -238,14 +238,14 @@ icu_Collator_contains(icu_Collator *self, PyObject *args) {
- 
-     a = python_to_icu(a_, &asz);
-     if (a == NULL) goto end;
--    if (asz == 0) { found = TRUE; goto end; }
-+    if (asz == 0) { found = 1; goto end; }
-     b = python_to_icu(b_, &bsz);
-     if (b == NULL) goto end;
- 
-     search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
-     if (U_SUCCESS(status)) {
-         pos = usearch_first(search, &status);
--        if (pos != USEARCH_DONE) found = TRUE;
-+        if (pos != USEARCH_DONE) found = 1;
-     }
- end:
-     if (search != NULL) usearch_close(search);
-diff --git a/src/calibre/utils/matcher.c b/src/calibre/utils/matcher.c
-index f38a7082ce..8e57947867 100644
---- a/src/calibre/utils/matcher.c
-+++ b/src/calibre/utils/matcher.c
-@@ -15,7 +15,6 @@
- #define inline
- #endif
- 
--typedef unsigned char bool;
- #define TRUE 1
- #define FALSE 0
- #define MAX(x, y) ((x > y) ? x : y)
--- 
-2.29.2
-
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index d579f919da48..7e2554343659 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,6 +1,6 @@
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
 EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B c198997bd2b46f796e5ce31812830be1073d02fe4d716d5cd7e9d04c01b3bc792134e0f715f330f73e5e73e083206fda8211269eb9cfcda83e85221572fa0ef8 SHA512 774cae08ce0940d27e2bb4961509e005fe134bf2eeb59aa3b60dd98aca1786acc4bd6b6d438d8f936424eaa17a3bc174b77f89dbccee4908c23c3aebe2005e0b
-EBUILD djvu-3.5.28-r1.ebuild 1539 BLAKE2B da03e8d56f687108b2e8721ef390ebfe48a1fc6abdc57695c247190e3cf3fb19fb71e2b56f06c3ad1305a018f02f760707760912820074c8ca79cf4508b63fa5 SHA512 ea163dd85a00aeb658e9c1dd3d57504e9736c76afdcac5ea8c7c0102631c5a3ea05f63e9905e7ea9eab5fb23e051aefd4d408dd377c664ffd9329006e137fc5f
+EBUILD djvu-3.5.28-r1.ebuild 1532 BLAKE2B da59eabf654f375a9a053abf8535275019789e2140a46f0410e3802126fe1edb91487625eccd0fd43c340cc56a9778d117017bd2d285680691f702ee9dfe4022 SHA512 9e79d5806181fe89cc0b0393b716c2556391e4ce319f21c7d0296fa0beefc3eada4276156c672a2ddaefcb1b06e8a5c2644a93366304a90bc1a0af34d43d2d9d
 EBUILD djvu-3.5.28.ebuild 1460 BLAKE2B 0676c99f9d5a56f052ee72787096fbcf109e4bf18783ec5e0f3d8604af04b4e927916951ec5c0936f73f42a6e65a4eb66f98148ac99921c1682f57cd15b22e2c SHA512 c90c9f93d60fc510a6da17027d3f85b9b15867e1c83359ba3c34c87c71083a6d3602eec24731dd8c9fc36117a271691bfb405366a5c43830c7796310b4b9cf3d
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.28-r1.ebuild b/app-text/djvu/djvu-3.5.28-r1.ebuild
index af3433f46f91..01871d1ae5ce 100644
--- a/app-text/djvu/djvu-3.5.28-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.28-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P%%.3}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 8e94e3c9eaf3..f12651f58728 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -5,5 +5,5 @@ DIST tl-dvips-2021.tar.xz 58076 BLAKE2B 23105928a22ecb0fb9d9b3b9bc8e5edb2eb42c7c
 DIST tl-dvips.doc-2020.tar.xz 521496 BLAKE2B 1a19670ea2a6339f983564580bfc15374737014fe5dbccc4fb3f3f81455bab2c0ee9cec9ea0b9858ccd3d75cff6465d825a4a2fb095e7d4e70edb459e76634b5 SHA512 6f97f38327335ea711ec467133d1fa4e3124f3362d177e19af2cca06a50be1cf1de4d9e5b1aacbd1ba9779e0062a49a7572d47c5de918030fd5f78476e2bfac1
 DIST tl-dvips.doc-2021.tar.xz 521496 BLAKE2B 7c366af47a1ea967e871e5740d8debb1751b67b9e41a35aada0327c1aa26c04a90baf1898c1c50965ab766006028f5fb13264f5d7cda87fc630dd99300995b5a SHA512 07b00a4bfe557a04a93b22667f4854e2d55f76f33d2fa767d445b3301835aafafd4b8046b7126d5f516b65a743b1d0fe32a8fa3d0dc9b7b29e47bcfdfc790138
 EBUILD dvipsk-2020.1_p20200406.ebuild 1563 BLAKE2B 8c0e32dd0e55888d1b47411efd967fb6c22e127fcb5682ba18c2a16ea92abd26fdc8a9205d3024890c71f7cdbc61e570c8bf6237e04c7717e82bc6754e7120ba SHA512 b10e98aec4a2511a07f8f84949a4d694319244258310a512570b72f6e14bb34290fbecd8703d22642452713891bac48442f935f40f07b818ea05b61d86a133ed
-EBUILD dvipsk-2021.1_p20210325.ebuild 1571 BLAKE2B d9909c8d8cf206761f4d9cd6206969bb0420e8effe7ea8cb8c7651a16883a130ed6402247bbb60416eb7079370bdb2a88f112ce4631e7d17b8b3078630d641fd SHA512 cbacaca5bacc63aacb8f48aeb931790c1a5734abf840d1ef1e02d8a7bca003b6d511608e567dab4a0b0427d98eeccd0ce87fb6ea5ff916434ac8c41395d8e378
+EBUILD dvipsk-2021.1_p20210325.ebuild 1563 BLAKE2B 41bda98de894203badebbb49d2954a1e5c95614abb5cb3f3a9a5dfe4ddceea7c1f4850ee352949371d61388beb0ae8db5f4901de6862288a66f1ae2e57455d50 SHA512 e3fb9f7a2589c360acfa965b425a2d67dbc02d80392dec76c964aa312b205e9958e058b1edda0b5c489eeded910f66339e52c5439044128cdff5270f1445d856
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild b/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
index 627e1168083b..31343a58c7fd 100644
--- a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
+++ b/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 53284faa0fa4..cf003fe3ccef 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -2,5 +2,7 @@ AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a
 AUX 40.1-build-Fix-t1lib-detection.patch 1017 BLAKE2B fbb53e5c0a0da025b0410af62ae7251d369106c39c22ca5af58854c637a9f59119b96c63e0c76c64e918385f66ec37a9bda4808a2b3a5ddae5640d57e62304d7 SHA512 f77640a39fdc6c4e6aeea312380c0b922395b938557e04d718e29e55a6f0bd7cab8efc738668051f4f45183e68298911234bc35af82f0eb3d79e681ec20712c4
 AUX 40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch 1207 BLAKE2B ebcf5f7fe0419ce853c492699b97cc17b0df17c2d86f66ccadd4aef7e08e324a79d358a81c7148b73efc6a4788eeac128532665b9f8abb41a65908771c051219 SHA512 4816954209c20debecc6d6ca20650ac0bb06979d4b0e8d7fc63bda5445372f405fabc6accf44f0c62fad37070dada8cbb157f615e093f7ec894dccabf6069a4d
 DIST evince-40.1.tar.xz 2928924 BLAKE2B e9376c186da9fed132b820b2e9a1ef6bb0997f22abca3d7b271691291ea4870132b48075ada5a992e056193e6af51bdf95e6bbdac79c789475fb985d692f9ccc SHA512 c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d
+DIST evince-40.2.tar.xz 2928072 BLAKE2B 86051e8568044ec484a7a3c036a523ee44d22e46bdf5e75c6052d3302f92a27d48cb26e2408b176cfee3fafd3879a8771f4bf29a51f6b8085c31fa28f4885660 SHA512 f3ee19053a0bc6989a50fc790d1d54747d7aac5cbf0cd1e0eaea6cb743c0ebbbdf2565e88ea995fbba31c7f97e4279f9c0fa44c386bcf635a500033f6105ca9f
 EBUILD evince-40.1-r1.ebuild 3247 BLAKE2B 578562594a55320dd6e9d2c9f437cef0e737071cb74e396d1ee0c0e06c0244356bf1dd918b563c72c8dce2ff1d5a29d2c86361383cdbd404e912a90f4ee42b3c SHA512 492261623631a1a5c1192a26c7e3d06839554bbd389303641c7f488b3846ff5662ee06ca565c1db8ab7ab5c97a7c07bf1cc909e5f3a7da95b4498f533cda905d
+EBUILD evince-40.2.ebuild 3116 BLAKE2B fcb217f0a151a12b9a527a35386ef5b3c8b268465d72fce8ba0e60eb69897a93541c45d56dd840bc54f2179963aa5f12cb4a5a5fad4828795c08b5db0dafe644 SHA512 c0c3964ed4d4e6d23ed15fb427a56882f10ce8ebb00d078332ec0f1eaff1363b7f7910c6690d66363788e97a703d35278809bf83924b495aa025ab7f07ca5212
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-40.2.ebuild b/app-text/evince/evince-40.2.ebuild
new file mode 100644
index 000000000000..f3d4f7e417e1
--- /dev/null
+++ b/app-text/evince/evince-40.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.0:1=
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.76.0[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		>=app-text/libspectre-0.2:=
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.33 )
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/40.0-internal-synctex.patch
+)
+
+src_prepare() {
+	default
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=true
+		-Dthumbnailer=true
+		$(meson_use nsplugin browser_plugin)
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		$(meson_feature t1lib)
+
+		-Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+}
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 7c942ceb25d8..52849da59a7e 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,4 +1,4 @@
-AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
+AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2140 BLAKE2B 181f2405c7d762242314a96df3674360f9f98edf168dee983332b58be81db967d6fbee6e1e8c5a622d13dcfdd86f4bba7757c192ef2cd2a0575e16f31eaa12a5 SHA512 384e2d0571621402b9e3cfa0cc666d244e93e42e6520c1d88651c26d3fed1cd3d7b443e7d0e87d7eb4518798a779ee075ff51390d3835b043f4e82ce4e2ad9b8
 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 1931 BLAKE2B c95eeb62b7a449dc86f22a621e538f109705ccf202cd34c4bf25379d86af454667744d0cae92f82df629a719d678ec858feb95008cf6ba7697e87f56a4322d98 SHA512 dd7ce0df21b6c20fb88a09737f7b9ec36c59fa576c457f2e0a9e8f14c394498193140f3506e9c783350dbdf4796738ba40a16c1bbc7bade5049f44da19d0712e
diff --git a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
index eecc54560695..bac8aab4078f 100644
--- a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
+++ b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
@@ -2,7 +2,7 @@
 +++ b/bootstrap.make	2013-04-11 20:35:26.710082615 +0200
 @@ -1,4 +1,4 @@
 -_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
-+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "${EPYTHON}" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
  
  _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
  _db2omf  = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
@@ -13,7 +13,7 @@
  _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
  _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
 -_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
-+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "${EPYTHON}" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
  _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
  _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
  _chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
@@ -24,7 +24,7 @@
  _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
  _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
 -_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
-+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "${EPYTHON}" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
  _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
  _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
  _chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index c559f4da2a08..2b441cdd3363 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -4,5 +4,5 @@ DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
 EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 EBUILD highlight-3.60.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
-EBUILD highlight-4.1.ebuild 2411 BLAKE2B f54d453c059429ff41b94df35d81dba0c790a0217da0587bb031e4fd19f4cc05259514100987b5685d4596c1d498c2e9cbe043819d2211b9e8b993822e666d3b SHA512 5cbd35e733755c4bc11fce2f830bcf848fbf30b0822dc6ed271642177c72581ee7a20b491933627dc70c3de8640715079b81b6f7b32e36abb05102c9ef7ab6b5
+EBUILD highlight-4.1.ebuild 2404 BLAKE2B 6fbfa8a99cb1f37104a3b865dba125bcf356240a6c55772ab7e69997fbc6a0ca57ca77238149ec3497b5fb194354f3787ff61622190eca6a03e93132a41b0092 SHA512 171cde8c66962d09b4be1f28c5409e680a535d3ec2b67dd12d0c99d90f9f04f4225b90ea97dd4788cf7fe4868ebdc4bcaedcef65ee8e10995d73b0e6b466e821
 MISC metadata.xml 330 BLAKE2B 3e7c157a3d1763cb2b5c6c65a9259c03ac3863056d55ddb6eddbb76e66f98bcd11f87a04ddae616657f88e0a6b1f7bab0d028b97c8b0091ab8daa9e8fb5bc70a SHA512 3b6739ebce190bd586ad2e1657460b3540ae5056f2f90fdeb68121da3215e32dc382a1e965038968ec23f0c46d4626231f1e261aa7aca184dc8e08d80a82a681
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
index 323a92ad3acc..7cfbb9f2be8b 100644
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -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 501673f91237..95cf9026a1f2 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,3 +1,3 @@
 DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
-EBUILD htmldoc-1.9.11-r1.ebuild 1376 BLAKE2B b09aefd7605db06c5b429d2cb68ca9192c50ad2880c7fe07f7e307a1a7ae67489bf26a0e809b5ca3396b2968f8a69f265656c5eb1718811754e815abe93bdee7 SHA512 1c678bdcbd3e222caa8bb925365adc06ae237638d70b37a34243e286dab248951fd5ecdf4942bee62332a049241d089717de28d0e9b4e02e88343e2e18c0b3a9
+EBUILD htmldoc-1.9.11-r1.ebuild 1360 BLAKE2B f63c196fd6df2bc869e266d2d356c5ca1a56b45a7d1e07e479855e13a915a8fdc82ec7ad1b5270250823c7b4364a24020c507e4a27511dd3debf67a29f2f1f43 SHA512 cfd9f740c0c973bd933b1c0235b3271e84e8c4b6923e1ecf9a509dbff78472ad4d5bb09d9a6f9ced6eda952f08258e400f52a2aa01b9bcbf6b6ecccdb484334c
 MISC metadata.xml 253 BLAKE2B 866785a39539e5da350fc5ce3c2039b8e906bb106c7eab83df24a7a66f576e530ade48e9d63e1115ff5cb55617da9bb615f164ffc46f5f16bb93055419d4229e SHA512 cc9791ffe80b6f6064de254903f73d298247a57455a3031fc089abdf5a291a0546e6d8f64fb7886ce5d543af487971149ccf68092a8418e25ed58feece9fc033
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index f34baa19af19..de7e4f8afa89 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -9,8 +9,8 @@ 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"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="fltk ssl"
 
@@ -50,7 +50,7 @@ src_configure() {
 		--disable-localzlib
 	)
 
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf "${myeconfargs[@]}"
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 4b35dd650338..f6753a5d54b2 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,7 +1,4 @@
-AUX libetonyek-0.1.9-boost-1.73.patch 304 BLAKE2B c9b18c3dac65284f53be3d686316bf6ecdab62b3d7a82cb4af41d528519e19cc65a0d5a97ac69a032d7305b38361ef0f47c7c1d2a0cf9098fffe6e1b3d818c3a SHA512 be2c53cd0902c3f51b0ba39b5b07177f3fc0978321fe6094baccdd8937b91de1aacf3cb77b1afe14840709712eb24d618e7474f58bb9baccdabe218eff7e7a9f
 DIST libetonyek-0.1.10.tar.xz 1494000 BLAKE2B 1c47b410050380d134d96b5551f0c9186c24aa0ea52c801e26655e3013f030e92198d8e3f19e8a341744206eeaad2d10ca130f286fd42c8a9c3b56f773cfa7d5 SHA512 516a14fcb7b7b5898484a4263d593a036ac728b90144da9d1c22a5d0fdffc879839e19a7b390f99d924c390d433e64433fb08939b1e04ca24359315571c5772b
-DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
-EBUILD libetonyek-0.1.10.ebuild 1220 BLAKE2B 65b8c308cedc0450ada5a75f16371070eae73c03bd6ca32d50dd442c877d24a34d04cfefd0cf881c30aeb3172a95bbc259af1653e05506ce8e0eb236d91d182e SHA512 4cc64741b966f79d67d0bc14cf9a0378eb137f3f73c030b2e309731d892019826e65e70f47d22077fb864d5e208b96891a5520669e98981e1ca7710d4fd4bc1a
-EBUILD libetonyek-0.1.9-r1.ebuild 1406 BLAKE2B 09ca23a212133a46fa045d7afaacc142333789f3529f2de0ea7fd6f8e6e8b97133d5ab065f66b3dba6ce2eb0dc3745af7d2a06e31a55160d45bf5f2dd23e0bfd SHA512 1439e3933eb3df18dc3dd74a4d1101e6715fd8ae6310e5bd1718009c339aa0eab1246ba2b807a8e6ccac1434193576868003ea5ef54677e64d032a9148d35ee5
+EBUILD libetonyek-0.1.10.ebuild 1217 BLAKE2B 8ccebae827e1058fb551cfb7e7f141d09ce2f2940c6f1643f52d98dd9c60387f19ff9558898943a3772c6477c6db183713331f08d445b034d0dfa0cdbdadac0e SHA512 659388a5ea74fdd9f919bb12e005772b97fec64a6ba277be79fb8cf626385a75bac96840550f1db2bff13cfeed8cf4d81225aef768088b0adae8ae5d3cdd675c
 EBUILD libetonyek-9999.ebuild 1220 BLAKE2B 65b8c308cedc0450ada5a75f16371070eae73c03bd6ca32d50dd442c877d24a34d04cfefd0cf881c30aeb3172a95bbc259af1653e05506ce8e0eb236d91d182e SHA512 4cc64741b966f79d67d0bc14cf9a0378eb137f3f73c030b2e309731d892019826e65e70f47d22077fb864d5e208b96891a5520669e98981e1ca7710d4fd4bc1a
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch b/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch
deleted file mode 100644
index 2992f9f1add3..000000000000
--- a/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp
-index 6dc0e9a..6f8e79e 100644
---- a/src/lib/NUM3Parser.cpp
-+++ b/src/lib/NUM3Parser.cpp
-@@ -7,6 +7,7 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  */
- 
-+#include <algorithm>
- #include <functional>
- 
- #include "NUM3Parser.h"
-\ No newline at end of file
diff --git a/app-text/libetonyek/libetonyek-0.1.10.ebuild b/app-text/libetonyek/libetonyek-0.1.10.ebuild
index a9b34322cd7f..212b6c2ce430 100644
--- a/app-text/libetonyek/libetonyek-0.1.10.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
deleted file mode 100644
index 66621ce15c89..000000000000
--- a/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-DESCRIPTION="Library parsing Apple Keynote presentations"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	app-text/liblangtag
-	dev-libs/librevenge
-	dev-libs/libxml2
-	>=dev-util/mdds-1.4.3:1=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	media-libs/glm
-	sys-devel/libtool
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.73.patch" ) # bug 722042
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_with doc docs)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-	)
-	if has_version ">=dev-util/mdds-1.5"; then
-		myeconfargs+=( --with-mdds=1.5 )
-	else
-		myeconfargs+=( --with-mdds=1.4 )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index e07a5e916cdd..f268cc863a7f 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,6 +1,4 @@
-DIST libmwaw-0.3.17.tar.xz 1349700 BLAKE2B 4b5ba8d5133144973609dfbd273ca36cc95e52608c78f6143f7c4283bc2bc6d7ceb22836a693d64fa7408957a3b02a7c9d0a5ab9235aa2d0b9725170441babfc SHA512 c3a1bb079d7e74cd7a23de1501730be21b1b089ef6d4f81ee0001775483c6346da3105b0d67f75523e4e088987bc92b97acb056ec7fc11bb29047109a1cf5ac4
 DIST libmwaw-0.3.19.tar.xz 1401720 BLAKE2B 93e63993dd73d52d1b071c44a5efa4ba2495a370a767cd80fbeb437a56224d333781cfdf32c3ca1c0a3794544da6cdf8c967badf98b6858796fbc8f2ea7878c1 SHA512 a5b74f417366f7e8a8303948e678d54caf9c45e0b51694d39593926b2f2fbbaa5dfea5dee8a6b4a656e5ca5bd880f41a76e7b869f55230690740b7ab75a28f1f
-EBUILD libmwaw-0.3.17.ebuild 1004 BLAKE2B bd99841d18279477318ce13e9c80907572ecbb1de67ec738bf32afda9df36ed9e4d0e6ec695a386e535b41e19d0088f2635778448a0b6480bdc71c84da44a62e SHA512 f822bef23ebbe99c097d20a6b312014abb2091e61a54f4a8cf184252f13db23deccc3c0ac6b09f68309d4cf95479a58be6a8a9ba508dfd30e327ea6a5958fb95
-EBUILD libmwaw-0.3.19.ebuild 1007 BLAKE2B 2042912c93c84d2c590f2f6d11ee0b936f71c8d6811425f3cc00a3ec2b18edd44714cdcd69467acc84da93e2a0096f86a32df4a1d0e5e847b49a1986c718ddbb SHA512 03834bd3781edd22c3c71008aec707a855e28e54227ffe2e54c52c8c48639fb283f472b32e646484f9d6679fae25c585a95fc013c00d09583bd49f55d7a44427
+EBUILD libmwaw-0.3.19.ebuild 1004 BLAKE2B e6db19e89201be0df73cb6dd3deb81eaf2e08d442c6d958826e95120d14ce2740248158b3a1f5084ae4b9f588d22d62c4794f090f0c58aebcde48204ea256560 SHA512 2ba0bc30818fc9b4032698081bcdea307185e24dd08885168d05ca6ab43bbb6dd2747cfa2268a5416e31c4050fcada5bfcb32bf605d4eadba26cf766b407a2f4
 EBUILD libmwaw-9999.ebuild 1007 BLAKE2B 0d5cee2920040a56940cf0e916f4734433875c73fe541d7918c3bdaea0d4820a40975a0d67c154ef23a02f6b70e3fe49b9ceaaacc79cfd82c6ee74d552f455e4 SHA512 d65054c2dbd389041d5c55bfa8f8819507987ef862474f218ba6115d818dda293ecc7473f67b33cdd89679f706a7b2d717e22f6c071e922d79aeea1a37917a16
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.17.ebuild b/app-text/libmwaw/libmwaw-0.3.17.ebuild
deleted file mode 100644
index 094644ec7197..000000000000
--- a/app-text/libmwaw/libmwaw-0.3.17.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 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/libmwaw/libmwaw"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc tools"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	dev-libs/librevenge
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# zip is hard enabled as the zlib is dep on the rdeps anyway
-	local myeconfargs=(
-		--enable-zip
-		--disable-static
-		--disable-werror
-		$(use_with doc docs)
-		$(use_enable tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libmwaw/libmwaw-0.3.19.ebuild b/app-text/libmwaw/libmwaw-0.3.19.ebuild
index 7363e33a0479..4f07691b3c39 100644
--- a/app-text/libmwaw/libmwaw-0.3.19.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.19.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 96e8a1aaaa03..202f7b5052d5 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -9,4 +9,4 @@ AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
 EBUILD mupdf-1.18.0-r4.ebuild 4259 BLAKE2B c95febaeb6be6ccef3c48ee358e3f1f32e37af133bf3885dbc381efbf0fa9a85d81f50efbebd7da36d70c339ca465b3670db1daec0061c876ff9ee52a765a65d SHA512 827ae51bdf6613893eddee22708c8fb5ae6322752afc76cf1eae0386f3f610f5e26697e0c68729a65fec0bfcf6ba3d8eeee82544ad9d4d4c7bf5c440ae79b044
-MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 82b29f9cae62..979bcc7aec93 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index e86825b4a137..4d8cf3680783 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -3,9 +3,11 @@ DIST nuspell-4.0.0.tar.gz 379136 BLAKE2B 90aebe8318cd28240dfb7c1b034b2c045ac208c
 DIST nuspell-4.0.1.tar.gz 379342 BLAKE2B be52797ddd737c523a6141fc1c2683690cfcd1aa09e6548d7eed593ab023d2b45d3538f2a9964a7c2b4abc6506c67058cdc2479ec12ae5438ffe9faa00f0680c SHA512 122616fd24c2de35000ba12d680d3617e7fe97881d33febbcb106ce70d3bac356a00d90680a1bc8ee631ed532ace0f4b4f9fce4760a25b0f7fc1d60553e74528
 DIST nuspell-4.1.0.tar.gz 380814 BLAKE2B 500da0797e4f0d1939afd8451b734f309b5c58e66532150614dd3463eda95ab421094e6c0485396b7ef1dd4b7fc03cadf10316d9cfdb1390b2769ddcc963d8b3 SHA512 d0c01dd73fefd8b9c800e6419fe916e55a53b8b19f5848d3766cdcb50383fdcd9e9bb49362b5cea4d9d2d7fda21aed055f28cb47b006e2049b2a904355f7f9ed
 DIST nuspell-4.2.0.tar.gz 382635 BLAKE2B cc141e764ce4e649a7a10f213c392973eb98eb21adddc7d2cd46c01f3cc9a6c85432bfb13ce178fba387a01aa1661e7c9b6a4717fca18fb3bfa220732daf53eb SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d
+DIST nuspell-5.0.0.tar.gz 372940 BLAKE2B 67e3b9b73f79d39c7cdb371ae7699fdaf8323db15dacd17907642f3d799eeb3e3303678d4a9ee4c5a88a5f61d7f1778745590fbac880625dc08c78e94752da6b SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5
 EBUILD nuspell-3.1.2.ebuild 1170 BLAKE2B 016ae5d2d29907d7ddd8bfde4f17f6b17259a79e75f1de133ea9074d777dd1a9bb7a3a6d53c188232720360d0714e849cd821cb80477dada5c89fb7e7508696c SHA512 eb61874975da9232e1dcacef814560c4eb43e8664e0130561e20b976c4b1a98b3b3fe7a64a90ccc2adc4c8c4ff707eda831658ca609a31122e41d49fef16cf0c
 EBUILD nuspell-4.0.0.ebuild 1170 BLAKE2B 2492c07d1f7b6ab3ab9bbbec92e1ab493931ec69352ec2b8f4dc6559e905982938c25bdd3cd30f6f04e9c153f495a3228ab5719ec8fde7a2c98d0b565e28bf1d SHA512 4f9b2ba615a77757d70c9e1ab1569ec8330d6c5ef89c7f32570e7dd41b7bdcd08ff2569c7c2951996a8b83706b77e572d0f9500a5acfe4b2de3300e33c7d3ae5
 EBUILD nuspell-4.0.1.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
 EBUILD nuspell-4.1.0.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
 EBUILD nuspell-4.2.0.ebuild 1142 BLAKE2B 940a20fd21b52017c1e8d2d2a9dcc56de5f1e2eaabfe72b2c6c06052fc8bb8f372e88452eeb0f7d702c6ff93d630212a53d66b5939a786f2b72de437b2a693dc SHA512 3c4c91aa5cd1f38389884bce74fb343877ad0977ed8ad4919ef69dc00f87350416e964384f2b62c875221657b37a398279838dbe3f0e1c5b00c36293046c99c0
+EBUILD nuspell-5.0.0.ebuild 1147 BLAKE2B 126b9cfdc11fb89ec73179038058758659048f232cd7704fe0f1a4956ba85d04dbd9902ff97511585cc0507a0f581baf615b7fbf8978c2af96945194d88f8599 SHA512 e0db32e32a9a2e94dec39bfc11f5d8065358f8738184bf8b1ab65316a523e7f9b9a50f59e49b68dab4569be1ca5249eddfbbf9cad1f95a469c91e12c1b347064
 MISC metadata.xml 489 BLAKE2B f3982146d0310c27e8fcb8092ac55e70d1d4d2b63beef25bdd9dd2db709f900236a6c8403845f40600bd692f76f9f96724282d02084832fc628842aa50e93f5f SHA512 e6e6d227ffead16c0e465c82dcd125351b5fd6af2195cd8e93e2855f76cfd38d225cf66a381c1f1023248b9d00d8896124c7b928400e34874eb3b5891ab81a2c
diff --git a/app-text/nuspell/nuspell-5.0.0.ebuild b/app-text/nuspell/nuspell-5.0.0.ebuild
new file mode 100644
index 000000000000..f23bbc3b51bf
--- /dev/null
+++ b/app-text/nuspell/nuspell-5.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/5"  # due to libnuspell.so.5
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/icu-59"
+DEPEND="${RDEPEND}
+	doc? ( app-text/pandoc )
+	test? ( >=dev-cpp/catch-2.3.0:0 )
+	"
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	rm -R external/Catch2/ || die
+	if ! use test ; then
+		rm -R external/hunspell/ || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+	einfo
+	einfo 'Besides MySpell dictionaries, for other options please'
+	einfo 'see https://nuspell.github.io/#languages-and-users .'
+	einfo
+}
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 9772f2d0b73c..4370401ed2dd 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -2,5 +2,5 @@ AUX paperwork-2.0.3-desktop_file.patch 604 BLAKE2B 7c7a4b8a7fbae4b7d9813b2e5c10e
 DIST paperwork-2.0.2.tar.gz 6222075 BLAKE2B 6dba798ae2b18ba81891c8f9c29e1e2bc8670f24a65e554aa169f05fbf1a89382b9ea24abaa1784da657ac5b9d9d145ffbadaff86ddc3583023f164ffb40c351 SHA512 bde28c167eac5b134b4bdf0f2ac8d93eca4f99c1881ca0edc105c33674114b3a4e3508a1f45048f45ce1c2f6b690a0f765c1b980dbe42c7e1282172f12c3a853
 DIST paperwork-2.0.3.tar.gz 6224520 BLAKE2B 099d76893b0b89e5f7914456ec31346f28335333361a4528efed6ab4c596fa24893d375557d6c1e89f7c83f4a1acac161004138b7e1537aa2f3cb2de0460bcc3 SHA512 d5cf30ef8a6011817947c9878d4defe93a0c82f77562fd707c198d944657db754ba57d703ae3f931ac9e2d7f9f1eb7f9f9093a1d26f25dac0e336b03f9b25ed3
 EBUILD paperwork-2.0.2.ebuild 1026 BLAKE2B b9b3e3cd09c0b0575b566119dac1f192044b958c1bfd6e4ec16a588babab28617c3ca23dd3dca7b9e0e4a5efb5355a2315f8d246394b8a12fff02f427097681a SHA512 5814f5c4c2e96fb2fb2204f1423426577b8032f3e536bed454f26f89a6f4abb368305e41eb0d531df776751c0aa9551aa65bcd0c6c32808efff84d2d5cf346f6
-EBUILD paperwork-2.0.3.ebuild 1288 BLAKE2B 334f807727117b11e035a83240cfb6dddfe3db7a9298a189e47e308cebb5559ec3c4745404049323096c3128ad545f0292ab81b530a14ca771cd0ce44cc9ae29 SHA512 0bf82bcb3b9988b5d7b15916abaaa67ad368fdcce31e1721a572fd6753e65924bb59e942f9072aec8030768d98717598cf08e398d758a32e728cbd864a47ad24
+EBUILD paperwork-2.0.3.ebuild 1406 BLAKE2B 673bae79df2dcfe41da6223d641e66769bc1fe6210fc18a532e8441cac1c7dfb446de834bebaf133d0edf3faf7d21fe48c6f16105833ba453ba85aea55324145 SHA512 c33021dc523e4cd0090470b0fed84e08161d838e754603d7a46c0745b5a7ee925f7b2761232bbfb25b3785df55c30ec589a4fb7a629cfcfcbb4559a1e5879d1b
 MISC metadata.xml 719 BLAKE2B c97e258d05155df5380f08accfa9736ce44514ef9fa9b0fd0a4d5966a48df7ae940902ce929893ffb828f30883c4591c93a2bc5c8ca0c7a6f636e477e8f52eae SHA512 a36e28273a451c529451602b80ec70bca26d2db40a683e6fc7297db185c88696cc359c3f80951ff9580e81e7e221379913f7d1db3af3d00fb02128e1994e7f4d
diff --git a/app-text/paperwork/paperwork-2.0.3.ebuild b/app-text/paperwork/paperwork-2.0.3.ebuild
index b9ec9918ccc6..3095f01e5a0d 100644
--- a/app-text/paperwork/paperwork-2.0.3.ebuild
+++ b/app-text/paperwork/paperwork-2.0.3.ebuild
@@ -36,6 +36,10 @@ PATCHES=( "${FILESDIR}"/${P}-desktop_file.patch )
 python_install_all() {
 	distutils-r1_python_install_all
 
+	# This queries tesseract languages and will fail sandbox with
+	# USE=opencl, bug #793446
+	addpredict /dev/nvidiactl
+
 	PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
 		--icon_base_dir="${ED}"/usr/share/icons \
 		--data_base_dir="${ED}"/usr/share
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index d1b2c6b96c15..a6f10068de31 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,8 +1,4 @@
-DIST pelican-4.2.0.tar.gz 1332348 BLAKE2B 879a9d51f2b2956e895302dd613c877ff65bf8d420cd70144618ada07723037bca680f6983bdf3860d144ebae4eca8198219dad9caf0d6ecc06745a3881447fa SHA512 9c9f41306739acc4c6c6a7ddf50d955d958af7be1da197b42859b95405b18ab5b597fee4f9aabdf98cd508204558bff9c4f0c11bf4e5367b16e32568682a21e6
-DIST pelican-4.5.1.tar.gz 1397023 BLAKE2B f12b16045feaf001c8f6e57116fb8e807ce1d51f16bf7a373203edec3d1edb91a2386dbf8fb008efbc11654ae1cbe678b4a3cbf99349340db1d784962e81ab5b SHA512 cb27399d3c280981d1e8cd01dbfd54b1a8bd11d9b87c4717226a2a467d73c3ad4e038a8e544534289a73e9e3cc64b4414e2b3bbf2cdd05b917d02df79ab40b5a
 DIST pelican-4.5.3.tar.gz 1397896 BLAKE2B 86651f627af67c571ea65a7ddfe7b62747fd2798575d6c4f29455da9b2371ce22ff42d715f148925724764e0a9fbb8aeba1dea401226856d3681b520dbb0a7af SHA512 b1ef5f145b448f6af2e25a1adb399521d4c5f7eef3ee2aa5ab9e50c223623b5c9961622e5cd835a3cb72dbbe905da6ac9217128f2459a35892bbac9b9cb6d26a
-EBUILD pelican-4.2.0-r1.ebuild 1496 BLAKE2B 1904172079b4c088d526099ca9eaf16a4d32d84b757184f739cfd3c00bef3836f3fe1e0dc9aded8e72ec8750780163bb8579732b93cb5d33490eaf5b407de014 SHA512 1336584c84bea1eea7965438e7a363830c581bba3d2bc5e73bb2f8628808221c14e60ed24781264831d3d5843381e1fbe68b31e4d12dc549bcb1de39d421dd17
-EBUILD pelican-4.5.1-r1.ebuild 1531 BLAKE2B dd05b2da83c9c40b8615e566cea548ef331539fdbe36f058d5af7c0eac26bd5390132084faff0d7bd98ae3d2bd1ec5162babc0fa4a28853d6f28f1b429214e83 SHA512 f823ded1cd71ae0a5e3563886a7385f16a085dfc5e379d2fb74762d47ad3b6261b1b13b70c8e98d786b350a31eecedd66576d3279ccfc099118bbf363456d1bf
 EBUILD pelican-4.5.3.ebuild 1427 BLAKE2B 6ad0b6a55dd7c7f8c0773d3fc4145ad435238d70e7539c405b485564200b40e21e9de1a4d6b546811a744ffa66ed9fc5066c6e18d7377af237c8692f7a31c666 SHA512 d5e598875ab2b68150ecceda3cd0235b139b38d3cb4c638b53d12951b698603af6ede5156b55d3edce3737b712a8ef990b59c577a981ee9417a2cbe0ef10d500
 EBUILD pelican-9999.ebuild 1422 BLAKE2B c60d1e169af3170ef94baa62be09d7d089de05c7f282c7f69461530ad9335c894ae020d05a024667e6c16e86663924edeeff6df6b0bdb1bd668dbccdb0379e1f SHA512 bf0b1881f75b42c9db16b7b8604b8e0f2543d579b78033ddb0292cf2dd21fc64e7000211d2dfe127202f8231483035a7c1117e6eace2194150b026f299188269
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-4.2.0-r1.ebuild b/app-text/pelican/pelican-4.2.0-r1.ebuild
deleted file mode 100644
index 78bf8edfb8c3..000000000000
--- a/app-text/pelican/pelican-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples markdown test"
-
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)
-"
-DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-RESTRICT="test"
-
-DOCS=( README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		docompress -x "/usr/share/doc/${PF}/samples"
-		doins -r samples
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pelican/pelican-4.5.1-r1.ebuild b/app-text/pelican/pelican-4.5.1-r1.ebuild
deleted file mode 100644
index b43b78f34e59..000000000000
--- a/app-text/pelican/pelican-4.5.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples markdown test"
-
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)
-"
-DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-RESTRICT="test"
-
-DOCS=( README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		docompress -x "/usr/share/doc/${PF}/samples"
-		doins -r samples
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d0cbe2661f3f..685d19a0c2da 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,7 +3,9 @@ AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78
 AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b
 DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
 DIST poppler-21.05.0.tar.xz 1700632 BLAKE2B 5e277f3d9d6fafbd39b395d7730182ec028c0ccdbb59e0b9d6ea93e079eb6dc8ff6e46a2b378ec4502055e8748973d353e1f947d734cdee4c5abb9f1bb6dba2c SHA512 428f63a85fc8a227efebcd64ca7e89fec487fea07c93f9dd990fae343532547bcfec29a3288dd9ffce698cf994ccc2ce5055e4fa677ebceb216c1caaa3e0cdae
+DIST poppler-21.06.1.tar.xz 1708344 BLAKE2B 424888e16c72e9ad37fcb0aa3ecc7bef8c6150f3ca51b205407f9db51a5800bf76c703ad7a7e642e5ce60edc0ab3506d29bd18c8424425da7d4270bb2adb3025 SHA512 6e447d09421b7729d83a59a24deaaaea15103240cac0eaf41ddcdd64ac2c8f08a6902b95d56bbbcfd9e229054bd0a4f1769ea05c7e20691bc8f995e3f959f0e9
 EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B 6eea98c0df7d157fedf39f8ed52f1305542f888b19c8a5adf741bd85df6fc7d5724c8ec03ad88ee9bec30bda82aa30e3fca370d407a6234a4f97aa5d4b3f76ce SHA512 2657dd6d87197953c09ab1ed4852f07e33475e1ceeadea0dcd0627f771500f13057eee927b8341286ba25820c4f2ce6b3f8d6b00d0b75510b27b3b9740585375
-EBUILD poppler-21.05.0.ebuild 3282 BLAKE2B c310706cf76e64135e4bcc479a1a3cb95c73b0ab2573fa4592dcddf1a55a4b2a59a655cfa647839ba2aa1ade0e929a78c86a7c7d7580370c67dacb19c4310d17 SHA512 01aa706393a3c42272e2fb87833928a3867ca9d11fc83d646c3972ee6e89b1276da6203a326da579011e70f7391e7f5f75d0515515d780732da4cdd9f8b2ad18
-EBUILD poppler-9999.ebuild 3283 BLAKE2B 1b094db33956feade86e5089cc845878439d6fdf8595f4d795d6c253d4a26601b3e4ab2df6ec95ee1b718f442efd3d23748768dffe492445f95077f7cdeaf4d4 SHA512 ccaf9605e0bef9343ffe3346a60ed774dc93b0bc268d6235d88407d60f1580662425dc39c7626ea4f329a0953c3d2b6c6824fbc7fdc95baacef7afe181b2068e
-MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
+EBUILD poppler-21.05.0.ebuild 3276 BLAKE2B 6daa0fcd6bec129e982958fa3e48c418e2a47049aa8bfa0562c765ff7334efccb81adc2fe3cc2f84a7a4eb6d4ef49b5755a11d35a5cc2b9939f3e351424f557f SHA512 00e06cef9ee44d3d404dd353c6e6d6b7bf3926361e481b2d277c64c8239a606be69d21b177784b703f145ee49828993a329e5ea9159079ff1b021c74edad3d01
+EBUILD poppler-21.06.1.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
+EBUILD poppler-9999.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
+MISC metadata.xml 1094 BLAKE2B 661b20d0ca935bc2d7c91a395f1a541085bab7139858f50c5a8adf04b3d8c8ce97b80153ac9be3a6a92d5ee008505617f305fa1b37e94ecdd77f524f56b28a62 SHA512 51bbcede699a7f4f3d70bbbf18080ae17054daa48de147bc9756614a84225e71d1bb9b7dab918f54661e001cdd33f5a00c5b55e292d8a99e7ed66b82798a9b69
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 6f044d376b2f..91f9161a0e05 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -22,6 +22,7 @@
 </upstream>
 <use>
 	<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
+	<flag name="splash">Build the Splash graphics backend (requires <pkg>dev-libs/boost</pkg>)</flag>
 	<flag name="utils">Install command-line PDF converters and various utilities.</flag>
 </use>
 <slots>
diff --git a/app-text/poppler/poppler-21.05.0.ebuild b/app-text/poppler/poppler-21.05.0.ebuild
index e3df86156aa7..d238d22ee04e 100644
--- a/app-text/poppler/poppler-21.05.0.ebuild
+++ b/app-text/poppler/poppler-21.05.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/110"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-21.06.1.ebuild b/app-text/poppler/poppler-21.06.1.ebuild
new file mode 100644
index 000000000000..048302fba121
--- /dev/null
+++ b/app-text/poppler/poppler-21.06.1.ebuild
@@ -0,0 +1,128 @@
+# 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/111"   # 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="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 +splash 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+="
+	splash? ( 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
+		# Required for SPLASH
+		-DENABLE_BOOST="$(usex splash)"
+		-DENABLE_SPLASH="$(usex splash)"
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index e66369be54d3..048302fba121 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,14 +12,14 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/110"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/111"   # 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="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 +splash tiff +utils"
 
 # No test data provided
 RESTRICT="test"
@@ -53,6 +53,9 @@ DEPEND="
 RDEPEND="${DEPEND}
 	cjk? ( app-text/poppler-data )
 "
+DEPEND+="
+	splash? ( dev-libs/boost )
+"
 
 DOCS=( AUTHORS NEWS README.md README-XPDF )
 
@@ -87,7 +90,9 @@ src_configure() {
 		-DBUILD_CPP_TESTS=OFF
 		-DBUILD_MANUAL_TESTS=OFF
 		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_SPLASH=ON
+		# Required for SPLASH
+		-DENABLE_BOOST="$(usex splash)"
+		-DENABLE_SPLASH="$(usex splash)"
 		-DENABLE_ZLIB=ON
 		-DENABLE_ZLIB_UNCOMPRESS=OFF
 		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index ac1366f3047c..bc35ef796eb1 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 EBUILD ps2pkm-1.8_p20200406.ebuild 786 BLAKE2B b96b70a4cb0cc2371c5889cbb82b510812f29c13a8150f2b68a081be2da7330d45780bc1d0182631060ee0d3028528db23a142b1cb52e1d3baf735df43761d1d SHA512 20c73be65f099ad8f5df79e96b3b87f3f450a9a7a0911a9a736ca0d0d0460539139d0463e02ae6d7e41363ea20ba31dcdc146424463e8ac733b37211e62763a9
-EBUILD ps2pkm-1.8_p20210325.ebuild 786 BLAKE2B f0ddca8b71acbd704b493ca821984dd5d2fe74db72c738a58cb5a8994bddf314c78e403620136bd1e325f0c4b58ae1e377455fd7606c4d4d8ba8d37bdee66865 SHA512 0cffbcd2687c66c8d2b7f29659c6cd5a448d9807d6708368420dd9bae3dd9b672db78240b0e2d0918b767d67674bb934e5d788d54b273dcc99a96de67ec0ec60
+EBUILD ps2pkm-1.8_p20210325.ebuild 778 BLAKE2B 9d04d755585356dd9855c8ec08be981845e927047a47cdcab95e6f85f25bb79e0af5640353a88aadd30951d2f7e51b1e950f7735d4da9dbc428672b89ee0cd6e SHA512 a2dfd913c4de734384a68baa567e4165abb50d22d8648d46fdfbf26202035aa3e406a9e9e207fd1add7bd6b7c5981ed1862bcea4ca6da30495b2cfd94f502f7c
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
index 56c4150a4946..ba369b0c001e 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="MIT"
 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"
+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"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
 RDEPEND="${DEPEND}"
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index f854d301d8e4..7a2ebd5498a5 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,5 +1,3 @@
-DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
 DIST pytextile-4.0.1.tar.gz 49282 BLAKE2B b51220ff33fe43b83d0aefee840b5170747015073fbe88934798c2505c3455e9805eee8815ec8068521c88a44a309bd0eb32e84757d088536f1c12a1f9bc0ca0 SHA512 e299663fd71b935e9c948649baba80584b1339dd3393a3f37b39475fe1d6a4addaaa2adcd16ba57b4c5db43ab9f8de6e9332871915b1fff7b7882ad5e8d64580
-EBUILD pytextile-3.0.3.ebuild 1019 BLAKE2B 853f5d6a2211efe889276fb6bd0a16b8544360e9c3a4d399c69dd9d1da3a07c072850bb688a75032ef70cf67f8c7f3f96519f85604e38d754f628f51f0a83031 SHA512 d23bbf6112c17d902e463a2a2581a52e1b0c958b317fd64e0033a929ff6fd94a0e119d6cb6b0a4b25fa9aa81e8c3f81126b0f27f93feba1492acd8e9c808c29b
 EBUILD pytextile-4.0.1.ebuild 1215 BLAKE2B df2236630c1210a841998c67aae0d95c42f7d48f68a38fc2696a0c5d141e8ecab24dc3e2ad99e31b61111523ab6fa1564d6662dce13da50cb598b2e47c109b60 SHA512 f0d5c43bd329be36fd304fb3f2d1517d7eb1102ae8b456290d4097c46cc90b87247d0f8064e57b514ac81bba01023be50b4ffe7893143e339ffbe7eabed50491
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-3.0.3.ebuild b/app-text/pytextile/pytextile-3.0.3.ebuild
deleted file mode 100644
index c760aa34679e..000000000000
--- a/app-text/pytextile/pytextile-3.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-MY_PN="python-textile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="https://github.com/textile/python-textile"
-SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	# remove useless --cov arg injection
-	rm pytest.ini || die
-	# remove useless pytest-runner dep
-	sed -e "s/pytest-runner//g" -i setup.py || die
-}
-
-python_test() {
-	pytest || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 8370393737f4..6a2951fc4e9c 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,5 +1,7 @@
 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.7.9.tar.gz 2230259 BLAKE2B 36039ba9e62c5113231764dfa9cffa73b7ff5cd91bab622a0daf0a48a73ab8a62afd16132cec2590eed14623ce5b86ad057e8ca8454cf8185869f0780b3523e7 SHA512 277074dee63cdc7f1a1be2acca67481b8fb816bd4319fe8e882696e42d15309750b930fa9e8d6286e714132a976f0eaf87f718560d6cb86eeaa79b86f0700a6c
 EBUILD recode-3.7.6-r1.ebuild 1006 BLAKE2B 23141789d5bbcc6beabe28c9d45b29f9f0c984c5d8145351dff53cf73cf97192b6c022d74b864a5265d1b90eccf28e0dfdda7aea0d28ffeaf7923bce8655207b SHA512 4d598eacabba0db13ceee3101e738855f8f7bf5560dcfeb18f9bd11433c65c053cc2f79c36a63025297b6fa7309a23962d9340eb6bdeb7bcdcf1c80cc42bbcef
 EBUILD recode-3.7.8.ebuild 1299 BLAKE2B 5f507df510a1d03d4acc5ac5393bedf458db17a8c080ae3596b3a4f269d873ec56312a502cbc085d5b1669f0b42a28ab96a952e2d707c80b5dab97802f1f7989 SHA512 08ce3bfed0aa9cc49702b0390365cc3c962eb1a63dd32e6d673460de13e0cda7af7adfa8d4aa72e8f23deac50fd5a3d41f570fe7feafc23fc305f11020c07ffc
+EBUILD recode-3.7.9.ebuild 1306 BLAKE2B aed00a09f17165e8a0f5d491c3166a718a50fe8a6d7040716c809e46dc6c6ecb819c31d986aa1178d0e1b1be863c96d2712c84c017a6ad6e942b8ccbc7e676fb SHA512 b2eea5e29f2da46efc389b8b49c584144c40af5a40bc24ca0ce7b3879ce15db1953a1c79d5d33a90d0fc865bcf779082a89d8e174246dfbb2e1db43ee6628890
 MISC metadata.xml 430 BLAKE2B 2df5bd5e46e37f7e60a6064a2f13876bc190121189057c703d98354a24de68e49b3a67337bb10a43c419b777af014fc0238940b44ef812862da5eb2250a06a5e SHA512 796421baea5a32814112194ac554251426312280ecd1517076a1b73b4e21026cb149e294df50a00e0c4674066640d0f5fc9f650198cde5b1a44f8f1446715d3f
diff --git a/app-text/recode/recode-3.7.9.ebuild b/app-text/recode/recode-3.7.9.ebuild
new file mode 100644
index 000000000000..163176ef093c
--- /dev/null
+++ b/app-text/recode/recode-3.7.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# librecode soname version
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/libiconv"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	if use test ; then
+		has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	tc-export CC LD
+
+	# on solaris -lintl is needed to compile
+	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+
+	# --without-included-gettext means we always use system headers
+	# and library
+	econf \
+		$(use_enable nls) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
index ae48267edb43..d3ac5d480b61 100644
--- a/app-text/rnc2rng/Manifest
+++ b/app-text/rnc2rng/Manifest
@@ -1,7 +1,3 @@
-DIST rnc2rng-2.6.1.tar.gz 14330 BLAKE2B 04d316f03da1e936603ca69cf5c8e087dd3a45f457d2b245452544e2a74a730d4c20a655a3eea5856f7f91e9154a7196bee89e8cc052cae887c6188da89b0574 SHA512 ab18b713d8756153fe03c76901dac7b090c7eab12042a251f2e97d7ae4e1ebfdf969a826305704f073c9df5a0980a6d8cd5d4e7a12a8caed018cab46a9196159
-DIST rnc2rng-2.6.2.tar.gz 17981 BLAKE2B 202b7f540197a5a17367a28524c4ca2b532d9e051b349654978754a0b96ecc89536a2a0857a1244027e0815ac1351581054c818787faff8e9a0ebd034c1c08ee SHA512 d305e902e16b3c30f6654475b28b2c71dec40bd6f7046bba8e56b81b947086e004b6b572ab3851c8622d00ddbfd7c65228d2b39b1f1cd647ebfd1e3082886f28
 DIST rnc2rng-2.6.4.tar.gz 18005 BLAKE2B 4725f9a8dfcc5e7ed26c4560d9198939d51376aad8feaa5e592bf28c9014d1abe0e90c47f6aff9ec0d7cecc815660a3a41270c118e4db87030e5a1fa208f3177 SHA512 c26103943ecac440dbeb4db6f913e57c2e4b1f84f92d7e8693e66b6a1e5af051c49ace8172fb94dae2d447ee042e432af15cc578e606452b50ca843d8bd85378
-EBUILD rnc2rng-2.6.1.ebuild 526 BLAKE2B 659af24b255a03f7a18b905ef55b998dd6a5772741dd72c989e1e6d27be4477673ef17aac187fd0b77ef2eeb7360b49418ef7069f6bed1a45262ccd3fc70ed6e SHA512 bd65daff8c92917dbaa6ee5a8f759e93c915f4a170caed0adc6336605bf005128a40c8a53df18c13bbee5a96b2fd3ab1b42539d076cce7e30978d96cbd54ce3a
-EBUILD rnc2rng-2.6.2.ebuild 516 BLAKE2B 3b2294a5b599a6f2df8d08d0e95d6d1a5d5759d6682029e2559eec0f3f264e27d63de1b0ab559ad84ccf2390fde2b06591e2aea4095df5c61f3df845272d25d1 SHA512 b00b7c76d6a286898a1807cb3814fd72e78b55811676eec76a4c1b0a3867f6dafe0b69feab788f4f86898fd75b916bcc4feaece056f245fd62c21f7c9db53494
 EBUILD rnc2rng-2.6.4.ebuild 556 BLAKE2B 89697fffa568d6535ab6a188dca657de7b60170817f32efe22c4d37c98a9992a3988e047c4a23f04118df46397a7bd85c953dbda1022ae8c0f6020326eb80b73 SHA512 fbbf384237b5825a3303310c6770a949e5809e6b2e733dae2abf767533a9cbca5cebb556bb8abd3e56cafed2b457a7d2db79227649a728fce7dcfcfd1b0205bb
 MISC metadata.xml 366 BLAKE2B 070e33036f9d25fc5c34b2c4605f1c1eeef1d108a439c2356ab8bc6a3010865e7f72d8cf4021a7644336d34cd9bd11114af0b9eb8057be0ae8e7bef7fd6a9462 SHA512 0ed8a799683a3e54b6bed7d5bdc0373db115baaf7ade3118158792b6c3f93ae9ddbf3f3f8770b43b2f526abd7624422d45b8c844d8bfe2940c94f12b8fb9d872
diff --git a/app-text/rnc2rng/rnc2rng-2.6.1.ebuild b/app-text/rnc2rng/rnc2rng-2.6.1.ebuild
deleted file mode 100644
index f156768852a3..000000000000
--- a/app-text/rnc2rng/rnc2rng-2.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
-HOMEPAGE="https://github.com/djc/rnc2rng"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" test.py
-}
diff --git a/app-text/rnc2rng/rnc2rng-2.6.2.ebuild b/app-text/rnc2rng/rnc2rng-2.6.2.ebuild
deleted file mode 100644
index 0bc3b2b6a12f..000000000000
--- a/app-text/rnc2rng/rnc2rng-2.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
-HOMEPAGE="https://github.com/djc/rnc2rng"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" test.py
-}
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 630dfe65ac04..a594c5d0aa1c 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-2.3.ebuild 12270 BLAKE2B f05f08d66084896780448a04fee6acedbdafe34ee3ef97bd173f0d9c12f6ce148c5494be50e1659c97aca98ae300338a74ec325b21a411ebc26ae60f2432d704 SHA512 f14d750a5594735afdfe1ee1e49adcd12b3ea50e49cc523ece34cdf9fd3334c08b4b918e0e1d7da7e1f8b0e7cd965de8c2ea4ea225e2ba4cfe5fccd9d7f6d274
+EBUILD sword-modules-2.3.ebuild 12269 BLAKE2B 6cbe97bae4d10bf412b1153045fca55b3ec0e0bcf7015ca73fc06a71f3dce57e9d185407ef087bba95fc6b3ec9657adeee48beae6c5925c2da5964b49e1378ce SHA512 19172f0c228a54bafc26e5d36a80d4ef02e910b1a78931d503b854baa12bced22598042d2fd34e6cb28dc72cd1f370a880bf8fd3b43968ce9a9c7e382fcdb5a7
 MISC metadata.xml 385 BLAKE2B 58e3a018c64e0068b39c728415f94cf05afe3c63e4ecb340ef47e6ecad5a3c8aa0776b6390acfa6eef8775e5065d5a65c3ea8ebc07219a0a990be36e3bf305f3 SHA512 a305a1265342a3674f5bc0f2b5adb788732ccc78c5e05cbdb116fb4a556ae099d8394c10572e5e01e3dae70bf9b4eb982079bf130b4567f4aadb55d3e76bbc1a
diff --git a/app-text/sword-modules/sword-modules-2.3.ebuild b/app-text/sword-modules/sword-modules-2.3.ebuild
index c69774346873..a010666f5900 100644
--- a/app-text/sword-modules/sword-modules-2.3.ebuild
+++ b/app-text/sword-modules/sword-modules-2.3.ebuild
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 LANGS=" af ar az be bea bg bla br ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
-IUSE="-esoteric ${LANGS// / l10n_}"
+IUSE="esoteric ${LANGS// / l10n_}"
 
 RDEPEND="
 	|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs )
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index a05425fae35c..dc51cc98026d 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -378,5 +378,5 @@ DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b7293
 DIST tl-xpdfopen.doc-2020.tar.xz 28176 BLAKE2B ba0a9f1621999a8d98dd96f72fb93cd7a380e1f6285d2d59dac812e68ac91c08e815756553e10ff8cf1042dcbfa71bb994abab000910cdb1e6ddf113eefc481a SHA512 8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32
 DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404
 EBUILD texlive-core-2020-r12.ebuild 11941 BLAKE2B 06ee8afe2cd8345b6a6f7f50767b36661db7bef5d0cbdb7679490bdd72a48e7d013682cd7a8d2ec0ca1896d10de2127b665f23acab62460a055e1b0895496a11 SHA512 47938416987dccdf293554654287e306f2e3e122711818f7439f61beac493ec9eb9c80d6967038f4c12fc01a9bb18a9a4f49f2ea853170beac7bce6fc099b557
-EBUILD texlive-core-2021.ebuild 11774 BLAKE2B 1d793d51154a63ff3e35ee15d4a75ab133962786e23d7764a9f68e93247088be361a88059260bf1d4f294e26ef2d1c8f083762dff064e2ef1e2ccbe245e83a23 SHA512 baf0e4ff92c0cb39ba7e4b94bf0af3ab3fc0302d030cc2aaa3b45c7514f46599d801e7a5d7e58979a2e0ea995a183d01776646bbe4b04d658d742bef95d68880
+EBUILD texlive-core-2021.ebuild 11766 BLAKE2B 2ec395f4caddd1ba57584e023fe39648f9eb88695c7ae6b2942df4beffee9e1b8c1c4104f4631e8f470c68e1a2fbd1a51c3035cddfe58635f89d39bd95e5f911 SHA512 1711c3bcade1f086ad1550ac89ee87c1318f296f19aefdcfbd7e4fb46c42c5184bb654a74b6e8b2e7b61b1e4c0b951e3a2559719782c6a30201e3f4b41806287
 MISC metadata.xml 674 BLAKE2B 4bab73d192039ab8cb3952877ced5e1b7b329f47d2a5b96e72ec82428dbc2236629abb7e2de1af1997bf577fc81cc91ada9f173eadcd2a2e726acbd79b9607bc SHA512 6faf1b433b9236aaca1fc07aa5679752b2d0214b5bb5f7aea03aa6c21e8a1880a103dea2b9a4c87ea84e85d91d259a2c01f5906190c96c7467f8b0a4863d85c1
diff --git a/app-text/texlive-core/texlive-core-2021.ebuild b/app-text/texlive-core/texlive-core-2021.ebuild
index 6e386ac22154..512afedff308 100644
--- a/app-text/texlive-core/texlive-core-2021.ebuild
+++ b/app-text/texlive-core/texlive-core-2021.ebuild
@@ -75,7 +75,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 IUSE="cjk X doc source tk +luajittex xetex xindy"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index ae06161488e7..aff21e8a7f32 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,3 @@
 EBUILD texlive-2020-r9.ebuild 6758 BLAKE2B 026890baf4d477e7140005a243eb890a7ffbc8163860a6d15dd95398c95bedabada111f86e10823e8c35b3b4a9415e118552634229c6d8558b4b1da55cb0df44 SHA512 f3e496d5438643e000b06025205c0c99b1912535fd69e98f5e213d24328320db560ad845edfbd599a76756b22b3bc0f4b2b008270d2df92c7da2c5d57e846bd7
-EBUILD texlive-2021.ebuild 6694 BLAKE2B 82ac251256335dbadc451e45c0861dbe865f17083ff53e9b5e7fcfee1a442d10e8482a2c932f846fbf54730503b2dbc9012979769b54437a3cdf497a00da6829 SHA512 1fb0d61df75eb4f304c84af7c03a5b66d5aa4f54dc36b3de7ed2ba7553d3adae0408ae5f980f3bc474437ea61b487307e41195bf48b84f21d158918dccc2c81b
+EBUILD texlive-2021.ebuild 6688 BLAKE2B 906342092da463d8872d87fbeb5d7594bd07c229c5fd5878a1b4e79d59669d1ebfc7ea45d77c816bf5749cbef3709ada8346231567bf129d4549f22f8a0233a1 SHA512 51553e74ad8390f2c21d583698e5e50eadef1fc9b08467e6b6ae29dcfc2b63c21b83249295906946afb5aa0df1049e3dddb031ccfb7b182cac66f2fad1b4c231
 MISC metadata.xml 1932 BLAKE2B f69f70507b754ea964ffc2c7a1d5f693d782e87b4b40fb715b2be25d044a628cb9177c3b7695ef4093afd72b54e15f43564978b104f8246d3b307e288b06585d SHA512 3f9f2defe49de21e0eb8c6398f607d0138bd789071766e0c3a737dfd5692b41423ba29107e817a760a410080fe55e42cba33f84c08f70258ffe5b7337d34f2d4
diff --git a/app-text/texlive/texlive-2021.ebuild b/app-text/texlive/texlive-2021.ebuild
index f88937a1333b..8e45ab20cc60 100644
--- a/app-text/texlive/texlive-2021.ebuild
+++ b/app-text/texlive/texlive-2021.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
 
 LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index 16f2356b225c..35875681ec29 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1,5 +1,6 @@
 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 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
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
new file mode 100644
index 000000000000..f3f78ced3cec
--- /dev/null
+++ b/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild
@@ -0,0 +1,26 @@
+# 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/trang/Manifest b/app-text/trang/Manifest
index 2b4a31f85599..80b73725e6f2 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1,4 +1,4 @@
 AUX test.xml 3053 BLAKE2B f9837b05c4ac00fa63ce75f04318f3378c2cc0c99680c21520d7d75a74e0e9ad00a9fcdf4857655ac32a3eea935208dc86e51d2bbef3e2349cd78d65ed74ac30 SHA512 11b4faef6fce89d72e8cdcc25cc1dc6c89ea7bc44252e0521a9a5ff47f686e78c46eac6b606e47f51b0bdb8175e583d5c1c56bdcb8bea105c70a63b65f20ea67
 DIST trang-20151127.tar.gz 13746141 BLAKE2B 8895fefa8be62a524a2bfb603a64bcf641f13cd500dbe51b9efdaed7d5147dd6478963d356aec81c5c5b6af12a59edcb908d203b6b8edaf093fe29f76db80b7c SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26
-EBUILD trang-20151127.ebuild 2070 BLAKE2B d9355cb752161614485ca3911cfe293117f08b78ec359d3296604f0018bdfd39d3bc578efda8d1abe00ed4dbff57315460ba204ab41200b4e7bfea7e986f2a3d SHA512 b0d9aa8adb56abbe566ccf37e6e2764127d2e752df1b02670175a653187add219a74433bdb6cad7a691a14effc59c25d7d18c08f0721c4f20fa34b4778dfb9a4
+EBUILD trang-20151127.ebuild 2069 BLAKE2B 233f0d76735718b3976bbf3b85424427ce31498a59242defa0c371623973e3de5033b6ef7f3585d7dd2107ffc359648742b61c13aa4a4684296c596b6015de4f SHA512 d9cbc6d59339a5d527d62e7524473f1a6cff992fe1c1e4dbd080682241dbabc4df8a097e624308d11e6987d704659281f3f7ebde8e06c4fbb390417c4206cc77
 MISC metadata.xml 374 BLAKE2B e8d7e9fafb80a0b972bce7a3c8a02abacec08b11bee39dcf2b927cffe59931daf6cfcc3372f2a0549a1de4310332a072e3f154ce0e8241cf9f4e616884819dae SHA512 884f58def744deb8a44d8d60a178d7409bb67afcb3b88c224608ecf902a00602e6aeb0da8683fd6edc20d07bf739492196067c4b2821a129255e510b6991bc90
diff --git a/app-text/trang/trang-20151127.ebuild b/app-text/trang/trang-20151127.ebuild
index fa287c480746..55c73618b101 100644
--- a/app-text/trang/trang-20151127.ebuild
+++ b/app-text/trang/trang-20151127.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -47,7 +47,7 @@ src_configure() {
 	# Because this crazy package uses XSLT, we need to escape this.
 	sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
 
-	EANT_EXTRA_ARGS="-Djavacc.dir=${EROOT}usr/share/javacc/lib"
+	EANT_EXTRA_ARGS="-Djavacc.dir=${EPREFIX}usr/share/javacc/lib"
 	export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
 }
 
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 05388abd5f27..ad5ef2f8614d 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 EBUILD ttf2pk2-2.0_p20200406.ebuild 1120 BLAKE2B 92b477af86c6b1bb15a24e0cca0d28c85182168fe47f91a5d20b2cfcc0870db239975f43bfc55d2142a9494121e91b82414aceb6974d307e265f93f3452dd40e SHA512 00585ea45690ed0052940d42a4410a39d4ef2239a581b9e62c6494aaaf32a0754b7c6617bd42f807f56ad5489125db7dcf424168a3edec309af0e3810b6a7e37
-EBUILD ttf2pk2-2.0_p20210325.ebuild 1127 BLAKE2B 8a66adfb1cfe4e88915d4c06780fe1c8fbfc6636ae3072431bc3b53b62370ea0084db269e877e768670c07324923a8210cc6a9e9a239da1a9510dfcb5e23d0df SHA512 a20f912d525874b85ed46daa43e0482a0373413fee69cb371e1b00d12cfdf5f77da0474053465cf777a41e4c7c51ecf63c1d00f7d73bf3dbc7613a3cc37ddd25
+EBUILD ttf2pk2-2.0_p20210325.ebuild 1120 BLAKE2B 92b477af86c6b1bb15a24e0cca0d28c85182168fe47f91a5d20b2cfcc0870db239975f43bfc55d2142a9494121e91b82414aceb6974d307e265f93f3452dd40e SHA512 00585ea45690ed0052940d42a4410a39d4ef2239a581b9e62c6494aaaf32a0754b7c6617bd42f807f56ad5489125db7dcf424168a3edec309af0e3810b6a7e37
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
index 901cf53cd7c8..e722a14b4810 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz
 
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 7edeb598daeb..af51c426520e 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -2,6 +2,8 @@ AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de2452133
 AUX wgetpaste-2.30-fix-dpaste-escapes.patch 493 BLAKE2B db87670a90aa94a2b79844d7b1abdf349cbb600118b8a2a09def19185bc2d3460cdce36f56a09f1c51e178e7927abfe50772b75c39889bef55a284fa0312fb6e SHA512 0cec0d469327c9d6700977f36744b24d1f450bb3486058ba43c233190dd2d4bc10c52d7a90a53896596a06534d39ed929cdea1a0facb5a1bd9c97f92c986f46b
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
 DIST wgetpaste-2.30_p20210222.tar.gz 14654 BLAKE2B e74332826f7faec3c2be2dddfd5f81d1ec14aec92888f27cdcd081b59262ac742003f2f48af3c3ca25be9e02f583a37dd1bec315236ab54912ebf6cf61308a10 SHA512 467daff5531fd6361ade87913ab867f67f72d5ffc07a35c263cd3dad65774ed31b3a6b0d69d2b52726a24419758d784c23e8c587f23e9028afd0e0a27966f32f
+DIST wgetpaste-2.32.tar.gz 16626 BLAKE2B a8628a47edec5797f011fdf648cccf4147043bb699fe6ebfc38b66d1bbff1840147613e1de1a2abf1048b83247e9a16026bed4174be605f99e59035cf7c64f9f SHA512 57f6194c864adf3eabffe46163d1c83a5c2c30affc4c353fee5cafe6aaf19cfa306e134cb5dd216577eb34cc93eee66b28297e5a1d4fa92d78d38597170d40bb
 EBUILD wgetpaste-2.29-r1.ebuild 669 BLAKE2B c0003f40085795be13306b8dd3b5fa26d5dba6d5475726aaf6e483e4e958ecd7ae862b3df089210beee017eefbfc30dc88a3e6aca3aa9b85e0e397b4b51baa5d SHA512 0fa556949fe80fe15d5231a2940e35b571b3403e5106659027368cfa562dec6bab0512f93442740db2d73bdff143fd4a708b01fb8bead94c96e226e986ff38af
 EBUILD wgetpaste-2.30_p20210222-r2.ebuild 819 BLAKE2B c109de02941711ed4d6d13887d1e34b89f271bfe8d45dd4139562b6f3a8eb9d782e26ebdbefb857994fc0e57fdcb20ebb72abbbd8cd939b53cef2b3eeb531f12 SHA512 c41ca1c9151e87de932e0ff1c5207e90f27c79e548d57491521573b6729f2a6aed8cdd5d63ae074e20949adc32630acfb38ad46dcb94a663837c8d7dc4323d48
+EBUILD wgetpaste-2.32.ebuild 658 BLAKE2B 867ff1702f8db0559eeb8f959b6c628145ed1774aebe7048f4b3895b65f7b9ab75ef44a46a3f059d40f4d18f06864b2c4dba33c46a75cfee6a6e0663aac2defc SHA512 0c7284b5eb91b048c125dc79373f244c6618ad0ba99fd63928318525d53ad6f48a6a88dd4fb148427a40bc1cf19c7f819c624b50ff5a9c651bb105cb7805775a
 MISC metadata.xml 412 BLAKE2B e746785155941e2ca0d1c502bfc90a5f709b2afbf45e9e7f5ac291eea71ad67d54f5da691d72206556d7681ba5ebb8c9cd3bd8e1352353fdee802cd8fe7c2fff SHA512 1fecddde86406300943195b5be5502cb6efa1c5d061e56155946ec8b7fe9daaa74234f03a8f93a29a86544b0280ef58d697a9e96599d6fa5a2712d56c47ab236
diff --git a/app-text/wgetpaste/wgetpaste-2.32.ebuild b/app-text/wgetpaste/wgetpaste-2.32.ebuild
new file mode 100644
index 000000000000..d738ebaa2c55
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.32.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="http://wgetpaste.zlin.dk/"
+
+SRC_URI="https://github.com/zlin/wgetpaste/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+ssl"
+
+RDEPEND="net-misc/wget[ssl?]"
+
+src_prepare() {
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+	default
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/zsh/site-functions
+	doins _wgetpaste
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 7969927deaff..e405f33b3817 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 1169 BLAKE2B 5466a3404b1a84d9c4e6b55c4cd5ade7148d3655dc5586b2e15902a1b64b3958cb246376aa2cedc5ceef711b8577484044523b7cb8bb1d4b802354e84b77f399 SHA512 baded5aa583a65c65969eec5355e47a77da16740f2b29dfb88fee53e6b4bbe07d8a80e152ff378feddfe21306b296e7d5ff5f5a5ed84fe7eb95ceaa6b7ac8672
+EBUILD xapian-omega-1.4.18.ebuild 1167 BLAKE2B 995e8887d014ebb258f6e953cba0388d4ad9b1c4b0903a67730418d5b6ae754d5ffd69cbc01bdd6a7f31e178af5f274d1a3c5ce8b0324d35f7ca58d507645e32 SHA512 5493576eaa29e2244e7ce7440e6f00eb342f717c243d1bb92cc0427798e5961acfe95dfcbc1332f3c0b1454a7c833652041bc92d03008599cbc7a51b5eca7044
 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 6623cc6dbeba..c3cf578974f8 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND="~dev-libs/xapian-1.4.18:0/30
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 928085e93b50..5b4e4f92f171 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -2,5 +2,5 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8
 AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
 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 1435 BLAKE2B abcc70422eb5d91bed1137158a33a9d4e2c6a0a2833e37d549d8c573377909e347989c40cc51d5beb09425e6f5f47c4159158ab638088e99464568098e841885 SHA512 c59fc49e086cdc37b40fd4bd7849d4fe191e9e4f3b119d28a5a14c2166bf68e444acb8ca31a0949b400891cab4d7d63b7228c6601cd81f03adccbb288c2b5ea3
+EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
 MISC metadata.xml 323 BLAKE2B fc92312d7c96a25a1d35384dd78942a7d6bfdeb0d1c36a7ffddc687d42a83261766e7042dc109b2544da11d72274761a98c62cc8e0ac872e8478e5e027cc69bf SHA512 33789a6e807d048100b32969bfbce0beea9c3b25fe279fe5d318d59b970b4562ec8edd222bf5817a62e46d23961160ccb11384be06e605fb115b3fc7c72299c5
diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
index 87c5faaa209b..9188b524d598 100644
--- a/app-text/xmlto/xmlto-0.0.28-r6.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
@@ -11,7 +11,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="
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /app-text
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)