gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /app-text
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
92 files changed, 1113 insertions, 494 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e01ff6b14fc2..5092b57504a1 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 61a25da46990..a78adfa31ba5 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1,6 +1,6 @@
 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.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1-r1.ebuild 911 BLAKE2B 123b26f66856a3447fd19c282cb6b33dc2fd82d0cb98fa36b8a09fa798a410f6e6f202da88a03ae6c87b6a640b6b4b97c10cb9b7034d71ec8480e1f191646711 SHA512 81e07f8b5aa16025e0a6a980eb0d5a42d2d45001a660f72ac5aa9148693dd101975c5eee1ca0c87355313194651cf378757ea6af4b5d7e23aa721a644bf5e5e1
+EBUILD aiksaurus-1.2.1-r1.ebuild 918 BLAKE2B aa9a0cc3f79ccf981488e1e08b6336adfbfb6e9d209235fe209c85cc9849ce94f9b6068f031e67cf8c7e0471720af7355f9a0dc33cdf5b9c029fcb2a80ab01ac SHA512 cf47fe2edca5be36e676301eb84f9553c5d3a248068c23303ba099eaa64489330050787c296d2b184767573beeb8f5e9b9b5930f50c72214aa9b2c6e61595dad
 EBUILD aiksaurus-1.2.1.ebuild 792 BLAKE2B dbea7c8127b13263e87dac48c1acf606e91eeb0455a4ca9151da2c5ae74098c0a4282db99f36a1ab46f764afa65810e5ca7726b919d44edf679cf1e27e25a5f2 SHA512 54e4f2addec2514af7f3c734aa99354713b7db43175cc18a0da8179afc001f6b89a266306160dc97d556aad3614cf556100c5df5cdf14c1d71f010b43f1ecb7e
 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-r1.ebuild
index dd4ebeeef7d7..9b41a9721e55 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index c518b29f0b6f..dd88869312db 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,5 +1,5 @@
 DIST console-setup_1.104.tar.gz 3272857 BLAKE2B ae7a5929a059ddd2258884e5207198ae517da1284e264527878ad25bf883e48b399e53f2a987265623a5cffa3eefce8cce5fe8ad632576c46bba40689c17c586 SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
 EBUILD bdf2psf-1.104.ebuild 678 BLAKE2B 357443c76f206854737eec7b9d32561515339e316428cc2c45d4bf9e222d36deebcf8191774961089c120eb074c8c357259d527d8e32183bf04dff7851e42226 SHA512 54f8ee43215a9e2de7eef0a5d4732d07fe26ef6f68c22732dd616f012e781f44115b01e80516cf5e585140fa91be4103e4d41b603b510b74ed6eda37f05b3460
-EBUILD bdf2psf-1.155.ebuild 679 BLAKE2B 1576f464efaa7872f195ba8ff38c0903df69ac7c1f95b3230381f707ef10ddf5b6f1d9b12ab0038c079befc61326838276ff7e065a40b03f687a9cd7d76997ed SHA512 0581284f054daff9350f22d46b80dce19610b284e5f28321cad633095f532b119b442c33459da378d5ced0e27a7dbd38ca4c7caace081db5fc0c5322dfa76ac0
+EBUILD bdf2psf-1.155.ebuild 678 BLAKE2B 8004a9359bef3f975bb70aceb4e1bcdf417b3b5e475606f4cc7846b724bce95e96b0d7d56932cddc04fc09439a41573837e1008dec38946b0f88750189203cab SHA512 2b65c85a5682775b3b5e89528ff961a805bb6e09a5f0cf70760cd69201bbc4737c5d0f7323acddbf3cc264ee104d2c9ab14357c524305781db0a71058b963e77
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
index 9480d5ed4302..e3c04746c942 100644
--- a/app-text/bdf2psf/bdf2psf-1.155.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.155.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 80cd03021e2b..15d22894613c 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,4 +1,5 @@
 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
@@ -6,7 +7,9 @@ DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b67
 DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
 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
