gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /app-text
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
63 files changed, 367 insertions, 496 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 658929fb9cdb..d4bcbd11f8f3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 36926c28bd0b..1903a4ed72ac 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1,6 +1,6 @@
 AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3af122826d7250d9cec4df9ef48a3564cb522911d56710394eaa183b6180e08eae939b9f00a73fe061f21be4142520689687ad4c SHA512 72ebdc63cbb2c56bd8274f92501cbbae8c66e7d81b11b8fdeda38149da4bf44ab88699d248093eedc9813f6cd60e2a1f360fb39d778b4b7827777b1d003ab1dc
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1-r1.ebuild 918 BLAKE2B aa9a0cc3f79ccf981488e1e08b6336adfbfb6e9d209235fe209c85cc9849ce94f9b6068f031e67cf8c7e0471720af7355f9a0dc33cdf5b9c029fcb2a80ab01ac SHA512 cf47fe2edca5be36e676301eb84f9553c5d3a248068c23303ba099eaa64489330050787c296d2b184767573beeb8f5e9b9b5930f50c72214aa9b2c6e61595dad
+EBUILD aiksaurus-1.2.1-r1.ebuild 962 BLAKE2B 6a889b5c824b1ba1fb3f236538a7e1c223784191ee745dadabcb753e6d0dee6552dd7955c5a75eae0075fd84a92203185b1c2d6a65166018a8ff94b7406532d7 SHA512 c914886adc6268dd82db8740a611f8737cbcab5c752db551d9282d782b1ed8767094efa95e7dc85304ce0837143d93bf06689132fec3ed7f79ebce99b2481639
 EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B bb46c201ab41502c8a3b24a2ac2d97f62244131a95efb3a9d8968f397dac06b3d86ef0b43dc5d56499c5770d95e786fb64dbf1427cd08dc026e9bb740a7381ab SHA512 fd0ff4456cd07621f294830397f7221cfc0026e2062dcde149d1595cb2922b5858a0b38317ac6ecc4ba78488798d0d9273e26561d9f36980bd3d1d503fe04867
 MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
index 9b41a9721e55..3bc1986d9baf 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,8 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -fno-exceptions
+	# bug 787899
+	append-cxxflags -std=gnu++14
 	econf $(use_with gtk)
 }
 
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 69b262d0f250..2b3eec7a7a84 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -2,6 +2,6 @@ DIST asciidoc-9.0.2.new.tar.gz 1269444 BLAKE2B 0041073c572267628b8bbfd56258d86c3
 DIST asciidoc-9.0.4.new.tar.gz 1233878 BLAKE2B 506a2c82d95ce0d522f45b20eee31f7ce2b114e0ad43c78bb313f34b210a7bdd282a8a3779a3ea29025e865847eb8298bd5a6ddac7ee338e4b878ae79bdf149e SHA512 59be96514d0c4c82e5842ddea412ddd6e06647ebe09e0f1828b7c07e787d890896bab4271e7566ed038eb2da6755a67c725bee07bcfbd7aa31475f39c3abc089
 DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895
 EBUILD asciidoc-9.0.2-r1.ebuild 2327 BLAKE2B 0473c9ae0a7874dc202acfaf7d37e13eda32955a3eb1f03a267ad7afcd5c6c8e86857bcf83e4665e18788b6b12681df88772c903de1dd4611bb3011964436979 SHA512 7ffc91972c4085c1b652f8a9f43f6c4e57aa98993b541fc653cdecb15c2783bd30babce176b4ac4abcdb82f1400035d0fd968b43ca6141bcdbd334adf67dc011
-EBUILD asciidoc-9.0.4-r1.ebuild 2328 BLAKE2B d588dbbc01d45a302006b51840ae5c9d1a741e8121a594cb9911af8e4b24933fddf091e6d50fd63ea9e66654d868dc1a7745a6a629c76a036dfbd0f7917c4810 SHA512 ba4fe05a83d22dad37d7bbf875a76150798fe7da9bf48229bb0279ad182b986008c52fb753fedbc6d97c49fd570fc1dabd31a8890d3b7d2ee470c4911f82d52d
-EBUILD asciidoc-9.0.5-r1.ebuild 2329 BLAKE2B 146fcae0da9a5eb7843a6523c81e9b08772bfd1bd704880a2e6c857455e2437d25b0fbda041725e23f4628f885db758728106c25ae7c025b30ea4861fca1154a SHA512 96c427146e528bbe84d8f0e7ef97940ef2b5f3e680b5be862c0d62c0cf1d1a48a144fc26ed13f08b915ebb98e87de3bd1d5b8e4b9a24ec9fa2e402b60e73f1f4
+EBUILD asciidoc-9.0.4-r1.ebuild 2327 BLAKE2B 0473c9ae0a7874dc202acfaf7d37e13eda32955a3eb1f03a267ad7afcd5c6c8e86857bcf83e4665e18788b6b12681df88772c903de1dd4611bb3011964436979 SHA512 7ffc91972c4085c1b652f8a9f43f6c4e57aa98993b541fc653cdecb15c2783bd30babce176b4ac4abcdb82f1400035d0fd968b43ca6141bcdbd334adf67dc011
+EBUILD asciidoc-9.0.5-r1.ebuild 2327 BLAKE2B 0473c9ae0a7874dc202acfaf7d37e13eda32955a3eb1f03a267ad7afcd5c6c8e86857bcf83e4665e18788b6b12681df88772c903de1dd4611bb3011964436979 SHA512 7ffc91972c4085c1b652f8a9f43f6c4e57aa98993b541fc653cdecb15c2783bd30babce176b4ac4abcdb82f1400035d0fd968b43ca6141bcdbd334adf67dc011
 MISC metadata.xml 465 BLAKE2B 7add2c9dc126e1538251b0ba0001a624d7ddb9406adc5151d8388d7a8549e2968fc5a02219f79e63ac1577c4ee55cda9b4ebdfa138eb9d6142375943d8da0e39 SHA512 986aa9ed2b95d5d5a61bfea9aecd3c4371ba76a1a6e9cfe8833b7cdef449527dcde14879565f0302d55533501e082c2f1d4734004218299061bcd87b7adbc8a7
diff --git a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
index e9c29e8b5279..952821000c67 100644
--- a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild
index 18ceda834897..952821000c67 100644
--- a/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index 73448d25d6d9..4e81086eb3d6 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1,4 +1,5 @@
 AUX barcode-0.99-fno-common.patch 650 BLAKE2B 27fce20565dfa526b4240c5817ab45735bba98a7445160ba5f7ff368f0befa2332e423f31732ea27a104b3f5f7db0fa8a954d465116a38fd445cd1ebc1209242 SHA512 1cacd446234f9b0d841803f3627a7b0775da22cc74fcf09ee45ee95317ed6816bc545e61555707f7c7a5cee743b33b241088182b01d6cdcd49e047f050d29c68
+AUX barcode-0.99-install-static-lib.patch 331 BLAKE2B 72b6a5a31ce3c450587ae7603f802bdd9e8c467f9095538fb819f2742703be1abe749af7faf340f908ee8e5979277f7fc65cc8230685f060253c08e31a5641f8 SHA512 2033f6edcdf98efcb17296845be76d1c2cfc3504fcee965d68536e209f949d26d6ef2326858fe673492e36a5c3aebd14eb3e0ef96355ca43d25a23f19b612d01
 DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
-EBUILD barcode-0.99.ebuild 629 BLAKE2B a3795836c93717f841a18ffb16e362b3a7d9b97f312476c70684c525e7f482b580fb357a76ed9291341730a36ffac9687abbed2fbc67406c0e27f51a4fc6355e SHA512 9833f89fa9197e0f4031979000a9c9993e41e322c8e8642d6452ee3b8858050b48db02d3b64f7d5cdcb944046a42133e27fe54ebc78cfd997bf330cfc213d87c
+EBUILD barcode-0.99-r1.ebuild 720 BLAKE2B 448c0d1acba6731d26bb8734937a491604b6befcb16c3c26f9443aff1e51ff83126de45a2386d4654f601409faa3a5bb6ed09db8f9f7d0717d563765184c16e4 SHA512 544c3edbf21c639e980961814d71ae9167e452e320d0d081b4b359ae9b8c3868c9d13495dbcb9aee36d8bcb57a9fa41480e5505af3e418fe882c4f2779ea9510
 MISC metadata.xml 243 BLAKE2B c7e8ffa98061b37b0107cea12e59f7779ed014b1b83b008c1f8baa888fca120d4ba508078f2182c27c1bff0e8c2dea07bf3b33a3b086fdfbd7421cbf57b2494c SHA512 dbdb824584151c0ccb600c9fa433898cb613604bc97c7305b7a0809d22574007bc9ee3037b3922ee5256471519fd27510c3168b24ca3f75ab63e5c3051502d3f
