gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-text
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
98 files changed, 474 insertions, 924 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 78d08ed0088d..9985ab78d45d 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index eed03dfa850f..38fdd4117952 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.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.2.ebuild 2350 BLAKE2B 885c6cbab104796d3c8fe9435e66848e5944438bd0c57230905cf630934bb217adcb245499ee282e13cf12a58e43d92b28af36675272c11f0c84fe4eb1162996 SHA512 7346b5c0e174f874e446c44aa68ac85aa64a944689cd69ccad40b38bf61488e0dafa5af2508b0f7cff0e4b5f3e96f9d7a06688bbf10805f4cc4923702d0cd27b
+EBUILD asciidoc-9.0.2.ebuild 2354 BLAKE2B 8036d5095a6331cba7fdfdb7908627bae037ccd5bca81d3cc016b5f17690b6cd2e873117438ff0e119f95f228bca0bb57954db2282b0976539f236590cd5e7c2 SHA512 99341d44821c8659384c9e77f3a8cb739feca5ae90b80e32deff893dd3befda196429f4ba9f364f6688ddec388b0bf4a8d71e65b53eac262f7453264f8f56aca
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-9.0.2.ebuild b/app-text/asciidoc/asciidoc-9.0.2.ebuild
index 2ecc52b09ee1..c289dc0c95a2 100644
--- a/app-text/asciidoc/asciidoc-9.0.2.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
-inherit autotools eutils python-single-r1 readme.gentoo-r1
+inherit autotools optfeature python-single-r1 readme.gentoo-r1
 
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 206fa437e50e..f00e7fa2743d 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,5 +4,5 @@ AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbd
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
-EBUILD aspell-0.60.8.ebuild 2747 BLAKE2B 1dc9da32ba80d7b30ab7ba9eca3ce2ce62614696ea3d61a97d65dc9a6387cff2e954e7f3a43a9e9144b792e136bc28fd34192d0fd08d54df7af5f9d66621256b SHA512 e56e687f6ebffb3ab82dea0783a7671afb353e74d9d0c94ec68718d4219ce297cbfff32c9f38de508a4911e2b39c120c0e0403cbac595887b95b4ff6ad3c244b
+EBUILD aspell-0.60.8.ebuild 2754 BLAKE2B b587a95d9ef90e811869823f15c18e0341009c806e53caf838e9b3d7db5f9ad412f006d0f270bc37c3e9c28bd73e17bb39484a0d0b3992d78cc0cf0380fa15cb SHA512 0fb04b734cef8b90d1c45df727c561edb0ffcac44417a30e34ce1a782f1e7e3443bbaf3a5b62eef67fa1a834813ed3953ab564b17c002b13ac8fef050c8eb984
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/aspell/aspell-0.60.8.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
index b2929d84e9c6..8cff278583d0 100644
--- a/app-text/aspell/aspell-0.60.8.ebuild
+++ b/app-text/aspell/aspell-0.60.8.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-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 ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 6cdfec21e4a2..e527dba2a744 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,7 +1,5 @@
-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 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.0.ebuild b/app-text/bibletime/bibletime-2.11.0.ebuild
deleted file mode 100644
index 8c7cd16f9aa8..000000000000
--- a/app-text/bibletime/bibletime-2.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt Bible study application using the SWORD library"
-HOMEPAGE="http://www.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"
-
-# bug 313657
-RESTRICT="test"
-
-RDEPEND="
-	>=app-text/sword-1.7.0
-	dev-cpp/clucene
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport: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
-"
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
-	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
-}
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 1957dc4c3533..24c28da6550f 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
-DIST blogc-0.19.0.tar.xz 341284 BLAKE2B 1ea0e7f7fe0e4243f54faa15276ac00d29b88f03568d31d08b9522a118072a54e3251c0ae84660fc21bac11d650dd23286b15343d1782fd4d56a397dcb5cc7a6 SHA512 02e1826642a248aa9c5347481a4d89a0ee2ef08cb0985d58aa712c5a8b998ec6033120092d1cb370d86f425d3986fc993a831c195001c73311460f85ad2d0ef8
-EBUILD blogc-0.19.0.ebuild 1144 BLAKE2B a21019e497b03aaa382da9009aff661b547ce3dc93fc6177261b1756e4c08985e186c23e8283a61d238bc5aa4d8de7570dedc1c934aea9fd81a149ca7c8fa0ff SHA512 40eb8a9f49870a79acfe8f1bf7f202ccb5fec1647e88ca58adc83ff5429037f4ee417670f4cb19ea76e2f5f4c85851dc9f99e6e434455f03160bdfe90ab4b950
+DIST blogc-0.20.0.tar.xz 347924 BLAKE2B faabb51237ff4ba3b431b84394cb8ca6f977770f9ed8c1ffbcc841773dc707b9a51694d7a5f3dbe5c573bdd7a16971004551b8ae2c0347273d8c246ae329bd82 SHA512 3738eb23341deb755dbfb0d2e98a73fe53f0e38b929606ebb0a3210d0564a626375d5c20ebff220e63be1f61299492da9061db5366d9d53a28f7ff18cff678a5
+EBUILD blogc-0.20.0.ebuild 1144 BLAKE2B a21019e497b03aaa382da9009aff661b547ce3dc93fc6177261b1756e4c08985e186c23e8283a61d238bc5aa4d8de7570dedc1c934aea9fd81a149ca7c8fa0ff SHA512 40eb8a9f49870a79acfe8f1bf7f202ccb5fec1647e88ca58adc83ff5429037f4ee417670f4cb19ea76e2f5f4c85851dc9f99e6e434455f03160bdfe90ab4b950
 EBUILD blogc-9999.ebuild 1144 BLAKE2B 6764ab70e01f55931815fc6602163bf8dd46ea9dbd043f9c7593dfe027d1b1e139da20d5f706d00d34154a213a88e1518424dea7b63dd16e6b0d68c400dba37e SHA512 dd59471fdfb17d2726afd914c8a95a3c07ed093115252786d8e66984cd03e1ed6500910ae1c443907d08bea0b6f21d18c2a0aab380d8d05f5521a908961ab4f1
-MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
+MISC metadata.xml 635 BLAKE2B c6eea4d41dea75444a7a88ea7f8e9ec716465dfcd2db1f83c22b0a0b0ac85812e5211cda0480b6209270f78d1ce8a89584eaf75a9c620c5ccedb55b342993041 SHA512 8c60992b0d0d12556da80de2cf855bf74e44eecdf56f535a4b881305761c94902be189e7fe829f6ba940605f36d669f07030ca39360afe887348e31a8d08e828
diff --git a/app-text/blogc/blogc-0.19.0.ebuild b/app-text/blogc/blogc-0.20.0.ebuild
index 8deec5d2e311..8deec5d2e311 100644
--- a/app-text/blogc/blogc-0.19.0.ebuild
+++ b/app-text/blogc/blogc-0.20.0.ebuild
diff --git a/app-text/blogc/metadata.xml b/app-text/blogc/metadata.xml
index 6a921452e508..410777d2e89b 100644
--- a/app-text/blogc/metadata.xml
+++ b/app-text/blogc/metadata.xml
@@ -5,10 +5,6 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
-	<longdescription lang="en">
-		blogc(1) is a blog compiler. It converts source files and templates
-		into blog/website resources.
-	</longdescription>
 	<upstream>
 		<maintainer status="active">
 			<email>rafael@rafaelmartins.eng.br</email>
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 5582081bb8fe..1ffba96098d7 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
 EBUILD cmark-0.29.0.ebuild 731 BLAKE2B 9cf4db73d57e077dfcf941a7fef74ca55afcb39b8a8e4e9241ed882a260d476b21c171d829eac90cf5696471bf553e23e50856fe2b177a2221b7c13d987223ec SHA512 746e152b0f048556a4e49b62db055e8b5d3d53fe3dd48fc4b914a8e50cae25b6717fb0e25eee7d550d8ceffeaaf4bd094be8415be54deeab7a9364e37af448dc
-MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
+MISC metadata.xml 473 BLAKE2B 770f8d92e6aa0ff167733de2877fe1b244cd153875dce9116b361cdb4ee529e54de01f0841af1d1a23b54826786e784097afa993f791515a79c4a1af61b4349a SHA512 a0f0f24ee085d6d49311c08a1cb72f492cb88659a840ffdc2d01576c97b9a56b63beab6fe46a23df5331ce2fc100341283b2cf0bdb18a3861f0953f8c1331c72
diff --git a/app-text/cmark/metadata.xml b/app-text/cmark/metadata.xml
index da44e88f8f6e..8da187d6f1c1 100644
--- a/app-text/cmark/metadata.xml
+++ b/app-text/cmark/metadata.xml
@@ -9,9 +9,6 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <longdescription>
-    CommonMark parsing and rendering library and program in C.
-  </longdescription>
   <upstream>
     <remote-id type="github">commonmark/cmark</remote-id>
   </upstream>
diff --git a/app-text/cuneiform/Manifest b/app-text/cuneiform/Manifest
index cc4e358511e2..c288df96bdce 100644
--- a/app-text/cuneiform/Manifest
+++ b/app-text/cuneiform/Manifest
@@ -9,4 +9,4 @@ AUX graphicsmagick.diff 1547 BLAKE2B 5dad602a467a2b3f8c0a55f8a873e9d46cde7857b07
 AUX libm.diff 634 BLAKE2B a1f3eaba778b5cb1a8322a3b3c048293af61eebfe1c3e43c880242a100b732d3f2252ea9bac3469218e0f6e97424fd13ba52655adaf1a43b8c8abf8d67652e16 SHA512 7b1f00e9644ef0762adb10d64835bd9f2e5b2d64729a75cd1afde62f6560afe4fb632e666a4f971686aabbc8a6d5d6364ab641787a01152667e25904fedfff62
 DIST cuneiform-linux-1.1.0.tar.bz2 26388511 BLAKE2B 9a9406d42b96d814b7342c48b384b7d46b529116e37f9946da6b1158bd223d2e4be0158bd0101f0b9821b7d63374758190e60232483779bdb6a4164d1b06034e SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56
 EBUILD cuneiform-1.1.0-r3.ebuild 1528 BLAKE2B 40cb06b092624ded0880885fa36e0a5737bf10b59727be792c2852d6e4ab07f66860425b3a337735ed9822c8e90bfbf8d4fc995bce828044e77e71a1da5b5e1c SHA512 a2a4106a360b2b888aea93df82ae3f134b7ed4df6eeb98fcaf35fde5ba6f288c4267cd2fb31dca2bf0ecd50026996ba28be439bbdfd2d6916f665ac950a3a23c
-MISC metadata.xml 344 BLAKE2B a004a26b6f3707acc98c356f79b3d9451b5fb596fb5ee3e2291ceda662539e2b90e82cfcc3f0c5f17febd315f5f8d921a39cfa212fab2253efa67edb87914e41 SHA512 7c8e545246470ac8e3928f698434403dfd4ccfacce041d623a1fbfdc26bf2a032b4df5604425292d5fc63570237c576630d61884f1ab03e7d2052b9d167a385e
+MISC metadata.xml 250 BLAKE2B a79213869bd5899b9cfe177caee01e12a026f71485466cf3836d2809234fb64fe5c7ca8d945765fb2f40259fb0a9817e521d101d29ae87cd34098d5316f3dcba SHA512 b540aad05003ebec6a4f52250febbca55356d3d2d826d7b3f982d25ca543be928537194325600b5489970288e6500a671b0343735ed9ee052471efa26cd7cdab
diff --git a/app-text/cuneiform/metadata.xml b/app-text/cuneiform/metadata.xml
index 8797b4d858f4..0c8e3f8c1079 100644
--- a/app-text/cuneiform/metadata.xml
+++ b/app-text/cuneiform/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Cuneiform is an multi-language OCR system.
-	</longdescription>
 	<upstream>
 		<remote-id type="launchpad">cuneiform-linux</remote-id>
 	</upstream>
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index ccc5a877d675..432abb918306 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -4,6 +4,6 @@ AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63
 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 1798 BLAKE2B 34e61d1fcc33323a2da173e2a07ada90ee89dc6c2f46a6f6ccc0a1cfea25a7f2f19399708952124f6003026f6acb77782940e485e18e611873079cf8d141f0ed SHA512 56bf72d3d35a82e2dbfbefe6bbccad01cc00bb05c30d9d7ef472d00e0b457a948418944f05398ac6719ea6a285ea5c11b7cb4328832dfdbd732bc1866386c93b
+EBUILD dblatex-0.3.11-r1.ebuild 1796 BLAKE2B 397a88b719c756c394ae63aeaaf91ed65d307231e5e3b70f5261e7af7f7fb18c44e1ee4485fc4a364763e62d9ec4bf7d7847da3bbbeb09427a683dd3edf55745 SHA512 5f0d955684d247e54f197eec011926f61ac547e07bb913f6e75e00221e47da67e782230c8c6b6e0f883220e343212cf143ab16f272ccc9ad1b907e22b5bb50ee
 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
index 0c2e4c9d1418..5cb798c413f4 100644
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="inkscape"
 
 RDEPEND="
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index bc54229776ec..beaa2dfa6a01 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -9,6 +9,6 @@ AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a186645274
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
 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
+EBUILD dictd-1.12.1-r2.ebuild 2870 BLAKE2B abfafae14c450faae4ddab7e6067140bf5ffae2fc44c89d22af9055cc0f087dd94ccf70013f423c0874279a3814a288b965d3d566af34b0c923f5885eb81dfb8 SHA512 4b4caa9de69e126ed84b9d00cf086c327ea47a059bfd3fc7e6f541b15153f73d5c9afb87de75da186d36b8226666e6284ae64b6981352273a6b58ee8b729a66a
+EBUILD dictd-1.13.0.ebuild 2956 BLAKE2B 05bf8ae9ec53ed9b4d2255f6fb3cc544534cc4662d6342eb2d69d28aaf3b2ebcad4c886f0e7a8e4783dd187e6915bbf48e1e26271a5d7b36eb9bea88396fbcc3 SHA512 f579cc49468d91b85d87c58464e0ea02e7aaeb37e18d76fc627891908306762588a460716b5bb3586c0c02380c587fb082aa0a61ec1741a25538b7e89e347bec
 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 4da9d8dbf3ae..4feb9c4a5c76 100644
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild
+++ b/app-text/dictd/dictd-1.12.1-r2.ebuild
@@ -13,6 +13,7 @@ SLOT="0"
 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"