-EBUILD calibre-4.22.0.ebuild 8692 BLAKE2B 7d394fc987120030e3ca6dfc593ddaf103a52983f13bb95e02c063da6ca9c3500f6c1d60148040bb8c19e70d731145b1ef086493f2817b4512b036c95daf8a1d SHA512 4fbd12df71e6ad2371540595b4aeeed833a465d5c9b6bff70d20949d27671a875e209e5d98a84cad0d16176879d8f4c1b7f7dd46427f5e32a7c9fc600d508955
-EBUILD calibre-4.23.0.ebuild 8735 BLAKE2B dcec79565840c0fca422ea5a973072e46a5233b5440c6eaa2db8049151e4110a1dadc8af8c65e43bd2d1010f7dd63a0f39d30192e4fa1bf28a5141753f923363 SHA512 6fde8b0929df69346aa619e2398ea7f43d03984eef2db967e3047e490c22845641883b78b049c59be62b9053f4ba77a29e325138d7c5c3820456d063fbe7b0ee
-EBUILD calibre-5.4.2.ebuild 8659 BLAKE2B 1b5bac25d97ef4543c94a8646fb44c024918f2302286813fefd328b984368a49cf8ffea55410a339aa4acb407a78b165cd9566ac31d35f538561c96aa54ceea4 SHA512 5a533b3858f0ca63fb7e4a1a9abe0cd44906ce9c1cb54e4045c3e802cca147ff78691a83000daa561c4c1a956a5c63ea047c380c86a6e04a51c3b6c8aa62268b
-MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
+DIST calibre-5.6.0.tar.xz 36653328 BLAKE2B 44941c50873c285aa552c5b4ac716e5d3dd6bc3e1a4f13b1003d42adb808566ec3a5083c683a40d9679524e4ae70eed6ec8bc4c70770991f9791bcea25387c42 SHA512 5d06b60467bbf332acb8666d4117407c2876cfe2726dca3e9d9ed5d77561614406c7150c2800aacefe3cecb0869c1cd7b2681eba27830248b3c32e362123d50f
+EBUILD calibre-4.22.0.ebuild 8777 BLAKE2B 98571cdd9f4f5af94d5845e72916be4bc7e3b0ece2e0179045bf4799e219a09a107d0e93f665e2980001b802705392aa5bb8709604e1ac319a65edd452d0b539 SHA512 e9488d9110911d33c7568f608f825e4481e3de0659c8304a5d9e4a3734602bf126806e3e460b2cde45866d0c2976fe45238f3bae67d2bde299f9326ce12e2ff8
+EBUILD calibre-4.23.0.ebuild 8820 BLAKE2B be3ea817795c0476cc19b1b0421df52030ac27e4a3ed3651c3d3dad9c3e3d2ce5d276442cec72a6eb2451684f5196beecbc70d8f02d520601ff9546ae145a2d2 SHA512 e42af2e3e12d811690586a4af4d66854e2c9e8096e31abb32ebd1181e6d982f93aadce3d26b5e00f15572b9b1aa0badca8de27781adc9f3aa9966b26554fa4f9
+EBUILD calibre-5.4.2-r1.ebuild 8769 BLAKE2B 8fffa73b1f6f9ccfc6bed49e8beab87f3b0c77b8a967f8248efdbf9b96ed99f8ccdbead2f2244f8090e3735e1da5036660fea607d0e098b45314949a3f42f0c1 SHA512 2b8702a7e7066b6f4de86b3dcd709afceecfa8cb810e65a2f03b327b6938ed6b6e562812f8af51a311285ed66080be9f53daac4289be823c8473d89ac88d8fba
+EBUILD calibre-5.6.0.ebuild 8713 BLAKE2B a26ee08f18f7e819a6d28e18162036b67a1bbb6459a7a3be5afee012ee9fc254f83c29fb0953ed9310cda882dbdd36a6819101e707418be2b70f26077a78d6a4 SHA512 592fce01d289f6c3206e0ba9d7139122f767bb035acff99bc5c73a88752759458b03eb50c93c99b941b6b39b59b1dc6a16b3cceb8929dd501caace7c38d829f7
+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
index 7dca7d16c3d3..e4e9240c23ba 100644
--- a/app-text/calibre/calibre-4.22.0.ebuild
+++ b/app-text/calibre/calibre-4.22.0.ebuild
@@ -124,6 +124,8 @@ src_prepare() {
 		"${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.
diff --git a/app-text/calibre/calibre-4.23.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild
index 2e529363d2c8..52871226e47f 100644
--- a/app-text/calibre/calibre-4.23.0.ebuild
+++ b/app-text/calibre/calibre-4.23.0.ebuild
@@ -124,6 +124,8 @@ src_prepare() {
 		"${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.
diff --git a/app-text/calibre/calibre-5.4.2.ebuild b/app-text/calibre/calibre-5.4.2-r1.ebuild
index 6c46bbdb0639..85080bb9aa86 100644
--- a/app-text/calibre/calibre-5.4.2.ebuild
+++ b/app-text/calibre/calibre-5.4.2-r1.ebuild
@@ -42,7 +42,6 @@ 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:=
@@ -67,6 +66,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=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}]
@@ -126,6 +126,8 @@ src_prepare() {
 		"${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.
diff --git a/app-text/calibre/calibre-5.6.0.ebuild b/app-text/calibre/calibre-5.6.0.ebuild
new file mode 100644
index 000000000000..1547c3b7358e
--- /dev/null
+++ b/app-text/calibre/calibre-5.6.0.ebuild
@@ -0,0 +1,264 @@
+# 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
new file mode 100644
index 000000000000..c4b3baf05703
--- /dev/null
+++ b/app-text/calibre/files/calibre-4.22.0-icu68.patch
@@ -0,0 +1,49 @@
+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/calibre/metadata.xml b/app-text/calibre/metadata.xml
index 2196cbeb104f..c7f35ac2f858 100644
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>axs@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
   <upstream>
diff --git a/app-text/capyt/Manifest b/app-text/capyt/Manifest
index 617bf7adce7b..29f6695c5144 100644
--- a/app-text/capyt/Manifest
+++ b/app-text/capyt/Manifest
@@ -1,3 +1,3 @@
 DIST capyt-1.1.1.tar.gz 3247 BLAKE2B 259c1cc7eddc88853518ed106f25e9b1d47a5c4604e749d25fb2133f11d90e78672473a9dd31fa80322b4c5177163fe5a177d27a6fd9a7cd31ef12db7ee3ed0f SHA512 863164967aab93088d39b0324d1324145f41ba76b9d21874ea6a3aa49955e1ec3430c7bcc9eb100c51b9e159c63758b6474d3bad586383d7c10d9f1118340123
 EBUILD capyt-1.1.1.ebuild 586 BLAKE2B 907d28c7ecc85cff6c2f3736ddf2e64b4c71058a3864aab54d05a0f31d8112a2d6ab4027ee91643908920962303175826f0c9718c93168f10091dab898a3798c SHA512 ceb18fac932fb0eea865570017d9b810b3946bc0a5dc8fb23daa05aaedc65c4b654b9d43e3b4e579d62aa6ee2266d056c72853a63f85396e4f5de7a87fc3c964
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
+MISC metadata.xml 370 BLAKE2B a110aa5a03154a5505f9ff4add2d67e8e75f1313129dc8f0a83026f6d81fc84045046333f016bcea58ebedd030e844c48ec362ad5ec928b318c5ef9d60d93da5 SHA512 176af2d46cd2e63f642a2e9575b427c7feef57440d07cd8389241a03741af9983dfb2272b1034cb34b4b1b42de8949a1c6e9eb64aa3f0acebaa42cab4cc48f63
diff --git a/app-text/capyt/metadata.xml b/app-text/capyt/metadata.xml
index 6b0a0fb3a729..60660574b441 100644
--- a/app-text/capyt/metadata.xml
+++ b/app-text/capyt/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">capyt</remote-id>
+		<remote-id type="github">lbatalha/capyt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 29f27405778e..698f7f69ba42 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2474 BLAKE2B 3c7386e7d7b2101553bcd927aec8c2a7f7b3821efc437c71a415a734a778e2dede5d85fcb8cca5e07e66e5a9d1401f642c7da77f1c6521e0091caaeb2cfe6346 SHA512 bb88dc3902be88a7b0a579bde0287db59ae2091235529c73504ee6027f204b4bd217b317f153fee86d6b06ae786d3ccb8e16166bb5ccf2ccaa4b8e05dac76b3a
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2481 BLAKE2B 89b3a425041975a4154738d36ba7753297fc55b460c76acd53ea0be6e9e488db9de497b98d433d3093f8269fd60c8b9c8ffae74408beaef8c46e8615cec4610f SHA512 83b1f7657ad19f00004ccbbfea8566f3f7a41ca3857c5c4d9932d8e3f1e0b16102b3de4ef587f3cb328f23c020d643e40c557922dd37deb4246a4d5933d7bf0e
 MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index b271adb314e7..f74268994c76 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index cacf9c1ed595..dabf4d762691 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,8 +14,8 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1242 BLAKE2B 17b909bc422758d17dacf948f31f6684ac182f24fb756723cc61480a37e05a247418e0272dccbbd87fe492279647f08e7142c6a99e70e12d2c568fff8f19fe28 SHA512 070aea951bfb898bbfe3bba6b92d8653d2fbb4e2c87a33abea36f801d11bee5c58b9727e7fa78f61f646548c1067a184d567b0f80123d2c79a55ce78eee9baf6
-EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1242 BLAKE2B 17b909bc422758d17dacf948f31f6684ac182f24fb756723cc61480a37e05a247418e0272dccbbd87fe492279647f08e7142c6a99e70e12d2c568fff8f19fe28 SHA512 070aea951bfb898bbfe3bba6b92d8653d2fbb4e2c87a33abea36f801d11bee5c58b9727e7fa78f61f646548c1067a184d567b0f80123d2c79a55ce78eee9baf6
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1249 BLAKE2B 9ab8bfb460f974c24b27cfb73bf36ff108bbdc9fe45fe8a4e6720b1e770e152a03b2753a6c8fb5f6d457b89e86aa22bcdbe3c85b2810097cf3816ef44586b09e SHA512 7ebc7e23fca5dc965165cf37400a5168ff5471affb9c827169ed5cda2ec0db44151fee5b157cfe2f45b0bc2bbb49bcd221d527bcffe492b51da6a5f3e636cbeb
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1249 BLAKE2B 9ab8bfb460f974c24b27cfb73bf36ff108bbdc9fe45fe8a4e6720b1e770e152a03b2753a6c8fb5f6d457b89e86aa22bcdbe3c85b2810097cf3816ef44586b09e SHA512 7ebc7e23fca5dc965165cf37400a5168ff5471affb9c827169ed5cda2ec0db44151fee5b157cfe2f45b0bc2bbb49bcd221d527bcffe492b51da6a5f3e636cbeb
 EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1242 BLAKE2B 17b909bc422758d17dacf948f31f6684ac182f24fb756723cc61480a37e05a247418e0272dccbbd87fe492279647f08e7142c6a99e70e12d2c568fff8f19fe28 SHA512 070aea951bfb898bbfe3bba6b92d8653d2fbb4e2c87a33abea36f801d11bee5c58b9727e7fa78f61f646548c1067a184d567b0f80123d2c79a55ce78eee9baf6
 EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1242 BLAKE2B 17b909bc422758d17dacf948f31f6684ac182f24fb756723cc61480a37e05a247418e0272dccbbd87fe492279647f08e7142c6a99e70e12d2c568fff8f19fe28 SHA512 070aea951bfb898bbfe3bba6b92d8653d2fbb4e2c87a33abea36f801d11bee5c58b9727e7fa78f61f646548c1067a184d567b0f80123d2c79a55ce78eee9baf6
 EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1253 BLAKE2B 48e913aabf0307702a1c1cca1be62f0e1fa35ea2902e9f06c584201cc69547cda776177bdd325041562e693e80a4ec94fd4310d0d1cf6a06a216607622776a67 SHA512 ff8d5fa3ba1a5497d29613af4fb905ab6c41fac7f6a6c8f23aa453bddd765899ce436c8c5e1c0b96c09295f456b00728d639d896fbf8f3b54cf165a07bce2377
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
index dd1e251a03e0..76bb85201018 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index dd1e251a03e0..76bb85201018 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index f1f41e6246c0..585464088200 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -3,5 +3,5 @@ DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955
 DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
 EBUILD dos2unix-7.3.5.ebuild 2060 BLAKE2B 79addcc1d203a536003d9ac775c520f09a3f816898e1c888e5d3305500db1a18439d9503f365e91e2c5379456101c1e090926191d09f67d5eae00c6cd632f418 SHA512 c486b0abc3b9ca00bd4fc0909298ad4340d6b84e949ffe7f61ac2e0c05a9aa47b83a72616d1b53f867f2b51ec04dd44467f988311cd9a11e031ba2e4a4ed1936
 EBUILD dos2unix-7.4.1.ebuild 2080 BLAKE2B 4ee1a14eabb90520cdfb6a163d2bc04f2c3aa7632914e47efc8d5c77e974d2590d422eab6e59cae6e4ce0ecd0723721a640797b8a5b6390a2041cec6f7919cf3 SHA512 71a45fdfd99e9e0ac65b12f81e7f7ff5d15608f82521f24a5bdc17bf439237aa6546e0bdfa8dc6a5e00b3c02344d14f43ea1ab5dbf219c8221b988e1e87f941b
-EBUILD dos2unix-7.4.2.ebuild 2147 BLAKE2B 1bbb99a76ee393c233e796ee51262fe5eeed6e6584d192d78cfc150aa845a085c86919170ca8acd78d18e16312dc1b217b4a3091a3e42b3f80d01efd66ff1093 SHA512 28aa107c6cdb86b274e577fcef12f7e46bfa1965bd0ac4b2e9bd0dd0737813a3bda34f0693dd9afbb0c8a5d577cd99cbf326a68d7598b960bd98644a29e4bf05
+EBUILD dos2unix-7.4.2.ebuild 2154 BLAKE2B 3a270da858e1147072870740055ba8863e95396c083b9a6cb4b9be75df24fe232d033cdfbc84b25bf4514ca7870e4c5a4727ea8987c938959a3cb34d011fcebd SHA512 900eb5aa4b1d43ef2b204a3f657fea14ad6fff4f959d342230058156bbfc15732895dceb9d430562ad9f0b75db34b4633334ae4c8b982913ab7dbe1764722fc2
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.4.2.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
index 591c044b4780..6edbea3b26fb 100644
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index 258e1944051c..f288cbe636b9 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -4,5 +4,5 @@ AUX gcc43.patch 632 BLAKE2B 3f4537c7b4e20e50aafa3d8e07379eb8db2e68c1abbe6e096b2e
 DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
 DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
 EBUILD epstool-3.08-r1.ebuild 904 BLAKE2B 50b366747cd1c79275a6a7c82dfd937ed5d052f81be2ce1c48c0d1f10cf8c59c7dead1ac8e1026fbd8566709ee5aff180c947c26f2b650469128f05a7053b570 SHA512 34323645e925827275dfd63f016a7578eb3d6c0a7bcfa71597afb7b010081caf0bb6e65b8c529dbd7ebb144c6242e71186f6187e76cb3daccdaad3c613016400
-EBUILD epstool-3.09.ebuild 893 BLAKE2B a8fd79b506225de9cf28d7fbdc777baf8caddf34780a6a4afeabd2bdce32f9ef988e13996d4ff74c4cb9f66614d6d5dc1889442355390f5bebf309b0530a04ad SHA512 b826f3b12814d718d523c7d5c2bf66e4bc551b6b81d987ee11841a243ea8d5b0d076b33dad67006366b5b4e63f45d3369fdef32240fe8bfdce8898d2d9cb0c1f
+EBUILD epstool-3.09.ebuild 892 BLAKE2B 48f00d7d90a637afa6cafe3721a1fa21c948d78c7c2f1ff165e959d491458aff9859c5197b42d1b22b574941d08487e523113131191181c545ccc582820c97a5 SHA512 a710c0dfe1fdf64c30a2a8da6947e5e372d20fcb8408e87778a4af0633f972cf636690df5e4145f0a32b62cd38e8d1daf1a5d28e751815254dabac633f7439ac
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 21df4bab8b64..7bbbe381f000 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index a938ad705ba0..84ff5c677126 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -4,5 +4,5 @@ DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
-EBUILD ghostscript-gpl-9.53.3-r2.ebuild 5037 BLAKE2B 27a37786502df336666206a6afba170fc2f20fccdab41bbba23e2fd3fe91298fb79059ba76bc40db38d831782e27252355b336249ba4be01a1b829f548eca909 SHA512 8bd444fa4f9dcd1f740038828ab09f053a4c03a364832b0bf458760b28ad68d6617c226ecb552c457cea6b340a64f4c338832d826b36cd405cbeab6d33f9642a
+EBUILD ghostscript-gpl-9.53.3-r2.ebuild 5210 BLAKE2B 9a7fca567d9263eb455e83b1c10e720adf2cac85377f7d2636bf19f7e0c052d467949d4ead0ac1adcc19308df7ad8daadaa76aa6a0b82cb60c98ff727532cd6f SHA512 85a07b3eb6b8a6d3fad665930011d2926057c745dcbb1e38163cb012b0caa53803d58bcdec9d2d1b8caac1f3b5e3fae572b264ea2c0170dd3a091a23ee842a0c
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
index 47929e088e2b..3e43e96c815f 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
@@ -156,7 +156,8 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_with cups pdftoraster) \
 		$(use_with unicode libidn) \
-		$(use_with X x)
+		$(use_with X x) \
+		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
 
 	cd "${S}/ijs" || die
 	econf \
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 08d0ba1cc046..1108890af45e 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,3 +1,3 @@
 DIST htmlmin-0.1.12.gh.tar.gz 134130 BLAKE2B 5a9996bfea469f273c37bd0bd72c0e27b8636cb4552681de1b7e9a4849ab215815f7fc8ce430392b8ca3a849b3e51d8188ca248a8ce23242905799258ceeae29 SHA512 6d9db4b6bcdd6d223be8b4e3830da4d63ac6d7d28ee83abd97809b0b901968c994c8434c992fbdd148101ba25d8d786c93657cb5f82881af44dadbba40bf3252
 EBUILD htmlmin-0.1.12.ebuild 687 BLAKE2B e16da15d3ca3b741f324db20f52f09cc6a57471863068908c54635fa26ec84f99fd30043f03dcd14d11072a5c06734c86263461da77b8ac8de486ea54daf4953 SHA512 df59d6c9f9eb20b9db4eb4b4547c68607964f9abd9b5be4fbb0fc85cf5afe446241237031234c6c30f608ed2d56471eb024072ff83a793ceae94c0ec62e68c13
-MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
+MISC metadata.xml 478 BLAKE2B 781aa02d2f61dbd03e9d20713185755b0928199656d6cb7694feebd7e383043b1f2506210dd718a440e473c549bb4d85bc90dd1273eef5d769e65e1fc5186faa SHA512 0565add7d5aee2a81c7e799c695f29fe6d2054fd1fdab26eccef7a7b746c59806872eb537862b8e96ea31fae0cc9eeccacfef270e59b1ee29e8868cdc10a977b
diff --git a/app-text/htmlmin/metadata.xml b/app-text/htmlmin/metadata.xml
index 2b2dd5ca9914..86d2c7f7283a 100644
--- a/app-text/htmlmin/metadata.xml
+++ b/app-text/htmlmin/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">htmlmin</remote-id>
+		<remote-id type="github">mankyd/htmlmin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index a8b1b0034f8a..c03d9b97e799 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -1,5 +1,4 @@
 AUX libebook-0.1.3-icu-68.patch 991 BLAKE2B d8b7cbd831e65cdd82131d13c50558e2ffe4ed5ab72c6f576267921176ff5d65be2a0c71b3c1cbd853db9456d6a7c20ba27516fbb7f4b7a83e22fa0680cd23ad SHA512 5378d95e926e4b385b8dfa957254b5a1d2b943be5562124b897ead5a81e2922a39d37768afdd010e18655f2a184d82c837b19ab7f862b19ff71c0d5e664c076b
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
 EBUILD libebook-0.1.3-r1.ebuild 1062 BLAKE2B 34ec7e280b67c138c15a47f46d867490150cbfdf95e520824a267bbe0734c715ea1dc9aa784d388b0a7673146668af0043ef3038672cdf0f3f2a8fa7eea052ed SHA512 2c98c078ebb77ff932f760b68316a98e0bc0d0989bf6d05d58208b1948a0bbd5407d7cde85d6539f2ec06e6997f115d45aa6418dfe599f0082f9939ed8eb1586