diff --git a/app-text/barcode/barcode-0.99.ebuild b/app-text/barcode/barcode-0.99-r1.ebuild
index bd58bc146e16..9defd1531f06 100644
--- a/app-text/barcode/barcode-0.99.ebuild
+++ b/app-text/barcode/barcode-0.99-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,10 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 RDEPEND="app-text/libpaper"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-install-static-lib.patch
+)
 
 src_prepare() {
 	sed -i -e '/^LDFLAGS =/s:=:+=:' \
@@ -25,3 +28,7 @@ src_prepare() {
 
 	default
 }
+
+src_configure() {
+	econf --disable-shared
+}
diff --git a/app-text/barcode/files/barcode-0.99-install-static-lib.patch b/app-text/barcode/files/barcode-0.99-install-static-lib.patch
new file mode 100644
index 000000000000..44d32d059ce9
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-install-static-lib.patch
@@ -0,0 +1,13 @@
+--- barcode-0.99_orig/Makefile.am	2020-12-06 15:39:43.270943391 +0100
++++ barcode-0.99/Makefile.am	2020-12-06 15:40:26.723942515 +0100
+@@ -25,7 +25,9 @@
+ 
+ bin_PROGRAMS = barcode sample
+ 
+-noinst_LTLIBRARIES = libbarcode.la
++lib_LTLIBRARIES = libbarcode.la
++
++include_HEADERS = barcode.h lib/gettext.h
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 6eaf3d916974..fc235cef3e0c 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -8,5 +8,5 @@ AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4d
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
-EBUILD dictd-1.13.0-r1.ebuild 2884 BLAKE2B 4a23318de1a4cd27992f15b7b4961ce1c83350b839cf2e57f896a29604e5d8818daf9287965f49e6dbe0a5ad9e27b927868b3a781102640c5a81628dd1d7601c SHA512 3088514a61e38a5f552e366f5af7061cf1a595bf5abb71465e1946b96fd9fb65ca20f30848878cccf417d29aa9dce2eb3fbad5a2d5768ca25f21995ef820fa68
+EBUILD dictd-1.13.0-r2.ebuild 2893 BLAKE2B 841fe1e4349ca30a3a09109e89f84fe4555a8b6e7cb6968a2a8f296bb602c3b3d17b41661b95e726b4aae407e06b800434ee3884414edc484a6efb172ddb4394 SHA512 949c4a2975dac8aa94819c5cedfd860a673a709905a61650412f62474f8619519d7d63fe6afb01179c5f1c8e889bb1bb49080f0bdb3b54c519e6494a10360052
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.13.0-r1.ebuild b/app-text/dictd/dictd-1.13.0-r2.ebuild
index 234f0f2b0f93..fc78189e59d0 100644
--- a/app-text/dictd/dictd-1.13.0-r1.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r2.ebuild
@@ -9,9 +9,8 @@ DESCRIPTION="Dictionary Client/Server for the DICT protocol"
 HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
 SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 
+LICENSE="GPL-1+ GPL-2+"
 SLOT="0"
-# We install rfc so - ISOC-rfc
-LICENSE="GPL-2 ISOC-rfc"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="dbi judy minimal test"
 RESTRICT="!test? ( test )"
@@ -88,7 +87,8 @@ src_install() {
 	else
 		default
 
-		dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
+		# Don't install rfc2229.txt because it is non-free
+		dodoc doc/{dicf.ms,rfc.ms,rfc.sh}
 		dodoc doc/{security.doc,toc.ms}
 		dodoc -r examples
 
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index cd6afebae4c5..2dcf2e977301 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,10 +1,12 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
 AUX 40.0-avoid-changing-soname.patch 2136 BLAKE2B 3e9c25711ab9e5e83f3e9407fb03f8259c6bc035e384d1394319df987584cbd71dfe2970a503d0d7939ec4f7744bae498466a34512a35e1b4c1f2e783f621eaf SHA512 c723fce354f0a034f2ad4846d4b9f637f4985a03bdb7caef348328c74ab9488ef3d2f2204583248e35e0d8a27456b7327ac2e8e0ca14e0ab92e8db25e0197dda
 AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
+AUX 40.1-build-Fix-t1lib-detection.patch 1017 BLAKE2B fbb53e5c0a0da025b0410af62ae7251d369106c39c22ca5af58854c637a9f59119b96c63e0c76c64e918385f66ec37a9bda4808a2b3a5ddae5640d57e62304d7 SHA512 f77640a39fdc6c4e6aeea312380c0b922395b938557e04d718e29e55a6f0bd7cab8efc738668051f4f45183e68298911234bc35af82f0eb3d79e681ec20712c4
+AUX 40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch 1207 BLAKE2B ebcf5f7fe0419ce853c492699b97cc17b0df17c2d86f66ccadd4aef7e08e324a79d358a81c7148b73efc6a4788eeac128532665b9f8abb41a65908771c051219 SHA512 4816954209c20debecc6d6ca20650ac0bb06979d4b0e8d7fc63bda5445372f405fabc6accf44f0c62fad37070dada8cbb157f615e093f7ec894dccabf6069a4d
 DIST evince-3.36.10.tar.xz 2430584 BLAKE2B 7c8b5e3dec7168f4ab6976022bb85041fd8cc9f55b8c032bbf03cf492d243dc49f00d6913c1f2f09498c1b4091b4be126a9367dd3ed235635e9d08e6a9ae5a0d SHA512 2a17fc1fbd18e2685c254194d0e195ec0c6126f37212ae64297fb06f30f2e07f926cb768affb4d5c9c407c4dfc43db3578ffd244c9a6e121d1d3c9b5e653b4d2
 DIST evince-40.0.tar.xz 2928668 BLAKE2B 852c532b595f50e849893670b536b5b8c25f0407a719cbe659faa3f72b51f43a0471c3df9197fa5bd11735c14e0779d8cf28a88cd79aabec4dffa797443b9819 SHA512 995693e4a6e1a3bb31e1d4f3538dc53519102a5a6afa58ba61454a1e2ca582df26bd368876210fce6fab8ff4e218305644fa7a7a88c99e1a1ca5bda8d8f1ece2
 DIST evince-40.1.tar.xz 2928924 BLAKE2B e9376c186da9fed132b820b2e9a1ef6bb0997f22abca3d7b271691291ea4870132b48075ada5a992e056193e6af51bdf95e6bbdac79c789475fb985d692f9ccc SHA512 c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d
 EBUILD evince-3.36.10.ebuild 3083 BLAKE2B ff940dcedd304464ba5cb06451aa14a1c8943d45f616532e93eeca3b5f6399ff9f6949c676473646f9c4f5d863086dc1388800077022afde3497feb5bd09027e SHA512 58b7f5b0013c9fb6af17e9782dc5b9738412c5bb6c63e744ec66018e4a25dc5b997d5bd75b9e165b4df0f1eed781ea310a8005c1116e11b23f5abca5d92e01a9
 EBUILD evince-40.0.ebuild 3281 BLAKE2B 5fee649a184d6340a05f80503d4737f5a4b58f6aed88b805324a988c4bba0177a909a42fcc0d6f8cc8f6f488edbd2f75f43909968a343de60e6b2f02158ec2ef SHA512 9d2a0a6eba4cfb68a07d5ccfcac21dceb42799fc3b921f67358685d5d86b1281d68615ca820993b5d9567c4111e9befd55d03e06007f4b09e59ffcd65dd292fa
-EBUILD evince-40.1.ebuild 3237 BLAKE2B 7d9d95e411fadc2e13e198e70570ebad650ab1d8de08de3845cb733398a47d95235b6ef0b0fd237e0358e3b253565f6bd239917134e5e047120a2edb4ac4bd61 SHA512 cfd61d25977419401c8599b1fbefab1f233e7cebc06e990053fedcd93884f2151385598b8e29676884c35d1b5314a052700389d1c120e843e904934a91354fab
+EBUILD evince-40.1-r1.ebuild 3249 BLAKE2B b1e36874d8b377115f3cd47ba7637a0b23a67a7fc1b6f891ed7eaa99b791ca9f83284eb03928f06148be973f1998ff753955329aac3b8116c5bb18292e9272d8 SHA512 13ad543727c48e37a5601df1f039c677f47cf88be0fa3b0346c8878c5ac08eff4f2667c8a590f1e3362cd2a7af43fc2ecbad23e87d17aa2b94c10520ddec6e92
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-40.1.ebuild b/app-text/evince/evince-40.1-r1.ebuild
index 05e5b8fd667b..34dc2484fd95 100644
--- a/app-text/evince/evince-40.1.ebuild
+++ b/app-text/evince/evince-40.1-r1.ebuild
@@ -66,6 +66,8 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PV}-build-Fix-t1lib-detection.patch
+	"${FILESDIR}"/${PV}-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
 	"${FILESDIR}"/40.0-internal-synctex.patch
 )
 
