gentoo resync : 25.08.2020

244 files changed, 3103 insertions, 3891 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d9249bcf7e91..06141a873426 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 3ca5f22f58bd..a592662f3d24 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
 DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
-EBUILD ansifilter-2.16.ebuild 1009 BLAKE2B ee7751cce471e0093badb09bf41e5369cebaf6a17542c019d06a5a37f70b5ba6ccc6d94e6d3fece85ba24b1cb8e08e0b68e4634ea018608ad5947b72842fea5d SHA512 ca385e86a7c2b698369f939498fa85fd50e03d6ac5eee42acffca46e5650b24b93c724da4fb248df3a45ec6458b968dffd1245fe04eb3440c84301e002e4a0ce
+EBUILD ansifilter-2.16.ebuild 1016 BLAKE2B 8889822a7d5f469e114971fd0aad097e64ac3b237528d2abec01b36621899220cc015b8193d4eb32cc87e8a049d7cf3c523c0733513b4ce2c978f0aec2c68b78 SHA512 83548025ab5e6384bbbaa3d88bf1a2377b64b17ea9a5bf000a3dda8ba33370f5834210c39a4bad0a93b0bfcd536d9c714b585f15541f838c6c0a962b389e0c56
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.16.ebuild b/app-text/ansifilter/ansifilter-2.16.ebuild
index d6ef6e4cc8c8..f151d1243229 100644
--- a/app-text/ansifilter/ansifilter-2.16.ebuild
+++ b/app-text/ansifilter/ansifilter-2.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index d20c2bf7afe8..f781fe77aa09 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-DIST asciidoc-9.0.0_rc2.tar.gz 1145229 BLAKE2B e820a957a5e03f8b28e94fb0e9514b2beebe5b08a30357b7ab70db326894270972cfee1b44c30d51dc1c4794e91a09e36acbf9e464386d9e932ac7d32e2f8e93 SHA512 61ea1eb74a2e2da76f92e32ef279f8940fa4ea77a82078e15b54c7c6f134e9d177b0425c6eb8a239cfd2dc6a6f85ad5e93883a447a3e0e92850c0898747b5ea3
+DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624
 EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B e29260b9b80ccd796662ea0ce4d207a66c4b99ffc371ff7ad02e38350ae9564a21c98740d4de7fb967ebb17cba1ff243e19e51e575ddcf08fa32e34549b2e255 SHA512 21e1a6e7d72d96265be242b2234faff0aa777f22895a4b051fab26be6e36c0d0b9a91463097e87c485cde39168e3ed4bc0033d9eaa164407f051db806281ad58
-EBUILD asciidoc-9.0.0_rc2.ebuild 2718 BLAKE2B 7663a75927e76607a54d7ab8d22b27feb041881cb229f66fafaff69848fbcb725ded0bed61f18252160bf323f4b448fbe0896f2ba65d260fa266672db22bdd45 SHA512 7108bca1b61ac986342c6b8f513ce4cedb6e82913078a6971fbfebea8e4917eee13bb68eb922f20feecdaa409d62b4573b12abe40ea5eacf5deea0e58f17c2d6
+EBUILD asciidoc-9.0.2.ebuild 2354 BLAKE2B cbadac1a48164d34caca69cfeb8fbd7bd8b42e05d07ff751f462092f98723f67c80e2486e1a62611c8fa89ffe5ca9b23b8b949dfee35123a7ce2c9c823ac4f5e SHA512 6ab2cbfd034e16b1c4e99c4222dbaf97bc8409e18211526bf498e07c48d7cdb285cb07cc08842ea8b4fe9448893662d8c2142b617dd6298bccce3d1be6161e87
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild b/app-text/asciidoc/asciidoc-9.0.2.ebuild
index a9c28a003493..322c172ecb88 100644
--- a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit autotools eutils python-single-r1 readme.gentoo-r1
 
@@ -13,8 +13,8 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.
 
 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples test"
+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="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -54,6 +54,9 @@ src_prepare() {
 	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
 		asciidoc.py || die
 
+	# enforce usage of the configured version of Python
+	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
+
 	eautoreconf
 }
 
@@ -61,25 +64,16 @@ src_configure() {
 	econf --sysconfdir="${EPREFIX}"/usr/share
 }
 
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${EPYTHON}" tests/test${PN}.py run || die
-}
-
 src_install() {
 	default
+
+	if use doc; then
+		emake DESTDIR="${D}" docs
+	fi
+
 	python_fix_shebang "${ED}"/usr/bin/*.py
 
 	readme.gentoo_create_doc
-
-	# Below results in some files being installed twice in different locations, but they are
-	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
-	if use examples; then
-		# examples/website is full of relative symlinks,
-		# deref them for copying, which dodoc doesn't do
-		cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index c4f20d6699b7..09acd9df5fce 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,5 +1,5 @@
 DIST atril-1.22.3.tar.xz 1798396 BLAKE2B 1f06585393e1a9a6d51b7cc50c52bd61e8e115aa3985ffca0233c2e09219a88c3a30b4ddbcc70bfb9ddf663810e6cc67e968f8a32bfd4a3f07b4646e896a7f18 SHA512 f4a83702818e1fb32279c67f1727c01480d27fe756f3fc0ff9dcd42584ce74ce10ac7ee81c0149f3756b6eb08f2a011ede28706ab54ff16a51c544a1af3b103f
 DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293
 EBUILD atril-1.22.3.ebuild 2173 BLAKE2B e1306cbb47dd78e18ef826a6f607668eaeb38f3323420ff1bfa5bef47c90dbfaf2776a040d89592ca0662341db5a458839e4d971222f2b32b48b655357974c41 SHA512 385379581433704ca2da56286ded25422387b640bde61ecb10cc0c4903811163350c0b11b95e963cda325da7fd3ce54ec06ccf9a67b28812ec599fb584d13178
-EBUILD atril-1.24.0.ebuild 2234 BLAKE2B a55e8356aab30caf603b2506ea37c271f781ccea281d87c0740b2702e57980940ae6c96366862f516ca700ccc47a894c2c3d9b4b171a95aaca425a0bc3a2bdd8 SHA512 963bbe109cf829d5202a6dc93b34d2be21f53f4d2af655335e403445d52260387382289673f604e849bdaad6da505f4f85c842f6c15d304a0d7ee9219c841697
+EBUILD atril-1.24.0-r1.ebuild 2253 BLAKE2B ae262b9f622fbbd916898c936e83d5411501596bd4b1c36ddf057ae4a25aca707f6f4eb7ea8a56ffd3662e9db0b46aaafde49e879ddbd32b67eaeee5871b4de0 SHA512 c76e3f3ebcb797648ee2290e6adcd5920c5a55e01b8f529ca3c58a9b4132baa388bb4aceaadd8e2322821b0cf0f135e1950de096f6b6681299c65cf4a145440f
 MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
diff --git a/app-text/atril/atril-1.24.0.ebuild b/app-text/atril/atril-1.24.0-r1.ebuild
index 0f89edd836ad..58223d3207d6 100644
--- a/app-text/atril/atril-1.24.0.ebuild
+++ b/app-text/atril/atril-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
@@ -75,6 +75,7 @@ src_configure() {
 	# Passing --disable-help would drop offline help, that would be inconsistent
 	# with helps of the most of GNOME apps that doesn't require network for that.
 	mate_src_configure \
+		--disable-static \
 		--disable-tests \
 		--enable-comics \
 		--enable-pdf \
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 130abd5fb53d..6cdfec21e4a2 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,5 +1,7 @@
 DIST bibletime-2.11.0.tar.xz 2403136 BLAKE2B fecf854a40ad0e188fde8ad3d047acf6274bfdf20f6a6211a6ff9d41e3de38f4d311db92e2b2fdf735e293163637cf4b553e722a05174d8c84201e94cf6e7b7c SHA512 41f0751db30b9001d04e1c4040dca022c83eb440987104e2c3465f4233f8c0ecb1c940eac0433409f97f78c89c00d0f880f822a51219eadcbf3fc6513cfa81e6
 DIST bibletime-2.11.2.tar.xz 2533472 BLAKE2B b116bbefaac8106d1f283d1c1a0c4d4c17e67d1cb41066c219ecca243914b0fa355748ebebb23ec88c1749548c853166d391764a454dd77b43c6617072a648a6 SHA512 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31
+DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
 EBUILD bibletime-2.11.0.ebuild 960 BLAKE2B 65bdcfeb1a85ac2ae4232f58c00b48b5453f310530da42b62a3380affdd9f6fa274aa87e1e764ef501467893f4b7dd899e55f615df6b11d961f28cd97a0281d8 SHA512 35dfdbdc5220a77856ad9d00ba93eb5b834a3f3bb00dea85d1f418af8a4212a959e09682f471b083e0cfff1e53a7dd3678dd55783e786f0adf39be16df786ec2
-EBUILD bibletime-2.11.2.ebuild 962 BLAKE2B e82a986d78a9f287b1c72dae5e525f4e61c4377af4f921455d588940f808edf766bcd69cddfb06e8c0f808e67cd6a0a8b1f78214863c2be7ff694849b9cea461 SHA512 fdbff40e6d53b358f1ed9ea15aa7171b743b24366d0000c2664406c9130bf8850fa1aa36f5dc257262eb3e46954156aec009d35b739c188905295803eed7509e
-MISC metadata.xml 658 BLAKE2B 0f4e1d9ffb30d6d0a9ca097739a4a58c9fdfd4d4b777f552c3bf3584a36e902d215f6757c83d449b17355b105076b231e775c9537337bc830f60d2a0799d475a SHA512 4d3e9dd30225ea7a354750d38bc4e4b9cac37a2cfe9e40d79835536b5ed9ae7c6704f1b12a32e0bf2926574378d6ec014ccdcc4a7af0b15f6e336d980060eeae
+EBUILD bibletime-2.11.2.ebuild 1304 BLAKE2B 583de78e4e8868c26e509939d2273284db179d41b5207b3ef0bfa31f6abf859031ba239051b4122b42c39fc3a12eb0920786001ee188761fd2422e738e684e3b SHA512 f7b7ffe12fd292e35d910da8323d273c1c69a868ca7a0424f6f97f17f3d0fcb61bb122f3c6c647fd167f20a5f0875166270a3dccd3c0e6985a6eb66936ac2797
+EBUILD bibletime-3.0.ebuild 1468 BLAKE2B b067588a1e999a797ce9d2853eec25ec89319a60c7170dd33cf2a827e40bf3efb2ce6e97f1640cb3c3c517743b9c9060de992aa9d104538e311cf2932f1bf57c SHA512 7c224b59fb239b1ef8fe6ec1683e726691e2004eac2b72e93cbed52eb0a0dc82609c770bc6dae8dfc53783c65214baa28477338aa13c72937185434d8667d74a
+MISC metadata.xml 656 BLAKE2B 66daf991e55a977a67ff159c7d2bd780308bd580572b8eef8fd5a456cc0932e837c10b175cae7288b0c5097434820b9eb9bdd2b93124f81fe6441e913823674c SHA512 7214abfb4ded4f531e84a2895ece417bb3fe36249fb59ec1d53d231d49d40119c66438931c0cdae79fb4859a70874c3bb03670d554c86f221223530eb12f0bc0
diff --git a/app-text/bibletime/bibletime-2.11.2.ebuild b/app-text/bibletime/bibletime-2.11.2.ebuild
index ebbcd684ed65..f148b08c8277 100644
--- a/app-text/bibletime/bibletime-2.11.2.ebuild
+++ b/app-text/bibletime/bibletime-2.11.2.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+VIRTUALX_REQUIRED=test
 
-DESCRIPTION="Qt Bible study application using the SWORD library"
-HOMEPAGE="http://www.bibletime.info/"
+inherit cmake virtualx
+
+DESCRIPTION="Qt Bible-study application using the SWORD library"
+HOMEPAGE="http://bibletime.info/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+KEYWORDS="amd64 x86"
 
-# bug 313657
+# Some tests fail due to being unable to find an icon directory relative
+# to ${WORKDIR}, some others segfault. Needs work.
 RESTRICT="test"
 
 RDEPEND="
@@ -23,6 +25,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwebchannel:5
 	dev-qt/qtwebengine:5
 	dev-qt/qtwidgets:5
@@ -36,12 +39,23 @@ DEPEND="${RDEPEND}
 	net-misc/curl
 	sys-libs/zlib
 "
+#BDEPEND="test? (
+#	app-dicts/sword-Josephus
+#	app-dicts/sword-KJV
+#	app-dicts/sword-KJVA
+#	app-dicts/sword-Scofield
+#	app-dicts/sword-StrongsGreek
+#)"
 
 DOCS=( ChangeLog README.md )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
-	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_test() {
+	virtx cmake_src_test || die "Test run has failed"
 }
diff --git a/app-text/bibletime/bibletime-3.0.ebuild b/app-text/bibletime/bibletime-3.0.ebuild
new file mode 100644
index 000000000000..599fd22e4549
--- /dev/null
+++ b/app-text/bibletime/bibletime-3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED=test
+
+inherit cmake virtualx
+
+DESCRIPTION="Qt Bible-study application using the SWORD library"
+HOMEPAGE="http://bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Some tests fail due to being unable to find an icon directory relative
+# to ${WORKDIR}, some others segfault. Needs work.
+RESTRICT="test"
+
+RDEPEND=">=app-text/sword-1.8.1
+	dev-cpp/clucene
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	net-misc/curl
+	sys-libs/zlib"
+#BDEPEND="test? (
+#	app-dicts/sword-Josephus
+#	app-dicts/sword-KJV
+#	app-dicts/sword-KJVA
+#	app-dicts/sword-Scofield
+#	app-dicts/sword-StrongsGreek
+#)"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HANDBOOK_HTML=no
+		-DBUILD_HANDBOOK_PDF=no
+		-DBUILD_HOWTO_HTML=no
+		-DBUILD_HOWTO_PDF=no
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test || die "Test run has failed"
+}
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index f1ef81c14f45..c397d7aaccbf 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>theology@gentoo.org</email>
-		<name>Theology</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<longdescription>
-BibleTime is a Bible study application for Linux. It is based on the 
-K Desktop Environment and uses the SWORD programming library to work 
-with Bible texts, commentaries, dictionaries and books provided by 
+BibleTime is a Bible study application for Linux. It is based on the
+K Desktop Environment and uses the SWORD programming library to work
+with Bible texts, commentaries, dictionaries and books provided by
 the Crosswire Bible Society.
 	</longdescription>
 	<upstream>
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
deleted file mode 100644
index 5267e2561d07..000000000000
--- a/app-text/bibus/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX bibus-1.5.2-bibus.cfg.patch 1280 BLAKE2B 46d1d0f784636c02373372bab68bad592cf88a88f587a9c40411e38992ec58cbaef83ad3a1db4f3ba70701525312cdcda88e0041bd6bce59c899b868bfb76865 SHA512 f62aee3cd67d2c845cd3d19ee07ecab2a2a058d49c55232b7df51df3dde42bfba6a4f23cbc4d31f38788c9edf73780f444a4a5354b2deafac6a0f2d7158a2627
-AUX bibus-1.5.2-install.patch 5630 BLAKE2B 8f0da2eb8fcfde331b1008650f3ae0156a82f64e86fa894bcb051fc78322451a8cab3df2a19395791cfa3a09b4687669ecc0dd8521cbd342fa342d36ebeade76 SHA512 a553cd687d0bd861b65896acb2cface6f8950e3a6006975ae53108d5984ead2e9dde8e610e003b5c8888bd0b7e635542a83c1a502df09cb6a7dcb85b8a0a1e33
-AUX bibus-1.5.2-wx30.patch 7623 BLAKE2B 644d97804c8e43f63df0090026e0e757dc9a80eee521ac3f07630912619cb26ab9f9893351e56c7b1b1aa3024e3c15f71504392362404cf37d92b6c73182e2af SHA512 48915b9dedbaddc6fc1f7adc6f197e1e5df01942a897c6aab664fa36c980a0978d111deb29e05d2b282f9ec17e01ff2117f11d86cd53600a0fa6ebfc4c6de049
-DIST bibus-1.5.2-lo-4.patch.xz 13196 BLAKE2B 1dfef94699eee77537fea3d3b93aeb1613fc93b68df1deb43c4af6fae0bf5aeb2282bb823f4824272acdef53a5edcd9b30a52415e82da00952971fa65ec0d9dc SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1
-DIST bibus_1.5.2.orig.tar.gz 5411889 BLAKE2B db95ea4b1e0ba22fd85cb36d945864741a2f40890499018698c679c9f7d4b77b2299d2aa941664b2e4011c41ea62a31463b39c392eb3678633de17482f928474 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4
-EBUILD bibus-1.5.2-r3.ebuild 2054 BLAKE2B 97ae9c2e3f09fe2e64f06a2518fa3f457c03bfec3e91b0f329626874abc3645b551a8ebe074173cb46e6f53254249792b2234303a02a82171424a8fe22021b2a SHA512 206cc042585499f922b1b50cb7d8bf8a34ac400e40da13e6de57c37e122c33360252ada918c6a3e1e011523788fd532439abe117aa3b496c8b51fb33932bea3e
-MISC metadata.xml 335 BLAKE2B 1bf81d23e26f3990b58cf0ae16ffb46f7b70d5e9a632c1a787145bf143a30e6721f872f077716d8abbd7c572659329a6927524ee9b17276839e04421cbbd80f8 SHA512 fe16c696e26755549539bce6b16f8370df11af5bf69c774a103ea608e99525e83a8e2b355efcff51a42f8296bc0146e66d4d4e49004e1a54dbbaba98dcdc867f
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild b/app-text/bibus/bibus-1.5.2-r3.ebuild
deleted file mode 100644
index f046112d4e06..000000000000
--- a/app-text/bibus/bibus-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-r1 versionator xdg-utils
-
-DESCRIPTION="Bibliographic and reference management software, integrates with LO and MS Word"
-HOMEPAGE="http://bibus-biblio.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="mysql"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Most of this mess is designed to give the choice of sqlite or mysql
-# but prefer sqlite. We also need to default to sqlite if neither is requested.
-# Cannot depend on virtual/ooo
-# bibus fails to start with app-office/openoffice-bin (bug #288232).
-RDEPEND="
-	${PYTHON_DEPS}
-	app-office/libreoffice
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	dev-db/sqliteodbc
-	dev-db/unixODBC
-	mysql? (
-		dev-python/mysql-python[${PYTHON_USEDEP}]
-		dev-db/myodbc
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-install.patch
-	"${FILESDIR}"/${P}-bibus.cfg.patch
-	"${WORKDIR}"/${P}-lo-4.patch
-	"${FILESDIR}"/${P}-wx30.patch
-)
-
-pkg_setup() {
-	if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
-		OFFICESUITE="/usr/$(get_libdir)/openoffice"
-	else
-		OFFICESUITE="/usr/$(get_libdir)/libreoffice"
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	einfo "Installing for ${OFFICESUITE}"
-	installation() {
-		emake \
-			DESTDIR="${D}" \
-			prefix="${EPREFIX}/usr" \
-			oopath="${OFFICESUITE}/program" \
-			ooure="${OFFICESUITE}/ure-link/lib" \
-			oobasis="${OFFICESUITE}/program" \
-			sysconfdir="${EPREFIX}/etc" \
-			pythondir="$(python_get_sitedir)" \
-			python=${PYTHON} \
-			install install-doc-en
-	}
-	python_foreach_impl installation
-	python_foreach_impl python_optimize
-
-	python_foreach_impl python_newscript bibusStart.py ${PN}
-}
-
-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/bibus/files/bibus-1.5.2-bibus.cfg.patch b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
deleted file mode 100644
index bfba0c0ac43b..000000000000
--- a/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
- bibusStart.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/bibusStart.py b/bibusStart.py
-index edfc19f..99c5381 100644
---- a/bibusStart.py
-+++ b/bibusStart.py
-@@ -17,12 +17,14 @@
- # along with Bibus; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
- #
--import ConfigParser,os,sys,urllib,urlparse
-+import ConfigParser,os,sys,urllib,urlparse,site
- cp=ConfigParser.ConfigParser()
- fileName = sys.argv[0]
- while os.path.islink(fileName): fileName = os.readlink(fileName)
- sourcedir = os.path.abspath( os.path.dirname(fileName) )
--cp.read( os.path.join(sourcedir,'bibus.cfg') )
-+bibus_sitedir = os.path.join(site.getsitepackages()[0], 'bibus')
-+bibus_cfg = os.path.join(bibus_sitedir, 'bibus.cfg')
-+cp.read(bibus_cfg)
- # We read first, then if it is not null we convert to absolute path
- # otherwise, empty path will be converted to the current directory path
- python = cp.get('PATH','python')
-@@ -69,5 +71,5 @@ else:
- 	except KeyError:
- 		os.environ[LIBPATH] = oopath
- # starting Bibus
--os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(sourcedir,'bibus.py') +QUOTE )
-+os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(bibus_sitedir,'bibus.py') +QUOTE )
- 
diff --git a/app-text/bibus/files/bibus-1.5.2-install.patch b/app-text/bibus/files/bibus-1.5.2-install.patch
deleted file mode 100644
index 5225fcd6c3d8..000000000000
--- a/app-text/bibus/files/bibus-1.5.2-install.patch
+++ /dev/null
@@ -1,110 +0,0 @@
- Makefile |   62 ++++++++++++++++++++++++--------------------------------------
- 1 files changed, 24 insertions(+), 38 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d41b12d..b07cdff 100755
---- a/Makefile
-+++ b/Makefile
-@@ -14,62 +14,60 @@ mandir = $(prefix)/share/man
- man1dir = $(mandir)/man1
- 
- define install-files
--	install -d $(datadir)/bibus
--	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
-+	install -d $(DESTDIR)$(pythondir)/bibus
-+	install -m644 *.py MySQL_Bibus.ini $(DESTDIR)/$(pythondir)/bibus/
- 	#
- 	for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; do \
--		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
-+		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(DESTDIR)/$(pythondir)/bibus/'{}' ';' ; \
- 	done
--	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
-+	install -m644 Setup/UnoConnectionListener.odg -D $(DESTDIR)/$(datadir)/bibus/Setup/UnoConnectionListener.odg
- 	# locale files. We look for all the directory in locale/
- 	for dir in $(wildcard locale/*); do \
- 		if [ -d $$dir ] && [ $$dir != "locale/CVS" ]; then \
--			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
-+			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(DESTDIR)/$(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
- 		fi; \
- 	done
- 	# bibus.config in /etc
--	install -m644 bibus.config -D $(sysconfdir)/bibus.config
-+	install -m644 bibus.config -D $(DESTDIR)/$(sysconfdir)/bibus.config
- 	# man page
--	install -m644 Setup/bibus.1 -D $(man1dir)/bibus.1
-+	install -m644 Setup/bibus.1 -D $(DESTDIR)/$(man1dir)/bibus.1
- 
- 	# freedesktop icon and shortcut
--	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
--	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
-+	install -m644 Pixmaps/bibus.png -D $(DESTDIR)$(datadir)/pixmaps/bibus.png
-+	install -m644 Setup/bibus.desktop -D $(DESTDIR)/$(datadir)/applications/bibus.desktop
- 	# The following lines are presumably not needed since icons/desktop are in standard locations
- 	#echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
- 	#echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
- 
- 	# bibus command
--	install -d $(bindir)
--	ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
--	chmod 755 $(datadir)/bibus/bibusStart.py
-+	install -d $(DESTDIR)/$(bindir)
-+	ln -sf $(pythondir)/bibus/bibusStart.py $(DESTDIR)/$(bindir)/bibus
-+	chmod 755 $(DESTDIR)$(pythondir)/bibus/bibusStart.py
- 
- 	# basic doc files
--	install -m755 -d $(datadir)/doc/bibus
--	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
-+	install -m755 -d $(DESTDIR)/$(datadir)/doc/${PF}
-+	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(DESTDIR)/$(datadir)/doc/${PF}
- 
- 	# generating bibus.cfg file
--	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
--	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
--	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
--	echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
--	echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
--	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
--	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
--	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
--	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
-+	echo '[PATH]' > $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+	echo 'python = $(python)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+	echo 'oopath = $(oopath)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+	echo 'ooure = $(ooure)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+	echo 'oobasis = $(oobasis)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+	echo 'docdir = $(datadir)/doc/${PF}/html' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+	echo 'localedir = $(datadir)/locale' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
- endef
- 
- define install-doc-en
- 	# copying docs in from Docs/html/en/ for bibus-doc-en
- 	cd Docs;\
--	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
-+	find html/en/* -type f -exec install -m644 '{}' -D $(DESTDIR)/$(datadir)/doc/${PF}/'{}' ';'
- endef
- 
- define compile
- 	# compile recursively all the python files located in $(datadir)/bibus
--	$(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
--	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
-+	echo "No compilation"
- endef
- 
- install-files:
-@@ -83,15 +81,3 @@ install:
- 	$(install-doc-en)
- 	$(compile)
- 
--	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
--		echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
--		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
--	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
--	# end uninstaller
diff --git a/app-text/bibus/files/bibus-1.5.2-wx30.patch b/app-text/bibus/files/bibus-1.5.2-wx30.patch
deleted file mode 100644
index b53486741817..000000000000
--- a/app-text/bibus/files/bibus-1.5.2-wx30.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Author: Jan Beyer <jan@beathovn.de>
-Copyright: Copyright 2014 Jan Beyer
-License: The same as the Bibus packaging.
-Description: Patch to migrate bibus from wxpython2.8 to wxpython 3.0
- Thanks to Olly Betts for the script that did the main work:
- http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git
-
---- a/ShortcutEd.py
-+++ b/ShortcutEd.py
-@@ -27,7 +27,7 @@
- 		self.category = category	# edited category
- 		self.short = short		# current shortcuts list
- 		# begin wxGlade: Capture.__init__
--		kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
-+		kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
- 		wx.Dialog.__init__(self, *args, **kwds)
- 		self.label_1 = wx.StaticText(self, -1, _("Capture from field"))
- 		self.choice_field = wx.Choice(self, -1, choices=[])
-@@ -110,7 +110,7 @@
- 		self.parentshort = short	# we keep a copy for updating it latter
- 		self.db = db				# connection to the database
- 		# begin wxGlade: ShortcutEd.__init__
--		kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
-+		kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
- 		wx.Dialog.__init__(self, *args, **kwds)
- 		self.list_shortcuts = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.LC_EDIT_LABELS|wx.LC_NO_HEADER|wx.LC_SINGLE_SEL|wx.SUNKEN_BORDER)
- 		self.button_new = wx.Button(self, -1, _("New"))
---- a/bibus.py
-+++ b/bibus.py
-@@ -120,7 +120,7 @@
- #
- class Bibus(wx.App):
- 	def OnInit(self):
--		wx.InitAllImageHandlers()
-+		# no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
- 		self.SetAppName(APPNAME)
- 		# reading and eventually converting the config file
- 		if os.path.isfile( wx.StandardPaths.Get().GetUserDataDir() ):	# old config file in $HOME/.bibus
---- a/Pref_Shortcuts.py
-+++ b/Pref_Shortcuts.py
-@@ -26,7 +26,7 @@
- 	def __init__(self, categories, *args, **kwds):
- 		self.categories = categories  # current categories in parent. may be different from BIB.SHORTCUTS
- 		# begin wxGlade: NewCategory.__init__
--		kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
-+		kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
- 		wx.Dialog.__init__(self, *args, **kwds)
- 		self.label_1 = wx.StaticText(self, -1, _("Name"))
- 		self.text_ctrl_name = wx.TextCtrl(self, -1, "")
-@@ -80,7 +80,7 @@
- 	def onFile(self,evt):
- 		tmpfilen = self.text_ctrl_name.GetValue()
- 		if not tmpfilen: tmpfilen = 'shortcut'
--		filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.SAVE )
-+		filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.FD_SAVE )
- 		if filen:
- 			self.text_ctrl_filen.SetValue(filen)
- 
---- a/moveFile.py
-+++ b/moveFile.py
-@@ -96,7 +96,7 @@
- 
- if __name__ == "__main__":
-     app = wx.PySimpleApp(0)
--    wx.InitAllImageHandlers()
-+    # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
-     dialog_1 = MoveFile(None, -1, "")
-     app.SetTopWindow(dialog_1)
-     dialog_1.Show()
---- a/OOo.py
-+++ b/OOo.py
-@@ -103,7 +103,7 @@
- 				self.saveDoc()
- 				self.finalize()
- 			except bibOOo_IOError:
--				url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"),  _("All files")),flags=wx.SAVE|wx.OVERWRITE_PROMPT)
-+				url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"),  _("All files")),flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
- 				if url == '':
- 					return
- 				else:
---- a/BibFrame.py
-+++ b/BibFrame.py
-@@ -971,7 +971,7 @@
- 
-     def __getFile(self,question=_("Please choose the file encoding"),mode='r',enc='ascii'):
-         """Get file and encoding. Return open file or None"""
--        dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.OPEN | wx.CHANGE_DIR)
-+        dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
-         try:
-             answer = dlg.ShowModal()
-             filename = dlg.GetPath()
-@@ -1048,7 +1048,7 @@
- # --------------------------------- File Export --------------------------------------------
-     def __saveFile(self,question=_("Please choose the file encoding"),mode='r',enc='latin_1'):
-         """Get file and encoding. Return open file or None"""
--        dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
-+        dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
-         try:
-             answer = dlg.ShowModal()
-             filename = dlg.GetPath()
-@@ -1124,7 +1124,7 @@
- 
-     def __saveFileHTML(self,question=_("Choose the destination file"),mode='w'):
-         """Get file. Return open file or None"""
--        dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
-+        dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
-         try:
-             answer = dlg.ShowModal()
-         finally:
-@@ -1176,7 +1176,7 @@
-         ret = wx.GetSingleChoiceIndex(_('What do you want to export?'),_('Export'),[_('Selection'),_('Current key'),_('All')])
-         if ret == -1: return
-         # get the file destination
--        answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR )
-+        answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR )
-         if answer == '': return
-         # we create the database
-         try:
-@@ -1746,7 +1746,7 @@
- 
-         arcstarttime=time.time()
-         archivename=time.strftime('bibusbackup_%y%m%d_%H%M%S.tar', time.localtime(arcstarttime))
--        dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
-+        dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
-         dlg.SetDirectory(userDocsDir)
-         dlg.SetFilename(archivename)
-         dlg.SetWildcard("TAR archive (*.tar)|*.tar")        
---- a/FirstStart/MySQL_Setup.py
-+++ b/FirstStart/MySQL_Setup.py
-@@ -533,7 +533,7 @@
- 
- if __name__ == "__main__":
-     app = wx.PySimpleApp(0)
--    wx.InitAllImageHandlers()
-+    # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
-     MySQL_Setup = MySQL_Setup_Main(None, -1, "")
-     app.SetTopWindow(MySQL_Setup)
-     MySQL_Setup.Show()
---- a/StyleEditor/FormatEditor.py
-+++ b/StyleEditor/FormatEditor.py
-@@ -33,7 +33,7 @@
- 
- class FormatEditor(wx.Dialog):
- 	def __init__(self, *args, **kwds):
--		#kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.THICK_FRAME
-+		#kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER
- 		kwds["style"] = wx.DEFAULT_FRAME_STYLE
- 		self.filename = kwds['filename']
- 		del kwds['filename']
-@@ -130,7 +130,7 @@
- 			wx.MessageBox(_("The style name is not correct, please avoid: '/' under linux; '\\' and ':' under Windows"),_("Style name"),style=wx.OK|wx.ICON_ERROR)
- 
- #	def SaveAs(self,evt):
--#		self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.SAVE | wx.OVERWRITE_PROMPT)
-+#		self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
- #		#print "%r"%self.filename
- #		if self.filename:
- #			self.Save(evt)
diff --git a/app-text/bibus/metadata.xml b/app-text/bibus/metadata.xml
deleted file mode 100644
index 114579753777..000000000000
--- a/app-text/bibus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bibus-biblio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 5c45299338ae..39543d874869 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,14 +4,11 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f87d9a8f645b5af8342da90337202b0247b07dccd8995f55bb965b5c2bbdddc24b55b6e92e899f91d5dec19c10ddea8fcc42c8ed3d74ee90eb09d6 SHA512 b0652c3277b8390f47039366380fceacfd3cd9014fe42306a947f6749c6192657b77e3d832044828bea06c43f1f5e745e6b4ff8dd24efc73d9ad5261c4c73a5e
-DIST calibre-4.17.0.tar.xz 37027156 BLAKE2B e1e9fbbb93cc14af0790e400d79b433c774f17bb06d99161e27769217ab7eed5c2660ab8a3e09109bade91684a8f5a8b52795667833ddf454343e530109eea63 SHA512 95719c820839a8548c0734a7be105fa4124c3c070fdd79ceeef5fef7f9c81f89d5b2077a71df3cc6cd103c14b813cd0d42add1c75ec4883686a8596de36ef5d0
-DIST calibre-4.18.0.tar.xz 37135328 BLAKE2B 247fc226fade064306309933be008e7636bacfdcfb1c96ae900fce5cc4474e26853b3a9dd932fd758543e31af95374f089d2e7a15c3d9ca7655eabd077727e2c SHA512 cc75e8b78722eb286af57f1d6b1ed783647f69471d903a3d4dd458b3f6966804e8e4fda7bd1947e9107ce9a280486ea7de101f7b843f8365bfe6e874d9ebf3d3
-DIST calibre-4.19.0.tar.xz 37172532 BLAKE2B 1cf3a4727ac7a2e7fe4d926acad7e6324b0673728db862209d98280f4fe9457eb33d734e47ac4882accebad2a6ffd12aa0add6bdcfe64cc4baa8a39dc2b4b94f SHA512 47b767b3f23f01fa1931abd470eb69f5493f5b0e6cd5c0e566b5576d1d831137c28555de3f73ad2a2dd0dd03615171a4c62356278a590ad48b77a6ca1cac890b
-DIST calibre-4.20.0.tar.xz 36997620 BLAKE2B 28ee9539eda96809004f4c276c8dceba119122379867f4b9235ad52a3ec68337330c4cbc2e715462f27ea0c3a0c8470609a50273db49a69f69a60e7fbcef11a5 SHA512 97e33c0a4a53c0b799ed76fde6327570d3e6356a812836d204ce0e6f5273715e274fdf2e987a0446b61ce6aceb4ce5cfda9c0cb8a2f2871efd83b76acbc43820
+DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b6736be01f55874951a9a0c81a70c82e23e723db1d81d13917eaf615e65752a100fbc1cb43bdca0b3c4543e3b17cf43 SHA512 b9db1c72cf010c25563e3f86a75478ac872249034b3c8b09bb8f0c2519487bb78dea821c9e45564fb645d17431bbee96459a28ee036e57830faedea4cd94b423
+DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
+DIST calibre-4.9.1-bug-731786.patch 1069 BLAKE2B 8b57fb89c9ec2d3a435fbc90f514d45468ceb96b46428efd5d2084cc9bb6137b49dd90dc2f7e574b6d8b8d536728392863046b068c39c8f9bcc3ae23678ac590 SHA512 acd158923bb369270155b3032b033a8387bcb53d1b0ea3e2c0724a40ec0cff6add5fca85649caaf37db0a0878fc3dafacc98b2b641cf10a8d58dc719642c6be5
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
-EBUILD calibre-4.17.0-r1.ebuild 8765 BLAKE2B 5fdb90f47e390d3935639673f63c2fdd9a5e64ae5635f5a1e5732c176831f5b91decb2dead5ddc79eafd786b64ccd95aa6b0943038428f8aa6331ed45beda222 SHA512 3235f8bac83d558268c0e41b6a313204b87e545dd7606309aaed0d2b9ab8a867562f0dd5127e90bd8d8d56dc4371c46c2d0091bcefa9815cbc3b1da31f00b4ec
-EBUILD calibre-4.18.0.ebuild 8697 BLAKE2B 2375f915eb98ca26ac5ad31db9a0ffee9ec8cc6694b0a7daca9eda35604c1ca606f71b3e3b7277033ba9c35e35abbc9ffdf02fceb2f1d72cc286a6d6daf357aa SHA512 48ccd11e78545cd8f489ad0a7fa1e660ed52e68dadf54d1439baa1a378afa67d766e6f7b0c0c5bd53538695e274e2fa4c2a6bb0555d5898d854cac56660a9cda
-EBUILD calibre-4.19.0.ebuild 8550 BLAKE2B fcaf2c66cd59bbe0017ab5ead307bb532ac1ae8f5fcc9c0b4e015ec652646f8faed0d108ccbf29675384265f07fb6720634abe757faa6653a73146c685caa7f4 SHA512 01f6b7944e0ae5ffdf420b8046a104200217f958fcdeef057ba5e81a06bc04ffb9b1b2a8bcddcc3b50bd2d3dfd27b738df9084454d2bd7ae51ed28ab7b78d714
-EBUILD calibre-4.20.0.ebuild 8550 BLAKE2B fcaf2c66cd59bbe0017ab5ead307bb532ac1ae8f5fcc9c0b4e015ec652646f8faed0d108ccbf29675384265f07fb6720634abe757faa6653a73146c685caa7f4 SHA512 01f6b7944e0ae5ffdf420b8046a104200217f958fcdeef057ba5e81a06bc04ffb9b1b2a8bcddcc3b50bd2d3dfd27b738df9084454d2bd7ae51ed28ab7b78d714
-EBUILD calibre-4.9.1-r2.ebuild 8799 BLAKE2B abbcecaeec5f818cf7ed218edef294ee45d53861b3a8a573ac8c119deeb3d6f25ee16c42433daefb41a1b05eb7ffef007759632d6823b731931c57b60272cd30 SHA512 8989bcbb4e122b2e7ad8fde2b671ed71173658a6b05932b2b56e270e600d84ac916d61af1e2eb63dd146b9ff8801670cd42a2ba8db5a6aca3f21e944f1ecbd43
+EBUILD calibre-4.22.0.ebuild 8692 BLAKE2B 7d394fc987120030e3ca6dfc593ddaf103a52983f13bb95e02c063da6ca9c3500f6c1d60148040bb8c19e70d731145b1ef086493f2817b4512b036c95daf8a1d SHA512 4fbd12df71e6ad2371540595b4aeeed833a465d5c9b6bff70d20949d27671a875e209e5d98a84cad0d16176879d8f4c1b7f7dd46427f5e32a7c9fc600d508955
+EBUILD calibre-4.23.0.ebuild 8735 BLAKE2B dcec79565840c0fca422ea5a973072e46a5233b5440c6eaa2db8049151e4110a1dadc8af8c65e43bd2d1010f7dd63a0f39d30192e4fa1bf28a5141753f923363 SHA512 6fde8b0929df69346aa619e2398ea7f43d03984eef2db967e3047e490c22845641883b78b049c59be62b9053f4ba77a29e325138d7c5c3820456d063fbe7b0ee
+EBUILD calibre-4.9.1-r3.ebuild 8980 BLAKE2B 1df8fd4d5840923c95640475b81805b8b700da66b3980d3f85040291f92e885b6658408426d06f39f1b578048b77051d927af0a0bfff600b83516bb3967eed6f SHA512 1ea1265dea6574b3e2392fd2e2ba3b1173fba9c698ddc636ea8da18a46b219ba66f1d5fb656adafd9b8c2cd73017c6cba45dd2766e0ac88e30d03e2f10ce0d81
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.17.0-r1.ebuild b/app-text/calibre/calibre-4.17.0-r1.ebuild
deleted file mode 100644
index bd20fd840abc..000000000000
--- a/app-text/calibre/calibre-4.17.0-r1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
-	https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.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'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.18.0.ebuild b/app-text/calibre/calibre-4.18.0.ebuild
deleted file mode 100644
index a4f5f90a8186..000000000000
--- a/app-text/calibre/calibre-4.18.0.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
-	https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=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"
-
-	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'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.19.0.ebuild b/app-text/calibre/calibre-4.22.0.ebuild
index ae82240de8bf..7dca7d16c3d3 100644
--- a/app-text/calibre/calibre-4.19.0.ebuild
+++ b/app-text/calibre/calibre-4.22.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="sqlite,ssl"
 
 inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
@@ -31,7 +31,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 SLOT="0"
 IUSE="ios +udisks"
 
@@ -75,7 +75,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
+	dev-qt/qtgui:5=[jpeg]
 	>=dev-qt/qtwebengine-5.12
 	dev-qt/qtwidgets:5=
 	dev-util/desktop-file-utils
@@ -153,6 +153,7 @@ src_prepare() {
 '-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"
 }
 
diff --git a/app-text/calibre/calibre-4.20.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild
index ae82240de8bf..2e529363d2c8 100644
--- a/app-text/calibre/calibre-4.20.0.ebuild
+++ b/app-text/calibre/calibre-4.23.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="sqlite,ssl"
 
 inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
@@ -75,7 +75,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
+	dev-qt/qtgui:5=[jpeg]
 	>=dev-qt/qtwebengine-5.12
 	dev-qt/qtwidgets:5=
 	dev-util/desktop-file-utils
@@ -153,6 +153,7 @@ src_prepare() {
 '-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"
 }
 
@@ -162,14 +163,15 @@ src_install() {
 
 	# Bypass kbuildsycoca and update-mime-database in order to
 	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
 	#!${BASH}
 	echo $0 : $@
 	exit 0
 	EOF
 
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+	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"
 
@@ -202,7 +204,7 @@ src_install() {
 
 	addpredict /dev/dri #665310
 
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 	"${PYTHON}" setup.py install \
 		--root="${D}" \
 		--prefix="${EPREFIX}/usr" \
diff --git a/app-text/calibre/calibre-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r3.ebuild
index 0eb5f2c1295d..ce4305d2881b 100644
--- a/app-text/calibre/calibre-4.9.1-r2.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r3.ebuild
@@ -11,7 +11,8 @@ 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://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
+	https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch
+	https://github.com/kovidgoyal/calibre/commit/7b6416ac6522fc40f24f6baf3ca552b17a8b91d6.patch -> calibre-4.9.1-bug-731786.patch"
 
 LICENSE="
 	GPL-3+
@@ -75,7 +76,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
+	dev-qt/qtgui:5=[jpeg]
 	>=dev-qt/qtwebengine-5.12
 	dev-qt/qtwidgets:5=
 	dev-util/desktop-file-utils
@@ -124,7 +125,8 @@ src_prepare() {
 		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
 		"${FILESDIR}/${PN}-disable_plugins.patch" \
 		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch" \
-		"${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
+		"${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch" \
+		"${DISTDIR}/calibre-4.9.1-bug-731786.patch"
 
 	eapply_user
 
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 1df4bb9a658d..194cd04d5f3e 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,7 +1,3 @@
-DIST cb2bib-1.9.8.tar.gz 1180660 BLAKE2B 86a826a9285ecd5ecd266b3935ddfa330153cba4b28f378519b464719d5a2bcaa6043470d36ba5c443202a07a18bbaeb28c3371db07063f0d682b54d2a8fe373 SHA512 717f9b4de3e261e6d22a7e514e2ec5891723572f1624280edc8a980171f4dada6e177a3e95748fc39ff0ba1c137406e38dd14f43a0f1e0995c1f39992842f38a
-DIST cb2bib-1.9.9.tar.gz 1292720 BLAKE2B 7263d09ab077d1029129b81abbf7a745405d476776ab91d4b73dc9799b3d945e46283fe565fee32b08df7a8734c027cbeacf0e7a44c4e15efaa6c992c69f9b7a SHA512 66e81ea8d86cdf374c9e1109d26e02c0b3101608e751ab6bbded76cca42eb8c2c1d43f6a993b9003b6013d815683f644bff7513ce63dc750ffa8d608cccb49b3
 DIST cb2bib-2.0.0.tar.gz 1337422 BLAKE2B 6b1137c162f69f6d875aa3ae73b5995a067b332b3a7c0a5e69b787f352810768559c227c793204ca40ec594667624d329b5202c28056bca2e13110afebe57f63 SHA512 de1f3a36b98e016c5fa7317ba3fa8c5b767bd4b37bad1318298a57999bead4cc70d18ac49bb87fde57c4379f3347988846a7aa9b88e23a381d6c193bb1354cc2
-EBUILD cb2bib-1.9.8.ebuild 1778 BLAKE2B 6d381621b9d13fdc8459c95017a7ffe1814278d86112b843b3f3bfa714a38cf9aa47050ba6ec8d3e10adc8a62f590fa42df4eaca91bab8577fc09170e8ba3c23 SHA512 afbd9c421d77e9b46cb341e41c13929dd7a7169cba634dd54c584c39f5d6757c098c931ab149746acfd3c2a9e9782345a88b4b35da975ad7a2c31585d0e8ca42
-EBUILD cb2bib-1.9.9.ebuild 1777 BLAKE2B 3f71e35f3a27fe137e17bfdb0d605fb20b397f1f3144ceb0ce6d14038ef119675cfbd8ae0e3aa54085da54548b21edaf4e8198ab09e2f6ea5354822bda3205b0 SHA512 8092905d8d12e49ae68e204d78289c8a2c6ddf007349e61883183982821248f6a0a04ea946b69e1565c12df3928b06e260a73a85f87b4d781721113fdc4b2767
-EBUILD cb2bib-2.0.0.ebuild 1882 BLAKE2B ac145533edc970e58f57da2ddad3269b3af26d780fb4c30ff5d5993fc02e87c720717143a9d7524c8e92eba6b2ec11b27fc463973a49a2d322681df545bc19e0 SHA512 f1200c6efd5b2a03e1d3b181e6b52d0258607bf71a0c09916d31fca8404fdde475f8a989738bff811d3cd72dd53e416b281b40dc7b6c23e3dc841546bcabbae8
+EBUILD cb2bib-2.0.0.ebuild 1926 BLAKE2B 6f2436e81d7c08c9fb84bd76da3495c46d32a5054c0263b60980e631226865fe27e776d75e0cbd02d932d1fc661898e7fd6b246332dea1c47a50e21f520839bd SHA512 5f150c5e1b1c9018b4b42342e10e198ffdfdfe667309cfe6960675d4572f8f392601560bab5dc83db5423753e94adfe2f99fb848292364ab6a0c370a1af5276e
 MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
diff --git a/app-text/cb2bib/cb2bib-1.9.8.ebuild b/app-text/cb2bib/cb2bib-1.9.8.ebuild
deleted file mode 100644
index e91077411de8..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="https://www.molspaces.com/cb2bib/"
-SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	lzo? ( dev-libs/lzo:2 )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
-	default
-
-	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
-	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
-	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		$(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "For best functionality, emerge the following packages:"
-	elog "    app-text/poppler[utils] - for data import from PDF files"
-	elog "    app-text/dvipdfm        - for data import from DVI files"
-	elog "    app-text/bibutils       - for data import from ISI, endnote format"
-	elog "    media-fonts/jsmath      - for displaying mathematical notation"
-	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
-	elog "                              text strings"
-	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
-	elog "                              nice printing through the shell script bib2pdf"
-}
diff --git a/app-text/cb2bib/cb2bib-1.9.9.ebuild b/app-text/cb2bib/cb2bib-1.9.9.ebuild
deleted file mode 100644
index 1a3068c56e88..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="https://www.molspaces.com/cb2bib/"
-SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	lzo? ( dev-libs/lzo:2 )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
-	default
-
-	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
-	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
-	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		$(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "For best functionality, emerge the following packages:"
-	elog "    app-text/poppler[utils] - for data import from PDF files"
-	elog "    app-text/dvipdfm        - for data import from DVI files"
-	elog "    app-text/bibutils       - for data import from ISI, endnote format"
-	elog "    media-fonts/jsmath      - for displaying mathematical notation"
-	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
-	elog "                              text strings"
-	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
-	elog "                              nice printing through the shell script bib2pdf"
-}
diff --git a/app-text/cb2bib/cb2bib-2.0.0.ebuild b/app-text/cb2bib/cb2bib-2.0.0.ebuild
index 70c2922ef25f..3eb3286f5902 100644
--- a/app-text/cb2bib/cb2bib-2.0.0.ebuild
+++ b/app-text/cb2bib/cb2bib-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lzo webengine +webkit"
 
 REQUIRED_USE="?? ( webkit webengine )"
@@ -43,6 +43,11 @@ src_configure() {
 		$(use !lzo && echo -config disable_lzo)
 }
 
+src_compile() {
+	# bug #709940
+	emake -j1
+}
+
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 2c9397b18a92..9fed0172cac1 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,5 +1,7 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 DIST coolreader-3.2.39.tar.gz 17679570 BLAKE2B e84fb7d8032ae62fec24a74a9cebab086664a2ed3827f0664e667a4ab3b8d76b722790958f71f5fcd79729238e897c6592059f9b45eb4069c9ad483883bc0600 SHA512 1b92b35750174a8ef4df4b7c4f33bb9fcc94b36008c08a7f9d1f8e85c6b642c5b037e0673a783cde1aa98296887bb286c4a2da186911b26f298f689605e1eb4b
+DIST coolreader-3.2.45.tar.gz 20290340 BLAKE2B a4e6218965618a1b0938606ca323534112a5d7b64a1d56e06f56ba8b2e5591d380d7fb2aeb9c37d007fb834963a42e684e2af939720272c3a7494e5afc65501e SHA512 d7dc9921b74d1da236aeb02edcb39d44dfcfb9da5d6d3b1bf428157f67415c19af218c2454a602828d12d0c6d8c80d1335e92101acda1af8abd6bd312900c33c
 EBUILD coolreader-3.2.2.1-r2.ebuild 2479 BLAKE2B 63c86c1dee137edc9f8937c72cb80c77c0f890347aa1d385b2be771a3fdfc11a1d895ee87b4bd295a52392dc72f9abcd34f019c5f350943d4a9ce45e3971f5b0 SHA512 8df9d4a6337416a8d394cbab4be7f9d166d7ca9febe6e4dc5054d842de4f006adb535342c24a1b80370988edad4c71f9a0e7f50a0aeb832ebcd251fa38f0d8b0
 EBUILD coolreader-3.2.39.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
+EBUILD coolreader-3.2.45.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.45.ebuild b/app-text/coolreader/coolreader-3.2.45.ebuild
new file mode 100644
index 000000000000..0b26482993e9
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.45.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
+
+CR_PV=$(ver_rs 3 '-')
+
+if [ "${PV}" != 9999 ]
+then
+	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-cr${CR_PV}"
+else
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+DEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if ! use wxwidgets; then
+		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/cwtext/Manifest b/app-text/cwtext/Manifest
index 668bf6cc19a0..c6dd424fd941 100644
--- a/app-text/cwtext/Manifest
+++ b/app-text/cwtext/Manifest
@@ -1,4 +1,5 @@
 AUX cwtext-0.94-asneeded.patch 525 BLAKE2B 0e099345b40bd853420bd35289108bfd43ff02ccc253202786201a74607692015808ae6a3620212ea3879e93b53a10abd4daab81ecf77159982a8aebf5dab604 SHA512 e80d4705d71badb3a0c75a21b99cb2b8033272c609a9cfea769ec48825544f3972cdc505ad32842c34da4918e7dcfcff07900f3611a5a1ca0fdd4c48784d7067
+AUX cwtext-0.96-pcm.patch 248 BLAKE2B 51aa851c7ac8ef3cbbe93722394670bc8542a1553c06df74cf970b7a6af366b5f1a4e342d52d6c27aa747aa42a88cf2e306c54777ee8a2689c5460ddc007e072 SHA512 84b07b79f712a1fc5db6497d625abea47a36061a22e60ea13042b695a39370dda826b421296709efe3ab776a319b4fae6d14fe29ddeef60dec1e76ddfc8ade04
 DIST cwtext-0.96.tar.gz 16596 BLAKE2B 0165b787fcb0e5c0ef803370d06eabbde4c014ac11dcd16a516579cf3d817e90c79db6ec15702643be710c9849765671bf676f41a0679443a87a6f4e555963d9 SHA512 6765c79b6feea2947974bf4654ed1edc83f6c9ddaae1bf37d5ed95dedc4ce9b45d5e41dff7ec50d6586f34901d8f93a3230f1a7e1cf4d52b8a84c851cfbdbd33
-EBUILD cwtext-0.96-r1.ebuild 706 BLAKE2B 28ed1d6d96fa6351399696d81a4fa446eee2143169c5135eec225dc17311bd8cbab653487573c83b4dffdffe054a64b58938253560b5490df2d5d35100426257 SHA512 33d6b93fe5b26e5dbc31f80f8001e3498a236676cdb8f7edd3ad66177f05e3d0aa717502bd7c5b765b3f848360d29e1639170ef35496d689ffee74df63179380
+EBUILD cwtext-0.96-r1.ebuild 747 BLAKE2B fd19efebd9f3dc51668eb6dd20d1b2463b7d57e10b013f3c8d258a68e61a13e75745aff24a049075044ebda7ddfac6469f319ff54e40954af08402e8c3cbfb72 SHA512 dce8b269ec6f62b83b91c6e0147584149ac9248717048b03f3a8fe75f009ed4e55397047ffd6d7e64815aa546df2580e61aec817a2766239790233680f270de2
 MISC metadata.xml 325 BLAKE2B ff358d0bef47c35ccd68eb73a608e1e3f61cf6735aafcf4045c9b5a49f2e533b4ef2c305a0fa3fa1e23fb6920f4d589cd2274fbdd0073d0d0a8432ff5b911910 SHA512 e61b6497de3ea7dfbc4244c904bd2e3966bdfc3fb228836ffd21e7955da87da325af62b0f8cde180b75d0632dcacf77b46e2b56249b14b2dfa827cc082bd217f
diff --git a/app-text/cwtext/cwtext-0.96-r1.ebuild b/app-text/cwtext/cwtext-0.96-r1.ebuild
index d95b65bce481..25b8dac1a7a3 100644
--- a/app-text/cwtext/cwtext-0.96-r1.ebuild
+++ b/app-text/cwtext/cwtext-0.96-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
@@ -13,11 +13,15 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-PATCHES=( "${FILESDIR}"/${PN}-0.94-asneeded.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.96-pcm.patch
+	"${FILESDIR}"/${PN}-0.94-asneeded.patch
+)
+
 DOCS=( Changes README TODO )
 
 src_prepare() {
-	eapply -p0 "${PATCHES}"
+	eapply -p0 "${PATCHES[@]}"
 	# change install directory to ${S}
 	sed -i -e "/^PREFIX/ s:=.*:=\"${S}\":" makefile || \
 		die "sed makefile failed"
diff --git a/app-text/cwtext/files/cwtext-0.96-pcm.patch b/app-text/cwtext/files/cwtext-0.96-pcm.patch
new file mode 100644
index 000000000000..f14a1d06182b
--- /dev/null
+++ b/app-text/cwtext/files/cwtext-0.96-pcm.patch
@@ -0,0 +1,11 @@
+--- pcm.c.orig
++++ pcm.c
+@@ -60,7 +60,7 @@ int mStoSamples(int hVox, int time) {
+   float samples;
+   float fsr;
+   
+-  if (!valid(hVox)) return;
++  if (!valid(hVox)) return 0;
+ 
+   timelen = (float) time;
+   fsr = (float) voxref(hVox).samplerate;
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 4b3c1323b8d6..e16a786f9a49 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -1,6 +1,9 @@
+AUX dblatex-0.3.11-encode.patch 752 BLAKE2B a9dfa9fd76219f346bcae7781fa4cb3174f1723901891618a480baa290599586080692743409a70e5a606d44c7bddaa4449735fd34beab83f90602ecc0482903 SHA512 4750f800d99a425eeccf84c87dbdfac6d1c0c2ff394c191ed239ca329dbac13c861d5d74014202bc4fd430c806fcfee0bdafc62b0ab94e9b910429d916590545
+AUX dblatex-0.3.11-inkscape-1.0.patch 4051 BLAKE2B 0c21ab019da8dec6ea093963f79382241bc6326f70aa84b2aaa53502e1ed84c7bcb68e95581b6a480b10869f53709000003e1ef0ba71c79d5cc1ebe6434d0968 SHA512 fd33e2388de5d830288ce25cfe4dd0f933333118cbea3c68b66b8f171476b5ac29fc7fb43ac26bd38e362e676f36cf0297e2c643be948e2d5f6c796c68eb3c67
 AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63bb7cc034f54e8edf59434127e495d5878dfb761c990f9f106fbc0436513220ade66bb107030093f41c8e4777e6ccb279259aff912d06 SHA512 08f4e4473359a2633a785cd34fc3a89feaab8619843a93c5ffba0bf00e31aff2d1ce5a54aeea3eb51e63385b3480df1f196f54cdd568ff49558860460faa1c8f
 AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c264de8c8970fe4cbf5459c5ec651aecd3e3ccb7dcc95bfcc8277686133bc3187a5952edd1bc88dae11c2ddac3aa4060333b4 SHA512 ae08b08a435393bf94039edd8b74457a1d4475d8473fa450b41a993ca4ded08f79566bf2dc78144df977fe1f975e1c60b9d02b2dc4579f8c7d65839946e3de05
 AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
+EBUILD dblatex-0.3.11-r1.ebuild 1799 BLAKE2B 1c5e8c48a5db271a1ad5048edb6623ffe1878c7e18540c12343ab1faca0ddb0e65bb353e7a83cb6517ae09ef2304efcfd16b2245041ffa5884cf7a631dc01868 SHA512 85c2f9bf1297e280d287dac4f03dfed97e1ba4cede1d94a10deb68109261ed50f86060fedcffc13eefe2ff7ffec5a97e0a28dd223f37dc2d1fcba8f116924cd0
 EBUILD dblatex-0.3.11.ebuild 1622 BLAKE2B e22f30327fbec58cf69839f1aad790aab5c024bf70df5faa3b4f5eb75e6619b6c3b35a9e52e8df0dab0d942b71c1bce8836bd1a468d2e66992b8fa90fd1d3a46 SHA512 25818584313360bb615da8a8dd6c88f6fe8ea41066e564d8e59849aadd30e0b2f13ad1b2aad511deaf492179d8b3e9d64b71c105793de7ca07f395b02a8e961f
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
new file mode 100644
index 000000000000..7e0ca0eab604
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Transform DocBook using TeX macros"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="inkscape"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-libs/kpathsea
+	dev-libs/libxslt
+	dev-libs/libxslt
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathscience
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-xetex
+	gnome-base/librsvg
+	media-gfx/imagemagick
+	media-gfx/transfig
+	inkscape? ( media-gfx/inkscape )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}py3"
+
+PATCHES=(
+	 "${FILESDIR}/${P}-path-logging.patch"
+	 "${FILESDIR}/${P}-setup.patch"
+	 "${FILESDIR}/${P}-encode.patch"
+)
+
+python_prepare_all() {
+	# Manual page is precomressed, but we will use our own compression later.
+	gunzip docs/manpage/dblatex.1.gz || die
+	# If we dont have inkscape we need to use an alternative SVG converter
+	use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
+	# If we use inscape however we want to make dblatex compatible with v1.0
+	use inkscape && eapply "${FILESDIR}/${P}-inkscape-1.0.patch"
+	# We need to fix version information in the docs and some metadata
+	grep -l -I -R "0.3.11py3" | xargs -n1 sed -i -e "s/${PV}py3/${PV}/" || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Move package documentation to a folder name containing version number
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+}
diff --git a/app-text/dblatex/files/dblatex-0.3.11-encode.patch b/app-text/dblatex/files/dblatex-0.3.11-encode.patch
new file mode 100644
index 000000000000..1f32f99074a2
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-encode.patch
@@ -0,0 +1,19 @@
+diff -Naur dblatex-0.3.11py3-orig/lib/dbtexmf/dblatex/rawtex.py dblatex-0.3.11py3/lib/dbtexmf/dblatex/rawtex.py
+--- dblatex-0.3.11py3-orig/lib/dbtexmf/dblatex/rawtex.py	2020-01-29 13:48:34.000000000 -0800
++++ dblatex-0.3.11py3/lib/dbtexmf/dblatex/rawtex.py	2020-07-13 23:49:56.296767535 -0700
+@@ -101,10 +101,14 @@
+ 
+             # If something done, replace the figure in the tex file
+             if newfig != fig:
++                if isinstance(fig, str):
++                    fig = fig.encode("utf-8")
++                if isinstance(newfig, str):
++                    newfig = newfig.encode("utf-8")
+                 line = re.sub(br"{"+fig+br"}", br"{"+newfig+br"}", line)
+ 
+         return line
+-            
++
+ 
+ def main():
+     c = RawLatex()
diff --git a/app-text/dblatex/files/dblatex-0.3.11-inkscape-1.0.patch b/app-text/dblatex/files/dblatex-0.3.11-inkscape-1.0.patch
new file mode 100644
index 000000000000..48cd9f249729
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-inkscape-1.0.patch
@@ -0,0 +1,107 @@
+diff -Naur dblatex-0.3.11py3-orig/docs/custom/dblatex.xconf dblatex-0.3.11py3/docs/custom/dblatex.xconf
+--- dblatex-0.3.11py3-orig/docs/custom/dblatex.xconf	2020-01-29 13:48:32.000000000 -0800
++++ dblatex-0.3.11py3/docs/custom/dblatex.xconf	2020-07-14 01:05:42.883435133 -0700
+@@ -18,7 +18,7 @@
+   <imagedata>
+     <converter src="svg" dst="*" docformat="pdf">
+       <command>
+-        inkscape -z -D --export-dpi=600 --export-%(dst)s=%(output)s %(input)s
++        inkscape -D --export-dpi=600 --export-filename=%(output)s %(input)s
+       </command>
+     </converter>
+   </imagedata>
+diff -Naur dblatex-0.3.11py3-orig/docs/xhtml/manual/sec-specs.html dblatex-0.3.11py3/docs/xhtml/manual/sec-specs.html
+--- dblatex-0.3.11py3-orig/docs/xhtml/manual/sec-specs.html	2020-01-29 13:49:23.000000000 -0800
++++ dblatex-0.3.11py3/docs/xhtml/manual/sec-specs.html	2020-07-14 01:06:19.012860710 -0700
+@@ -36,7 +36,7 @@
+   &lt;imagedata&gt;
+     &lt;converter src="svg" dst="*" docformat="pdf"&gt;
+       &lt;command&gt;
+-        inkscape -z -D --export-dpi=600 --export-%(dst)s=%(output)s %(input)s
++        inkscape -D --export-dpi=600 --export-filename=%(output)s %(input)s
+       &lt;/command&gt;
+     &lt;/converter&gt;
+   &lt;/imagedata&gt;
+diff -Naur dblatex-0.3.11py3-orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.11py3/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.11py3-orig/lib/dbtexmf/core/imagedata.py	2020-01-29 13:48:33.000000000 -0800
++++ dblatex-0.3.11py3/lib/dbtexmf/core/imagedata.py	2020-07-14 01:02:56.729388831 -0700
+@@ -47,16 +47,16 @@
+ 
+ 
+ class PoolManager:
+-    def __init__(self): 
++    def __init__(self):
+         self._used_pool = None
+         self._pending_pools = []
+-    
++
+     def set_pool(self, pool):
+         self._used_pool = pool
+         for p in self._pending_pools:
+             pool.preprend(p)
+         self._pending_pools = []
+-    
++
+     def prepend_pool(self, pool):
+         if self._used_pool:
+             self._used_pool.prepend(pool)
+@@ -73,7 +73,7 @@
+         self.format_pool = PoolManager()
+ 
+ _image_setup = ImageSetup()
+-    
++
+ def image_setup():
+     global _image_setup
+     return _image_setup
+@@ -181,7 +181,7 @@
+ class SvgConverter(ImageConverter):
+     def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
+         ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
+-        self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
++        self.add_command(["inkscape", "-D", "--export-filename=%(output)s",
+                           "%(input)s"])
+ 
+ 
+@@ -224,7 +224,7 @@
+         ImageFormatPool.__init__(self)
+         # There can be a mismatch between PDF-1.4 images and PDF-1.3
+         # document produced by XeTeX
+-        self.add_rule(FormatRule(docformat="pdf", backend="xetex", 
++        self.add_rule(FormatRule(docformat="pdf", backend="xetex",
+                                  imgdst="png"))
+         self.add_rule(FormatRule(docformat="pdf", imgdst="pdf"))
+         self.add_rule(FormatRule(docformat="dvi", imgdst="eps"))
+@@ -318,7 +318,7 @@
+         Copy the file in the working directory if its path contains characters
+         unsupported by latex, like spaces.
+         """
+-        # Encode to expected output format. If encoding is OK and 
++        # Encode to expected output format. If encoding is OK and
+         # supported by tex, just return the encoded path
+         newfig = self._path_encode(fig)
+         if newfig and newfig.find(b" ") == -1:
+@@ -350,7 +350,7 @@
+         if (ext):
+             realfig = self.find(fig)
+             return (realfig, ext[1:])
+-        
++
+         # Lookup for the best suited available figure
+         if (self.output_format == "pdf"):
+             formats = ("png", "pdf", "jpg", "eps", "gif", "fig", "svg")
+@@ -369,7 +369,7 @@
+             format = ""
+ 
+         return (realfig, format)
+-        
++
+     def find(self, fig):
+         # First, the obvious absolute path case
+         if os.path.isabs(fig):
+@@ -385,4 +385,4 @@
+                 return realfig
+ 
+         return None
+- 
++
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index c868375e9be7..bc54229776ec 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -3,10 +3,12 @@ AUX 1.10.11/dict.conf 243 BLAKE2B 707e17e8373ded07ff36a304a17e33d22544a2b497118b
 AUX 1.10.11/dictd.conf 781 BLAKE2B 1cb0a3548125923d2fabfa296863135472b93ca6c34cd4b2d8eebf7f9c0d6e7df9ec652eed4f3a2ee138834ada12a58cdc315d0607cd2bba05315a6dac6db6bf SHA512 60c7ade9e3c160c69b87405962b0e92f6beb3941fecdbbb90c2343f1db1cc800bd26f1a670435641859e6bc864aa8ace58749c07dd106c3afd7eea81601445c3
 AUX 1.10.11/dictd.confd 207 BLAKE2B f7d9815d41490f85a977d3dcfa9dc7330e48b76102f4cf90c18204f780287c7681ba9c7a4dc4e04d9007d18e89f2dbe6c29595ea9f685bb6a14c774f2485a85f SHA512 16e31e250bce84cfa25d5d187f736053773889afd248248fac61aac115df2938fbe6f30049c143f2c290b60652947125763adaffdfcd71260853d574c0434348
 AUX 1.10.11/dictd.initd 1982 BLAKE2B ea63cda1512c1e65a463193cb17a2610053909aebdfb5c572720572f9aa77a00adb632d22a8e775bd0fd8c397331b2f79dda43c214d44d0166b374a9f5dcdc7e SHA512 7b8907dbc9f40f81b8431e691506142954643e6539ca6bb486f629fb929f60da8a7e52066e46374478f805dc1b6e84931f3b4a6a2f8f7d34f56a8664c5f4a0ab
-AUX 1.10.11/site.info 235 BLAKE2B 561d838293b3894d6e7a34348d7181ce3f38a093441ec3029e97524d219bac315927a0ab67f6dff94150d03e851a15b578aee4141d2f3c8d68792ae8f7a794bd SHA512 74bb341f049acd7d502d9117ae1321bedc499958ba377c02a2591880cc45d451409fd99a76ec3ddcf1846f6d124ef5ae1da40c5c001b67e94c68a895c2dcfd79
-AUX dictd-1.10.11-colorit-nopp-fix.patch 323 BLAKE2B e99dea0a194532be7239fab52da9c1bae0557ed3d7a32c4ffa07d5c0298346bfb17b3d2711ac7a5d755f82493b3c4cbde60d1af7f6d4dc31fc9866dbf77a36a8 SHA512 af4a35954d4c38e7e33d23a05dccba4dc7ffb5b4905cb34487718a664f8c52c3cebb17296367fb9f8b203137bbc00fef62d2f452446fb589f914ff8862bbc1e7
+AUX 1.10.11/site.info 235 BLAKE2B 423c81fc16eafaa8d0a0f04eb478fb390ef075638b3ffd6ddcae0a6f8685758ff741c52585d76fa56713893931376845b68fa33dcb90191268bf81301c686b00 SHA512 62e63fd9c0b939647381831fa82762f324059c440111918791abbb03f03459d1411065d30f71c8b30da666f84e720960e3f49977a17c849aae4d6c5845e38a5f
+AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4dbbcd2271f484d91e23bfba9e8f287669f5323006b3209b41ca9a0926e672c66d867db5f048b5b3fcf314ed29b1d7617b65eec SHA512 f7e8e84bd6132e19e778066b6adcd34ffb17e009d3f6abd9177a6aa5ad0c2c7e8afc03f5cadc18b6ec509a3118ccf3b515f971330f45baed36534b65415f8ca7
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
-EBUILD dictd-1.12.1-r2.ebuild 2803 BLAKE2B 432b62db8548e23b0ee3321ad4d6d1faef7bb304eecd2c88539991ac2ed9f905632843c9e4e1936460fe13d9ffbf0d094f9db13ee8acc921767597c5eb3e3131 SHA512 e020c8ad1645e983b5d537d06974f90e33fd179dad13baf98b98711bf6df4d13c40a89897e0ec5d70514d3c38f933b9748eee6fbfd289aad5898d7ee47cc609d
+DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
+EBUILD dictd-1.12.1-r2.ebuild 2841 BLAKE2B ecabe4a1e6053fcafe80206a3a172d75a4344a47941bb7ac197ec0599acc26b94dddc9232b4065537b95519e358f94d63a264fc517fbd32a33bf1f58c77b523e SHA512 d9b9d95e77b9b1e3b2938fe1c4b10f158a73a44962a53074455e0ea394351b7b5817eb7f1cd81b41ec5080a557a315278053884a69efa9c0ac7786a57222a3e2
+EBUILD dictd-1.13.0.ebuild 2915 BLAKE2B 81d1435efea188ca0ab4d1b44f33711ed2f28d2ef5dc8186d8fd1b46a4646123337e4563de57978733401a71f5174b69a3d6bb675bb9a61c1cc6f9491c375574 SHA512 dcb00df8f8cde9bff0a0c74f0aed03f8e68beb526da98a806e6ce5af81241840273b95815c6aae1c5dd19d870a891b338f22796221f8164a343fbd74f3d78d81
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.12.1-r2.ebuild b/app-text/dictd/dictd-1.12.1-r2.ebuild
index 62f818c4f28b..4da9d8dbf3ae 100644
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild
+++ b/app-text/dictd/dictd-1.12.1-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 # We install rfc so - ISOC-rfc
 LICENSE="GPL-2 ISOC-rfc"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="dbi judy minimal"
+IUSE="dbi judy minimal test"
 
 # <gawk-3.1.6 makes tests fail.
 RDEPEND="
@@ -25,6 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=sys-apps/gawk-3.1.6
 	virtual/yacc
+	test? ( !~sys-apps/gawk-4.2.1 )
 "
 
 DOC_CONTENTS="
diff --git a/app-text/dictd/dictd-1.13.0.ebuild b/app-text/dictd/dictd-1.13.0.ebuild
new file mode 100644
index 000000000000..6f994838112e
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 systemd user
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+SLOT="0"
+# We install rfc so - ISOC-rfc
+LICENSE="GPL-2 ISOC-rfc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="dbi judy minimal test"
+
+# <gawk-3.1.6 makes tests fail.
+RDEPEND="
+	>=sys-apps/coreutils-6.10
+	dev-libs/libmaa
+	sys-libs/zlib
+	dbi? ( dev-db/libdbi )
+	judy? ( dev-libs/judy )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=sys-apps/gawk-3.1.6
+	virtual/yacc
+	test? ( !~sys-apps/gawk-4.2.1 )
+"
+
+DOC_CONTENTS="
+	To start and use ${PN} you need to emerge at least one dictionary from
+	the app-dicts category with the package name starting with 'dictd-'.
+	To install all available dictionaries, emerge app-dicts/dictd-dicts.
+	${PN} will NOT start without at least one dictionary.\n
+	\nIf you are running systemd, you will need to review the instructions
+	explained in /etc/dict/dictd.conf comments.
+"
+PATCHES=(
+	"${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+	"${FILESDIR}"/dictd-1.12.0-build.patch
+)
+
+pkg_setup() {
+	enewgroup dictd # used in src_test()
+	enewuser dictd -1 -1 -1 dictd
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i -e 's:libtool:glibtool:g' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with dbi plugin-dbi) \
+		$(use_with judy plugin-judy) \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--sysconfdir="${EPREFIX}"/etc/dict
+}
+
+src_compile() {
+	if use minimal; then
+		emake dictfmt dictzip dictzip
+	else
+		emake
+	fi
+}
+
+src_test() {
+	use minimal && return 0 # All tests are for dictd which we don't build...
+	if [[ ${EUID} -eq 0 ]]; then
+		# If dictd is run as root user (-userpriv) it drops its privileges to
+		# dictd user and group. Give dictd group write access to test directory.
+		chown :dictd "${WORKDIR}" "${S}/test"
+		chmod 770 "${WORKDIR}" "${S}/test"
+	fi
+	emake test
+}
+
+src_install() {
+	if use minimal; then
+		emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
+	else
+		default
+
+		dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
+		dodoc doc/{security.doc,toc.ms}
+		dodoc -r examples
+
+		# conf files. For dict.conf see below.
+		insinto /etc/dict
+		for f in dictd.conf site.info colorit.conf; do
+			doins "${FILESDIR}/1.10.11/${f}"
+		done
+
+		# startups for dictd
+		newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+		newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+		systemd_dounit "${FILESDIR}"/${PN}.service
+	fi
+
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+
+	insinto /etc/dict
+	doins "${FILESDIR}"/1.10.11/dict.conf
+
+	dodoc ANNOUNCE NEWS README TODO
+
+	readme.gentoo_create_doc
+}
diff --git a/app-text/dictd/files/1.10.11/site.info b/app-text/dictd/files/1.10.11/site.info
index 23bfdeb61102..c896c1e0e875 100644
--- a/app-text/dictd/files/1.10.11/site.info
+++ b/app-text/dictd/files/1.10.11/site.info
@@ -1,6 +1,6 @@
 Welcome to your dictionary server dictd!
 
 This is an example site information file.  It should contain information
-about any restricted databases and how users can obtain access.  If may
+about any restricted databases and how users can obtain access.  It may
 also contain other random data as you see fit.
 
diff --git a/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
index 4643a10d2de4..841193b1982b 100644
--- a/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
+++ b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
@@ -1,6 +1,5 @@
-=== modified file 'colorit.in'
---- colorit.in	2009-03-02 08:52:14 +0000
-+++ colorit.in	2009-03-02 08:52:48 +0000
+--- a/colorit.in
++++ b/colorit.in
 @@ -167,7 +167,7 @@
  
      function process_config (){
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index b19396539d2f..a8813c336752 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,5 +2,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1830 BLAKE2B 5ff8ad32d9b2c3605eb0ecd12ca1c5f6a206e559531ad071486db3c1292965a95e376965665913bf41e4b336b450a17ddacfad3e1f697420da75dd060c19c538 SHA512 40993ea088986b333810bb6a69bf72cbf29afddb46dac33e48669a51e69e65214934c0f08e7ba08a29459b473b88992f588996e7a1e4a9495f0d07675f26a69e
+EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1846 BLAKE2B 1ca06b9c750e2d99b065a117b9e23615bbb7422a4d190e64f97bde53503f8f5e97b0b1083d96c1c6e817a686d385650656820a7e5839462d19d5b26776b15a7b SHA512 fb71b8783e43dae5ae432881adee681095bc0d1d67015c2b54fedd809230a632af58e38d684f7aef7d3917371f3269088ce0bab4033bcdc21af444c4b04b4da8
 MISC metadata.xml 409 BLAKE2B 326a67b502158f75dcbbd01ef2772bbab0099a4d4a1fc1e7463655abbcd807fbec8761edfd1d312b4d3c845d72506fbf53245779e657cc0baf7d2fa44b3e147b SHA512 abc9fadc1fe1a7a863308a566932f958df7b13800336db521acdb6cc93773fa6c8310a34d702bb996baff5718c2329ef790bedacc5f1d849810c174fd8b281ea
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
index 7ee3caabf4bb..b3e158e62674 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
@@ -29,7 +29,7 @@ DEPEND=">=dev-lang/perl-5
 	~app-text/docbook-sgml-dtd-4.1
 	~app-text/docbook-sgml-dtd-4.2
 	~app-text/docbook-sgml-dtd-4.4
-	jadetex? ( app-text/jadetex )
+	jadetex? ( dev-texlive/texlive-formatsextra )
 	userland_GNU? ( sys-apps/which )
 	|| (
 		www-client/lynx
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index bfbb4d176921..bbca304d51d1 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2155 BLAKE2B 47578253ccf91346c4fbb2a25b223030b6c8f92d67befc7e56065fd1760f1bfd64621aadfe0d21407bd86c142139b731a61562db3b6f7c0d93f461566634ca93 SHA512 7e22cc5edd01f64f9fa8d72e4dca82e500e63cb2aec28c02b7eb449d2766976f983548ae437c01f83da6dd12866dce3e02ebdf2785f57a82010bfeb25aac8ec6
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2148 BLAKE2B 8f7d796e50163d868adcaeef7352b5460a2395c84deb119a997ab86133ea387e5326a785ad7a33c692983ef9dd0f16c90d07bf21746b6f674927f5c1f4a6a98f SHA512 849295da49fe9e165a568a68a2e380fd2e3726824c1d4b2631e32de736f22e61065b3939bbd780962cb04a69ce8e54461250bb1cf13afeb3462f24b1d9b3398c
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 8eec20d29722..cc082f08fe8c 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit ruby-single
 
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index fda0b36d3c1c..2b6493ed99a0 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c6
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1571 BLAKE2B dcaaebf204fa7b78f5ad4e8771e7250f983ec9bf36c074328fcf79e56f0e92f6ec002ce74c4195d994a0c1d880595f9cea47c732e835c950f170441f9cfef357 SHA512 6feb7f3dea59afc91e7c145d8001cc588a142eabde16e12ff25776c6b2b3d7fa12cc77a37246b55fababb76edaea49d9b9737202d4e5909da785e56ae167d900
+EBUILD docbook2X-0.8.8-r4.ebuild 1558 BLAKE2B 1bc7891aa410eb53d525090d07eed7cda47428f23603535673e1ccc233ac6e1d0b72d5be393df513f182062c9d05b96535ae312105af27facee6f09a7d7f9043 SHA512 ddcf4fe394d77b250ddcfa4397ea8c69c22638ce22d17754651c643eba8ac8b09e7ce793e97f44359608f04d1dc8b174b08d1ecc9eb56b731e8d66c643d74cd3
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index 21d062586458..a96945848f97 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/app-text/duali/Manifest b/app-text/duali/Manifest
deleted file mode 100644
index a30496768784..000000000000
--- a/app-text/duali/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST duali-0.2.0.tar.bz2 13334 BLAKE2B 28366eedef3c37d40b88c1458cbc420be6dd44b252bd7b176939f1d794ef29659109d19bb7328388b6ef3e16ba8dc0c500fd962525b3e05c44900092687f5cd2 SHA512 9234647b722a54fce8f947f2f0eb8cc121e5bdd32bcf606bc8ff71854eaf68655474e374b3328b2a20af58484e5962dadf716bc220f7fd697a8cfbb99afb2d30
-EBUILD duali-0.2.0-r1.ebuild 944 BLAKE2B 9841fdf613d183ffe2c82727f720d5bcb1f6c324f149dfc2cac95047eadaf7de2e0385bc291f25da74a7c832bba59ea63babc1d443f7df360631e4831c289cc7 SHA512 51de78eb1caf7aa07ff4b544d213d60d6d35985faa84015cefc753f44bdbcd2b19906c4b84062bf3f2c432c74d064edc36250040bbf62457f4d092dce1eaa5dc
-MISC metadata.xml 245 BLAKE2B 7dc5df660e9e3cc71fcd39abbcc77edc7890bd44fa6e2d68556b914e6a35c6e6526e281b6aa286a0f12893a527669c2fbf64d63c8ad555137e222832edaf2cc1 SHA512 5cf81ad67c841f8eb5a71ef18b6ae6c344d68fb63c80c21f4a9b9a0060de938264530276a152eb5451dd88a5955f04a48c8cd4d034be6bc7a1922b5e4f43539f
diff --git a/app-text/duali/duali-0.2.0-r1.ebuild b/app-text/duali/duali-0.2.0-r1.ebuild
deleted file mode 100644
index e324474ac5f5..000000000000
--- a/app-text/duali/duali-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-# Duali uses "anydbm" which should even support a slow fallback;
-# however, due to implementation details it fails when the databases
-# aren't gdbm.
-PYTHON_REQ_USE="gdbm"
-
-inherit python-single-r1
-
-DESCRIPTION="Arabic dictionary based on the DICT protocol"
-HOMEPAGE="https://www.arabeyes.org/Duali"
-SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-dicts/duali-data-0.1b-r1"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	python_fix_shebang duali dict2db trans2arabic arabic2trans
-	python_doexe duali dict2db trans2arabic arabic2trans
-
-	insinto /etc
-	doins duali.conf
-
-	doman doc/man/*.1
-	dodoc README ChangeLog
-
-	python_domodule pyduali
-}
diff --git a/app-text/duali/metadata.xml b/app-text/duali/metadata.xml
deleted file mode 100644
index c8c6479d60fe..000000000000
--- a/app-text/duali/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">arabeyes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 4a6e9ad67c32..82e94c948847 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,7 +1,7 @@
 DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
 DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
 DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
-EBUILD dvisvgm-2.1.3.ebuild 1109 BLAKE2B 62a43b55ec7b13d22d21255c88118f792f23991c41a930b804556ad470b9ea74ca87a745d60dd35dc3eea59f3f45c5ac1429781c86165afcc8dbcfb0eb588d18 SHA512 4096471c087bfc8a913af3722f09e7d53da761e7e8b80dc4c494adea9871147791dc543ea782974ba552ffb8c4929239ea17d6ef3dd4b2b2a77a87a0cc6dfeb5
+EBUILD dvisvgm-2.1.3.ebuild 1108 BLAKE2B 0a391190895375304ad42e95472551a4a92ea583d92a9739befc775b8e9a411d637cafaf8dc84c91aa7314e026a736344162fd1f220d044e7059290af041a6c7 SHA512 58dcfd060f1ab8320ef14956a705adc4a225e35217399b6a8058621c03d46ccc382cb333e0596be7e811a128c5b1851cc35943caf057ec73c489d797178b6508
 EBUILD dvisvgm-2.6.1.ebuild 1198 BLAKE2B 43104499f16347592d7b328e575cb528605c852154ee0c9fe7ad468b0cb988347c397d56700ab91ec8404b239a1002ebadb1ed6abbd8aef316892b755a63fb2a SHA512 5a0504d8953c91c552e5c688640400aa16fb11e9add8a6af9a178c44bbe87c7cbe9e0d966f02b47d5d282ec72d738b1617c1e77786f1bc92527762051ba5bd59
 EBUILD dvisvgm-2.7.ebuild 1198 BLAKE2B 7e60b8ea517403fd22f033ed0b3beb8e2adee9a88c575daea688de33088714b4066240e5b764922ccb558b20793bd6d853912325927436fb2afe1e28a0a977db SHA512 7fc67c1d09859469969977d9bcc092267a8970539bd9c6f1d991776de25962138cd74285c5add62f81b443c30fd0f12ff5fdf0ee320d885f5218e377fc0ce693
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
index b4d1be54a80f..ac03a2ff199c 100644
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index 862a372c4e3e..ef0d7e42ed71 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -1,7 +1,9 @@
+AUX editorconfig-core-c-0.12.3-no-static-libs.patch 2732 BLAKE2B 0ce8fd79ba40701c9723d127dfe7faa1f6fc0e20d43d858df9831959a7f7f06a776720e69e5946d6b22a3bad11a958823faf922b8bbd69d601f7e3e2cda5ee34 SHA512 33cdd54d79f2d28e11b2c458b41d720c6763549b41835f2aeb6601e009f9928f43ea4d27264609c5651c81680b696be3795ddb9b50cd44337a6ed8c4aa35ee73
 DIST editorconfig-core-c-0.12.1.tar.gz 65369 BLAKE2B 30296b64bd215a8b51d3b4d6146ce5eac13cb1a8ba8a25d0faabcc22989503d9d73bc138240b475eb7ea4eecd5f5bbbf347519b1696373daf55ffd27fc772f4c SHA512 3517f7db84d632615ba651eeafab6730739b7bf01f4ea34fbca65f58463fbbcbabc101587b289a7922b55708453262c65569077c51087424d47d0676dc1db686
 DIST editorconfig-core-c-0.12.2.tar.gz 67002 BLAKE2B 6b808366acc8d0a96fc47cb74d620a4028978d7114b4a64d6799527276442f1d39ba8d5611530f873c78b7c49893c5edecec84dcc6f2616ba2663cb36fa92d0d SHA512 6ab3e4f7f95c83c0781064ca15bb70394bb947f9d4cd1348224f02e25c65021d14439b913775d7cfafb93476158799c34438fa548adf3c7ec6dbfd6f1052a046
 DIST editorconfig-core-c-0.12.3.tar.gz 67701 BLAKE2B d5e6310f770099f542eb81f4ca7ec975e74c49f481c4e8e07832a7f9fc0882e2cb65da5b4b18ad926786d7ac92c3deb6ac0a547188bd68d350143258796ad1b8 SHA512 4a17cd6317bd45f8b0131070165d852569d020f1cf74e72b44057b97672184b4992aee54aae6e3222c669fdce8bb6b1f3482235e6518acffcef05e1d74087e6e
 EBUILD editorconfig-core-c-0.12.1.ebuild 901 BLAKE2B 541ba2ea83d46ae92146d81fc61f33c28135596ada38f0eca29a8a8e4bf556cd8ccd640cb8c346e2e0df799bc821cd9649d96d4e6800019d4540bfc58cf973f3 SHA512 84b2b7388a7df7ac9d7de0d3ba136d513bc005f729ca833d9f2dcb1ee06087d3935c37b82ac2e85184500b157c08b014e1432eff4f09449f3d20e21efc6cd98d
 EBUILD editorconfig-core-c-0.12.2.ebuild 908 BLAKE2B 4e06c5be8aec27b1d41da5854e34385c1dbfece7cb9a8f1a33c7e694bcf056f32f957b641a430c9a6bd1299da1e364090c566c8d939a3fdd82b38e8a3b77b8e0 SHA512 457bac4c77fee133a9af5c4aa65d5312dffd5dd52a000e5965fd0117845545d7ce482ef1d7473d2e3d8cca40b0e5a9957a8fd6dca455bc4d84ee62a86bab6adb
-EBUILD editorconfig-core-c-0.12.3.ebuild 1023 BLAKE2B 137e85dc9b8755ee15fc24f65a153e17db8ca153120979b6810b94256b15a99f03e360ccc28a95058b0e7e9d1458e643f136e78a139f3a24f19ecaca90d85eb6 SHA512 9140af3b2e1d1b5f12d78c37ac38c3f79143a9bbc0cbdcaa04ec690fe1beebb346fbc58a22a15def09896662eaee2a1604c566b58ddaa37a30f60e1a03b4d2b7
+EBUILD editorconfig-core-c-0.12.3-r1.ebuild 742 BLAKE2B 9ee9b9c888d05628c7927154a1c26f407e26d731e9c226636e6a3e28155c9b39a3cd5089265a6e6418ceabc2e51b1e8e80be6ef202c7582b7065cbbb1dce2eda SHA512 7c156ff80dda7e1918067e4e19a99eb25e30112478748e5bb97db6a4021ee044c85c666b3ca32b6e07ce6ef7d3d0a58c5f813eccacfc9b6a22b678fcc4b0ee1a
+EBUILD editorconfig-core-c-0.12.3-r2.ebuild 864 BLAKE2B ea50011f62f7c5f4f59f051865d924ac0a9f32d8253b2b7ed805e5a782d0d11fc552c8a49398dfc4c6d0525650c94bbec1e6286862ed2367537480ab9000e5cb SHA512 e35bedfc956d726984996ac1380e45b022c2f6e0fe5df64191428afeed84736c045a79d4dae2dc1b83818754834993a845f27ea8ac1092aa616b37d948e3cc3d
 MISC metadata.xml 388 BLAKE2B d2a5f28be0aea3f3aefd1b8e82e337b87e67192b96bea1e2e0e5073e44f8c54d3f0380a089118d405c417d42ee6d978919dc8e0212a36ee0d3808b706846ad70 SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r1.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r1.ebuild
new file mode 100644
index 000000000000..828fb761bded
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="EditorConfig core library written in C"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cli doc"
+
+BDEPEND="app-doc/doxygen"
+DEPEND="dev-libs/libpcre2:="
+RDEPEND="${DEPEND}
+	cli? ( !dev-python/editorconfig-core-py[cli] )"
+
+PATCHES=( "${FILESDIR}/${P}-no-static-libs.patch" )
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+
+	if ! use cli; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild
new file mode 100644
index 000000000000..02055e6d7f0d
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="EditorConfig core library written in C"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE="cli doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="dev-libs/libpcre2:="
+RDEPEND="${DEPEND}
+	cli? ( !dev-python/editorconfig-core-py[cli] )"
+
+PATCHES=( "${FILESDIR}/${P}-no-static-libs.patch" )
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc 'ON' 'OFF')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+
+	if ! use cli; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild
deleted file mode 100644
index 98408d4748d3..000000000000
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="EditorConfig core library written in C"
-HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
-SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cli doc"
-CDEPEND="dev-libs/libpcre:="
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	cli? ( !dev-python/editorconfig-core-py[cli] )"
-
-src_prepare() {
-	sed -e 's:OUTPUT_NAME editorconfig_static:OUTPUT_NAME editorconfig:' \
-		-i src/lib/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-	use doc && mycmakeargs+=(-DINSTALL_HTML_DOC=ON)
-	cmake-utils_src_configure
-	sed -e "s:/share/doc/editorconfig\":/share/doc/${PF}\":" \
-		-i "${BUILD_DIR}/doc/cmake_install.cmake" || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	use cli || rm -rf "${ED}/usr/bin"
-}
diff --git a/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch b/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch
new file mode 100644
index 000000000000..369b806467be
--- /dev/null
+++ b/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch
@@ -0,0 +1,69 @@
+From 4fa85f00f824b1dd5d1244c77667ea497d94f02b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 11 Jul 2020 21:11:58 +0200
+Subject: [PATCH] Do not build static lib if BUILD_STATICALLY_LINKED_EXE=OFF
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/lib/CMakeLists.txt | 36 +++++++++++++++++++++++-------------
+ 1 file changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
+index 353ab1c..12db621 100644
+--- a/src/lib/CMakeLists.txt
++++ b/src/lib/CMakeLists.txt
+@@ -44,16 +44,18 @@ if(WIN32)
+ endif()
+ target_link_libraries(editorconfig_shared ${PCRE2_LIBRARIES})
+ 
+-add_library(editorconfig_static STATIC ${editorconfig_LIBSRCS})
+-set_target_properties(editorconfig_static PROPERTIES
+-    OUTPUT_NAME editorconfig_static
+-    VERSION ${PROJECT_VERSION})
++if(BUILD_STATICALLY_LINKED_EXE)
++    add_library(editorconfig_static STATIC ${editorconfig_LIBSRCS})
++    set_target_properties(editorconfig_static PROPERTIES
++        OUTPUT_NAME editorconfig_static
++        VERSION ${PROJECT_VERSION})
+ 
+-# We need to link Shwapi since we use PathIsRelative
+-if(WIN32)
+-    target_link_libraries(editorconfig_static Shlwapi)
++    # We need to link Shwapi since we use PathIsRelative
++    if(WIN32)
++        target_link_libraries(editorconfig_static Shlwapi)
++    endif()
++    target_link_libraries(editorconfig_static ${PCRE2_LIBRARIES})
+ endif()
+-target_link_libraries(editorconfig_static ${PCRE2_LIBRARIES})
+ 
+ # EditorConfig package name for find_package() and the CMake package registry.
+ # On UNIX the system registry is usually just "lib/cmake/<package>".
+@@ -65,11 +67,19 @@ set(editorconfig_CONFIG_EXPORT_NAME "${config_package_name}Targets")
+ set(editorconfig_CONFIG_INSTALL_LIBDIR
+     "${CMAKE_INSTALL_LIBDIR}/cmake/${config_package_name}")
+ 
+-install(TARGETS editorconfig_shared editorconfig_static
+-    EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++if(BUILD_STATICALLY_LINKED_EXE)
++    install(TARGETS editorconfig_static
++        EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++else()
++    install(TARGETS editorconfig_shared
++        EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif()
+ 
+ configure_file(
+     ${CMAKE_CURRENT_SOURCE_DIR}/editorconfig.pc.in
+-- 
+2.27.0
+
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 630628049d55..03e6f3e9ec69 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,4 +1,6 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
 DIST evince-3.34.2.tar.xz 2565752 BLAKE2B 76497c34ce2eb460a3f2c3e790a7c44b9eeddd566854061d49fba2ba7cefa3b523d7bfe973d08b7ec1e8d967e4cbd63c73a668a346bd158a67752897f25827ee SHA512 51bfa4671e17a98c536790185ece6f4f77b956062901f840cd298cdc3e42eb7e8cabe9bfa84387f185cdf7462a322ef54bbc463b988a677af68561e55acd9f12
+DIST evince-3.36.7.tar.xz 2580208 BLAKE2B 76ba6d206289f9981af24e5d82c9567c05984ad71efe83391aa1f8fdd94d31c284e600cf81eab9868e01f120f71cde1ae9b6ee6b7a4b1da47458d17b95b78d87 SHA512 dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910
 EBUILD evince-3.34.2.ebuild 3133 BLAKE2B f98ca75f5c17333f062ca74daf739c1cf0a5c26bf55f54c95be45e1bd2469f4fc28e428ce9e4b59b1d67206f83885b3706f79af25e1ceff19dd61641c253c4e6 SHA512 14eb12ba64aa16e65649be0f41379e887030095c66fba79d46682cd03e1f4d94cd74c0978e2a6d7a37405235c7d214df96a3275449050c1b97d5efc47631b981
+EBUILD evince-3.36.7.ebuild 3135 BLAKE2B d361bc36f31a3b3568be081299bad034e33af75dd70cccd3ba9426bf3ca8d3da287d25d5f07d32ab92b17c81a90f5333f5b1e2cf1245a06590145167072aec8e SHA512 20a27bc84a939763e385ff4583a8077495fd4d4b007de0f357ddd8ad3a32bccca93519764c2cfd55ed8d197b4a9d0df3cb8a8d71d165a7c4170c2a9062fe6aa7
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.36.7.ebuild b/app-text/evince/evince-3.36.7.ebuild
new file mode 100644
index 000000000000..bc17efc5a75a
--- /dev/null
+++ b/app-text/evince/evince-3.36.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.38.0:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.76.0[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	app-text/yelp-tools
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+PATCHES=(
+	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
+)
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_with spell gspell) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/fb2edit/Manifest b/app-text/fb2edit/Manifest
new file mode 100644
index 000000000000..7caa006cbdb8
--- /dev/null
+++ b/app-text/fb2edit/Manifest
@@ -0,0 +1,3 @@
+DIST fb2edit-0.1.0.tar.gz 244667 BLAKE2B 332ba2801a346ef667760ff9f116aec6ae3ef93c7d862884514982bcc6adfd5413b22beb40859cc28ca297548e2e8f1c95885c2e68734c554922965d53c8f7ab SHA512 f13d45987a513fa9ea8139b195cda77dd39d4d680b5a826882b8b9d6d5704f10ed4b447070f1de39997b3be0fafa8378fe1261ff2d1e53cf9b3225c07a293d08
+EBUILD fb2edit-0.1.0.ebuild 590 BLAKE2B aad7c166eb1fccd092917139b19afc9185f008c948da79ac15148ace6952d5a3836d6ab0eeb054745c04356296e67462261349b4c1e6f2556edd175eaf38067d SHA512 f7e7b385d2551bac953d80dd22b2ae73a1d3b2710bb35d631d4ea336f2467a1e2b42d7cfc78f936b260ce1b5210d8c62b74e4188cc7e353d9ed54572ce3f88d7
+MISC metadata.xml 304 BLAKE2B 470be4c51e8e29610ce0c582424b6fd5eea58cc8bf9baf18f6e3e06d0bbc216e41e6e188d59e448aa51aebc4ea9fd8e5f1c0a2f3a061483ce2bf9f737b6a4083 SHA512 69b144bae914d9e5f4f0743206720df42835d83b790b234eb278e5d6532acfd0ef519077780548c0d881dfc4f5c39197c978252396535baf1ab216dc442450fb
diff --git a/app-text/fb2edit/fb2edit-0.1.0.ebuild b/app-text/fb2edit/fb2edit-0.1.0.ebuild
new file mode 100644
index 000000000000..1586fc5e4078
--- /dev/null
+++ b/app-text/fb2edit/fb2edit-0.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake xdg
+DESCRIPTION="Create and edit fb2 books"
+HOMEPAGE="https://github.com/vitlav/fb2edit"
+SRC_URI="https://github.com/vitlav/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	dev-libs/libxml2:2"
+BDEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_prepare () {
+	cmake_src_prepare
+}
diff --git a/app-text/fb2edit/metadata.xml b/app-text/fb2edit/metadata.xml
new file mode 100644
index 000000000000..e236be2dcc29
--- /dev/null
+++ b/app-text/fb2edit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vitlav/fb2edit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/fblog/Manifest b/app-text/fblog/Manifest
index 805bc6eae7ce..2f1b3a13da88 100644
--- a/app-text/fblog/Manifest
+++ b/app-text/fblog/Manifest
@@ -28,4 +28,4 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fblog-1.4.1.ebuild 948 BLAKE2B 4af1344bf52e24c2a02a826fbd311676fe9415316c19f63b5c1c8f336c96ca7596c9ea9a8941fb1e027905c3a67d64befc2b64c61bb1bbae7373bba9bbca1e48 SHA512 cc503dee77d3910f404b8f76df56ce898f77bb0df788428712ec20fb7f5fdbb8afe3ed17f23cc49e4288f544e9fc48f4bc13bc356b44ec8a11aff12e4bfec2b8
-MISC metadata.xml 390 BLAKE2B 75706201540fe87b91200fca22103f06fcb7e392ccac62461b7bc1f77a9187b24e2e7fa6ea9723749fc048d6c334098b267530f0212e3554a9969876f109ac6c SHA512 bdb6e4e2464c6669e864ad909c317720516eb6aada0317df8140763a5dd8dc8a6b3653a08884850d8cc30306226f958bdd42879c4d0a232bbd7f21869ed1064d
+MISC metadata.xml 306 BLAKE2B 51f0b3397f4147ba5e7581fea79bf76ff084c70754245e29463182fe9395f8bee0f77434208d61372fa80a5428ba1fa4ee663f1aad62813b9ff53c7e8d7b85e5 SHA512 53535c05085364b059a30c216dba75d6a25f48c5885128893648e866ba80a3cfa517a049f578b60082bf4fad959814896ff94e4923f4afb193394c9c7188b2b0
diff --git a/app-text/fblog/metadata.xml b/app-text/fblog/metadata.xml
index 1950ef12155f..715b1052cb70 100644
--- a/app-text/fblog/metadata.xml
+++ b/app-text/fblog/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/brocode/fblog/issues</bugs-to>
 		<remote-id type="github">brocode/fblog</remote-id>
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index af04056a1dda..ef7cc46bc34d 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,5 +1,5 @@
 AUX fbpdf-0_p20190202-printf.patch 1166 BLAKE2B 41972cfeea7bbc8d1e1840a21882c82050b2f91fff75056067fd00e6ed4a67929f35674cb3e09e5345ce2690cbb92a1676a4ef273f804d866cad5385cc48cc43 SHA512 e91f8158d0a8237010dda66eee289046348b8b657b859e4de1ae22c91424c47775df94f5d58151c930453389e71b4237c07b942c4391afe288e980d19833f183
 AUX fbpdf-0_p20190202-use-pkg-config.patch 1258 BLAKE2B 7542773b6ecf8fed73abcca526d41cfbc7629da44bd3e50649951680469ac7a5f1392a75b4849a8626fe740436bf1bdea9a0131f9e60558f37bb7cdbb1ed89e7 SHA512 6086ff1948ba000c8330aa5fe510b84d74a91254a75ac07c326730c371a4ab47cd2f936ceb888bed4c1520b9fec61a823fb1656533374586cd4fe2466b3160bc
 DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
-EBUILD fbpdf-0_p20190202.ebuild 925 BLAKE2B 7f2caa4ae663a18690013460940ccd040b40cd00c92be732b948f322e98f9ecf2c4309b72dab401f8ea201661a55a350ffa54dd3026eee87a87b0c22d6e720c3 SHA512 841085eede01cb591d166e2359f69b7504b3fe8eaed10d722711f792db0359b00cd7ff3505bcbff53acffe68f1de329e4b768bfcc1629c38b41d4ddcf26e855c
+EBUILD fbpdf-0_p20190202-r1.ebuild 868 BLAKE2B 577a0505265a3e7f1643722d64436197cc108618861ec4a7970e889c6ca5c51d6484f6bbf0ce404667c59cb87db604523a359c97f8cd8dcc84ea82a17aa27db2 SHA512 482c65a5c6ec5d6c070fe757cfe44c7f05413c3ea66ebef52b6e0d1813323bdf910a14be494f9439fbbbdca60e196ad54a084bf913526942a35bb2c255604654
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-text/fbpdf/fbpdf-0_p20190202.ebuild b/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
index 2cae3b100718..79bea0cffbde 100644
--- a/app-text/fbpdf/fbpdf-0_p20190202.ebuild
+++ b/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs vcs-snapshot
 
@@ -19,17 +19,13 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	>=app-text/mupdf-1.10:0=
 	app-text/djvu:0=
-	dev-lang/mujs:0=
-	dev-libs/openssl:0=
 	!media-gfx/fbida[fbcon(-)]
-	media-libs/freetype:2=
-	media-libs/jbig2dec:0=
-	media-libs/openjpeg:0=
-	virtual/jpeg:0=
 "
 
 DEPEND="${RDEPEND}"
 
+BDEPEND="virtual/pkgconfig"
+
 S=${WORKDIR}/${P}-${COMMIT}
 
 PATCHES=(
@@ -38,7 +34,7 @@ PATCHES=(
 )
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 73854e4f98e0..49e1378e2f74 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,3 +1,3 @@
-DIST foliate-2.2.1.tar.gz 4310842 BLAKE2B 3e858379c84a790d1ce4d60af25c4911d2864d7b82f1896216ae8a01598ae7865d65b90056348b372b328e84184e75fcbacfbb2b6fdb8aa9a7e254e726957c4f SHA512 3c9c3d8f2df72fcb8699ccf23bf1850c129c6f387a9b12489d8fcc3dd1da4da5a7e0707f74f4607ab0e28d67e2f55f0bb2d053fbbc072bc9915c54c4857e4cff
-EBUILD foliate-2.2.1.ebuild 980 BLAKE2B 38bf7445278159e8d914dad322e8d3164a2e7edacc6a37f149f625897c0f98aab560679eb4d984fac9660084227ef696996b51ac7d50657c0fbcf8c9fe86ccaa SHA512 633d6da653eb3ffe94b3a7fc576e5cf20cf085d69798c76ef82efdfe64e86bfbe20ef8ead5cb2f386c01237ee0e0ec4fe9df63c6d62ddc2d6e4e2027aea3a568
-MISC metadata.xml 526 BLAKE2B 9663aeafbe2182662001d238253587b45512bf1d71308e7e1d0fbd197c88d2cf384ff38a464da61facabbc8eeb3e391abc382426291eb75a2853ede4152d490c SHA512 0132f71baba803835fe3789cbb41d6a7d98fcfe06ff14e6212f734d807ed0b3ce0e4379d5531f1f23a82b99672102d227ce3eeeb9a7e2f94ead65755f1c7cf24
+DIST foliate-2.4.2.tar.gz 4638211 BLAKE2B 4263e047d7251a0f15a2cda2592ba24dbbb9754a37ba6367f0d1e778e3f926cd46777d505e9f92d74bdcd28a722988b60f064f1a841c53a9b2849130941d9481 SHA512 6dda76c9bd3f9f3273bafdd65463adfcab84d9c81ca89c2fd1cda4c5d7618d84610e11c75936c5df2bb118caa3f3e1e77ded506da670263e5af5b0ad92a97a07
+EBUILD foliate-2.4.2-r1.ebuild 1208 BLAKE2B 5c7c4ab877dc6682830179250e320f16b1dc743b187a78b1b10a97983df80d78e608a5cd1511f0ed3047ffea8a6319cfe442f23207120fe873cb8eee719342b0 SHA512 012b8a76be83049edf2c4ad3d822a864733dc20090d6cad4e0d57b4612ff8746b491f7527c7b6719543785cafcc7ebc76ef3ec00b1828f144f66e50b355147c0
+MISC metadata.xml 606 BLAKE2B 122522b577e0911c008bdc8f6a2b52dbf5514c30011d6a57cebea044e157c26f0dc0075d92ddf70825b26cbd8291c858077a0bc467eeb64c050eee0734125d75 SHA512 ac916591078fae44e77faf87571d7d34eeeebb0253f243a7a560e52a0c3c67276871f7b7f48e9649922ecad13c54cce43c2cc6349dbaab0131a190dee7918208
diff --git a/app-text/foliate/foliate-2.2.1.ebuild b/app-text/foliate/foliate-2.4.2-r1.ebuild
index a64449df461f..6a96690330e9 100644
--- a/app-text/foliate/foliate-2.2.1.ebuild
+++ b/app-text/foliate/foliate-2.4.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PLOCALES="cs_CS de_DE es fr_FR id_ID it nl pt_BR ru_RU sv zh_CN zh_TW"
+PLOCALES="cs_CS de_DE es fr_FR id_ID ie it nl pt_BR ru_RU sv tr uk zh_CN zh_TW"
 inherit meson l10n xdg-utils gnome2-utils
 SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="gtk ebook reader built with gjs"
@@ -11,12 +11,17 @@ HOMEPAGE="https://github.com/johnfactotum/foliate/"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="handy spell"
 
 BDEPEND="${MESON_DEPEND}
 	sys-devel/gettext"
 RDEPEND="dev-libs/gjs
-	net-libs/webkit-gtk"
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	net-libs/webkit-gtk:4[introspection]
+	handy? ( gui-libs/libhandy:=[introspection] )
+	spell? ( app-text/gspell[introspection] )"
 
 src_prepare() {
 	default
diff --git a/app-text/foliate/metadata.xml b/app-text/foliate/metadata.xml
index 61acad2b9559..7c05fa08f38b 100644
--- a/app-text/foliate/metadata.xml
+++ b/app-text/foliate/metadata.xml
@@ -9,6 +9,9 @@
     Supported formats:
     epub, epub3, azw, azw3, mobi, fb2, fb2.zip, cbr, cbz, cbt, cb7, txt
   </longdescription>
+  <use>
+    <flag name="handy">Use <pkg>gui-libs/libhandy</pkg></flag>
+  </use>
   <upstream>
     <remote-id type="github">johnfactotum/foliate</remote-id>
   </upstream>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 6f845d763506..9169e0492d27 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,7 @@
 DIST ghostscript-9.50.tar.xz 34613344 BLAKE2B 999af7525ec84448256bac233a81ea3b8d4dcb8cd22fd67dc26dd542840259cef0c1438b85274f1d9c192784ecc5d36cb47a3d4482ebbe19ea8843404f9d0ad2 SHA512 3c1e5db519a427f4b6bfb8d93f3c3dfb67d5ec9ccd19c7afa7670deb768515f3fc617c5588e54934bbfbedfdf8609ce2ffa36dd7da3cb618937fe034f64f43ee
+DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
 DIST ghostscript-gpl-9.50-patchset-1.tar.xz 3840 BLAKE2B 12bda8633b5657b1b480b69d5a039be724c1af9a1a67e3509112fb607565e087500d2a6efaacd5e774e0f24b01fa6e8887a56fa0207cfc6fcdc3768b0156f86f SHA512 dc638ffb48425980202e7064ee40f65b0f78041c82601f87035100a50d5e18455aa1b852c8c1d852fa582b8be52276d078d80463e3b25ab73863a8544d0e08c1
+DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 EBUILD ghostscript-gpl-9.50.ebuild 5381 BLAKE2B 10c86300876dc50b8ae79bd45cc5df6208244d576cf22558b18f17b2e7e74fa2b2a75b2132dd572c6eec8e5c988c3d95032b189fef3fc876d8330c3fadef7441 SHA512 614783d94a95898ef0727b1285733e6b543190618423d835a186d4fd029f2cdfd3ba038bbc1644451bc48709d0264390b996113c91f1fd5d42f7c9e16a534246
+EBUILD ghostscript-gpl-9.52-r1.ebuild 5098 BLAKE2B 378117d2aad00c25b262c9a6d0df70a095a108409c334571d6f0495518388aa346c8f5f7c12ef21dea4fbad28b48c6c19994cff9ba3d646512b2e9fcaf130617 SHA512 6cf6163a00ec73acc8d6a7450ac4942ff868428473632e02ddaa95f238a1f11f5ce3043d965fae439148adf453ac6f414c5dc1715ffc2de9bd5113bd4acd0b70
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
new file mode 100644
index 000000000000..a0ef29b0db3f
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+MY_PATCHSET="ghostscript-gpl-9.52-patchset-01.tar.xz"
+
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 sparc x86"
+IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.16:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=sys-libs/zlib-1.2.7
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn:0= )
+	tiff? ( >=media-libs/tiff-4.0.1:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-text/poppler-data
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n "${MY_PATCHSET}" ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
+		eapply "${WORKDIR}/patches/"*.patch
+	fi
+
+	default
+
+	# remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with tiff system-libtiff) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest
deleted file mode 100644
index c2e577dde849..000000000000
--- a/app-text/glosung/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX glosung-3.6.2-glib-includes.patch 329 BLAKE2B 79feae4ab17b1647b57807db8ff8346620548c9498a0329d97e76a6aacbeb7aae0e8cfc3d234717f24d715d310c14909c0d0ceeef6d8be4090be93e5386bc929 SHA512 cceb87873bb1b617f0d550d0d1818e21705c9894015a6c8bbd6050365af580956fcf6f79289cc0ac619552ec170af3f42f5222c5733548f7eb5d3fd303733044
-AUX glosung-3.6.2-scons-2.3.2-respectflags.patch 1701 BLAKE2B 7bd71dfacfee19d6466fd4462c6e918dba46f362fdf2bb300128b1f651fe6e777514cd3d1225f752a375371841fc86317f222894e7b33be415d04d9f0402277d SHA512 6b2dfabc97cc87280a8078accd5d39bbae47b3d03db9efc85b820da135c6231683916cdae3a00dcd662d3c74332322997579370bf7b539f15ea033786d4fbb70
-AUX glosung-3.6.2-scons-respectflags.patch 1720 BLAKE2B eb83fc529227215002bd8029e6870ce4d8c5aaef8170d36c3ad25fc4a583f0d8e764b869180590ff6fa13bd52ab728979867b0b71a2f34038493abb022ece480 SHA512 e2ab10f723fa30e9aec8f10fe629711228ee4d08076095fdf3879bc23da1f15fe991367272d55c5490f96255100a6024c96f639613f6a402b3112fb68ae29520
-AUX glosung-3.6.4-scons-respectflags.patch 1785 BLAKE2B e9580d582a76c43345b133bcae6f3ed339e55f02e2c2037d80dd08592b87efafb65e63ec5224036199597b0973abdd3bf374b1cb66a03dcf9663cbaee3a26526 SHA512 7cedc550a6cc3902c38deac26016facf1383c581d03b2cbc4fc484c0ba0cd332bba5496904325a09c8416595fa14c92b1db320f902fd1acaa515e1e8d4da4b8c
-AUX glosung.desktop 374 BLAKE2B aca6f33d8f89df4878cb2ffc313c1187f551bf4814bc174370c0cb028b8ec51fa22ff76b95dd1ecbda5bf2687cf6e63040c2968a4e3d540f1e472f51fc72be50 SHA512 3afccd76f801b61690eda4e7902aa3abe048a241dbbe31dc17670611d0463acbf5f54536d59f8b6da2d55423b62bdb0b16c30c241cca27b0774908e067d280a2
-DIST glosung-3.6.2.tar.bz2 65089 BLAKE2B 247cca9079c361316f3f3648667ffe18e9bd8c62c30d2944f07840ffca2972d9cedadfef7da6a05944c141351805cf170248729a10b577aad0846f75e8e09454 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11
-DIST glosung-3.6.4.tar.bz2 71887 BLAKE2B f5e2d2c54e4d66daf175961e78eadcd67dee04e0713e084de877068ea34cb63ff09f100195d1d902174c18b0842aaabb007dac4f67cd2d8d3ba7ecaacbd2c700 SHA512 c4f51d2569e0c74bddf6806551c314a337d573cd10ab1b6dc04c735c24e4e3e679af35b5d7340d7917e6f4c1fd2b4dec283205c5f744b8c020630ba428738349
-EBUILD glosung-3.6.2-r1.ebuild 1232 BLAKE2B e374c86fdc0e2ec8dce9b9bb28726722bab7ebdd35d2c354b15c0dfacefe811f445e16f0d587dcec8cd87d7547f00cf3acca181d9c99ad0b3031be8e90dbcff3 SHA512 5497faa310f62402217930b38b51cb4882abb839bac0f89403296c10604d2a5c5e6bc4cb800ad77c5facb1ae4454a49c4ff4a3a5dc2491842c16de27077babe8
-EBUILD glosung-3.6.4.ebuild 1040 BLAKE2B 1fe44bb3c3dc41aecd30dd769aa6c0bc1c30b7d4c9c2dfa3e51e7157600ed005b01cb6a035e3ea74fa48430ee83f03d355704ab7da67a36877417605fdb2d99e SHA512 d8250228f1941331ac9ff867affd2ea6a42041eeb03ba832dbeb0e63361955390503cb396e9dc031c5b21bd090e9f9d78dd95b97adc51ba151d782df73bef7ab
-MISC metadata.xml 297 BLAKE2B fc1d1b5292ad79937c9356f138153f5183994bc8a9a31d614d3540f91c07d8b6b64a251c53337ceeb7e42ed506822c2501f8d3bf43e7611d93e930b12839dd66 SHA512 4e9f59f67c171aa9fef3056f2231632fe454646bd45a1170d996f99ba5ab4ab08bc8194f7c1a345f405331dd5bd302d10e57379760eaf867dc69f200884dd8f8
diff --git a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch b/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
deleted file mode 100644
index 715b201ca64f..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN glosung-3.6.2/src/losung.c glosung-3.6.2-patched/src/losung.c
---- glosung-3.6.2/src/losung.c	2010-01-04 15:28:38.000000000 -0500
-+++ glosung-3.6.2-patched/src/losung.c	2013-01-21 14:34:14.318711560 -0500
-@@ -31,7 +31,6 @@
- #endif /* WIN32 */
- 
- #include <glib/gi18n.h>
--#include <glib/goption.h>
- 
- #include "util.h"
- 
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
deleted file mode 100644
index 0f4ac73a06bd..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -17,6 +17,7 @@
- 
- 
- import os
-+import SCons.Util
- 
- version = '3.6.2'
- 
-@@ -32,14 +33,22 @@
-                               (this option is only for packaging)''')
- 
- env = Environment (
--  LINK      = 'gcc',
--  CC        = 'gcc',
-   CPPPATH   = '',
-   LINKFLAGS = '',
-   CCFLAGS   = '',
-   ENV       = os.environ,
-   TARFLAGS  = '-c -j')
- 
-+if os.environ.has_key('CC'):
-+	env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+	env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- 
- if env['PLATFORM'] == 'win32':
- 	prefix      = ARGUMENTS.get ('PREFIX', '')
-@@ -58,7 +68,7 @@
- BuildDir ('build', 'src')
- 
- cpppath = ['#', '#build']
--ccflags   = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
-+ccflags   = ['-std=c99',
- #		'-DLIBXML_STATIC',
- 		'-DVERSION=\\"' + version + '\\"',
- 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
-@@ -74,7 +74,7 @@
- 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
- 
--linkflags = ['-Wl,--export-dynamic', '-L.']
-+linkflags = []
- #  -L/usr/lib'
- #             `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
-
-@@ -83,9 +83,6 @@
-     ccflags.append   ('-pg', '-fprofile-arcs')
-     linkflags.append ('-pg', '-fprofile-arcs')
- 
--if env['PLATFORM'] != 'win32':
--        linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
-     ccflags   += [
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
deleted file mode 100644
index 15c12bf94888..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -17,6 +17,7 @@
- 
- 
- import os
-+import SCons.Util
- 
- version = '3.6.2'
- 
-@@ -32,14 +33,23 @@
-                               (this option is only for packaging)''')
- 
- env = Environment (
--  LINK      = 'gcc',
--  CC        = 'gcc',
-+  CC        = '',
-   CPPPATH   = '',
-   LINKFLAGS = '',
-   CCFLAGS   = '',
-   ENV       = os.environ,
-   TARFLAGS  = '-c -j')
- 
-+if os.environ.has_key('CC'):
-+	env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+	env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- 
- if env['PLATFORM'] == 'win32':
- 	prefix      = ARGUMENTS.get ('PREFIX', '')
-@@ -58,7 +68,7 @@
- BuildDir ('build', 'src')
- 
- cpppath = ['#', '#build']
--ccflags   = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
-+ccflags   = ['-std=c99',
- #		'-DLIBXML_STATIC',
- 		'-DVERSION=\\"' + version + '\\"',
- 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
-@@ -74,7 +74,7 @@
- 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
- 
--linkflags = ['-Wl,--export-dynamic', '-L.']
-+linkflags = []
- #  -L/usr/lib'
- #             `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
-
-@@ -83,9 +83,6 @@
-     ccflags.append   ('-pg', '-fprofile-arcs')
-     linkflags.append ('-pg', '-fprofile-arcs')
- 
--if env['PLATFORM'] != 'win32':
--        linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
-     ccflags   += [
diff --git a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
deleted file mode 100644
index 9adece925b19..000000000000
--- a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ruN glosung-3.6.4-original/SConstruct glosung-3.6.4/SConstruct
---- glosung-3.6.4-original/SConstruct	2016-01-22 22:11:00.785053522 -0500
-+++ glosung-3.6.4/SConstruct	2016-01-22 22:14:04.434058592 -0500
-@@ -17,6 +17,7 @@
- 
- 
- import os
-+import SCons.Util
- 
- version = '3.6.4'
- 
-@@ -32,14 +33,23 @@
-                               (this option is only for packaging)''')
- 
- env = Environment (
--  LINK      = 'gcc',
--  CC        = 'gcc',
-   CPPPATH   = '',
-   LINKFLAGS = '',
-   CCFLAGS   = '',
-   ENV       = os.environ,
-   TARFLAGS  = '-c -j')
- 
-+if os.environ.has_key('CC'):
-+	env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+	env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
- if env['PLATFORM'] == 'win32':
- 	prefix      = ARGUMENTS.get ('PREFIX', '')
- 	install_dir = ARGUMENTS.get ('DESTDIR', '')
-@@ -57,21 +67,18 @@
- VariantDir('build', 'src')
- 
- cpppath = ['#', '#build']
--ccflags   = ['-O2', '-std=c99', '-Wall', '-g',
-+ccflags   = ['-std=c99',
- #		'-DLIBXML_STATIC',
- 		'-DVERSION=\\"' + version + '\\"',
- 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
- 
--linkflags = ['-L.']             
-+linkflags = []             
- 
- if ARGUMENTS.get ('profile'):
-     ccflags.append   ('-pg', '-fprofile-arcs')
-     linkflags.append ('-pg', '-fprofile-arcs', '-Wl,--export-dynamic')
- 
--if env['PLATFORM'] != 'win32':
--        linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
-     ccflags   += [
diff --git a/app-text/glosung/files/glosung.desktop b/app-text/glosung/files/glosung.desktop
deleted file mode 100644
index 7372b0f47123..000000000000
--- a/app-text/glosung/files/glosung.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=GLosung - Herrnhut's Watchwords
-Name[de]=GLosung - Herrnhuter Losungen
-Name[hu]=GLosung - Herrnhuter-i Útmutató
-Comment=Gods Word for every day
-Comment[de]=Gottes Wort für jeden Tag
-Comment[hu]=Isten igéje minden napra
-Exec=glosung
-Icon=/usr/share/glosung/glosung.png
-Terminal=false
-Type=Application
-Categories=Utility;X-Red-Hat-Extra;Spirituality;
diff --git a/app-text/glosung/glosung-3.6.2-r1.ebuild b/app-text/glosung/glosung-3.6.2-r1.ebuild
deleted file mode 100644
index 6bf0c06d72a6..000000000000
--- a/app-text/glosung/glosung-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
-HOMEPAGE="http://www.godehardt.org/losung.html"
-SRC_URI="mirror://sourceforge/glosung/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libxml2
-	>=gnome-base/gconf-2.0:2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	net-misc/curl
-	>=x11-libs/gtk+-2.10:2
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/scons-0.93
-	>=dev-util/intltool-0.22
-	>=sys-devel/gettext-0.10
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.6.2-glib-includes.patch"
-	if has_version '>=dev-util/scons-2.3.2'; then
-		epatch "${FILESDIR}/${PN}-3.6.2-scons-2.3.2-respectflags.patch"
-	else
-		epatch "${FILESDIR}/${PN}-3.6.2-scons-respectflags.patch"
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	scons ${MAKEOPTS} || die "scons make died"
-}
-
-src_install() {
-	scons install DESTDIR="${D}" || die "scons install died"
-	#Ships with an ISO-8859 encoded .desktop file, which causes validation to fail, so ship a UTF-8 version
-	cp "${FILESDIR}/glosung.desktop" "${D}/usr/share/applications"
-}
diff --git a/app-text/glosung/glosung-3.6.4.ebuild b/app-text/glosung/glosung-3.6.4.ebuild
deleted file mode 100644
index 581b7533a9f3..000000000000
--- a/app-text/glosung/glosung-3.6.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
-HOMEPAGE="http://www.godehardt.org/losung.html"
-SRC_URI="mirror://sourceforge/glosung/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=("${FILESDIR}/${PN}-3.6.4-scons-respectflags.patch")
-
-RDEPEND="
-	dev-libs/libxml2
-	>=gnome-base/gconf-2.0:2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	net-misc/curl
-	>=x11-libs/gtk+-2.10:2
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/scons-0.93
-	>=dev-util/intltool-0.22
-	>=sys-devel/gettext-0.10
-	virtual/pkgconfig
-"
-
-src_compile() {
-	tc-export CC
-	scons ${MAKEOPTS} || die "scons make died"
-}
-
-src_install() {
-	scons install DESTDIR="${D}" || die "scons install died"
-	#Ships with an ISO-8859 encoded .desktop file, which causes validation to fail, so ship a UTF-8 version
-	cp "${FILESDIR}/glosung.desktop" "${D}/usr/share/applications"
-}
diff --git a/app-text/glosung/metadata.xml b/app-text/glosung/metadata.xml
deleted file mode 100644
index 88f24ae3103f..000000000000
--- a/app-text/glosung/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>theology@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">glosung</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index d024841d210f..29676f42a313 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,3 +1,3 @@
 DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
-EBUILD gocr-0.50.ebuild 1198 BLAKE2B d3ee9f332ff3d7b16a29a9f061f7dd3ea5bb5f66cebc26426cfc2ecaee9b10cf205529b704096faa9486910f5ce030923de25b4ea7c96d0fa1008b0135c9ea55 SHA512 c84d04a2188690b718a9ac959b55d0f9aacace22c1084efe1d11339523a832fee6cb1e30e40e8c08e9ee35b045160174ffa57901e7f981097f929208ae914197
+EBUILD gocr-0.50.ebuild 1187 BLAKE2B 8fc8244c4832d59401f834a69f0faa463f39b25d18c7680aa4607e3a1a04fd5ec51839b3bb6b6d66b920b7c55510c43a02929190816099aac5ca1df68e1fa74f SHA512 f4f039654b015388cee8893d55b5fba24675ee0b238fa0e1a102ec19c001ed9f41efca2c881ba27999d3491db1fff0f7c8dc578719f5c4c751c0d47c45337fc4
 MISC metadata.xml 241 BLAKE2B 0ddb3befa9aa8922cec51c1c82d2927a12fa35eab2474330dd53794dabb7dd58859fc35f02e7b5067111bb9838592f9976fe3ff343aae7f521cdc034cf165a4b SHA512 c0dbe231483dc9dfc42dfe465aa2202145bae8a1ac5794ef9a9f02f687275c525a7826740e3b35fee93ba856ff2a78b214956b02cece209f6322ee3311cbf0ec
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
index 4061044f46df..a8e6c3baca7b 100644
--- a/app-text/gocr/gocr-0.50.ebuild
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc scanner tk"
 
 DEPEND="
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 882efa4c2f03..5f4f390587bd 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.5.2.ebuild 639 BLAKE2B da1c384bd58b0d582ef88bbc934123ba559cd542e30221f1c08003551de578e668ba922851a0325b8c98140d8a22cc3b75c6c03e4fd243ba661ad22159ab2987 SHA512 4d369d94d623d0896d691f105a5426b8ec66c25b87887ffc9a74d5a0d914d3e1009d7972cec91cb35b6507400d7f475dde0a60d09aca834ad9f2e0906abcca6d
+EBUILD grip-4.5.2.ebuild 658 BLAKE2B 8e3699b7ed73f09f7d4e6afdde09a8aa997cf900c8bb77317735fb6ba294571885b7777ae4bfa8d1a6730dca1c33260746dab4bb78d5aba7927f7985c8733918 SHA512 6dc6956688886056b307361feab24abc9c27667e55b00d10dc36a923c74255b8d53501c9bf0cb35299325744ca5015373ab9b14965529a027596d922b5a116ff
 MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.5.2.ebuild b/app-text/grip/grip-4.5.2.ebuild
index f268c25ab592..529c0af1c38c 100644
--- a/app-text/grip/grip-4.5.2.ebuild
+++ b/app-text/grip/grip-4.5.2.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="amd64"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
+	!media-sound/grip
 	>=dev-python/docopt-0.4.0
 	>=dev-python/flask-0.10.1
 	>=dev-python/markdown-2.5.1
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index 493262544a52..db64eb03c36b 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -6,4 +6,4 @@ EBUILD groonga-normalizer-mysql-1.0.6.ebuild 714 BLAKE2B 9700d2835f3f1558fa659ea
 EBUILD groonga-normalizer-mysql-1.0.9.ebuild 702 BLAKE2B 21096c271665dcb14c2828519ba5d0338918d6bbf575195cfb4e0e577c2628e8b280a51e73346bfe014d6cf43e6bb4b6ea364bca76049320134a256372aa3abd SHA512 bbff6609a47a4ef115fb72e70c8443ad9bceddb7a56f5447438f71c5c90d2d33b0bedeaba918a6e2772416438b39636c370f58092da39f4db8b9cfdfd8365301
 EBUILD groonga-normalizer-mysql-1.1.0.ebuild 702 BLAKE2B 21096c271665dcb14c2828519ba5d0338918d6bbf575195cfb4e0e577c2628e8b280a51e73346bfe014d6cf43e6bb4b6ea364bca76049320134a256372aa3abd SHA512 bbff6609a47a4ef115fb72e70c8443ad9bceddb7a56f5447438f71c5c90d2d33b0bedeaba918a6e2772416438b39636c370f58092da39f4db8b9cfdfd8365301
 EBUILD groonga-normalizer-mysql-1.1.1.ebuild 677 BLAKE2B 43c428007fc189bc6fc1f1ff62251c99ade97f9bb2f0775f4fa4bad48cf15733a2886cb1700f773817ef38386d1585c234303b61c8756d89eb3deda2047e7a3b SHA512 6b387668dee0f7c4d68dc1b690ef028ff8e14da6f8a15a764d300497b1eca16329adfd1a2adfe98e3aecbb8c2267acd742b1f02c31904dc3c7264d2ee0e0edac
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/groonga-normalizer-mysql/metadata.xml b/app-text/groonga-normalizer-mysql/metadata.xml
index 097975e3adc2..6f49eba8f496 100644
--- a/app-text/groonga-normalizer-mysql/metadata.xml
+++ b/app-text/groonga-normalizer-mysql/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index 5066da754f65..05c2fc6bdddd 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -8,4 +8,4 @@ EBUILD groonga-5.0.3.ebuild 2423 BLAKE2B 68844a8cd8c52e45eeba804d8d44659a32b7231
 EBUILD groonga-5.0.9.ebuild 2423 BLAKE2B 68844a8cd8c52e45eeba804d8d44659a32b723182a7584c6acea02bdb165334ebad517901eccfcbdf0249f1c8772d60cb9fc75ff7d7c72a604574cdad31acc59 SHA512 25cd58568c1947f1d42e441b297542c7856c0b8033dcea73791aaac720bf74bfa6df47f55776f37e5b4869f76d13b31b423c0893163480b7208804090c81da07
 EBUILD groonga-6.1.2.ebuild 2413 BLAKE2B 0d9472484b1d0bfd0949c968e52f6b80737d5398d9304a35826984a30db9555610fc2e8512b8eeba6bd0fd33b9f337d70ceceb425ebe9180530fdcff75390327 SHA512 d6832fac842eab906b5c9df2cbc9e9158b1336c39775a42eea818e8e8fb3ea40917ad02b6b89517bf6a75e6477e92bc0cb290343fe5fb8bf685cff79c3c6fdbe
 EBUILD groonga-8.0.2.ebuild 2621 BLAKE2B efcfa60f6d05c88d765973434c2fa53f25d28de79ac627cd1d5ba7a3f7313e214c88ecff5b70f16b1fac046f7b8ad919311c6d5abef3ce762f413a0de4fe2627 SHA512 875ffc1cd44664637e860ffd5ac91ae1e5b8b6858ca6413fa0076090e04a0bf78fa89e03e3e8f52941adf1d8a748bdbd4d0c46a8aa3bcf6ec00914b219b03aea
-MISC metadata.xml 1129 BLAKE2B 100a393000736b928322a512f020fc140a2b9c09997df5d4e17836794ca06b69db762c50d74c930bbb058dd918650d746834d9d1e4ad39fbafb2f385b32b1dee SHA512 496e795a9f139de79402df42093a15a0588013b011b1c6f70d6ed54090475b7814a4f8c0ba8097ede4d257557dcceb4411a05f4fb290c7442c3f04fdc5e7a966
+MISC metadata.xml 1156 BLAKE2B a6fdcf212e2de097ea99dee4c071da0af7c4024a9c4390aaee67a94f1940ff3483e08a5c20e301e47de63dffc59856a2114c2bf72de9f22e2031bd60c719fe6d SHA512 a1e8936921f6688690cc70ef39eee1abfcdb7b6940de9a29c6f1f3750c3dab4e8f50d1e189ee57ca87085e8e0daf81ff52a93cd81076745f6f479d291fabe079
diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
index 5c065388810c..42a2573c6231 100644
--- a/app-text/groonga/metadata.xml
+++ b/app-text/groonga/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<!-- maintainer-needed -->
 <use>
    <flag name="abort">Enable query abortion</flag>
    <flag name="benchmark">Build benchmark programs</flag>
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 8160893a1e98..03f9b63f8ce3 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,3 +1,5 @@
 DIST gtranslator-3.32.0.tar.xz 2767988 BLAKE2B cf05561d35adaa77e1bb15adb11faad5346a236d6bf82ccc2b474c2478ea537c89852e0c0322067de1bb24c320ad6732eff5a0f6489a97e57c980b0f1c7d56f6 SHA512 4119b64f671ccb4d8132c4b18f53b614a80c6faaecef212b23268b2a189e7b337dd63f9c0d82e139976a6d5615c4c047ad3be97397734930b5c0d07b57e13531
+DIST gtranslator-3.36.0.tar.xz 2121776 BLAKE2B 745ae74a9a1a47af609b30712f5e6e99474081da9136cc15ecf0bd121e0dd01d326574466ddf4551df7255247a6a895dd468b085cee91735fe8883e4feb16c97 SHA512 63393a33db031ea549763113d6bc55cd00c081e671a31654d225968d8d31d671ca7e577b4df8336603fe2c769c5c443e9ebf69d558c888438d194a503e044044
 EBUILD gtranslator-3.32.0.ebuild 1009 BLAKE2B 6a7af19f1b6b4656b8f74f5d1d8176009f9de0333d52d4e6dea5214c88fc4c9576eebf8b96078e2eef5d6f525972f7938f2f07f78375f624ab5ba56bbdb01b7b SHA512 b4efe029a73ba4b6f0ac9438b97860c97a87ae534fcb8e10be079863bc0cdac208c56b167446b502514983c9be9e6f99ff769d079e25ca0752ac949b62c3945f
+EBUILD gtranslator-3.36.0.ebuild 1049 BLAKE2B 2d156ac8a71d119308e49067f0b44b293a9ab17d064639fdb7941885e7ac0d02d917a84f2bff03eea50cf3ac89e298fa03015344608373bdbfb97c70da6472ae SHA512 2a62730aeece9f337e259e6525caa0aced0c17ad312b0d0e4c771d49df8b704feccc22cc65e24f73d7e9c381c018cd7474af0f7f3698e0e8b3cc65e4ef356a56
 MISC metadata.xml 812 BLAKE2B 9a347a373b7b39cd522c7bcacd845252798a5b9b06cef89ce14b71160e6b6673d65d5d9eee806c52aa104dde2d937894cb0e12a8d51b8d53feecb4bd52bb3db2 SHA512 e9cab01e3126862ab79cd223d87ed3bb927844b6a0cd7a40e94dc6ece54a2e2c4fe820032b4dd3c25b876a6704c866f3429f5ad98d82b9893ba9337a3a85d6a4
diff --git a/app-text/gtranslator/gtranslator-3.36.0.ebuild b/app-text/gtranslator/gtranslator-3.36.0.ebuild
new file mode 100644
index 000000000000..e8faa15bacc0
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-3.36.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME Translation Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk-doc"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	>=x11-libs/gtk+-3.22.20:3
+	>=dev-libs/libdazzle-3.33.90
+	gnome-extra/libgda:5=
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/gspell-1.2.0:=
+	>=x11-libs/gtksourceview-4.0.2:4
+	>=dev-libs/libxml2-2.4.12:2
+	net-libs/libsoup:2.4
+	>=dev-libs/json-glib-1.2.0
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.28
+		app-text/docbook-xml-dtd:4.1.2 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index a32366449ae9..fb5f554fa5fe 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -1,7 +1,4 @@
-AUX gv-3.7.3-libXaw3d-1.6.patch 404 BLAKE2B c77340974dd82861d952ae91b6b75d51c987e043b7f420e8d0a60018cffb403344be2cfd23e2225127f73900d72fc5d40e454876fc2f5659939aeb2e9716ceff SHA512 3b047d34b03efeefe5f764ac02f32b9e1b7fe43f8a08eb49e54313ce42d2c6323573dfb90fd46d77eb81c3acc9dfbd98a5551f5cf49b48240a519eb57c4e1b19
 AUX gv_icon.xpm 2837 BLAKE2B d4e15bbf39e183b0093c7f9effa2725e558b6f0fad3d44fc3831c7c142081e668c727cc1688d0bd2b61e1702b50351f841f7390d1873cf27c21474549eed87d3 SHA512 6aae3a463fbf3484028f7ca8f50cb7a332f5566f3bb84dd5c17843b581e1b6013b4f99a1de8600e9d4a0ba5b9b7ce131ee37b0fd80b97e32ef018d272f756076
 DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
-DIST gv-3.7.3.tar.gz 754282 BLAKE2B cdc2133e9be41e420401d23ab7691ca27ccbcabbe5c4d2c892f5661b5c47afc1f5b90f9f240a735d33e66813dcdda0a7a5c78580719ad715048fcaf6a2991446 SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3
-EBUILD gv-3.7.3-r1.ebuild 1181 BLAKE2B b3e0043afda714bb6b9162775d4469e719a452763790ecc136259f6765187dcac5ebc208f863152a27cad8ea57c0a26c7cb8003907a567541356ca4697a5a022 SHA512 4c13af882d31cebfd57d7fb70088baa4d7d43b798d6369f19d95f7f29f64fd63aa5a0c8a960041f162bc2a9c56b8cb7ebdcc0a7ccef39b2375cd8498840b0efd
-EBUILD gv-3.7.3.90.ebuild 1062 BLAKE2B 779fab28c23bc1cb4a48a657bbe929ba5c123323039b83d1654ac4b1c6484ea874b7a3ba07b0e5b9ab789e09c20e486eb655d587a9cba23029aa594d4a88945d SHA512 08b5b114166a20c56f78522181ad0e14ff5de1b9ba52b97ea1e3fca1874888a43b569d0035b441454defd05904351f5dc1c74c8d78fe2279671831912d2c040a
+EBUILD gv-3.7.3.90.ebuild 1056 BLAKE2B 2318d1afa0df742757fb86a43944c148285656a7f6493b957fb1c9caaf449e33b2009c1393d74e007df8cafbd9df7155e6eca53ddc4bd6c2bdc2b0b85437d59d SHA512 cdc47f90ba760203b9ab219012c2c8fde5be75c43883bfdaf59add81dd8ccd232cf0c2f851ccbf7530b070ae1098a7bc8a65186f0300faaeb17163248c85d487
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch b/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch
deleted file mode 100644
index 76c88b158b27..000000000000
--- a/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644)
-
-http://bugs.gentoo.org/399753
-
---- src/Scrollbar.c
-+++ src/Scrollbar.c
-@@ -1006,7 +1006,7 @@
-    TOPLOC = newtop;
-    SHOWNLENGTH = newbot-newtop+1;
- 
--   (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
-+   (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
- 
-    ENDMESSAGE(Redisplay)
- }
diff --git a/app-text/gv/gv-3.7.3-r1.ebuild b/app-text/gv/gv-3.7.3-r1.ebuild
deleted file mode 100644
index f1f8764caa9c..000000000000
--- a/app-text/gv/gv-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
-HOMEPAGE="https://www.gnu.org/software/gv/"
-SRC_URI="mirror://gnu/gv/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="xinerama"
-
-RDEPEND="app-text/ghostscript-gpl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXaw3d-1.6-r1[unicode]
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.7.3-libXaw3d-1.6.patch
-}
-
-src_configure() {
-	# Grab -DXAW_INTERNATIONALIZATION if needed
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags xaw3d)"
-
-	export ac_cv_lib_Xinerama_main=$(usex xinerama)
-	econf --enable-scrollbar-code
-}
-
-src_install() {
-	default
-	doicon "${FILESDIR}"/gv_icon.xpm
-	make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
-}
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
index 9ceecd9b1cb7..1bb2e687a1e2 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/gv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index a733ebd11e9f..c542aea228ff 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,3 +1,4 @@
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
+EBUILD highlight-3.57-r1.ebuild 2805 BLAKE2B 7f99799eb755da57d7540a9af08a183867ed558b343cb4013f2611937faf54a28f69cd10d03fa407334a5004ae3ca69c53a74ffdf2dda0ac385d7383e1fef80d SHA512 87a986128536dc5a9cf74ba08fedeeff4646dc7ad03ed3b02659c836ec5c7580fce5a6356a654582c5ca98c36fd911957f9ba31f6cdeb087bf42791c231717dd
 EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild
new file mode 100644
index 000000000000..079ca0895c88
--- /dev/null
+++ b/app-text/highlight/highlight-3.57-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt5"
+
+RDEPEND="
+	|| ( dev-lang/lua:0 dev-lang/lua:5.3 dev-lang/lua:5.2 dev-lang/lua:5.1 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+myhlopts=(
+	"CXX=$(tc-getCXX)"
+	"AR=$(tc-getAR)"
+	"LDFLAGS=${LDFLAGS}"
+	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
+	"DESTDIR=${D}"
+	"PREFIX=${EPREFIX}/usr"
+	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+	"conf_dir=${EPREFIX}/etc/highlight/"
+)
+
+src_prepare() {
+	default
+
+	# disable man page compression
+	sed -e "/GZIP/d" -i makefile || die
+
+	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		-i src/core/datadir.cpp || die
+
+	# Use the correct pkgconfig name for Lua
+	# Upstream codebase supports up to and including Lua 5.3!
+	if has_version 'dev-lang/lua:5.3'; then
+		LUAPKGCONFIG=lua5.3
+	elif has_version 'dev-lang/lua:5.2'; then
+		LUAPKGCONFIG=lua5.2
+	elif has_version 'dev-lang/lua:5.1'; then
+		LUAPKGCONFIG=lua5.1
+	elif has_version 'dev-lang/lua:0'; then
+		LUAPKGCONFIG=lua
+	else
+		die "Could not detect Lua version"
+	fi
+	einfo "Using pkg-config ${LUAPKGCONFIG}"
+	sed -r -i \
+		-e "/^LUA_.*pkg-config/s,\<lua\>,${LUAPKGCONFIG},g" \
+		"${S}"/extras/tcl/makefile \
+		"${S}"/extras/swig/makefile \
+		"${S}"/makefile \
+		"${S}"/src/makefile \
+		|| die "Failed to set Lua version"
+
+	# We set it via eqmake5, otherwise it forces clang...
+	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+		-i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/gui-qt > /dev/null || die
+		eqmake5 \
+			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile "${myhlopts[@]}"
+	if use qt5 ; then
+		pushd src/gui-qt > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	if use qt5; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi
+
+	if ! use examples ; then
+		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+	fi
+}
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index e582c67e5a89..aec0465f2d2a 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -2,6 +2,5 @@ AUX hunspell-1.7.0-CVE-2019-16707.patch 811 BLAKE2B 5adc2e6009a0381bbe6ea10a64fb
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
 AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
-EBUILD hunspell-1.7.0-r1.ebuild 2317 BLAKE2B 9557168fd901afe16a8402a682cf06cb97f6a6fd367caef811e31acc92f04f2b77a907d409e9d77b6389425eaad901a0084bb8d38d69935648da4bda9ae6ac47 SHA512 e2926c1860838c46fcddb6bb7c05462d6908fb188791ddcc677243394cf46902ed01198c53e137f7860c418c27c20ac59de21d4033fc624c168fdd60c104c69b
-EBUILD hunspell-1.7.0-r2.ebuild 2372 BLAKE2B b65efc24aa4e71a043e86a747a3d5ec257a6ad584129fb540aa2003c6d31656b6b3d96d0c53c47baec5538df71d187a2719e7699aa31c1435a1b65e209020ef2 SHA512 d40ad309340d7822093aff140760d189f6e54061951c32e5c168df83a2f4b42541cd8e485021c5a18efd2e0f13c2ae1defb426bc348c0d8069452a457b4c7d3c
+EBUILD hunspell-1.7.0-r2.ebuild 2365 BLAKE2B aee539d45a6edf6c85924ed8c2ee465951b2aea6480c8700bd541ac128cb204b431f153ac27273770148b2bfa710bfebf5db2d4772ea8b5629b95714c37d70fb SHA512 9e1687f50f4dbcb789e995e82a4451b90f947a90fdd9cc43b7c52369f37da7656ef24ba559b70afa5dd35fdfdeb92cadd826295c35ba95065d274bcd6c576f0f
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
deleted file mode 100644
index 77c6e414f32e..000000000000
--- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/hunspell"
-
-SLOT="0/$(ver_cut 1-2)"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND=""
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	AUTHORS ChangeLog NEWS THANKS license.hunspell
-	license.myspell README.md
-)
-
-PATCHES=(
-	# Upstream package creates some executables which names are too generic
-	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
-	# It modifies a Makefile.am file, hence eautoreconf.
-	"${FILESDIR}/${PN}-1.7.0-renameexes.patch"
-
-	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_with ncurses ui)
-		$(use_with readline readline)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	#342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
-	popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
index 209dab4e6da2..0caeb3c9f131 100644
--- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 2d5895202a13..09e92a967f6f 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,4 +1,4 @@
 DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
 EBUILD jabref-2.10-r2.ebuild 1818 BLAKE2B 9fd1b25bb773e29e924cefce7e7b85046f1c84c88727c8009785af90dfe65475454962f5e3c0b88d3788cc37ea674374500b8d14fd1163df06c498a407417479 SHA512 4c685bce3c6d9cf4dae811548d7f230647049c728669bbb5816ddf1de43c226efe1002d7e2d42cce7008a4aaaf920e5136913b1f0072d49953f808ce44e2e050
-EBUILD jabref-2.10-r4.ebuild 1844 BLAKE2B 7682bf48b6abed07a42dfa404c4b4be27d5d73d381e8738f35cca9a522e2f3554552ce73a5d471a9b3dbd9d8a23139ebe4423f487e334c3987cbbe90f78069ad SHA512 e246388881e6e8b1d3290ae7bbeedad21b0af60ee4647df53b953f2b390f6cb255e66b2ef9e5f8b042e552522f784e208fbc9e1b7b9ce9a5aa43f8d9c52303e3
+EBUILD jabref-2.10-r4.ebuild 1839 BLAKE2B 14f139884a63130ffdf59ee41f8640117ab925a39058c6ec80d515d7e8deb8379da387baa50023a08e218888811f1fb89ee9bb840cfdba2a0021b8a09da83f4e SHA512 53df22685ae2fe8a572f87ddb0bb1b953438bb05d2a8fe6ad1a64a97037348819309d55e3d532eea61fbba5c58470e732a68005fc5eaba435d90b55f89b0898f
 MISC metadata.xml 537 BLAKE2B 1aa32da69c977641a51f05b3e615d4cfb15d21912ab649b0db7f6a4b35daf5428225431533e97eca895253e4370dfd03baa60beaee4ee333a225df8942e715d4 SHA512 8478bf7312a365c4fce15051b0cedb465e92a274e215bcf989e744434ed93f568217f953cbaa07e9adfc5e620187d4ed4076d3201806bfe2df55ae8743bfaaa2
diff --git a/app-text/jabref/jabref-2.10-r4.ebuild b/app-text/jabref/jabref-2.10-r4.ebuild
index 3574c04c59cd..8ed45fb5a629 100644
--- a/app-text/jabref/jabref-2.10-r4.ebuild
+++ b/app-text/jabref/jabref-2.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 COMMON_DEP="
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
deleted file mode 100644
index 361ba202ad88..000000000000
--- a/app-text/jadetex/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 80jadetex.cnf 995 BLAKE2B 31086ca95c6731978292a728771347ca4d3994d49ded1398cb8d4762c43021baadf8bb3b804184a0842cfa76d33cbfef96ab670562dd660285d7e71342ee76ee SHA512 66c65dc72d27d751e0973623e948094bdca41b09714dab50c975e794d6de7a99cea71f6e4421d39dbde7827a2857cf398eded6c98d65b4cebcde0017d89d05a3
-AUX format.jadetex.cnf 170 BLAKE2B f6f923eb38263e054ef470f0e9bb8f4beae75a9ea5f5df380077e1661e22fed024e1f77f56f8419127bfb831b7409f486cd53bfbf2aa81bb80a2c47ec674cf2a SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b
-DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
-EBUILD jadetex-3.13-r9.ebuild 1643 BLAKE2B 7fafa9770bb9c14b1270668068d630693775d7d23d60cb661c0d4628a26969a4447fb41d8176ab674e3929c1aa08c5403336609f1ba17be7f5dff627a14c7bba SHA512 638e17d7eaec8231f48a68a5a71d5a4a2eae18f369f1580b75c818921def60e44a4707de78596374e35dfcd14ce2340f03f8cd5a5ee89b8dee54da4da43f5f50
-MISC metadata.xml 326 BLAKE2B 43480e556a9ce9c52fc46d18765664881cbb16ea08954b18d357df0a956d335815e9a0c3093504bd68a5b2249bee307ca05030fbe7fb4324beb8fdd7ff8b2e53 SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915
diff --git a/app-text/jadetex/files/80jadetex.cnf b/app-text/jadetex/files/80jadetex.cnf
deleted file mode 100644
index 0729f629d634..000000000000
--- a/app-text/jadetex/files/80jadetex.cnf
+++ /dev/null
@@ -1,37 +0,0 @@
-% -- jadetex configuration params added by texmf-update --
-% latex settings
-main_memory.latex = 1100000
-param_size.latex = 1500
-stack_size.latex = 1500
-hash_extra.latex = 15000
-string_vacancies.latex = 45000
-pool_free.latex = 47500
-nest_size.latex = 500
-save_size.latex = 5000
-pool_size.latex = 500000
-max_strings.latex = 55000
-font_mem_size.latex= 800000
-
-% jadetex & pdfjadetex
-main_memory.jadetex = 1500000
-param_size.jadetex = 1500
-stack_size.jadetex = 1500
-hash_extra.jadetex = 50000
-string_vacancies.jadetex = 45000
-pool_free.jadetex = 47500
-nest_size.jadetex = 500
-save_size.jadetex = 5000
-pool_size.jadetex = 500000
-max_strings.jadetex = 55000
-
-main_memory.pdfjadetex = 2500000
-param_size.pdfjadetex = 1500
-stack_size.pdfjadetex = 1500
-hash_extra.pdfjadetex = 50000
-string_vacancies.pdfjadetex = 45000
-pool_free.pdfjadetex = 47500
-nest_size.pdfjadetex = 500
-save_size.pdfjadetex = 5000
-pool_size.pdfjadetex = 500000
-max_strings.pdfjadetex = 55000
-% -- jadetex configuration ends here --
diff --git a/app-text/jadetex/files/format.jadetex.cnf b/app-text/jadetex/files/format.jadetex.cnf
deleted file mode 100644
index d88f7eb0bff8..000000000000
--- a/app-text/jadetex/files/format.jadetex.cnf
+++ /dev/null
@@ -1,3 +0,0 @@
-# JadeTeX
-jadetex		pdftex		language.dat	-translate-file=cp227.tcx \&latex jadetex.ini
-pdfjadetex	pdftex		language.dat	-translate-file=cp227.tcx \&pdflatex pdfjadetex.ini
diff --git a/app-text/jadetex/jadetex-3.13-r9.ebuild b/app-text/jadetex/jadetex-3.13-r9.ebuild
deleted file mode 100644
index 54e50576aae4..000000000000
--- a/app-text/jadetex/jadetex-3.13-r9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package texlive-common
-
-DESCRIPTION="TeX macros used by Jade TeX output"
-HOMEPAGE="http://jadetex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
-
-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"
-RESTRICT="test"
-
-DEPEND=">=app-text/openjade-1.3.1
-	dev-texlive/texlive-fontsrecommended
-	dev-texlive/texlive-plaingeneric"
-
-src_compile() {
-	fmt_call="$(has_version '>=app-text/texlive-core-2019' \
-		&& echo "fmtutil-user" || echo "fmtutil")"
-	VARTEXFONTS="${T}/fonts" emake
-	VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}" env -u TEXINPUTS \
-		$fmt_call --cnffile "${FILESDIR}/format.jadetex.cnf" --fmtdir "${S}/texmf-var/web2c" --all\
-				|| die "failed to build format"
-}
-
-src_install() {
-	# Runtime files
-	insinto /usr/share/texmf-site/tex/jadetex
-	doins dsssl.def jadetex.ltx jadetex.cfg {pdf,}jadetex.ini *.sty
-
-	insinto /var/lib/texmf
-	doins -r texmf-var
-
-	etexlinks "${FILESDIR}/format.jadetex.cnf"
-
-	# Doc/manpages
-	dodoc ChangeLog*
-	doman *.1
-	dodoc -r .
-
-	# Support for our latex setup
-	insinto /etc/texmf/texmf.d
-	doins "${FILESDIR}/80jadetex.cnf"
-	insinto /etc/texmf/fmtutil.d
-	doins "${FILESDIR}/format.jadetex.cnf"
-}
-
-pkg_postinst() {
-	etexmf-update
-	elog
-	elog "If jadetex fails with \"TeX capacity exceeded, sorry [save size=5000]\","
-	elog "increase save_size in /etc/texmf/texmf.d/80jadetex.cnf and."
-	elog "remerge jadetex. See bug #21501."
-	elog
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/app-text/jadetex/metadata.xml b/app-text/jadetex/metadata.xml
deleted file mode 100644
index 964ad3bf6d73..000000000000
--- a/app-text/jadetex/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jadetex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index 8a2f23d4caf2..44312ecb28ed 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,7 +1,9 @@
 AUX jo-1.1-version.patch 217 BLAKE2B 366b69d941f5f324de39e31de160e0a296dd65259a2051f4adcefde4b8253b514e44c0d4c52413379b33567d7a744a8beef0cc324bd098b7d017ec6318d2f5f2 SHA512 c70e5993069229143f75f2360bf7b4756a988f71d321a0f26c821d0258d523fc2c9d754692b498ece20ff452444ee817af609435160409f1ebe4033287ef89a3
 DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
 DIST jo-1.3.tar.gz 143425 BLAKE2B 32efaa84f64b0d3e82173a5121a30e13ce7fed991ec09f26400c90071e5e3cc5cc8af372550f4d9769cc338e852bf50497782c11ffd7d32a52d5769370742fbf SHA512 3c9480257d0ab9d9f19f1aaeb3a5b72e69caff6dcf87118bea8aca74a3b0864c0d17ed52bfc5550783c4636ee3a6acb8578f08316d976cea4f06af7096c12f02
+DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169
 EBUILD jo-1.1.ebuild 426 BLAKE2B 7752fa82f7f4f99ca1873eaa98f9a2f9612fe57548cc7791e81ffb15bced18061d1bf4d17367506dc6a6f860fd0fea2c314d240f9d6fbb84336d77f00d867a79 SHA512 eafeac07b4a04c94a03de806eabcf620685043815a4df4db89e06783533767e09c38aec38197c34ff86c854ce29ba6456b555b18a0df7373a35620dd3e34d893
-EBUILD jo-1.3.ebuild 482 BLAKE2B 5c70116b7537387cb64f0433609044b5ee296b5ec68f756e6025ae85d66648309cfb1bcd91fb299763eb6731714416f335e9bae121dde052972329907d9db7a4 SHA512 11336f4a9d07c484f45f106b4f9dcc3f5513e894d1f4b63d40bcb54384d8108758aa1d2daf694d4f6628b3ae9367287e95a12399df1c1aee872cfcf7284b8780
-EBUILD jo-99999.ebuild 499 BLAKE2B 0981dc4e2d1b9baec1033b5fe560e89be50d1dd76ef365ff108b635ced839d69ee3b25296263c4651f0ed8974cd28c7d8efa1694ea1fe7f52bc34bc01e8c31dd SHA512 2e20cda5b9d668024a0c121a235afb6e45441c37eb326006adf84bc8b74147900a66b1ca64ff7ab24f078b880086a5e6dc750acd1267e7b8fcdbf3fce96e043f
+EBUILD jo-1.3.ebuild 488 BLAKE2B e6fa094208c84a74e8f81715ab621b7323c37d13ba04433e64d7c78b1115b2ec80291df2c898e38b99ed998e01cf17096f21b5d610eabe050ebe7f88c875a2e9 SHA512 3c26934e8a5e3c8be1e16bdc530a5e014af4b2b2b80173d46940c8ff0ce6cb14c78f727d1230ad26fcf08e3e309a5c0f64c4162c7f961c1089b55dc747a6b55d
+EBUILD jo-1.4.ebuild 488 BLAKE2B e6fa094208c84a74e8f81715ab621b7323c37d13ba04433e64d7c78b1115b2ec80291df2c898e38b99ed998e01cf17096f21b5d610eabe050ebe7f88c875a2e9 SHA512 3c26934e8a5e3c8be1e16bdc530a5e014af4b2b2b80173d46940c8ff0ce6cb14c78f727d1230ad26fcf08e3e309a5c0f64c4162c7f961c1089b55dc747a6b55d
+EBUILD jo-99999.ebuild 505 BLAKE2B 87c67279bfd395e89ee8e9f2f26cc4bd12abfbf4955da369791b323da30dbc19646c73e19e7a13e6205ab59fac4d383cc41092ff6ba92f4ce6b0ab464c1e9555 SHA512 57988d8a84baab4b7551331ee546a60bd1a3ddb7b0e428d949dd815c53d311a37e6bc956267fc0c77a716ad769ae9c4fbd37dc067b567457dc1173031584f628
 MISC metadata.xml 288 BLAKE2B 8b66970135ed40287f00f96188b1679d936f9f58d59d2991aa36f2641e0a5ae48bdf3f36556be0b0296190a1c8bf59c88e6900de93e32c102b3adb880e524dcf SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb
diff --git a/app-text/jo/jo-1.3.ebuild b/app-text/jo/jo-1.3.ebuild
index d2d6974384b1..bf84777ca6d8 100644
--- a/app-text/jo/jo-1.3.ebuild
+++ b/app-text/jo/jo-1.3.ebuild
@@ -19,5 +19,5 @@ src_configure() {
 
 src_install() {
 	default
-	mv $(get_bashcompdir)/jo{.bash,} || die
+	mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
 }
diff --git a/app-text/jo/jo-1.4.ebuild b/app-text/jo/jo-1.4.ebuild
new file mode 100644
index 000000000000..bf84777ca6d8
--- /dev/null
+++ b/app-text/jo/jo-1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1
+
+DESCRIPTION="JSON output from a shell"
+HOMEPAGE="https://github.com/jpmens/jo"
+SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+	export bashcompdir=$(get_bashcompdir)
+	default
+}
+
+src_install() {
+	default
+	mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
+}
diff --git a/app-text/jo/jo-99999.ebuild b/app-text/jo/jo-99999.ebuild
index 06279f5b7cd7..098a68881de3 100644
--- a/app-text/jo/jo-99999.ebuild
+++ b/app-text/jo/jo-99999.ebuild
@@ -24,5 +24,5 @@ src_configure() {
 
 src_install() {
 	default
-	mv $(get_bashcompdir)/jo{.bash,} || die
+	mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
 }
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 123a5af2ed4a..2cc3aef4d590 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,5 +1,5 @@
 AUX kchmviewer-7.7-force-qtwebkit.patch 960 BLAKE2B da573cf4eb4a2668b7d37356df270f002cda5f1ca54055fbed36dc9f95bd8373934d8befa2b635f23074e0ce69cb9707cfd41cfab223c6254cb68c4fdade8a3b SHA512 bb93256211bc7390acb52b142da5cd12dc4c8220fdf745c6b5dcc93bfba8880272ad0134c868409afe5fe6ea3bcae47cebe1aaab13cdead6556bf15bd838b549
 AUX kchmviewer-7.7-underlinking.patch 300 BLAKE2B 02d86fad61fe727e5bebdd8b340bd9a70ccde78d04ef65b2dcbc517a76304b5788412d16ba727bc7575087a9c0229c814550c25f80edba6ca6332a9dfd366f8d SHA512 004056e7ba232a80f76fe7a8955a2ef621d8148f7c594c78ae3136dca7ca8d3c39e8ab3081f75b3181bef3c9a720601cc7e65ba371b95853faa4bf845e80d0ec
 DIST kchmviewer-7.7.tar.gz 345952 BLAKE2B 7c42f3d05c7a46163d4e63af271ba73932dc2f7eb20e4e0c2c5dc2b335f488593288e4dd5b0a03b75ee7a008836a16b86ec8f47aa6d076b6351d48290a23bdef SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070
-EBUILD kchmviewer-7.7-r1.ebuild 859 BLAKE2B b4427a44334b82f0e6af50b499199e55e50aecf2b0d1cc81adc85c97fe2c84853a04e09c5b711328e0caee83244965ff77ab84b80ac49bf0b9d463a952692d2c SHA512 bb620cad030ced2ea5584c175212c9901fd219d32c93a53c210ba086f7dba5b8b8ab0e7ffc04f6cdef0046ea60066d8af9dabf5c3f5de288de21f6deecb03a31
+EBUILD kchmviewer-7.7-r1.ebuild 853 BLAKE2B a3446cc96aff7a0ac09e42ac9cead41dc91420e3f18a86b07f7bf709c5b997014b2662ad6006d7f044cecd21cf74ba226f567e0303ffd2450ee22ee4a413d80c SHA512 25fbacdbb184f424140995c2dbdea683be9f35a8cb79c43874df80a59ae7ad399e9028f0ec7c99e9573563e8357016c98dbfe4c36f30ebb0e609ffad878d6f04
 MISC metadata.xml 982 BLAKE2B ed5f9ea7ed6aa8a2b6d743ad2944bbfbe46638f3c0e2b154b8abe250d2b7cf0a56ad48cb4df994fe2c1df1cde7c7a612f3c681107d0b5c1f8652072e15ad5cc8 SHA512 746f5a51bc2e4373f41a24f71e2f19647f70a53439a1f40933f32405b3a9c2fdec6130bbe2ecd2cee0b1901f87a5bae12cfa782ab44a37f5ecce61727a16ae91
diff --git a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
index f38835061d77..7864d2f6a305 100644
--- a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
+++ b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop qmake-utils xdg-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Feature rich chm file viewer, based on Qt"
 HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
diff --git a/app-text/mftrace/Manifest b/app-text/mftrace/Manifest
deleted file mode 100644
index c279b603778b..000000000000
--- a/app-text/mftrace/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mftrace-1.2.18.tar.gz 79112 BLAKE2B 8c3be27985766690782338dec33955cbac80e7d8f4334ed7b62d3c52d7ea5784c14b12c87afd13099cdae226033ca3324b9e7c6e876badb75a8fb634f68a75f6 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db
-DIST mftrace-1.2.19.tar.gz 78907 BLAKE2B 894ec3c428020cad8f2e408e141b58d7f1e0969c59e65ccb5379e346d735845f8922be4e046ca8fbd18cfd7c3b8e2179ed7af4756ddb4416b6ad42bdbff27f09 SHA512 410739ced17c5e5bb82c286b6b935c9d8d46299f9c04f0ba4c97df9ada5d7e9c778c720fb8a2377eb6df3c629a6e7264836fe7675733cf60197a817477dc49ee
-EBUILD mftrace-1.2.18-r3.ebuild 893 BLAKE2B 313aa235ff20995f1ae82ed72e74921bb7e13af3c08641026eeeadaa88ef68992a03f5f95c777e46f70e252f6797ded27d829d6cb152bd9a8c1009c0b37f8232 SHA512 3afd8d942567db44841c674875ad3c6a464b0c7ff7106a51c468df89d986be6ac55a9c41aad9d6907fbc08d926fb6bb54d662c8fa7c96c74dd4d214d7452093b
-EBUILD mftrace-1.2.19-r1.ebuild 896 BLAKE2B f5e9b9017ac2fb34ee78830db58965cc45c3aeb6b389fcddb253722a8f4cf8d5a078d0791f172ebf2c91d893c419596e0a9a48668d0f3314457c178f5fc2030a SHA512 d269a62b586f0bff5f31c6b40d9ccb5868f594c5ae8ccc6a86e6df6a50359b253a5b8253ffdae92dc20a8f34c95d2e313d3276c82c2621dcca6a6651f0fc45c9
-MISC metadata.xml 340 BLAKE2B c05678e707d8559ee9e192a80e8911ed8caf3279f8b240e2554bf2e60a6f10c0c1597d12ee3d236fdcf4e9b10aea677972c1a443eabf507d37f6adf9cc7fbcff SHA512 f8317a47d8515f79517a74e966aa31a05c9900a5a4aa52d9aac86b92d15553d03e6d82051312eb689d62381be05ab0f2fe9234bd520e86faf8226aba0cc9ba21
diff --git a/app-text/mftrace/metadata.xml b/app-text/mftrace/metadata.xml
deleted file mode 100644
index db4b1471479e..000000000000
--- a/app-text/mftrace/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/mftrace/mftrace-1.2.18-r3.ebuild b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
deleted file mode 100644
index eb25b659a5f2..000000000000
--- a/app-text/mftrace/mftrace-1.2.18-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
-HOMEPAGE="http://lilypond.org/mftrace/"
-SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc x86"
-# SLOT 1 was used in pktrace ebuild
-SLOT="1"
-IUSE="test truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/t1utils-1.25
-	media-gfx/potrace
-	truetype? ( media-gfx/fontforge )
-	virtual/latex-base
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( media-gfx/fontforge )"
-
-src_configure() {
-	tc-export CC
-	econf \
-		--datadir="$(python_get_sitedir)"
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS}"
-}
-
-src_install() {
-	default
-	python_optimize
-}
diff --git a/app-text/mftrace/mftrace-1.2.19-r1.ebuild b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
deleted file mode 100644
index 2ad587595348..000000000000
--- a/app-text/mftrace/mftrace-1.2.19-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
-HOMEPAGE="http://lilypond.org/mftrace/"
-SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-# SLOT 1 was used in pktrace ebuild
-SLOT="1"
-IUSE="test truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/t1utils-1.25
-	media-gfx/potrace
-	truetype? ( media-gfx/fontforge )
-	virtual/latex-base
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( media-gfx/fontforge )"
-
-src_configure() {
-	tc-export CC
-	econf \
-		--datadir="$(python_get_sitedir)"
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS}"
-}
-
-src_install() {
-	default
-	python_optimize
-}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 2d6d93558c03..2eee55978e35 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -4,6 +4,9 @@ AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993
 AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab
 AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
 AUX mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6
+AUX mupdf-1.17.0-cross-fixes.patch 4554 BLAKE2B 7956aea05180adc50805f56c000b0704cbaf1eb538889f1569e9f536984fb11581c36956edabb704f519285513aad01cbe0ba5a107838996937c2efa398a9c07 SHA512 0fc71632744a5fe15cace6c7b185b108e78b6676c03f204ba52e90826e7be17039b427a50697004798d51ea357828035e897d2d3ce91da95ea0f2a1a0c668fba
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
+DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
 EBUILD mupdf-1.16.1.ebuild 3482 BLAKE2B 2f8f19e665bb7f60a55f08fd841a05e2f5388831d1eeb7bf903bc2014d2723c93bc363fb4930295d54b932e42ec0ef05dc966e5b64cc1c9af0e89727251d84c1 SHA512 90b0634cd1ee1c29c6dc91e563c26f24736429c7be164855df4ece40967ca6b5e1af2d10e5743bcb83e05aed607ffb771115960bb7c299696ec796fb4704e211
+EBUILD mupdf-1.17.0.ebuild 4380 BLAKE2B d0eafbaef397afb3369730800a075c50210c5e057bd598faa59eb40cd52a5258016a61664ad2b6e1787922412a49934dcd2bf288a28f20e7af95f6cf58b0f8a7 SHA512 474615ea48c4cb505b48cb2b59c2ca7456a4da7cf5b2610f9e3dd977a88161a6aaf64946f7c0e63faaf7c5bc1609244a2db4ff429a53a4ff07babd7212d07f37
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch
new file mode 100644
index 000000000000..ae14f9bb5e49
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch
@@ -0,0 +1,103 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makefile
++++ b/Makefile
+@@ -134,6 +134,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+ 
+ HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
+ 
++$(HEXDUMP_EXE): scripts/hexdump.c
++	$(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
++
+ FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
+ FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
+ FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
+--- a/Makerules
++++ b/Makerules
+@@ -15,6 +15,9 @@ OS := $(OS:MSYS%=MINGW)
+ OS := $(OS:Windows_NT=MINGW)
+ OS := $(OS:Darwin=MACOS)
+ 
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
+   # clang does not support these in combination with -fembed-bitcode
+   CFLAGS += -ffunction-sections -fdata-sections
+@@ -101,35 +104,35 @@ else ifeq ($(OS),MACOS)
+ else ifeq ($(OS),Linux)
+   HAVE_OBJCOPY := yes
+ 
+-  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+-	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+-	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
++  ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
++	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
++	SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
+   endif
+-  ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
+-	SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+-	SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++  ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
++	SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
++	SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
+   endif
+-  ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
+-	SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
+-	SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
++  ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
++	SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
++	SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
+   endif
+-  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
+-	SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+-	SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++  ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
++	SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
++	SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
+   endif
+-  ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
+-	SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+-	SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
++  ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
++	SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
++	SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
+   endif
+-  ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
+-	SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
+-	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
++  ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
++	SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
++	SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
+   endif
+ 
+-  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++  HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
+   ifeq ($(HAVE_SYS_CURL),yes)
+-	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+-	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++	SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
++	SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
+   endif
+ 
+   HAVE_GLUT := yes
+@@ -140,14 +143,14 @@ else ifeq ($(OS),Linux)
+ 
+   HAVE_X11 := not-unless-portage-tells-me
+   ifeq ($(HAVE_X11),yes)
+-	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+-	X11_LIBS := $(shell pkg-config --libs x11 xext)
++	X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
++	X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
+   endif
+ 
+   HAVE_LIBCRYPTO := not-unless-portage-tells-me
+   ifeq ($(HAVE_LIBCRYPTO),yes)
+-	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+-	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++	LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
++	LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
+   endif
+ 
+   HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild b/app-text/mupdf/mupdf-1.17.0.ebuild
new file mode 100644
index 000000000000..73a2ee992231
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.17.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+S="${WORKDIR}/${P}-source"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +javascript libressl opengl ssl static-libs"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=dev-lang/mujs-1.0.7:=[static-libs?]
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?,truetype]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	virtual/jpeg[static-libs?]
+	opengl? ( >=media-libs/freeglut-3.0.0:= )
+	ssl? (
+		libressl? ( >=dev-libs/libressl-3.2.0:0=[static-libs?] )
+		!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+	)
+	X? (
+		x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?]
+	)"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="opengl? ( !static-libs )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.15-Makefile.patch
+	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+	"${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch
+	# General cross fixes from Debian (refreshed)
+	"${FILESDIR}"/${PN}-1.17.0-cross-fixes.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	use hppa && append-cflags -ffunction-sections
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h || die
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+
+	# Bundled libs
+	# * General
+	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+	# recommendations. It does not mean "always use system libs".
+	# See [0] below for what it means in a specific version.
+	#
+	# * freeglut
+	# We don't use system's freeglut because upstream has a special modified
+	# version of it that gives mupdf clipboard support. See bug #653298
+	#
+	# * mujs
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We then went back to using the bundled version of it.
+	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+	# when bumping and check!
+	# See bug #685244
+	#
+	# * lmms2
+	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+	# It is therefore not appropriate for us to unbundle it at this time.
+	#
+	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+
+	emake \
+		GENTOO_PV=${PV} \
+		HAVE_GLUT=$(usex opengl) \
+		HAVE_LIBCRYPTO=$(usex ssl) \
+		HAVE_X11=$(usex X) \
+		USE_SYSTEM_LIBS=yes \
+		USE_SYSTEM_MUJS=yes \
+		USE_SYSTEM_GLUT=no \
+		HAVE_OBJCOPY=no \
+		"$@"
+}
+
+src_compile() {
+	_emake XCFLAGS="-fpic"
+
+	use static-libs && \
+		_emake build/debug/lib${PN}.a
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1 || die
+	fi
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a build/debug/lib${PN}.a
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+
+	# Respect libdir (bug #734898)
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 62c1c5d817b0..3c80bbe2b259 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,15 +1,3 @@
-AUX pandoc-1.15.0.6-no-https.patch 407 BLAKE2B f884a11a29b111f2b7ba278aa3aa3b5a8a5b9ad0ee47b1881c4d163ca2266bcb1d311da81d66be93cb379704e6b7b365b335f8d6248626b40fd048a796db2b78 SHA512 3c8901649fdedd56bd6ae65af5667c563a04aff8f282194cfb70ae343408d82a6842e9e2e46be73f1938db889773fe946ae8da46bca45acbc882f5eabbf747e1
-DIST pandoc-1.12.4.2.tar.gz 1048263 BLAKE2B 0caef0e612dc45be1a4fec59143ea4640229fdf10f55074afb0e986c3384a0a9c71936b2ee4a981fa0a095fcf79b2c946eb1c8798e43693c8fcf9c886855ba9e SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743
-DIST pandoc-1.13.2.1.tar.gz 1999641 BLAKE2B bbf0f4bdb42a86a72995e3b3bcae7c3b452d6efa5bc68011c1eb87f2e0b024ef6a0df09011a8428f0ff67d6bbc8b53612baafc1312e8557e1c1fea46c4b32391 SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d
-DIST pandoc-1.14.0.4.tar.gz 2052114 BLAKE2B 12de5d3ab457718708f3181e78879b511c90ebbdb1c8c3477f45e277ce88b4f8c37d93fbf0040f287675010010f7cfe2ce9f10b206e8094683b8b781ebaa9718 SHA512 57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443
-DIST pandoc-1.15.0.6.tar.gz 2049870 BLAKE2B d1495abd3451ec6e14fa13ca022051813bf736b9c15ff6106987c00bd53672fe027ad87d43d81faa15d50694fa1735a5ec31472738ff2b9a496e78d27c7656c9 SHA512 4c9bfea7440d6bdb72fb10a9a99b69c018db0ef0f1028d86b032e6c4df215c86566b93fd55c5cba7772d713d4ce3f764891de079dfa24de8ca21f818b7729211
-DIST pandoc-1.18.tar.gz 2711663 BLAKE2B 3c324917285eb0bff314ff04add75aa6dfa381d1bb8dcc99078284be8c93cb8f5f9bacd9e557be1f07b2e6a4137b74d10e769b42e08f27bdfa0c6bd71aca4b12 SHA512 52bc68e9586366433e522a867946adf2e03219dfa4ca63cd6ff318ebb251f77ab16aa18f0350605fa31f8e085bb6cac9055f9661a0ef3cb5693faba9e124d049
-DIST pandoc-1.19.2.1.tar.gz 2755101 BLAKE2B 1314ebe4084dd39521fed89c1d14b8365f2bfb40c6f8ff581ab6b2566bf5e5ef43c4014e383c2e17ac10bc66cbb159ae60a718d399873084b68c7fcd5fb90f2b SHA512 bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9
-EBUILD pandoc-1.12.4.2-r1.ebuild 4142 BLAKE2B aece6deed0d32ab7a30fce9a80bb1b1649054230fa171103c25744d857cfb89d3ce79e017c0cf36dbfc6be362f6727c9ec4b7d4e09ed3d219259899a737daf1b SHA512 33da73a4d5a4bebf453475f97da67927c80671178ba1d79b90f0198719c0feb57b64a1528eec8ef64a21064e412143dd41429a99b87ea9a5393392e547f69800
-EBUILD pandoc-1.13.2.1.ebuild 5034 BLAKE2B c68c245aec5243374c433fe7c6901146e73dbf02e8b13e4d27e01abe92386abe7403adbacd844f35711ae26525eaa7b404c2a3a19239b1f60eda8141170695d4 SHA512 26ca2918ce5c27dfc341dd05b03be05a1a9ed2e8cd1c512d810969041006436d2bc58001d3c2e3bafd9b9b3ac0b9095ab779442342022b5d8ac713ef83ee2062
-EBUILD pandoc-1.14.0.4.ebuild 5333 BLAKE2B 6d76d063b8212c5699f1423ec12487a5cdfded00659797005b4193c9fca1645cc7cbba60c1dfeb6b57062a86f33e9faeed7f559caa726b2bab8ea7c98a8f383e SHA512 98c21b76c045b8a4dad6f583fef63f6ed9a66a20534fdbea4fa14eeebcf305b56929cbb8a827ad7ab49327564c52f4671d05692ded71a80b6201061c009b5563
-EBUILD pandoc-1.15.0.6.ebuild 4920 BLAKE2B 7976bae8f35cbff0ee64cd466e1c3ae0c592a3f9b9426b4e8c156bda181d75c2f36d52f83d6c55379c160e650f664288d30ca4e238a8f0d74416ca4c37cff275 SHA512 d3caed0c908d3333dbfbde80a5be8f32af62d6410d479dee6dd0d82e5fe20ff733a511c2d0f5a57d3efe721189b7af2b674aeca9be0617125f3589a138218917
-EBUILD pandoc-1.18.ebuild 4830 BLAKE2B b0c0c5fbf0df87840f4442d5b4c5a1bfa2d23c3aac4f82588b4d3710aefaf8875651ae47d51e24f6f6ed67f94ed56fb9f42a56b1fb87da6007cb94076097fb2a SHA512 ac324508b6655d446a70d7fcbe28aaa4c1aa3aaf9c8382ed6fe6185c24b94d32eeaf5f365c74b569ffa1e2abae1541892fee32b6eae711295b02ae987a20a25a
-EBUILD pandoc-1.19.2.1-r1.ebuild 4908 BLAKE2B e55010ee0388eb10bbbd49e6b197a40c2d7e09690867a330dd19c3db38b59c858ad5d95db46d33404045b1691054520841b532aa202c645ae3f002d9d28191eb SHA512 e8fbd73e60351c2429fabafa7758b3a5940c3876317fa8f00312706ad04efbd86dfc8fbb73811fa581a0ba11eb10ba46f644a10c347627c89cad4bb724e1c7e9
-EBUILD pandoc-1.19.2.1.ebuild 4780 BLAKE2B 4a969419563723a4d86d4faecd2035dd48d5bc1309861b7a5bf47384d4942800748e26e5fbe116a4cd6510609df897b4b04b65d187adf05715e678c85e9f805c SHA512 8da769f19eb43f0b5fead89f4ef42fc7d8bfb90fae9f056eccfa86cdf1fb933230c8954a0895db101861ae965b450505c88ab4eb2a55730fa3fc10b185231a60
-MISC metadata.xml 1284 BLAKE2B 0ac01c07148aa682d4e6bd074b246d2578a816c76d6110ba3a9506e051b5ef2254f98e3faa8399c5f51200af26155dbabb6d08987bba32dd27f863f7c8183c15 SHA512 ba9a2c3897e5b645c0faa2a1a2f918cf5c30e3cace81343b01de73b25c26c343d95d7a09c50d56bf2aaa18a0a39318a506131e6bcdd7a48ab32197f3ef68be2a
+DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
+EBUILD pandoc-2.9.2.1.ebuild 6088 BLAKE2B 156eb7fda9f1824886d8d484db802dd645601abe0514fadc21e359ee0f8bb02f4b0ad7ba1c1d77d7e662f9fdda45de16b91ab9f756d383c5e95b2f48811132c5 SHA512 a600bad2ecb5b8b497cc1041685a1b4c98d20cfe9347cec12e5679d197dbcb5b70aa70a42e03f4cd48252713b3a669475bc0d82d076afe3454b9f2e00c5e5e59
+MISC metadata.xml 941 BLAKE2B 04e284ba78b78c6a88999705ce10650fbe854fd5154bc197b938de1e7b12689382c0c19b04c522366fb51c50f7f0b03d7cdb875ee6840816613bfc96f7d1d7c6 SHA512 2cb5cdae868ec8345655e18303a9fe1bae9c4eef4ee2b2da3f302b2e520af70095f06f78cbf0de1cbed524ddccb43742a73a5ce0e3710876ce83d25f4f19f77f
diff --git a/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch b/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
deleted file mode 100644
index 7e0f4d375a71..000000000000
--- a/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
-index ef9f66a..50b0ec4 100644
---- a/src/Text/Pandoc/Shared.hs
-+++ b/src/Text/Pandoc/Shared.hs
-@@ -143,2 +143,3 @@ import Paths_pandoc (getDataFileName)
- #endif
-+import Codec.Archive.Zip
- #ifdef HTTP_CLIENT
-@@ -152,3 +153,2 @@ import Network.HTTP.Types.Header ( hContentType)
- import Network (withSocketsDo)
--import Codec.Archive.Zip
- #else
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index 837984f412b5..4394f8602323 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -16,11 +16,7 @@
 	</longdescription>
 	<use>
 		<flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
-		<flag name="http-conduit">Enable downloading of resources over https.</flag>
+		<flag name="optimize">Enable -O1 optimizations (requires ~16GiB memory)</flag>
 		<flag name="trypandoc">Build trypandoc cgi executable.</flag>
-		<flag name="https">Enable support for downloading of resources over https.</flag>
-		<flag name="make-pandoc-man-pages">Build program to regenerate pandoc man pages from README.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-		<flag name="weigh-pandoc">Build weigh-pandoc to measure memory usage.</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
deleted file mode 100644
index 87ca53e3060d..000000000000
--- a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +http-conduit"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	embed-data-files? ( dev-haskell/hsb2hs )
-	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/highlighting-kate-0.5.8 <dev-haskell/highlighting-kate-0.6
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/syb-0.1 <dev-haskell/syb-0.5
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/text-0.11 <dev-haskell/text-1.2 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'scientific >= 0.2 && < 0.3' 'scientific >= 0.2 && < 0.4' \
-		'attoparsec >= 0.10 && < 0.12' 'attoparsec >= 0.10 && < 0.13'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag http-conduit http-conduit)
-}
diff --git a/app-text/pandoc/pandoc-1.13.2.1.ebuild b/app-text/pandoc/pandoc-1.13.2.1.ebuild
deleted file mode 100644
index 334780d77031..000000000000
--- a/app-text/pandoc/pandoc-1.13.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +https make-pandoc-man-pages +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/highlighting-kate-0.5.11.1:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	embed-data-files? ( dev-haskell/hsb2hs )
-	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4:2
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4' \
-		'aeson >= 0.7 && < 0.9'  'aeson >= 0.7' \
-		'aeson >= 0.7.0.5 && < 0.9' 'aeson >= 0.7.0.5' \
-		'highlighting-kate >= 0.5.11.1 && < 0.6' 'highlighting-kate >= 0.5.11.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag make-pandoc-man-pages make-pandoc-man-pages) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	doman man/man1/pandoc.1
-	doman man/man5/pandoc_markdown.5
-}
diff --git a/app-text/pandoc/pandoc-1.14.0.4.ebuild b/app-text/pandoc/pandoc-1.14.0.4.ebuild
deleted file mode 100644
index 85ab78a926c1..000000000000
--- a/app-text/pandoc/pandoc-1.14.0.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +https make-pandoc-man-pages +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/cmark-0.3.3:=[profile?] <dev-haskell/cmark-0.4:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?] <dev-haskell/css-text-0.3:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	if ! use make-pandoc-man-pages; then
-		sed -e '/Executable make-pandoc-man-pages/,/Buildable:   True/d' \
-			-i "${S}/${PN}.cabal" \
-				|| die "Could not disable build of Executable make-pandoc-man-pages in ${S}/${PN}.cabal"
-		sed -e '/, postBuild = /,/makeManPages args bf pkgdescr lbi/d' \
-			-i "${S}/Setup.hs" \
-				|| die "Could not disable build of Executable make-pandoc-man-pages in ${S}/Setup.hs"
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.15.0.6.ebuild b/app-text/pandoc/pandoc-1.15.0.6.ebuild
deleted file mode 100644
index a483adcb7e23..000000000000
--- a/app-text/pandoc/pandoc-1.15.0.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://pandoc.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +https +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/cmark-0.4.0.1:=[profile?] <dev-haskell/cmark-0.5:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-https.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	doman man/pandoc.1
-}
diff --git a/app-text/pandoc/pandoc-1.18.ebuild b/app-text/pandoc/pandoc-1.18.ebuild
deleted file mode 100644
index a617c37202e0..000000000000
--- a/app-text/pandoc/pandoc-1.18.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://pandoc.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +https +network-uri trypandoc"
-
-RESTRICT=test # fails to load dynamic libraries
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	>=dev-haskell/highlighting-kate-0.6.2:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.8.6.5:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
-			>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory >= 1 && < 1.3' 'directory >= 1' \
-		'directory >= 1.2 && < 1.3' 'directory >= 1.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
deleted file mode 100644
index a3e82072acbb..000000000000
--- a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://pandoc.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +https +network-uri trypandoc weigh-pandoc"
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/skylighting-0.1.1.4:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
-			>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-	weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'skylighting >= 0.1.1.4 && < 0.2' 'skylighting >= 0.1.1.4' \
-		'skylighting >= 0.1.1.3 && < 0.2' 'skylighting >= 0.1.1.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc) \
-		$(cabal_flag weigh-pandoc weigh-pandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.19.2.1.ebuild b/app-text/pandoc/pandoc-1.19.2.1.ebuild
deleted file mode 100644
index 2a4bbf6d04b9..000000000000
--- a/app-text/pandoc/pandoc-1.19.2.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://pandoc.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +https +network-uri trypandoc weigh-pandoc"
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/skylighting-0.1.1.4:=[profile?] <dev-haskell/skylighting-0.2:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
-			>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-	weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc) \
-		$(cabal_flag weigh-pandoc weigh-pandoc)
-}
diff --git a/app-text/pandoc/pandoc-2.9.2.1.ebuild b/app-text/pandoc/pandoc-2.9.2.1.ebuild
new file mode 100644
index 000000000000..878536e561c9
--- /dev/null
+++ b/app-text/pandoc/pandoc-2.9.2.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="https://pandoc.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed-data-files optimize static trypandoc"
+# test failure: error while loading shared libraries:
+# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
+# cannot open shared object file: No such file or directory
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base-compat-0.9:=[profile?]
+	>=dev-haskell/base-noprelude-4.9:=[profile?] <dev-haskell/base-noprelude-5:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
+	>=dev-haskell/doctemplates-0.8:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?]
+	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
+	>=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
+	>=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?]
+	>=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
+	>=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?]
+	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
+	>=dev-haskell/jira-wiki-markup-1.1.3:=[profile?] <dev-haskell/jira-wiki-markup-1.2:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/skylighting-0.8.3.2:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
+	>=dev-haskell/skylighting-core-0.8.3.2:=[profile?] <dev-haskell/skylighting-core-0.9:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-haskell/texmath-0.12.0.1:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
+	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
+	>=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0
+	test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.3
+		>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_prepare() {
+	default
+	# optimisations require ~16GB of memory on ghc-8.8.3
+	use optimize || HCFLAGS+=' -O0'
+	cabal_chdeps \
+		'haddock-library >= 1.8 && < 1.9' 'haddock-library >= 1.7'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed-data-files embed_data_files) \
+		$(cabal_flag static static) \
+		$(cabal_flag trypandoc trypandoc)
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	doman "${S}/man/${PN}.1"
+}
diff --git a/app-text/passivetex/Manifest b/app-text/passivetex/Manifest
deleted file mode 100644
index d7a550a6a20b..000000000000
--- a/app-text/passivetex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST passivetex-1.25.zip 1190258 BLAKE2B bc82a0414c5df9b5619b099899ac3970943672fc3b76fa60549ba36dd60861b591c62174f1f55b58b0f51458bc961ce47fee9b991795e2d321daf3ae4b328e9d SHA512 083ba4fab9fee327ed3fef5bdc48b415138951432dcb53b1478d1ba16a92bebc1cfc4b8590e2aa647a32c7658124f2aca8160230176c623bbf531e996c43622b
-EBUILD passivetex-1.25-r1.ebuild 767 BLAKE2B eac87fa74905e696981d533f34b3b04d18d051315595bc0df3df37cca14cf5bf7ab7053eb836f989d86c8d0bdf84fb09a63b04f9232e0b6ae50d47654c7627de SHA512 2747418ffbdf16c9dd62d3aa7b5ce9a33eb317e0101b1e5fbe9ddd0a4373e7b8f21b2797562cc747662d9d580a43aba6491d59e27bebdebdba08cdcd3e483b11
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/passivetex/metadata.xml b/app-text/passivetex/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-text/passivetex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/passivetex/passivetex-1.25-r1.ebuild b/app-text/passivetex/passivetex-1.25-r1.ebuild
deleted file mode 100644
index 209a1b5cd180..000000000000
--- a/app-text/passivetex/passivetex-1.25-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="A namespace-aware XML parser written in Tex"
-HOMEPAGE="http://www.tei-c.org.uk/Software/passivetex/"
-# Taken from: http://www.tei-c.org.uk/Software/passivetex/${PN}.zip
-SRC_URI="mirror://gentoo/${P}.zip"
-S=${WORKDIR}/${PN}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/latex-base
-	>=dev-tex/xmltex-1.9"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-TEXMF=/usr/share/texmf-site
-
-src_install() {
-	insinto ${TEXMF}/tex/xmltex/passivetex
-	doins *.sty *.xmt
-
-	dodoc README.passivetex index.{html,xml}
-}
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 8fe130f38e25..247496ab72f8 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,5 +1,7 @@
 DIST pdfarranger-1.3.1.tar.gz 120834 BLAKE2B 5f429d479d130ec06e795c6cedc2aefa75f89b971b556901fc0bfba02038e36c4fd7b4233b5ce6d0dfb6252862176dc7b07192ab43e458090970a25648bb946e SHA512 6ac13447410477e9125da26adbf7123f7f5ffa25814a4c254247a5ff2d07eba6af0557eafb60b4c68ac5987c8e9e7888da21296fb6a74d31a3d0d763b1077918
 DIST pdfarranger-1.5.3.tar.gz 221208 BLAKE2B 2669a3be00d771542ba2449696de74d633fe31c1ab84ff368ea95ffd6e6f6bdd4d5bbb2b0b2cf1c2ddcddcba9e774f1870ee3c85735f54c832894e2093392042 SHA512 17960786b2197e4035b2c224cbeb8e6d14ca7690920a4366d3dcad8b19f890b52d5e95277372fe3011f3476a5be0c4f253eb4d3ee3b6a8df74e20468be124d8b
+DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390
 EBUILD pdfarranger-1.3.1.ebuild 732 BLAKE2B d2f04362a6461b10b875fdc00e86e1f71534eefc87c5cea5f9b6ae7e3ea877ec07dd4debb1aaf39c13dd00f553cf09782b35d2a8d07e2159ce0cbd2d8424b6a6 SHA512 97d65731e892b00f5c3e22756c9ca02548982a7a88e5434d7abf76018deba2671d2b378cf9b5c0e0d5179516f6e88c8f8c7e5aa7428ad8c648e13f97f8a10074
 EBUILD pdfarranger-1.5.3-r1.ebuild 1077 BLAKE2B 283fd218247e772d2d33366b0b54f2a2d541c479f145ad34480a6eaf6f74cf00090eb69697868afce44914dae499e379fe123a980610c560c4e73acc6b5ec831 SHA512 f1f3c911f98f8032892d80c09277e0121f0f3631c0c3e599bd8e61ee2713d6ff4d165727c52936d420caf17da34736696080ba23b5e497c4946af94f90b4e115
+EBUILD pdfarranger-1.6.2.ebuild 1077 BLAKE2B 283fd218247e772d2d33366b0b54f2a2d541c479f145ad34480a6eaf6f74cf00090eb69697868afce44914dae499e379fe123a980610c560c4e73acc6b5ec831 SHA512 f1f3c911f98f8032892d80c09277e0121f0f3631c0c3e599bd8e61ee2713d6ff4d165727c52936d420caf17da34736696080ba23b5e497c4946af94f90b4e115
 MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
new file mode 100644
index 000000000000..ca5563883b52
--- /dev/null
+++ b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
+HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
+SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	app-text/poppler[introspection,cairo]"
+DEPEND="${RDEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	insinto /usr/share/icons
+	doins -r data/icons/hicolor
+}
+
+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/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index 48b79b5d3a01..dd1e2223bb89 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -4,4 +4,4 @@ DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746
 EBUILD pdfgrep-1.4.1-r1.ebuild 631 BLAKE2B f98ddc8be42c8534972df535a2e27bd433278382cc854d23fc34adf75b98cd07eecc22d654e79bfe1149e4fdc1395a3186a815f3947625ae8dbe8335088f28c1 SHA512 3dd3e6515d913d44b749d0491d6120e6ee32a3f3ea458d8d3515c1d6ec0e99719d5dc85005ec4951158dff230cae1cfaf751dfde131324cd079f58bd2a73b7fe
 EBUILD pdfgrep-2.0.1.ebuild 701 BLAKE2B 8b877e130a6d58635312771cb09778454d25fbb87cb2686deb92adbb981b9ecfb5706fe842a6bd8477e67d098d07c4e941809b94f7e92a29f456a0934c843844 SHA512 c1c78707a9cf2589800d275b50dc0a8a97a7f5477c2f1f0773312801aad082c2af4752380d5463aec6b136ead175d4f42cd75d9632da8bebe557c4776b03a879
 EBUILD pdfgrep-2.1.2.ebuild 761 BLAKE2B c6879de906a6b25f22eaa4e24566df386ea4b9545da164084a61465664d82559d24fe5b9ef860902ea6932b05f1580888a8704a7553550f34643b857e10f66ef SHA512 48865871bd3e0f115e7acaf64218703341ef162e637609adbe138f70a73ab32e8d30b46bfb433e447a79ba648a3ad5cdf5b9596d7aebd431fd29971905b6ad7c
-MISC metadata.xml 568 BLAKE2B 0ceff9c7c8c2bdc001b0b356c17c3b0339cc2f9da50469462c6214248cff7ab8ebd9fb0303711cf98268d82004627e4a433a70900132a0c9f7827fec4de50ce2 SHA512 e5cb531f3eb16c53697b58a004f6949a13d2226922c9c32d5defc2f397450bc0e4877b03fd055853fe669b1394dc72c9e505ff252dd517ef5432f132ab56315f
+MISC metadata.xml 492 BLAKE2B 7cee2a75825f42f20f364427915e938fecd8a62d0d7053bfc8dad1f9e377a8d0ef5f6155c756fef486a0136181b67b08d5536783613d27cfd63bf32b850a6f69 SHA512 2db060e5b59ad5bb8d8f1d66178e28ca923afbf68420898b27e69bb46f7edea4296bd87f2f35c954f75062cec9b765369aaf45a5516d33b79581ae60efc25d1c
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
index 1a839140fb6c..3b89b4ece539 100644
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>flo@geekplace.eu</email>
 	</maintainer>
 	<maintainer type="project">
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 897887279abd..9bc17db6b1e7 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -2,5 +2,5 @@ DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4b
 DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4
 EBUILD pdfminer-20140328-r1.ebuild 779 BLAKE2B 7c3f07f51fa5b62654bf4e8b877e1cd752ff6546dd466fd8106fa8e40ebde1f42d7a909dd8a533c5c1fefd3d69ac646cf54e2cb74bd97805e38a6d87956166f4 SHA512 6ea9601e759713156ff3f93025fc362e1abca4f83b96784aed7972122e7d0065fab1a0671d90cb235cd6bc4a4a0e96076b489b6c2e803d054e13fbdb74eeab2e
 EBUILD pdfminer-20140328.ebuild 714 BLAKE2B 521142f1e2d74ad8487d7381e4db1fa73fda77a7e91187df4b6580f558e91dfdef6df8f8bb303ac17e438e2a3d18f7a8d660a94d8b0d2458ed6dea8b1534b2a8 SHA512 301947f92084ac278decbf638235bd539b5b63cb001ff1665965a502d94dd52380c1bde7cb222a7f4bce4639d87d182a3d767391d6f67d6485d53a7c4917440b
-EBUILD pdfminer-20191020.ebuild 793 BLAKE2B 3ebbc5cb905bb2ca09d9c2b78ee67e99bd0c8ad41ee8d8faac18bb3f12a5990761a04ac3e02f451581506df9ee44a91b69d2d020d7de817ac18030874b67e07f SHA512 b1f1a8364afcecc11a76e058f0a193cd8be4d251fe51da36604c945614186a2531a4d876fd706c76fe2060fb6b1b35e356df752fce4920815d7303dd9eedc390
+EBUILD pdfminer-20191020.ebuild 791 BLAKE2B 1bf6a0d3232c00a44a99ac991de2fa3c3830e973656f6e57e0fba74e5db6df5efa673491fdce6863e8ec0d171d456ec484735bf0c30dcc249a4c4c51dc0ff70a SHA512 d50cf4520ff4cc536c4a5f8d93481c4974828ed4db00142507bb13726c93f026435f17e6e5a8468f7dc0c561822e9612e1ed41ec7c35f826a57508f2e3ee4832
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20191020.ebuild b/app-text/pdfminer/pdfminer-20191020.ebuild
index 679252239b1d..3954bdfd0138 100644
--- a/app-text/pdfminer/pdfminer-20191020.ebuild
+++ b/app-text/pdfminer/pdfminer-20191020.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 3be0bb8e8f0c..966c1e4a8dbe 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -15,6 +15,6 @@ DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
 EBUILD pinfo-0.6.10-r5.ebuild 1316 BLAKE2B 4e2e29c94d57c1a2a5f0811762f863c71c34bdc9e64f223441a568ceaf7a02364b9c525d8b4b3ceb1eaaa21fe87df2b3fa1f397ee730104a05d19775f78541c9 SHA512 6fdafceee5ea2ce77adaf678b1c4e03389a7138edbe94ce83e51c6e1b2492de8c8cc50ec07a62a6833cd10a4c21fbfb51018d1dfb6268a5a5ebb927e3f24151c
 EBUILD pinfo-0.6.10-r7.ebuild 1430 BLAKE2B a369621e3778359219a0850f19fc950fc9699fcf6e53c3d63846b6b817442294fdb08b76f4441234a6a60d2e52c61972896a8f6f2781346ff1bf18b639e4fa96 SHA512 fb80e9c0bfed07d6dc37607cd05d2868102a554855f73dc3b4a7f780f50c3e525fbc096d3464ea35f524bb221b779982343afd3151e1e616e94c01356f800e01
-EBUILD pinfo-0.6.13.ebuild 1033 BLAKE2B 86e5709bbdf2163a2def54ccd00899d7b742b85a77ad4be4e069241cf4ca8c6152780d6db48f7cbdf27b83a1f38518af421bf2fcc2bc8603c046a569699b9615 SHA512 bf207f46871847d6e3f0e39e37c24d2b983a8b14cea5e3335beaede34e9041d58d48aded6d83a7cfb3866bed8fb5df18d6c99d0748a16ef0e512954b078c854b
-EBUILD pinfo-99999.ebuild 961 BLAKE2B fd9160283980bf7bdede66ab5133f511d820fba9570e305676fc0170845cbd31c9507367f10705de3e4e2e218b4b03732ceb7697b91ac7ac570103d5d6694128 SHA512 b6d9164f6b194b0cb2be0615890496cc522219d8b29e621f52bde86b37044466c1099e0df65d5a408c3c83cb62fff4e8ebe2276891626725210d31b6fb643230
+EBUILD pinfo-0.6.13.ebuild 1082 BLAKE2B 265c9351d355d4de75f9ae00757cce7ed68dd2aa3e9385662174c6f949d60d1a30430c6906da5f4c2f4f194fe423bd1d2ddd41881259e517509bea9b81c264eb SHA512 8a9765a56aab6dbd73f6a4f80bf37dd4d1613a27e112ad6bbe62cce8fb475cdd76e541e19eac9b968e919ab4e91d37191f1a467d3ea949c042205e3fd06dea6b
+EBUILD pinfo-99999.ebuild 965 BLAKE2B 70eea0fb86462f8cea446b270fcde21247bb2d497946ddf585bbf5f21651de0068746f82133cb0dbf8b3802be02af7ccbd8189118bc4da21e525b2cf456872eb SHA512 38490ae9c934f6a73e31b4e30df86d249f5c54199622ec6d9c9185f3d13cc83cc56a711b62c9fb639ffd80ae8448ccd9c8548121bcbb21356e272c3f44a7381f
 MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 1edae9c02d3a..65a73c599ed0 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -34,6 +34,9 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	sed -i -e 's| -Werror||g' configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/app-text/pinfo/pinfo-99999.ebuild b/app-text/pinfo/pinfo-99999.ebuild
index 697760bc7fca..94bcef91cbb1 100644
--- a/app-text/pinfo/pinfo-99999.ebuild
+++ b/app-text/pinfo/pinfo-99999.ebuild
@@ -29,11 +29,13 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
 	"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
-	"${FILESDIR}"/${PN}-0.6.13-fno-common.patch
 )
 
 src_prepare() {
 	default
+
+	sed -i -e 's| -Werror||g' configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index b94b036dcadb..d878cbdaf5f1 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
-AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
+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-v0.59.1.tar.gz 3624434 BLAKE2B 9837a7317eecd3db540bc7c23b3d26a9110f00d9c441b1bf1d61af80bae1fe0952f875425f14d66a939456f3a90e9ea74c189d94da7471c7c9a4d0b15f3875ce SHA512 904cb5817586fef19de55e76f3a33c264f9864b5c720b727a75e78a3b690e1ecd7b10603304a762d07b340320143b83b686c9918b9fe95499ceb55482950a4d4
-DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1656 BLAKE2B d648029b8afc30b50ff4b216bc46b37731ff7bb471aeec21ada1244f37f9b431c392e0f32b1bf3f16cc15e7fc79946a23aef976548382b998057812d8366a593 SHA512 1ee6216f7c8f1aa4ba51cd96c6a2fd4b5361d8727fa056a333d96f1413aa76fe19480d5e77602a32b526d99a4b436a103fbe93a58856c2e4021c85c5cc20d53c
-EBUILD po4a-0.57.ebuild 1315 BLAKE2B 4af0025a0c55dfa8931872aace40c26f78ece5cd960450745191cc12a86df4f32cb8f92a86f24b72ccbd1d17a1620f6b8df5ce21107265440ba1b9247850dfe9 SHA512 c03cd5ef922f15cb4ee5e572a37f612822d66a8e20a788a3b9a9b1eecca34f129efca0175f188b0b3bbc9330745e844a604a3766fb64c0f91c0d7ae863f1395d
-EBUILD po4a-0.59.1.ebuild 1365 BLAKE2B 1d2364833b47fd38ad32290cd4942da8bebe13a266dd27dcc21b6265361bea45689a86771c49aab3a4f2478f6a350188f80bbaa9cca9572ca70619405ed52d02 SHA512 291da03d42b6039bcb35505161b8da6d7198b7f995130293d9d2582e26d7c01adaeee344791c84b55693c45ebbfc974743387f604bcbea6efcbfec6acf1536ad
+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
+EBUILD po4a-0.61.ebuild 1326 BLAKE2B f588b1f4753b7e4d59c1c5b5eaa74a13773392ceeb3859663472b52ef131011e419884a1d49f6bd9f611a04243140b642885df8fa0a858666670f86c70a7a4cb SHA512 8be8325f4e2cf06e0a4b039a23e2ed14d54ec7e2d2668f58eafffd4bbdfad02b60d86c8d2be0a24a34884b348768688041c3a2da0929eab68b72d2763bcfc428
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch b/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
deleted file mode 100644
index 226fa0e9b6e2..000000000000
--- a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Tue, 13 Jun 2017 21:10:34 +1200
-Subject: [PATCH] Fix broken use of lib '.'
-
-   "'.'" is not "."
-
-Bug: https://bugs.gentoo.org/614122
----
- Build.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Build.PL b/Build.PL
-index 43c6f80..9ee443b 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -1,6 +1,6 @@
- #!/usr/bin/perl
- 
--use lib q('.');
-+use lib q(.);
- use Po4aBuilder;
- 
- my $build = Po4aBuilder->new
--- 
-2.13.1
-
diff --git a/app-text/po4a/files/po4a-0.60-man.patch b/app-text/po4a/files/po4a-0.60-man.patch
new file mode 100644
index 000000000000..40927dbda818
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.60-man.patch
@@ -0,0 +1,18 @@
+--- a/Po4aBuilder.pm
++++ b/Po4aBuilder.pm
+@@ -232,7 +232,6 @@
+         }
+         $parser->parse_from_file ($file, $out);
+ 
+-        system("gzip -9 -f $out") and die;
+         unlink "$file" || die;
+     }
+ 
+@@ -250,7 +249,6 @@
+ 		print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
+ 		system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
+ 	    }
+-            system ("gzip -9 -f $outdir/$outfile.$section") and die;
+         }
+         unlink "$file" || die;
+     }
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
deleted file mode 100644
index 6322c6a37700..000000000000
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
-PLOCALES_BACKUP="en"
-
-inherit perl-module l10n
-
-DESCRIPTION="Tools for helping translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.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/openjade
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/SGMLSpm
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	sys-devel/gettext"
-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
-		virtual/tex-base
-	)"
-
-# Running tests in parallel fails
-DIST_TEST="do"
-
-PATCHES=(
-	# Fix bad escaping of '.' in @INC modification
-	"${FILESDIR}"/${PN}-0.45-614122-no-dot-inc.patch
-	"${FILESDIR}"/${PN}-man.patch
-)
-
-src_prepare() {
-	# Check against locale files in ${S}/pod/bin for mismatches
-	# with languages listed in PLOCALES
-	local locales_path="${S}/po/bin"
-	l10n_find_plocales_changes "${locales_path}" "" ".po"
-
-	# Get rid of disabled locales
-	my_get_disabled_locales() {
-		PERL_RM_FILES=( "${PERL_RM_FILES[@]}" "po/bin/${1}.po" "po/pod/${1}.po" )
-	}
-
-	l10n_for_each_disabled_locale_do my_get_disabled_locales
-
-	einfo "Your LINGUAS lists the following languages: ${LINGUAS}"
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index fd37e00722ab..a6016b45c7ed 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 ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.59.1.ebuild b/app-text/po4a/po4a-0.60.ebuild
index 6d9d46d247b7..8807618f22d5 100644
--- a/app-text/po4a/po4a-0.59.1.ebuild
+++ b/app-text/po4a/po4a-0.60.ebuild
@@ -6,11 +6,9 @@ PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_B
 
 inherit l10n perl-module
 
-MY_P="${P/-/-v}"
-
 DESCRIPTION="Tools to ease the translation of documentation"
 HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -36,9 +34,8 @@ DEPEND="${RDEPEND}
 		dev-perl/Test-Pod
 		virtual/latex-base
 	)"
-S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=( "${FILESDIR}"/${P}-man.patch )
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.61.ebuild b/app-text/po4a/po4a-0.61.ebuild
new file mode 100644
index 000000000000..f17215b23e4a
--- /dev/null
+++ b/app-text/po4a/po4a-0.61.ebuild
@@ -0,0 +1,51 @@
+# 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 ~riscv ~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"
+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 0d3c1c12eee5..8b8720560109 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,5 +1,3 @@
-DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
-EBUILD podofo-0.9.6_p20180715.ebuild 4661 BLAKE2B c5e6616218c01a583ef3bcd8e93a80edd060b9fe010cf9f91372a5ce3e9f34d592d69fe20cc8e9ba02dceefa6ac70679c5d66783580fd7d70b40cc2f74c5a85d SHA512 b6b6a274d5ee92d13d4b573844cd0d1629f13b552f5d8257e884a0c555ba1d14425abe3fab1be9e01d27c5c1da9eae07519ad0916862569a0495808d2719449f
-EBUILD podofo-0.9.6_p20190928.ebuild 4670 BLAKE2B df7e653e7251ee6a8c82f45cff91ab7703aa73045d1dd16b7bdaf0ba10d9475e5736566411600d473f1b4ba79df8742e96f616e8d1b45b524382d569b568b2b8 SHA512 f0d481bbf173348d0da77ac046aa4fafa5301e91fb888107f6bad455ee366edd1a7fbfa56a1b8533e9f72c1a9cf27ff45668769b86c6820e99c84d266746f19a
+EBUILD podofo-0.9.6_p20190928.ebuild 4665 BLAKE2B 82b5f6179a54e471a1b8aeab45d87d5499f59fb47a82b9a39302b3053d4f0642a8677e723013a6b307e112a057ae61609940b6298cc43c9b203cefe08153aeee SHA512 ae262d3bef4ff0ef909779620b7c80768158a53ddabcdbf500f034f2f5a988b64a2de7d4f19998618780d888252783add8b2a3f3030124b52685077e268f1ea9
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
deleted file mode 100644
index e53db8b61f42..000000000000
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV%_*}"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc x86"
-IUSE="+boost idn libressl debug test +tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tools )"
-
-RDEPEND="dev-lang/lua:=
-	idn? ( net-dns/libidn:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/fontconfig:=
-	media-libs/freetype:2=
-	virtual/jpeg:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	boost? ( dev-util/boost-build )
-	test? ( dev-util/cppunit )"
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	local x sed_args
-
-	if use libressl; then
-		sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
-			 -i tools/podofosign/podofosign.cpp || die #663602
-	fi
-
-	# bug 620934 - Disable linking with cppunit when possible, since it
-	# triggers errors with some older compilers.
-	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
-
-	# bug 556962
-	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
-		test/unit/EncryptTest.cpp || die
-
-	sed -i \
-		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
-		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
-		CMakeLists.txt || die
-
-	# Use pkg-config to find headers for bug #459404.
-	sed_args=
-	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
-		[[ ${x} == -I* ]] || continue
-		x=${x#-I}
-		if [[ -f ${x}/ft2build.h ]] ; then
-			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
-		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
-			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
-		fi
-	done
-	[[ -n ${sed_args} ]] && \
-		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
-
-	# Bug #439784: Add missing unistd include for close() and unlink().
-	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
-		test/unit/TestUtils.cpp || die
-
-	# TODO: fix these test cases
-	# ColorTest.cpp:62:Assertion
-	# Test name: ColorTest::testDefaultConstructor
-	# expected exception not thrown
-	# - Expected: PdfError
-	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
-		-i test/unit/ColorTest.h || die
-
-	# ColorTest.cpp:42:Assertion
-	# Test name: ColorTest::testHexNames
-	# assertion failed
-	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
-	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
-		-i test/unit/ColorTest.h || die
-
-	# Bug #352125: test failure, depending on installed fonts
-	# ##Failure Location unknown## : Error
-	# Test name: FontTest::testFonts
-	# uncaught exception of type PoDoFo::PdfError
-	# - ePdfError_UnsupportedFontFormat
-	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
-		-i test/unit/FontTest.h || die
-
-	# Test name: EncodingTest::testDifferencesEncoding
-	# equality assertion failed
-	# - Expected: 1
-	# - Actual  : 0
-	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
-		-i test/unit/EncodingTest.h || die
-
-	# Bug #407015: fix to compile with Lua 5.2
-	if has_version '>=dev-lang/lua-5.2' ; then
-		sed -e 's: lua_open(: luaL_newstate(:' \
-			-e 's: luaL_getn(: lua_rawlen(:' -i \
-			tools/podofocolor/luaconverter.cpp \
-			tools/podofoimpose/planreader_lua.cpp || die
-	fi
-}
-
-src_configure() {
-
-	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
-	filter-flags -fvisibility-inlines-hidden
-
-	mycmakeargs+=(
-		"-DPODOFO_BUILD_SHARED=1"
-		"-DPODOFO_HAVE_JPEG_LIB=1"
-		"-DPODOFO_HAVE_PNG_LIB=1"
-		"-DPODOFO_HAVE_TIFF_LIB=1"
-		"-DWANT_FONTCONFIG=1"
-		"-DUSE_STLPORT=0"
-		-DWANT_BOOST=$(usex boost ON OFF)
-		-DHAVE_LIBIDN=$(usex idn ON OFF)
-		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
-		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
-		)
-
-	cmake-utils_src_configure
-	mkdir -p "${S}/test/TokenizerTest/objects" || die
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}"/test/unit
-	./podofo-test --selftest || die "self test failed"
-}
diff --git a/app-text/podofo/podofo-0.9.6_p20190928.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
index 0c3c7b2bd809..a07aaa17adbf 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 63c2782dfee7..b26616d34c65 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,9 +6,11 @@ AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2eba
 AUX poppler-0.88.0-pdfsig-crash.patch 918 BLAKE2B 1cafb94e03afb06729633e117951edf0a14c6d52786eee4d785786e249f22fb4579d909f946ec595c6a7a54fbd594b6b1e94006ea37f97cacc49a93336cb2d37 SHA512 8967348da204da57002fbbff55d318e8065ce422e99bc5fbe7d517aed70c5f962dac87996bd949053ff5844f44aac528de08bbb1b2f7131b7852b3f5ad11653e
 DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
 DIST poppler-0.89.0.tar.xz 1612156 BLAKE2B 071724f823214f3b3a775a1e6ee57992c18c65815cc139d88953ea3a7b348066981ce7933bd00ea27ddb60bf9f2f34a245bf09944d8cfda9732f0e33feecb017 SHA512 e2af2ab20cc1bba72080d42e229379bda0802aff355d2932dd970ee5924f454577529aef21f0f90fc57efba54caf15cd973c75446f309498f88199d5c2d93f11
-DIST poppler-0.90.0.tar.xz 1619960 BLAKE2B 479c89b6e0881c674beb5c760e08e9277df40c08904dcb1bfc1b039e9ca95f3d24d4548017b3d06ac4e1324172b2c9e412db665d6ee1d7ffd11da0f3d0a0b42c SHA512 3b2a45c7fcdc41b0dad80b6454cd8bb50a6625537edbc537898790ef4b6425bb62e1934fd2aaa8565be9c045ab1ac40a8de2e939c5b5abf0254d8e6c833b4450
+DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
+DIST poppler-20.08.0.tar.xz 1635372 BLAKE2B ca8829fe031bc9565baea71dd7a565d16160aa26645fdd6b30fa0d26c427f8b9d966766df95ca0c1e98552af2e3104c45721f7111db0bcd47f9f29620d1b37ed SHA512 e3d7d85356c854e298bb96ac8a563d9b97174e07d220eb5e7fe0372354a9105a3a1f6ea16e2a34af09d65c61f5fb349412fa7100e7fdda3c98e5030d82b48679
 EBUILD poppler-0.88.0-r1.ebuild 3393 BLAKE2B 3ab052ad53eaf884e6ae388010b8273c4e801b316490f040786dfd10cc115f420e00fba9a3e8449b89b8ac3f76c5e530601d9ca7f69eb4a57691407289dd9bbc SHA512 4dcd8052f9d6c4bc95c7670090e67de51b85329a91f39d266e9c92870b0931d91eb7c6f6d18039052416a1449b59cb7bded9b3b840db34d8a28b9d96ff234292
 EBUILD poppler-0.89.0.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
-EBUILD poppler-0.90.0.ebuild 3364 BLAKE2B fca621779d0ea5db5d08cd627f43a426d9cd31e2e98d1fe498ecf3763b4dbea3914f2269369ce495dcb83e68516e55b49174bf7dccec0ff9ab0e3392d63b2e93 SHA512 aa952862044c9829b6b6b2bf9187e1c6ccb0da41eda6c14fd5a6259d8eb2602fbb4a8cdef49667e5e876c0c522d10ebf8d613377ae92b4af22bb9a39861f1f5b
-EBUILD poppler-9999.ebuild 3364 BLAKE2B fca621779d0ea5db5d08cd627f43a426d9cd31e2e98d1fe498ecf3763b4dbea3914f2269369ce495dcb83e68516e55b49174bf7dccec0ff9ab0e3392d63b2e93 SHA512 aa952862044c9829b6b6b2bf9187e1c6ccb0da41eda6c14fd5a6259d8eb2602fbb4a8cdef49667e5e876c0c522d10ebf8d613377ae92b4af22bb9a39861f1f5b
+EBUILD poppler-0.90.1.ebuild 3381 BLAKE2B ece60d6f8a145530998b7ea2cd73c95c688ef643104e04adfe798f89c7dd11bb815d14225bfa314c4c2213d233ac99dc1e6850d318f51f9d49ec162901df67d6 SHA512 66aee158da18605d577c4ef9c97d5075f7a4c10aafdd28c439f48ce63545c6f26e36beff54656115e97f94f54889f799a006db70914d3e45fa2a4a2bcf76b605
+EBUILD poppler-20.08.0.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
+EBUILD poppler-9999.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-0.90.1.ebuild b/app-text/poppler/poppler-0.90.1.ebuild
new file mode 100644
index 000000000000..4c2c2787fc42
--- /dev/null
+++ b/app-text/poppler/poppler-0.90.1.ebuild
@@ -0,0 +1,124 @@
+# 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/101"   # 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}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.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-0.90.0.ebuild b/app-text/poppler/poppler-20.08.0.ebuild
index 7c34ec504ee9..39d7375ed1b8 100644
--- a/app-text/poppler/poppler-0.90.0.ebuild
+++ b/app-text/poppler/poppler-20.08.0.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/101"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/102"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -105,6 +105,7 @@ src_configure() {
 		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 7c34ec504ee9..39d7375ed1b8 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/101"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/102"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -105,6 +105,7 @@ src_configure() {
 		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 0f4f0a5d2fac..eef0e36fb48b 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,3 +1,5 @@
 DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
+DIST pytextile-4.0.1.tar.gz 49282 BLAKE2B b51220ff33fe43b83d0aefee840b5170747015073fbe88934798c2505c3455e9805eee8815ec8068521c88a44a309bd0eb32e84757d088536f1c12a1f9bc0ca0 SHA512 e299663fd71b935e9c948649baba80584b1339dd3393a3f37b39475fe1d6a4addaaa2adcd16ba57b4c5db43ab9f8de6e9332871915b1fff7b7882ad5e8d64580
 EBUILD pytextile-3.0.3.ebuild 1025 BLAKE2B 7f99559324e89b88bd6f901d9083d1b6d8eec90e5f87d13779de82f1664866e98e9d729944f46f73e80c594f43e8ea99a6935761cbdb76f18acb0feea46bfac5 SHA512 df1939e9580235a9131f3b3ff519305e7c49e339f2497f77df7ccc9969f3be27f8b5391a9780089ddb7b82842afde289f392887a0cb862f84b4d95974ae07116
+EBUILD pytextile-4.0.1.ebuild 1217 BLAKE2B 70bf37067119bcbb924796d2d2d36770461fbd12013b2fd42e107b56b40dacbba63f8c50de664a1905ca3943f01292ba5ece07db2d5e7b562d5665f0f550b8ae SHA512 1fa5a8d51e10334662361e142880c0f7a19722cd8dac9a58dd8deee5485ea4fd2017d8fb02fc2e6c7f930a46c69576836e472bfb50dea2ae7435069bcf0aa136
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-4.0.1.ebuild b/app-text/pytextile/pytextile-4.0.1.ebuild
new file mode 100644
index 000000000000..1d920065c305
--- /dev/null
+++ b/app-text/pytextile/pytextile-4.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="python-textile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python port of Textile, A humane web text generator"
+HOMEPAGE="https://github.com/textile/python-textile"
+SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# remove useless --cov arg injection
+	rm pytest.ini || die
+	# remove useless pytest-runner dep
+	sed -e "s/pytest-runner//g" -i setup.py || die
+
+	# remove tests that need network access
+	local my_drop_tests=(
+		test_getimagesize.py
+		test_imagesize.py
+		test_textile.py
+	)
+	for test in ${my_drop_tests[@]};
+		do rm "tests/$test" || die
+	done
+}
+
+python_test() {
+	pytest || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
index d118a0f829d9..5d31e8cef6f1 100644
--- a/app-text/q-text-as-data/Manifest
+++ b/app-text/q-text-as-data/Manifest
@@ -1,3 +1,3 @@
 DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2
-EBUILD q-text-as-data-2.0.10.ebuild 1112 BLAKE2B 1d1965e6f65978d209a8248165c46f296a3c1fc0f4d9b0668d4b16eb0727b843b95e7b77316f80fafc0eb1c4dd7b34ee1b3f7682d795c6c3857ffe968a77eaa8 SHA512 f778dee4e4177edd6682a64ec56b3afc410a519f4b9d42db3ee5f2e88083b220af418f33ebd7dfed4e94cf5c8615bd6d023b1039a676f91b99e79deb49270f1f
+EBUILD q-text-as-data-2.0.10.ebuild 1099 BLAKE2B 4af69eca1ed9e1499526466f3a972f9be41dbd661c9ce2bc14264f278ee6428dfadeaf7bdaa1de3e7ddca37dd1a236b9b9d791b789b1262924f1b697de45da71 SHA512 4f9ed280f9e8a3f12e68c17a2a14a77ebcd72bdbb3bc17d8250ba58306cd82901d223d885a25323b38ca0ebca8867e434e5af0a336145ca2662670f3d3c39530
 MISC metadata.xml 300 BLAKE2B 57b125311f9ec6ca94d329e91209e85c77c3c739c2e2ca885dbe4a8c3d9a13627fcd4b64c79c9c672d30c0265eab241fb57114e0c23b46e01c60fb969d7d6f9c SHA512 3b90282d1ba8092665a1421e81e53a82dadcdf3c70ecdcc0c71e97e00d0ad2f7ba1e970d507ab9d354721cd13e08582ae21c482955372c5d8bc0caeb3d4505aa
diff --git a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
index f3c988259f1b..28dbf1e7a1ba 100644
--- a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
+++ b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-r1
diff --git a/app-text/queequeg/Manifest b/app-text/queequeg/Manifest
deleted file mode 100644
index 890ace178d77..000000000000
--- a/app-text/queequeg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST queequeg-0.91.tar.gz 69449 BLAKE2B bd9db4bc6be37e8ee327fa5f6072cc4b2bc4b48fbfae194ef2466ebc26478c3ab3aadef212a69bf816ebdcd020c57af2b953eb9ef6a4c6d5be6516255c51666c SHA512 e5366577e587fd3f286c917135cd043ef599ef6ee673757f3538668f749ce6a57c2a257f31f1e9d38724cb6ee4680b4401800c23f84ae27deac75392ab6c5e34
-EBUILD queequeg-0.91-r2.ebuild 1002 BLAKE2B 25c2e40a01c1f60461c9f26fc16faa6354b64f254f68d9363af1e33d18604c1deb4e6d9fa40c44a3ccdf00f52051f49e8502957797307a25e9c560c7d5604fc8 SHA512 dd8b83be480c467dc5a49cff67898d3787afc0aa738f661009e9a6fbaedc0bbc53c1b7dfb71e3fe7ce36660746417c8805a5f6b320755f6881b909d204719494
-MISC metadata.xml 390 BLAKE2B 7f62f2991408f9fd4b9e860311f1e2d50f4007d8870da3464683150077eaa371ecb192720ab088464f3829f6df65985e6e9bd742672708cef8f55e060abab17c SHA512 5a750294043ee99964070d290dd178659f8587c5fc9e13d73f78c9a73bd880b55ebe48eeabb66181cb24595a566c5767c8cd01f7f6874d279156b746f306e1a6
diff --git a/app-text/queequeg/metadata.xml b/app-text/queequeg/metadata.xml
deleted file mode 100644
index e7804710f371..000000000000
--- a/app-text/queequeg/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hattya@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">queequeg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/queequeg/queequeg-0.91-r2.ebuild b/app-text/queequeg/queequeg-0.91-r2.ebuild
deleted file mode 100644
index bd13a71a2779..000000000000
--- a/app-text/queequeg/queequeg-0.91-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A checker for English grammar, for people who are not native English"
-HOMEPAGE="http://queequeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-dicts/wordnet"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local dictdir=/usr/dict
-
-	if has_version ">=app-dicts/wordnet-2.0"; then
-		dictdir=/usr/share/wordnet/dict
-	fi
-
-	emake dict WORDNETDICT=${dictdir}
-
-	python_fix_shebang qq
-}
-
-src_install() {
-	local prefix=/usr/lib/queequeg
-
-	python_moduleinto "${prefix}"
-	python_domodule *.py
-	insinto "${prefix}"
-	[[ -f "dict.txt" ]] && doins dict.txt || doins dict.cdb
-
-	exeinto "${prefix}"
-	doexe qq
-	dodir /usr/bin
-	dosym ../lib/queequeg/qq /usr/bin/qq
-
-	dodoc README TODO
-	dodoc htdocs/*
-}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 2bf36a47156b..c66ae4bad669 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -5,5 +5,5 @@ DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59
 DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
 EBUILD recode-3.6_p20-r1.ebuild 1683 BLAKE2B 41458adc86e9e77bf02c0ad8aa3405024efd4ea808f61cda13842ba82f5e4740af30a37432c0a9d332c4c64bfbe027cab73b4a5f7410fe6d40e0d63e9866254b SHA512 d96dfcb1094e9a7b8af27c1b8c42637b59aa3a1a0113787ba19fe0fae3f69b3ef6cf16ccee0e098752da4263e5c4b86b98223ada5741a1cfff65af1e04274050
-EBUILD recode-3.7.6-r1.ebuild 1024 BLAKE2B ecc79b0cc686ea88b765bb1fa035d7c41fd908496daf094dd2c11573a94843faeef067d91ecac570f0058ed81d645c0ab58e4d5fbe6809288e7bb25eaec4dee9 SHA512 a9ed1b358366995d2905796458379ad713bea5ef1e7a807b708b4a22869841b27a14f46adc4af300635dec1333c7bba786259be3546c96602f3977bf42e7da3e
+EBUILD recode-3.7.6-r1.ebuild 1016 BLAKE2B 2877c0ad077106ed1049befb217fa32524e9f8c8d8a625a6ffb9cf5df71ad37336dee61249e362109e04df32c25690612bd491b2ed4d704162eb620e9765510e SHA512 a4e71ea3e8652db14826451ced4b96644af086d185f1c7f438aac675925c4166e12f78712ef12dad4a5fdf813cdada7e532bad17f969e3ebbea47888c2822849
 MISC metadata.xml 346 BLAKE2B 0a6af84d8b6ea322f62bf1f741e332892a60eee2704265685615240a178ddd965f524586179882867e609cef66ef021cfc56950581d1c0915f04a2a669dea9ba SHA512 6c5caba02d69998dc08954f52c9e126db6546eaa0d0f4abc166e96896fdfa8e73371f1206318fa00ebd0f266600c79105d43d5e300c07e7f7b0c3645f9537b2e
diff --git a/app-text/recode/recode-3.7.6-r1.ebuild b/app-text/recode/recode-3.7.6-r1.ebuild
index 88f530ff3af2..6a353fdf17fe 100644
--- a/app-text/recode/recode-3.7.6-r1.ebuild
+++ b/app-text/recode/recode-3.7.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 # librecode soname version
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="sys-devel/flex"
diff --git a/app-text/referencer/Manifest b/app-text/referencer/Manifest
deleted file mode 100644
index d46f1944db3f..000000000000
--- a/app-text/referencer/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX referencer-1.2.2-lib_path.patch 809 BLAKE2B 2cb37ce577ab7b877353489dcaedf32fb135b7970ed70c031de843e0db50d619c8b83d451945dfe9c5d88f60fd21e5243c026c6cf10b0f113fc375bae7f766e0 SHA512 4857eaf468aaba555e7a74b23f91049c68746a6bc1a80d4df287a3363f92871ccb879bdf7f0f8dfb6f18a6f0443fc61f743cbe23b164de4fa0f8a076f59a839b
-DIST referencer-1.2.2.tar.gz 694421 BLAKE2B 2b48b71610d0cb79feaaeae7af203dedd1dc53d194b1b93306c5f022954a5e50f5db1dd693da76b7d4f33045d3174ed82a0764a9dfee6b6bfe98f352575cf59b SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907
-EBUILD referencer-1.2.2-r1.ebuild 1175 BLAKE2B f96a5be8c8845efde3c7c62ea6c455ed643940ddc5f29d00a06539ac3c370eac1206d4d242adf9614405c3ae332b837e81bb6ed0f3339b8238af6468cde3dadb SHA512 353a7164345f5fcb0d709669d65497dd2c5bd620c8b869f80f822a5437038cad6110d028d95676dbf6a470b3cd2b255128d2609dda24ebb0f42897b9d68a7cc4
-MISC metadata.xml 453 BLAKE2B 8422bf3441f4a64d469ed5d1f3935f93d6ef0a9b04dda823d3ab6cd03f53de8794fcc30732d9c5ba7414f925a346d96ba70fbfe52c628b1ba473b4c4c3180cdd SHA512 966bf89a47f9afee99af80214048a21d332e810ec1013ca8c9d7edb9e7038575c7a86fd1603dd9cf34ffe90f2a93ff55f7f1d1c229d66055872123f7b6f20649
diff --git a/app-text/referencer/files/referencer-1.2.2-lib_path.patch b/app-text/referencer/files/referencer-1.2.2-lib_path.patch
deleted file mode 100644
index 220b47d8b488..000000000000
--- a/app-text/referencer/files/referencer-1.2.2-lib_path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dominik Kriegner <dominik.kriegner@gmail.com>
-Date: Tue, 29 Nov 2016 09:56:00 +0000
-Subject: [PATCH] fix build issue
-Patch's original author is Askhat Bakarov on arch
-https://aur.archlinux.org/cgit/aur.git/commit/?h=referencer&id=961f2b5e4b286f27f610e5267465c63021b8a50f
-
-Project-Bug-URL: https://bugs.launchpad.net/referencer/+bug/1645639
-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=601174
-merged upstream: http://bazaar.launchpad.net/~referencer-devs/referencer/trunk/revision/939
-
---- a/src/Document.C	2014-01-27 03:43:00.000000000 +0700
-+++ b/src/Document.C	2016-11-03 16:25:00.698676538 +0700
-@@ -297,7 +297,7 @@
- 
- 			lib_path = lib_path->get_parent();
- 			up_dir_level += "../";
--			if (lib_path == 0) {
-+			if (!lib_path) {
- 				doc_is_relative_to_library = false;
- 				break;
- 			}
diff --git a/app-text/referencer/metadata.xml b/app-text/referencer/metadata.xml
deleted file mode 100644
index 8b254b7dbc9a..000000000000
--- a/app-text/referencer/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dominik.kriegner@gmail.com</email>
-		<name>Dominik Kriegner</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">referencer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/referencer/referencer-1.2.2-r1.ebuild b/app-text/referencer/referencer-1.2.2-r1.ebuild
deleted file mode 100644
index 6fa53d118dd7..000000000000
--- a/app-text/referencer/referencer-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit xdg python-single-r1 flag-o-matic
-
-DESCRIPTION="Application to organise documents or references, and to generate BibTeX files"
-HOMEPAGE="https://launchpad.net/referencer"
-SRC_URI="https://launchpad.net/${PN}/1./${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.12.3-r3[cairo]
-	>=dev-cpp/gtkmm-2.8:2.4
-	>=dev-cpp/libglademm-2.6.0
-	>=dev-cpp/gconfmm-2.14.0
-	>=dev-libs/boost-1.52.0-r4:="
-
-DEPEND="
-	${RDEPEND}
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8.1
-	dev-perl/libxml-perl
-	dev-util/intltool
-	app-text/rarian
-	test? ( app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/scrollkeeper-dtd:1.0 )"
-
-PATCHES=( ${FILESDIR}/${PN}-${PV}-lib_path.patch )
-
-src_prepare() {
-	default
-	python_fix_shebang plugins
-}
-
-src_configure() {
-	append-cxxflags -std=gnu++11
-	econf \
-		--disable-update-mime-database \
-		--enable-python
-}
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index 2cd79880cd66..b39f9ffff298 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,4 +1,6 @@
-AUX 1.0.3-libsablot-expat.patch 286 BLAKE2B 07728a2d174343133946519934a0b10aa0ea0d2c7e5ba73401b8c16ead71f059f78b24236bc96e17baf2467a5765ce0d82e67e97bb48225a9ba0fc5ac8a163d0 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040
+AUX 1.0.3-cxx11.patch 524 BLAKE2B 4b8c5f68e662b2d65e4acb50e2cc3584d2186f4ecc5c8e10be9cd7555a1d5e962b2b9dd0f3b8095921db68cbdbea00f2b926ca3da8b79f3f0bf165ab85bab1e7 SHA512 1e3d0200cf8193a61183065625cdb1394fc98a021a127170997a26dcdcab1671436c0d02a74d5eec9f5cfe81a9d030d0027ca5e4e133e08723504cf42a14b97f
+AUX 1.0.3-libsablot-expat.patch 195 BLAKE2B ec916a15bbcd86eff5c28c4f4ff2f5cc1f81bf43a4c8d5d26f2bc63fa14e509ae68e531e17051c09037932ea45043d4d94f9886aa5155610a52fa411c5b7a858 SHA512 3f769da06b06548bac82fb505d3f3aa9f2111c448e5b18ea3b553ecce9b627e3e0f02cdc6afb9491f9dab0b89946f6b056486395e0fd6a0822be0f549ccbf035
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
 EBUILD sablotron-1.0.3-r1.ebuild 1038 BLAKE2B 951637f5880123c5326b3a8b05d9e756b7b74954582224daef203b8a285ab1c071267fe4c6ba77da435bfbe382cd8ecf626da766e5a6b2f58256669315afafd9 SHA512 997f719e6951465946496933ebf91498dc8b474d33f108cdcb58303356bc76982306d7d33b9a5c93564dbdd985b2a24e9df80185b1d6807be96c8dd5935e8881
+EBUILD sablotron-1.0.3-r2.ebuild 1145 BLAKE2B 762b95b9addbdccd631858b53ab44b4408ca4591cc2925e4a80ede9dbaa32cea71468deb0249c7cb2ea34e37937a20b546a7d20ac77fb6b1d506eacc805556f0 SHA512 284a6a7a79545c3c85dcb938ef5a44a71c419483702a316eb011be0c875e67265e67b9e932915ecfb32f536acbf03269657bd176931abdd4ae30e97e174d4141
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/files/1.0.3-cxx11.patch b/app-text/sablotron/files/1.0.3-cxx11.patch
new file mode 100644
index 000000000000..edc1e3141d94
--- /dev/null
+++ b/app-text/sablotron/files/1.0.3-cxx11.patch
@@ -0,0 +1,11 @@
+--- a/src/command/sabcmd.cpp
++++ b/src/command/sabcmd.cpp
+@@ -168,7 +168,7 @@
+ 
+ char askhelp[] = "Type sabcmd --help to display a help message.\n";
+ char msgConflict[] = "conflict with preceding switches: ";
+-char version_txt[] = "\nsabcmd "SAB_VERSION" ("SAB_DATE")\n"\
++char version_txt[] = "\nsabcmd " SAB_VERSION " (" SAB_DATE ")\n"\
+     "copyright (C) 2000 - 2005 Ginger Alliance (www.gingerall.com)\n";
+ char dbg_usage[] = "\nDebugging options:\n"\
+     "\t--debug\t\t\tdisplay results of the command line parse\n"\
diff --git a/app-text/sablotron/files/1.0.3-libsablot-expat.patch b/app-text/sablotron/files/1.0.3-libsablot-expat.patch
index 328c9e906856..e4f6c3fdfab3 100644
--- a/app-text/sablotron/files/1.0.3-libsablot-expat.patch
+++ b/app-text/sablotron/files/1.0.3-libsablot-expat.patch
@@ -1,5 +1,3 @@
-diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
-index abd2041..1307b1c 100644
 --- a/src/engine/Makefile.am
 +++ b/src/engine/Makefile.am
 @@ -76,4 +76,5 @@ include_HEADERS = \
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..9910b99b55bb
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PN="Sablot"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An XSLT Parser in C++"
+HOMEPAGE="https://sourceforge.net/projects/sablotron/"
+SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz"
+
+# Sablotron can optionally be built under GPL, using MPL for now
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="perl"
+
+RDEPEND="
+	>=dev-libs/expat-1.95.6-r1
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=dev-perl/XML-Parser-2.3
+"
+DOCS=(
+	README README_JS RELEASE src/TODO
+)
+PATCHES=(
+	"${FILESDIR}"/1.0.3-libsablot-expat.patch
+	"${FILESDIR}"/1.0.3-cxx11.patch
+)
+
+src_prepare() {
+	default
+	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable perl perlconnect) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 298bb2add157..6c4aebd483df 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -4,7 +4,7 @@ DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd
 DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47ba0b4e6fa86f7abdc52b06a2dfcfd632b16dc7bce6e5ef3b0dbb40ce9170e678bc17c0a4e43dcc0099a1dc SHA512 77be81f042e2099de7fc84b0161bc8a95d5c3dde662284613d84a1e249fa0aa51dad73f53f265c833526d40f5e1f19fce99dc5cd6df35efb0a323c3db6084a55
 EBUILD scdoc-1.10.0.ebuild 1165 BLAKE2B aa225065ba9decac9e3a4beb0331f740c3d1513e2d775d0e74e7d619609c474915d75b3b18b84284a353eaf197681a050e68eae0c0cbf5fe6d82dea0fc6e7738 SHA512 ddd56e88a5e19c0282252035b653512bd62cec03de42b6311e443954f86708440d8488522c0dc0d3e575513ceff313c6b630914d746eedc4582bb8ba00fe076d
 EBUILD scdoc-1.10.1.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
-EBUILD scdoc-1.11.0.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
+EBUILD scdoc-1.11.0.ebuild 1165 BLAKE2B aa225065ba9decac9e3a4beb0331f740c3d1513e2d775d0e74e7d619609c474915d75b3b18b84284a353eaf197681a050e68eae0c0cbf5fe6d82dea0fc6e7738 SHA512 ddd56e88a5e19c0282252035b653512bd62cec03de42b6311e443954f86708440d8488522c0dc0d3e575513ceff313c6b630914d746eedc4582bb8ba00fe076d
 EBUILD scdoc-1.9.3-r1.ebuild 1165 BLAKE2B acddab79253fec1c4e2c59f8ee70b9ab0d86c4fea2784a41afe94aa62909af7b2664e20f69b610484452aaeaf1ed597567439af8b4aa12e0462226b9c8108522 SHA512 9e8bf612cf40478c23dae4fa2934a09115f9ee813d2a9eb904710c638b605ad28a9938a7f90a0e6da024e0338e7dfbce66cf79f3e202c992a1140a0bc0b10eba
 EBUILD scdoc-9999.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
 MISC metadata.xml 422 BLAKE2B ec662d4bd34390be05318e8816524f206decf6e3cf97ee6e132405a7a2bdd33839b5b82e8083bd3fedc8d390871275ecc9490252cdeb883994e35d511cb8b7d4 SHA512 09dc27076a9ffd2c3f94b40b9df84cbb02317dee7235cb0ce358890c93667dacfc3a7adfe09cf949b8f63970983a7ed7ff654a9ec290b58c6f4ac6b05f9579e1
diff --git a/app-text/scdoc/scdoc-1.11.0.ebuild b/app-text/scdoc/scdoc-1.11.0.ebuild
index 15ecbe1b112a..f32f05fc9bf6 100644
--- a/app-text/scdoc/scdoc-1.11.0.ebuild
+++ b/app-text/scdoc/scdoc-1.11.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index b17e1c496ab1..597a13c33b05 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,4 +1,4 @@
 DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
 DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
-EBUILD sgmltools-lite-3.0.3-r15.ebuild 2540 BLAKE2B c3f2cdd3f0f25cd59311fcf310d9cf44f660203dc69128f0022075286fa796ed7794e69634938515bd41a07a5c6712271dbc050c90c23ecc3b99bfe85d6fc343 SHA512 ac06017cef0a725d02f02de77f5164ccc6524bf70c63bc5bdcd4680349fc2de44ee1e3226a32a6153f09af3c0326292a57452937de2d55c1d6c64a8edf3974ed
-MISC metadata.xml 493 BLAKE2B 36e972b80b557e131d5decb41945968ce24de810197ea457e50081017e50e3926baa419082222cbdfb494a55e9bae125bf304a431234efb4c4a67a8c3536852a SHA512 9f2e53faa5f07d791f7c4cfa7972ed42a26d1abfa5c11faf3e36dce18c2c30d086462e9c0a2c7664153333cb10c3923d47b4bb9e873b7e48dd144e667719a14e
+EBUILD sgmltools-lite-3.0.3-r16.ebuild 2556 BLAKE2B 2832e1838b9cce160538d9c57539d9887a2813f68e92dd59e1f14e8d77692be27092c23d27817574b171ac477a12cb56b0bc6ba525065899cc1a9b41d0c1a67d SHA512 6553c2c8ac76f45a6ca5cdbdccf1575071328c041aa2e695b5a5286c4b6695254c854c01409ffa22d65abdd290e72308f94896a965c8f01a44610664d6aefc66
+MISC metadata.xml 459 BLAKE2B 1a92db84d9abf25e81f6d603fe2b37f68106ebd8485fe7df7983881455826f686f4d923065a14c26e316e55f5a2feb9c244af4b520fdac6dd5f555c565dcc4b9 SHA512 6faa350897ac1a1a3e833ed29c039632333f8874ff0b1f139ffa4a8cbdc21e220357d073ee244665c668ed9c959c93bcd9d471056af75f7a825517436942a413
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
index dae13712da5b..ccd674f2e5f6 100644
--- a/app-text/sgmltools-lite/metadata.xml
+++ b/app-text/sgmltools-lite/metadata.xml
@@ -7,8 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="jadetex">
-			Add support for <pkg>app-text/jadetex</pkg> (for processing
-			tex files produced by the TeX backend of Jade)
+			Add support for processing tex files produced by the TeX
+			backend of Jade
 		</flag>
 	</use>
 	<upstream>
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r16.ebuild
index d315d8225bad..508be43372cb 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r16.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
 	app-text/docbook-sgml-dtd:3.1
 	app-text/docbook-dsssl-stylesheets
 	app-text/openjade
-	jadetex? ( app-text/jadetex )
+	jadetex? ( dev-texlive/texlive-formatsextra )
 	|| (
 		www-client/w3m
 		www-client/lynx
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 4ed274ce4eee..3aecb7d1ff77 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,6 +1,6 @@
 AUX sigil-1.2.1-qt5.15-fix.patch 1228 BLAKE2B 61c4b8de1d7e6a65668f45b6aadebb7c93bad6c82ed415caad3900f009f88f253aa10ca678c76580ef5d3b344cead91390b001aa824e49ad963a45ff259971d3 SHA512 f4a42fa135b03a218c4fa1d2460563d727f90de1a20482ab35bba8ebe2af8484863424664930ad01f14c20772a60c0d60f6472e287ecb69302140df8af6b7b3d
-DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
 DIST sigil-1.2.1.tar.gz 21462439 BLAKE2B b615304d80ae1bc8b202398e4e00e25e6f13130ba5f27239d78cb847813fac6d13ddd868ed8daa496b5a5f2f37914603b3014b2c0ecb9f8ae2f0e5f6f2bdf84b SHA512 763648e5c77df9c34568790700f76a1793445f0ba061e2c8c2032c1de72bc5d5c0e0f671d87140df1b4404d571f6c1c73aa99c57208f7383aa2b0d50ed3c15a1
-EBUILD sigil-0.9.16-r1.ebuild 2960 BLAKE2B f3198426ecfe3f9e01a04a4741049a3e42e54c574a5e8df1500deb5cf632f41c32925b8fee9681da4287b1aaf63eb5c18be4c2372592fb5a7d07796c0fb099a6 SHA512 ce4c4428a22ca2ee06bd38a4cb05c45475a0a2b6ad766128bbfa9d4361ea5bcb756d9167a582e358ba1a80da53e1c1110e51b662a21a708f11b15102d4da35f3
-EBUILD sigil-1.2.1-r1.ebuild 2064 BLAKE2B dac3f83421c2481340fe8d15511de050ea8c0b35e68813f750da9f167b77c2745879a348176d11eb88fbf5998109dc24a96e7695de636945a99e54ed4abd714f SHA512 cf8ac54594d499bbbd68b970785111ceec4653a1613b3d4a7b81f24d33573840ead7332a00dd098a8822b575532bea192e7c3803d7137e96783d8a4d65edd326
+DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 0ded5f2fa4a85a583113d268a0c287727faa9548a95ca3b564efac5db3528e0bf52b0df12f88cda46ae02851b0b85967c23c07cd3cd55073a87bcffbae8dec87 SHA512 fe1cbc2591dbfb54a2c561a3c53684447a4e90d944714bb182ee6ef160df74cc886c4d178d88d24a217643099ff9f409048ea2e5bb8ac88746fd280e48daa1b8
+EBUILD sigil-1.2.1-r1.ebuild 2062 BLAKE2B 246ab17ee83adb4f841c772e44402adc01239e6f3130536b6db2cc0546da219650401afca1bb044c611741e9fdcbf348e47acca07786c42bd341b08bf37672c4 SHA512 62da8924b149912b88d998b5c9431b6061e2290627c8d4d138b514132650d1b8c90894f330b5b1391886c919e5f4c0b4a1f8d063e555061152b313420bcb9589
+EBUILD sigil-1.3.0.ebuild 2014 BLAKE2B bded5f0282a62236f4d7f781c4662e18c89d507d537b746101509dc716c82ebe92f61b5a3d89950c31cb89295213d531847fa8f037aaf52236c80d713b038857 SHA512 9af94b73883ae8f6c58372e126848df9d8a3355aac3b4d5a67afd8b653aa33a414c22d4f1edee5a286974b35161a75cc9d1a0602b8bb3acb2b25375c18243d26
 MISC metadata.xml 932 BLAKE2B c7bf8b421a098f818c9a394cfe656f49fdf6349d762ca2bea588f24dbb0492ca426673f255dffe57dab54fde53408b6fe74bd2cd3b6bfbf31b9814c331de21ca SHA512 0e5c7366b3e0defbc8675c6a33313f6680bb51bc3b67963e79ff03d2f02aa201e5237af43645d1c0e6eb550fad17ca8f9ada9c85a9c4105ddb7a45ef487f726c
diff --git a/app-text/sigil/sigil-0.9.16-r1.ebuild b/app-text/sigil/sigil-0.9.16-r1.ebuild
deleted file mode 100644
index a9492f58a94c..000000000000
--- a/app-text/sigil/sigil-0.9.16-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/boost:=[threads]
-	dev-libs/libpcre:3=[pcre16]
-	dev-libs/xerces-c[icu]
-	$(python_gen_cond_dep \
-		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]')
-	>=dev-qt/qtconcurrent-5.12:5
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgui-5.12:5
-	>=dev-qt/qtprintsupport-5.12:5
-	>=dev-qt/qtwebengine-5.12:5[widgets]
-	>=dev-qt/qtwidgets-5.12:5
-	>=dev-qt/qtxmlpatterns-5.12:5
-	sys-libs/zlib[minizip]
-	plugins? ( $(python_gen_cond_dep \
-		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
-	system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-DOC_CONTENTS="From Sigil's release notes:
-When you fire up Sigil for the very first time:
-navigate to the new General Preferences and select the default
-epub version you plan to work with (epub 2 or epub3) so that new
-empty ebooks start with the correct code.
-if you plan to work with epub3 epubs, you should change your
-PreserveEntities setting to use ONLY NUMERIC entities.
-
-For example use & # 1 6 0 ; for non-breaking spaces and etc.
-
-We strongly recommend enabling Mend On Open in your settings
-for best performance with Sigil."
-
-src_prepare() {
-	# bundled is a exact copy of the package, and upstream plan to switch soon
-	rm -r src/Resource_Files/plugin_launchers/python/css_parser/ || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
-	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-1.2.1-r1.ebuild b/app-text/sigil/sigil-1.2.1-r1.ebuild
index e7b02c1eea76..5f283ccaee82 100644
--- a/app-text/sigil/sigil-1.2.1-r1.ebuild
+++ b/app-text/sigil/sigil-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/sigil/sigil-1.3.0.ebuild b/app-text/sigil/sigil-1.3.0.ebuild
new file mode 100644
index 000000000000..82de9563cb56
--- /dev/null
+++ b/app-text/sigil/sigil-1.3.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="tk"
+
+inherit cmake python-single-r1 xdg-utils
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/libpcre:3=[pcre16]
+	$(python_gen_cond_dep \
+		'dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]')
+	>=dev-qt/qtconcurrent-5.12:5
+	>=dev-qt/qtcore-5.12:5
+	>=dev-qt/qtgui-5.12:5
+	>=dev-qt/qtprintsupport-5.12:5
+	>=dev-qt/qtwebengine-5.12:5[widgets]
+	>=dev-qt/qtwidgets-5.12:5
+	sys-libs/zlib[minizip]
+	plugins? ( $(python_gen_cond_dep \
+		'dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]') )
+	system-mathjax? ( dev-libs/mathjax )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/Sigil-${PV}"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_BUNDLED_DICTS=0
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 17e60f1c456d..915f33f72489 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-1-r1.ebuild 3342 BLAKE2B 44b3cabbc441116f6f4c8a3d03d0033d80e1a8a783474e699d7fd9a2a66c7697ce339b43472faabccf20121b84f00d525a8089f81df6d913532f2777446ef786 SHA512 e6f65cacdfe94994cef8096aae2def0d9c972b95a5edee1b352dd537baef9c4c03b1db80f187a4706b9285fd2a077595c81b6fa7bcb605999d92b06d8714397d
-MISC metadata.xml 378 BLAKE2B 94f101a56061c2386d02786a9f8f023bd97e33629ed7d660f5f62395c8b18a95c5ee6facbdc54b0f4dddc530fa7e07802dd470067087226859e9de9df0f83441 SHA512 066849ccc8fbb9e87e694a0c6e3de55b9d4d685eace107a70287d2aab827231dbb7d2eba8fb5e92dec30de93cb4d8749332a7cdc838d971e298b8c0818ad026d
+EBUILD sword-modules-2.ebuild 11929 BLAKE2B da788ca10be0eeb388ac29ea824208c874336ae216785048c27df2291efb4d7739966b14ea61316d8cfd484990b5c157dd96d8072f19e11c30c492296522a08c SHA512 24dcb484515c9d88fcd9a18d2701f91e4b740525de82bf98db463652c431a3b20105d2849d4e79bf62bfb2e1fa91f26f14653778bb1af72d39dfc848f5510c8f
+MISC metadata.xml 361 BLAKE2B 51316035c5e4197a328d336f328b3b3b777bcd14dfea50f11060624e86ec566b5d4e1bca5f755cd8f165aad8100bcb9c9a8aa12f036ad4df52276a9a16fab51f SHA512 61c6526b5fd049d5c13ee6af9bae3eaabc7151fe45de3ba63869a5ef8f2a4b00a4257c5a8d244f245b4e3f92d47a97a54c83ad03bf0742c1dda143efe392a10d
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
index ff3976de5780..f24236186ef2 100644
--- a/app-text/sword-modules/metadata.xml
+++ b/app-text/sword-modules/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>theology@gentoo.org</email>
-</maintainer>
-<longdescription>
-These are some of the more popular modules for the SWORD Project.
-They provide a large number of tools for personal study.
-</longdescription>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<use>
+		<flag name="esoteric">Install modules with no linguistic content, in unknown languages etc.</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/sword-modules/sword-modules-1-r1.ebuild b/app-text/sword-modules/sword-modules-1-r1.ebuild
deleted file mode 100644
index ada05b1a4dd3..000000000000
--- a/app-text/sword-modules/sword-modules-1-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="A collection of modules for the SWORD project"
-HOMEPAGE="http://www.crosswire.org/sword/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-dicts/sword-abbott
-	app-dicts/sword-acv
-	app-dicts/sword-afr1953
-	app-dicts/sword-akjv
-	app-dicts/sword-alb
-	app-dicts/sword-aleppo
-	app-dicts/sword-amtract
-	app-dicts/sword-arasvd
-	app-dicts/sword-asv
-	app-dicts/sword-barnes
-	app-dicts/sword-bbe
-	app-dicts/sword-bulveren
-	app-dicts/sword-byz
-	app-dicts/sword-cbc
-	app-dicts/sword-chamorro
-	app-dicts/sword-clarke
-	app-dicts/sword-common
-	app-dicts/sword-cro
-	app-dicts/sword-czebkr
-	app-dicts/sword-daily
-	app-dicts/sword-dan
-	app-dicts/sword-darby
-	app-dicts/sword-diaglott
-	app-dicts/sword-drc
-	app-dicts/sword-dtn
-	app-dicts/sword-dutkant
-	app-dicts/sword-dutsvv
-	app-dicts/sword-easton
-	app-dicts/sword-esperanto
-	app-dicts/sword-farsiopv
-	app-dicts/sword-finbiblia
-	app-dicts/sword-finney
-	app-dicts/sword-finpr
-	app-dicts/sword-frelsg
-	app-dicts/sword-geneva1599
-	app-dicts/sword-gerelb1871
-	app-dicts/sword-gerelb1905
-	app-dicts/sword-gerlut1545
-	app-dicts/sword-gersch
-	app-dicts/sword-greekhebrew
-	app-dicts/sword-hebrewgreek
-	app-dicts/sword-heretics
-	app-dicts/sword-hitchcock
-	app-dicts/sword-hnv
-	app-dicts/sword-hunkar
-	app-dicts/sword-institutes
-	app-dicts/sword-isbe
-	app-dicts/sword-isv
-	app-dicts/sword-itadio
-	app-dicts/sword-itarive
-	app-dicts/sword-jfb
-	app-dicts/sword-josephus
-	app-dicts/sword-jps
-	app-dicts/sword-jst
-	app-dicts/sword-jubilee2000
-	app-dicts/sword-kjv
-	app-dicts/sword-kjvd
-	app-dicts/sword-klv
-	app-dicts/sword-klven_iklingon
-	app-dicts/sword-klviklingon_en
-	app-dicts/sword-lightfoot
-	app-dicts/sword-litv
-	app-dicts/sword-luther
-	app-dicts/sword-mak
-	app-dicts/sword-manxgaelic
-	app-dicts/sword-mhc
-	app-dicts/sword-mhcc
-	app-dicts/sword-mkjv
-	app-dicts/sword-montgomery
-	app-dicts/sword-murdock
-	app-dicts/sword-nave
-	app-dicts/sword-norsk
-	app-dicts/sword-orthodoxy
-	app-dicts/sword-packard
-	app-dicts/sword-personal
-	app-dicts/sword-peshitta
-	app-dicts/sword-pilgrim
-	app-dicts/sword-pnt
-	app-dicts/sword-practice
-	app-dicts/sword-rkjnt
-	app-dicts/sword-rnkjv
-	app-dicts/sword-robinson
-	app-dicts/sword-rotherham
-	app-dicts/sword-rst
-	app-dicts/sword-rusmakarij
-	app-dicts/sword-rwebster
-	app-dicts/sword-rwp
-	app-dicts/sword-saoa
-	app-dicts/sword-scofield
-	app-dicts/sword-scotsgaelic
-	app-dicts/sword-sme
-	app-dicts/sword-smith
-	app-dicts/sword-sparv
-	app-dicts/sword-sparvg2004
-	app-dicts/sword-spasev
-	app-dicts/sword-spavnt
-	app-dicts/sword-spurious
-	app-dicts/sword-strongsgreek
-	app-dicts/sword-strongshebrew
-	app-dicts/sword-swahili
-	app-dicts/sword-tagalog
-	app-dicts/sword-tcr
-	app-dicts/sword-tdavid
-	app-dicts/sword-tfg
-	app-dicts/sword-tisch
-	app-dicts/sword-torrey
-	app-dicts/sword-tr
-	app-dicts/sword-tsk
-	app-dicts/sword-twenty
-	app-dicts/sword-tyndale
-	app-dicts/sword-ukjv
-	app-dicts/sword-ukrainian
-	app-dicts/sword-uma
-	app-dicts/sword-vulgate
-	app-dicts/sword-vulgate_hebps
-	app-dicts/sword-web
-	app-dicts/sword-webster
-	app-dicts/sword-webstersdict
-	app-dicts/sword-wesley
-	app-dicts/sword-weymouth
-	app-dicts/sword-whnu
-	app-dicts/sword-wlc
-	app-dicts/sword-wulfila
-	app-dicts/sword-wycliffe
-	app-dicts/sword-ylt"
diff --git a/app-text/sword-modules/sword-modules-2.ebuild b/app-text/sword-modules/sword-modules-2.ebuild
new file mode 100644
index 000000000000..8229d7f3c1cf
--- /dev/null
+++ b/app-text/sword-modules/sword-modules-2.ebuild
@@ -0,0 +1,566 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="All the unlocked modules for app-text/sword, grouped by language"
+HOMEPAGE="https://www.crosswire.org/sword/modules/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" af ar az be bea bg bla br ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
+IUSE="-esoteric ${LANGS// / l10n_}"
+
+RDEPEND="
+	|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs )
+	app-dicts/sword-Personal
+	esoteric? (
+		app-dicts/sword-Phaistos
+		app-dicts/sword-Sentiment
+	)
+	l10n_af? (
+		app-dicts/sword-Afr1953
+	)
+	l10n_ar? (
+		app-dicts/sword-AraNAV
+		app-dicts/sword-AraSVD
+		app-dicts/sword-alzat
+	)
+	l10n_az? (
+		app-dicts/sword-Azeri
+		app-dicts/sword-NorthernAzeri
+	)
+	l10n_be? (
+		app-dicts/sword-Bela
+	)
+	l10n_bea? (
+		app-dicts/sword-BeaMRK
+	)
+	l10n_bg? (
+		app-dicts/sword-BulVeren
+	)
+	l10n_bla? (
+		app-dicts/sword-BlaMat
+	)
+	l10n_br? (
+		app-dicts/sword-BretonNT
+		app-dicts/sword-br_en
+	)
+	l10n_ch? (
+		app-dicts/sword-Chamorro
+	)
+	l10n_chr? (
+		app-dicts/sword-Che1860
+	)
+	l10n_ckb? (
+		app-dicts/sword-Sorani
+	)
+	l10n_cop? (
+		app-dicts/sword-CopNT
+		app-dicts/sword-CopSahBible2
+		app-dicts/sword-CopSahHorner
+		app-dicts/sword-CopSahidicMSS
+		app-dicts/sword-CopSahidica
+		app-dicts/sword-SahidicBible
+	)
+	l10n_cs? (
+		app-dicts/sword-CzeB21
+		app-dicts/sword-CzeBKR
+		app-dicts/sword-CzeCEP
+		app-dicts/sword-CzeCSP
+	)
+	l10n_cu? (
+		app-dicts/sword-CSlElizabeth
+	)
+	l10n_cy? (
+		app-dicts/sword-WelBeiblNet
+	)
+	l10n_da? (
+		app-dicts/sword-DaNT1819
+		app-dicts/sword-DaOT1871NT1907
+		app-dicts/sword-DaOT1931NT1907
+	)
+	l10n_de? (
+		app-dicts/sword-GerAlbrecht
+		app-dicts/sword-GerAugustinus
+		app-dicts/sword-GerElb1871
+		app-dicts/sword-GerElb1905
+		app-dicts/sword-GerGruenewald
+		app-dicts/sword-GerLeoNA28
+		app-dicts/sword-GerLeoRP18
+		app-dicts/sword-GerLut1545
+		app-dicts/sword-GerLutherpredigten
+		app-dicts/sword-GerNeUe
+		app-dicts/sword-GerReinhardt
+		app-dicts/sword-GerSch
+		app-dicts/sword-GerTafel
+		app-dicts/sword-GerTextbibel
+		app-dicts/sword-MAK
+		app-dicts/sword-Rieger
+	)
+	l10n_el? (
+		app-dicts/sword-GreVamvas
+	)
+	l10n_en? (
+		app-dicts/sword-2BabDict
+		app-dicts/sword-AB
+		app-dicts/sword-ABP
+		app-dicts/sword-ABS_Essay_GoodSam_SWB
+		app-dicts/sword-ACV
+		app-dicts/sword-AKJV
+		app-dicts/sword-ASV
+		app-dicts/sword-Abbott
+		app-dicts/sword-AbbottSmith
+		app-dicts/sword-AbbottSmithStrongs
+		app-dicts/sword-AmTract
+		app-dicts/sword-Anderson
+		app-dicts/sword-BBE
+		app-dicts/sword-BDBGlosses_Strongs
+		app-dicts/sword-BWE
+		app-dicts/sword-BaptistConfession1689
+		app-dicts/sword-Barnes
+		app-dicts/sword-Burkitt
+		app-dicts/sword-CBC
+		app-dicts/sword-CPDV
+		app-dicts/sword-Catena
+		app-dicts/sword-Cawdrey
+		app-dicts/sword-Clarke
+		app-dicts/sword-Common
+		app-dicts/sword-Concord
+		app-dicts/sword-DBD
+		app-dicts/sword-DRC
+		app-dicts/sword-DTN
+		app-dicts/sword-Daily
+		app-dicts/sword-Darby
+		app-dicts/sword-DarkNightOfTheSoul
+		app-dicts/sword-Diaglott
+		app-dicts/sword-Dodson
+		app-dicts/sword-EMBReality
+		app-dicts/sword-EMTV
+		app-dicts/sword-Easton
+		app-dicts/sword-Etheridge
+		app-dicts/sword-Family
+		app-dicts/sword-Finney
+		app-dicts/sword-Geneva
+		app-dicts/sword-Geneva1599
+		app-dicts/sword-Godbey
+		app-dicts/sword-GodsWord
+		app-dicts/sword-Heretics
+		app-dicts/sword-Hitchcock
+		app-dicts/sword-ISBE
+		app-dicts/sword-ISV
+		app-dicts/sword-Imitation
+		app-dicts/sword-Institutes
+		app-dicts/sword-JCRHoliness
+		app-dicts/sword-JEAffections
+		app-dicts/sword-JESermons
+		app-dicts/sword-JFB
+		app-dicts/sword-JOChrist
+		app-dicts/sword-JOCommGod
+		app-dicts/sword-JOGlory
+		app-dicts/sword-JOMortSin
+		app-dicts/sword-JPS
+		app-dicts/sword-JST
+		app-dicts/sword-Josephus
+		app-dicts/sword-Jubilee2000
+		app-dicts/sword-KD
+		app-dicts/sword-KJV
+		app-dicts/sword-KJVA
+		app-dicts/sword-KJVPCE
+		app-dicts/sword-LEB
+		app-dicts/sword-LITV
+		app-dicts/sword-LO
+		app-dicts/sword-LawGospel
+		app-dicts/sword-Leeser
+		app-dicts/sword-Lightfoot
+		app-dicts/sword-Luther
+		app-dicts/sword-MHC
+		app-dicts/sword-MHCC
+		app-dicts/sword-MKJV
+		app-dicts/sword-MLStrong
+		app-dicts/sword-MollColossians
+		app-dicts/sword-Montgomery
+		app-dicts/sword-Murdock
+		app-dicts/sword-NETfree
+		app-dicts/sword-NETnotesfree
+		app-dicts/sword-NETtext
+		app-dicts/sword-NHEB
+		app-dicts/sword-NHEBJE
+		app-dicts/sword-NHEBME
+		app-dicts/sword-Nave
+		app-dicts/sword-Noyes
+		app-dicts/sword-OEB
+		app-dicts/sword-OEBcth
+		app-dicts/sword-OSHM
+		app-dicts/sword-OrthJBC
+		app-dicts/sword-Orthodoxy
+		app-dicts/sword-PNT
+		app-dicts/sword-Packard
+		app-dicts/sword-Passion
+		app-dicts/sword-Pilgrim
+		app-dicts/sword-Practice
+		app-dicts/sword-QuotingPassages
+		app-dicts/sword-RKJNT
+		app-dicts/sword-RNKJV
+		app-dicts/sword-RWP
+		app-dicts/sword-RWebster
+		app-dicts/sword-RecVer
+		app-dicts/sword-Robinson
+		app-dicts/sword-Rotherham
+		app-dicts/sword-SAOA
+		app-dicts/sword-SME
+		app-dicts/sword-SPE
+		app-dicts/sword-Scofield
+		app-dicts/sword-Smith
+		app-dicts/sword-Spurious
+		app-dicts/sword-StrongsGreek
+		app-dicts/sword-StrongsHebrew
+		app-dicts/sword-TCR
+		app-dicts/sword-TDavid
+		app-dicts/sword-TFG
+		app-dicts/sword-TSK
+		app-dicts/sword-Torrey
+		app-dicts/sword-Twenty
+		app-dicts/sword-Tyndale
+		app-dicts/sword-UKJV
+		app-dicts/sword-Webster
+		app-dicts/sword-Webster1806
+		app-dicts/sword-Webster1913
+		app-dicts/sword-Wesley
+		app-dicts/sword-Westminster
+		app-dicts/sword-Westminster21
+		app-dicts/sword-Weymouth
+		app-dicts/sword-Worsley
+		app-dicts/sword-Wycliffe
+		app-dicts/sword-YLT
+	)
+	l10n_eo? (
+		app-dicts/sword-Esperanto
+	)
+	l10n_es? (
+		app-dicts/sword-SpaRV
+		app-dicts/sword-SpaRV1865
+		app-dicts/sword-SpaRV1909
+		app-dicts/sword-SpaRVG
+		app-dicts/sword-SpaTDP
+		app-dicts/sword-SpaVNT
+	)
+	l10n_et? (
+		app-dicts/sword-Est
+	)
+	l10n_eu? (
+		app-dicts/sword-BasHautin
+		app-dicts/sword-en_eu
+	)
+	l10n_fa? (
+		app-dicts/sword-FarHezareNoh
+		app-dicts/sword-FarOPV
+		app-dicts/sword-FarTPV
+	)
+	l10n_fi? (
+		app-dicts/sword-FinBiblia
+		app-dicts/sword-FinPR
+		app-dicts/sword-FinPR92
+		app-dicts/sword-FinRK
+		app-dicts/sword-FinSTLK2017
+	)
+	l10n_fr? (
+		app-dicts/sword-FreBBB
+		app-dicts/sword-FreBDM1707
+		app-dicts/sword-FreBDM1744
+		app-dicts/sword-FreBailly
+		app-dicts/sword-FreCJE
+		app-dicts/sword-FreCrampon
+		app-dicts/sword-FreDAW
+		app-dicts/sword-FreGBM
+		app-dicts/sword-FreGeneve1669
+		app-dicts/sword-FreJND
+		app-dicts/sword-FreKhan
+		app-dicts/sword-FreLSN1872
+		app-dicts/sword-FreLXX
+		app-dicts/sword-FreOltramare1874
+		app-dicts/sword-FrePGR
+		app-dicts/sword-FrePilgrim
+		app-dicts/sword-FreSegond1910
+		app-dicts/sword-FreStapfer1889
+		app-dicts/sword-FreSynodale1921
+	)
+	l10n_ga? (
+		app-dicts/sword-IriODomhnuill
+	)
+	l10n_gd? (
+		app-dicts/sword-ScotsGaelic
+	)
+	l10n_gez? (
+		app-dicts/sword-Geez
+	)
+	l10n_got? (
+		app-dicts/sword-Wulfila
+	)
+	l10n_grc? (
+		app-dicts/sword-ABPGRK
+		app-dicts/sword-Antoniades
+		app-dicts/sword-Byz
+		app-dicts/sword-Elzevir
+		app-dicts/sword-GreekHebrew
+		app-dicts/sword-LXX
+		app-dicts/sword-MorphGNT
+		app-dicts/sword-Nestle1904
+		app-dicts/sword-OxfordTR
+		app-dicts/sword-SBLGNT
+		app-dicts/sword-SBLGNTApp
+		app-dicts/sword-TNT
+		app-dicts/sword-TR
+		app-dicts/sword-Tisch
+		app-dicts/sword-VarApp
+		app-dicts/sword-WHNU
+		app-dicts/sword-f35
+	)
+	l10n_gv? (
+		app-dicts/sword-ManxGaelic
+	)
+	l10n_he? (
+		app-dicts/sword-Aleppo
+		app-dicts/sword-HebDelitzsch
+		app-dicts/sword-HebModern
+		app-dicts/sword-HebrewGreek
+		app-dicts/sword-MapM
+		app-dicts/sword-OSHB
+		app-dicts/sword-SP
+		app-dicts/sword-SPDSS
+		app-dicts/sword-SPMT
+		app-dicts/sword-SPVar
+		app-dicts/sword-WLC
+	)
+	l10n_hi? (
+		app-dicts/sword-HinERV
+	)
+	l10n_hr? (
+		app-dicts/sword-CroSaric
+	)
+	l10n_ht? (
+		app-dicts/sword-Haitian
+	)
+	l10n_hu? (
+		app-dicts/sword-HunKar
+		app-dicts/sword-HunUj
+	)
+	l10n_hy? (
+		app-dicts/sword-ArmEastern
+		app-dicts/sword-ArmWestern
+	)
+	l10n_it? (
+		app-dicts/sword-ItDizGreco
+		app-dicts/sword-ItNomiBibbia
+		app-dicts/sword-ItaDio
+		app-dicts/sword-ItaRive
+	)
+	l10n_ja? (
+		app-dicts/sword-JapBungo
+		app-dicts/sword-JapDenmo
+		app-dicts/sword-JapKougo
+		app-dicts/sword-JapMeiji
+		app-dicts/sword-JapRaguet
+	)
+	l10n_kek? (
+		app-dicts/sword-Kekchi
+	)
+	l10n_kk? (
+		app-dicts/sword-Kaz
+	)
+	l10n_km? (
+		app-dicts/sword-KhmerNT
+	)
+	l10n_ko? (
+		app-dicts/sword-KorHKJV
+		app-dicts/sword-KorRV
+	)
+	l10n_kpg? (
+		app-dicts/sword-Kapingamarangi
+	)
+	l10n_ktu? (
+		app-dicts/sword-KtuVb
+	)
+	l10n_la? (
+		app-dicts/sword-VulgClementine
+		app-dicts/sword-VulgConte
+		app-dicts/sword-VulgGlossa
+		app-dicts/sword-VulgHetzenauer
+		app-dicts/sword-VulgSistine
+		app-dicts/sword-Vulgate
+		app-dicts/sword-Vulgate_HebPs
+		app-dicts/sword-la_en
+	)
+	l10n_ln? (
+		app-dicts/sword-LinVB
+	)
+	l10n_lt? (
+		app-dicts/sword-LtKBB
+	)
+	l10n_lv? (
+		app-dicts/sword-Latvian
+		app-dicts/sword-LvGluck8
+	)
+	l10n_mg? (
+		app-dicts/sword-Mg1865
+	)
+	l10n_mi? (
+		app-dicts/sword-Maori
+	)
+	l10n_ml? (
+		app-dicts/sword-Mal1910
+	)
+	l10n_mn? (
+		app-dicts/sword-MonKJV
+	)
+	l10n_my? (
+		app-dicts/sword-BurCBCM
+		app-dicts/sword-BurJudson
+	)
+	l10n_nb? (
+		app-dicts/sword-NorBroed
+		app-dicts/sword-Norsk
+	)
+	l10n_nd? (
+		app-dicts/sword-Ndebele
+	)
+	l10n_nl? (
+		app-dicts/sword-DutKant
+		app-dicts/sword-DutSVV
+		app-dicts/sword-NlCanisius1939
+	)
+	l10n_nn? (
+		app-dicts/sword-NorSMB
+	)
+	l10n_pl? (
+		app-dicts/sword-PolGdanska
+		app-dicts/sword-PolUGdanska
+	)
+	l10n_pon? (
+		app-dicts/sword-PohnOld
+		app-dicts/sword-Pohnpeian
+	)
+	l10n_pot? (
+		app-dicts/sword-PotLykins
+	)
+	l10n_ppk? (
+		app-dicts/sword-Uma
+	)
+	l10n_prs? (
+		app-dicts/sword-Dari
+	)
+	l10n_pt? (
+		app-dicts/sword-PorAR
+		app-dicts/sword-PorAlmeida1911
+		app-dicts/sword-PorBLivre
+		app-dicts/sword-PorBLivreTR
+		app-dicts/sword-PorCap
+		app-dicts/sword-PorIBP
+	)
+	l10n_rmq? (
+		app-dicts/sword-Calo
+	)
+	l10n_ro? (
+		app-dicts/sword-RomCor
+	)
+	l10n_ru? (
+		app-dicts/sword-RusCARS
+		app-dicts/sword-RusCARSA
+		app-dicts/sword-RusCARSADICT
+		app-dicts/sword-RusCARSDict
+		app-dicts/sword-RusCARST
+		app-dicts/sword-RusCARSTDICT
+		app-dicts/sword-RusMakarij
+		app-dicts/sword-RusSynodal
+		app-dicts/sword-RusSynodalLIO
+		app-dicts/sword-RusVZh
+	)
+	l10n_sl? (
+		app-dicts/sword-SloKJV
+		app-dicts/sword-SloKJVA
+		app-dicts/sword-SloOjacano
+		app-dicts/sword-SloStritar
+	)
+	l10n_sml? (
+		app-dicts/sword-sml_BL_2008
+	)
+	l10n_sn? (
+		app-dicts/sword-Shona
+	)
+	l10n_so? (
+		app-dicts/sword-SomKQA
+	)
+	l10n_sq? (
+		app-dicts/sword-Alb
+	)
+	l10n_sr? (
+		app-dicts/sword-SrKDEkavski
+		app-dicts/sword-SrKDIjekav
+	)
+	l10n_sv? (
+		app-dicts/sword-Swe1917
+		app-dicts/sword-Swe1917Of
+		app-dicts/sword-SweFolk1998
+		app-dicts/sword-SweKarlXII
+		app-dicts/sword-SweKarlXII1873
+	)
+	l10n_sw? (
+		app-dicts/sword-Swahili
+	)
+	l10n_syr? (
+		app-dicts/sword-Peshitta
+	)
+	l10n_th? (
+		app-dicts/sword-ThaiKJV
+	)
+	l10n_tl? (
+		app-dicts/sword-TagAngBiblia
+		app-dicts/sword-Tagalog
+	)
+	l10n_tlh? (
+		app-dicts/sword-KLV
+		app-dicts/sword-KLVen_iklingon
+		app-dicts/sword-KLViklingon_en
+	)
+	l10n_tr? (
+		app-dicts/sword-TurHADI
+		app-dicts/sword-TurNTB
+	)
+	l10n_tsg? (
+		app-dicts/sword-Tausug
+	)
+	l10n_ug? (
+		app-dicts/sword-UyCyr
+	)
+	l10n_uk? (
+		app-dicts/sword-UkrKulish
+		app-dicts/sword-Ukrainian
+	)
+	l10n_ur? (
+		app-dicts/sword-UrduGeo
+		app-dicts/sword-UrduGeoDeva
+		app-dicts/sword-UrduGeoRoman
+	)
+	l10n_vi? (
+		app-dicts/sword-FVDPVietAnh
+		app-dicts/sword-Viet
+		app-dicts/sword-VietLCCMN
+		app-dicts/sword-VietLCCMNCT
+		app-dicts/sword-VietNVB
+	)
+	l10n_vls? (
+		app-dicts/sword-vlsJoNT
+	)
+	l10n_zh? (
+		app-dicts/sword-ChiNCVs
+		app-dicts/sword-ChiNCVt
+		app-dicts/sword-ChiUn
+		app-dicts/sword-ChiUnL
+		app-dicts/sword-ChiUns
+		app-dicts/sword-ZhEnglish
+		app-dicts/sword-ZhHanzi
+		app-dicts/sword-ZhPinyin
+	)
+"
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 5859a055f208..a95adde22dfb 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,8 +1,5 @@
 AUX sword-1.7.4-configure.patch 816 BLAKE2B 6b1dc70d5146178be9e2e650b6a46f9a64dfbab2edfddeea7c4f3825c00ccf1af7fe328b86be90c3730ecb928ae9fe1c4558f3a0bcb6acfba6a207a48c32b3f6 SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186
-AUX sword-1.7.4-gcc6.patch 626 BLAKE2B 69b56ed6152d07962d5941868925ac35825256e4db22cc435c7580694925694902eb6c322d143af7148ea4a60828e059409625e9415cbb5f8905d98b4a1d85c5 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04
 AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d414424fc3ca7618a098d6e3ee82c440eb95c3370eeb0dbe46a4abe7ccc0c62e7b725cfed0f8ec0951e11099627337 SHA512 7bd545014ea81fa5f6203d39fd1a4125ae163ac51fe76270511b1df65d4dbf44b912fbaf3fa6a6d6a20370efc3abfff9feabe5de7177981ce1b62f4d9c5ce49d
-DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
 DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
-EBUILD sword-1.7.4-r1.ebuild 1964 BLAKE2B fd911784f0d72c29f0a1fbdaf5df45594ba95428d654e65f8b9f3d88752ac7c651ff7b00441b90db1917141f962b022e33e8ef92e6d9a6c2ba5f0068629926f7 SHA512 a0a1698b1160feac54e444f951b60c661823ee25652ad4f219074b71a6d01f8f90ca03f381988e734849a28d45400c8e7fbbfc0ee8442393ba2a3225a2c0450b
-EBUILD sword-1.8.1-r1.ebuild 1816 BLAKE2B fb8a0b982e10ef201181308adc42fd235dce26c4bfbfa87e4ae3870373bc50116feac875d30e688178d174a727886175ec6cbc26307da152eebb220cdc454cea SHA512 070f6efa7131ec2559826431c926be8630d862f584280c5aa09d5ae942bf6e189443bf144f759aa6e95adf5db046a772bb69386685ad3248c6aed5a467a5d199
-MISC metadata.xml 564 BLAKE2B b7ed0b7e3e245079c82d4ebcb446a1e864e0f72610ac9c60d98fbfc73c7d078f12ddb7d1650fbc3816ac292c8c6b122990a71b0e99056eb21bdb4f3a8dc8b3ec SHA512 74ff38bf540aa48eb0195c7999adcf1226ede7ca4a6848a45b73913011f95e2bb7d84e0ca0534d2ee2610efee78234a52ae69f507704bb0ec80e4876a5d4aadc
+EBUILD sword-1.8.1-r1.ebuild 1818 BLAKE2B bfb01f3537feccb057fd34fc0784af7ea955164e2b6f195ad10f85f0a5759ba14e3626895d11f4ed31f43ecb3c0d479330c75bbf9e5622b522827390f76c72d4 SHA512 05577095fb4cede4cb549dc18af636937523bf6089fa70e0c73b91464799e2eb134ab0179c293fa5ec2acb5ee8e328fd5c3e19aef5b298abb2757d15841f2cf4
+MISC metadata.xml 593 BLAKE2B 945677f76cbe16a77999ede8bd2c7ee6926c2aade70dbc1a8125fa30c73130601f21a47e4ec34a70121ea7b61c98c10748ec17933bde0d98d7d32cd5e28cb37b SHA512 4c11d1b66bb60f21d8706f25f4541147ece1a75f5a1676c75d7be39b8af982bb35fd743fe040204415c3a89f8729c7bb6e83e3bd66ccd5114b4d3739b876a4d8
diff --git a/app-text/sword/files/sword-1.7.4-gcc6.patch b/app-text/sword/files/sword-1.7.4-gcc6.patch
deleted file mode 100644
index 54c79671235e..000000000000
--- a/app-text/sword/files/sword-1.7.4-gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sword-1.7.4/configure.ac.old	2016-09-21 18:04:55.029088352 -0400
-+++ sword-1.7.4/configure.ac	2016-09-21 18:05:37.870349308 -0400
-@@ -197,7 +197,7 @@
- fi
- 
- 
--AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-+AM_CXXFLAGS="$AM_CXXFLAGS"
- 
- if test x$enable_warnings = xyes; then
-   AM_CFLAGS="$AM_CFLAGS -Werror"
---- sword-1.7.4/configure.old	2016-09-21 18:05:05.900008373 -0400
-+++ sword-1.7.4/configure	2016-09-21 18:06:03.822112657 -0400
-@@ -16793,7 +16793,7 @@
- fi
- 
- 
--AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-+AM_CXXFLAGS="$AM_CXXFLAGS"
- 
- if test x$enable_warnings = xyes; then
-   AM_CFLAGS="$AM_CFLAGS -Werror"
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index fb9230654d3a..760864b569c2 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>theology@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
 The SWORD Project is the CrossWire Bible Society's free Bible software
 project. Its purpose is to create tools that allow programmers and Bible
 societies to write new Bible software more quickly and easily.
-</longdescription>
-<use>
-    <flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/sword/sword-1.7.4-r1.ebuild b/app-text/sword/sword-1.7.4-r1.ebuild
deleted file mode 100644
index 99a6880de9ce..000000000000
--- a/app-text/sword/sword-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/"
-SRC_URI="http://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 static-libs"
-
-RDEPEND="sys-libs/zlib
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu:= )
-	clucene? ( dev-cpp/clucene )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS CODINGSTYLE ChangeLog README"
-
-RESTRICT="test"	#Restricting for now, see bug 313207
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
-		-e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
-		configure || die
-
-	sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
-	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
-
-	cat <<-EOF > "${T}"/${PN}.conf
-	[Install]
-	DataPath=${EPREFIX}/usr/share/${PN}/
-	EOF
-	epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
-	epatch "${FILESDIR}/${PN}-1.7.4-configure.patch"
-	eapply_user
-}
-
-src_configure() {
-	# TODO: Why is this here and can we remove it?
-	strip-flags
-
-	# bug 618776
-	append-cxxflags -std=c++14
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		--with-zlib \
-		$(use_with icu) \
-		--with-conf \
-		$(use_with curl) \
-		$(use_with clucene)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use doc; then
-		rm -rf examples/.cvsignore
-		rm -rf examples/cmdline/.cvsignore
-		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
-	fi
-
-	insinto /etc
-	doins "${T}"/${PN}.conf
-}
-
-pkg_postinst() {
-	elog "Check out http://www.crosswire.org/sword/modules/"
-	elog "to download modules that you would like to use with SWORD."
-	elog "Follow module installation instructions found on"
-	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/app-text/sword/sword-1.8.1-r1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild
index acafbb4e5311..7da3c1961d47 100644
--- a/app-text/sword/sword-1.8.1-r1.ebuild
+++ b/app-text/sword/sword-1.8.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic cmake-utils
 
 DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/"
-SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+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"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 79edbaf50761..a37971d477e3 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-DIST texlive-core-patches-2020-4.tar.xz 12188 BLAKE2B 7162ef9e3d22367f76a9759a5ed3995f7bd5cb5ac7961778216eaf57e81611483481c72a45ec76666cf9fdc0bb05a2b5b33f3de8270efc96640847f8c6f1a9fd SHA512 13b3ca5d86dead6af53774ad5c4c74a6f1c63805fe6f3ba10ada07e081a5d3d47e06e398c139e015eeee2c5110c295de4f366f1e4bb4fb6b72d99a2a2fadeef9
+DIST texlive-core-patches-2020-5.tar.xz 13132 BLAKE2B 2117b0b44078cc4af26337c6407441ee660848e29bc190340b36be80fe2d52998da2d8799f0f7943670c29f33968c06464d92c2bce6fb238170be72d6acb2337 SHA512 65063f212732c801926bc97d639a9b71389f30b247b0299decb3d1d8a4c9770d314f348c50b9dde1d455f2531e1b8a8513eaf5fc0c35455d5dd87f3b3374d5e3
 DIST texlive-tlpdb-2020.tar.xz 1261796 BLAKE2B b070f09024a8a12ffc73f8ef6e82026b0d1cc963e50fb0b4c1226043f642db90cf18cd888b3bd4a1b559080b4a55b78b29b44d3456f39b7b9ce09e8edc29a166 SHA512 587433bada2333df2462b4adc012278f4f5f01cf85243fb0c2e46bfffa46e1ec7b34abfb8a0415eb071acd87f4abaa509b1f1c7b2500f3cdb6e127b89a1a58ab
 DIST tl-a2ping-2020.tar.xz 30652 BLAKE2B 63e857ba7142751828669bc00d9689f000effddecc221a03943f508e69a28bdc675707527b47a5444ac9881268b1d9abe372d0bbcde78007aaf81c69b15421dd SHA512 4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420
 DIST tl-a2ping.doc-2020.tar.xz 39744 BLAKE2B 4de3d1df0a1af62c203c1398faec9918ec38ee306105cc31f9534117b5dc58f0b14442005a7b0fdd239eb2e40b8d6a84b7dfa7e7e93ded4b83fe636e6c6cf3df SHA512 7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb
@@ -184,5 +184,5 @@ DIST tl-xindy-2020.tar.xz 141192 BLAKE2B 47a053cf02e7ead9a86801731e211663c5ead7f
 DIST tl-xindy.doc-2020.tar.xz 406620 BLAKE2B 143e9810da19aa0bd9080801ceb42923bd5c8ceb6a1055e6916489a306b40bfd6977a7b17b3434ee04c88ee975a5313c3beffb536b1e867ce6e7eeab1df3b1b5 SHA512 9e6c10388a7a707695e2965c3e3b851f939a68997cf880560a4a05ca3a167febeee9f1a7803cff1927bf7aecf0d6baac65bc4827c367f9c2d086d17d5947d64c
 DIST tl-xpdfopen-2020.tar.xz 580 BLAKE2B dd5bba56ad86e209daf6030f5aabf59c41a0474142e81a840b647ae2abf744d0a53ff76ba1581bf2f7de0db4432bcd607553fc3a2e5bb739e483357f02ed454b SHA512 4bc35a5699e39b12f6f38b48ed7e136e9c5c54cbcad71119d7ffcb0688df9739187b4e0042782a2678233b289902b24c6537ba10303ff26846bfe73b98c9f54e
 DIST tl-xpdfopen.doc-2020.tar.xz 28176 BLAKE2B ba0a9f1621999a8d98dd96f72fb93cd7a380e1f6285d2d59dac812e68ac91c08e815756553e10ff8cf1042dcbfa71bb994abab000910cdb1e6ddf113eefc481a SHA512 8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32
-EBUILD texlive-core-2020-r5.ebuild 12079 BLAKE2B fd9a7b37e52bda9290eb88fc19a5af4551002aa505f52009dde37a822be657273e06e218eafa8ce08e0879bc19b7582f786456e18e95bac3cda5ab06ba4651dd SHA512 f8f08cf86bff653a375829bbc6ec5ffb4ce79b4938007e827b23bf405c63a5e60c1b3a98ed8c66f7e727a12e83bd506f3db5ad7c0bf001346add3927db984cbf
+EBUILD texlive-core-2020-r9.ebuild 11849 BLAKE2B 0573d85de0bccd65f82da5950d6c46c08384e56582399521a57f9ceb8fcf947d7a2edde56dde8a40035eaa5014b0c7e9cf8b37a2cbaa31ebaf7ef1314037e90d SHA512 1777a296244379b11ec75cb06e6cc4348a6aa468e99488d67e9a63eb925100fc85825b6535c3381657e95eeec2de157d6b8c84a7e44bb0b54644dc77a8cfd407
 MISC metadata.xml 747 BLAKE2B 86f6b1dbfe55c17e841ed5cf89a20e3da7bcf895b0481a7460ee2577dd1927548b6dc7f7c618c3bc08bac73a8a33ac20632391a9533cade342d78f2ef92caedf SHA512 96e9763e09319a9f49ba9b62f09497ed422ad5d1111c3c850351f5cd13537bdeedd2cb0539aeafe09fd3cbab6dc87db7366de3994189f2123fbfc2b8090ed98d
diff --git a/app-text/texlive-core/texlive-core-2020-r5.ebuild b/app-text/texlive-core/texlive-core-2020-r9.ebuild
index 525e0874fe5a..44eb986c0a9b 100644
--- a/app-text/texlive-core/texlive-core-2020-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2020-r9.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common
 
 MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
 
-PATCHLEVEL=4
+PATCHLEVEL=5
 
 DESCRIPTION="A complete TeX distribution"
 HOMEPAGE="https://tug.org/texlive/"
@@ -75,7 +75,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="cjk X doc source tk +luajittex xetex xindy"
 
 TEXMF_PATH=/usr/share/texmf-dist
@@ -86,6 +86,9 @@ MODULAR_X_DEPEND="X? (
 	)"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/vlna
+	!app-eselect/eselect-mpost
+	!app-eselect/eselect-pdftex
 	!app-text/xindy
 	!~dev-texlive/texlive-basic-2019
 	!~dev-texlive/texlive-fontutils-2019
@@ -96,7 +99,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	media-gfx/graphite2
 	>=x11-libs/cairo-1.12
 	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
+	dev-libs/zziplib:=
 	app-text/libpaper
 	dev-libs/gmp:0
 	dev-libs/mpfr:0=
@@ -157,14 +160,14 @@ src_prepare() {
 
 	cd "${B}" || die
 
-	default
-
-	eapply "${WORKDIR}"/patches
-
 	sed -i \
 		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
 		texk/web2c/configure || die
 
+	eapply "${WORKDIR}"/patches
+
+	default
+
 	elibtoolize
 }
 
@@ -215,6 +218,7 @@ src_configure() {
 		--enable-regiswin \
 		--enable-tektronixwin \
 		--enable-unitermwin \
+		--enable-vlna \
 		--with-ps=gs \
 		--disable-psutils \
 		--disable-t1utils \
@@ -236,7 +240,6 @@ src_configure() {
 		--enable-luatex \
 		--disable-dvi2tty \
 		--disable-dvisvgm \
-		--disable-vlna \
 		--enable-shared \
 		--disable-native-texlive-build \
 		--disable-largefile \
@@ -338,14 +341,6 @@ src_install() {
 	# like non-existing targets
 	dosym tex /usr/bin/virtex
 	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}" || die
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}" || die
-	dosym "pdftex-${P}" /usr/bin/pdftex
 }
 
 pkg_postinst() {
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 0970543565ad..8e3577cc82eb 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2020-r4.ebuild 6953 BLAKE2B df669543e8512a88ee605af3b53190ace1572d1466fcac3d5d17d99b0362ad9659aecbac20f461259a9ba3f9ad8ee977fd6b9dc0f2306d6b5e794d27183ff162 SHA512 f1e4e93fc8a93e0f5fec578f28a006c4a4c2491b331b0c838ca1b766fa641cf926f45304a0009b52660c926971f0af05998e66c084af015c4d3231fa02ad1ad8
-MISC metadata.xml 2321 BLAKE2B fc9c387d08100e543a6752ee7644f878c9430db5f2f66b5d16991dc292cf8ac01fc80bb6d805a8d6694edabffb68bc23f031974eece051114809c90deaa32941 SHA512 ca224c87c1bae60752d3d77b62b5a54632bd42379551523f479d8b470ad61c91ac34ddd4c7539f4bd667ae4f60f08d10726f31329b7fc194a24b6d4c642ab536
+EBUILD texlive-2020-r7.ebuild 6864 BLAKE2B 46c2fd5a0a0941873020df984ae5ccc30b45517a4923ef2ccc6bc54460a694e8964dac4cca45da9014f41adaaa0f7539d2ae36cf00b1451821f9924420cb359e SHA512 5742b5d657235ac026e770a02ce83120a3d2aa55523b697399f4a6d3d3ab322c2d64c3fe84503b0a9a0e2a53984d0796a80adc12d031f9e4b34b080cd290b103
+MISC metadata.xml 2184 BLAKE2B f74223553a6b3b36f401dd335d7df1cf83959ca642cc9d9a8a978770822d21a36eabb57d11d6c2a6d25a3425297eb4e39c52d75d7f6a8df8cd492215c9f6e1b3 SHA512 9ba91053801cae866b7612338e71e1b708ab121e42905ddffef6333bb5f8eb835dcb97de1fe6f1cf55713482aaf33202443b26e5d91b2b851a1dde10a340e4a2
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index f79519d87f63..43fbad5a7f25 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="games">Add typesetting support for games (chess, etc.) (<pkg>dev-texlive/texlive-games</pkg>)</flag>
 		<flag name="graphics">Add support for several graphics packages (pgf, tikz,...)</flag>
 		<flag name="humanities">Add LaTeX support for the humanities (<pkg>dev-texlive/texlive-humanities</pkg>)</flag>
-		<flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg> (for processing tex files produced by the TeX backend of Jade)</flag>
 		<flag name="luatex">Add extra support for luatex</flag>
 		<flag name="metapost">Add support for metapost: A tool for creating graphics in scalable PostScript</flag>
 		<flag name="music">Add support for music typesetting (<pkg>dev-texlive/texlive-music</pkg>)</flag>
diff --git a/app-text/texlive/texlive-2020-r4.ebuild b/app-text/texlive/texlive-2020-r7.ebuild
index b06a7f6c1a0c..9e9609403b12 100644
--- a/app-text/texlive/texlive-2020-r4.ebuild
+++ b/app-text/texlive/texlive-2020-r7.ebuild
@@ -10,7 +10,7 @@ LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
-humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
+humanities luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xml X"
 
 LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
@@ -70,11 +70,7 @@ RDEPEND="${DEPEND}
 	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
 	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
 	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
-	xml? (
-		>=dev-tex/xmltex-1.9-r2
-		app-text/passivetex
-	)
-	jadetex? ( >=app-text/jadetex-3.13-r2 )
+	xml? ( >=${TEXLIVE_CAT}/texlive-formatsextra-${PV} )
 	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
 	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
 	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
@@ -85,8 +81,7 @@ RDEPEND="${DEPEND}
 	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
 	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
-	              >=app-text/vlna-1.3 )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
 	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
 	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 1df3b844f838..4d65aaf6ce1f 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -2,5 +2,5 @@ AUX 51txt2tags-gentoo.el 214 BLAKE2B f5c5aad466fbc7eaf1ec36dcd4a52a914f1710f10fd
 DIST txt2tags-2.6.tgz 544724 BLAKE2B 9c8c37c6e003c7252276b32bacd373fe9143fdd93fdbc2bf0c23a83e2123c2a9636be5f106d248f2f0ecccd71eb9bc68cf8343557f10a7e6f8deacd8ade975ee SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e
 DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
 EBUILD txt2tags-2.6-r1.ebuild 1670 BLAKE2B 00ecbc9792141f79ebb9488767c4ae56632117a898ce65b55517ec74fabb8679c51091c7cc56ac05f6deb9b07fe12d5106f93a7d1f6266ce698e18c2cc3789bc SHA512 1e106685085d9e282e297a753f061c901cc44ef785b9f3134684af3c3a9b695c98a50398922616a2524628cdc4770c24386c2ff170a910f6dbb79353ee77536c
-EBUILD txt2tags-3.3.ebuild 517 BLAKE2B 1000d1641025192ff07f593f6f60d9f0c97597eecacf47bccd9d2cb4fdcef50527e923d380a890bde62fb5efcd1945290408c6ef0907272b3ef608a156b2185e SHA512 10ed52c6fd76c6ac405919d8cc665d9251d2bd146c45624ed489b2e1fae10dbdbe8aab12ef67e90bced158c1bf21f0ee94f6f1bc1d44fd6c25419f881ff463d8
+EBUILD txt2tags-3.3.ebuild 514 BLAKE2B 9c8f5e2adaa6362cb62ceddefb156e69a04bb26fe0568477d228f6c1134027caa909fe4d5ce9c78e2a18ce4bff076790225d8489f9c0883ce71cfe6321d3e471 SHA512 c03da7aa20627b69eb300f0ee465dacaa9d7caedfef925908bea9a310a346e4beea68f81fa76951fdd9b1a82e371b154128071ca25854141757993402a5b501c
 MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/txt2tags-3.3.ebuild b/app-text/txt2tags/txt2tags-3.3.ebuild
index 572bf7c02bc9..48eab7803a3d 100644
--- a/app-text/txt2tags/txt2tags-3.3.ebuild
+++ b/app-text/txt2tags/txt2tags-3.3.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/jendrikseipp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index 8ff2f50aeda1..952415ee10f3 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,3 +1,7 @@
 DIST vgrep-2.3.1.tar.gz 1149421 BLAKE2B c4c9a414bba5e509d57faa9ca6f6ce5cae1dbb001ff8b410ad54691ec6bf39f41c535fd25bdd5d93fdf89b4e4b49acf4dfa9a8956653e5c5e2ce39bd7da8d484 SHA512 0fa65151ae40f7fefc4e5b1af8e6ea332b50b1136849ec0902dd110786ca14204441e27c65a036b08fa56bf04a6325d8aa8ef2d4d02cdb0e0fe219896e24d694
+DIST vgrep-2.3.3.tar.gz 1149769 BLAKE2B 59f15e0f2d9fd069b4926cb26a0517cb1d201dccce53d7c6b3ec1954693a3286396e8d4d72e2c3bcc4bb8e70083ba1ea349dfc4bec244caa112fcc2289063c25 SHA512 b745ec24bb5c329a3d0e4e756e54432f3acf9c24f9492339b69850d5a8e688074323d7e56c584e59f3aedf3a41b84997497791512dae2950424eaed56d6b7329
+DIST vgrep-2.4.0.tar.gz 1196159 BLAKE2B f8b6b8166feb17ddeea7978ff14fd729ee395feb9658cbfc838f978f33169c7ca15dcd4008af54582aca25a0803924c508da11603d02e42d1e597a5813f78c3b SHA512 c614b52fe7fa720d3d2bb57830805c1ebb7c47db549aadda9309676b9c286447e693e51f74f969ccd0450934510bfe79c1603717022dd69c9f7f2709cbfd4465
 EBUILD vgrep-2.3.1.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
+EBUILD vgrep-2.3.3.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
+EBUILD vgrep-2.4.0.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
 MISC metadata.xml 394 BLAKE2B 52d95eb8f47c5002203258b8077e0104423472b1f4bdae387fa8194b5056fd4986a9b795d0bbaa7939497ce45ff2ee0ca90e1c44ebeaf31b40725b36ddf1390a SHA512 9f44f00b50a654d27819e20172dc338d3dac8abcdac3933df88153156871612e1c414dcc5b0590795eb58c972302c3b54546b7dbbd539ca60737bcfa5a8989f3
diff --git a/app-text/vgrep/vgrep-2.3.3.ebuild b/app-text/vgrep/vgrep-2.3.3.ebuild
new file mode 100644
index 000000000000..f50049ccd32f
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Uses golangci-lint
+RESTRICT="test"
+
+DOCS=( README.md )
+
+# go binary
+QA_PRESTRIPPED="usr/bin/vgrep"
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	local prefix="${D}/usr"
+	mkdir -p "${prefix}"/bin || die
+
+	emake PREFIX="${prefix}" install
+}
diff --git a/app-text/vgrep/vgrep-2.4.0.ebuild b/app-text/vgrep/vgrep-2.4.0.ebuild
new file mode 100644
index 000000000000..f50049ccd32f
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Uses golangci-lint
+RESTRICT="test"
+
+DOCS=( README.md )
+
+# go binary
+QA_PRESTRIPPED="usr/bin/vgrep"
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	local prefix="${D}/usr"
+	mkdir -p "${prefix}"/bin || die
+
+	emake PREFIX="${prefix}" install
+}
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
index 5aa5d4ed2f6e..97878764ce85 100644
--- a/app-text/webgen/Manifest
+++ b/app-text/webgen/Manifest
@@ -1,3 +1,3 @@
-DIST webgen-1.7.0.gem 201728 BLAKE2B ed44657420817d98ffbd72093ff56db22ae3a8da43c77661a663d938f3958c4055df4b7b34252eee162846af27a35320f680fdb6b9b1818f96aa1e51eceffd9f SHA512 1e791f720108996a4f52b151d160d9b6f613c036aae2350c634f5539257c4ae946737ba2df94bc424199413463e3016432a6d1e67e30b419b2770bc83b3b14db
-EBUILD webgen-1.7.0.ebuild 1490 BLAKE2B a7d030cbef9fd77dfeab3cc54d8e7fba04d7a2ee9cc9549c6a45956735ae9c64f7fd2f3ca1bc47f6db8dab0915bb97936582abd7bc2fe0473bbe89de46fbc4dc SHA512 ce7d14ac48592bdf117ab556250c021242994f641920a96e075fdbd889b6a9406756e2c72621598517bd7399c4de1d9c3addae1a7914cbba6ea631f62565dfd1
+DIST webgen-1.7.1.gem 201728 BLAKE2B 2ea7d7911b4edf29cb7310a676593a77956b3fffd1a4ca5f69731270e648365fb8293a292b8fdd717444ed8f690dd5f095ac5dd77f5c950253b5de7d6086f966 SHA512 7b58c7d2b8ff6a4feabc1435e6bddbf25b3e4695517c2bd8d97b698a49b6fd61538f1a77bdd4e13f7368fdfbeae9f007dfc09ecfcde4eb75a366b8e0ccc8c58a
+EBUILD webgen-1.7.1.ebuild 1436 BLAKE2B cb17a23980c87ab2d27e51e165c859cc2a0c863f33e404aa7d8f15190acd745c951ac57319f2071dbdf275864a1e9e16132fce547a66487afbb0505c915cc6d8 SHA512 156f808cf029a5895bc5077ad11d4005112b526addfcbe82783d7d82af3112a1809499318d931c5d34bc046e8fc788dc2bef08a932481c3653e3756035adb3a3
 MISC metadata.xml 477 BLAKE2B c8293490729904a1a67e6c0861f6fc01b00190322213b566de36e6a56d474118c32a81a9573bb8e43f433d5eba8d5f111878cda00866a5f1b5fb36e052b779d1 SHA512 d872a0fb051b79b34541fafe549c2283a4a92edd7bad4a97adb1c3124e82820a67c286d04a004cdd2fe132a44ea4f0ec8cc3b335f3a1d91aa8877533a1c278bb
diff --git a/app-text/webgen/webgen-1.7.0.ebuild b/app-text/webgen/webgen-1.7.1.ebuild
index 3e7ecc338654..143a53059e74 100644
--- a/app-text/webgen/webgen-1.7.0.ebuild
+++ b/app-text/webgen/webgen-1.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="task"
 RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
@@ -21,14 +21,13 @@ IUSE="builder doc highlight markdown"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )
 	test? (
-		dev-ruby/kramdown
 		dev-ruby/minitest:5
 		dev-ruby/rdiscount
 		>=dev-ruby/sass-3.2:* )"
 
 ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
 	>=dev-ruby/systemu-2.5 =dev-ruby/systemu-2*
-	>=dev-ruby/kramdown-1.3 =dev-ruby/kramdown-1*
+	>=dev-ruby/kramdown-2.3:2
 	builder? ( >=dev-ruby/builder-2.1.0:* )
 	highlight? ( >=dev-ruby/coderay-1.0 )
 	markdown? ( dev-ruby/maruku )"
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 78122bf22d21..e79a7c2de877 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,4 +1,4 @@
 AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de245213307b154c8c9f94a4f37b952b7509b7768df53459b1724b91e43bdde3ddb4cacf070d02c4a2dfdf33cbce7cff240c5ec7bc SHA512 70e9b77b5e4eef7a790973737be5c330443ae5eb4f54ac7a706e1404073a3568e0dc42eee1084ae5c4fdecff3384d22ff4666f2b0b24d6d28cf5d66ba3094612
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
-EBUILD wgetpaste-2.29-r1.ebuild 754 BLAKE2B d0c8d2e00154baa57a3c6bdf0da206c02e4e1e1089f0a1ce8c7b447e25ba3c66dd53e771744285d494bf3a5f2dfd08e800cf8b8ac87c07065d7d16f88734449a SHA512 21c516eb3e5b29a62f25913e564f36903edde91fb214eed1bb7d0ce1858094c39c8a70d4cfb526cd47b6cfb824ac785045a1fdebce481488de7f10443e988107
+EBUILD wgetpaste-2.29-r1.ebuild 678 BLAKE2B 5f24bbc9ad8872c64496427e9ac5b847a68820042b392f39cabf71cd8152616ddf15b61d2a78d702bbc63949dd583d8dee3190812d70e9fbf4dcc4ada3a8535c SHA512 0d3ee7a7ffd77734719fed157502a6e09786a08fc8812d8021ca23acfb4c2af8bd67c2cd57c6980cd22ec184a7b9fd71bae1d164c40105478572d0ed2f7e846b
 MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index 478db735fcbc..0c181457c667 100644
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+ssl"
 
 DEPEND=""
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 2abdb85a4397..8bcd4df9bd2b 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -2,8 +2,10 @@ DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febb
 DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b1390ba63ca999f235a10a7ab9bf4db378273cf6f7f6b3107c80c1ebb44bdb1a94ce3c00585f83ac0bec188163633be843b SHA512 27059d13bbdfc2ee9e8f4f6e74479bac0885cabab97d7eb1ebdc57eacbff1724b2684ba72efdf6d35f608e2e8f0891d47c626aaa100c713f4c2f66f923d841b7
 DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679
 DIST xapian-omega-1.4.16.tar.xz 546360 BLAKE2B 990eab976833854d2a172e1584383b71375fe2e0b83a8ff0a150f4c9fdb6e99cbd42e58720e81698292843918112426d3b445efe14d9ee5f76e85304439475de SHA512 7f8c3d4e372c49f89e28da999ee49f0754052a339bbc4492b50f8134cf29b2c433ddae9e58ef3a2468898b711b4510ea87687a247ce21e83eba2f8daaa2910c4
+DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
 EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B e6431300b0eeea58f502e8475225830986573e839441f1701cf9387c1ad53bf2bc838d08aa823c65f93d62c94501def769602b4772d714cf2d9396a052c61c50 SHA512 a22cbd4bf3a7ea46c0a60b7a1884af858f09464928f90d63e0526385e5fc6cad123446d59affe1efbad286c883c1bc125b5f6f7fb6a8b224f9b242ddcfd13a98
 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 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 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
new file mode 100644
index 000000000000..f76f70d1acab
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 9d81319dcd32..9d35ce2c21be 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,4 +1,4 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r6.ebuild 2368 BLAKE2B 523c308e2dafe577aa734b7e1d685b72e7241d81f98d10d1d451f1682371704b45d2b0b6aab355d4cf6dbea71e817c19e6097e0d1f4b881ef881fedd8293cdb0 SHA512 86893a7861ceba1eee4039ba29fd840eefe7d14436067d2f3bf165dac1fc8d5ca0fcab869d7cc1de1bf9100afa0e9e6608e5fbc9cf46f3415b3a3ab896dfc384
+EBUILD xhtml1-20020801-r6.ebuild 2367 BLAKE2B 6c368965b93e793e801d0f1320a90de49542eba9748e31677912a107b0bc89c7f8bb6285e6ed5720daf2ef2a8cbc11ccc346df3ae1d01d692da4f501284b2635 SHA512 adab359d63b7454f0810d78a9be5117a19b2b23efc53d92481196cfd33c44180c313c630cf9a652ec5a85dd67e2cbe7ea481b5be75b8c7ddb6a45ebc9d325e13
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index 257116cb54b3..87af258ebfd9 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.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://gentoo/${P}.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="app-text/sgml-common
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
deleted file mode 100644
index 5555237f13db..000000000000
--- a/app-text/xindy/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX xindy-2.4-configure.patch 884 BLAKE2B fbb60e5bdc287b0a37f2e047081c9263fe7c763f9831c9e99dcf1f9eb143f75e09096ddc532185d699aeb862f98c643c54e3bfb16c9942106c4546d18dcd48b4 SHA512 1b40f03481ced4caa2a4e137c7ec2ce970c8eeba9c228da4caa1952b533f5346a025f885860024168a95739d3f0e6bfe3173f1654ce747a4f2b4f6e4ba41c1d0
-AUX xindy-2.4-locale.patch 679 BLAKE2B b67f436e0aa67b8474336bfa1f70f6da52199871b91934bb73c2485ea80d5d3859f91e624e930f0f1a5c2f0e59d28698a6bd1725131b0cadf82314a0681c51ff SHA512 4d80684d08def3d3cde3765056d562b60d6bbef36e3495933c0aba0016308f95e462c2857215b4e47325339c5238f565bb798b96ad197c23e156d9b9c7fb3f4a
-AUX xindy-2.4-nogrep.patch 431 BLAKE2B 97543e7eeff2cb4c23c8b9cc0d5673fca2c3f682553a8a3d25bc39253a371320a2a423fef63294be32f5c36b5bac30717766b3a9a4c75663535ce0a6bd8e13bc SHA512 fdcc109b89a6e56c86624f348ebe1c98f574b9f788e3f307e3b110fc2b93643af087e16711b3f0bc6604dbdcfae06080693e4976d8ebec5816e68fb73f89fa6c
-AUX xindy-2.4-perl5.26.patch 337 BLAKE2B c869adcd80cc93bbfe46a385effab94a920f3fb76441c653ea269962071ad5f9269961caebd13d6fce38f3f4dea485291b510db6e884aefc5edbd22cf4b9bd4a SHA512 3f3abc9654e3c7c9de12a542241e107d80046bc26d0eed336e046835a221ea190d526b37c85f91b722e6cac89f140e38b0cebaf208a2391d8d7a42a2ca4b8459
-DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4
-EBUILD xindy-2.4-r1.ebuild 1000 BLAKE2B 0fe9f394b499132a697c65bb24440a618dce02da9c6d71cfe40dc4f72af21300c08c29391002b8325cfa7ad4bb84c9fc236d3b5459c71d01fdf204808ca8f7d8 SHA512 89cea602ebcd5c1bcd5e793b318b6e19894e3f7d8ad9c3072362ee80c910de004c18f0edc6407185be7e6a6d5e60e306627c7692f2db4f1a1982c9ffd79d6a53
-MISC metadata.xml 1118 BLAKE2B 1bb41c8208737b0ad0d3545143cedd0b70aa2cdf632905f1572ca2c2aaa2eb35e712eb5971b4e4bd8a66a3130ebc1f21c8d6ad194056fe5a1c15c522e1d57219 SHA512 ef09dceddfc91214cf575c58f9ffa8f82ec10bfa7274caec809a00c83b9a07668139eca7e420e04c5fe38bbca9084bfcb6fafd10bc91092138726dfa1dc4cced
diff --git a/app-text/xindy/files/xindy-2.4-configure.patch b/app-text/xindy/files/xindy-2.4-configure.patch
deleted file mode 100644
index b76341f1f759..000000000000
--- a/app-text/xindy/files/xindy-2.4-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xindy-2.4/configure.ac.orig	2010-05-10 16:12:10.000000000 -0700
-+++ xindy-2.4/configure.ac	2010-09-28 23:43:39.591495118 -0700
-@@ -42,12 +42,16 @@
- 
- # Test for building make-rules
- AC_ARG_ENABLE(make-rules, AS_HELP_STRING([--enable-make-rules ],[build and install make-rules package (default is YES)]),[BUILDRULES=$enableval],[BUILDRULES=yes])
--test "$BUILDRULES" = "yes"  &&  AC_PROG_LATEX
-+if test "x$BUILDRULES" = "xyes"; then
-+	AC_PROG_LATEX
-+fi
- AM_CONDITIONAL(BUILDRULES, test "$BUILDRULES" = "yes")
- 
- # Test for building Documentation
- AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs ],[build and install documentation (default is YES)]),[BUILDDOCS=$enableval],[BUILDDOCS=yes])
--test "$BUILDDOCS" = "yes"  &&  AC_PROG_PDFLATEX
-+if test "x$BUILDDOCS" = "xyes"; then 
-+	AC_PROG_PDFLATEX
-+fi
- AM_CONDITIONAL(BUILDDOCS, test "$BUILDDOCS" = "yes")
- 
- # Checks for programs:
diff --git a/app-text/xindy/files/xindy-2.4-locale.patch b/app-text/xindy/files/xindy-2.4-locale.patch
deleted file mode 100644
index c2edccc4bef6..000000000000
--- a/app-text/xindy/files/xindy-2.4-locale.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xindy-2.4.orig/src/Makefile.am
-+++ xindy-2.4/src/Makefile.am
-@@ -41,7 +41,7 @@
- DEFAULTS   = defaults.xdy
- DUMP_XINDY = dump-xindy.lsp
- MEMFILE    = xindy.mem
--CLISP      = @CLISP@ -q -E iso-8859-1
-+CLISP      = @CLISP@ -q
- 
- xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
- 	rm -f $(MEMFILE)
---- xindy-2.4.orig/user-commands/xindy.in
-+++ xindy-2.4/user-commands/xindy.in
-@@ -777,7 +777,7 @@
- sub call_xindy ( $$ ) {
-     my ($mem_file, $xindy_exp) = @_;
- 
--    my @command = ($clisp, '-M', $mem_file, '-E', 'iso-8859-1');
-+    my @command = ($clisp, '-M', $mem_file);
-     if ( $interactive ) {
- 	print "Proposed xindy expression:\n\n$xindy_exp\n"  unless $quiet;
-     } else {
diff --git a/app-text/xindy/files/xindy-2.4-nogrep.patch b/app-text/xindy/files/xindy-2.4-nogrep.patch
deleted file mode 100644
index 41f1b3a03609..000000000000
--- a/app-text/xindy/files/xindy-2.4-nogrep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/573794
-
---- xindy-2.4-orig/make-rules/inputenc/Makefile.am
-+++ xindy-2.4/make-rules/inputenc/Makefile.am
-@@ -43,7 +43,7 @@
- latin.xdy : latin1.xdy latin2.xdy latin3.xdy
- 	echo ';; Generated from latin?.xdy' >latin.xdy
- 	echo >>latin.xdy
--	sort -u latin?.xdy | grep -v '^;' >>latin.xdy
-+	sort -u latin?.xdy | sed '/^;/d' >>latin.xdy
- 
- %.xdy %.idx :
- 	$(PERL) $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex
diff --git a/app-text/xindy/files/xindy-2.4-perl5.26.patch b/app-text/xindy/files/xindy-2.4-perl5.26.patch
deleted file mode 100644
index 657b5e94c362..000000000000
--- a/app-text/xindy/files/xindy-2.4-perl5.26.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xindy-2.4/make-rules/inputenc/make-inp-rules.pl
-+++ xindy-2.4/make-rules/inputenc/make-inp-rules.pl
-@@ -8,7 +8,7 @@
- 
- 
- while (<STDIN>) {
--  if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
-+  if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
-     if (!($1 =~ /inputenc Error/)) {
-       $i = hex($2);
-       $macro = $1;
diff --git a/app-text/xindy/metadata.xml b/app-text/xindy/metadata.xml
deleted file mode 100644
index 8916aa9cb8ad..000000000000
--- a/app-text/xindy/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>common-lisp@gentoo.org</email>
-		<name>Gentoo Common Lisp Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		xindy is an index processor that can be used to generate book-like indexes
-		for arbitrary document-preparation systems. This includes systems such as
-		TeX and LaTeX, the roff-family, SGML/XML-based systems (e.g., HTML) that
-		process some kind of text and generate indexing information. The kernel
-		system is not fixed to any specific system, but can be configured to work
-		together with such systems.
-
-		In comparison to other index processors xindy has several powerful features
-		that make it an ideal framework for describing and generating complex
-		indices, addressing especially international indexing. Have a look at
-		xindy's Overview that describes its most important features!
-	</longdescription>
-</pkgmetadata>
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
deleted file mode 100644
index a9f5d4c7ff04..000000000000
--- a/app-text/xindy/xindy-2.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A Flexible Indexing System"
-HOMEPAGE="http://www.xindy.org/ https://github.com/jschrod/xindy.ctan"
-SRC_URI="http://www.xindy.org/${P}.tar.gz"
-
-# The latest development is now on the TeXlive SVN.
-# The author jschrod backports it from time to time to his github repo.
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc x86"
-IUSE="doc"
-
-RDEPEND="virtual/latex-base
-	dev-texlive/texlive-fontsrecommended
-	>=dev-lisp/clisp-2.44.1-r1
-	dev-texlive/texlive-langcyrillic"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/flex"
-
-PATCHES=("${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-locale.patch
-	"${FILESDIR}"/${P}-nogrep.patch
-	"${FILESDIR}"/${P}-perl5.26.patch)
-DOCS=(AUTHORS ChangeLog.Gour NEWS README)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable doc docs)
-}
-
-src_compile() {
-	VARTEXFONTS="${T}/fonts" emake
-}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 4a6d2eebb3aa..9e1b0097d603 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,5 +1,6 @@
+AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a882246528afcf36fd9b24bbf7fadeec270a24d230bec5a0ef2436b7a70358aff9946e19ed3bd60304bb786f4920f389ce2389bb146f SHA512 59d9ea167ccdbdbc7b90eedbe58e12fe9b11043b48442143d6bff67f2853d717597e7023c7898936a63e6e9def599b6309330e31a394dfb4c807ae95fdc63d52
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
-DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
+DIST xiphos-4.2.1.tar.gz 28373966 BLAKE2B 33f4cb8884add292047d4c9a594ee467f6a294c0732af54802ffa556c5d97978f398fc1b5da52d5620413305d4efe9ea1a3e680dc4db1dde962d5c9028c360cf SHA512 4ce92b86e1915fa4d0ffa867a3542ff697195dd176dff1c5d00193a9556ecfc60623049bf45837a2f60317c392b3c4365742a7490ac8304a6f1b9491e3318077
 EBUILD xiphos-4.0.6a-r2.ebuild 2053 BLAKE2B b9bd97ee6e3da5a10b98db3eaf45e6d5a746e852e4b7762e9fafca1213c471794035170fb9b43563144e7666709e749aa8748701435331e399d647441ca12ec6 SHA512 1a9b16294c1013f4b35da37c3bd3c6169e3e067f95f8d9505ab1042294df1c5d4877eb9353018f1ff71843e915c676127157b4c4a8d27ac77a4ee42f64c629d5
-EBUILD xiphos-4.1.0-r2.ebuild 2006 BLAKE2B 2c54a0561b481fffd95e5a88257b19033725c970c21e45fcb579ef1cded0506d5b08bbbdb91486cfff6709798b541f9978cc164c7458a7267c9417e55335c0b4 SHA512 a8fec9304f9136dcc9be657bbde58871ce4f2433a94919a769dba56dc1992278cc3906c5817812343504a47cfedbc514b9a0b5f3519fa3be5cd4ce8d58c35964
-MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
+EBUILD xiphos-4.2.1.ebuild 1335 BLAKE2B 22174bc8c2942e832255746e6151bfa0807574bdaa1f53858344c38958b8e2958195e2620570745c6aecabd6a8d6dd3539e76b54b06f35c29f97af180d5eddae SHA512 14019cd40634b2891de9aa894e932db91055ce9c26d5a514392ee50f43a75e27470a399101a0e11c9fa246425976b8991c7c3398c1675823468c4539e20e83a3
+MISC metadata.xml 325 BLAKE2B 1fcf098a010153588db7bd29c726c965e4d0505841c47be0b7a75f07b4e785d7c42a3321d67079a66782ab5edf4f39611a9f4ac2578d552f93462632c872bfeb SHA512 0b9f3bfac06d3847983a5117be9d101d01ddb02511b5fc832451de6cec703ac46f5a18d10e330af1d79147338b077b957d4d1263b8113dc3e0bded92267714a6
diff --git a/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch b/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch
new file mode 100644
index 000000000000..fddfd2eca957
--- /dev/null
+++ b/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch
@@ -0,0 +1,11 @@
+--- a/desktop/CMakeLists.txt
++++ b/desktop/CMakeLists.txt
+@@ -96,7 +96,7 @@
+     )
+   # install file
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.appdata.xml
+-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata
++    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
+     COMPONENT data
+     )
+ 
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index 139d2b70ed62..5f7e93359df2 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>theology@gentoo.org</email>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnomesword</remote-id>
diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
deleted file mode 100644
index 49bfe5394fce..000000000000
--- a/app-text/xiphos/xiphos-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.8.0
-	dev-libs/glib:2
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
-		gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/rarian
-	dev-util/glib-utils
-	dev-util/intltool
-	>=net-libs/biblesync-1.1.2-r1[-static]
-	virtual/pkgconfig
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-	dev-libs/libxslt
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
-		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
-		wscript || die
-	default
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--debug-level=$(use debug && echo debug || echo release) \
-			$(use dbus || echo --disable-dbus) \
-			configure || die
-}
-
-src_compile() {
-	./waf -v build || die
-}
-
-src_install() {
-	./waf -v --destdir="${D}" install || die
-
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
-
-	dodoc Xiphos.ogg
-	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.2.1.ebuild b/app-text/xiphos/xiphos-4.2.1.ebuild
new file mode 100644
index 000000000000..7a03b2cb28bb
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.2.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
+HOMEPAGE="https://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+COMMON="sys-apps/util-linux
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dbus? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON}
+	>=app-text/sword-1.8.1
+	dev-libs/glib:2
+	dev-libs/icu
+	gnome-extra/gtkhtml:4.0
+	>=net-libs/biblesync-1.2.0
+	net-libs/webkit-gtk:4
+	sys-libs/zlib[minizip]
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="${COMMON}
+	app-arch/zip
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	dev-util/itstool
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
+)
+
+src_configure() {
+	# TODO: stop using gtkhtml, it is deprecated (Bug #667914). However, as
+	# of 4.2.1 it is still required because the WebKit-based editor
+	# does not support webkit-gtk:4.
+	local mycmakeargs=(
+		-DDBUS=$(usex dbus)
+		-DDEBUG=$(usex debug)
+		-DGTKHTML=on
+		-DPOSTINST=off
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index a94690cff9c3..7813200f2850 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,3 @@
-DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
 DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade00a14b817d42706bb1b3e407f2645d7df5b5e9f4d60d75d48afe6475e5c1f1bab24ea6fdd78d8646c79b58 SHA512 1dc3f76f51df3c506af827c9a7f67386143b4ce49c2159302e07c5f56054ffd9e858f086bb76d64a038b7e9ae7c116d1146714d4528ea9d53e23e1bacb4bb812
-EBUILD xmldiff-1.1.1.ebuild 621 BLAKE2B 7e0be4595a818a7ffa00105ab7bec4554795ab8369ec27fd27520de6c2aa640104804c51cc52a598fa03d919b1a7e9f36d39895011292d0dc47b95ca140cf106 SHA512 1233cd14bd38ecbb28619cf381306f2f40faecfca36a2d9c7cb59453b406f70815bf9b27c3f18f7a2ac5e8c795427ed8004929056f57876c207a6c2f3490c011
-EBUILD xmldiff-2.3.ebuild 640 BLAKE2B de99cf265dc04d7faf7ce13ea00936f5d4b4020ea866545791a71b23d5df3b97f1730be87e1184ddf7bae56b9189329634fc1aed73020f18dfcb65e427bf424e SHA512 0da6edb3a7348d20724aabcd7be89baf9e58197ff3e31ac97354a61f5dcbf95e4a814ba78f2a65d8a57437b32006f12b23eb14848ee76b93ab0e187978f5a040
+EBUILD xmldiff-2.3.ebuild 636 BLAKE2B 2624f1ede10d236dd47d79c9a1773001d5246ea5363271d1b6823ad49ce7836fa2f117877c45c1ab8f5799422b27376d6906ff5fc900eef501395ff29c0ea9f0 SHA512 31e29d00d330a3c198e7a0daab2ddae51d0604352df01e350bcec40eb4b0e0b1bd6d7bf39b7937229012fc3d9850b0f14b93e74408eca616f1575bcf3994c510
 MISC metadata.xml 776 BLAKE2B a2813ad30729db3a2e48ef6fefc7603df138326e05231b955475ec61cd44a175f4ba83c7fa7ce4c2da208676b0f72f1b08e371670af1ba368c9223e947eda4f7 SHA512 579b4593545777f8c244e8b3f0532bd968a420409b946dac93ff875358b814064e8d24548f2d2417602e2840f6e3844dc2c6ccbd07804f948f22e5467ff5254a
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
deleted file mode 100644
index 8f2480fc7ffb..000000000000
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff"
-SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/future
-	dev-python/lxml
-	dev-python/six"
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst TODO.rst )
diff --git a/app-text/xmldiff/xmldiff-2.3.ebuild b/app-text/xmldiff/xmldiff-2.3.ebuild
index 1ed202bb4aaa..7508d2f18506 100644
--- a/app-text/xmldiff/xmldiff-2.3.ebuild
+++ b/app-text/xmldiff/xmldiff-2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 8046fdff97d2..a25d4cf1ed1b 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,4 +1,4 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r1.ebuild 1449 BLAKE2B bc2d0e1a03d97a1c6b6ee1bef5eb4d8860b3cb2fbf2fbb75bc15722356ddcdc7b7ee786d130398412a4be1bae250310f9ea6d321a32c8cf460c9e65c29b01b0d SHA512 1bc053436ce4dd2b6ab15745e1e0ff3ee8a35e21cab861de5017ad628a9c3a3e89b4e0d9988f59bd4311b3327eb3a079ef0625247d209ee915beca84331d1123
+EBUILD xmlto-0.0.28-r3.ebuild 1431 BLAKE2B 769b8e65b67c99527ffafed511b5681072739aa01e5c361ed86fdfcaed178698fbd2f5a5f14cd55a3fd033c270da1d25157c6414ab7500d2d93dfbf3fcd9048c SHA512 a0a2c8b319a067354454c34ae959d2766d7b1e2ecd6aa7905d2a28727cb49fe210e85bc6ffe552d8b7f7107d6778f31167aeddb95caf63e5244ec438291e515c
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
index 58faafa5f938..5602e66567e0 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
 	|| ( sys-apps/util-linux app-misc/getopt )
 	sys-apps/which
 	text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) )
-	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
+	latex? ( dev-texlive/texlive-formatsextra )"
 # We only depend on flex when we patch the imput lexer.
 DEPEND="${RDEPEND}"
 
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index fec106ff0a7c..ef7264749f20 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,4 +1,4 @@
 DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
-EBUILD zathura-cb-0.1.8.ebuild 654 BLAKE2B 24002517066047c86d4e716bc27bad39890193376ce5a3e205614ec161dfe8d04aea57ee8f8ec97e89d1a7bc93ea02e129aa48582a8ab26e3a42e18e23420741 SHA512 f7756d761c06f0f1451759cae82a535c3fe70e202a09d0327c6825417df0100e8bb561bfef0db62ee2aba5e13f04ca2de7775e38de592310628af132d1583a96
-EBUILD zathura-cb-9999.ebuild 657 BLAKE2B 0836100ed329f8b153dfe4382ba22f9175c09812d62964eacdd628061758297e90a4a2c477176e02b13a95d5036072efc5be568873e4efb8f257e87dc0288a42 SHA512 bc0e52634152a0606b9107c9e0e825375b13fcf284ed7108552210a0bc3942e12d75c36f70f8e8a574927bfd0634a516cf7f8b6024e7d5e323687a339a3f5d8a
-MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
+EBUILD zathura-cb-0.1.8.ebuild 760 BLAKE2B 0f1fa2081c06090bc05e7d96813f6af4baf656fc605e69790ff5caf4c1e138ab9c39ca2ebddc75315003342e8649e180e782c50af3e3001b6ded7f9240d5c7db SHA512 3a1095d34359c98490b65ea2181170402b911e65756de930f01a6a0e643f2650e6c26988086c618e69c4196ff6bab01f6e1266b423d5832a855a49f692fce21d
+EBUILD zathura-cb-9999.ebuild 763 BLAKE2B 63ad420d4b577f61506936047fb187ea9e9c98aa7fa0a54cacec778f6f99012af2ab0b8a8dcbb4228fba60bfeb98f20d303a14b2d575ca432c83eb5b23c40824 SHA512 2d4348d3b1841712effd03f7aa65736c09b6ff8f0d8d50a814d71d2fdab0b00c23b8bd16ed35fc14fe24cc993f9ef439105e0792ee0072a36af7adca30b59d73
+MISC metadata.xml 582 BLAKE2B ed94d37e43b59abd8bf8fbc1da8a6839aceddd5aae31109bf5d35f3996992d96dec619daba1d2c67a7d5c6182a06a413dc5e425ae786c3fe2cdbb68bb25796fb SHA512 88a39e758edddb852dd554a88035a74b0043d37009f97fb2ba45fe94169e17eef02b41ba8666d9f712469ae3af3258f14f7958b4dc70fc8eaea790d31b092fb8
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
index 9e0907fe1628..7f5e7f55e607 100644
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Mikle Kolyada</name>
-		<email>zlogene@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 		<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
index 2fad557959ce..237c58a12477 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson
+inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -28,3 +28,11 @@ DEPEND=">=app-text/zathura-0.3.9
 RDEPEND="${DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index 5e59ea0d4e25..a5d47c0a1d7a 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson
+inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -28,3 +28,11 @@ DEPEND=">=app-text/zathura-0.3.9
 RDEPEND="${DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 3a5ae0fa6fb8..bf6eff8917c0 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -3,4 +3,4 @@ DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa
 EBUILD zathura-djvu-0.2.8.ebuild 790 BLAKE2B e1d46cea20f9449006092e2ff44263b0d9bb9e8a269801a850dc7182e014c17c12f1fa23dddab820b05a158e03e322a8e9fe3d99e82e6c2ca5ae8b8e3a0bc72e SHA512 4c9809b8a22db671ab492204a30493daa74aed5f86d2b3b7642057a73114c8fc9e556e8f22717e8b82f52a92c4d660c1e2831016dbecd810083d5f129a6d286e
 EBUILD zathura-djvu-0.2.9.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
 EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
-MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
+MISC metadata.xml 582 BLAKE2B ed94d37e43b59abd8bf8fbc1da8a6839aceddd5aae31109bf5d35f3996992d96dec619daba1d2c67a7d5c6182a06a413dc5e425ae786c3fe2cdbb68bb25796fb SHA512 88a39e758edddb852dd554a88035a74b0043d37009f97fb2ba45fe94169e17eef02b41ba8666d9f712469ae3af3258f14f7958b4dc70fc8eaea790d31b092fb8
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index 9e0907fe1628..7f5e7f55e607 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Mikle Kolyada</name>
-		<email>zlogene@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 		<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 3f40d5c19ccc..26278a7a6776 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,5 +1,6 @@
 AUX 0.3.5-compile-fix.patch 518 BLAKE2B e1e52be08b27459d2125fb44b1767c1f381ce13dfecae02b83afb6bc09db00c145f2b557db0c1515a383ea223eb51c68fdfa32d3effea334c5cddb9af5209ed5 SHA512 7af34317726849aa0eb49b7d7449c23cea1208a72ec1f872bf218b3be9c9b84bb8668523ef8ca0bee9fcdcffa44ba9599ba43f79c88bc3e8811597a91868a1c6
+AUX 0.3.5-fz_location.patch 1710 BLAKE2B fc6a13a495f3121466da5553c044d7de31c9a1c37984cc36b219d32aa2d9cfefb894f9f8225a5d93e96bbe4c25a6a4d76c2e24da24c583273bddf7efd4de4436 SHA512 fbab10cff2bc28da23effa17f05e17ef332b4ace23e7c995e1bfd6126f5dba66bb825ead78e91b70549e41c60ca089c64ba4961f2bc0d509c4e5bd6fa2b169e4
 DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
-EBUILD zathura-pdf-mupdf-0.3.5.ebuild 1014 BLAKE2B 7c9c4cbba3522ac96b552bdcc0162e333a213ab4de6f38490af6413d215fb6fd5b714ad804aad9f50aa6ed9ac6a8652bb8fb08926798420b521e2f63236ba712 SHA512 e879efacb15818bf3ca0a7bb0423adda5dabdc1f5354b42ed0d594554cf30c0edbe119aa48192ecdb4b673c46177c4f9272396b3cd17589f33d957eade8f71e0
+EBUILD zathura-pdf-mupdf-0.3.5.ebuild 1112 BLAKE2B 12620e265b0ce055f23ce2562faa958dcc9d5796fda2a9614e54e59567281fe8e77d7fb484ae6feae4b5602fa0481d62766c1df4ef0209e9e961ed62c6537ca7 SHA512 98db4e1cc241b331a76d6b357b837f54a5edc0ed2dc7a03afb6668c9ee611888f94e5ac4e0ad3b637dd28886ee9c66b5daaf956b9a1bf0b33650fd3abc3d178f
 EBUILD zathura-pdf-mupdf-9999.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
-MISC metadata.xml 672 BLAKE2B 539ab88c5ef3fe3ad7ca25d9856bcf6a7755e09c479631c1cbdd835aeb398d2f6052af0980afc35771312397b6858fca2271f5aa8ee64fa8a57130f05b7594ee SHA512 288bfcdc265543b1d5d364af4fe0c6dbdeec0f30019b683ef0bf32619d87ada509cce47c141aac08cf0942f7ad74d1a453e6b5303175ea591e2f661ba044882a
+MISC metadata.xml 592 BLAKE2B 1159f04d19816c03115b8b2fd20ddbee3c420ffbd6276c9c48b80b4e6d43377354ae935d01c0ae7b3d81f8fc1f7b0f0928ee72ddcac6826c2775efd109b33e32 SHA512 449cce725a42bb2f05746e9af3e474547e83b4f7d25357b948ab8f24a9a6182dbd627a8cfa66b4385e396cfe3bc7e9dcadb9a6672eef354b49eb229e89640de8
diff --git a/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch b/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch
new file mode 100644
index 000000000000..03c0bf24aab5
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/0.3.5-fz_location.patch
@@ -0,0 +1,44 @@
+From c2dd7835b63ff68c0edc8a3182b3f994dc6ab4dd Mon Sep 17 00:00:00 2001

+From: a <a@a.com>

+Date: Sun, 16 Aug 2020 19:46:11 +0300

+Subject: [PATCH] fix conversion from 'fz_location' to 'unsigned int'

+

+---

+ zathura-pdf-mupdf/index.c | 2 +-

+ 1 file changed, 1 insertion(+), 1 deletion(-)

+

+diff --git a/zathura-pdf-mupdf/index.c b/zathura-pdf-mupdf/index.c

+index c421f5c..996d012 100644

+--- a/zathura-pdf-mupdf/index.c

++++ b/zathura-pdf-mupdf/index.c

+@@ -67,7 +67,7 @@ build_index(fz_context* ctx, fz_document* document, fz_outline* outline, girara_

+ 

+       type                    = ZATHURA_LINK_GOTO_DEST;

+       target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;

+-      target.page_number      = fz_resolve_link(ctx, document, outline->uri, &x, &y);

++      target.page_number      = fz_resolve_link(ctx, document, outline->uri, &x, &y).page;

+       target.left  = x;

+       target.top   = y;

+       target.zoom  = 0.0;

+-- 

+

+---

+ zathura-pdf-mupdf/links.c | 2 +-

+ 1 file changed, 1 insertion(+), 1 deletion(-)

+

+diff --git a/zathura-pdf-mupdf/links.c b/zathura-pdf-mupdf/links.c

+index 99c5715..2e8e90a 100644

+--- a/zathura-pdf-mupdf/links.c

++++ b/zathura-pdf-mupdf/links.c

+@@ -57,7 +57,7 @@ pdf_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error)

+       type                    = ZATHURA_LINK_GOTO_DEST;

+       target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;

+       target.page_number      = fz_resolve_link(mupdf_document->ctx,

+-          mupdf_document->document, link->uri, &x, &y);

++          mupdf_document->document, link->uri, &x, &y).page;

+       target.left  = x;

+       target.top   = y;

+       target.zoom  = 0.0;

+-- 

+2.28.0

+

diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index a4adf124756a..8557cb82e322 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Mikle Kolyada</name>
-		<email>zlogene@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
index b1b7975e9616..965f6f84b38a 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.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
@@ -40,6 +40,10 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PV}-compile-fix.patch
 	fi
 
+	if has_version '=app-text/mupdf-1.17*'; then
+		eapply "${FILESDIR}"/${PV}-fz_location.patch
+	fi
+
 	default
 }
 
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 5186f1736d7f..d691728cb0ee 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -3,4 +3,4 @@ DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff
 EBUILD zathura-pdf-poppler-0.2.9.ebuild 742 BLAKE2B e3a1fbaf7947512832385b3b8ffd47a56ca09cba148a5d80af28457a9d041563eb5dfdf7bb89a0cd590f990a9c4265349a8ceb832c77b6ac1b0dd185b730125c SHA512 a8504ef444e936e214b3621ea3111d82a0e86f89f087531f9f82b9ea05e2648c9aa11adc19c923e33b6bee85330bc8fd9bf782ae78801dc303fccf62b0438ed8
 EBUILD zathura-pdf-poppler-0.3.0.ebuild 763 BLAKE2B cdaee47346ca46fb18c9d4003c41195426e0c6af395592e6dc691a099e674af073c8363cb635a0889c20eab75c6234369e70d61ee5e9cb3878a8687af3bab68f SHA512 931475dee0efa3e9a8c6d82e8cca5cfbb1305461f8f576908c4c67e6adbff792c06444f4819a503dad3e2811527b265e20d55886a97b372f4cd57ce1a37dc522
 EBUILD zathura-pdf-poppler-9999.ebuild 745 BLAKE2B 6abb817bbf4c1db7542f2b59e69eaa0785074578d9c32f7a37efc86dbe89b9888b8093061ebf4867727b52b205f941a7e5e453650006d4dd913e1bce851ae5cb SHA512 daac708c3c2b62185d843a8a649149165e028006987c7d0bf57f9959b7e01fbe52006ec3b46af9b0def91ba334bec0bee148d565b4749ca86ed1d1fb66246a73
-MISC metadata.xml 663 BLAKE2B 0e076d5625ba01810d18d1494048c619129ef68473242f7cb80efc51d056b7a918b2297d045514b3362bd5120d96166d1c83ddfec37c5eee3ece733b29736316 SHA512 509bc36f10297eca9a9f6290502a5531729146abc95ad5cf0b8052cbd478a05bc868a0285e9c52962a5852079e962ba471eec216885444a6206f7bf3a4b1b20c
+MISC metadata.xml 583 BLAKE2B a01ca7f52e9297540970640942b9c32907913df492ee3217d6665a620ed602652a9e5664bb4bc784dbe1356c243fd91a33bab8f2c7504c730b13990aa57ed098 SHA512 2a3827bc9db71c43e8b9b4b357e6156e49b2d4cff5fbcc548f3de104c9d9734278e494ae6e8ed3f2f9b00b2169be2870efac056e07f716d6feef74713263d0b9
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
index 39371e1e7ba9..5869d4ab6b86 100644
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Mikle Kolyada</name>
-		<email>zlogene@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 		<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 21322046fe96..d4b985d26bf4 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,4 +1,4 @@
 DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
-EBUILD zathura-ps-0.2.6.ebuild 672 BLAKE2B f5eb15d1e5892617a8167a5fb56cc5f13c32f7218e51a769409497156ffd954277a99213c6afaff6a69cd88dbf5a71289e50d3d7fc4775e1ba55a57503128efa SHA512 359a2ec673a1278c13ea285fc5cf199081746361bd92d6ab7efa7d2e6fa56a71751e347ad9d566e817966d7f8416f5454f6d248334c583540ad79d284e42c1c8
-EBUILD zathura-ps-9999.ebuild 675 BLAKE2B e9c7f67fc8d86bd307acb311d28f04a181511d70509ae777b2e096af40dd6518f7382468c423dcd368a3ae3fbec0c71bed17a6dc02b4807694a46d0df42066cd SHA512 e821086cbf8442d13bf4c08ec7cdb59d4eec41d2c2d09fb63a1281c8a5eed2e9daa7af5d9d618b405d7ae613f50ede25f1eece6638c96edf09f85741b6eb15ad
-MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
+EBUILD zathura-ps-0.2.6.ebuild 778 BLAKE2B 30a0e94aaaf25ee46f7de992c15e0b19aff13ad68778f1ce4ae8768fea4c5bad50e0a49c5f57ac51c79df66bf58cb6769ec0fed27ff7dc019fe4142ebf9b0adc SHA512 d195be1fbfa49e61885fde466c86f3966300d6f0468489ed36b8e472ad520d8f3b0ad42c7c9dd0487237bc2f1e39203603d0c80569d010639a24ff85be7087d0
+EBUILD zathura-ps-9999.ebuild 781 BLAKE2B 9baac092008549bae90c8a3ffe37dd10db60cd37bd8d963ff7d60f061de883344179b321492ebb34797edeea92a87d0e432ebd6b38f59fa9a1fa08978c269fe6 SHA512 476d15bc2fcbfa3d7943ff6fe0d1b1c262e2215f0ad12e7b5525f243c9fdafde9ac206207943e537c821bc2f07067a8730cd1f672364961614a7cb1cbffa081a
+MISC metadata.xml 582 BLAKE2B ed94d37e43b59abd8bf8fbc1da8a6839aceddd5aae31109bf5d35f3996992d96dec619daba1d2c67a7d5c6182a06a413dc5e425ae786c3fe2cdbb68bb25796fb SHA512 88a39e758edddb852dd554a88035a74b0043d37009f97fb2ba45fe94169e17eef02b41ba8666d9f712469ae3af3258f14f7958b4dc70fc8eaea790d31b092fb8
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
index 9e0907fe1628..7f5e7f55e607 100644
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Mikle Kolyada</name>
-		<email>zlogene@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 		<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
index 94dab249fb7a..e115907ec1e6 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson
+inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -29,3 +29,11 @@ DEPEND="app-text/libspectre
 RDEPEND="${DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 16e0d2d5ba33..1029752194f6 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson
+inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -29,3 +29,11 @@ DEPEND="app-text/libspectre
 RDEPEND="${DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 89c7facbf300..e1e9c0f9c680 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -5,4 +5,4 @@ EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b
 EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
 EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
 EBUILD zathura-9999.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
-MISC metadata.xml 763 BLAKE2B 1a98b02634dd4017052820cb2103b81d7bc8308c8832edb28f65127f43e9a673926b76091e2062a66c701b25e9d5866051e2268fa3fb4f53a681257132618789 SHA512 5afbabe1726a25ba2b0ae5c66533bbc247deaf1c745534487895bfafa2671ba87d9fc4333ac824176f78db64a940cc53a87d018fa4d7e5d201cfc6f41cfb50d6
+MISC metadata.xml 683 BLAKE2B c62911db419d4f2e7a92c3c41b8e28c6cbef576947b1ece65bc196b1f80ea99c2bc8f032bc0ddabedc219d8b5e9efde32575201cb2a7c1b1a3d55b4565909eab SHA512 d4c070d99ca6f3c3957859da152a65f1008bcb66fdbc70e83cb09a8bea1e6d979b0d912d28697d39847153e37194900df22223fcbf100bfb9252281ac3a5359e
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index 9e879333ac21..fe4a9fd81fc6 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Mikle Kolyada</name>
-		<email>zlogene@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>
 	</use>