-EBUILD libebook-0.1.3.ebuild 1039 BLAKE2B 78ed938aef8e76bd9470bfb0fb2de9d318c5c503efaf49d82f5ddcf973190d042715271a62204fc7b0b3d33be827a7e042dc85bd0b6cb44fe995e590a891892a SHA512 98eb112d3ff3c5b5b2572b38c42a933b47860622f21980b703f7d9154189915d93a4b54b33a759c0e16ddd9f36761e30944da12eac25b52014467141c861db0f
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
deleted file mode 100644
index ebf1a3373666..000000000000
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="libe-book"
-MY_P="${MY_PN}-${PV}"
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library parsing various ebook formats"
-HOMEPAGE="https://www.sourceforge.net/projects/libebook/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc test tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/liblangtag
-	dev-libs/icu:=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-util/gperf
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 618854
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable test tests) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index c99290d4c916..4d4946d42aa9 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,3 +1,3 @@
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.6.0.ebuild 663 BLAKE2B b82a2b55a892c18655ca728a0aa081520cb0cb668053e7923a1c465373ef2919764231d98bc94842e7bbeb4329471285c8d8c295394d6e1cffaa2d42dea41cff SHA512 f0c3b5c9b5584bcdc6cca2c0595457304f65d913fc6261ab614e569128d4e5facaefbaa507207213f7993967566d3bcca88dfb14de9d4eabd4027268d0cdfe55
+EBUILD libgepub-0.6.0.ebuild 670 BLAKE2B cdd880755781fbddaba81f3ad15fbb9d3bf7a1f069c03e31de9d99db37b04de2178bdf16c14c789f301206deba7b07e06999c1536b1a9fe6e2252d54b5d0be7a SHA512 44023ec8d401b7ba2b2105ded5c31ae34468e68b1bf666a61d3f105939a6bd5ed08bdb9c1c430ebf53d51c8a985ed3a51ef2ad85d78eddbce4c93e3a1757c9a1
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index c8eae9e5f272..f2b3935ddcb1 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 6cf0bf70fa4e..6743167e2832 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,3 +1,4 @@
+AUX liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch 996 BLAKE2B 56b386faba4b93ca2f8c97f8684a0f76a55e1179aa32011e7f943f95165f19a3878f44b995e1195139660102d2500619d32ba61a5854e8ea2b8494e2bbc312bc SHA512 721e99788d25183015a881cf060c78bbeaab4036abcb37a0390cad78f261ac5bdea79fa538738ac3d0e93a3f146b7022a72e9539e0011a8d34969b3afd166b1b
 DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf
-EBUILD liblangtag-0.6.3.ebuild 1229 BLAKE2B 63cef5c98f492b721bbab859090cabd3e99350e2788319dea9c5697aa774914365f0cad5290bb0d276633561f8445c55a1c5289c63ab68f9cda7afaee9259128 SHA512 55b99a2660b0550c34b48283c696a409c2f461d20bba68416e1ed63f51a8fa510a5539bd13dbe26fd02a0e838dc99fafee9e3ccccc84cf39ed7e12768aafe8bf
+EBUILD liblangtag-0.6.3.ebuild 1308 BLAKE2B d28fb68cc290471b60aada30d298bbded12bca83775956da997c5fa39e526533d800b7564f685f3973a0be6c60d071696f57081793822f219c7765747a0133a4 SHA512 6868c2a3e493cba4dd5853e0e127663b3be13d830c593ac93a2b70bf5e5fb4610a5e6b99d637d313879f9e733ce424e663cc090622abb7b521f4ba9426a3a2cc
 MISC metadata.xml 349 BLAKE2B 3be7ff388f2fa95c460c034408fb159d9f7f2b17b4634027f73870018e672f330b3b0f9cc96fa372170bf2daa314cb087a9cd5794ab1e373449b4cc0762bda87 SHA512 dc4a715ede23108572522e1e6c7afd36b3c3359fe4145e5a02b45e7fc094f1633fbfcdf0d9c75955f75acb1487e438bb437a85766d7a06e628674447d5cf3d96
diff --git a/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch b/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch
new file mode 100644
index 000000000000..86d7a651bbb9
--- /dev/null
+++ b/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch
@@ -0,0 +1,28 @@
+Fix build with gtk-doc-1.32
+
+This bug was reported here:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939956
+
+The issue is that gtk-doc-1.32 no longer generates empty tree_index
+files.  The recommendation is that liblangtag be modified to no longer
+reference what used to be an empty tree_index, but is now a missing
+file.  The same bug report contained the patch implemented here, which
+removes the reference to a now-missing tree_index file.
+
+The fix should already be provided in newer versions of liblangtag.
+
+diff --git a/docs/liblangtag-docs.sgml b/docs/liblangtag-docs.sgml
+index 1234567..1234567 100644
+--- a/docs/liblangtag-docs.sgml
++++ b/docs/liblangtag-docs.sgml
+@@ -58,10 +58,6 @@
+     </section>
+ 
+   </chapter>
+-  <chapter id="object-tree">
+-    <title>Object Hierarchy</title>
+-     <xi:include href="xml/tree_index.sgml"/>
+-  </chapter>
+   <index id="api-index-full">
+     <title>API Index</title>
+     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild b/app-text/liblangtag/liblangtag-0.6.3.ebuild
index a9c9bdde4c33..fd3c9a30603f 100644
--- a/app-text/liblangtag/liblangtag-0.6.3.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild
@@ -16,6 +16,7 @@ IUSE="debug doc introspection static-libs test"
 
 BDEPEND="
 	sys-devel/gettext
+	sys-devel/libtool
 	doc? ( dev-util/gtk-doc )
 	introspection? ( dev-libs/gobject-introspection-common )
 "