@@ -75,9 +77,6 @@ src_prepare() {
 	# Do not depend on adwaita-icon-theme, bug #326855, #391859
 	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
 	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-
-	# https://gitlab.gnome.org/GNOME/evince/-/merge_requests/336
-	sed -i -e 's:T1_initLib:T1_InitLib:' meson.build || die
 }
 
 src_configure() {
@@ -85,7 +84,7 @@ src_configure() {
 		-Dplatform=gnome
 
 		-Dviewer=true
-		-Dpreviewer=false
+		-Dpreviewer=true
 		-Dthumbnailer=true
 		$(meson_use nsplugin browser_plugin)
 		$(meson_use nautilus)
diff --git a/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch b/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch
new file mode 100644
index 000000000000..5e46649e2536
--- /dev/null
+++ b/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch
@@ -0,0 +1,30 @@
+From bb3c826f134c47c505ad4fd93b1c97f67da5350c Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 12 Apr 2021 23:47:14 -0400
+Subject: [PATCH] build: Fix t1lib detection
+
+Without this, Meson always fails to detect t1lib. Autotools looked for
+the correct function name. See the check at the time of removal in
+commit b27189bb ("build: Remove autotools")
+
+Fixes: d69158ec ("build: Port to Meson build system")
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index abee124d..0d7fd4d4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -365,7 +365,7 @@ if enable_dvi
+   endforeach
+ 
+   t1_dep = cc.find_library('t1', required: get_option('t1lib'))
+-  enable_t1lib = t1_dep.found() and cc.has_function('T1_initLib', dependencies: t1_dep)
++  enable_t1lib = t1_dep.found() and cc.has_function('T1_InitLib', dependencies: t1_dep)
+   config_h.set('WITH_TYPE1_FONTS', enable_t1lib)
+ 
+   backends += {'dvi': mime_types_list.get('dvi')}
+-- 
+2.26.3
+
diff --git a/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch b/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
new file mode 100644
index 000000000000..bfc650947d44
--- /dev/null
+++ b/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
@@ -0,0 +1,33 @@
+From 4a94fad803f5041b44477f0a2933cb447d81d82f Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Wed, 14 Apr 2021 02:15:40 +0000
+Subject: [PATCH] previewer: Fix build regression when gtk_unix_print is
+ disabled
+
+Restore guard around ev_previewer_window_print because
+that function requires GTKUNIXPRINT_ENABLED, without the
+guard, makes the gtk_unix_print unusable.
+
+In the commit 65bfd21c ("previewer: Use GtkHeaderBar in print preview"), the GTKUNIXPRINT_ENABLED preprocessor guard around
+the usage of ev_previewer_window_print was lost.
+---
+ previewer/ev-previewer-window.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
+index 6678aa75..7d3bd394 100644
+--- a/previewer/ev-previewer-window.c
++++ b/previewer/ev-previewer-window.c
+@@ -263,7 +263,9 @@ ev_previewer_window_print (GSimpleAction *action,
+ #endif
+ 
+ static const GActionEntry actions[] = {
++#if GTKUNIXPRINT_ENABLED
+ 	{ "print", ev_previewer_window_print },
++#endif
+ 	{ "go-previous-page", ev_previewer_window_previous_page },
+ 	{ "go-next-page", ev_previewer_window_next_page },
+ 	{ "select-page", ev_previewer_window_focus_page_selector },
+-- 
+2.26.3
+
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 646305c3c714..c559f4da2a08 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,6 +1,8 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
 DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e871e21eacef88416f98226046e99a2a0a27c3354119715f320df1653ad7065c1c9a4a23b3081971df4d72c6fa19c SHA512 e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b
+DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
 EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 EBUILD highlight-3.60.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
+EBUILD highlight-4.1.ebuild 2411 BLAKE2B f54d453c059429ff41b94df35d81dba0c790a0217da0587bb031e4fd19f4cc05259514100987b5685d4596c1d498c2e9cbe043819d2211b9e8b993822e666d3b SHA512 5cbd35e733755c4bc11fce2f830bcf848fbf30b0822dc6ed271642177c72581ee7a20b491933627dc70c3de8640715079b81b6f7b32e36abb05102c9ef7ab6b5
 MISC metadata.xml 330 BLAKE2B 3e7c157a3d1763cb2b5c6c65a9259c03ac3863056d55ddb6eddbb76e66f98bcd11f87a04ddae616657f88e0a6b1f7bab0d028b97c8b0091ab8daa9e8fb5bc70a SHA512 3b6739ebce190bd586ad2e1657460b3540ae5056f2f90fdeb68121da3215e32dc382a1e965038968ec23f0c46d4626231f1e261aa7aca184dc8e08d80a82a681
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
new file mode 100644
index 000000000000..323a92ad3acc
--- /dev/null
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit lua-single qmake-utils toolchain-funcs
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt5"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
+)
+
+myhlopts=(
+	"CXX=$(tc-getCXX)"
+	"AR=$(tc-getAR)"
+	"LDFLAGS=${LDFLAGS}"
+	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
+	"DESTDIR=${D}"
+	"PREFIX=${EPREFIX}/usr"
+	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+	"conf_dir=${EPREFIX}/etc/highlight/"
+)
+
+src_prepare() {
+	default
+
+	# disable man page compression
+	sed -e "/GZIP/d" -i makefile || die
+
+	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		-i src/core/datadir.cpp || die
+
+	sed -r -i \
+		-e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+		"${S}"/extras/tcl/makefile \
+		"${S}"/extras/swig/makefile \
+		|| die "Failed to set Lua implementation"
+
+	# We set it via eqmake5, otherwise it forces clang...
+	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+		-i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/gui-qt > /dev/null || die
+		eqmake5 \
+			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
+	if use qt5 ; then
+		pushd src/gui-qt > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	if use qt5; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi
+
+	if ! use examples ; then
+		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+	fi
+}
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index efda90d75bcd..181258215af9 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,3 +1,3 @@
 DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
-EBUILD jabref-2.10-r4.ebuild 1839 BLAKE2B 14f139884a63130ffdf59ee41f8640117ab925a39058c6ec80d515d7e8deb8379da387baa50023a08e218888811f1fb89ee9bb840cfdba2a0021b8a09da83f4e SHA512 53df22685ae2fe8a572f87ddb0bb1b953438bb05d2a8fe6ad1a64a97037348819309d55e3d532eea61fbba5c58470e732a68005fc5eaba435d90b55f89b0898f
+EBUILD jabref-2.10-r5.ebuild 1844 BLAKE2B 0e76e8392a4ceea776949ea002f8ba818ba038c4978c8e7e0c66b0a460e515c14a5972be28f92ed86634ea404701a2ce76faee015032fae85a83ba95b20861cb SHA512 c9454d62e0c8549eeded61ff5185c08ccbcb003833a146954580e78817e147c36729ebc96abb2291ea6f21798ae19a67543e6ff5a9967ea739372c5816601389
 MISC metadata.xml 537 BLAKE2B 1aa32da69c977641a51f05b3e615d4cfb15d21912ab649b0db7f6a4b35daf5428225431533e97eca895253e4370dfd03baa60beaee4ee333a225df8942e715d4 SHA512 8478bf7312a365c4fce15051b0cedb465e92a274e215bcf989e744434ed93f568217f953cbaa07e9adfc5e620187d4ed4076d3201806bfe2df55ae8743bfaaa2
diff --git a/app-text/jabref/jabref-2.10-r4.ebuild b/app-text/jabref/jabref-2.10-r5.ebuild
index 8ed45fb5a629..094dfeeb4b5f 100644
--- a/app-text/jabref/jabref-2.10-r4.ebuild
+++ b/app-text/jabref/jabref-2.10-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
+inherit desktop java-pkg-2 java-ant-2 java-utils-2
 
 MY_PV="${PV/_beta/b}"
 
@@ -30,11 +30,11 @@ COMMON_DEP="
 	"
 
 DEPEND="
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8:*
 	${COMMON_DEP}"
 
 RDEPEND="
-	>=virtual/jre-1.6
+	>=virtual/jre-1.8:*
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 4121818416a9..2e214da27239 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,3 +1,3 @@
 DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
-EBUILD kbibtex-0.9.2.ebuild 2046 BLAKE2B a77265d918f7857ffa1cb1773539756b044c508b39aa5f835643f49c62382e417204005f8f36a2ebe5f69e21b5120cf9c1b28fd8e94d48ffad971a77db5fb774 SHA512 751fae344944ea23db4962b2233279a58877ab9e1ccefa3373f5d62929623e4f4baef608d873d93656985795bcf07da046b664b6e55583214964102dfc0c4cab
+EBUILD kbibtex-0.9.2.ebuild 2044 BLAKE2B 06d4fef041b58ee933fd835116656195e03c5a36352020e4a7a27bb63642668ef98068d703096c07d617db68d1bf70325183d9208a296bf1c616ac622ead4c9d SHA512 8e530f8eacb142c2d444912d63f2c3d1da14ecae90d4981ff6b57cfa46b83eaec450ae0eb2f09b1b2197ff87b207516a237ea0c827c12caa801e841f7c3c11d6
 MISC metadata.xml 440 BLAKE2B e5121ee173f89412a1bf3339de23a9e13fcec40f52c82129ebd185732759e4ad586b922d31e6470f91e03ba2ce614ba6de75dcb340e0f20d5b799c3476bde23b SHA512 cb2f6751bff9d468dde56635a792813de84b6c383e488ab5764c9656e54a892f5a9b9fd4932d49ec603bae4716f9f0bdd3cbe90b0c796017fceeb6b61196f1ef
diff --git a/app-text/kbibtex/kbibtex-0.9.2.ebuild b/app-text/kbibtex/kbibtex-0.9.2.ebuild
index 2721357c5c5c..6dfd1e597201 100644
--- a/app-text/kbibtex/kbibtex-0.9.2.ebuild
+++ b/app-text/kbibtex/kbibtex-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://apps.kde.org/en/kbibtex https://userbase.kde.org/KBibTeX"
+HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 4daef53a4f99..fd75f35b6bb9 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,8 +1,3 @@
-DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
-DIST lesspipe-1.84.tar.gz 119657 BLAKE2B 671b504022bdba82eea03d7a83960d5ed148d851d0420f179967f46d38a88ab90c9928a462e01744134aedfe710dba741430e78743451b1b65e603e5d89ae139 SHA512 f11ef23610f722d62ddf7e084b03967ed59d21af6ac207d4456f625c93c3c58c87ec5907cf6bca00ae5550dcddfc9b7f0be5de51f9ff81044fcff1f1cde81267
 DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
-EBUILD lesspipe-1.83-r1.ebuild 1063 BLAKE2B a3bce9fa46ddeb453cab46d0b0db9d24069dbf365546fb039ec8adbea85945e22a4e380e162552151d6fec19203a7333c3d1299f35d6f59211ff64087e6d238e SHA512 be2b04bce7919507d8a62ec04623651f836470879295d65d79a5f98509a71f3e8ca29317cfe569389957ba3aceac7837ea68538275c73ea9cfd66da1721ffe5f
-EBUILD lesspipe-1.83.ebuild 1076 BLAKE2B 43e138721dbb29c653aaf5a0fb1ec65565f065eb6026056755a961ea0b7d7692f9957eb395120894c11453355daad1ad904e14f26bf41da125238bcac0b8eb75 SHA512 15a08ab8ffd2b0b111494b74a960f65bc7bac8dafd12d9017d69f42933ce34c766e9448ff85a469d65ee40c16c3b5bb2cc1b6db4385d491c71d2839f129eefb4
-EBUILD lesspipe-1.84.ebuild 1072 BLAKE2B 1b362a414ff398ec0d1e965cc6954aca215c43bdcfd5fdf360ab051989e3eb1694f38c96ba97cc252e113f0c65a144ca163e17cf1ec7d1cc09470cd3dc8808d7 SHA512 2ce9cf72e190a9456d3b593ae69af134595646e4120a551fa8713918e7f1917f9151ade81e7a68f70a84e21ccb78c000b55535fc61246733b17a31e0ac5fd27f
-EBUILD lesspipe-1.85.ebuild 1072 BLAKE2B 1b362a414ff398ec0d1e965cc6954aca215c43bdcfd5fdf360ab051989e3eb1694f38c96ba97cc252e113f0c65a144ca163e17cf1ec7d1cc09470cd3dc8808d7 SHA512 2ce9cf72e190a9456d3b593ae69af134595646e4120a551fa8713918e7f1917f9151ade81e7a68f70a84e21ccb78c000b55535fc61246733b17a31e0ac5fd27f
+EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
 MISC metadata.xml 303 BLAKE2B 994cf3fadfb22f368dc6f14707fd56a6a4dc019b335d0d241a5f5f6ccbc221bdd284a3544c3171cc10c107ca01248444c23ca5c0f1386bd0d344fa1c13618699 SHA512 079c0445d27021945507ccc075775236d1ddd6f60cfa669928d982ebbff394f8185de0f8e092c3cb3bf3a531d21b80db6c04af9c98a34f28c8d643b25fd00b10
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
deleted file mode 100644
index 35049dffb23f..000000000000
--- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build.
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
deleted file mode 100644
index 6f0b97d1b104..000000000000
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build.
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	dodoc ChangeLog README TODO
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.84.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
deleted file mode 100644
index 6629361ef00b..000000000000
--- a/app-text/lesspipe/lesspipe-1.84.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build.
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.85.ebuild b/app-text/lesspipe/lesspipe-1.85.ebuild
index 6629361ef00b..07996432881b 100644
--- a/app-text/lesspipe/lesspipe-1.85.ebuild
+++ b/app-text/lesspipe/lesspipe-1.85.ebuild
@@ -9,9 +9,14 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+# Tests are broken in 1.84, 1.85.
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
 	!<sys-apps/less-483-r1"
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 23d38ded88ab..4b35dd650338 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,7 @@
 AUX libetonyek-0.1.9-boost-1.73.patch 304 BLAKE2B c9b18c3dac65284f53be3d686316bf6ecdab62b3d7a82cb4af41d528519e19cc65a0d5a97ac69a032d7305b38361ef0f47c7c1d2a0cf9098fffe6e1b3d818c3a SHA512 be2c53cd0902c3f51b0ba39b5b07177f3fc0978321fe6094baccdd8937b91de1aacf3cb77b1afe14840709712eb24d618e7474f58bb9baccdabe218eff7e7a9f
+DIST libetonyek-0.1.10.tar.xz 1494000 BLAKE2B 1c47b410050380d134d96b5551f0c9186c24aa0ea52c801e26655e3013f030e92198d8e3f19e8a341744206eeaad2d10ca130f286fd42c8a9c3b56f773cfa7d5 SHA512 516a14fcb7b7b5898484a4263d593a036ac728b90144da9d1c22a5d0fdffc879839e19a7b390f99d924c390d433e64433fb08939b1e04ca24359315571c5772b
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
+EBUILD libetonyek-0.1.10.ebuild 1220 BLAKE2B 65b8c308cedc0450ada5a75f16371070eae73c03bd6ca32d50dd442c877d24a34d04cfefd0cf881c30aeb3172a95bbc259af1653e05506ce8e0eb236d91d182e SHA512 4cc64741b966f79d67d0bc14cf9a0378eb137f3f73c030b2e309731d892019826e65e70f47d22077fb864d5e208b96891a5520669e98981e1ca7710d4fd4bc1a
 EBUILD libetonyek-0.1.9-r1.ebuild 1406 BLAKE2B 09ca23a212133a46fa045d7afaacc142333789f3529f2de0ea7fd6f8e6e8b97133d5ab065f66b3dba6ce2eb0dc3745af7d2a06e31a55160d45bf5f2dd23e0bfd SHA512 1439e3933eb3df18dc3dd74a4d1101e6715fd8ae6310e5bd1718009c339aa0eab1246ba2b807a8e6ccac1434193576868003ea5ef54677e64d032a9148d35ee5
-EBUILD libetonyek-9999.ebuild 1347 BLAKE2B 0c0dc3a26076eb3b3d98f54c50aacd261bd7f13152fea89e37a04e53a37c8c37537d14a7f074d4a2ce39def6d77ac5226e86d7731798959e70c6ccd0a761737d SHA512 46ce7f286673f1c201cfb882130eb3d83c6a1c47a9bd3a28f72aeb5f22e25a88c6aa377a7808f1a129fd7223d73899a1520a3e6d23ed167cf7f854bf65082499
+EBUILD libetonyek-9999.ebuild 1220 BLAKE2B 65b8c308cedc0450ada5a75f16371070eae73c03bd6ca32d50dd442c877d24a34d04cfefd0cf881c30aeb3172a95bbc259af1653e05506ce8e0eb236d91d182e SHA512 4cc64741b966f79d67d0bc14cf9a0378eb137f3f73c030b2e309731d892019826e65e70f47d22077fb864d5e208b96891a5520669e98981e1ca7710d4fd4bc1a
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.10.ebuild b/app-text/libetonyek/libetonyek-0.1.10.ebuild
new file mode 100644
index 000000000000..a9b34322cd7f
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	>=dev-util/mdds-1.5:1=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	media-libs/glm
+	sys-devel/libtool
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 63aab3eb452b..a9b34322cd7f 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	>=dev-util/mdds-1.4.3:1=
+	>=dev-util/mdds-1.5:1=
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
@@ -49,12 +49,6 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable test tests)
 	)
-	if has_version ">=dev-util/mdds-1.5"; then
-		myeconfargs+=( --with-mdds=1.5 )
-	else
-		myeconfargs+=( --with-mdds=1.4 )
-	fi
-
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index d0718ef37f3a..e07a5e916cdd 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,6 +1,6 @@
 DIST libmwaw-0.3.17.tar.xz 1349700 BLAKE2B 4b5ba8d5133144973609dfbd273ca36cc95e52608c78f6143f7c4283bc2bc6d7ceb22836a693d64fa7408957a3b02a7c9d0a5ab9235aa2d0b9725170441babfc SHA512 c3a1bb079d7e74cd7a23de1501730be21b1b089ef6d4f81ee0001775483c6346da3105b0d67f75523e4e088987bc92b97acb056ec7fc11bb29047109a1cf5ac4
-DIST libmwaw-0.3.18.tar.xz 1382328 BLAKE2B eae75e24826a963032d866be1834221850a762447495a209ad1fe268c1072c877e4c19843d61e2e4d9322a48a03b459fa9a4cc734af0eabbb09813ff9626e466 SHA512 4666c0dcc567e3e4c0ae5d9651a7003d2f32acda841bd1e297d46e566430c9227588e29b219987c56f1347f6e5656b52b00d8d6d8fa7902e19d175505e345b7e
+DIST libmwaw-0.3.19.tar.xz 1401720 BLAKE2B 93e63993dd73d52d1b071c44a5efa4ba2495a370a767cd80fbeb437a56224d333781cfdf32c3ca1c0a3794544da6cdf8c967badf98b6858796fbc8f2ea7878c1 SHA512 a5b74f417366f7e8a8303948e678d54caf9c45e0b51694d39593926b2f2fbbaa5dfea5dee8a6b4a656e5ca5bd880f41a76e7b869f55230690740b7ab75a28f1f
 EBUILD libmwaw-0.3.17.ebuild 1004 BLAKE2B bd99841d18279477318ce13e9c80907572ecbb1de67ec738bf32afda9df36ed9e4d0e6ec695a386e535b41e19d0088f2635778448a0b6480bdc71c84da44a62e SHA512 f822bef23ebbe99c097d20a6b312014abb2091e61a54f4a8cf184252f13db23deccc3c0ac6b09f68309d4cf95479a58be6a8a9ba508dfd30e327ea6a5958fb95
-EBUILD libmwaw-0.3.18.ebuild 1007 BLAKE2B 2042912c93c84d2c590f2f6d11ee0b936f71c8d6811425f3cc00a3ec2b18edd44714cdcd69467acc84da93e2a0096f86a32df4a1d0e5e847b49a1986c718ddbb SHA512 03834bd3781edd22c3c71008aec707a855e28e54227ffe2e54c52c8c48639fb283f472b32e646484f9d6679fae25c585a95fc013c00d09583bd49f55d7a44427
+EBUILD libmwaw-0.3.19.ebuild 1007 BLAKE2B 2042912c93c84d2c590f2f6d11ee0b936f71c8d6811425f3cc00a3ec2b18edd44714cdcd69467acc84da93e2a0096f86a32df4a1d0e5e847b49a1986c718ddbb SHA512 03834bd3781edd22c3c71008aec707a855e28e54227ffe2e54c52c8c48639fb283f472b32e646484f9d6679fae25c585a95fc013c00d09583bd49f55d7a44427
 EBUILD libmwaw-9999.ebuild 1007 BLAKE2B 0d5cee2920040a56940cf0e916f4734433875c73fe541d7918c3bdaea0d4820a40975a0d67c154ef23a02f6b70e3fe49b9ceaaacc79cfd82c6ee74d552f455e4 SHA512 d65054c2dbd389041d5c55bfa8f8819507987ef862474f218ba6115d818dda293ecc7473f67b33cdd89679f706a7b2d717e22f6c071e922d79aeea1a37917a16
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.18.ebuild b/app-text/libmwaw/libmwaw-0.3.19.ebuild
index 7363e33a0479..7363e33a0479 100644
--- a/app-text/libmwaw/libmwaw-0.3.18.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.19.ebuild
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index 23eccdee0a75..fdae28fe9a9d 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -3,5 +3,4 @@ AUX mandoc-1.14.5-r1-www-install.patch 637 BLAKE2B 2550351e29db19b43de500f039f05
 AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea4f0d890e54b42817981e1cd4c568229927fd04bd0592e53ce18192f8359dded28be8c8690904f6 SHA512 74bdb16bc498d741128f1b6966afec8e21eb6899e26d20cf57cb0408ae6bdc63d75538dd355a21ae55593c359fbe707a56bbcdf6e78d557d4b53570db56fd6b3
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
 EBUILD mandoc-1.14.5-r1.ebuild 2954 BLAKE2B eb4b9ffbe134ea11c1fac9fce45e8f84d7cad63a0ff803b4d1fdd0cb6287a732c2c29f1114be40eb4b031d90035858edb79fd83e170b6e9de1c34e6fe7a03d96 SHA512 5f1edd81227c09a9eab1f348f1e34bbd8b23e7e5c710af31667a9cbc94943965f5411aea9594ce611b08487b4137f5627452c45ad8668b33b73f2a1d56765b87
-EBUILD mandoc-1.14.5.ebuild 1727 BLAKE2B fbdad7247703bcea768dd034b2169f5183cf7ca644dad09335428356d83935d3ab4db2449d18e9c44d23b76c2d5fcfbdda4f6c09ec4bb5b81e8ca2732fdc65f6 SHA512 92be1ad119597580062788095aafb9fc951f8c55d1c368cc412b7afcff32476b01aa103f6f067c326d8a459b97e6071c8c79af8ef51482d5205fa27a743b1f42
 MISC metadata.xml 375 BLAKE2B 6b3565c3419b306f33ce9ad867319cee386b20c92743fe1a6565a348aca03d13133906d07f5aa10ec145d84645fa11894ad8abd73a6f65d5d0680ce03ef339d5 SHA512 1814f8bf92ec3500aba2e6a194a8a1b0e7adf53de5ac5408ef22fa42845b9c7270a27eea0061d77b5b53ea7cf77e9bfc75c865dc1d6fb661a5bb8412fb9cda3e
diff --git a/app-text/mandoc/mandoc-1.14.5.ebuild b/app-text/mandoc/mandoc-1.14.5.ebuild
deleted file mode 100644
index f79cec58e05a..000000000000
--- a/app-text/mandoc/mandoc-1.14.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="https://mdocml.bsd.lv/"
-SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="static"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	default
-
-	# The db-install change is to support parallel installs.
-	sed -i \
-		-e '/ar rs/s:ar:$(AR):' \
-		-e '/^db-install:/s:$: base-install:' \
-		Makefile || die
-
-	# make-4.3 doesn't like the CC line (bug #706024)
-	# and "echo -n" is not portable
-	sed \
-		-e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \
-		-e 's@echo -n@printf@g' \
-		-i configure || die
-
-	cat <<-EOF > "configure.local"
-		PREFIX="${EPREFIX}/usr"
-		BINDIR="${EPREFIX}/usr/bin"
-		SBINDIR="${EPREFIX}/usr/sbin"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
-		EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
-		MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
-		BINM_MAN=mman
-		BINM_SOELIM=msoelim
-		BINM_APROPOS=mapropos
-		BINM_WHATIS=mwhatis
-		BINM_MAKEWHATIS=mmakewhatis
-		MANM_MAN=mandoc_man
-		MANM_MDOC=mandoc_mdoc
-		MANM_ROFF=mandoc_roff
-		MANM_EQN=mandoc_eqn
-		MANM_TBL=mandoc_tbl
-		MANM_MANCONF=mman.conf
-
-		CFLAGS="${CFLAGS} ${CPPFLAGS}"
-		LDFLAGS="${LDFLAGS} $(usex static -static '')"
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		# The STATIC variable is only used by man.cgi.
-		STATIC=
-	EOF
-}
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
index 60729ac12e6f..8e4f1131627b 100644
--- a/app-text/openpaperwork-core/Manifest
+++ b/app-text/openpaperwork-core/Manifest
@@ -1,5 +1,3 @@
-DIST openpaperwork-core-2.0.1.tar.gz 62459 BLAKE2B 8b513b7ff79f3e81018b306d69a3f71ab6a132b57495f19b013ef4f364c1c4782a5b9ce05b3410be588c1b859b413b13ef8e990094e217d300fd70b36b93974c SHA512 cf048afe1052a6a63eade9944330f9c1c20c89e9c94da58f31562f1eea9286fc96b74af8bc32a010a37369463cfffd1847a407940dfede4dee9b16504beb2d88
 DIST openpaperwork-core-2.0.2.tar.gz 67268 BLAKE2B 85fcd8d4e1c8a054267b28eb5ec826617e13f93bf7cd54d6defffd62be65fb0306a0ae4fadb1cc8e875c23933c3559e41aab46b58a333489fed0174776ede597 SHA512 fb47d1d8b7747274a6b60248180786f4142110feffa1a8f886b0486a1e1cefbe11d06e3ec1f3a3ee33e38cd40d8e7460afefb466ee938e847deb2518d642ed00