+RESTRICT="!test? ( test )"
 
 # <gawk-3.1.6 makes tests fail.
 RDEPEND="
@@ -78,9 +79,9 @@ src_test() {
 
 src_install() {
 	if use minimal; then
-		emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
+		emake DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
 	else
-		emake DESTDIR="${D}" install
+		emake DESTDIR="${ED}" install
 
 		dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
 		dodoc doc/{security.doc,toc.ms}
diff --git a/app-text/dictd/dictd-1.13.0.ebuild b/app-text/dictd/dictd-1.13.0.ebuild
index 6f994838112e..79c142175876 100644
--- a/app-text/dictd/dictd-1.13.0.ebuild
+++ b/app-text/dictd/dictd-1.13.0.ebuild
@@ -2,6 +2,7 @@
 # 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"
@@ -13,6 +14,7 @@ SLOT="0"
 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"
+RESTRICT="!test? ( test )"
 
 # <gawk-3.1.6 makes tests fail.
 RDEPEND="
@@ -22,9 +24,7 @@ RDEPEND="
 	dbi? ( dev-db/libdbi )
 	judy? ( dev-libs/judy )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	>=sys-apps/gawk-3.1.6
 	virtual/yacc
@@ -39,6 +39,7 @@ DOC_CONTENTS="
 	\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
@@ -78,15 +79,15 @@ src_test() {
 	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"
+		chown :dictd "${WORKDIR}" "${S}/test" || die
+		chmod 770 "${WORKDIR}" "${S}/test" || die
 	fi
 	emake test
 }
 
 src_install() {
 	if use minimal; then
-		emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
+		emake DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
 	else
 		default
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index fbb4946d2771..a9727a71661b 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,3 +1,3 @@
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
-EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B 1543bc005f55a9ecf74f95295a29aed25100f056da963b5ed75fcde148928ef10e4fa05830b6ad8c17d2e8bc07a0daef3baa1fddc4bc085fb343b667a8edb33a SHA512 30dbaf5409bdf414fcc53246882f6dda413dc25d1689bd489e383a05a39699b2efcaa5eb3d24ec3fc8949a169f51a3642a8552911579e34c8f4970b12c56d945
+EBUILD djvu-3.5.27-r2.ebuild 1660 BLAKE2B ed005e78e907b2caf89118c2e37448a0951b08db834004f480e644534bf337b5dfa6220697dbf8b07f80f651afcfc6bccabe826242eefb6e05432040582ab981 SHA512 c6d5b6e7997fb7d8ab9ab688c3679ca150d92d2a6c787c63001780a30e51de630fec300911979803c4556e4186096ca4600eb0e2b67a3daa6cc8e1033791063c
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
index e5debec50dbb..e3d9bbf4d761 100644
--- a/app-text/djvu/djvu-3.5.27-r2.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop eutils flag-o-matic xdg-utils
+inherit autotools desktop flag-o-matic optfeature xdg-utils
 
 COMMIT="a00b7618c22fb35b030582147a4479c4cf41c349"
 MY_P="${PN}-${PN}libre-git-${COMMIT}"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index a8813c336752..3b015cad6c52 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,4 +3,4 @@ AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73
 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-r4.ebuild 1846 BLAKE2B 1ca06b9c750e2d99b065a117b9e23615bbb7422a4d190e64f97bde53503f8f5e97b0b1083d96c1c6e817a686d385650656820a7e5839462d19d5b26776b15a7b SHA512 fb71b8783e43dae5ae432881adee681095bc0d1d67015c2b54fedd809230a632af58e38d684f7aef7d3917371f3269088ce0bab4033bcdc21af444c4b04b4da8
-MISC metadata.xml 409 BLAKE2B 326a67b502158f75dcbbd01ef2772bbab0099a4d4a1fc1e7463655abbcd807fbec8761edfd1d312b4d3c845d72506fbf53245779e657cc0baf7d2fa44b3e147b SHA512 abc9fadc1fe1a7a863308a566932f958df7b13800336db521acdb6cc93773fa6c8310a34d702bb996baff5718c2329ef790bedacc5f1d849810c174fd8b281ea
+MISC metadata.xml 375 BLAKE2B f1655f0698fe7e1374db6464010f2dbfee8db3c32e7bb35a2c6b275faa9555ee163cc9aefdb069eaf05cb795333af67d4f8c2594b7426d885132eb228ecedfdf SHA512 1ee377b0ace2956254d9d8751eb25463f6e7034328ce0a620e4a2a36c01d70d3f8e3e8b94da1f25b83536468aac558d410348b9e0d4890409104347f712fa0a6
diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
index c09afbf4330d..e57bb4319ef2 100644
--- a/app-text/docbook-sgml-utils/metadata.xml
+++ b/app-text/docbook-sgml-utils/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>
 </pkgmetadata>
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index e6ffeb5c6138..99fe3c8abccf 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -2,5 +2,5 @@ AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af SHA512 4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090
 EBUILD enchant-1.6.1-r1.ebuild 1629 BLAKE2B adf64823d275f228a0056b7ef888bd399f9e7d0ab0d487ab3316272a0d04e944472a60a90dd16f545b55d742f5dcfff0f05200763ff11492ca576423a59d0e03 SHA512 2f132714843ceccfcbbdbcdeb4a5d24c66635dfeca4f95f676046dc9f0313bd1bf8ff6b62ed5f1ee666649e519dd67b2a3f9b15854e050ddd0dbedd003530edb
-EBUILD enchant-2.2.8.ebuild 1223 BLAKE2B c44c9c66e5c730c3cbe74619d564ada75e4793274f9609efe0da48f3c420e3649b80c1a89120e04aa35d44fa13d5b790c037a06a6cce75277c05badabc54de17 SHA512 1e49ea61b6bfe2fe023e7444cab68c7b74dfcd8a3dc5993e8794c86b8b4be3afe4ad75af94b97c26646625f0b0775806d5730b119b86a8970f58906100be0aac
+EBUILD enchant-2.2.8.ebuild 1230 BLAKE2B 2caf5298fc0b7a922dcf2f2d8732248294b21ec88998fdceaf83c7003676ee509c453bd7b31af0f0e6a7513a56a2ab3a09e68bb068ae991e9fcc6926b8b7b085 SHA512 6ccf011411e6e8b321c67da98dd4e91eaccf0dda407a81950d03f35ed15405b222e1463da2a647a5adf5d3711a0784beb63504d724885d5c00b2cea437aa2310
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-2.2.8.ebuild b/app-text/enchant/enchant-2.2.8.ebuild
index 710a67b885cb..0c48e1849305 100644
--- a/app-text/enchant/enchant-2.2.8.ebuild
+++ b/app-text/enchant/enchant-2.2.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/fb2edit/Manifest b/app-text/fb2edit/Manifest
index 7caa006cbdb8..7c3362f21d09 100644
--- a/app-text/fb2edit/Manifest
+++ b/app-text/fb2edit/Manifest
@@ -1,3 +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
+EBUILD fb2edit-0.1.0.ebuild 598 BLAKE2B e369fac1b21cafc9d44603642ba32103465c982fc100a86583b77d1fd2ba5ccf6148086f9308c9d11100b9e59ec4ffdcdc57d8d4895ffa9ea53b874ffdd6df22 SHA512 e550a48bb2dc946425bcc1d421e1b143936636bc879075f8741e17e87a75e8f6346d6cafa12cc983a849d2a1e18e8d15b33728e6fccdda47b75f8b44ef501065
 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
index 1586fc5e4078..1eaa7cee867e 100644
--- a/app-text/fb2edit/fb2edit-0.1.0.ebuild
+++ b/app-text/fb2edit/fb2edit-0.1.0.ebuild
@@ -18,8 +18,8 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
 	dev-libs/libxml2:2"
-BDEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare () {
 	cmake_src_prepare
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 0c8c2083b0c1..6ff117683bd9 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,4 +1,4 @@
 AUX fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
 EBUILD fbreader-0.99.4-r5.ebuild 1934 BLAKE2B e12e5cdb9714e1f97e6a375c3e64dc65aedd93b9214417e7d3b3f2dfb4b39f53a8cb540cf2636bed5940b202f64ab7f8817d541d32b212ac5a1835656e923fe9 SHA512 48a634082045cdc346d06473db3ac1b17e1ff91451fae50900ef7b19e5a7529b82c683d8ff93435b9d0053f69ccee8e924ec82854b06f213895657cec26aaad6
-MISC metadata.xml 320 BLAKE2B b537c430018e9035438033df51325115040dc2468f03721c678a60c40654ed99be77a154ba34bb6cc1b7afd54191912906a007a50924cefddb2b6bba908eceb8 SHA512 d215791adfc4cb16e4c25d0dfea7dcf6439fa12916d0c0e51be65d62dd8d48bd63c7e983080027101c6cac1220f4e622c580f7ced4dc895e8b4898f14e921539
+MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/app-text/fbreader/metadata.xml b/app-text/fbreader/metadata.xml
index 6eb5f614141b..13830225acf7 100644
--- a/app-text/fbreader/metadata.xml
+++ b/app-text/fbreader/metadata.xml
@@ -4,7 +4,4 @@
 	<maintainer type="person">
 		<email>grozin@gentoo.org</email>
 	</maintainer>
-	<longdescription lang="en">
-		FBReader is an e-book reader for various platforms.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 44d0b2503454..85a0abb59be2 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,7 @@
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
+DIST ghostscript-9.53.0.tar.xz 41358720 BLAKE2B 9a8b5872dc799f14759033685c37890f2da28450b1e115fcc63a2a920bb22bfc02db078d3f39dc62778da2a2518b82c2fc91f349486e83914c88c70d1e15d7e8 SHA512 fa594ef99e58257074b651e4d078bd1025f7bc2c435cd2a5454ba59c2a98cc82e93339ccd1eaa4fe624275165aacefeabc6f8336476027946f56aeb02e93da30
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
+DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5097 BLAKE2B 748ff28b3a38714562d03d63b267a2cbb762103972d41883d2c5917083cbed564ca36788fdde92ac8366768153d0453ece4b25b760bad6c3d97e08c9e86961bf SHA512 82e9b5f3f1515236197510bb29238ca955cf042a233ef314036b8b88887df2bc8dc353342b09c7d0444d73de9f98412a2c7252d19782e956f15dac2147b3d289
+EBUILD ghostscript-gpl-9.53.0.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild
new file mode 100644
index 000000000000..0d3acf4a9d16
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild
@@ -0,0 +1,189 @@
+# 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.53-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 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.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=media-libs/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn: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 \
+		--with-system-libtiff \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(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
+
+	# 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/hunspell/Manifest b/app-text/hunspell/Manifest
index aec0465f2d2a..2539b9bf1df5 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -2,5 +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-r2.ebuild 2365 BLAKE2B aee539d45a6edf6c85924ed8c2ee465951b2aea6480c8700bd541ac128cb204b431f153ac27273770148b2bfa710bfebf5db2d4772ea8b5629b95714c37d70fb SHA512 9e1687f50f4dbcb789e995e82a4451b90f947a90fdd9cc43b7c52369f37da7656ef24ba559b70afa5dd35fdfdeb92cadd826295c35ba95065d274bcd6c576f0f
+EBUILD hunspell-1.7.0-r2.ebuild 2372 BLAKE2B 0fa1b468117d75a8cf719edda49852ec027fae21df54fa00623b85ede74f1fcf229824715f2f63a79addb1810c7c64892421f3eeaa8d28dcf1b3208f2343c016 SHA512 b957431599ef10e4f5986170dd324476f5c93fac08f5f70fc6dea63ae8ed3d735d27474ae74740e5f29ffcb9ab34575c93e8400bc7b33b217318fb5dbdfa6b79
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
index 0caeb3c9f131..2b7966634c05 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 ~riscv 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/libwps/Manifest b/app-text/libwps/Manifest
index acaaec7d54c7..61d82c830d50 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,3 +1,5 @@
 DIST libwps-0.4.11.tar.xz 706000 BLAKE2B e733b2fed9a05352b41126b2c0225807b3fe9a57f01f3b2a3bf35f99bd0adbd47bab8ef058f45de749332d407d589f6c33a03a3579fc76551548cb92c236e09f SHA512 6c81342b68fd93974c10ec0907dd46e9417cafa46d06205843941650828f4299a8793a7ace5c0ca755b8b9fb91fc1d6ef63304c641e7b5de36885e9995566e36
+DIST libwps-0.4.12.tar.xz 713008 BLAKE2B c95bdab54f8853cd1d13b59904ee4064cded3741cb91f2b067f139d80cdae6ea19bac68e6855cad74878403bc1a04c6f4bdd3181407b69b7e50f1e7bf4255f58 SHA512 d23667681f443b0c718b55006bee881e8a07d6b071cda742a783a89e9ed0e4c60c66c7dc9612a3fb4a419ff6d6e572f5981cec1d9470422e10cf9837e92a4649
 EBUILD libwps-0.4.11.ebuild 782 BLAKE2B 74bd852c8cce0c5ccacf6d96f30f9dfb4b1f68a022c7f75fa11ec86f29bab9a5d8c5e671645bb3bcf6813771b06f0d2778b1a15b0d70773a402c8129e73dd65a SHA512 b27f0287b4ac60676578b94e0398aaa2b820b068b716478fdd73681ee91b451aaa8a66edb9f8d0970dc2cddacd04fd29c049c5c0d9b6a4f1cd647b678384c11b
+EBUILD libwps-0.4.12.ebuild 757 BLAKE2B fa5142857e2530c08f2dd024b3d9d0623ed8ce41c4b7a4433b1f01fa67edbb4a12cd21883495820ec5161c15b6cf718804c9a01d4b1b19328ce2e4837587cf16 SHA512 08c95a50555af60751821b42395f79f74dcba4a2ca48c23d44988af6ed93617ca9469398af418ec201da9d877be3cba392b9b90b1260395f2dc7c90e54b3ab46
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.12.ebuild b/app-text/libwps/libwps-0.4.12.ebuild
new file mode 100644
index 000000000000..9499a49c965a
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug doc tools"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-libs/librevenge
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 0f52e9893889..64fc10f73e89 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -3,6 +3,10 @@ AUX llpp-30-keysym.patch 1669 BLAKE2B 4df35a04c4b5de7e8fa4eaf7efe6a63f203292f12c
 AUX llpp.desktop 556 BLAKE2B 44ef90b27f7d4efc02e7a4f420bade296d9704ba1dda803d4ffe897fef1393a2147827971bfe58ad0d896b0af619c6b4796c1bb08beba0728d66c2ec15e2cc56 SHA512 a0c6a256f8d08829f70cf8c1b2a2b93fd9cb60ff2e5d886a09a4afffe42fc95e5f9ac86fbcb9e4af805d40f309a65b7958f5f60dc3637aab9ad4248a56a9fb97
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
 DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B 56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d SHA512 c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713
+DIST llpp-31.tar.gz 169199 BLAKE2B 3f60db741fb94bf1b4753f5443705e68f062a68212fd3d0d8062f54b3b71002dc0ee3ba3040f9be028a40d8e96de11c8c53966196e631458f65d863f90f7226f SHA512 d9e213078899ece4a92291199bc2ea962c40a185b9908a7db241a773f57c64e08b004a8433984b86cc4b59088f97991b2ee8ee94e75d71536ce378dd32316e57
+DIST llpp-31_p20191016.tar.gz 169480 BLAKE2B af8f01d156863b642ad1c062b4b1a00a744955fdc1e7446b7a5023e6d03b58af77c699140b54d337c0eeacf65fba7a06ccfd6baa6ab9e1920bd7fd0fcfa90d97 SHA512 6fdd2621aec9f026e175c52957c77293a105adc81e42dad33f24631d5d2ae6775978834e84e1cab73cc8d1246af684384f9057a0f613438a19eaf7b607f92ddf
 EBUILD llpp-30.ebuild 1716 BLAKE2B c7c87a02e1ce23d4cd01645cd33469eff8be4cb109d5fa388b54fff60230a5eaca7adc6e432ce2385ef6e286ec23f06800ffdf4e194bd7bc31560e8ad3134575 SHA512 5afd881e7944eb01a77fbd1766ecbe131e1043f90d5809db99b5da24da4353d151a4b1a11e1e55e49d1046a5fb332178ed6a9bedb1d08929c9781f13ca460bef
 EBUILD llpp-30_p20190316.ebuild 1776 BLAKE2B b2b63fafd4d9f0a6303519e8ca017918fdbd2af6ece74c1e26f1faaac8c0d6efc71ea6d213bf5f5ef8176d6c5a49eb93c330c8ac64fe46da34636d0ba4daa1fa SHA512 7feef827c5fcd7b879f1878929ad0365e4c439fb0426f0b35c9839726aa425c253d08a938635a30c7ddb460c08db02434c1ee8ff7f132ae7698414fb07688a7c
+EBUILD llpp-31.ebuild 1514 BLAKE2B e106b5f401dc0105b10708c0d265ea1b92dfc4a80a3c985299a3e15b291c0314cf162239b738620326ee2f76a3e578e17f9d294fed9e9af2e9ca8cb3da54b0f8 SHA512 e9016e6e9efbb40491ac480565e186543dfb10f1c0683517169d8968eb3b9fa8787dcba92fda2a244a8c75137701f221862bd60b28bef3b04ffc24fbd3944c32
+EBUILD llpp-31_p20191016.ebuild 1770 BLAKE2B 8119c7951afbea57e5d84cfca036730b523ded54f31a01bb76947fa840dc17c66649fc1fd83b512a0f911a3322e382295a1f11d8374fe39e1595f5c27b0a8e80 SHA512 3c1ddfad6605e177c25a3b3605ac9368017df3806b16b3e276bc1354353d310c00de44172fef37dfe2f84fe4ae97efcbeaf5cf6c4cebb2b40279666b036975db
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/llpp-31.ebuild b/app-text/llpp/llpp-31.ebuild
new file mode 100644
index 000000000000..439e1c537abe
--- /dev/null
+++ b/app-text/llpp/llpp-31.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="https://github.com/moosotc/llpp"
+SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static-libs"
+
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig"
+RDEPEND="
+	=app-text/mupdf-1.16*:0=[static-libs?]
+	app-arch/bzip2[static-libs?]
+	media-libs/fontconfig:1.0[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/openjpeg:2=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	virtual/jpeg:0[static-libs?]
+	x11-libs/libX11[static-libs?]
+	x11-libs/libXau[static-libs?]
+	x11-libs/libXdmcp[static-libs?]
+	x11-misc/xsel"
+DEPEND="${RDEPEND}
+	>=dev-lang/ocaml-4.09[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
+
+src_prepare() {
+	default
+
+	# use custom makefile from archlinux with minor changes
+	cp "${FILESDIR}"/Makefile "${S}" || die
+
+	# re-add desktop file removed upstream
+	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
+
+	# remove empty interface definition
+	rm "${S}"/main.mli || die
+}
+
+src_compile() {
+	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="/usr" install
+	dodoc README Thanks
+}
diff --git a/app-text/llpp/llpp-31_p20191016.ebuild b/app-text/llpp/llpp-31_p20191016.ebuild
new file mode 100644
index 000000000000..71908e87e152
--- /dev/null
+++ b/app-text/llpp/llpp-31_p20191016.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="https://github.com/moosotc/llpp"
+MY_COMMIT="25c10de38cbfe0874d377e7599108e6b2a8a92ff"
+SRC_URI="https://github.com/moosotc/llpp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static-libs"
+
+RDEPEND=">=app-text/mupdf-1.17.0:0=[static-libs?]
+	app-arch/bzip2[static-libs?]
+	media-libs/fontconfig:1.0[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	sys-libs/zlib[static-libs?]
+	virtual/jpeg:0[static-libs?]
+	x11-libs/libX11[static-libs?]
+	x11-libs/libXau[static-libs?]
+	x11-libs/libXdmcp[static-libs?]
+	x11-misc/xsel"
+DEPEND="${RDEPEND}
+	dev-ml/lablgl[glut,ocamlopt?]"
+BDEPEND="
+	>=dev-lang/ocaml-4.09[ocamlopt?]
+	app-text/asciidoc
+	virtual/pkgconfig"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
+
+S="${WORKDIR}"/"${PN}"-"${MY_COMMIT}"
+
+src_prepare() {
+	default
+
+	# use custom makefile from archlinux with minor changes
+	cp "${FILESDIR}"/Makefile "${S}" || die
+
+	# re-add desktop file removed upstream
+	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
+
+	# remove empty interface definition
+	rm "${S}"/main.mli || die
+}
+
+src_compile() {
+	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc README Thanks
+}
+
+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/logmerge/Manifest b/app-text/logmerge/Manifest
index cd4bdfa8767c..05d255d99618 100644
--- a/app-text/logmerge/Manifest
+++ b/app-text/logmerge/Manifest
@@ -1,3 +1,3 @@
 DIST logmerge-0.5.2b.tar.gz 3407 BLAKE2B 5bc6f46693a9a6e087f8b18441659a06387410bcc66c789120644e088bf1971ef161bead4494b2a509850d8031bad43052bc76d3a8afc13de836119b32dab8ee SHA512 9185d52c62d2ea68fee0e1c6fa798cda60b4a2b621436f5060d7c9b3e5b15363fdb1c9fb40351f66dc48173498f3b18035c46fcf58fa3063bad0008b9bb5946f
 EBUILD logmerge-0.5.2b.ebuild 450 BLAKE2B c445d8e44efa541af85debe1e41bea8b0223546dfe84323454a822e9eb2d9c6250c7e034dc9b1c8d99e3e58409323c47ba91ba0e16b0411ed209a1b64b16cce0 SHA512 a542512742a0597691407e8d6f1a4756f8cc5c98fc30d2210701ed36f2675b57187969e38a576feaa26efa2f476f338d7f9fc15e7a299b931cfbca60eecb8604
-MISC metadata.xml 404 BLAKE2B 3014fae65f8b3116420d4bd39bf0268ba334cc65546833f0a216df8f8b65ae53a179d73151740d4b51489c5629e0d6b760ca423f30a0279a4552443b359b941f SHA512 f35a08d3fc5d52a61e91ec28c1b15cb1fbaec77f1a5652b4cc44d7f12b675526111349f3b96519d705b42d2198ab545d81fbfc8c4fdd56e4a3ee11346dd85d24
+MISC metadata.xml 264 BLAKE2B 5c2b41e74176f4e38c5d414635fcd1141f9ba2306aa3101ce8d8f05dcbfb5488a20e08ae910d76a72dbde0ba7e61fe2bc4ebeff1139052433f5462b63a2689e1 SHA512 b3306ed0ffcfee82f45e3dc6ed4ba13c369c8e060e6cda07b0a1247f5f869f589e22c669ffbb18cd41952583aba9016645ef78abb7adbed9655598e36af4f60c
diff --git a/app-text/logmerge/metadata.xml b/app-text/logmerge/metadata.xml
index d0b9b2fdc5d0..604d9e32df7a 100644
--- a/app-text/logmerge/metadata.xml
+++ b/app-text/logmerge/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-    Merge multiple logs such that multilined entries appear in chronological order without breaks.
-  </longdescription>
   <upstream>
     <remote-id type="github">ildar-shaimordanov/logmerge</remote-id>
   </upstream>
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index 9e8893d86c5c..dd825226dc4b 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,5 +1,5 @@
 DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
 EBUILD mandoc-1.14.4.ebuild 1535 BLAKE2B 29f294139623d10225aab640399d224632535a6b39fadfe8d57101c6cc2e696a662c84a20cd619a761d8b52e2f590434303062e5599baca13d8c61e0f04a6268 SHA512 a3473a40521fd694315a7dca6d0aba171389ba39f8b92aaf24a103299ff664a97f8e984d27c2b7ffd86a294f0e027358b0686ec2093ecb02d1d6aa2dbfed845d
-EBUILD mandoc-1.14.5.ebuild 1720 BLAKE2B 9f273f2cd786495c36cb21b8b7e333a06734534042234943fa726e38d8c9e561412d3991f2975e0be73e4e063a7cf13772adff8b604d23e7326b119cc0a65d1e SHA512 18a61c7ccf76c220d337069cd0ca329b9652250b35046a5cd61ea8aa61ab87a1c164257798f8d576be0382cb1e0914bb8987d5560069bd3fc31aa0cc9ee2f650
+EBUILD mandoc-1.14.5.ebuild 1727 BLAKE2B fbdad7247703bcea768dd034b2169f5183cf7ca644dad09335428356d83935d3ab4db2449d18e9c44d23b76c2d5fcfbdda4f6c09ec4bb5b81e8ca2732fdc65f6 SHA512 92be1ad119597580062788095aafb9fc951f8c55d1c368cc412b7afcff32476b01aa103f6f067c326d8a459b97e6071c8c79af8ef51482d5205fa27a743b1f42
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/app-text/mandoc/mandoc-1.14.5.ebuild b/app-text/mandoc/mandoc-1.14.5.ebuild
index 5fdb433abdbd..f79cec58e05a 100644
--- a/app-text/mandoc/mandoc-1.14.5.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="static"
 
 LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 42c23ecd1dff..e0dc1db804c2 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,6 +1,6 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
 DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.1.ebuild 1279 BLAKE2B 03b0022e5d7c0e9ede138abe5393646feed9da09d7eb27ff9373d6c38b3b762ac45c37d05c60217c72373ece3dbb7a624b17090edec4a9c0964ae0b1e4f75392 SHA512 9fc8bc426de8522afc3f5d681ab2a3bfaba24ff25ef553fac1c55b193ff087644fabb08fabdc014d127d7c2b54a312d15905dbc16f25202a04113c620fe031e1
-EBUILD multitail-6.4.2.ebuild 1284 BLAKE2B c336442cad722e0aee03c97e43b3e9b4c51146afa4b704387f417c27cfd43459fea7ce5edad9058f319d4544c30af36c5b8ac973cab4990a19794708cea1d9bf SHA512 aacfeb85b96ff2a6b321019edf6427f61634bee087fa79103d2224424ef6f87bf1cd5a0181c886abca2f63eeade937d87feca9709b484dbe870b9c6cd60296d7
-MISC metadata.xml 272 BLAKE2B 609c633a45e8ff00773488f8866b7db5928c91bb7d81172a893fee6ac47f1125ddad1c15a59e3c337d57612112ab6c4731669e31ea4690c8097e6a4602019d5b SHA512 d36a244fa048a320eecd4da6ab2b4a65287a32ef24a253e028b5f95d4abeb7fd935b466cbe02f29a8e83d4c0cd3d1109de7c8d9b0799fa45273b0fb695bc37f7
+EBUILD multitail-6.4.1.ebuild 1297 BLAKE2B f42d72abd21ec2b2d5e8386dfe5915fabb73538a47dc353956788c3f86d6d7f05a27334dd0e6f94d1edcb48ea0e83d82034a517db67b7c543a83c01a84e6e38c SHA512 1b14d664c5cb2f4d17c96785c59f38655b2241a437e738a345bc479da37e3934441eabbea5deba077fba4b26f05e4e2e18b18843bfcb2f55e64943550cdadf96
+EBUILD multitail-6.4.2.ebuild 1316 BLAKE2B 4cf3af57fc091bf6440061bafa203c549b873bfce4240d5088448b9a183d0e09fffc9ed00767179743cea2f75a95314393c8502a32d850a787f5c667f18c7b35 SHA512 f89a7611e0617a6ba204685ad7b358fd53c1fbec2a6ae9d5886359fe96de2f73b3cd6dbc4797171a0e5e5cefcf42b03074056f4861a6251dfbcff455f65d1187
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 183cf910aa3f..3cf14bf74636 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
-
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
index 4bf7e87f111d..9b88ebb4680e 100644
--- a/app-text/multitail/multitail-6.4.1.ebuild
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
+inherit epatch eutils flag-o-matic optfeature toolchain-funcs
 
 DESCRIPTION="Tail with multiple windows"
 HOMEPAGE="http://www.vanheusden.com/multitail/"
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
index 819fc4d3e724..6fb9bf917d18 100644
--- a/app-text/multitail/multitail-6.4.2.ebuild
+++ b/app-text/multitail/multitail-6.4.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic optfeature toolchain-funcs
 
 DESCRIPTION="Tail with multiple windows"
 HOMEPAGE="http://www.vanheusden.com/multitail/"
@@ -10,33 +11,31 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
+RESTRICT="test" # bug 492270
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-RESTRICT="test" # bug #492270
+PATCHES=( "${FILESDIR}"/${PN}-6.4.1-gentoo.patch )
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-6.4.1-gentoo.patch
+	default
 
 	sed \
-		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
+		-e "/^DESTDIR/s:=.*$:=${EPREFIX}:g" \
 		-i Makefile || die
 
 	sed \
 		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
 		-i xclip.c ${PN}.conf || die
+}
 
+src_configure() {
 	tc-export CC PKG_CONFIG
-
-	use debug && append-flags "-D_DEBUG"
+	use debug && append-flags -D_DEBUG
 }
 
 src_compile() {
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 79273cc85f22..1a19b13ce633 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -4,4 +4,4 @@ AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d15
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
 EBUILD opensp-1.5.2-r3.ebuild 2007 BLAKE2B b61c7fd843c1f0967ce850ddc669ee1abac553ecdeadaf8d6e21dff8d02d897ad1f3a5b18f0a464583a53315468febadba395bcfdbec9440a27aef967e4fbc5e SHA512 63ac01aa40ae20e851086afa4ce3473573a27d79375350b2b7d96b84e3573318c29a36743e79168513d0b312e774830744d831cbb672660b5cff5f168c23c442
 EBUILD opensp-1.5.2-r6.ebuild 2083 BLAKE2B 0b81f55f210161fa10460b5e1ab53e3ce49b8855ffdc23f7e378090d649134c5e45df0b46f9651eecbd464016d494727dd385be333d8e02922175808075b76f7 SHA512 c7871c02c1fb7fe8c6bd3845c53acfcd5295b755289b5f66f8ea6fb51615b48a3fb90b7a8dfd9da8a6473ccac3af4b35ec4f049f47470553a16d9de9657995d2
-MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008
+MISC metadata.xml 320 BLAKE2B b93835e4e002171464888c0ad80df13fa041436cd16525da0bac6087af3013b8c43bbcc2a12e6924894ea65ef141c6e739ca38f914af7e83910b85a4f6700547 SHA512 8614ddb85153854eee8f3a61e308a4590b17bd457f1dcc813fdad1f69265a06f4f74295a608538fcee757e147af9b269adf3d0dafc0e613a936e5e605bedacf4
diff --git a/app-text/opensp/metadata.xml b/app-text/opensp/metadata.xml
index 84b1ddacc397..7c52bdf9578f 100644
--- a/app-text/opensp/metadata.xml
+++ b/app-text/opensp/metadata.xml
@@ -5,7 +5,6 @@
 		<email>heroxbd@gentoo.org</email>
 		<name>Benda Xu</name>
 	</maintainer>
-	<longdescription>An SGML System Conforming to International Standard ISO 8879.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">openjade</remote-id>
 	</upstream>
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index f553285b14ae..4ebcd571f0db 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -1,20 +1,7 @@
-AUX pinfo-0.6.10-clearfilenameprefix.patch 278 BLAKE2B 678ebf0333898651407e36315a38f6ca1e0ca8b3e7f1597496796de0d8a55d37ccfe94c77740e9b92e6f708fadc2511ce3d4c8a098d91ed2211a56e048d1e7c1 SHA512 6d4b0e19c94011eacdaca85e6a566f296d8e41e89c7687d25e5aa6c3e155f0a51112d59fe9bebafa83144469a1bce85400559812adc7d7ad8990b80712b45906
-AUX pinfo-0.6.10-dir-file.patch 280 BLAKE2B 32b728969d23902dde2aed942cf5c21dc87fb5c1bff11c90dcece36fe67698b242a74b8ab74f91a172b28d3c548afd46404e0d956f4673980f8abfe0944932e4 SHA512 bcc16752f2c98b7c013ec1dae84ada89f44d6c00298ed5069b2098674bedcb31bf9e29d3e5c821398518fd59e0fbd84e9141dad2885c55d5a3c76ef728a24b50
-AUX pinfo-0.6.10-gcc-7-inline.patch 835 BLAKE2B 41c2bfe79b6b2afc86ba20718d6cbfa414ef0045c8d64262639e7731ebfd2e340d6f7217bd25020f6dbd333f6a994c5fde368bd882a5417b2cb695c5405d9e16 SHA512 1f4d458917966367333027e1cc5c6e8a376da31f62b2d5be37a4ea287a1a340c55f64f1653b3afa7c0a13bcad8309aae16ca12e91c12ca409eedef7de5cd7049
-AUX pinfo-0.6.10-gettext-0.19.patch 3622 BLAKE2B ebffa03b6df06a4ea96f628ff1ff009aae43b637ee2089b2ac622eefcd745894eff9d94cc648bec4b53b6a9e6aece0ed3e002320c10f615acf2cd7405b5dd051 SHA512 52e4aaebe829e1d10846dadb96b03d973d8b5fe0c40b5c3c2ee8d107b020dc8efff175018cca81c42cecc2631a4e4efe74c6655c38d2d819db0224d16b15babf
-AUX pinfo-0.6.10-info-suffix.patch 968 BLAKE2B 86e442f381c6523e374259db9903426e4f6db769099ff2fffb56af23500aa394a63739f1d8681c550282e122a495a9de99b63242e7743349028e7dce63c14078 SHA512 882c80eb6d36f264e20cc532aa1cb00f3a1982b887bd199e4879e4e5845d18cd7a5e01c023ef723290c174a8534bc60060758f31ad7d1dd995f1441a4c496ada
-AUX pinfo-0.6.10-libc-basename.patch 736 BLAKE2B 3e7a83dc07aff65003dc45ccbdfb69818102aafa4debb80916784acef724396d6c7305939896b6dc85dd00de4dd28208f745305c2c5e9acef57d2b3cad44eb02 SHA512 b415aeebca3dc4a4d064781b70908ec70af522928428214e090f23e9ea82cbfde2bab2a08a88ebca88b30daf702b06a934157674bfd8d5f56ee4f973a2732e6e
-AUX pinfo-0.6.10-ncurses-check.patch 408 BLAKE2B a100e5e31424a1f846eb053c601b52969c4b8e190ed7dedab2583e1da6651600dbd604b0f735854e4d2407628a4c41055a6206c0f605d99936a861da978bfab6 SHA512 c7ed7036b5e629882129b559cbdeec3ebe1a8f6f72ad91db4b743bbce45ea7f55d49fd4c8884fb424a6df048f52f680d880fb2cba2125367cdbf993222203d30
-AUX pinfo-0.6.10-tinfo.patch 944 BLAKE2B 240107160cb76fef695fe826400dd4986d21c6c2707c50dbfe90f92d15663c915f7e2d22a709d8d25efd0161c2328d4b3a716dfa7def13006734e456bd9633d8 SHA512 9a4ff5fdc9a461c205f46e71cd43873270cfa1b4e5d897145bf30e51a0a0ffd350add33ff812a8870272f5e30bb8173c0a30af9fadd9f09ee9916512c106e42c
-AUX pinfo-0.6.10-version.patch 264 BLAKE2B 65bcfcdc4f49cdc011b5db956bc296e4b3ed25900fc25c8df667a8f221c5454b0b369e59df07b61604004ef2d0df1b9e98caaf7dc0597daf4ba294655e4ebc7d SHA512 aa998d5b63d50c844dcfdc6e6419dafab3d31c32e6e6a2e67101d124a5badf0968eb0e52fb46aea8ca2e8ac7e8eed7c4aabbdadffe9e99165d7525d89990625d
 AUX pinfo-0.6.13-fno-common.patch 217 BLAKE2B 80bfe222627299bb078cc33005a6470278ea68354efc6e3f18fa8ec7e3af0ae9da000338c406d839c75ea9381b320ae43b1fb154ccc83a2b8193de1ec379c9da SHA512 9a9b41df86f003592e8982cd59077df295ece6cd656ed8689fa79a4176e3030c7e861a461fc4cee7504408dc5e823e33d0777e9d590e5530aa8d0a0eb4101600
 AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 BLAKE2B a49a7addbf822436bc5cb8cf2da9964eca3b354274de1fb5f64cf4d634164fbe55e634c99282f87b3cbda5ac9f334b25d9123237b4cc64e7e5286b57ddf2a057 SHA512 373eea0e8feca230c14bf658ca5e73698ea16d35b5ca790c46b5bf02a83aaf1d55628183f89666913dfea96ef0f3653789255f8dfd616fe5b3a19be195d46ce6
-AUX pinfo-0.6.9-as-needed.patch 457 BLAKE2B 5e104b202a66c377cad570d3427043fe8273e6c907738283ed596185852cfb5713d430250d2ae83b11d7708139fa7f2dd962add064c3e3c96fe6112359faee26 SHA512 c4b23c4f273b35d2594af81ee4bf9aca60cd5208f1c3ab4a084805a63fdecc8bb7f2a7ee6118130ba691e3fa17e79f2671a90b7bc0af7e3cccaf12d2baecfe7f
 AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
-DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d78518bb4d5399c100bf0aec291c869576b18313e00f8572610cb967c3acb5f8d643c48f1295fd2efa8e16e3e6 SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e
 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 1080 BLAKE2B 3764a8b4d0364e1d18eb78ea2150667ebe4635a854d9d840056fd34db5a67f265a8bf1b27b0f21e83c6320abc29433977d8bdfae8f07be12fe1153ac6094629b SHA512 f653e7754478fc8bb58d0ac3c40e28e7e6f23d4e3e32c160d4c6fcceeaac6fb47d51ec6e82f1703097829c57a1f5a3d8c2bd59db11716f8c3977cb97a07c1b19
+EBUILD pinfo-0.6.13.ebuild 1079 BLAKE2B a98ac680f4eadc81f710912a8c5f98696dd779318fcda5d23b2dbb99aad033abcc9c4bc385419d8e92b4b207a58be764f145864374e2dfa7110fe971a6e7e336 SHA512 001ba727cb2dea10f08f437d488847ee2e585dafc97d4786ce0140c6d8c7fa91970c015c55a300f1cd1f78aab8ed1334669c5e6f0692aba1ed039814b6b64bab
 EBUILD pinfo-99999.ebuild 965 BLAKE2B 70eea0fb86462f8cea446b270fcde21247bb2d497946ddf585bbf5f21651de0068746f82133cb0dbf8b3802be02af7ccbd8189118bc4da21e525b2cf456872eb SHA512 38490ae9c934f6a73e31b4e30df86d249f5c54199622ec6d9c9185f3d13cc83cc56a711b62c9fb639ffd80ae8448ccd9c8548121bcbb21356e272c3f44a7381f
 MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch b/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch
deleted file mode 100644
index 0835d166932e..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -758,6 +758,7 @@
- 		tmpfilename = tmpfilename2;	/* later we will refere only to tmp2 */
- 	}
- 
-+	clearfilenameprefix();
- 	for (i = -1; i < infopathcount; i++)	/* go through all paths */
- 	{
- 		if (i == -1)
diff --git a/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch b/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch
deleted file mode 100644
index 7a282f354baa..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -742,7 +742,7 @@
- 	int i, j;
- 	char *tmpfilename;
- 
--	if (strncmp(filename, "dir", 3) == 0)
-+	if (strncmp(filename, "dir", 3) == 0 && !isalnum(filename[3]))
- 	{
- 		xfree(buf);
- 		return opendirfile(number);
diff --git a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
deleted file mode 100644
index d73ad947c7df..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/src/initializelinks.c
-+++ b/src/initializelinks.c
-@@ -75,7 +75,7 @@
-  * checks if an item belongs to tag table. returns 1 on success and 0 on
-  * failure.  It should be optimised...
-  */
--inline int
-+int
- exists_in_tag_table(char *item)
- {
- 	if (gettagtablepos(item) != -1)
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -554,7 +554,7 @@
- 	return 1;
- }
- 
--inline void
-+void
- buildcommand(char *dest, char *command, char *filename, const char *tmpfilename)
- {
- 	strcpy(dest, command);
-@@ -564,7 +564,7 @@
- 	strcat(dest, tmpfilename);
- }
- 
--inline void
-+void
- builddircommand(char *dest, char *command, char *filename, const char *tmpfilename)
- {
- 	strcpy(dest, command);
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -193,7 +193,7 @@
- 	return value;
- }
- 
--inline void
-+void
- initlocale()
- {
- #ifdef ___DEBUG___
diff --git a/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch b/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch
deleted file mode 100644
index 6679e51acb20..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -9,6 +9,7 @@
- "PO-Revision-Date: 2005-10-11 16:59+0200\n"
- "Last-Translator: Katarina Machalkova <bubli@bubli.org>\n"
- "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-+"Language: cs\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-2\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/de.po
-+++ b/po/de.po
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 1999-04-21 01:50+0200\n"
- "Last-Translator: Ren� van Bevern <rvb@pro-linux.de>\n"
- "Language-Team: German <de@li.org>\n"
-+"Language: de\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/eu.po
-+++ b/po/eu.po
-@@ -12,6 +12,7 @@
- "PO-Revision-Date: 2005-09-28 23:14+0200\n"
- "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
- "Language-Team: librezale.org <librezale@librezale.org>\n"
-+"Language: eu\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2001-11-21 17:42+0900\n"
- "Last-Translator: Masayuki Hatta <mhatta@gnu.org>\n"
- "Language-Team: Japanese <ja@li.org>\n"
-+"Language: ja\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=euc-jp\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/nl.po
-+++ b/po/nl.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-09-01 21:21+0200\n"
- "Last-Translator: Bas Zoetekouw <bas@debian.org>\n"
- "Language-Team: Dutch <nl@li.org>\n"
-+"Language: nl\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-15\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2005-09-29 21:59+0200\n"
- "Last-Translator: Krzysztof Krzy�aniak (eloy) <eloy@debian.org>\n"
- "Language-Team:\n"
-+"Language: pl\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-2\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -13,6 +13,7 @@
- "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
- "org>\n"
- "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
-+"Language: pt_BR\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/ro.po
-+++ b/po/ro.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-09-30 03:42+0300\n"
- "Last-Translator: Eddy Petrisor <eddy.petrisor@gmail.com>\n"
- "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
-+"Language: ro\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-10-01 10:47+0400\n"
- "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
- "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-+"Language: ru\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/sv.po
-+++ b/po/sv.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-10-06 12:00+0200\n"
- "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
- "Language-Team: Swedish <sv@li.org>\n"
-+"Language: sv\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/vi.po
-+++ b/po/vi.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-12-21 15:11+1030\n"
- "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
- "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
-+"Language: vi\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch b/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch
deleted file mode 100644
index 45be53cd1bf6..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -96,11 +96,14 @@ matchfile(char **buf, char *name)
- 	{
- 		/* use strcat rather than strdup, because xmalloc handles all 
- 		 * malloc errors */
--		char *thisfile = xmalloc(strlen(dp->d_name)+1);
-+		int len = strlen(dp->d_name)+1;
-+		char *thisfile = xmalloc(len * 2);
-+		char *thisfile_info = thisfile + len;
- 		strcat(thisfile, dp->d_name);
- 
- 		/* strip suffixes (so "gcc.info.gz" -> "gcc") */
- 		strip_compression_suffix(thisfile);
-+		strcat(thisfile_info, thisfile);
- 		strip_info_suffix(thisfile);
- 
- 		/* compare this file with the file we're looking for */
-@@ -109,8 +112,7 @@ matchfile(char **buf, char *name)
- 			/* we found a match! */
- 			matched++;
- 			/* put it in the buffer */
--			strncat(Buf, thisfile, 1023-strlen(Buf));
--			strncat(Buf, ".info", 1023-strlen(Buf));
-+			strncat(Buf, thisfile_info, 1023-strlen(Buf));
- 
- 			/* clean up, and exit the loop */
- 			xfree(thisfile);
diff --git a/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch b/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch
deleted file mode 100644
index 6e9d4954792a..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-do not redefine the basename that the C library provides
-
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -31,7 +31,6 @@ typedef struct
- }
- Suffixes;
- 
--char * basename(char *filename);
- 
- 
- /******************************************************************************
-@@ -713,20 +712,6 @@ opendirfile(int number)
- 	return NULL;
- }
- 
--char *
--basename(char *filename)
--{
--	int len = strlen(filename);
--	char *a = filename + len;
--	while (a > filename)
--	{
--		a--;
--		if (*a == '/')
--			return a + 1;
--	}
--	return filename;		/* when it was a basename */
--}
--
- /*
-  * Note: openinfo is a function for reading info files, and putting
-  * uncompressed content into a temporary filename.  For a flexibility, there
diff --git a/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch b/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch
deleted file mode 100644
index a5f14c593f44..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-curses_wchar is set to true/false, so trying to assign it to the compiler
-flags variable makes no sense.  it's already been set up the right value
-at this point, so delete the assignment.
-
---- a/macros/curses.m4
-+++ b/macros/curses.m4
-@@ -130,7 +130,6 @@ AC_DEFUN([AC_CHECK_CURSES],[
- 		else
- 			AC_DEFINE(CURSES_WCHAR)
- 			CURSES_WCHAR=true
--			CURSES_FLAGS=$curses_wchar
- 			AC_SUBST(CURSES_FLAGS)
- 		fi
- 
diff --git a/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch b/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch
deleted file mode 100644
index bbb6ecfe421d..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -118,7 +118,24 @@
- 					
- 
- # curses
-+PKG_CHECK_MODULES(ncursesw,ncursesw,[
-+	curses_includes="$ncursesw_CFLAGS"
-+	curses_libs="$ncursesw_LIBS"
-+	curses_h=ncurses.h
-+	stop_searching=true
-+	found_curses_h=true
-+	USE_CURSES=true],[
-+	PKG_CHECK_MODULES(ncurses,ncurses,[
-+		curses_includes="$ncurses_CFLAGS"
-+		curses_libs="$ncurses_LIBS"
-+		curses_h=ncurses.h
-+		stop_searching=true
-+		found_curses_h=true
-+		USE_CURSES=true],
-+		[])])
-+
- AC_CHECK_CURSES
-+
- if ! test "x$USE_CURSES" = "xtrue"; then
- 	AC_MSG_ERROR([Curses not found. You need curses to compile pinfo])
- fi
---- a/macros/curses.m4
-+++ b/macros/curses.m4
-@@ -175,8 +175,8 @@
- AC_DEFUN([AC_SEARCH_CURSES_H], [
- 	AC_MSG_CHECKING([location of curses.h file])
- 
--	stop_searching=false
--	found_curses_h=false
-+#	stop_searching=false
-+#	found_curses_h=false
- 
- 	dnl  if a particular location was specified
- 	if test "x$curses_location" != "xfalse"
diff --git a/app-text/pinfo/files/pinfo-0.6.10-version.patch b/app-text/pinfo/files/pinfo-0.6.10-version.patch
deleted file mode 100644
index 8038fe0879e8..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/pinfo.texi	2006-03-16 16:40:41.000000000 +0100
-+++ b/doc/pinfo.texi	2010-06-18 16:20:24.000000000 +0200
-@@ -5,7 +5,7 @@
- @c %**end of header
- 
- @set EDITION 0.2.1
--@set VERSION 0.6.4
-+@set VERSION 0.6.10
- @set DATE 1 Dec 2001
- @set DATEMAN 21 Mar 1999
- 
diff --git a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
deleted file mode 100644
index 85a80e6f2602..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/macros/curses.m4
-+++ b/macros/curses.m4
-@@ -257,8 +257,8 @@
- 	dnl save CFLAGS and LDFLAGS and set new ones
- 	CFLAGS_OLD=$CFLAGS
- 	CFLAGS="$CFLAGS $curses_includes"
--	LDFLAGS_OLD=$LDFLAGS
--	LDFLAGS="$LDFLAGS $curses_libs"
-+	LIBS_OLD=$LIBS
-+	LIBS="$LIBS $curses_libs"
- 
- 	dnl do the compile test 
- 	AC_MSG_CHECKING([if curses is usable])
-@@ -288,7 +288,7 @@
- 
- 	dnl restore variables
- 	CFLAGS=$CFLAGS_OLD
--	LDFLAGS=$LDFLAGS_OLD
-+	LIBS=$LIBS_OLD
- 
- ])
- 
diff --git a/app-text/pinfo/pinfo-0.6.10-r5.ebuild b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
deleted file mode 100644
index 54b487de0d97..000000000000
--- a/app-text/pinfo/pinfo-0.6.10-r5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Hypertext info and man viewer based on (n)curses"
-HOMEPAGE="http://pinfo.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="nls readline"
-
-RDEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	nls? ( virtual/libintl )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.6.9-as-needed.patch \
-		"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch \
-		"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch \
-		"${FILESDIR}"/${PN}-0.6.10-version.patch \
-		"${FILESDIR}"/${PN}-0.6.10-info-suffix.patch \
-		"${FILESDIR}"/${PN}-0.6.10-dir-file.patch \
-		"${FILESDIR}"/${PN}-0.6.10-tinfo.patch \
-		"${FILESDIR}"/${PN}-0.6.10-gettext-0.19.patch \
-		"${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch \
-		"${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
-
-	eautoreconf
-
-	append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
-}
-
-src_configure() {
-	econf \
-		$(use_with readline) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" sysconfdir=/etc install
-}
diff --git a/app-text/pinfo/pinfo-0.6.10-r7.ebuild b/app-text/pinfo/pinfo-0.6.10-r7.ebuild
deleted file mode 100644
index 43f398132432..000000000000
--- a/app-text/pinfo/pinfo-0.6.10-r7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="Hypertext info and man viewer based on (n)curses"
-HOMEPAGE="http://pinfo.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls readline"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	nls? ( virtual/libintl )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-apps/texinfo
-	sys-devel/bison
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.9-as-needed.patch
-	"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
-	"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
-	"${FILESDIR}"/${PN}-0.6.10-version.patch
-	"${FILESDIR}"/${PN}-0.6.10-info-suffix.patch
-	"${FILESDIR}"/${PN}-0.6.10-dir-file.patch
-	"${FILESDIR}"/${PN}-0.6.10-tinfo.patch
-	"${FILESDIR}"/${PN}-0.6.10-gettext-0.19.patch
-	"${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch
-	"${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
-	"${FILESDIR}"/${PN}-0.6.10-clearfilenameprefix.patch
-	"${FILESDIR}"/${PN}-0.6.10-gcc-7-inline.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
-}
-
-src_configure() {
-	econf \
-		$(use_with readline) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" sysconfdir="${EPREFIX}/etc" install
-}
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index a1670523fa43..15237faa9352 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="nls readline"
 
 RDEPEND="
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 8cadc2a4bcab..622e36c874eb 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,12 +5,10 @@ AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27
 AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
 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.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
-DIST poppler-20.08.0.tar.xz 1635372 BLAKE2B ca8829fe031bc9565baea71dd7a565d16160aa26645fdd6b30fa0d26c427f8b9d966766df95ca0c1e98552af2e3104c45721f7111db0bcd47f9f29620d1b37ed SHA512 e3d7d85356c854e298bb96ac8a563d9b97174e07d220eb5e7fe0372354a9105a3a1f6ea16e2a34af09d65c61f5fb349412fa7100e7fdda3c98e5030d82b48679
+DIST poppler-20.09.0.tar.xz 1642932 BLAKE2B be61275560bf57c639f185b5ebbd8b37b99fd008412f49890ed644e95f4d8f2c4ca865b081eea99f2604d44fa1c0c31bd551339340f03cb43ab7f5a03992f760 SHA512 fbd57dd0754279d4b0a20ccbdbfb06abc5a5d84e63915676353fd42d5b80318904cf7e6ae462db445ed6c6e011fc24675dccbb8bd3597fc6532657a4ea23406a
 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.1.ebuild 3378 BLAKE2B f2cd5dbab1ffd5fff61dc9e4ffb9d93e5d840c4f814e9d0d40fba4c5f8ebc43c4b3c4394ae710f3c37464a45a2fa8f3d48cdbeaa1267b1814243bffdd91d2977 SHA512 30a280a51bc518ab6cc9697b650a5ccb1657d73f95c18382e957fcce94077d8446a33e26574c6a97dde5a346ee774b03c4c1cbd7c35dccd18b73a7228bc7d28a
-EBUILD poppler-20.08.0.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
+EBUILD poppler-0.90.1.ebuild 3375 BLAKE2B 799e4efb1e1a63debd0c3cda48f8238126416eefe7163d3a823495247ad51802e95e346cf84b676b0b90884c754fe61bb50088d343e18ec4acf74267ac8db31c SHA512 be22676dc458896584ecf1a358cb01fd6fbf5adbfd1c816acbd4b038fd34808048acdfae2ac39520d53a197f21a727dab418a8854d378de73eea788993f0b184
+EBUILD poppler-20.09.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.89.0.ebuild b/app-text/poppler/poppler-0.89.0.ebuild
deleted file mode 100644
index ce0b37279855..000000000000
--- a/app-text/poppler/poppler-0.89.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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/100"   # 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)
-	)
-	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.1.ebuild b/app-text/poppler/poppler-0.90.1.ebuild
index aac9bceb8b66..9f6d43e02578 100644
--- a/app-text/poppler/poppler-0.90.1.ebuild
+++ b/app-text/poppler/poppler-0.90.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~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
 
diff --git a/app-text/poppler/poppler-20.08.0.ebuild b/app-text/poppler/poppler-20.09.0.ebuild
index 39d7375ed1b8..39d7375ed1b8 100644
--- a/app-text/poppler/poppler-20.08.0.ebuild
+++ b/app-text/poppler/poppler-20.09.0.ebuild
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index 41acbf41e453..a8d30d3698bf 100644
--- a/app-text/ps2eps/Manifest
+++ b/app-text/ps2eps/Manifest
@@ -1,3 +1,3 @@
 DIST ps2eps-1.68.tar.gz 97304 BLAKE2B 594b894b2d81f64c8c6a7461d1df96d7b6e3ce3ef8f7eaf58161eb6a05ebca7b2d304a531be954898f1a9ad53cccd84536b64127b080afbc3902265d2e4e1108 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b
 EBUILD ps2eps-1.68.ebuild 912 BLAKE2B 09ca8b81ae0d8f675394b23d6cdaafcb987cbee8f107642c89527e34093df18612724a4cd0c0e467b4cfe3d31c7640fe802523e28b0f82f2ce0f3005ae417499 SHA512 23d92ef49746c7e0216222833c0660220c7fd78fd7d1843c2bf69b3b3a6f50290ce36b8fe5e35c9b1089b63465fb09710fcc1644fa12d80075553d4a34cebb76
-MISC metadata.xml 525 BLAKE2B d27db1f0104b7ac6fb9e61c95da58ce62a7dddb28eb7c160507efc87b9b6930df11f889e8a8f5ec1e606209d942254294933313581a2e5dcb0f56c578e4d4080 SHA512 0d250fa2b43ab06f9d214116054bd21dc43f130c5518b430c2bdaaf4a4038fee52d61c6a82b1fe0736b966634e24d7fd99c6a88e171a05e7b5d9cb83a45ca24a
+MISC metadata.xml 369 BLAKE2B d97022c8448637ff25c9032eb1e9dd31c39876108057d719c8ba34201ba3946493e6b158c43de55c639863d86a1a076456f5ea885f56298a91bd34ac9a0abf2b SHA512 126af017800386430af8e1ae11c6e20b0fd9ac2656e8cd947235ee37faf9e28fd8634e01ada0598915496eb323b24275b268109d7e1a39e7a10832de55b9d1e4
diff --git a/app-text/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
index 67cbd0ec0e3d..e851bc46fd93 100644
--- a/app-text/ps2eps/metadata.xml
+++ b/app-text/ps2eps/metadata.xml
@@ -9,8 +9,4 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		Tool for generating Encapsulated Postscript Format (EPS,EPSF) files
-		from one-page Postscript documents
-	</longdescription>
 </pkgmetadata>
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index c0fb23a1a34b..262fd951d6fb 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,5 +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 1216 BLAKE2B e015e21dbe3680a67105acc7207b8ae748a0e6f6931de93a0c29890f685eca4c087990f1bac9582f1a8819e192bb4de73a53175ca29685736d5a46c21d1319ce SHA512 f99726bb85c0bd5f7baf985332a258253fb0d79627323e4f63a337370c24e4b44e63a66c977064145d21981ac6f70f3cfeccf0e49d9e4dbe7c066e7918dac6f5
+EBUILD pytextile-4.0.1.ebuild 1215 BLAKE2B df2236630c1210a841998c67aae0d95c42f7d48f68a38fc2696a0c5d141e8ecab24dc3e2ad99e31b61111523ab6fa1564d6662dce13da50cb598b2e47c109b60 SHA512 f0d5c43bd329be36fd304fb3f2d1517d7eb1102ae8b456290d4097c46cc90b87247d0f8064e57b514ac81bba01023be50b4ffe7893143e339ffbe7eabed50491
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-4.0.1.ebuild b/app-text/pytextile/pytextile-4.0.1.ebuild
index 8a4c6c29f89b..ffa9cd0eb2eb 100644
--- a/app-text/pytextile/pytextile-4.0.1.ebuild
+++ b/app-text/pytextile/pytextile-4.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 865095c46a4d..b2e2e9a40a3c 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -2,4 +2,4 @@ AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3e
 AUX sdcv-t_list.patch 588 BLAKE2B ea7106246204d2c18eaecdb05e4bf7a9c1d12d0ef6e1509591ad5afcf529746a6ef3f4a5051add8923c399863f8b56c3144c9d758b7fa2215b6b593eb1e2b305 SHA512 7a2f8fc105988ce6847ce533051ed65ec49b2ac1ffa4ec076a78be59d219d8c18aee7170d965dd429b95b193bf5a4608d20002e9fa58b6abfa5b972bb6879f94
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
 EBUILD sdcv-0.5.2.ebuild 1609 BLAKE2B 9f3eabd561d63a5d2255cf2efb30d9dbdfe792a65a0c1c6e69be45330e4b5cfc2157bd3d0ea1ea92265b3fbc288c0bad6ba5b9130eecae88531e6bea991ff118 SHA512 6cf930c6fad804bbd6890265183a6c1d2db122ac953f52726cd42f3b223f11a2ba921b81d0935a4a984e03af7a15bc37d700c48571dde050232a255d8f1cd9e4
-MISC metadata.xml 528 BLAKE2B 56e25a716843e62cb0a90bb7e75abf3811dbbb38c5c91a4153d5b340c355efdd4db771a815b116650e696b637deb4dc42320e0300d903ddbbc9b124b57934071 SHA512 0128fc0c89045f17ca1dbd13e18d2351dbcdc7af76451b80ba586ad223025c8c96f9100c09db5857e88f503534c6d699e649bf68c1bb3e23c6972ca2e5536c99
+MISC metadata.xml 448 BLAKE2B fd8196b4fb4caf645780c9b9c3170aa2f6148d17c359d2ea5579eff73f91b7eed8507ad8ed99a93c02ea7bae327bf6641dd1b6863539be379f45b4258aee1342 SHA512 f265fa0f3215a1effc00060394e942f10b7f5247bf6c1c55f9cbeb28ae26bc7398bf97acdc877d545a1e90a83b8ce41eb9780beab1267c99061f2b391a59acbb
diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
index 0b6f03db0294..6d7f3a758110 100644
--- a/app-text/sdcv/metadata.xml
+++ b/app-text/sdcv/metadata.xml
@@ -5,7 +5,6 @@
 		<email>bircoph@gentoo.org</email>
 		<name>Andrew Savchenko</name>
 	</maintainer>
-	<longdescription>sdcv - console version of StarDict program.</longdescription>
 	<use>
 		<flag name="darkterm">Improve readability of color output on terminals with
 		dark background.</flag>
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 915f33f72489..8a1e46b639da 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-2.ebuild 11929 BLAKE2B da788ca10be0eeb388ac29ea824208c874336ae216785048c27df2291efb4d7739966b14ea61316d8cfd484990b5c157dd96d8072f19e11c30c492296522a08c SHA512 24dcb484515c9d88fcd9a18d2701f91e4b740525de82bf98db463652c431a3b20105d2849d4e79bf62bfb2e1fa91f26f14653778bb1af72d39dfc848f5510c8f
+EBUILD sword-modules-2.1.ebuild 11963 BLAKE2B 59b7f7f626b46130446e4bae5ac382607200d114cc68a5312ccbdcb4800b1e2e2c7f8516791667aec8489315a1d49eddca9f3fd289128ecf02843c28687503fa SHA512 78f1d13471919b4cc0eece5b4d1ec3213a016149ea5fd89cffb524d500a42f3883665c851190815dcc0c155ac61e208d6d013627ea41b950d012a1094fe0b68a
 MISC metadata.xml 361 BLAKE2B 51316035c5e4197a328d336f328b3b3b777bcd14dfea50f11060624e86ec566b5d4e1bca5f755cd8f165aad8100bcb9c9a8aa12f036ad4df52276a9a16fab51f SHA512 61c6526b5fd049d5c13ee6af9bae3eaabc7151fe45de3ba63869a5ef8f2a4b00a4257c5a8d244f245b4e3f92d47a97a54c83ad03bf0742c1dda143efe392a10d
diff --git a/app-text/sword-modules/sword-modules-2.ebuild b/app-text/sword-modules/sword-modules-2.1.ebuild
index 8229d7f3c1cf..9d74c11bf8d3 100644
--- a/app-text/sword-modules/sword-modules-2.ebuild
+++ b/app-text/sword-modules/sword-modules-2.1.ebuild
@@ -545,6 +545,7 @@ RDEPEND="
 	)
 	l10n_vi? (
 		app-dicts/sword-FVDPVietAnh
+		app-dicts/sword-VieStrongsGreek
 		app-dicts/sword-Viet
 		app-dicts/sword-VietLCCMN
 		app-dicts/sword-VietLCCMNCT
diff --git a/app-text/tessdata_best/Manifest b/app-text/tessdata_best/Manifest
index 053f78b19351..9537b219b353 100644
--- a/app-text/tessdata_best/Manifest
+++ b/app-text/tessdata_best/Manifest
@@ -123,4 +123,4 @@ DIST vie.traineddata-tessdata_best-4.0.0 12435550 BLAKE2B 3d5b029e27c28d851b56fa
 DIST yid.traineddata-tessdata_best-4.0.0 3278995 BLAKE2B 52dec464f0cd020d8060e425db2edb40ffc48a0b7efaf1fe5e437ecdf2664739f8cca992000bdf6ddd40e641df9999af40353098bdc19c41c4c3cb4fb15d2cd3 SHA512 17aa0b1ac83245d594bae43b9341f82c97fea5da1a8bd5439c953bbf8b5aa7200353c77e2e43cb1e37432ef559fe27c5708957f14def42a6d3c93753d5e95c78
 DIST yor.traineddata-tessdata_best-4.0.0 3736121 BLAKE2B 370679dface083eef9f5c71e6f0c21bfb78dee7720b54c4431d4414468a6fd6c1ea01144eabe6d4fd992930efeb852f3ccfbc3428b7f3f8c6ac81f5e2613f048 SHA512 fd383977a7196f5e7d50bbd9a04c50783c8e5fb1512593c23a9fec6c49c3f756f0ecd78986cdf1381d6947031eece84680c1db51a727981ec905b3ade8829ddc
 EBUILD tessdata_best-4.0.0.ebuild 2196 BLAKE2B 5cde56a7f95464cd4ab531c806c56cc0315cc0679fc61940fdf3f66b0ad41e87dd768c949706669c3eaf0d8c51f07179aadc150971aa23067234b0d42903cce4 SHA512 ce605018b6c91ac3d65d7f429354a7f4cfcc1e3f137e3ab65ba6dfad0f7f3fcea550f1465125f2e29bedb8d7395edd9f9c640f66f8cc7b07d359925d23cd5b6a
-MISC metadata.xml 548 BLAKE2B cfc9d8a0d932ab7e4fe1fe8af8fcbafd14dce53b49be0e524ed56e4d6d639b915183116187273b128ce57b51ff40a8bd19771f8c3117aeb0ce2efc371c8cf909 SHA512 6cbf9f99075ce5d913b9bd63d7a0579ecd2e1770c4c2a0697728bbf7f8794c3e789a7bc4272383415c23e7f55baf821f083b538517cf19d51bbc42611d8acefd
+MISC metadata.xml 449 BLAKE2B 8ab22713a9c1c56d67de86275133d22024490a8b9957ddb5bb4a68b45e4e38a69e4d864d50e9f638bab9b840f3802dad01b7b818a95da42c7502e2715975239e SHA512 21f4673eef772853958197283e519e920d9451c32cc3e7baa5bfc2d9c75ecf9b522ca082e8d673a41f978b1a16e0f727777868aa1dabb6ba21592b50f20a0ae5
diff --git a/app-text/tessdata_best/metadata.xml b/app-text/tessdata_best/metadata.xml
index a4461ee6746f..8b6d846a5d04 100644
--- a/app-text/tessdata_best/metadata.xml
+++ b/app-text/tessdata_best/metadata.xml
@@ -5,7 +5,6 @@
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
   </maintainer>
-  <longdescription lang="en">Most accurate trained models for app-text/tesseract</longdescription>
   <upstream>
     <remote-id type="github">tesseract-ocr/tessdata_best</remote-id>
   </upstream>
diff --git a/app-text/tessdata_fast/Manifest b/app-text/tessdata_fast/Manifest
index 9dc873fe7222..655703f4fef6 100644
--- a/app-text/tessdata_fast/Manifest
+++ b/app-text/tessdata_fast/Manifest
@@ -123,4 +123,4 @@ DIST vie.traineddata-tessdata_fast-4.0.0 531275 BLAKE2B 379070086dfd362ef888b8a4
 DIST yid.traineddata-tessdata_fast-4.0.0 545606 BLAKE2B 96d06916e67e5712d708d6c4534b3a618211cf76b3825ea3b48ac04d8158633a5fd0584aecb2574fdf105d0ba8d9ed21861d3cd9e6fa186c273ed950b9382a1d SHA512 4ee1effed6fd9233d6341f62f5dfd0a4dfb25e7388c7152bc3bdc55dff0737198f35264fcff34d81c223e4a8be832417323f9e16c4c33245d0493d44eacbefc5
 DIST yor.traineddata-tessdata_fast-4.0.0 963400 BLAKE2B 38f84a1c331ef161cf3d6bb25e8586d1cd5fa0458fcd295fec3481f3c02cfe3f9f138c22731af3beec09471570b5d790917bb42ac40e5597dd5336afe2f55cea SHA512 da4d086f52534fbf01ac00dd996aceb2c646fc61b60199cf539cc7a223c050e69079ede591b95abbe1d3927a39ca7f9bedd68c558e6df54d949dff5c6428f449
 EBUILD tessdata_fast-4.0.0.ebuild 2201 BLAKE2B ab52780b5c63d4ce062a0964abee89f5a2924c0a2c1a4fd993ad7de5159cc7a1c7fd7a90933ea25711008cec249db171387c24680a5167be4b296f6382508775 SHA512 d7dd529f1c9efb40cbddb65c55ebdf5427d36e70e9f070b331a07a333c73b308d1114904d59073f072b2593ccbac70b5c057371127069b2d30e3dc2016d3b75f
-MISC metadata.xml 559 BLAKE2B a8bbc3bdea38cc1634f27ccfa49775eb7fd8457cd74bc57264b2f953c040c38f9094cda82f9119960f6a95e022616ba0258b26ed2c1bb83215d8c52fe7ff9518 SHA512 8e6c81101097d1449698ed7b751b74a942a9d88f2cffe6a2ca0669ecdb7a2d2a1619af18b539af1fb538456d5cc64ef0edf3519793baee37cf2bc5be6e025919
+MISC metadata.xml 449 BLAKE2B 686a3f75047fc2a66e169cc6d04706aa1d9590e2fc5cda367783212b4a6ccabde1f91de469d89af4aee466515f078649b2c5ce54d95baf3ce632b500fd81f009 SHA512 cfe14b58c55808e20ae2cfe102ab13939531bcd6cb0fa9897b154dfc3c6d9e25723c02e2f2fb9897497a70213c202d3b6a8a3db4fa01d8c46fc5baaf075ecadc
diff --git a/app-text/tessdata_fast/metadata.xml b/app-text/tessdata_fast/metadata.xml
index e7a3ff9d1634..57cc972314d2 100644
--- a/app-text/tessdata_fast/metadata.xml
+++ b/app-text/tessdata_fast/metadata.xml
@@ -5,7 +5,6 @@
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
   </maintainer>
-  <longdescription lang="en">Fast integer versions of trained models for app-text/tesseract</longdescription>
   <upstream>
     <remote-id type="github">tesseract-ocr/tessdata_fast</remote-id>
   </upstream>
diff --git a/app-text/tessdata_legacy/Manifest b/app-text/tessdata_legacy/Manifest
index 138735c3b55a..22eb43f151fc 100644
--- a/app-text/tessdata_legacy/Manifest
+++ b/app-text/tessdata_legacy/Manifest
@@ -126,4 +126,4 @@ DIST vie.traineddata-tessdata_legacy-4.0.0 7763728 BLAKE2B b1a702f2fb2dbd08a115a
 DIST yid.traineddata-tessdata_legacy-4.0.0 4882707 BLAKE2B aec63586bfa9d9f55a48f8f8ac885c4f8df4ec9abfed52a2a8ab58f3747df9a2eb60f872e492ab29a189c21c73cd33c64ac18c6910f10562745441e2e780fc49 SHA512 88986d01ff3bb8523b41b18c885477befd9d6690c5d517a5822fd8a6ef1b45a5790b3a5ff8f06172907dd2ccd3ef07d19d7e35d316d37fedcadb8df713a81749
 DIST yor.traineddata-tessdata_legacy-4.0.0 963413 BLAKE2B e4d16812ade81cac1f685587837b431c122ea29551bccd52ff1bef5a4aa8b316eb741aee3d0eb790c941d15401ea1c190850e225765a819d8899149e35af278a SHA512 4a04821d7e76feb0e71f31ff2ed794fce5a4e53ed98aeeecc06bd36d2c07301e8a7a86123ec5747b36d9df1d6d8e24d148f31f70093f944e83dfd3f2162661b0
 EBUILD tessdata_legacy-4.0.0.ebuild 2393 BLAKE2B c1faeda7cbd7e00bc807099520b0fdd4b505935f569b2b94ac708f9fdb496a39a468c29d25911e1bd60e65a9832ee49e24ab0e3cd7d3c440418e2f40f6bc9f12 SHA512 b8b203c57e318a4cc29381174faee00fd74f4f06436729f5eec64e28df59cde666cf096665a8dc59ab5474e969463d6ca7bea7e7054ba9208e597578247277d0
-MISC metadata.xml 638 BLAKE2B e7daff0af193b541948a3b3c9f8fbb8e8616cebeeacca49b3d18d76b6db557720692f6db146ad4fd729520391cde988a0ad2b8b0694b8846209e6883bac2aa77 SHA512 af5dfdd1061376f736f31e2e66d940fde11efdc6ab49075ef35e633e698c9bcb6d0388562c5063e6c3fdbe6cb1c41f853bca00121e21fc0dc5880209d6c248ee
+MISC metadata.xml 519 BLAKE2B 8fda99b2b34f605623be8b2b2836825e0066d2ab3f36419437b87e689386682ad37914775cd9e8cf8b4004fc9de87ed5d54af05a5fc34d5dbc5378d5708cc8ba SHA512 1ba257efb58d0f0b0a92dfd180cd91482eca05bac787bdd08a9126435384a30e6a4771457a4aa5c3ab7c866ff849e8c2b0f78fa4784315df18db35f99ac0edc2
diff --git a/app-text/tessdata_legacy/metadata.xml b/app-text/tessdata_legacy/metadata.xml
index 79fe4f4ce09d..e9834bb6f660 100644
--- a/app-text/tessdata_legacy/metadata.xml
+++ b/app-text/tessdata_legacy/metadata.xml
@@ -5,7 +5,6 @@
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
   </maintainer>
-  <longdescription lang="en">Trained models for app-text/tesseract compatible with the legacy engine</longdescription>
   <upstream>
     <remote-id type="github">tesseract-ocr/tessdata</remote-id>
   </upstream>
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index a37971d477e3..361079046a07 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -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-r9.ebuild 11849 BLAKE2B 0573d85de0bccd65f82da5950d6c46c08384e56582399521a57f9ceb8fcf947d7a2edde56dde8a40035eaa5014b0c7e9cf8b37a2cbaa31ebaf7ef1314037e90d SHA512 1777a296244379b11ec75cb06e6cc4348a6aa468e99488d67e9a63eb925100fc85825b6535c3381657e95eeec2de157d6b8c84a7e44bb0b54644dc77a8cfd407
-MISC metadata.xml 747 BLAKE2B 86f6b1dbfe55c17e841ed5cf89a20e3da7bcf895b0481a7460ee2577dd1927548b6dc7f7c618c3bc08bac73a8a33ac20632391a9533cade342d78f2ef92caedf SHA512 96e9763e09319a9f49ba9b62f09497ed422ad5d1111c3c850351f5cd13537bdeedd2cb0539aeafe09fd3cbab6dc87db7366de3994189f2123fbfc2b8090ed98d
+EBUILD texlive-core-2020-r12.ebuild 11952 BLAKE2B 38270a6efe8e2e17f72b05fe4e96d8f413aed54d4df32a8901ae733f0184c9d2d315007d5ac23e4724301187678f09e200c78cb2bf83294563ef8326711474d5 SHA512 ad78860262ea4c6f10c110008c582c9bdd803a497790dfe9aa75bb07a2e739352ae00a506bf2d6f908a10510d9eeef98a4e3f21e2033dab25f571e155c74c914
+MISC metadata.xml 674 BLAKE2B 4bab73d192039ab8cb3952877ced5e1b7b329f47d2a5b96e72ec82428dbc2236629abb7e2de1af1997bf577fc81cc91ada9f173eadcd2a2e726acbd79b9607bc SHA512 6faf1b433b9236aaca1fc07aa5679752b2d0214b5bb5f7aea03aa6c21e8a1880a103dea2b9a4c87ea84e85d91d259a2c01f5906190c96c7467f8b0a4863d85c1
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
index 7b46f25e96ac..816bc484af1b 100644
--- a/app-text/texlive-core/metadata.xml
+++ b/app-text/texlive-core/metadata.xml
@@ -9,9 +9,6 @@
 		<email>tex@gentoo.org</email>
 		<name>Gentoo TeX Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		TeXLive core binaries
-	</longdescription>
 	<use>
 		<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
 		<flag name="xetex">Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
diff --git a/app-text/texlive-core/texlive-core-2020-r9.ebuild b/app-text/texlive-core/texlive-core-2020-r12.ebuild
index 44eb986c0a9b..acbfb66e3fb1 100644
--- a/app-text/texlive-core/texlive-core-2020-r9.ebuild
+++ b/app-text/texlive-core/texlive-core-2020-r12.ebuild
@@ -86,10 +86,13 @@ MODULAR_X_DEPEND="X? (
 	)"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!dev-tex/detex
+	!dev-tex/dvi2tty
 	!app-text/vlna
 	!app-eselect/eselect-mpost
 	!app-eselect/eselect-pdftex
 	!app-text/xindy
+	!dev-tex/chktex
 	!~dev-texlive/texlive-basic-2019
 	!~dev-texlive/texlive-fontutils-2019
 	sys-libs/zlib
@@ -103,6 +106,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	app-text/libpaper
 	dev-libs/gmp:0
 	dev-libs/mpfr:0=
+	>=dev-libs/ptexenc-1.3.8
 	xetex? (
 		>=app-text/teckit-2.5.3
 		media-libs/fontconfig
@@ -111,7 +115,6 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	media-libs/freetype:2
 	>=dev-libs/icu-50:=
 	>=dev-libs/kpathsea-6.3.2
-	cjk? ( >=dev-libs/ptexenc-1.3.8 )
 	>=app-text/poppler-0.87.0:="
 
 BDEPEND="sys-apps/ed
@@ -213,7 +216,10 @@ src_configure() {
 		--without-texinfo \
 		--disable-dialog \
 		--disable-multiplatform \
+		--enable-chktex \
 		--enable-epsfwin \
+		--enable-detex \
+		--enable-dvi2tty \
 		--enable-mftalkwin \
 		--enable-regiswin \
 		--enable-tektronixwin \
@@ -227,20 +233,18 @@ src_configure() {
 		--disable-bibtex-x \
 		--disable-dvipng \
 		--disable-dvipsk \
-		--disable-chktex \
 		--disable-lcdf-typetools \
 		--disable-pdfopen \
 		--disable-ps2eps \
 		--disable-ps2pk \
-		--disable-detex \
 		--disable-ttf2pk2 \
 		--disable-tex4htk \
 		--disable-cjkutils \
 		--disable-xdvik \
 		--enable-luatex \
-		--disable-dvi2tty \
 		--disable-dvisvgm \
 		--enable-shared \
+		--disable-static \
 		--disable-native-texlive-build \
 		--disable-largefile \
 		--disable-build-in-source-tree \
@@ -341,6 +345,8 @@ src_install() {
 	# like non-existing targets
 	dosym tex /usr/bin/virtex
 	dosym pdftex /usr/bin/pdfvirtex
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 8e3577cc82eb..42ca069a7c3e 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2020-r7.ebuild 6864 BLAKE2B 46c2fd5a0a0941873020df984ae5ccc30b45517a4923ef2ccc6bc54460a694e8964dac4cca45da9014f41adaaa0f7539d2ae36cf00b1451821f9924420cb359e SHA512 5742b5d657235ac026e770a02ce83120a3d2aa55523b697399f4a6d3d3ab322c2d64c3fe84503b0a9a0e2a53984d0796a80adc12d031f9e4b34b080cd290b103
-MISC metadata.xml 2184 BLAKE2B f74223553a6b3b36f401dd335d7df1cf83959ca642cc9d9a8a978770822d21a36eabb57d11d6c2a6d25a3425297eb4e39c52d75d7f6a8df8cd492215c9f6e1b3 SHA512 9ba91053801cae866b7612338e71e1b708ab121e42905ddffef6333bb5f8eb835dcb97de1fe6f1cf55713482aaf33202443b26e5d91b2b851a1dde10a340e4a2
+EBUILD texlive-2020-r9.ebuild 6768 BLAKE2B 4297e1c6dfef665d5cd20d111b6cade9ef8b13e2941d17865bd0d8488c47ec4dc4cff1c5ef10d238f6d55c678482e5f9df0feb9a8baee4b346e05949f27ba8b5 SHA512 b6a330f4e059bab84f18b15def8996c71a5fb10e4bf76d8aed0e086714629a784ebebddb3841e5964ae0dd9c812370e8ab7392d0d942eefcc047119c307700a7
+MISC metadata.xml 1932 BLAKE2B f69f70507b754ea964ffc2c7a1d5f693d782e87b4b40fb715b2be25d044a628cb9177c3b7695ef4093afd72b54e15f43564978b104f8246d3b307e288b06585d SHA512 3f9f2defe49de21e0eb8c6398f607d0138bd789071766e0c3a737dfd5692b41423ba29107e817a760a410080fe55e42cba33f84c08f70258ffe5b7337d34f2d4
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index 43fbad5a7f25..db18ff704bdf 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="context">Add support for the ConTeXt format (<pkg>dev-texlive/texlive-context</pkg>)</flag>
-		<flag name="detex">Add support for <pkg>dev-tex/detex</pkg>, a filter program that removes the LaTeX (or TeX) control sequences</flag>
-		<flag name="dvi2tty">Add support for <pkg>dev-tex/dvi2tty</pkg> to preview dvi-files on text-only devices</flag>
 		<flag name="epspdf">Add support for <pkg>app-text/epspdf</pkg>, a tool for converting [e]ps files to pdf</flag>
 		<flag name="extra">Add support for extra TeXLive packages</flag>
 		<flag name="games">Add typesetting support for games (chess, etc.) (<pkg>dev-texlive/texlive-games</pkg>)</flag>
diff --git a/app-text/texlive/texlive-2020-r7.ebuild b/app-text/texlive/texlive-2020-r9.ebuild
index 9e9609403b12..4db4500bce9e 100644
--- a/app-text/texlive/texlive-2020-r7.ebuild
+++ b/app-text/texlive/texlive-2020-r9.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://tug.org/texlive/"
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk context detex dvi2tty extra epspdf games graphics
+IUSE="cjk context extra epspdf games graphics
 humanities luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xml X"
 
@@ -33,9 +33,7 @@ RDEPEND="${DEPEND}
 	app-text/t1utils
 	>=app-text/lcdf-typetools-2.92[kpathsea]
 	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
-	detex? ( dev-tex/detex )
 	app-text/ps2eps
-	dvi2tty? ( dev-tex/dvi2tty )
 	png? ( app-text/dvipng )
 	X? ( >=app-text/xdvik-22.87 )
 	>=${TEXLIVE_CAT}/texlive-basic-${PV}
@@ -48,7 +46,6 @@ RDEPEND="${DEPEND}
 	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
 	pdfannotextractor? ( dev-tex/pdfannotextractor )
 	extra? (
-		dev-tex/chktex
 		app-text/dvisvgm
 		dev-tex/latexdiff
 		>=dev-tex/latexmk-418
@@ -128,7 +125,7 @@ RDEPEND="${DEPEND}
 	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+				  >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
 	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
 	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 9fb73b95190d..041c892f895a 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -4,4 +4,4 @@ DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e906
 EBUILD txt2man-1.6.0.ebuild 609 BLAKE2B 5791269461f773391ba2080795d7689a9347d36bde85bd2152e62f7215368c47df1e82f2b31d7827c6bb2765976871e31dee9cd06efb3b4811cc657d72332f60 SHA512 312045664e536ae8147e641fda6a3726ad629682f1fe3ef1696a8cd8163fd115ee6082747612157e003cdc62269e108afff65d75c68d505d4865092923bf794f
 EBUILD txt2man-1.7.0.ebuild 615 BLAKE2B b48cb60e8d392a7b2fb1f17aa04a83da7cff32574027cd5fe02551225cf0c43c3405a470157cfd3ec6abb96a14d64e894354f2a4d0c032b90d5e1476b8a95baa SHA512 e619cb6677bf3da4f88993c8b0dbe0efa74ae3a986c9888297d09c741a0d313cef7c4133d8609a04eafd09dd23058b98d7bb498b4952f15d39b782a17c2d9380
 EBUILD txt2man-1.7.1.ebuild 602 BLAKE2B 623ab5c12b5e67319fcc11bb43a44aca60e01f581842f0aad6cff719eba6551e2f35e9b716d7f60dc5b4a5b99e761d7fd2652e541cce1779328c8d5fbc32f5c8 SHA512 74c78ac586d3a8dd930853de88dfa429ceba69f4dfb58d166dfe8d601b88248d97e5f308468345b1396261b11d064aabe880ec8bcd29cee30c8d917e5545e211
-MISC metadata.xml 308 BLAKE2B ed6f6f83ed571ef3966c646eb0b58cb8e711f9ddce51fe8e97e0a961c5d2c88fbce7199308f5460005a393ae8b1854037e152d81290e97aba71465d96cc67159 SHA512 bf9580b121de871786c26826a398b5e0c5108b61da60fbbd797a6ff58360f7c983541574bddcf4ee8809ea0ca603a4bb1ace88e725484227fe810a44608ed51b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/txt2man/metadata.xml b/app-text/txt2man/metadata.xml
index c5c73d48f191..7a38bb900964 100644
--- a/app-text/txt2man/metadata.xml
+++ b/app-text/txt2man/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Simple shell script that creates a manpage starting from a simple
-		structured text file.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-text/vlna/Manifest b/app-text/vlna/Manifest
deleted file mode 100644
index cbfeeb0cff08..000000000000
--- a/app-text/vlna/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vlna-1.5.tar.gz 146670 BLAKE2B a72cae3b276bb0673dca940d15df4ec0af8c292bb08b0a0ed55680d6893a3fbf80de9588bad4698c8c12f056a9a66650a63c100ea3021d7809f57cd2b9b09d19 SHA512 2416fd4183a5be495fa538d05bd8a7514265c4cb68d78aff6f2dfdd4b3c9abc34b6eb829e5adb6fecd20aa5d110ad77d9e0f56f260ac8ced3ea2218cb6cadee2
-EBUILD vlna-1.5.ebuild 491 BLAKE2B a4d8857f3fd52acdf6af3293afb65edcb65695d1e2f5bc4a6a92a8c6e522363691ff23c72770a4931361c555757db644871674b06a050cf78f92c0009ea3fd8f SHA512 3b99784dabedf644f87e045e922703f1f7d4579a9fa920cbe6c74835a279ed996923069ddbde7c9069b53f81bf8afca61c95a5b66fc4a69a0fad3376e03f330f
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/vlna/metadata.xml b/app-text/vlna/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-text/vlna/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/vlna/vlna-1.5.ebuild b/app-text/vlna/vlna-1.5.ebuild
deleted file mode 100644
index 0a92337cd499..000000000000
--- a/app-text/vlna/vlna-1.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Add nonbreakable spaces after some prepositions in Czech texts"
-HOMEPAGE="http://math.feld.cvut.cz/olsak/cstex/"
-SRC_URI="ftp://math.feld.cvut.cz/pub/olsak/vlna/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_install() {
-	default
-	dodoc vlna.txt vlna.dvi
-}
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index 2f81c2f80b66..54b15048218d 100644
--- a/app-text/xapers/Manifest
+++ b/app-text/xapers/Manifest
@@ -1,4 +1,3 @@
-DIST xapers-0.8.2.tar.gz 160938 BLAKE2B cb21d04146f0cca39f1a706641e4cd2a83a796cbf4eb096379367203d91811c20798638a27215e9fdd9ffb32de908a389b0af57200f19bf4d2c8477a9c82ca93 SHA512 cdf1d4791dd48f579f9ee019492c26d10c9855c1ceef2c15bdc81dfdab0f1d74f54db453bb60a9d297a155a55d73cd26ff192875b4ee2b80d8f9f5d35a4bbcc9
-EBUILD xapers-0.8.2-r1.ebuild 753 BLAKE2B 56018b0006954269ce43a991bb2c80a0fcb8bdba21437bc36b522b33209c565b961539830eb038b7858bc73cc041d1b4d1c0e2ee7f6dd43b5817bb5474e0ab7e SHA512 52a5b97d1f454e8ddd90a2b5342f91e09dbce32aa63a4ad31211c4638615def445bc0ac317fc67d6c650270e8c4f0e55e6aa14e557e15b0c296e6e8e390da3ed
-EBUILD xapers-0.8.2.ebuild 665 BLAKE2B 74ded3c69b277243be799924fe3abd57f517dbb2075f01c67ab955f88cfdd4c050c8fb9d5df415c60917d24973c6d9f567ede69038a0f13f74b6fc34d2cd5330 SHA512 f9d2eb51bd7a2c33c1ff1e44a1f2b3c04a205856c2adefaa03096e1fc4652ca4d282e2b112fb5bb414f657faa7489054a3c53258ca6ba96f2652f2bdfc3dbc67
+DIST xapers-0.9.0.tar.gz 159928 BLAKE2B d202a3835ccbcb1adfc2123ee40f6e1992e0c10f84cf57fc38eaae27134d649c94b5c625bf3a11ef2f4d119093fb1dcd99a923a9585d8e6b6b37ed9db7c15247 SHA512 0b2e32d215c64842a2d586c776d6cdfd2b77cd3081929c37dde9682fb61e8c58e374773ef33e1123087e8dcf655e12fd19db371005aaf31875492607d6494dd7
+EBUILD xapers-0.9.0.ebuild 797 BLAKE2B d271b602340ce24f3dd0655fcaeed3cc9d1c4995eba9b652270474954eeba7e732147442e2b94e0b09bc42e875de4015f3136555a3c8a1b3b4285fea6b2c3b1e SHA512 49bbbe778e2a40ecef7536627d074b04bb5e58045a2cd34fafbf9c838166fae0999f03e28e0c27d16056f9dd949aa833d985e4a840235296b02f723e9644b3be
 MISC metadata.xml 553 BLAKE2B 94c65255d3a407dd26f92c44f904dbf5e3d5a969a0e93203c11d68c92766060bdfd62615513cff9f1bd74ba7e124b066b6eec2a8fc434c564ec7c5486ecb728c SHA512 41a492b7a1c2e33d2ea0c44bdd480027e7e578139faf00da7f1e0226b3011d03963dcd7b221e5d065c762797a24f8c04c8a34c16dbe92c70ee7aa30764423758
diff --git a/app-text/xapers/xapers-0.8.2.ebuild b/app-text/xapers/xapers-0.8.2.ebuild
deleted file mode 100644
index 87eb7f540cf5..000000000000
--- a/app-text/xapers/xapers-0.8.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Personal document indexing system"
-HOMEPAGE="https://finestructure.net/xapers/"
-SRC_URI="https://finestructure.net/xapers/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-text/poppler[utils]
-	dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
-	dev-python/bibtexparser[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	x11-misc/xclip
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-text/xapers/xapers-0.8.2-r1.ebuild b/app-text/xapers/xapers-0.9.0.ebuild
index 808db0ee8572..56850c3d6e19 100644
--- a/app-text/xapers/xapers-0.8.2-r1.ebuild
+++ b/app-text/xapers/xapers-0.9.0.ebuild
@@ -9,8 +9,8 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Personal document indexing system"
-HOMEPAGE="https://finestructure.net/xapers/"
-SRC_URI="https://finestructure.net/xapers/releases/${P}.tar.gz"
+HOMEPAGE="https://finestructure.net/xapers/ https://gitlab.com/jrollins/xapers/"
+SRC_URI="https://gitlab.com/jrollins/${PN}/-/archive/${PV}/${P}.tar.gz"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 7d270e3a84ad..3a9b62acc97d 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,5 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r1.ebuild 2771 BLAKE2B 90c06a6764d4c30792c7587c1a00aa8ad27bd6a31afc63b4baa261b588053575add7536ac29695f133d42a40b914652a3a6485ea410d2d61ac0309194a02ca96 SHA512 3504f7b69e668432635b6905fffe080f936f021125dc2caf1731416d2a0c8042745c71a30df5a170d273faa0ebaefdee3ba2ac2065987c5da9da407f5aa4e8e0
 EBUILD xdvik-22.87.03-r2.ebuild 2896 BLAKE2B d8e3310ac58b7deb3de603719a8de3a2408481c3882dba14e27219607becb657f594b48664b4511f34e4ad1efa1345424ef27604d610861510cfee78466db12f SHA512 65eb8d3c8256efe25a8825a8e1fbbbfeaae3533f54d6ceda9900ce4008cdaa574ded9bbc79406b98f69be5b369b1706b8187b75f338405eb86a23143d35c8531
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
deleted file mode 100644
index cfe5d3eb3bbc..000000000000
--- a/app-text/xdvik/xdvik-22.87.03-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit elisp-common eutils flag-o-matic multilib toolchain-funcs xdg-utils
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="motif neXt Xaw3d emacs"
-
-RDEPEND="media-libs/freetype:2
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	emacs? ( >=app-editors/emacs-23.1:* )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	!motif? (
-		neXt? ( x11-libs/neXtaw )
-		!neXt? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? ( x11-libs/libXaw )
-		)
-	)
-	dev-libs/kpathsea"
-DEPEND="sys-devel/flex
-	virtual/yacc
-	virtual/pkgconfig
-	${RDEPEND}"
-RDEPEND="${RDEPEND}
-	virtual/latex-base
-	!<app-text/texlive-2007"
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
-	local i
-	# Make sure system kpathsea headers are used
-	cd "${WORKDIR}/${P}/texk/kpathsea"
-	for i in *.h ; do echo "#include_next \"$i\"" > $i; done
-}
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-
-	local toolkit
-
-	if use motif ; then
-		toolkit="motif"
-		use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
-		use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
-	elif use neXt ; then
-		toolkit="neXtaw"
-		use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
-	elif use Xaw3d ; then
-		toolkit="xaw3d"
-	else
-		toolkit="xaw"
-	fi
-
-	econf \
-		--with-system-freetype2 \
-		--with-system-kpathsea \
-		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
-		--with-xdvi-x-toolkit="${toolkit}" \
-		--x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
-	use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
-	dodir /usr/share/texmf-dist/dvips/config
-
-	emake DESTDIR="${D}" install
-
-	dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
-
-	dodoc BUGS FAQ README.*
-
-	use emacs && elisp-install tex-utils *.el *.elc
-
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
-	echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if use emacs; then
-		elog "Add"
-		elog "	(add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
-		elog "	(require 'xdvi-search)"
-		elog "to your ~/.emacs file"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index d64678e98685..cc558a5f1924 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,4 +1,4 @@
 AUX xlsx2csv-0.7.6-tests.patch 2180 BLAKE2B 173aa4d2650b86648a7b0897a86f49650acffd1603cb6af4f8fa603d70bc902b23cd280cba0453176e477907e7e93447693ff8ec28b531213c1aa690e9288d7b SHA512 7374e315fbe73532e91278eea825d0171642f4d4d5c412e904932c67ecde0b71291c37d8f5cf8908449663435a587f11e10f409bc82128ef9388be0c002da22e
 DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489
-EBUILD xlsx2csv-0.7.6.ebuild 656 BLAKE2B 1dc25d71491dd7a2d308845c304c3eb82f944dd1544f0c7781ae4d2d9ed1d6902ad104f0c25106c69b0b24b0333a183d67ada6cf6979b8862e842beb24192ecf SHA512 361d7d8e2e78b7d4c995a32972141acc698c772e1312b024774cdc721b9a1b07a1d8233c16d7fd6de9f5d9686533f1fc754f2443d89ae1a340b29c9802bb3eba
+EBUILD xlsx2csv-0.7.6.ebuild 656 BLAKE2B b0661c464f21e5b7e702a4087a0b4f0b5255ca08266804f674172561b61c8f8ecffee70cedbac15b0e899e25c769488815df18ee182346144263e9f571caacd2 SHA512 f192bf1195caf81a7452dff12654921124068cf0138f7b4788727c3ddf5844cc8fdd95770f05bbc027eb62399b6ae6b3c4d45c0a9d97a239661b8ff9a2855fb7
 MISC metadata.xml 301 BLAKE2B b6bbde41ddb21a05cbfaf8a75bbc5e0d2eb24ce3b62bb93966e7712811cbda3cd258d351f584253d1e831806e2c26fc499092311d2c2d36fa0a8f7323e0b85e0 SHA512 bd16895b82a69676daacc8cf9f4c196423b61600a7dc9ffe8b8d3962cb0a06e46bee7e38a4c692c368a93879be4a83d7d70ce1fb82db6ef4bec25d21a86203c8
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index 39cdd163b0eb..804e56281aff 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
@@ -15,7 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
 
 PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
@@ -24,7 +25,7 @@ python_compile_all() {
 }
 
 python_test() {
-	"${PYTHON}" test/run || die "tests failed with ${EPYTHON}"
+	"${EPYTHON}" test/run || die "tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-text
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)