@@ -30,6 +31,10 @@ DEPEND="${RDEPEND}
 # Upstream expect liblangtag to be installed when one runs tests...
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-for-gtk-doc-1.32.patch"
+)
+
 src_prepare() {
 	default
 	xdg_environment_reset
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index ff473167ffe8..0ceed8bf5a3a 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,6 +1,4 @@
-DIST libmwaw-0.3.16.tar.xz 1306872 BLAKE2B 29c39ddb2cfe63116cbe7152a4dc3b7f16d402745c0dffd67c07dc42fa1ddee71f391695ead2519b3e1da206e8f437fbd24fa78ce1decfaa55e38a13d5d144e8 SHA512 c043d77e4b0efd7da594c1e370f24ee2d85afcb8a5e28179b4c3d76c8b7925f41ca5361bee12b35af732ef39f34fac46aa3636cb27c179ef9bb2b6feeaa19b0a
 DIST libmwaw-0.3.17.tar.xz 1349700 BLAKE2B 4b5ba8d5133144973609dfbd273ca36cc95e52608c78f6143f7c4283bc2bc6d7ceb22836a693d64fa7408957a3b02a7c9d0a5ab9235aa2d0b9725170441babfc SHA512 c3a1bb079d7e74cd7a23de1501730be21b1b089ef6d4f81ee0001775483c6346da3105b0d67f75523e4e088987bc92b97acb056ec7fc11bb29047109a1cf5ac4
-EBUILD libmwaw-0.3.16.ebuild 1032 BLAKE2B 24628116e25ae32185374858f2bc466eaff8c435ef4974789c204672551d939a4e19483ea610bb2fc141978c71fbcd3237fac386fa7928546513671a9bf5777f SHA512 9c6ef217f07414f0806f17aa9b13f2c32bf931f2b61fd85f4021d47c9082ffabe3b534de73870fbacfe13322d0a2b9e102f246445bc10b4035662782d134e151
 EBUILD libmwaw-0.3.17.ebuild 1004 BLAKE2B bd99841d18279477318ce13e9c80907572ecbb1de67ec738bf32afda9df36ed9e4d0e6ec695a386e535b41e19d0088f2635778448a0b6480bdc71c84da44a62e SHA512 f822bef23ebbe99c097d20a6b312014abb2091e61a54f4a8cf184252f13db23deccc3c0ac6b09f68309d4cf95479a58be6a8a9ba508dfd30e327ea6a5958fb95
 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.16.ebuild b/app-text/libmwaw/libmwaw-0.3.16.ebuild
deleted file mode 100644
index 901bad47b378..000000000000
--- a/app-text/libmwaw/libmwaw-0.3.16.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 static-libs 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-werror
-		$(use_with doc docs)
-		$(use_enable static-libs static)
-		$(use_enable tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 95b567f1a968..80341b06cdf7 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
 EBUILD libpaper-1.1.24_p5.ebuild 1209 BLAKE2B b5bc822e318b691585d7251ce235bf6dd54e160898d1999ec4c18d1d73300f55836075be87fc9b2ba2142ed1349229e603ee788d0a61ed542af807e31fa633eb SHA512 5f8b53eddbec4c1d145602228d210c4ce931731005f699bea68825a57180e4a011dadbe19c85ab18cb379a7c23b4f785022c0b1f5eb98f88094429f484c11baa
-EBUILD libpaper-1.1.28.ebuild 1153 BLAKE2B c8e81152bafe91624ef95ef562cbbf03df5a3439b6992a888a03cf016e1bd5e6af36cdd646f7983ffad3ac20b997978ccc5849fc75145e421751f7675291e612 SHA512 6bfd5dcb4cd6eb4bc7742bc1ad87932ee1cd891674ec59c495c6338e9b1a7818f8eaa583a58b8c0ad322ec415f25ebedf168c7b18103f3e125a72d8269603b41
+EBUILD libpaper-1.1.28.ebuild 1160 BLAKE2B 4562c4cbcc74029949fb8213ee0366b1c37934d54eec1c7012c6d2eb7ff925eb6e8e35554908ccf264db269676092ace312432745b0911047de1b9e3d386ff55 SHA512 4cabc5e88432dfbbc20c7e48cdd61579f2663877fb470636e42f507b9b0c335287af5e39c2768cc2580ab11ddc80278a618da90222e72cf248e31aba68277e44
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
index 72c0661922cf..e1a02fadbc34 100644
--- a/app-text/libpaper/libpaper-1.1.28.ebuild
+++ b/app-text/libpaper/libpaper-1.1.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( README ChangeLog debian/changelog )
 
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index dd825226dc4b..a55effec85b2 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,5 +1,6 @@
-DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97
+AUX mandoc-1.14.5-r1-www-install.patch 637 BLAKE2B 2550351e29db19b43de500f039f0563af8a720ef3bf7efa60ac715ca956d7dd0d13d0e092ae2749e3a76fc456eacf0260ca6fc03d324e08bf287bd8d4ac56dbf SHA512 5ed589e1322a2bbd261eb56aee8376526b80cf72eb5eafbc6e2772018c924913db0fb27eb7a50ec2509640e03e41d11e88401f76293d1d4230e777e39056c9fe
+AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea4f0d890e54b42817981e1cd4c568229927fd04bd0592e53ce18192f8359dded28be8c8690904f6 SHA512 74bdb16bc498d741128f1b6966afec8e21eb6899e26d20cf57cb0408ae6bdc63d75538dd355a21ae55593c359fbe707a56bbcdf6e78d557d4b53570db56fd6b3
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
-EBUILD mandoc-1.14.4.ebuild 1535 BLAKE2B 29f294139623d10225aab640399d224632535a6b39fadfe8d57101c6cc2e696a662c84a20cd619a761d8b52e2f590434303062e5599baca13d8c61e0f04a6268 SHA512 a3473a40521fd694315a7dca6d0aba171389ba39f8b92aaf24a103299ff664a97f8e984d27c2b7ffd86a294f0e027358b0686ec2093ecb02d1d6aa2dbfed845d
+EBUILD mandoc-1.14.5-r1.ebuild 2785 BLAKE2B 5a18292e498215ecd218eab33b390055320d325ca26a0a661a2b8c30efed2bc611b774595f16565d9e312d08e1c3f96e347843bfdd87fcb960383f723ff16fbc SHA512 99635990cf6f06768b4345e462779c8606c5ac0f4bbd28d3c172f7bb2b8dc2bc873b8a4b62766d2b752d1777b73f65bb392c7b0b18252d4d59707381ba301731
 EBUILD mandoc-1.14.5.ebuild 1727 BLAKE2B fbdad7247703bcea768dd034b2169f5183cf7ca644dad09335428356d83935d3ab4db2449d18e9c44d23b76c2d5fcfbdda4f6c09ec4bb5b81e8ca2732fdc65f6 SHA512 92be1ad119597580062788095aafb9fc951f8c55d1c368cc412b7afcff32476b01aa103f6f067c326d8a459b97e6071c8c79af8ef51482d5205fa27a743b1f42
-MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
+MISC metadata.xml 375 BLAKE2B 6b3565c3419b306f33ce9ad867319cee386b20c92743fe1a6565a348aca03d13133906d07f5aa10ec145d84645fa11894ad8abd73a6f65d5d0680ce03ef339d5 SHA512 1814f8bf92ec3500aba2e6a194a8a1b0e7adf53de5ac5408ef22fa42845b9c7270a27eea0061d77b5b53ea7cf77e9bfc75c865dc1d6fb661a5bb8412fb9cda3e
diff --git a/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch b/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch
new file mode 100644
index 000000000000..2395f1ce66b7
--- /dev/null
+++ b/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile b/Makefile
+index f4e2954..191c7e2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -535,9 +535,11 @@ soelim: $(SOELIM_OBJS)
+ # --- maintainer targets ---
+ 
+ www-install: www
+-	$(INSTALL_DATA) mandoc.css $(HTDOCDIR)
+-	$(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man
+-	$(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
++	mkdir -p $(DESTDIR)$(HTDOCDIR)/man
++	mkdir -p $(DESTDIR)$(HTDOCDIR)/includes
++	$(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
++	$(INSTALL_DATA) $(WWW_MANS) $(DESTDIR)$(HTDOCDIR)/man
++	$(INSTALL_DATA) $(WWW_INCS) $(DESTDIR)$(HTDOCDIR)/includes
+ 
+ depend: config.h
+ 	mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
diff --git a/app-text/mandoc/files/mandoc.cron-r0 b/app-text/mandoc/files/mandoc.cron-r0
new file mode 100644
index 000000000000..785564901765
--- /dev/null
+++ b/app-text/mandoc/files/mandoc.cron-r0
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# need MANPATH
+. /etc/profile.env
+
+exec nice makewhatis -T utf8 2>/dev/null
diff --git a/app-text/mandoc/mandoc-1.14.4.ebuild b/app-text/mandoc/mandoc-1.14.4.ebuild
deleted file mode 100644
index b42f184fedde..000000000000
--- a/app-text/mandoc/mandoc-1.14.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="https://mdocml.bsd.lv/"
-SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	default
-
-	# The db-install change is to support parallel installs.
-	sed -i \
-		-e '/ar rs/s:ar:$(AR):' \
-		-e '/^db-install:/s:$: base-install:' \
-		Makefile || die
-
-	cat <<-EOF > "configure.local"
-		PREFIX="${EPREFIX}/usr"
-		BINDIR="${EPREFIX}/usr/bin"
-		SBINDIR="${EPREFIX}/usr/sbin"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
-		EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
-		MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
-		BINM_MAN=mman
-		BINM_SOELIM=msoelim
-		BINM_APROPOS=mapropos
-		BINM_WHATIS=mwhatis
-		BINM_MAKEWHATIS=mmakewhatis
-		MANM_MAN=mandoc_man
-		MANM_MDOC=mandoc_mdoc
-		MANM_ROFF=mandoc_roff
-		MANM_EQN=mandoc_eqn
-		MANM_TBL=mandoc_tbl
-		MANM_MANCONF=mman.conf
-
-		CFLAGS="${CFLAGS} ${CPPFLAGS}"
-		LDFLAGS="${LDFLAGS} $(usex static -static '')"
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		# The STATIC variable is only used by man.cgi.
-		STATIC=
-	EOF
-}
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
new file mode 100644
index 000000000000..e775602af4b0
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="https://mdocml.bsd.lv/"
+SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
+IUSE="cgi system-man"
+
+RDEPEND="sys-libs/zlib
+	system-man? ( !sys-apps/man-db )
+"
+DEPEND="${RDEPEND}
+	cgi? ( sys-libs/zlib[static-libs] )
+"
+BDEPEND="
+	cgi? ( app-text/highlight )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch )
+
+pkg_pretend() {
+	if use system-man ; then
+		# only support uncompressed and gzip
+		[[ -n ${PORTAGE_COMPRESS+unset} ]] && \
+		[[ "${PORTAGE_COMPRESS}" == "gzip" || "${PORTAGE_COMPRESS}" == "" ]] || \
+		ewarn "only PORTAGE_COMPRESS=gzip or '' is supported, man pages will not be indexed"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# The db-install change is to support parallel installs.
+	sed -i \
+		-e '/ar rs/s:ar:$(AR):' \
+		-e '/^db-install:/s:$: base-install:' \
+		Makefile || die
+
+	# make-4.3 doesn't like the CC line (bug #706024)
+	# and "echo -n" is not portable
+	sed \
+		-e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \
+		-e 's@echo -n@printf@g' \
+		-i configure || die
+
+	cat <<-EOF > "configure.local"
+		PREFIX="${EPREFIX}/usr"
+		BINDIR="${EPREFIX}/usr/bin"
+		SBINDIR="${EPREFIX}/usr/sbin"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+		EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+		MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+		CFLAGS="${CFLAGS} ${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		# The STATIC variable is only used by man.cgi.
+		STATIC=
+
+		# conflicts with sys-apps/groff
+		BINM_SOELIM=msoelim
+		MANM_ROFF=mandoc_roff
+		# conflicts with sys-apps/man-pages
+		MANM_MAN=mandoc_man
+
+		# fix utf-8 locale on musl
+		$(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+	EOF
+	use system-man || cat <<-EOF >> "configure.local"
+		BINM_MAN=mman
+		BINM_APROPOS=mapropos
+		BINM_WHATIS=mwhatis
+		BINM_MAKEWHATIS=mmakewhatis
+		MANM_MDOC=mandoc_mdoc
+		MANM_EQN=mandoc_eqn
+		MANM_TBL=mandoc_tbl
+		MANM_MANCONF=mman.conf
+	EOF
+	if use cgi; then
+		cp cgi.h{.example,} || die
+	fi
+	if [[ -n "${MANDOC_CGI_H}" ]]; then
+		cp "${MANDOC_CGI_H}" cgi.h || die
+	fi
+}
+
+src_compile() {
+	default
+	use cgi && emake man.cgi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use cgi && emake DESTDIR="${D}" cgi-install www-install
+
+	if use system-man ; then
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}"/mandoc.cron-r0 mandoc
+	fi
+}
+
+pkg_postinst() {
+	if use system-man ; then
+		elog "Generating mandoc database"
+		makewhatis || die
+	fi
+}
diff --git a/app-text/mandoc/metadata.xml b/app-text/mandoc/metadata.xml
index aebca33be179..814b35c62403 100644
--- a/app-text/mandoc/metadata.xml
+++ b/app-text/mandoc/metadata.xml
@@ -4,4 +4,8 @@
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 </maintainer>
+	<use>
+		<flag name="cgi">build man.cgi web plugin for viewing man pages</flag>  
+		<flag name="system-man">set as the default man provider</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index c4c296fe938c..2745a6413036 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,9 +1,7 @@
-DIST master-pdf-editor-5.2.20_qt5.amd64.tar.gz 16261577 BLAKE2B 112c8d308875d36e3a71d28ae407eb78a0f714383fc005dc020cdb911a5596548274a55466133d8e03cbf47df29c062973f243f88ad0b1e9caa8410fbdfe2b8d SHA512 85b095603da1114cd4749ddbcf7bdd513c868ee17434df47037f7e0b914546fd13a6911949579ee981b5c33dcb13eb0ffa9585d4cbedd9bff4dc56e32bdcf4cb
 DIST master-pdf-editor-5.3.22_qt5.amd64.tar.gz 16410658 BLAKE2B fc9cb09e58625534d12b8fe4ff657917f76a14578341c678d6be909a5f2e7a75b4587c2f1abfac66741c088b43943a30874f6ae1414ae735ee01254f019c02b3 SHA512 033914e94c9ae4114243e79be445f523a6bbc6c39527db786613ef7220bedb2412ea75c83210ed8b6096d045afce73bc8f6141b55995f2f9c464ef4a7fd69d16
 DIST master-pdf-editor-5.4.38-qt5-all.amd64.tar.gz 38044035 BLAKE2B 60fbbaaaea47a1a572ea39a0c15e0d5a9b8a2f6d9fa68c06eea6279e5728cc84016514db5e91fc2a2a0b35a462325fc8cd66b1f9eb5bff5b4815c926587eeec5 SHA512 1f94bdd6a70d352c246081a40cd81801cf9b658ff1121572a91ee5bb3589e36d6db3c5db7ad54692334e04487c29ce6ef0b9381a6895467f1bb6ef0d9e00e00e
-DIST master-pdf-editor-5.6.42-qt5.x86_64.tar.gz 15961232 BLAKE2B b4d4fc35e55753fc6c86305a037817c0a62e7753cb171b4098b651316ad5e120d9de5b02350899c89a798b407a79e24e6b0c733255d2c5f9757258c29e43b22b SHA512 600796efc92be65fa82346cf02836e43aa467188c82a0f6a59ed7dc7d0e44f9ad6f004e099f7afdd5d37fb5c9b585dc812d68bba808603b42c0da3ef12c98aa9
-EBUILD master-pdf-editor-5.2.20.ebuild 1174 BLAKE2B d5522b2277cdae788777071681ad00edab0c32897cdb204ade78167a42004e90119000e1dfcf11bd9f7059616fbb0f93bb231dcba236817082b5e00c25d20941 SHA512 1e462a4d9a8d30fc831cd70411ed028581d6c4d44038f9541f900a81763c122079c301056a230630d812aaac3db92ebd9e0889c7b1fb192a0ad34043697ef4ff
+DIST master-pdf-editor-5.6.80-qt5.x86_64.tar.gz 15996548 BLAKE2B a2e8ad77d3cb107786b9dcb152a399b60ed87da02c052d992105f541a948d8fa05116af7be2c935ec21f642d21483d1166ddfe5d2ab8f41caee2ce26856f63c3 SHA512 c722c055e86dfdb1d0821e5e25635646fe5905ae8e13451f1cad3f1f71e4332ddb5ebb661cdefee89b186bd4647593cf2e149326fd4b7ec3433bfc17fb1c76ff
 EBUILD master-pdf-editor-5.3.22.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
 EBUILD master-pdf-editor-5.4.38-r1.ebuild 1585 BLAKE2B 7f8ef524fda232910acb17f42f90aac4781070bb841976616c50cd6a7d2cd5c5529647b59927ee8a75f9be09f5112cc516f0c75387a1e17802be6398d14c7c26 SHA512 1a9f0e9d6ed6935ea1c02f7badd19206c0d7b3ba9a59ea6949e858bfcc9d23c942fab255a312c18b37b781b0f3f80b92d371483319be011244dd1a563d7a3639
-EBUILD master-pdf-editor-5.6.42.ebuild 1175 BLAKE2B c7a9bb6efb5956d705a506b241e8188cb5ff423f7603a8390ed2d40428728c97e488990ffe5fd41cd0ae7321318b7f51fef68c0dd660d7b6c58c3854d425c86c SHA512 078ea181f06b944a6e0436c0d7b51d4949fd4df67255588aed988a457584e66c6ea1630064b9d7de675730a2529f14113a043d5ff1c42c77c9fc0ae8b072bad0
+EBUILD master-pdf-editor-5.6.80.ebuild 1189 BLAKE2B d67c9a3d9fd5e5b4df10b8f1aaefed1db2083e60d977d75d8f8a9aa1eec773796569d49822f9691193111321a87f3565bda1745d4d0806294e2b3ba460f74348 SHA512 8e0c0ad14900b871278098a9f6a5afedb9d61f48fe1957c088542fd70c39f657060bbf6969a94d7eebccf44588a32d9c8b7a157aa3b766029812dcfe132dad5f
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.2.20.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.2.20.ebuild
deleted file mode 100644
index 96ecd510bd39..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.2.20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils desktop
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.4.1:5
-	>=dev-qt/qtgui-5.4.1:5
-	>=dev-qt/qtnetwork-5.4.1:5
-	>=dev-qt/qtprintsupport-5.4.1:5
-	>=dev-qt/qtsvg-5.4.1:5
-	>=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts lang stamps templates masterpdfeditor5.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor5
-	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
-	make_desktop_entry "masterpdfeditor5 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.6.80.ebuild
index 6c0124f20cc4..37c3602d0599 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.6.80.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~amd64"
 RESTRICT="mirror"
 
 RDEPEND="
+	dev-libs/nss
 	>=dev-qt/qtcore-5.9.8:5
 	>=dev-qt/qtgui-5.9.8:5
 	>=dev-qt/qtnetwork-5.9.8:5
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 6ddeaf5e2d33..a44175b47477 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -11,5 +11,5 @@ AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6
 DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
 EBUILD mupdf-1.17.0.ebuild 4380 BLAKE2B 3c75b04d913c07617c738c1fdb6b87a6ab762f5fbf51cf723c8e485516b6de55aabd42857d9f84bc7131f8fac360df9cba112d0e5e40314f4624fdfb5d2ec7f1 SHA512 ae5b7d2b3374cdef700b65669fe3179b63e343a319e1f3c0ca1e624dcf8eca0819d8ec82d33ab348cd2e5d051a94b686e4f2dc3e4f9ad32a09b9a15cd966ff28
-EBUILD mupdf-1.18.0-r2.ebuild 4109 BLAKE2B 6478c0ad3f650356d8e9a0ffc1eabeb569ec0f2eb545356793575ab1e37a4f91d5cb5eb008f83c33fe5baee80622e75e5b1dc503442d6e093fd11e57806c9204 SHA512 6efc10e3f3c5f5f7a4fe86f909589dd0c7ea2a58fbf1e94bcde66de61b649d924023601774cb22f1c5ba89d33fd489938058a796c5f0a687e2267b162caee7b2
+EBUILD mupdf-1.18.0-r2.ebuild 4122 BLAKE2B e8bf328f63f9b469a4e1a561ef97c029252fa69776ebbc0a4677ad6668757ee26c083842e78cac6807c86932b04437ed025b5e6a82b4492c6f898a04bf7dea3f SHA512 537ce8ff3f792ce0eca92f7a209d1984158b44f7ad214fa7d941a80ff19288b4ffce80e5a83508bff156aa287f100a8304c504d60a4831284fba7f46320520c3
 MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/mupdf-1.18.0-r2.ebuild b/app-text/mupdf/mupdf-1.18.0-r2.ebuild
index dcce0f82d29a..9f330cd3e030 100644
--- a/app-text/mupdf/mupdf-1.18.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86"
 IUSE="X +javascript libressl opengl ssl"
 REQUIRED_USE="opengl? ( javascript )"
 
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index dd02f8f8c5b1..9c7237efa44f 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -2,8 +2,10 @@ DIST nuspell-3.1.2.tar.gz 379029 BLAKE2B 80f773ffdcbfbeee0dd13cd325bb4fec5efa5b5
 DIST nuspell-4.0.0.tar.gz 379136 BLAKE2B 90aebe8318cd28240dfb7c1b034b2c045ac208c6d25344a3f2fc2f1a38995a1d6f81e70399c644c70255fbbb30f61e340808d1a71dfccab1726f89b742cf7b65 SHA512 2b08e30c4ac91a243c74f21eaf4a8d55d8b1c834e0f293fea76a9f02660f2ee89fe4d4071b1b9ed97b8c1db80b0645c71f8746738d97fc3ae779a65dc1583d3b
 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
 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
 MISC metadata.xml 489 BLAKE2B 51835316b4f8b1b1a016324955d48f6f5126ef7b7caf11f4b46ea858469fc9ebe3154de4fbc99d528bfef3808fe7c95dd2f540038572ae640b00dad9fccbeacf SHA512 ea959020e4b2a90f475d296fd1a43c2ba8efc1c39f2dde70b930165bce165df1011e04af8f54b37740f28e009502a5c64ec0fdb2b7221003388cd47b1ccadeb5
diff --git a/app-text/nuspell/nuspell-4.2.0.ebuild b/app-text/nuspell/nuspell-4.2.0.ebuild
new file mode 100644
index 000000000000..fa0c2f915189
--- /dev/null
+++ b/app-text/nuspell/nuspell-4.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 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/4"  # due to libnuspell.so.4
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/icu"
+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/ots/Manifest b/app-text/ots/Manifest
index d9ef607d8595..b68c4556fa3b 100644
--- a/app-text/ots/Manifest
+++ b/app-text/ots/Manifest
@@ -3,5 +3,5 @@ AUX ots-0.5.0-fix-installation.patch 514 BLAKE2B 932a241591dcc23b9a57070e23422f9
 AUX ots-0.5.0-fix-underlinking.patch 863 BLAKE2B a85d3c6d4c004a3105935e013705e10e26159500f7dd95c2edf6fcccf1af9bfd1a1f8854feba37ed7b8473e8c272d355367eb795486cc65b820c264a4dd32ed6 SHA512 34f189afbba9d1c8936142f27e5ab6ed4ab2eac8271a58e9295e46b993b0be7d48fa771cd62b3a8374da15b07deaa12eefcc01b0dd34643947cb43cd64f5d0a6
 AUX ots-0.5.0-math.patch 402 BLAKE2B 647dd793323f1eb6a470015053c066593a6fc4da95c3b36f3e0c7926e38ebd75997fd3482dffa3bda850f70fac5a8a65ad19cb6e725fd514d4e9d4b366d9fec1 SHA512 4ba250e3c51eb621bba6e8ee1d291719c86d04ecb2dc20cbd1bf7bae27ea22ffbe54376d690c24c84a0af0da9907dcf40d01c0aa53e9b610737930a442cf6918
 DIST ots-0.5.0.tar.gz 371126 BLAKE2B 05785a4d4ec5feba421762ba58a7dab649f3fadcf83a3f809a73b8027c6668263a29305766aba1bba4ce9447e115a89a59788026d567b5b82f9e1c1f7a934d97 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe
-EBUILD ots-0.5.0-r1.ebuild 1130 BLAKE2B 32c781048e7ec1794caaa8cbcd746c6f3a6a4f398792f4f099e1901bbb285775d228f9c1df15cef9a5d7551371116bf6860f897d094909c04af94f3a8dac9998 SHA512 1889c9e0046f3f99a4a899804a909d6677a1f92c800b8b296588382b93929b13dd2843768b0327d541c971f3dd266c31d4dc7193e7653756a59d66e6620b07d1
+EBUILD ots-0.5.0-r1.ebuild 1137 BLAKE2B 0d4814d998277afe205fb818e2065a3b3ab569194b2620552351e79bf48022a6609ab6b830b50f0a541d70dc7dad92184a225a708bd9c8fa7d6e9779d4940bc9 SHA512 658dcef19f850f9f41ff056428364dfa7e7efd4c498c84699c1fd54e2d68744ff84939d5ada19b57118334cd7122c223e7c6784b94423f8d8d61f6f91c360bdc
 MISC metadata.xml 243 BLAKE2B aa2c4e92961faa40826e16a92582bb02cacbe1a10bd1e6e8d169560472923ce521ec642b1b0175ad5beac315e575d65c9a23466b08cc95eb9605ed2376af50d1 SHA512 354efb009da3999e18811a3e91f53628d4ce26aa103544be6b5d42caf9c5d9881097e81777665f96c7828a15a7e38f1e4a118579a865eb4c740e580527b42774
diff --git a/app-text/ots/ots-0.5.0-r1.ebuild b/app-text/ots/ots-0.5.0-r1.ebuild
index 9a2c5ab2e821..07bff144b9a7 100644
--- a/app-text/ots/ots-0.5.0-r1.ebuild
+++ b/app-text/ots/ots-0.5.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index e59550541928..cb6cf8b647ef 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,6 +1,8 @@
 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.ebuild 1484 BLAKE2B 61feaa13e44ac0efbd0e07f94ab7d1bd53245a0ecfc1b2a6e6d2f4674dc38f78b92753261c598165ca4005790dd8d2475e2c2c561cf2ff5711f0e92739111f8d SHA512 dc6f0ce017071f66f2e24cc4f6fdea986bf31d3980e08f7cd0c4b073eed2a6456e87af2a1cda8fd08cb8095c695a8598db49035d72f84dbd21161e4a7ba7e33c
 EBUILD pelican-4.5.1.ebuild 1519 BLAKE2B c8d21aed61f0d488d3515e587705bb467398bb3d462b659d84e5ed1f002d1d13e18f7ffee223ee3ccf77a5cf4ad50b7844d1144f84c8874d01a8202437c4ca00 SHA512 ab1f4db1cfc194f81f91c376401b8ba04400ebc2d4091be004e450405e8a952dd5f3186c58a3bf51a6b83c8a63ee82802b38d03345adaa658752447e4fd4ee90
-EBUILD pelican-9999.ebuild 1541 BLAKE2B 2b961dc8dc31d683360f063c90d727a0f8553796b4017774c6f97ab1e3386ca6aea5ba600aafd5eaaeae6c09bb480290b5407e2807d3b1ac5a4dd2cca31b2363 SHA512 6470c2a01b936cd22e8405346deac26330b627d6a05147055697775aa40f2dc87194f521c871da98c90800262930161084c1d1b441d754af51767f1fc8c1dcb9
+EBUILD pelican-4.5.3.ebuild 1429 BLAKE2B a63fd57d12351b26e93e894a77b80031257975b96468461f6e4dba90e7c416e077fc03a03ba4d3ab012261c590e9b9c353e4e3edfba0058c79977369df46ebe4 SHA512 932a5000ad63ad05902e29cd0ae686189d82486b037be5dadb2c3849c0ea35108198337925c2de8931d163a376457c562a1d249304cfa8d0d035602522792c07
+EBUILD pelican-9999.ebuild 1424 BLAKE2B f77d1ac743e751da8150e7da7514c5785f93f8c2e0f60370362a9728b1f32ab424ae4c2a971e007a899558939d46887e3d9efaab03cdef012b8b822bfaf7fc10 SHA512 672cfca62aa728ae9682850a5979393be163aaad50186cc729340916e150cc41c203d9bb49c8c834f5c77845475abd085ea2328fa138c8a5c17cd62677647ab6
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-4.5.3.ebuild b/app-text/pelican/pelican-4.5.3.ebuild
new file mode 100644
index 000000000000..6741e738f9b0
--- /dev/null
+++ b/app-text/pelican/pelican-4.5.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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"
+
+RESTRICT="test"
+RDEPEND=">=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}] )"
+DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+distutils_enable_tests nose
+
+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
+}
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index cda70ce55f5a..5ef3211ca690 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 git-r3
 
@@ -13,12 +15,10 @@ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc examples markdown test"
-# Tests fail for this release but are fixed upstream
-RESTRICT="test"
+IUSE="doc examples markdown"
 
-DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
+RESTRICT="test"
+RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
@@ -28,15 +28,12 @@ DEPEND=">=dev-python/feedgenerator-1.6[${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}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
 DOCS=( README.rst )
 
+distutils_enable_tests nose
+
 python_compile_all() {
 	use doc && emake -C docs html
 }
@@ -50,7 +47,3 @@ python_install_all() {
 	fi
 	distutils-r1_python_install_all
 }
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index d878cbdaf5f1..28a624fbf6ba 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,10 @@
 AUX po4a-0.60-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
 AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-0.60.tar.gz 3799018 BLAKE2B cecc260af82318fa4dfeab7ef81a29256f6531d8d97afe379d0e3291197f5b9bd0a4379697f23186de0a70ff3476cedae98bedd19bf7cddf59e9503ffbc90202 SHA512 b1e32169221d6aaf49fa0e6a42e45a858c8608a62470e5d5b769da985e4d03e09a220384400fe36f740447770331f7b8b821f00dc9ce68d3c7b00178c146c6a9
 DIST po4a-0.61.tar.gz 3863796 BLAKE2B f10c7d8b42c32be1b100f724e6d0d1b419e5ed10e0762c45bda8d91bbec7d5de331265611edc8cfcb04e3afeb044258697a54bea996240c27eb113f2f6aa0df3 SHA512 51038a3d2b2056de9bb258bc0b83dba4dec4414d6a06dedc17067441fba6824cd93296308abaa418248e3583bfacd6c81621fa6eb42e5596a3c29968ce154e77
-EBUILD po4a-0.57.ebuild 1267 BLAKE2B 066c64d168e931c61098c860e15def7a08782555f9adb85dcd700aca61d832305938b3d27ce5e7ad1b0d015cecbe8e83f3c3f09432f3f3ab30913adacda09c43 SHA512 8b636a4e7ebe708d3f248f7f89b2ceabfe8a7b6502704a6b8bfaadf9b159338139666871d9e06cfdf8188e760634c6aa8837cba998aef6df09509e06ee1029ce
-EBUILD po4a-0.60.ebuild 1320 BLAKE2B 749a40a9f392816f384cbd7e76e92553ccfcca9174c8179987059106da6453be2cd2d817c2fca80696dabaa4f04ee871dc7e3d11742db6900155afcb249f5f8f SHA512 a498934bf3d554cf042506ebd4642509ac5042f8258a220715ece60786e85cb202851f2bd7b177d84eb9f518a4ca5b80f68e4e440758ef9b9b2919b94f44d816
+DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
+EBUILD po4a-0.57.ebuild 1285 BLAKE2B bcf6b815289c5ee26d89fa62cdc838214c55c96c389fd3c702b8805250154662f857035f830254ee845e940e247ee5233703045b08746cef04d935643f93021a SHA512 0708efd6af416b9041c046a4d4ef6ac3548f31c971a818813e72b2eba1e19a68ca1b898557f1c9984f514efd8855bc0c807a8528fef90bcbf627cfa8580b956f
+EBUILD po4a-0.61-r1.ebuild 1344 BLAKE2B b61f8141c47df9b47d372c6ab6dcfd7d0f63b7079be0babab0da802b1ca1dbb382f3f37fcc12f3bcb20bf6b9c5bd82ad4e7547d8ad60c1d4e6f5ae01479f3fdb SHA512 a89c33d0cb1b63981b2cb658a9413c7b82a99f2678d01a3da2a86657afe6f93c0c246724253aee5e1e0344114004d30b7a204043f0e6c152f2c78d49d310ff60
 EBUILD po4a-0.61.ebuild 1326 BLAKE2B f588b1f4753b7e4d59c1c5b5eaa74a13773392ceeb3859663472b52ef131011e419884a1d49f6bd9f611a04243140b642885df8fa0a858666670f86c70a7a4cb SHA512 8be8325f4e2cf06e0a4b039a23e2ed14d54ec7e2d2668f58eafffd4bbdfad02b60d86c8d2be0a24a34884b348768688041c3a2da0929eab68b72d2763bcfc428
+EBUILD po4a-0.62.ebuild 1344 BLAKE2B b61f8141c47df9b47d372c6ab6dcfd7d0f63b7079be0babab0da802b1ca1dbb382f3f37fcc12f3bcb20bf6b9c5bd82ad4e7547d8ad60c1d4e6f5ae01479f3fdb SHA512 a89c33d0cb1b63981b2cb658a9413c7b82a99f2678d01a3da2a86657afe6f93c0c246724253aee5e1e0344114004d30b7a204043f0e6c152f2c78d49d310ff60
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index a6016b45c7ed..7444d4ee569f 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,8 @@ RDEPEND="app-text/opensp
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
diff --git a/app-text/po4a/po4a-0.60.ebuild b/app-text/po4a/po4a-0.61-r1.ebuild
index 8807618f22d5..ce4c88c02b9a 100644
--- a/app-text/po4a/po4a-0.60.ebuild
+++ b/app-text/po4a/po4a-0.61-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,8 @@ RDEPEND="app-text/opensp
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
@@ -35,7 +36,7 @@ DEPEND="${RDEPEND}
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${P}-man.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
new file mode 100644
index 000000000000..ce4c88c02b9a
--- /dev/null
+++ b/app-text/po4a/po4a-0.62.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+
+inherit l10n perl-module
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	l10n_for_each_disabled_locale_do rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 8b8720560109..be47612bad78 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,3 +1,3 @@
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
-EBUILD podofo-0.9.6_p20190928.ebuild 4665 BLAKE2B 82b5f6179a54e471a1b8aeab45d87d5499f59fb47a82b9a39302b3053d4f0642a8677e723013a6b307e112a057ae61609940b6298cc43c9b203cefe08153aeee SHA512 ae262d3bef4ff0ef909779620b7c80768158a53ddabcdbf500f034f2f5a988b64a2de7d4f19998618780d888252783add8b2a3f3030124b52685077e268f1ea9
+EBUILD podofo-0.9.6_p20190928.ebuild 4666 BLAKE2B 6af9d14f8e2ad0d3c55d6f3add49d9f70322a189d25960e46b0ba3cb56105bf864b4a76b32a47febf74072a8a95c491997ba2ed3ed3c2e6bc2383efde706e241 SHA512 380a8ae526de4d43ad6bc4e7e6d444010855c2853239248daed8105a65bd9f97fd8e30f57219952a9a6fcc0b752fc575f9bcdf0766c04a3887a2c93877326e18
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20190928.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
index a07aaa17adbf..9ab734ae2d45 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
@@ -15,7 +15,7 @@ IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
 
-RDEPEND="dev-lang/lua:=
+RDEPEND="dev-lang/lua:0=
 	idn? ( net-dns/libidn:= )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 2fb3f1ea0f59..a234fcef44be 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,5 +1,3 @@
 DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
-DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
-EBUILD poppler-data-0.4.10.ebuild 760 BLAKE2B cb29bd60394719ef71edbebb0640f59ca53de60441bd0b75e4abb3c80030470b4243007b7f2613bf4e0efb6e725bfddc0b768e7e1499bc9dbd323c40b8988109 SHA512 d2919f63e27d4e86b560ef915b42d578c6fbd863f4048fb15fb15b4b93074921ca9196bb9c156bb420ee6e9380b796c1109a62f2696487ecc33df1b4de44a195
-EBUILD poppler-data-0.4.9.ebuild 760 BLAKE2B 38b06c1797185f673aa67e77fd75c9c50abc2470db7134707c29f5adcabbf9f0c48875e3348ff1bc14ca257f508535bb5250aa3f75e6f189647a4f713de434cc SHA512 9eac446d1d0c52b90f6f4ac4c9978a71beffa0f522ffac8b143fb563b15a3c213400cd8a61a078079f7a9cf7182dddeac8d718afd6afbe27644c407b93ace307
+EBUILD poppler-data-0.4.10.ebuild 767 BLAKE2B 8b4e3a60dece697dbb534b04ff86bee3334e5c50a89bcecb4b41e31ae6d1774a8db3873798e03325899d1703d6e194a1a00d0ef64b8f72297bf9765567b4a64e SHA512 9a5ffebbb26b71a4a839a4710782630542797e42d1759f3046dd4d134646ccfd7cbbe29a3555a6a78ef835f847ba7d47e885dcc28961fcc5fe5fa3177fe8bb33
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.10.ebuild b/app-text/poppler-data/poppler-data-0.4.10.ebuild
index 57fe52f3d938..a59df9820992 100644
--- a/app-text/poppler-data/poppler-data-0.4.10.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.10.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
deleted file mode 100644
index d45de72c82bf..000000000000
--- a/app-text/poppler-data/poppler-data-0.4.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
-HOMEPAGE="https://poppler.freedesktop.org/"
-SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-src_install() {
-	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
-
-	# bug 409361
-	dodir /usr/share/poppler/cMaps
-	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
-	find ../cMap -type f -exec ln -s {} . \; || die
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 93e794c2f74c..64c9d46a4346 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,7 +3,11 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-20.11.0-respect-cflags.patch 2797 BLAKE2B 8c37ed086fa823eac8d04e47c04f79afc76c0e6caa6d921b21bb5d99928be9c9bc683126e42e249aa8ccd96470d7ecf9eb1b0d8e749bd85bf4a455bb5d513e01 SHA512 421760c08f351449b7c899e4a04c3d93a26cf914326c58427031d4398f7cd4d2ed68d5ab42f930d663aa4f918fa11534e310ae6a9c005bdb3c9a191a497e6386
+AUX poppler-20.12.0-respect-cflags.patch 5494 BLAKE2B 8107bd3cb374694aea1dbd66cb95258ec568bea0bd00ff02ce9cd074e23dd8f399543d2055578654cdf7db09b46bd051346a596538305af883f9eb45c0916e47 SHA512 700233376a3254e3e5667719f95d00f828850476e3156856068c8b7faeff8c438c494606aa39f5551e998e02dd58aaca63eaaa5faff606f75d9a272631bdbc8a
+AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
+DIST poppler-20.12.1.tar.xz 1660164 BLAKE2B b96198be824dad6bde3ed89cbd05ebae001914c253d1b95321088ee209c73134efbb7f0044aa5d20c07d35b2460f5d17171810f36b873d2542e4bc93f423273f SHA512 a7ede8b11ce73c724fc54bc1e522ecfedaff65a08265c5faee4645765f1d6670a35abf67e57bdebacfd01b2071f1c532a04b9e302939a500fea9185f6e8226d0
 EBUILD poppler-20.11.0.ebuild 3375 BLAKE2B 0b355ab38e00f5f0ce9fbbb95463ef4b990534e4f60f9923a8d21b5d6e0fa30e40520861ca6681a5fae3986ab0c358400170cb159b5ddc8e87a3cb6a4684156f SHA512 d96627f44264078a1d95325ffa3fe71f8d6819d809ebeea608080dc1e9b73019d3c30c32b216797b4a5a72bcf3c3c69830df75e367ea72a70311fbeb1b324be0
-EBUILD poppler-9999.ebuild 3384 BLAKE2B 53af7b182a6b978219cc2d198956d881c59e9471f1d4696331b78a49b5057717728fd903a27ee38ed3c3a2bf91f4186e6765a6affa09f3c0fc36eca2bd3012c9 SHA512 b2b89c68eb89f4414ce6f2c560519803d2c43c5492b9362e3c972699c4726f12a6b273e3e2e3a5aa868c61e78908f6a008a56b42bc9622ffbe5da62f06b22e6e
+EBUILD poppler-20.12.1.ebuild 3267 BLAKE2B 1825c9f020414404b4493b443b583ce52a733812faebade33acc5430648acb94bf9f20dcb452d6292893c299688f5c077f07ac479a8409ad4f0da7fc768113c9 SHA512 ab20e2cf3c32f060b19d870dd04a2b53d943cb6e15c2b42e96866ecedc5b6c9e1dc411efaae958d6e4f1239c9126e7b613a345c331de03619cc238f87a73621a
+EBUILD poppler-9999.ebuild 3274 BLAKE2B 1fdd72dbc4471b9609f1751fc1715f2e65b3b9bcfae0c3524c4af6cb42e05c8c49cb5dabae79f0367a5f0c90b6b3dce8bcb8690e060dcb8b90af689e87741b42 SHA512 3d440f7099d12ad5e550a75ce0fd31594a973dba00780405658acc6114ed4db38343818ca2f5d2e011cd526be65ca6607704d575337c97bb187fec455fb34fb4
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
new file mode 100644
index 000000000000..4b389faa7d61
--- /dev/null
+++ b/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
@@ -0,0 +1,108 @@
+From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 2 Dec 2020 09:29:33 +0100
+Subject: [PATCH] build: respect cflags
+
+---
+ cmake/modules/PopplerMacros.cmake | 81 +------------------------------
+ 1 file changed, 2 insertions(+), 79 deletions(-)
+
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 707e7497..882cf11b 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+   set(_warn "-Wall -Wextra -Wpedantic")
+   set(_warn "${_warn} -Wno-unused-parameter")
+   set(_warn "${_warn} -Wcast-align")
+@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  endif(GCC_HAS_AS_NEEDED)
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+-  set(_warn "-Wall -Wextra -Wpedantic")
+-  set(_warn "${_warn} -Wno-unused-parameter")
+-  set(_warn "${_warn} -Wcast-align")
+-  set(_warn "${_warn} -Wformat-security")
+-  set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wmissing-format-attribute")
+-  set(_warn "${_warn} -Wnon-virtual-dtor")
+-  set(_warn "${_warn} -Woverloaded-virtual")
+-  set(_warn "${_warn} -Wmissing-declarations")
+-  set(_warn "${_warn} -Wundef")
+-  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+-  set(_warn "${_warn} -Wshadow")
+-  set(_warn "${_warn} -Wweak-vtables")
+-
+-  # set extra warnings
+-  set(_warnx "${_warnx} -Wconversion")
+-
+-  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+-  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-endif()
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
+-endif(CMAKE_C_COMPILER MATCHES "icc")
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+-- 
+2.29.2
+
diff --git a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch
new file mode 100644
index 000000000000..234be8222146
--- /dev/null
+++ b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch
@@ -0,0 +1,49 @@
+From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 9 Dec 2020 01:28:25 +0100
+Subject: [PATCH] Move Qt5 test dependencies into test dir
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     |  6 ++----
+ qt5/CMakeLists.txt | 10 ++++++++--
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1573249a..ab91d537 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -157,10 +157,8 @@ if (ENABLE_QT5)
+   find_package(Qt5Core 5.5)  # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this
+   find_package(Qt5Gui)
+   find_package(Qt5Xml)
+-  find_package(Qt5Widgets)
+-  find_package(Qt5Test)
+-  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND))
+-    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
++  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND))
++    message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
+     set(ENABLE_QT5 OFF)
+   endif()
+ endif()
+diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
+index 58b42f5e..e3b26cc2 100644
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -9,5 +9,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500)
+ add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++
++if(BUILD_QT5_TESTS)
++  find_package(Qt5Widgets REQUIRED)
++  find_package(Qt5Test REQUIRED)
++
++  add_subdirectory(tests)
++  add_subdirectory(demos)
++endif()
+-- 
+2.29.2
+
diff --git a/app-text/poppler/poppler-20.12.1.ebuild b/app-text/poppler/poppler-20.12.1.ebuild
new file mode 100644
index 000000000000..9a3ae26fd3c9
--- /dev/null
+++ b/app-text/poppler/poppler-20.12.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2020 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/105"   # 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"
+
+# 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 )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-20.12.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
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-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 88fc60ed4b7c..17f47a8d2432 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/104"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/105"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -58,9 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-20.11.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 3c79c9aa4563..532827129827 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -3,7 +3,7 @@ DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
 EBUILD qpdf-10.0.1-r2.ebuild 1347 BLAKE2B cf0992aa1050c973626473a84654f718c119ab6400d9c9b26e73909c47033ac6efa647c49c1d286d919cbfbf6ad4a989df0aa2e4a0a0e7bfa71e35c0b0400eb1 SHA512 5bed37858577a8c440ed8f0b5ca03a126c142e0af31b82184466705ac2275d8cd4c0393abd10b1c3a5b46db4abfc3137e08f76fa453b420ae5e4bf8153058b05