-EBUILD openpaperwork-core-2.0.1.ebuild 491 BLAKE2B 9fe1b560960b183e5885831bb2f477a0371f64c017025034630daef40b203eb39de54466e911419c0ba7a36da51a97e4f6697ed2b6076bd71d7237f5bd705e80 SHA512 9be4f80aa1197449b2eb38e4c9427867a2e5f052beb60b5a46ca31b894a056641dd786c2640a69d8f73363325782497e5e408fdeacfe6638a63484c58654ff45
 EBUILD openpaperwork-core-2.0.2.ebuild 491 BLAKE2B 9c2f7ecde6a10693a0f7496ce60a4ee721fb987dff963d7a638b1b26f471de31a1d3dc2dc936ed5ff122fa574596b12b51f37cfe91aa05833ae83c0732ab1e01 SHA512 1f68412e29852a2abd6f62907735e813757f1efecbcec7b3575b669e3ba56a49345d1fb846190c3cde642e6e9088a8b3b7456dcef0770580bd692746f0cf9f93
 MISC metadata.xml 343 BLAKE2B 3b3ef7b9f3c0aff87d5f7f743a17d16a160ce7e03a21ad0f9e61127e591e0dce9a2a9b9483e04ad56779c7c848c5ffcf1f62ba06edd6780b9263fe066ecf6b65 SHA512 8c2967efd1bb4b024bc97b76fb4e3b92a01b08c82e12b5f86015eeadba7a22d5ceea1c9219d7517f79469308afd62e2cae20930931d918afb3b45dfc6400f8ef
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.0.1.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.0.1.ebuild
deleted file mode 100644
index c86dd7452cac..000000000000
--- a/app-text/openpaperwork-core/openpaperwork-core-2.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core part of Paperwork (plugin management)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/distro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/openpaperwork-gtk/Manifest b/app-text/openpaperwork-gtk/Manifest
index ae1a408a8b2f..9f409113a2e5 100644
--- a/app-text/openpaperwork-gtk/Manifest
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST openpaperwork-gtk-2.0.1.tar.gz 37716 BLAKE2B ab8e617148c57530d65952846c9bde4848a7b7019f49428dfce419dc3ac46555aeba79c5f6a4b7b8954ab7f5905b0ac4c2cfa5856970b640f53d4c768d737489 SHA512 1b342161f68680d298197bb3681203c251000e50039cc0935e674747ab5ce89950ff59d7afe3f6cad948450921d1b922d110a8607115f30cf53e264400e76f0a
 DIST openpaperwork-gtk-2.0.2.tar.gz 37740 BLAKE2B 40e1570364dd23cda97184211205186dadf7826624c1d8846a7fb31378fdf0ea9aa715c07adbf657eea9b08f4c583d86eb248b8907317b572bea51ac52c9a54b SHA512 c24f19a47f1ea1452f8efcf5cf1e4492f49a4f1c7fa7572f09341f4a8f70c2e9cfea478c32635d4ad998be90a069a55c4fe2a4c0e12a9835b9fa7e6b707494d7