-EBUILD qpdf-10.0.4.ebuild 1324 BLAKE2B 829dec1a35fb315fb838f8fdd956d013ca6e1219d291528db6fca90eac4d681f431fd6dab2d72eabb394bda4b50aa46dad122dd1e98d2a8f6df7aff475a839ab SHA512 a1e994d3b83566e8b048474e1ecf249289018c8d31836fa97e9cc52992617e35199e8a6a3185513994b2cd819d91a28426162d9a6fa29e7c5a8812070772cf46
+EBUILD qpdf-10.0.4.ebuild 1316 BLAKE2B c5d3b304a70bfd1ce6c013a20fe66e0470c9949f10fb70e5fc3f53a8a880794881baffb5b74b0d02248299eef70cef879f4b3a49f97aca3c848f7e96797ae8ab SHA512 9561d6f9623334b0172d37cc933cdd8a0e9d9a10e006141b1e6801437ee9db2e24e952f6cddb7b7ada71e4b7004a4304f8f4e3cac727b7c5dd8d920a506fc79a
 EBUILD qpdf-9.0.2-r1.ebuild 1278 BLAKE2B a7ddc49812f5307f62c51df2175eea83baa3e029d7f77c049a0533426dc3b81f27bb5ae10d1d8ae19dab1ddc80819db986bf803b2d218355195c71dfeda65360 SHA512 1bcf863d03efb215fe98517fe099e04f464cc14dcd49bd23eede86dc55d38e0428c32b90e654b9412aa899695b7422f1a936ed49d4f8e1d6eb8d552bf9c9d12f
 EBUILD qpdf-9.1.1-r2.ebuild 1212 BLAKE2B 267f67e4b5115ef494996ad283d10f952bf78d405b860bb8c72cb39227236cccff3e122d8addeee35eeb1f285d564faf6cc90e014fa93ff20070b17a8fb5f7e9 SHA512 24c72250383f4bc98e1e7778f04dada81a26c0192166251f0e5a6cd76d7cf46440e62a4454dc3ed69add76d303f6fed21faf24f345edc939b6c30a803ffae7e7
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
index d49539fd3d48..b3c9fdf3a275 100644
--- a/app-text/qpdf/qpdf-10.0.4.ebuild
+++ b/app-text/qpdf/qpdf-10.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
index 8ecbf881bc20..c672f8e0022b 100644
--- a/app-text/rnc2rng/Manifest
+++ b/app-text/rnc2rng/Manifest
@@ -3,5 +3,5 @@ DIST rnc2rng-2.6.2.tar.gz 17981 BLAKE2B 202b7f540197a5a17367a28524c4ca2b532d9e05
 DIST rnc2rng-2.6.4.tar.gz 18005 BLAKE2B 4725f9a8dfcc5e7ed26c4560d9198939d51376aad8feaa5e592bf28c9014d1abe0e90c47f6aff9ec0d7cecc815660a3a41270c118e4db87030e5a1fa208f3177 SHA512 c26103943ecac440dbeb4db6f913e57c2e4b1f84f92d7e8693e66b6a1e5af051c49ace8172fb94dae2d447ee042e432af15cc578e606452b50ca843d8bd85378
 EBUILD rnc2rng-2.6.1.ebuild 530 BLAKE2B 0d7182953a75186e6819182d7b52c4970f0ebc29b8e5ac1b42a7fc06f338e72e55f7a5c262b6ff532b2507c71bd6ab6fe712afddebe8f91cffb6eea29130a0d3 SHA512 dcc21fc62363aa6aa99adbf82b39e61bc3dbf58fd9d636ecf89143a6e1a4c61f5bca1af8bc363c74bcb2a58a0f33ffbe0b3e618e148737a4af3dca822f081546
 EBUILD rnc2rng-2.6.2.ebuild 520 BLAKE2B 9b089cfc741a24ed785ce109c9693fa0673f083e46645baa2389ecb957877586242479048f9d4f34602520277acab52b632e684fe5ff97f59ab26977a3dc4cc5 SHA512 e789868bb19ba5d2e154fba81fe68dc910357a57e7280dbe59cbad9841e3cae7bf2c6da59a5ff36a4983c5a764d7f055f777cfe6fe30587d30798a71da3e5a01
-EBUILD rnc2rng-2.6.4.ebuild 553 BLAKE2B 5cd45765b64a92dcaba48ad6fa93dc64a599cf43fdbd861eac16effa3a9ce6ab2d16937da2bddc7cd3907609b87cf3fe862858176f49625f885036c255afd39f SHA512 9de12b3dfa1d78614ad58f6ce4685d1904465a18a545affeb27e6ea974aa653d1aeeb9e6f07f75e3ae0427bf6fbe3b9d06d0b9d96b78f685817ff16f58a296c4
+EBUILD rnc2rng-2.6.4.ebuild 556 BLAKE2B 9d7c80a370870d068da8416cac405da5605a094253e6f193bc83301b48bcf7b535272334db47ed05a35cc6c2cb965a91d447639e9704777c45b2372134eeaa48 SHA512 b2f0889add071965fbfb12aa37e29cc25c6e004b473662a1a16c71b16d6c0ddec979b76cb21cbbf654cb0b494b018bfa340f66302a7d673c3c3b7bccbbb604ea
 MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
diff --git a/app-text/rnc2rng/rnc2rng-2.6.4.ebuild b/app-text/rnc2rng/rnc2rng-2.6.4.ebuild
index 034398c5e38f..0566e66856d0 100644
--- a/app-text/rnc2rng/rnc2rng-2.6.4.ebuild
+++ b/app-text/rnc2rng/rnc2rng-2.6.4.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 8a1e46b639da..cbcfeff3afce 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-2.1.ebuild 11963 BLAKE2B 59b7f7f626b46130446e4bae5ac382607200d114cc68a5312ccbdcb4800b1e2e2c7f8516791667aec8489315a1d49eddca9f3fd289128ecf02843c28687503fa SHA512 78f1d13471919b4cc0eece5b4d1ec3213a016149ea5fd89cffb524d500a42f3883665c851190815dcc0c155ac61e208d6d013627ea41b950d012a1094fe0b68a
+EBUILD sword-modules-2.2.ebuild 11993 BLAKE2B fb7977dafa649085c49b66681a47a73ff34e7e3f00f9102d5411a2ccaf864efbb95f2907672a15d90ff43e2d5e81ca187021b51e215092ae2c68514b828fe755 SHA512 5165164dd8c1859c4432f52159d16560c6b0b9c1e69f687be55165f1420ced9bc0cbe8fb60bc0a7b1d1ce5e0ae39617428f3226f6d4e77cac26940347b5b99e8
 MISC metadata.xml 361 BLAKE2B 51316035c5e4197a328d336f328b3b3b777bcd14dfea50f11060624e86ec566b5d4e1bca5f755cd8f165aad8100bcb9c9a8aa12f036ad4df52276a9a16fab51f SHA512 61c6526b5fd049d5c13ee6af9bae3eaabc7151fe45de3ba63869a5ef8f2a4b00a4257c5a8d244f245b4e3f92d47a97a54c83ad03bf0742c1dda143efe392a10d