-EBUILD openpaperwork-gtk-2.0.1.ebuild 578 BLAKE2B 879b70102d34b58f3a7f2f8129da001955a303d5308d9c52d9ec27481e3afd687ea18c6925907616a927c6ea977f909ed2d0ec43ee175d7b51289383dcca32a4 SHA512 8fc6018c827818dfb12433957f17e8094a75111aae729749bf221eeb2c7312cd90d448cb463f7e06bd3c1586d34de43249ae97c1b9f078493f8c1eae85d76622
 EBUILD openpaperwork-gtk-2.0.2.ebuild 578 BLAKE2B 7daf9f8ef3265a47c0e9372c0427c21ae6f60d8493557979584a5b2f90bc1da6f4a93189801a9e9d44b40b9ee50624d52be53f9eefd2782b5a7b303e5a2bc1f2 SHA512 9462ee2ffcb3ceaae642934effffcb2437af109cc993ec0a65918d0ce90d36815845858d279788c43dc10e39dbfb0c139b7edffe977aafef5826354fad859400
 MISC metadata.xml 342 BLAKE2B dba2557bfd27cb470cdb5a6c4cbdb2b444a02b3f9dd28186075075a31613f33c2f308657c6908060a20967c569a5c2c310fd99ef83d2a2762b4df01bffa4258d SHA512 25e1a179c9d45ca0a587fd60bcd77d05b66b20aa001ed0f45c2163b2f224b486ac337af7bcc3cc2aca4c3a236fe0f7984e02fc2089004062182df69ca33ecc07
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.1.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.1.ebuild
deleted file mode 100644
index 19d08b8f711f..000000000000
--- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Paperwork plugins"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 7b2f1e69d1bb..4eafd1b9c927 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,7 +1,8 @@
+AUX pandoc-2.13-trypandoc.patch 402 BLAKE2B 68bba7e2cb0018fa7d6bc7ec82ae24041da01fd3f7cab776993cbdd9118ec71dba6c029187d131b1da254446bade79e1f36f88cbf6a0ddc96b83b7a705ed8905 SHA512 6953a987a43b3393333f6164f72f839b90750acd4dd6fa37197bdaac3e52f1a6dbd56c7724ba331e90aa89715704d237e6c49b747076812b8bde680540c85e37
 DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
 DIST pandoc-2.13.tar.gz 12959060 BLAKE2B 78079d6805d8e1d84f73fd67c3802c2f202523b8e672204b69c6c9aa95e8c003588dbe158db506921bd6444c35aa4b0a8417bb317661fa889c8516cdae96197b SHA512 c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8
 DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
 EBUILD pandoc-2.11.3.1.ebuild 6170 BLAKE2B 097a59b21710bb75bb17f3d93cca07918a041eecc9517d0e8476c44af174f5f6b227d9bc9065d705b552841a12d3068c40e0ac9a64bb36c9c0ee2a0988df3fb5 SHA512 5a2a9266d3285952688af54ed71f7d34eeb0612cf2c1b0d147597132e3393411edc73393759f5389496378d66b27d2e3e5241dcf920121bde8f750486ae9a21c
-EBUILD pandoc-2.13.ebuild 6269 BLAKE2B 27c7f4940615776bc0d14a50abf29d0c8bd216c45719ac3e9421394a078713f88c26a15bf9396dbeb2ae6679b20fd8e7a8672258d3145f809fca9a4349008712 SHA512 fe3008919f24d5a93019d7fec07082a58ed7a7fcd9a0333e3536199d4a45311fcb24803e3ccc5692ad8c466ec80fc8d28b776d9f6c313dec5f4388a8d6e86879
+EBUILD pandoc-2.13.ebuild 6315 BLAKE2B 55b79d26d088cfc619767f04c734308b66d33fc5b9feb4b28503d0e2834776904e3d060440fef6f8676e57a7a50a3619311bf632e192348a4ae84c9544b6e1cb SHA512 f9ec4eb2b911733770f186314c6fc708dd352e42f30653ae32126fe375ef0ec19e18695067c53c9eaa79a221fb494fa4dcba489ce3dc157b79584a79524b5466
 EBUILD pandoc-2.9.2.1.ebuild 6088 BLAKE2B 156eb7fda9f1824886d8d484db802dd645601abe0514fadc21e359ee0f8bb02f4b0ad7ba1c1d77d7e662f9fdda45de16b91ab9f756d383c5e95b2f48811132c5 SHA512 a600bad2ecb5b8b497cc1041685a1b4c98d20cfe9347cec12e5679d197dbcb5b70aa70a42e03f4cd48252713b3a669475bc0d82d076afe3454b9f2e00c5e5e59
 MISC metadata.xml 941 BLAKE2B 04e284ba78b78c6a88999705ce10650fbe854fd5154bc197b938de1e7b12689382c0c19b04c522366fb51c50f7f0b03d7cdb875ee6840816613bfc96f7d1d7c6 SHA512 2cb5cdae868ec8345655e18303a9fe1bae9c4eef4ee2b2da3f302b2e520af70095f06f78cbf0de1cbed524ddccb43742a73a5ce0e3710876ce83d25f4f19f77f