diff --git a/app-text/sword-modules/sword-modules-2.1.ebuild b/app-text/sword-modules/sword-modules-2.2.ebuild
index 9d74c11bf8d3..3c794d642151 100644
--- a/app-text/sword-modules/sword-modules-2.1.ebuild
+++ b/app-text/sword-modules/sword-modules-2.2.ebuild
@@ -545,6 +545,7 @@ RDEPEND="
 	)
 	l10n_vi? (
 		app-dicts/sword-FVDPVietAnh
+		app-dicts/sword-VieRobinson
 		app-dicts/sword-VieStrongsGreek
 		app-dicts/sword-Viet
 		app-dicts/sword-VietLCCMN
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index a95adde22dfb..20d66d9b8c5b 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,5 +1,7 @@
 AUX sword-1.7.4-configure.patch 816 BLAKE2B 6b1dc70d5146178be9e2e650b6a46f9a64dfbab2edfddeea7c4f3825c00ccf1af7fe328b86be90c3730ecb928ae9fe1c4558f3a0bcb6acfba6a207a48c32b3f6 SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186
 AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d414424fc3ca7618a098d6e3ee82c440eb95c3370eeb0dbe46a4abe7ccc0c62e7b725cfed0f8ec0951e11099627337 SHA512 7bd545014ea81fa5f6203d39fd1a4125ae163ac51fe76270511b1df65d4dbf44b912fbaf3fa6a6d6a20370efc3abfff9feabe5de7177981ce1b62f4d9c5ce49d
 DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
+DIST sword-1.9.0.tar.gz 2606652 BLAKE2B cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236 SHA512 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f
 EBUILD sword-1.8.1-r1.ebuild 1818 BLAKE2B bfb01f3537feccb057fd34fc0784af7ea955164e2b6f195ad10f85f0a5759ba14e3626895d11f4ed31f43ecb3c0d479330c75bbf9e5622b522827390f76c72d4 SHA512 05577095fb4cede4cb549dc18af636937523bf6089fa70e0c73b91464799e2eb134ab0179c293fa5ec2acb5ee8e328fd5c3e19aef5b298abb2757d15841f2cf4
+EBUILD sword-1.9.0-r1.ebuild 1057 BLAKE2B 2b50b4de24835408d11622eff9d9e6fa0c36537bffacfb9966d821e6f20334d86bd8398b08459cd53bba49cac2d50aec3e72ecca5b247aa3e6a3538569f2eb18 SHA512 50ec3ede9472a835b0549c69dcd8c3c344f5bd6173a9c7a1d9f5a16567cf1da976250a30e39b9900f8e82bbc8ddff55f3ed4f152062ac19085209a77bdc70aa3
 MISC metadata.xml 593 BLAKE2B 945677f76cbe16a77999ede8bd2c7ee6926c2aade70dbc1a8125fa30c73130601f21a47e4ec34a70121ea7b61c98c10748ec17933bde0d98d7d32cd5e28cb37b SHA512 4c11d1b66bb60f21d8706f25f4541147ece1a75f5a1676c75d7be39b8af982bb35fd743fe040204415c3a89f8729c7bb6e83e3bd66ccd5114b4d3739b876a4d8
diff --git a/app-text/sword/sword-1.9.0-r1.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..edd796fc48f7
--- /dev/null
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="https://www.crosswire.org/sword/"
+SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+IUSE="clucene curl debug doc icu"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	clucene? ( dev-cpp/clucene )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS CODINGSTYLE ChangeLog README )
+
+src_configure() {
+	use doc && DOCS+=( examples/ samples/ )
+
+	# Upstream default is to build both the shared and the static library,
+	# make sure we only build the shared one.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DLIBSWORD_LIBRARY_TYPE="Shared"
+		-DWITH_CLUCENE=$(usex clucene)
+		-DWITH_CURL=$(usex curl)
+		-DWITH_ICU=$(usex icu)
+		-DWITH_ZLIB=1
+	)
+
+	cmake_src_configure
+}
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 39752269af4a..ef3e646a52b7 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,4 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 881 BLAKE2B a8f97ed114305cfcb840271cdf86485c587e78c82bb8a6748f5a57e0e100b77d467abac66c422e462c8dbc0a6b12968865a2702eab1e25daa999d49c9ad2413a SHA512 88be8fd876c957f39105b950228830634c11e531dad5e9e1828bc1300c23072b63c216b99a90aa40a5b6cfa03b15b90af59af312c44b3a2026ebe7065f121878
+EBUILD wdiff-1.2.2-r1.ebuild 880 BLAKE2B 4c386057db6fa83679b42c0314abe6336dda9bfcdfc2c5887037595f210b8eaa81509ecacf991ee77b90597ae5fe21c19d3cbb27b73854468840977bb2c391fd SHA512 ad0383422e8aa931adeeb787d47d2fc2c189fa2b65bf6f7cb70657b6846de9bd71a1a1541d3423434689c75ee133cb8af3f80603408c0933e2e95eb5485bcb5b
 EBUILD wdiff-1.2.2.ebuild 851 BLAKE2B 20168eee855349d4e7a5058b1b8e93ee39bc94231856598a6729db90b41e034c69f1b92ddce2f88d32b57d2da0e1068084ee82352d9924e68a4901901bf6f04b SHA512 2fe11c3f47e3a20ac3b265738182d607cbbbee88629257d288a2a77d97c9249abf5f3523fa19cb2a3799c290854c69f069d7e2efe9e6f99408fb00be3e8d9d57
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index 7c8054b50458..f8235bcf109d 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index 13a05258ad3a..2eb4671c411f 100644
--- a/app-text/wiki2beamer/Manifest
+++ b/app-text/wiki2beamer/Manifest
@@ -1,5 +1,5 @@
 AUX wiki2beamer-0.10.0-doc-examples-makefile.patch 641 BLAKE2B cbac271fbfcb8a41e9bfdb4eb950a9cad46f71f38378a5a4309b401ac6a136865dae81fbe6f75bc1dcbcbc43f1d78a225c5f48205667aad869067b2eb5eb3daa SHA512 0e92df952bd4e82d6198d26f88303c9e992d9f409185079c9261ee11d3a61e76e988574ad7b830fdd9075430ed2fde9e5a635f512e71fa730557af95bcbe23c9
 AUX wiki2beamer-0.10.0-doc-man-makefile.patch 1441 BLAKE2B bfbf6c71f037d67359d1460a4e3c75b7b0a260252881efc2429ddc0b5aa90005c2c4bd36b18873106f9010803f765217f19a1575ee7ba5324ad53e52908a23d6 SHA512 b6ad3ce2b1435d79cce8a517e1a784399b349c4390c245d888b50acb2f5b89aaa49241d3687e4b5432fde7d433bf5ab5fb4bd1d4d96dfaa44358a6c0961bc76b
 DIST wiki2beamer-v0.10.0.tar.gz 164911 BLAKE2B 0a532669915f0db5f1bb8755297bcd36e4175bc57d3b5f14df01566ac74e425c999447ff3f2bd20f2bcd50671bd65accfcf8049476a1656439fc46bab2becafd SHA512 712c719bcdd97f48c65aff1919f2e6a838a0beba1d2e5569063fd1f84bf68eda3137ac20e5dc463dff64c8b4656ce0bf02a0acea090b9a30262374cbee5db433
-EBUILD wiki2beamer-0.10.0.ebuild 946 BLAKE2B 21783eff4aa4eb1a981ed36a64c1ca0d10ebbf011d0e4d9c8e973117523cf112ee798a6dd2d476c87fb789df3d6073a4a5043fd674273deaae4094b302fe8b85 SHA512 1754372e1c4cc0c14988b515fa5f7cb8d42740af6e988d4af808c74ed1798232b83010aa68eb18240e3dfbeee1989d2a27516ece5ea5255564add3ed7662f9be
+EBUILD wiki2beamer-0.10.0.ebuild 947 BLAKE2B e726e9fa3dfb2e516e8ad5465559f8435e496cb843b408f0f3341cbb6f5f5e60e0276c9014b377022083dea45af8193a1de57cfb2e5fabc74622ea22fed5c251 SHA512 3c7c398697f7ae0d2727f9ae4e1aa345fa2bf5f4524413ed3b2631ce4846b9d1e0c090bc5690013f79fce05dbbd0ee9629482beebcf8c26e36c1798e9b89ab52
 MISC metadata.xml 330 BLAKE2B 27059ed0cbe2bf10ad3b028d1f0e12b0617c0e2146432e375ccae5d570d8b1c1860bb9b9f36021a588ce859b7b30dfc04fb1f841890c549093687f3b6ad8addb SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1
diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
index 3d7c75757a2a..349bbcbf25eb 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit python-single-r1
 
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 85e599ec8b6a..0931fcd39ecd 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1443 BLAKE2B d5f7311c5a84241305dac26bca3fa255e4abced4187c8fa5fab3380fc0bce1473f11378c166bd32c9fbb008c4e6349ebf18b3570a4f75298479c0263d4f75aea SHA512 724e880ab62219759da678e63c4b59f6cdb391cee8f42a93439d168f7fdb3f6cbd94b58f99b66169bcbedc6722e05393c2880b003621d6e31d55fa3e10a1ae5b
+EBUILD wv-1.2.9-r2.ebuild 1450 BLAKE2B e9725127cc6fd80db6159117acda509a88abe56dee32a997ede4a3c56e84251859a460e657ed84674db0ce61467b33f7f5004a9fa3332b8762345bbfafd0d0d0 SHA512 b5d4dd127e571727d42b308c2c0a30317fe13785009fc75ff2987c4774b54461f2aa1dc2a9fee42d39cc25a0c3f95fda9f310763783a93bd98704e85f726f848
 MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index 054e347dbd24..ed750acca201 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://wvware.sourceforge.net/"
 
 IUSE="tools wmf"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 1f6f6b70ab77..91a41f1a9328 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -5,5 +5,5 @@ DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae
 EBUILD xapian-omega-1.4.14.ebuild 1154 BLAKE2B 8811fc7b98c00a549752cc33f1f6ee53a5c9af856e3bc534b830e89aae2a8f2e4dc9b33f14bb5de528bde8941c5629e3c31660daa9e20c5a77133203befd539d SHA512 58671f926670abde77437ed28e6b602777475bc5e5a57775d65d02ff0c6e0ef2c6fa1eb3c2db250c44496697ca6fe4c2bac9a48f73a0b6b8d2d657114227c347
 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 1156 BLAKE2B cce7bddb39c30a9d26017db0401d295b83701572362de81d2347038cb3431851652b7b1a6408b9189ac341a452ad0be22dadc0316ac6857068597bfc3451b485 SHA512 b8a1c0c4796bf75b9c79905f490a7ca7bd3d6ad6de1296de5feefa59e9d7008c5bed5ce21a64b3d7d324bded36591179f7de5d461a6286055ef6c9df2ff44916
+EBUILD xapian-omega-1.4.17.ebuild 1154 BLAKE2B 8811fc7b98c00a549752cc33f1f6ee53a5c9af856e3bc534b830e89aae2a8f2e4dc9b33f14bb5de528bde8941c5629e3c31660daa9e20c5a77133203befd539d SHA512 58671f926670abde77437ed28e6b602777475bc5e5a57775d65d02ff0c6e0ef2c6fa1eb3c2db250c44496697ca6fe4c2bac9a48f73a0b6b8d2d657114227c347
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
index 5724ce6d468f..5d0f5ddcdc69 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.17.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:0/30
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 74d438f96e39..5ee968c4735a 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -2,12 +2,8 @@ AUX xchm-1.23-wx3.0-compat.patch 929 BLAKE2B 87f22da40033007e071ff3c1ca497247027
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
-DIST xchm-1.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6
-DIST xchm-1.30.tar.gz 981171 BLAKE2B 6b2077e9cf8fa849121cee3681bd390218de1ce83c9c49117a186ddef107b15ee8f491eb93ae41ba8a2ea07ede306883ef0f8f0c357142e9ca333bdea8ebc50a SHA512 896d94f4fa3b728e37985b1a2e918596e20bed0a43cf90711d27ebfdcbe49e4a0794c17e1f6cfefb6f272adcc7fb22464e2c25c15d0f0afcbe94b867899eb1a5
 DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.29.ebuild 1212 BLAKE2B a92a0015f18489465890cb9d292aa8e834a732e9d3b13b4df7fff95a42e0a3f2654c0aa59dae7327fd09e1330b5d0d8ab885a757c6fbfdb01227f2c04957c26d SHA512 ae281e0998252802f558ed91ba1ff39ec04144b9b2f6666657bc27d2ed9320a0420cc7ade9aa25cf5846fd1fbb3e4c158c2a4d3f9d164026cbf1fa9d3108399e
-EBUILD xchm-1.30.ebuild 1014 BLAKE2B b78f2480a9fb60cea85e74e185fc69b7cf34b429c53fb4d5a2b02b6287b88d156a29f2229dfa2332d080fbc8fa7b35a6c7165dcaffb60a9da12fb9739b352c75 SHA512 030b6a0e0100e1ba1ab2948eeeacb88fe42aa4d0d40be1746b2fd0a17d90178894a9034d66f8f7921160f2a4052a0e1f85f08c7cf191229f17badcc56ff0ad7c
-EBUILD xchm-1.31.ebuild 977 BLAKE2B 624e6af9fcc645192601235324dc61af665c23633fdfeb1ef461ea0e30f68f47b9723c0ed80f05aa73cf683b4ce1f37e1ce509966c7aa97b2060a00c24ab87b8 SHA512 ed839bbf9adf445c192518682e2aded1a0a2063f9ff1baa07427121dca675193a8d75ea2c0b23ed999588777a434487e52f1b38e070b6ff1712626c105a96689
-EBUILD xchm-9999.ebuild 990 BLAKE2B b2b4cb34cbe9bb43b49add6f34b37b462431eb97d67e1c7f0b0e8c522a8fec4f43ccec99a0cf71b42788c7ccb86a4b22624601e15330fc77d90d65a1da54c3eb SHA512 93ed6be0693e82bf4750bd18761a219527e9ee621a349f7e1c027160c97e0c86889ef7fa1cbcf3ac7429555b4a8c54621cdf4729c76d789b1e7f234192b73310
-MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
+EBUILD xchm-1.31.ebuild 947 BLAKE2B 2e5fe64c1009644c937f5001dbee0225753261825fee7ff78b59e851ad326962d2e508784461f15f092057b3ba970a4a09d520399f831b0f9a19d6b9d18bddb9 SHA512 8416e9df53ea552ac898762b3dd3e26bdd64fb27cf49e996864f557f3245c8d56bbb52c5a85e6c50e7f5dad54e60c9ff7e1c2f83c723986eddf5ccf2db5d5e5e
+EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
+MISC metadata.xml 370 BLAKE2B b7a2c5ee6e02f758f53ae1f67a982d8e3c0ceffed66524c9072801bc3cb803419824ce0a30b59f9dd16cae6381ae3b1a28a9b084c6dd71ab8d68a3a9be36e5a9 SHA512 f926ec5a7690046f0c1e73da64d5ab9eb662491cdb2ad24d44455ee5a4e94693188a3c8c17f777a0da120a44d57ca00f5713f5472c75f44215213ce41aceef2d
diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml
index e0b21d3488e8..82e69e9cd642 100644
--- a/app-text/xchm/metadata.xml
+++ b/app-text/xchm/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">rzvncj/xCHM</remote-id>
 		<remote-id type="sourceforge">xchm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/xchm/xchm-1.29.ebuild b/app-text/xchm/xchm-1.29.ebuild
deleted file mode 100644
index 7fc116cb157d..000000000000
--- a/app-text/xchm/xchm-1.29.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-inherit autotools wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	setup-wxwidgets
-	default
-	eautoreconf # Still needed on the next release?
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS README ChangeLog
-
-	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
-	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
-	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
-
-	domenu "${FILESDIR}"/xchm.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/xchm/xchm-1.30.ebuild b/app-text/xchm/xchm-1.30.ebuild
deleted file mode 100644
index e1a21d227bbe..000000000000
--- a/app-text/xchm/xchm-1.30.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-inherit wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	setup-wxwidgets
-	default
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS README ChangeLog
-
-	domenu "${FILESDIR}"/xchm.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/xchm/xchm-1.31.ebuild b/app-text/xchm/xchm-1.31.ebuild
index 07a7c38f9ed6..276ca9d35624 100644
--- a/app-text/xchm/xchm-1.31.ebuild
+++ b/app-text/xchm/xchm-1.31.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 WX_GTK_VER="3.0-gtk3"
+
 inherit desktop wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
@@ -11,18 +13,14 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND="
-	>=dev-libs/chmlib-0.36
+RDEPEND=">=dev-libs/chmlib-0.36
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 src_configure() {
 	econf $(use_enable nls)
@@ -31,8 +29,6 @@ src_configure() {
 src_install() {
 	default
 
-	dodoc AUTHORS README ChangeLog
-
 	domenu "${FILESDIR}"/xchm.desktop
 	insinto /usr/share/mime/packages
 	doins "${FILESDIR}"/xchm.xml
diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
index 13396034ab8a..b652fcfc7a2e 100644
--- a/app-text/xchm/xchm-9999.ebuild
+++ b/app-text/xchm/xchm-9999.ebuild
@@ -2,27 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 WX_GTK_VER="3.0-gtk3"
-inherit autotools desktop git-r3 wxwidgets xdg-utils
+
+inherit autotools desktop wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
-EGIT_REPO_URI="https://github.com/rzvncj/xCHM/"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rzvncj/xCHM/"
+else
+	SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="nls"
 
-RDEPEND="
-	>=dev-libs/chmlib-0.36
+RDEPEND=">=dev-libs/chmlib-0.36
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 src_prepare() {
 	default
@@ -36,8 +40,6 @@ src_configure() {
 src_install() {
 	default
 
-	dodoc AUTHORS README ChangeLog
-
 	domenu "${FILESDIR}"/xchm.desktop
 	insinto /usr/share/mime/packages
 	doins "${FILESDIR}"/xchm.xml
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /app-text
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)