diff --git a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch b/app-text/pandoc/files/pandoc-2.13-trypandoc.patch
new file mode 100644
index 000000000000..1a0dacce99bc
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-2.13-trypandoc.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/785268
+--- a/pandoc.cabal
++++ b/pandoc.cabal
+@@ -729,7 +729,7 @@ executable trypandoc
+   main-is:         trypandoc.hs
+   hs-source-dirs:  trypandoc
+   if flag(trypandoc)
+-    build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24
++    build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24, text
+     buildable:     True
+   else
+     buildable:     False
diff --git a/app-text/pandoc/pandoc-2.13.ebuild b/app-text/pandoc/pandoc-2.13.ebuild
index 72c73a65465f..f0ae5e9a8249 100644
--- a/app-text/pandoc/pandoc-2.13.ebuild
+++ b/app-text/pandoc/pandoc-2.13.ebuild
@@ -94,6 +94,8 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
 "
 
+PATCHES=("${FILESDIR}"/${P}-trypandoc.patch)
+
 src_prepare() {
 	default
 	# optimisations require ~16GB of memory on ghc-8.8.3
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index aef39b127f45..fef5d2babbb7 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,8 +1,3 @@
-DIST paperwork-backend-1.3.1.tar.gz 62343 BLAKE2B 2d391f63b0eaa010695b3c11b35a6c89df9df9f60d45401d8bad711743037379cdb856d8f6b0ba9f7837ac272c2d6fcbe6f58808d8b5047dccf210fbd9a3c98c SHA512 e845ddd4d01be0f4d89e7e4a0a728d06b90b87a551dca3a88426d1ce6487bc000676c997df73d13662ea8f93aced8e8dee8d44ed4fa588a4c8bd514135610c35
-DIST paperwork-backend-2.0.1.tar.gz 1283518 BLAKE2B 853e4733e16f1da503eb0a8de940c0d5a9379a3f82db50a96c6cdee82ff1b137c3b4ae4f128385217ab6cf43dfd0a3087fdd05bbde0da901c07053273b63f8e0 SHA512 14b072264436a300467ec9e45dc40c3ff9fab5c4ec383f6656b9cd89eabf37bf5e79118c02c67c65eece5e5d3809f3944049503a578e4616d440efbacfb46495
 DIST paperwork-backend-2.0.2.tar.gz 1293642 BLAKE2B 3785f69e941c14c1146ff1c9a5afa149559821f915ff1068b38f94c3fc3fbd591c2144f24070232e885b616eeb88b5dd1a7c86d608d9ad42f6512688db79b1fe SHA512 36261b89078e7ca10ddda3ad03871db34931d8a04f16edd663873a2f7c46b527bd607c27d0f4ff005ed869c16e0b7065992e629e257677b46d5ccb4b9a1dc7b2
-EBUILD paperwork-backend-1.3.1-r1.ebuild 928 BLAKE2B 67dc3162f9f3dd9aea3c41d6c6a61efa7ae20b8d32c1e9e338104ff048a71fe9588b152d9c40e79bb25630cd5effd092daee26ce365c57d949947ff909a40497 SHA512 3d7f29d4831b208392d54095dd8b36f0a9104eaab636b260d916b829093d5e1dde70dc5b63479ada6ac98d316c78c9474885fa7c931d65748926f406d9a21b62
-EBUILD paperwork-backend-1.3.1.ebuild 895 BLAKE2B 2177b993f71c15baa2e1a7d294c395993db65cbfc862830ad3980e8819b6b0e6a8807e2560658cb20fe375827e0c3611424ee7d6dac89176216bff461db6dfd5 SHA512 de4dcdd244797cc335a2225606ce0d52fb91fc94b8c6e1e5d44898074957fc3629c95d225d8e086fe9c419b775766ed739181743407e9dd5819fa3923cc47468
-EBUILD paperwork-backend-2.0.1.ebuild 930 BLAKE2B 359a96391a3d897186c6c9c6dce6182f23683f223aea8703ee63eb328c189b092696da918c56011c0fc704bc39046116c39acb0ec8384dae354e6523b35e560f SHA512 28ac260e8155fc40acc7e196a10f3ded07b31f81cd024f111e8c255e2a6cebd02c505cf3431d2034cfdf40cdfe658eb128753d4be04f9180bb82ac10faa52f26
-EBUILD paperwork-backend-2.0.2.ebuild 930 BLAKE2B 7bff0267bd343930a246272efa114604959f75fe14ea37a3f2e6ef4458b0611710ffe2204f5f6b80b7519588a99df10e6b79c26efe6bdd78f9cb178336ada0c4 SHA512 1332cfeabacd9aec36c2212ca9018779f767ee6d4a845eb7a8e01f20b8e12e199ef55cf4a4f060b957c4b180a045d0f501bb7933dfea79cedbb7914ebb7519fb
+EBUILD paperwork-backend-2.0.2-r1.ebuild 967 BLAKE2B 02d46b13c45a45c4b67fe811bed5b79fc9b3ebc89723db821a67d26b2224bf91dad806652fa2a99f558ddcf045525279ff9e5a2f3fb903a1c07b62cd49003995 SHA512 4f0bba571dbdfa8443303bcbd5148480bfa900b415baef8b1698af2f62bcc2268827816abb25b122b960fee955898a26429eee22cef99245930fd06ae1b5d119
 MISC metadata.xml 342 BLAKE2B a73c59727e066a3ffa217b622c58343a42d34351791f6619aa94d1a659b9d43ccbdfc9682901fb074c876a3e66b19403c02657aac3956502f400a93bd73ba6b9 SHA512 5a3a63678f9d83107a83c1bc6e4181544627279e89b3b589fcd2b745221dddb0201779f7b8c3ec1d7b2812a92ec7ad8d290ba58c11860f46f3c5329840bf1730
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild
deleted file mode 100644
index f31341c81d2d..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild
deleted file mode 100644
index eb14895f3a44..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.1.ebuild
deleted file mode 100644
index 763e51cff3f2..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-2.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild
index dbded23925ca..6b3c1b66ea73 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.0.2.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="app-text/poppler[introspection]
 	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/natsort[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pycountry[${PYTHON_USEDEP}]
 	dev-python/pyenchant[${PYTHON_USEDEP}]
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 367b2a980c59..6ee27a9a1f13 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,7 +1,3 @@
-DIST paperwork-1.3.1.tar.gz 4631298 BLAKE2B 9b111c524da29c6d547141a64ff39a5c50f18375484ae60702a2c7ce57a7be51b62621cf114ffbfa9c2175f9978225525f321449a4a9cad2570cd26dd956e496 SHA512 a0e6a95ebd0b5bfc290b8981488967bb5f2198ac5ec768f824ed487648d0dea6abc3ab8b8cfd8107eac1223a5ecb351a5362d9cbd7d5efccf5cb8c9a318490bc
-DIST paperwork-2.0.1.tar.gz 6224111 BLAKE2B b643548caa306ed3a7ce049694518ee25e102c73968eab9a812d4b088213593d08d262f71510bae61b015f685f0ca38e578c4ec6db0df279f42ba068b450a813 SHA512 bda94421e48a76878c661f201f07cb3d10c932dab3da33cacf229214022ec0ebcfbfef675d12bf62865b11e05d9450057244d5ed6bf4d3073df99823dece6087
 DIST paperwork-2.0.2.tar.gz 6222075 BLAKE2B 6dba798ae2b18ba81891c8f9c29e1e2bc8670f24a65e554aa169f05fbf1a89382b9ea24abaa1784da657ac5b9d9d145ffbadaff86ddc3583023f164ffb40c351 SHA512 bde28c167eac5b134b4bdf0f2ac8d93eca4f99c1881ca0edc105c33674114b3a4e3508a1f45048f45ce1c2f6b690a0f765c1b980dbe42c7e1282172f12c3a853
-EBUILD paperwork-1.3.1.ebuild 949 BLAKE2B ee1ce14bbc529f0a24a64bbf46cb9f74c1123aa8cbfe847ab9ac9124e7d4894bda99e22f31810990dc72861224302849adbc40f444a095eaf13102073b8255f0 SHA512 abab7f338510763c5d86e831b05f568d4a29223bf75e8a14f9e73dbc31377d328587091805749e43fc0b01938277541504f9b978bdb6b4411d6f7a61a5396c87
-EBUILD paperwork-2.0.1.ebuild 1026 BLAKE2B 9785e198272035c8a86252ef04a629683a76bcdd906a97e581c1f120b5e2469141e137b9402c30555d6da65c0d7310ef7f6f7f4952f31fc71882c4a52060cf9c SHA512 94c139f05649c457c126f103ad200de9988f273462511e4a6816f381b0fcab4ec29a0d32cdde3c66bb82d06a5b070e3a715c77392af44bffad06f1046d42c977
 EBUILD paperwork-2.0.2.ebuild 1026 BLAKE2B b9b3e3cd09c0b0575b566119dac1f192044b958c1bfd6e4ec16a588babab28617c3ca23dd3dca7b9e0e4a5efb5355a2315f8d246394b8a12fff02f427097681a SHA512 5814f5c4c2e96fb2fb2204f1423426577b8032f3e536bed454f26f89a6f4abb368305e41eb0d531df776751c0aa9551aa65bcd0c6c32808efff84d2d5cf346f6
 MISC metadata.xml 719 BLAKE2B c97e258d05155df5380f08accfa9736ce44514ef9fa9b0fd0a4d5966a48df7ae940902ce929893ffb828f30883c4591c93a2bc5c8ca0c7a6f636e477e8f52eae SHA512 a36e28273a451c529451602b80ec70bca26d2db40a683e6fc7297db185c88696cc359c3f80951ff9580e81e7e221379913f7d1db3af3d00fb02128e1994e7f4d
diff --git a/app-text/paperwork/paperwork-1.3.1.ebuild b/app-text/paperwork/paperwork-1.3.1.ebuild
deleted file mode 100644
index bba7cd76a1e8..000000000000
--- a/app-text/paperwork/paperwork-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	media-libs/libinsane
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-2.0.1.ebuild b/app-text/paperwork/paperwork-2.0.1.ebuild
deleted file mode 100644
index f7b6ea164162..000000000000
--- a/app-text/paperwork/paperwork-2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
-	~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
-	~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	media-libs/libinsane
-	x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index 7454330bcf50..8195bfcbbe77 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,5 +1,5 @@
 DIST pdfgrep-2.0.1.tar.gz 187217 BLAKE2B f498158e63e2f8419829df0d1801a31d3dff02627ccf0efee7239650203300233d1a19a5c72c57eb24495f2b5403e0e2c6a479b0f28a8d053aa578c732866b1a SHA512 4285f8cb514975a0040cdd6b82133090e27ba5c2f95ca880dccc3dd4fa3427260a5fc73d807df9124a79fa36ac6ed8c11380cde11e00599ed7134d92c50df4a0
 DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746c649f7ec77d58a41b90b13dd903d47b5ed2d35f56ca7ca12ae49cfb8a57004f9ad3ee6b8930f533b33d7d8463 SHA512 27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c
 EBUILD pdfgrep-2.0.1.ebuild 701 BLAKE2B 8b877e130a6d58635312771cb09778454d25fbb87cb2686deb92adbb981b9ecfb5706fe842a6bd8477e67d098d07c4e941809b94f7e92a29f456a0934c843844 SHA512 c1c78707a9cf2589800d275b50dc0a8a97a7f5477c2f1f0773312801aad082c2af4752380d5463aec6b136ead175d4f42cd75d9632da8bebe557c4776b03a879
-EBUILD pdfgrep-2.1.2.ebuild 761 BLAKE2B c6879de906a6b25f22eaa4e24566df386ea4b9545da164084a61465664d82559d24fe5b9ef860902ea6932b05f1580888a8704a7553550f34643b857e10f66ef SHA512 48865871bd3e0f115e7acaf64218703341ef162e637609adbe138f70a73ab32e8d30b46bfb433e447a79ba648a3ad5cdf5b9596d7aebd431fd29971905b6ad7c
+EBUILD pdfgrep-2.1.2.ebuild 766 BLAKE2B 1a651ed9900ff90aff32b31673d5bd3e37504f2db734c92716f6fbc89dd36b3899a6888dabfa6c3e301fda28f71299b6c16190a7702289d4c98351b16e147df8 SHA512 5c392b83a699cbbacf651611a06f150b80c95a199bc712ffb38adab371680cbea617461412204dade2a4c4452d0a4978d4b87bc48af151cd9c5c667a1541d908
 MISC metadata.xml 522 BLAKE2B 9bf82a86f7b50e8b0031b556acb03170978b6b720b41df5b539fcb0480ccc8f5fdcb1a2a5869a2cfed49486e2ac34c2a31b2aa01de87a55ee35489e0762a6295 SHA512 b48ef34c6097f56b48ea17567eaf1ec9e5f4ac5acf6de362a5e681b74d2b9bd683f3ccb1a5134c2afb3b86e618c3cc21ac8d9a32eacbcb3376dce435df762b97
diff --git a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
index d92566b9852c..444d6258b3d7 100644
--- a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
+++ b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.pdfgrep.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+pcre test unac"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index c3999cc2dca5..02609d85bf32 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -4,6 +4,6 @@ DIST qpdf-10.3.1.tar.gz 18956768 BLAKE2B 1581799b7bd08e28829fd26571ddaa06fc8460f
 DIST qpdf-10.3.2.tar.gz 18943834 BLAKE2B 5b4e320ddd663721d8201139842bb09a752347f86c3e33116063b2fff1426aed5ff6e3c581c120771a712a8ed278102e0d41816db207a25dabd84e5b89490d35 SHA512 4e630959abf27d1801e36d0cbd754945ded42ade9299057a6b9a642c7cb2a3f8242e274642f1c33a65b4a5a77562d91dcbe64fd5772d483cbe5edb4a6a389219
 EBUILD qpdf-10.0.4.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
 EBUILD qpdf-10.1.0.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
-EBUILD qpdf-10.3.1.ebuild 1247 BLAKE2B 1c03d7862b354c5b4615beb84d1fb5d83e605f94c72b4f2853204dd8e49525dcef262d8e13609b3ff74ef018c4d8fa0bcb221700cac17c895b344574a901216c SHA512 07377cf0a591c6b4e9874198d08ab9c975e3345fa94b05273ac3356471b2576d213a35c1e195e0ef10d33728913b5c796e5ed99f690eee872a556fb90288b95e
+EBUILD qpdf-10.3.1.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
 EBUILD qpdf-10.3.2.ebuild 1252 BLAKE2B e056b468f2e2a91633c132781422402028fea6b1720212eb0f4621223532f891173253150fef6cb8d691bf996b68a2c073395ad099de785e7754d3bb2bae203b SHA512 370eba25d739b339bdaaa3a5e139f364ca42c0dc1985cdda0e36c17a08956ded863e47d16f1710fd0e0881246d5dc9dbda0268dd606bce8b6a0cc6467bbd34cd
 MISC metadata.xml 443 BLAKE2B 4522681371216196a58ef46575aad835e548c7f4e18a7137d6c780b1a5b8596f121e223fbfa6face7e33d5fe487b20219f0a40c68c5b0cb4d7eae1dfe7e8dc92 SHA512 1fcc6699cc87a906f341f9ebf45158a18870df921c573bba5f348375cd1ef0a204270abc9c6337e81d48082bf970ba16b09d940c4dea94b92d1d4efbeac5fbde
diff --git a/app-text/qpdf/qpdf-10.3.1.ebuild b/app-text/qpdf/qpdf-10.3.1.ebuild
index 658e4ad3a474..e6c1b1772480 100644
--- a/app-text/qpdf/qpdf-10.3.1.ebuild
+++ b/app-text/qpdf/qpdf-10.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/unac/Manifest b/app-text/unac/Manifest
index ddcec0b23f3a..921a6f6009d7 100644
--- a/app-text/unac/Manifest
+++ b/app-text/unac/Manifest
@@ -1,5 +1,5 @@
 AUX unac-1.8.0-automake-1.13.1.patch 950 BLAKE2B 41be5811b494475d0927f6dc8a3581a4f39d15c6bd315921674e8653c0c87bf07b85e9d72c6ef3cae6463852a78b5f084b4a193ec1412369a818b04737f57f2e SHA512 f6f29885b937b4e3dc21379e1e5d81229de9f1a400d24f3ea83a8cd06db822b0dc7bb8fb1dbfce27aac6d2b83834fe7fe15cdbfabfb6d82ee6311079fe7807f5
 AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1204 BLAKE2B 8014d5cf159b64c3898f3356ea8dd5393d4288c352c660b75d847a8323eb4425b02ab3f466864424405011e6587334a1e5f006588b563a1666b53b0e5f256359 SHA512 a4379869ea0035640905fd592085a48a6d23e3ae958044f606129e589348d5244cd3b6b161a22b8b5867588aeb60cc3f90ea93ed38ea1c90039928e4126fd29b
 DIST unac_1.8.0.orig.tar.gz 281807 BLAKE2B 1c566d75eef70b37cc6e8d4840d5712783ec01e2cf6ed5dc39a10b5da2af2c35928b62a1e6592bae1bb21682c3a0410582158661b4989f0ecbea80220bd256d9 SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8
-EBUILD unac-1.8.0.ebuild 864 BLAKE2B e6341adb6cab9229b6e298abf5ba3162768d8f53d85b3579db43fb118255d101fed4edc4a27ceb8bb152ef0ba1119732020d8a623ae8c7636649a23f2a6ced5e SHA512 fbbbf170f80624d5952a4a7982d343f3d22f3fe8b6495bad7d57197ffeb49c5ceb265640dd55e11f9ee024819e1317fef2a4b5ef912523ffa64263c9f6cba5c5
+EBUILD unac-1.8.0.ebuild 871 BLAKE2B 627be94cdb06181a94ee9c20e79148166fc6ccaa3f11474fd363ef3078ece81847daaebbbfafc59f24fcc2b60e6c20dfe3262b636dfa3bebb991952a5d83cea8 SHA512 184196d1e2af662f28e055921bebc0c8ddfc42d5fd072c1c0322ed99ff3312379269ebeadb755c36a5ce35403819d973d20f3bd36a3419e973298bb622718ae6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild
index fed5a147afe5..fee2c8d8d145 100644
--- a/app-text/unac/unac-1.8.0.ebuild
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/u/unac/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest
index 5ae3f7ca0be0..902be5996d37 100644
--- a/app-text/uudeview/Manifest
+++ b/app-text/uudeview/Manifest
@@ -1,9 +1,10 @@
 AUX uudeview-0.5.20-CVE-2004-2265.patch 1788 BLAKE2B 6ee4cc768f3bab3cb4116c465d10324668e3d885a73359ff1919263843396475524f146fd747fe5748b1bf5bb52c45993c89ba8c4f8718213eb6f63d0c8efab0 SHA512 63ca3c7d98924df1a2a2c08188291cfc24870c8464bc2bb98d47315f2e28ef876cf732598b6410b2875d9875c2463fda51da959b9e1340c32baa2ec64875f46c
 AUX uudeview-0.5.20-CVE-2008-2266.patch 4595 BLAKE2B dd2ba71e43941812472729575f1481be9d93641f1868952385f7d5f69d6c63991b6856becc967d92c1ced93f0b5a68349af43b011de4ab92adacb93232b226c4 SHA512 fe6ffaf4d55f8a367cf8661ee4599f1224b2bdbf1d3659558c024e7c0d9a6ad043d7eb9631f28e4762b39a5b5e2a417b66be9e98efc7e5caeb9a286e239e486e
 AUX uudeview-0.5.20-bugfixes.patch 3575 BLAKE2B 8778f0f08fa8d8c5faabf2721c195505a53369f30d93c494080025e491121a75135f321fe5c0c117e5bfd538a7cb2d82fc64cb5584822dc9f353cd31b168bdf0 SHA512 c5e4126e9457cb94d6f014ba20e2497969a50b84d917bd31529a2a75ae5b1e9990ec946e8f8de7a83ced71e32aea7d62210416d94b765dc860902825ca6b34a3
+AUX uudeview-0.5.20-fix-append_signature.patch 893 BLAKE2B deccd364dffe6be50b5985c603a55407fa0ae358fcaa31133607d276d04770eb5e43ed175d8d169f3afabd9dc7a27c55a0273dc946f0e85be48f66922ec1ce91 SHA512 6c84e1276b1bb1f411bb9b1561d32f49312c6969721c4016761d3a2cef388d46b6288e5e5000d2f54a5529ba1bf16d5427ef73f531be5d53d8abcc2300792482
 AUX uudeview-0.5.20-makefile.patch 822 BLAKE2B b7729d04f9b881924205efce8dbb398b12e04ed95aa585f2e19fc79340e36772d8c8eb2c9fa23d2d69fedd44c743d85234578edd406b910f6f6ec70457f220a2 SHA512 69efb3af67aa9a47a4d4155b1c346bda5bcfcec26000e82b170d854dbc29e72ce6a8b21f171a72761f8ea2cc2c6fb65e74700a6134c9cbe107b596b45762a34c
 AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b
 AUX uudeview-0.5.20-rename.patch 1736 BLAKE2B 820e32f9d2fd248ee2748e3f6173994b02074720814ec8adc6a896b72defc29ce24a356626c7bab414c516555547fe04cbaf304a52c9f141b80a836593c8638f SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uudeview-0.5.20-r2.ebuild 789 BLAKE2B 5899404408299e4a9c221de9a046f6d26e06e23b660f1d8cb0b131224288b4bbbc26db3baa802061f6115f17c460874663d7d98b7b28f1c0c3dbeca228a80e9d SHA512 3552e7ab17aa3cadfe7cf8a26e397bb5ade4789c69b4398616bfbe49a472fcf92d1070e15e0761838137e77749f7a303fdb02a93f97952663694625d60774df3
+EBUILD uudeview-0.5.20-r2.ebuild 915 BLAKE2B 584efb60337f66d21187ad432eedce73f9ab56e0d47174ca5844b85caaacf457fdf90458e29a294c8bf9c8cb9d09fa0bb48fe9f90fa1d8bfba683a766d2d9d65 SHA512 65cafdef3c549f7de91202b343411e7dba71db676ee7bfaf60a5861c450adbe0a1a7faea3396bef1bf28ff96d405c2f3e381aeeee9531b326c9a1ed768ff139a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/uudeview/files/uudeview-0.5.20-fix-append_signature.patch b/app-text/uudeview/files/uudeview-0.5.20-fix-append_signature.patch
new file mode 100644
index 000000000000..3dfecc18cb91
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-fix-append_signature.patch
@@ -0,0 +1,36 @@
+From 3bd5dee4226142df3645b8a027ef9142277257cf Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Sat, 1 May 2021 17:51:47 +0200
+Subject: [PATCH] Make append_signature() void.
+
+If the type specifier is missing, it defaults to int. From the looks of
+it, the function is meant to be void.
+---
+ inews/inews.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/inews/inews.c b/inews/inews.c
+index 5fa309d..d1c1ee8 100644
+--- a/inews/inews.c
++++ b/inews/inews.c
+@@ -143,7 +143,7 @@ char	*argv[];
+ 		fprintf(ser_wr_fp, "%s\r\n", s);
+ 	}
+ 
+-	append_signature();
++	void append_signature();
+ 
+ 	fprintf(ser_wr_fp, ".\r\n");
+ 	(void) fflush(ser_wr_fp);
+@@ -181,7 +181,7 @@ char	*argv[];
+  * The rn-style DOTDIR environmental variable is used if present.
+  */
+ 
+-append_signature()
++void append_signature()
+ {
+ 	char	line[256], sigfile[256];
+ 	char	*cp;
+-- 
+2.26.3
+
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
index 1e0174e5eb8d..72fc9d499c88 100644
--- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="uu, xx, base64, binhex decoder"
 HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
@@ -20,11 +20,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-man.patch
 	"${FILESDIR}"/${P}-rename.patch
 	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fix-append_signature.patch
 )
 
 DOCS=( HISTORY INSTALL README )
 
 src_prepare() {
+	sed -i "s/^\tar r/\t$(tc-getAR) r/" uulib/Makefile.in || die
+
 	default
 	mv configure.{in,ac} || die
 	eautoreconf
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index b94ef19a73c4..137bfb030ba8 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -10,5 +10,5 @@ AUX vilistextum-2.8.0.20200411-static.patch 429 BLAKE2B e5a86f226bd0f272a21ccb1b
 DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
 DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917
 EBUILD vilistextum-2.6.9-r1.ebuild 1795 BLAKE2B 49f0673b3c30271e2686da6598c94455d57df7dad4dceed7e039c459d30d3cacf6407234d8d459f13f992be9990e660f00198d2017e829ae4252e58a476e6dcd SHA512 9a58610ef3a53b1179d57c837b9fef01c2a6dd1a0f520582846dd88bbb3124a4935f55e048c2f320aee0042c2acbf987fb0b1bb6b2d6d5a2b201703a9acbc7a4
-EBUILD vilistextum-2.8.0.20200411.ebuild 2057 BLAKE2B 82a354948640b4c655941f3f897100c1175c81c266ec81b888fe52c386b84627d637189ecaf6176f9db3f57054bd0a2a2343ecc63f9b1f632402539658c4456b SHA512 0eb8b8128357d314d89c5a708e6fef7f45f9e845d944b03ac1bf2f6273b1243a838575fc10af9f0fdc2d5d8e5db9027d1a0caefed686bc51df21ea04969fb267
+EBUILD vilistextum-2.8.0.20200411.ebuild 2056 BLAKE2B 486363551ec0e7b7743d80ccb1988f5fff5732fb62b8bf7dd164a53287f1098551b0c657e45ac1f49a7b09ccecc20a35c1b18429e868627bc6c852ee18368f15 SHA512 8c2844cf54099039873e7d219f8dd686e14620f7f39210a2a6d3422b79338595641d2f52cb6711e5ea96374f6a3b6b873712c62cb995657fe73d0aa2bfc5f8a5
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
index f388ee3dd47b..0e4e9fd91365 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITID}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 
 # Known test failures nobody cares about
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 34d8b52a3e53..7edeb598daeb 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -2,7 +2,6 @@ AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de2452133
 AUX wgetpaste-2.30-fix-dpaste-escapes.patch 493 BLAKE2B db87670a90aa94a2b79844d7b1abdf349cbb600118b8a2a09def19185bc2d3460cdce36f56a09f1c51e178e7927abfe50772b75c39889bef55a284fa0312fb6e SHA512 0cec0d469327c9d6700977f36744b24d1f450bb3486058ba43c233190dd2d4bc10c52d7a90a53896596a06534d39ed929cdea1a0facb5a1bd9c97f92c986f46b
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
 DIST wgetpaste-2.30_p20210222.tar.gz 14654 BLAKE2B e74332826f7faec3c2be2dddfd5f81d1ec14aec92888f27cdcd081b59262ac742003f2f48af3c3ca25be9e02f583a37dd1bec315236ab54912ebf6cf61308a10 SHA512 467daff5531fd6361ade87913ab867f67f72d5ffc07a35c263cd3dad65774ed31b3a6b0d69d2b52726a24419758d784c23e8c587f23e9028afd0e0a27966f32f
-EBUILD wgetpaste-2.29-r1.ebuild 689 BLAKE2B 3f803efebbe86ace4e41a78f358d820f2609f534b6b976cecebef1223754be95ec1301f4c7d03e50579a7a2e7586f7092deab40a224a660a2c2c86b38ea8ec81 SHA512 4818b22025d7b3e985479596558a3832371df3df2e5f9862c08eba3011d3bb022a87c3131ac6e421e99381a3bfb09468be133394e1b5470907f21396311bae13
-EBUILD wgetpaste-2.30_p20210222-r1.ebuild 771 BLAKE2B 4e3f23e7f0fff4a74b139cd5f5534f491a086d8c363cfbeea9f4180f5854df1b0fc9675176f273ab288c81411f40393b4dc35af1375dc996f912d49d56062dd7 SHA512 bf823e8f3dda78ad78594b4d2ba1f1b1cc75ee3b34c49c9ba6f42bd4f225ce6199e9c1a674f22747fa7d8806e7ba6e523e713cf59081fe55b8e8aa4175bc44d3
-EBUILD wgetpaste-2.30_p20210222-r2.ebuild 829 BLAKE2B 21ab964a57d4a27b95a0a4a1e12575a343c52254941d657933d0f80a9b897278677e0513322cbe06dbca25e4d2ee3cfed55f1e42e791b02529f422bd6e41a912 SHA512 666a06bab8f9820be2fb7eb3f5a7deac61255d6f62e10b8bc42fb083fc0acb6e4e79063f6dee5626bc4d704a3179116c2643022e8d02dd2ac738f4e6dd168d85
+EBUILD wgetpaste-2.29-r1.ebuild 669 BLAKE2B c0003f40085795be13306b8dd3b5fa26d5dba6d5475726aaf6e483e4e958ecd7ae862b3df089210beee017eefbfc30dc88a3e6aca3aa9b85e0e397b4b51baa5d SHA512 0fa556949fe80fe15d5231a2940e35b571b3403e5106659027368cfa562dec6bab0512f93442740db2d73bdff143fd4a708b01fb8bead94c96e226e986ff38af
+EBUILD wgetpaste-2.30_p20210222-r2.ebuild 819 BLAKE2B c109de02941711ed4d6d13887d1e34b89f271bfe8d45dd4139562b6f3a8eb9d782e26ebdbefb857994fc0e57fdcb20ebb72abbbd8cd939b53cef2b3eeb531f12 SHA512 c41ca1c9151e87de932e0ff1c5207e90f27c79e548d57491521573b6729f2a6aed8cdd5d63ae074e20949adc32630acfb38ad46dcb94a663837c8d7dc4323d48
 MISC metadata.xml 412 BLAKE2B e746785155941e2ca0d1c502bfc90a5f709b2afbf45e9e7f5ac291eea71ad67d54f5da691d72206556d7681ba5ebb8c9cd3bd8e1352353fdee802cd8fe7c2fff SHA512 1fecddde86406300943195b5be5502cb6efa1c5d061e56155946ec8b7fe9daaa74234f03a8f93a29a86544b0280ef58d697a9e96599d6fa5a2712d56c47ab236
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index 664406626a3a..3f189edaa450 100644
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,12 +7,11 @@ DESCRIPTION="Command-line interface to various pastebins"
 HOMEPAGE="http://wgetpaste.zlin.dk/"
 SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
-LICENSE="public-domain"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ssl"
 
-DEPEND=""
 RDEPEND="net-misc/wget[ssl?]"
 
 PATCHES=( "${FILESDIR}/${P}-fix-bpaste.patch" )
diff --git a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r1.ebuild
deleted file mode 100644
index c3eb7ed45128..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-
-COMMIT_HASH="f9b08c50009485817e8b44300f79a92e37fe9f22"
-SRC_URI="https://github.com/zlin/wgetpaste/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+ssl"
-
-RDEPEND="net-misc/wget[ssl?]"
-
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-src_prepare() {
-	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
-	default
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/zsh/site-functions
-	doins _wgetpaste
-}
diff --git a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
index 62b07cb4f813..95f415fdbb80 100644
--- a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://wgetpaste.zlin.dk/"
 COMMIT_HASH="f9b08c50009485817e8b44300f79a92e37fe9f22"
 SRC_URI="https://github.com/zlin/wgetpaste/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="public-domain"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ssl"
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /app-text
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)