gentoo resync : 28.11.2020

33 files changed, 119 insertions, 290 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ea5d24a4517c..e01ff6b14fc2 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index 4bad34d5d179..1456edd88eb4 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -2,5 +2,5 @@ DIST an_1.2-6.debian.tar.xz 4432 BLAKE2B efec93daf46b30369aa5d6a6bc57b9e79db7aab
 DIST an_1.2.orig.tar.xz 13196 BLAKE2B bbb19eb16e558f8fc3d331e5ad308611b13a7a88a65fb310b678bd21d46c39761747fb6f60a7eba99a1c2e756a8c9467543d26e97bbf7f9c93d17f66a4d7698c SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d
 EBUILD an-1.2-r1.ebuild 770 BLAKE2B f6ac00e6faf8e128ed85f7256fba39e6582cb976640cdc460ed4dee8fb0038b543a3d29e48d6c926cb6c85136626c0adf19970bdef3b642e4c67b88f75462df5 SHA512 618ae33718d53a0702798933fe3ee2c14856f76aee53682ea60c2baddc7c28f4800753cdc1f61a21cc9097824716d1d2237291d306d6642fbdabd4755299b226
 EBUILD an-1.2.ebuild 719 BLAKE2B 89ea6d80bdb55f99dab24ed234bc86ada3ab44202285b5d382c737bc42db8529ee19da1fb5c4f4aa120b95d0829f7bf5d384a5ecb21ff2600d19a358c11c75be SHA512 774b56f85bc3d9812e5824551f83aebca3d08e34e0857030cca8b378f57ab5032d6a6f5f1f0bc6b766df0c2b825b0cf91e30d259e4f6fb772ad374cc4b447d1b
-EBUILD an-1.2_p6.ebuild 900 BLAKE2B c779862faf8e4e49072c63ced71e160dad58fdc5539f291c1ff98693922365bf6ba5a87079c99fe7ce0ed9a68c2a2ed1f45f7096d185c86473e0db0396385f62 SHA512 ce7f2eedd1ec6cfd202e588c21493dbc37110526e1d8de2cdb82022b8b6bdc4906498e0250c1ea4f2fb9d026888161e490eafbe7322d5f20f9ec7108b631817c
+EBUILD an-1.2_p6.ebuild 896 BLAKE2B 736c8b5f6c55d53ec9f0fdf6ec64811c4675c93c589a16f893316652601ce8a55d7d8a3ebd4758a3284802fe87c998c457f8dc49173b6f8a49f1bb73b81d7bbd SHA512 d8ad5c1efe19fdfd62af91cec771305e30da5babe1ce8f7a69914ec8a77c579ae66e71428d4057596e5bbd76d851f1b4b982d37e609ad63b454052ac00d1190f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/an/an-1.2_p6.ebuild b/app-text/an/an-1.2_p6.ebuild
index fd837055287f..ec08966bef24 100644
--- a/app-text/an/an-1.2_p6.ebuild
+++ b/app-text/an/an-1.2_p6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 328150e954d9..4bfc92e4df22 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
 DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
-EBUILD ansifilter-2.17.ebuild 1099 BLAKE2B daaf8270898a8c343a1efdee689d8f4449619ed22739a0a12fdc45dd369c4c6520de5dd0b3b5973916f1a80b1a59f9bd244661eb05780106229839a3fd6ab860 SHA512 99579a1b84facba0b5ab905fb1ab643d4c7657179eafeb379c75440d6c7e995954c8b7f11f6d5280171ee60cc8f4df77a2a81e6ba1771a843d6fa48e57bb0c3c
+EBUILD ansifilter-2.17.ebuild 1108 BLAKE2B c5afc96a41f9b2bf6474f02c61d11763b77bf930c277d5a21c054b3f405115e7c57a52c869e40ed8042ec312e7d17afe7de2471a1460b845f7badc24bf3b2e0c SHA512 125d486d6d5f7e86c894a862f03dd4b0760776dda3b6047c14f28112f34d11ee72601e74ddc3a64c09953eeba7e5de30e3d6725a5df2519fe061251678b84de6
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.17.ebuild b/app-text/ansifilter/ansifilter-2.17.ebuild
index 30c870c62851..f9b8816867fb 100644
--- a/app-text/ansifilter/ansifilter-2.17.ebuild
+++ b/app-text/ansifilter/ansifilter-2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~x64-macos"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index 721437a665bd..c221cf4febec 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1,6 +1,4 @@
 AUX 0.98-info.patch 441 BLAKE2B 2e334be2e36e00a0528d220244affcd000da4ca7b4576501c34b210134ad9e5ff8af99c467d3be3ee34173b651690f8f0ec9a5584ceec60337b4abd1d7a4f825 SHA512 694c4ccd03baa7a17c0512b55b9a39fb2de34afef61194833fe5a481ba13c22f1d21217f53908ca8ad4cea536fbd9a6453486ba2778349e6b1651d2c67513ad7
-DIST barcode-0.98.tar.gz 335658 BLAKE2B 93694332200fce9311d4282c15b2e87e89a54af1a04cd251c9feb9b5ec056e62e97cca9f33e498df1d31d1d98d52e4f0b257f0669e9f7981addcc8e12a61f0cc SHA512 b2ff43d0c752a9fe7c17d65ef136ff2432ceddd27879c91cb18e46e9b0fc8ed6c174aa4154c0fa6d6e70c478ac86448b8eafa1857bb759159b2eaecc8d6f7ca1
 DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
-EBUILD barcode-0.98-r1.ebuild 805 BLAKE2B a731789d9c0643b41a3388e5eb234cbb69267da1218d68850e58bed2a0e35c6286babbca4352e69ed1fcb48c7fda7a70ed09969c5484c968b54931d9a326c935 SHA512 4a5207b85e31bd773e838541c0d4a33f762bbc484f11ffca272b3b90aa3c3369f51ec4639629d435afd5ec590967bb005083bd68f39a56f348a3717ef1ebe073
-EBUILD barcode-0.99.ebuild 674 BLAKE2B c493c0b0107b455b46402c7490c8c1d10b4b24cbd7cba8abccd7f698e9e40b3237ba696a011ddccc052c9b0ee8f42381f1116f890fb03d484e51f6ed86e2f38c SHA512 a6ffef8901b504023a4efa95405b4f171c07fb974c238f7e78f96af75b39fa00fd00f72cc358759a85276af3832ee5b604a3a3ca5d90aee5944ccb2a5b8dd0a0
+EBUILD barcode-0.99.ebuild 669 BLAKE2B cc82321c88a8244c01cffc963dcdc1467993d8120a6045bb68a3a74ebb76d8edd7efdcfe3288fe835d33c83d79ffe6d8b27b6e67049ab3d8dc5ca40c632d376d SHA512 6bb90e786b10fc142ee1ce0a4dc732b1b80c864bf44d47e0fc08cb4b98ffd28f6d7a419e6a9ea3fbb0a9feb3c974de0682a29fcbf523680caf1385ce5a9b248a
 MISC metadata.xml 243 BLAKE2B c7e8ffa98061b37b0107cea12e59f7779ed014b1b83b008c1f8baa888fca120d4ba508078f2182c27c1bff0e8c2dea07bf3b33a3b086fdfbd7421cbf57b2494c SHA512 dbdb824584151c0ccb600c9fa433898cb613604bc97c7305b7a0809d22574007bc9ee3037b3922ee5256471519fd27510c3168b24ca3f75ab63e5c3051502d3f
diff --git a/app-text/barcode/barcode-0.98-r1.ebuild b/app-text/barcode/barcode-0.98-r1.ebuild
deleted file mode 100644
index ef3174b628d4..000000000000
--- a/app-text/barcode/barcode-0.98-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="barcode generator"
-HOMEPAGE="https://www.gnu.org/software/barcode/"
-SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-RDEPEND="app-text/libpaper"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-info.patch
-	sed -i -e '/^LDFLAGS =/s:=:+=:' \
-		-e "/^aLIBDIR/s:lib:$(get_libdir):" \
-		-e '/^INFODIR/s:info:share/info:' \
-		-e '/^MAN/s:man:share/man:' \
-		Makefile.in || die
-}
-
-src_configure() {
-	tc-export CC
-	econf
-}
-
-src_install() {
-	emake install prefix="${ED}/usr"
-	dodoc ChangeLog README TODO doc/barcode.{pdf,ps}
-}
diff --git a/app-text/barcode/barcode-0.99.ebuild b/app-text/barcode/barcode-0.99.ebuild
index 5b04b0aef75b..ce0692e849f4 100644
--- a/app-text/barcode/barcode-0.99.ebuild
+++ b/app-text/barcode/barcode-0.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 RDEPEND="app-text/libpaper"
 DEPEND="${RDEPEND}"
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index 958759f18727..c518b29f0b6f 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,5 +1,5 @@
 DIST console-setup_1.104.tar.gz 3272857 BLAKE2B ae7a5929a059ddd2258884e5207198ae517da1284e264527878ad25bf883e48b399e53f2a987265623a5cffa3eefce8cce5fe8ad632576c46bba40689c17c586 SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
 EBUILD bdf2psf-1.104.ebuild 678 BLAKE2B 357443c76f206854737eec7b9d32561515339e316428cc2c45d4bf9e222d36deebcf8191774961089c120eb074c8c357259d527d8e32183bf04dff7851e42226 SHA512 54f8ee43215a9e2de7eef0a5d4732d07fe26ef6f68c22732dd616f012e781f44115b01e80516cf5e585140fa91be4103e4d41b603b510b74ed6eda37f05b3460
-EBUILD bdf2psf-1.155.ebuild 684 BLAKE2B fa1f1cdf8c503a41350b7f91608c5796c44b3bf8c64d16d69985d570b57de30171b48204aaccc11f631617824a90a2a77c340427ad625cd6ff4f83b6624d5da8 SHA512 e469d385937c8aba19ed9df46275ba4030757e861a429efa80eed72ae0e8c78bc6edaf0c51a2833254d9d7520503fb66af69f3387fec8dc6a6d3a487bfcfa2cc
+EBUILD bdf2psf-1.155.ebuild 679 BLAKE2B 1576f464efaa7872f195ba8ff38c0903df69ac7c1f95b3230381f707ef10ddf5b6f1d9b12ab0038c079befc61326838276ff7e065a40b03f687a9cd7d76997ed SHA512 0581284f054daff9350f22d46b80dce19610b284e5f28321cad633095f532b119b442c33459da378d5ced0e27a7dbd38ca4c7caace081db5fc0c5322dfa76ac0
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
index 96a51f59dd1d..9480d5ed4302 100644
--- a/app-text/bdf2psf/bdf2psf-1.155.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.155.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 2618a0fa9ee6..42b6823c81f0 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -7,8 +7,6 @@ AUX 1.10.11/site.info 235 BLAKE2B 423c81fc16eafaa8d0a0f04eb478fb390ef075638b3ffd
 AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4dbbcd2271f484d91e23bfba9e8f287669f5323006b3209b41ca9a0926e672c66d867db5f048b5b3fcf314ed29b1d7617b65eec SHA512 f7e8e84bd6132e19e778066b6adcd34ffb17e009d3f6abd9177a6aa5ad0c2c7e8afc03f5cadc18b6ec509a3118ccf3b515f971330f45baed36534b65415f8ca7
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
-DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
-EBUILD dictd-1.12.1-r3.ebuild 2815 BLAKE2B 0db400e2acfba90f98c357705a81f928a3f7e94bfc0a967aa44421daa996049104e9667fcc0bfae89f8a95bb6ea7a4e509ad35273697ee672cd786475d26475c SHA512 a99523b436163398177a8abc2461c9e6be308914634e5d941c58bf7cb5922a3e2551111f54dae12993d124bbee2de11f4a3792d5d7c0c72b2212691ef7304299
 EBUILD dictd-1.13.0-r1.ebuild 2895 BLAKE2B 7b4e5e4a67fb18ad32dded184b647daddb8ec9760481508f349e4b4760aa9a6042d31f26eb751c4e8fd1e87f177f98a1d0cc385df849b04430b2d3f086e5c724 SHA512 8634f4c0bb47368ae01521319526b8cdfc351ac48fa3cbcc819696fe4676e055f71d1fdd572f7641dbf5c294eb71403dbc7381837cb843e3d118e2eb4f144014
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.12.1-r3.ebuild b/app-text/dictd/dictd-1.12.1-r3.ebuild
deleted file mode 100644
index 7d308344d564..000000000000
--- a/app-text/dictd/dictd-1.12.1-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch readme.gentoo systemd
-
-DESCRIPTION="Dictionary Client/Server for the DICT protocol"
-HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
-SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
-
-SLOT="0"
-# We install rfc so - ISOC-rfc
-LICENSE="GPL-2 ISOC-rfc"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="dbi judy minimal test"
-RESTRICT="!test? ( test )"
-
-# <gawk-3.1.6 makes tests fail.
-RDEPEND="
-	acct-group/dictd
-	acct-user/dictd
-	sys-libs/zlib
-	dev-libs/libmaa
-	dbi? ( dev-db/libdbi )
-	judy? ( dev-libs/judy )
-	>=sys-apps/coreutils-6.10
-"
-DEPEND="${RDEPEND}
-	>=sys-apps/gawk-3.1.6
-	virtual/yacc
-	test? ( !~sys-apps/gawk-4.2.1 )
-"
-
-DOC_CONTENTS="
-	To start and use ${PN} you need to emerge at least one dictionary from
-	the app-dicts category with the package name starting with 'dictd-'.
-	To install all available dictionaries, emerge app-dicts/dictd-dicts.
-	${PN} will NOT start without at least one dictionary.\n
-	\nIf you are running systemd, you will need to review the instructions
-	explained in /etc/dict/dictd.conf comments.
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
-	epatch "${FILESDIR}"/dictd-1.12.0-build.patch
-
-	[[ ${CHOST} == *-darwin* ]] && \
-		sed -i -e 's:libtool:glibtool:g' Makefile.in
-}
-
-src_configure() {
-	econf \
-		$(use_with dbi plugin-dbi) \
-		$(use_with judy plugin-judy) \
-		--sysconfdir="${EPREFIX}"/etc/dict
-}
-
-src_compile() {
-	if use minimal; then
-		emake dictfmt dictzip dictzip
-	else
-		emake
-	fi
-}
-
-src_test() {
-	use minimal && return 0 # All tests are for dictd which we don't build...
-	if [[ ${EUID} -eq 0 ]]; then
-		# If dictd is run as root user (-userpriv) it drops its privileges to
-		# dictd user and group. Give dictd group write access to test directory.
-		chown :dictd "${WORKDIR}" "${S}/test"
-		chmod 770 "${WORKDIR}" "${S}/test"
-	fi
-	emake test
-}
-
-src_install() {
-	if use minimal; then
-		emake DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
-	else
-		emake DESTDIR="${ED}" install
-
-		dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
-		dodoc doc/{security.doc,toc.ms}
-		newdoc examples/dictd1.conf dictd.conf.example
-
-		# conf files. For dict.conf see below.
-		insinto /etc/dict
-		for f in dictd.conf site.info colorit.conf; do
-			doins "${FILESDIR}/1.10.11/${f}"
-		done
-
-		# startups for dictd
-		newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
-		newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
-		systemd_dounit "${FILESDIR}"/${PN}.service
-	fi
-
-	insinto /etc/dict
-	doins "${FILESDIR}/1.10.11/dict.conf"
-	# Install docs
-	dodoc README TODO ChangeLog ANNOUNCE NEWS
-
-	readme.gentoo_create_doc
-}
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index e5b3b6060e78..c4816dbd3ff2 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -2,5 +2,5 @@ AUX diction-1.13-make.patch 367 BLAKE2B 1b29ff3455dc455210dd1277281b175292ead12e
 DIST diction-1.13.tar.gz 145971 BLAKE2B a70a198f356d9c92813d2b60b02e703a61dbefd5968314058a2538e77929f1fcdfb72d95a827ceb539770fdaf0f6d7a0f67e4318524463e24ae3eeeb31edf475 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039
 DIST diction-1.14.tar.gz 147268 BLAKE2B 12e4a56aa6429bb155dd08a0ba01438f79b69ab9d2a990a3d9c2d12e1eccd15ff7c09d634d399f82d09c97b24586e4586bd6521153ae071b3192dc7a3ea10102 SHA512 db704f3c01883b24ce01c5aaaae9a615418e2cfbf851b7f11a4357c853299caf666483e309d84217413732b7abd1abc44f0bcb3dc960b64adfdfa19121607ce3
 EBUILD diction-1.13.ebuild 560 BLAKE2B de58eee9a39d247850564a0699969c8ca6500338f2d047925d182dfb4b85f15c285f2782d3c0e1e497af333a3c314f707e0ef6a74c67d1df0d25b726d2f132e4 SHA512 62214b2d75940fd215871d7d3eefc0adc3198a178e1eb4e0376999f8dc484f5f9d3094495eb128140e3f7b333a5e39820ce665402f19fa25f4d9e884caf45f24
-EBUILD diction-1.14.ebuild 538 BLAKE2B 9ee694676055e676fc0e4ff3e1eb643d0ea31dd18b24a39a6db5a60d03d1ff88ea4b20a829d05564b07b1f92be668ee7dfa6b3e4e810ab6ececeb81e4d15e45e SHA512 576237a3fdd5f3af275cb100942e69e0c3eeff30b27dd1ab25a2500e52a256da4c6dd89127446413eec79682f9c164c1028e988c1db5101fb21b1391be8cf467
+EBUILD diction-1.14.ebuild 534 BLAKE2B 856fc77f1a7522509164b97e65fe1787265298f2fa52738cf4389f54936a44baba57b00062028d5de7792d6c8ecd5b9623880ef4000489ee9c653e69cab5a6d8 SHA512 d2209492c2a6ee191504bae3d2c98f4b1a2d3c8727eb9984e92e7361940d7c588538b06af7a0a3bf5a2380f9043f828c0ad04da2caf874a6025f9c1b251992e4
 MISC metadata.xml 901 BLAKE2B 5643435f17fdfe599f47305f23c4ccc9b6430a5b5dd8fb9344fed92b760e9715c3aa30adf4a99c02543dc173e07b8e6ba233f4a0389c5d006b3d22d955e6bf34 SHA512 7c48abbc5a289f52d53ea115427794db393fadf18d875edc2419efa2d1426e425adcb955ba3f19790928e21c071cd55327fbfe006f2f5bb571bfd5be12b79b57
diff --git a/app-text/diction/diction-1.14.ebuild b/app-text/diction/diction-1.14.ebuild
index 07533e14ded3..9f39fa67f731 100644
--- a/app-text/diction/diction-1.14.ebuild
+++ b/app-text/diction/diction-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	sys-devel/gettext
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index 2b6493ed99a0..398b2d47b2c4 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c6
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1558 BLAKE2B 1bc7891aa410eb53d525090d07eed7cda47428f23603535673e1ccc233ac6e1d0b72d5be393df513f182062c9d05b96535ae312105af27facee6f09a7d7f9043 SHA512 ddcf4fe394d77b250ddcfa4397ea8c69c22638ce22d17754651c643eba8ac8b09e7ce793e97f44359608f04d1dc8b174b08d1ecc9eb56b731e8d66c643d74cd3
+EBUILD docbook2X-0.8.8-r4.ebuild 1569 BLAKE2B 245ff0908e542aa8306c8dccf41bacd4739a4e65f2e62e199aae90822625209d904083760237dbb83292c5d07952bda91c2f8ce3744d4a2bda57cfab97cb1df3 SHA512 f9622a4b9dd9632774378c9aeeec9309832d3b053a7f02519d8d031fa8a195c8fa9f5fae5e3ac2bf1e9d2f2567792101cd7e390400532a21ab355c93dc21c41f
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index a96945848f97..53121b0e749e 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/app-text/hnb/Manifest b/app-text/hnb/Manifest
index 2e4e83202df6..8d36266df643 100644
--- a/app-text/hnb/Manifest
+++ b/app-text/hnb/Manifest
@@ -1,6 +1,7 @@
 AUX hnb-1.9.18-flags.patch 2527 BLAKE2B cdfd66a4907d3431bb704f4f4b922543b2793cf6a1156e54ec363279a8771ab819340c6537522004f362371a7e410a4d68eff8dd1cb9881d0996969b9abc705f SHA512 672e8836a0766d0b922359572aff8319aa701a10863fb618bcd74c52980303d0e3158f3de7ca50cb05367296c7121c510a4e900d60721dee33b4e657a8a07e5a
+AUX hnb-1.9.18-fno-common.patch 518 BLAKE2B e92840f441129d0aa74e0b4fc965fffac52de7f381c439b8f853a3318b16c18ad918d12825564fd24cca9debdf368eb8a66c944d9f956d8acf70f78d82073610 SHA512 b61134e3790c204c153c3d12b602254ed196ba84b385e65a8b8da70c56141535416430bd988183e30a95108ac64cbd0af36e0f9f16a1ca13af7bbba936483734
 AUX hnb-1.9.18-include.patch 244 BLAKE2B 68ca79ccfd2f3b282d0d0f2ab7f633caf82b1a7e7c67b403a766db7a45365dd3f3ff0d25dd4d2ab496eebef4044688045f54e0e1f723b721616b34a59968c775 SHA512 5fa1b46221068885d9d2e2bde2f647c9f6756173af2f6568e4f32a00f64d6d753ed2aa2b841f7c1206afbd3d6af849bc374e8a29e84d2140c68cfa6627f4cb62
 AUX hnb-1.9.18-printf.patch 216 BLAKE2B 446e1d5338509fd67726c663c68ee5dda70d20777ebc6344224377acf36edfc6b57e60c7490a059991a7fa08e3c0e4b928f55f012e0b3e580bf14686cde50490 SHA512 2638a268020ca55619be92921698e82d540b1f7bf75af3014339ae7e5f674e9f28e3618bd195f0e946f5276c0c2464e2336883db90af2036d2b356f1c9680e53
 DIST hnb-1.9.18.tar.gz 166043 BLAKE2B 9d4257a4b76fb1458ed5df2743997bdfa416faad9ac328693a636250c0f3c8bf9fe6244436c36a4c5efaec254da1d89afb5e5d1afc8c438309851091530a43cc SHA512 9919a5d6512b6da3d19cc8efbed21d4452a2f6a343a38758c36728f73415b6e8ad57e24ff3eec17eb4e1e53b458d579c165ae1ad906f5b75f2fd42897159a30f
-EBUILD hnb-1.9.18-r1.ebuild 794 BLAKE2B 3b834f83848265dd3137dfc8c0c2ece75f9c5c734a6bf6242d7ff2285f5d11ca1ecb5b550066dd392b3399fc04137eb4f40997f48f8241727496743f67f83ee0 SHA512 642fde554203fa300e8b883a8580a85207d0ad34e4c5382f90ca5f79f9152a8c8bdcfb376b7211ecf6f0618fb7eb0b79e277cb04c75ca9c39054b927afa8a833
+EBUILD hnb-1.9.18-r1.ebuild 833 BLAKE2B 717b47e92a3e23b0d9f7e0bc9f5215a16e7fc7fcd7951754c0e4f5b29062d450f0561b5985e275c076c6537e37f0f5bae284663ad7dadd0d6035ce32edf1cbe3 SHA512 f2ca0899f1c3f0a832ecd8bc3c77bfffec5e6bdf33ce33d2be619be6eba5a2a685e1ff1cdadb58e287eeaaee7b7765ad7f74b44ea26941f95008d9e9051dc0d8
 MISC metadata.xml 521 BLAKE2B 763dfba52975b9c55ad9b91ff304dc5555d60e4d425f0349fdb8ca475368956b941ab0a771019943628836fc2a7c68ffc63b329922b6249c04891084fb5bd53f SHA512 109d368df00aef9bb47380f20afb9695a877425a557ff188d16c37037160c6342cd6533f858ca224d197ce1b4c21e7b456584753de264e412d0b22a3cb16d903
diff --git a/app-text/hnb/files/hnb-1.9.18-fno-common.patch b/app-text/hnb/files/hnb-1.9.18-fno-common.patch
new file mode 100644
index 000000000000..89a4321c4144
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-fno-common.patch
@@ -0,0 +1,27 @@
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -38,6 +38,9 @@ extern int hnb_edit_posup;
+ extern int hnb_edit_posdown;
+ 
+ extern int ui_inited;
++extern int nodes_above;
++extern int active_line;
++extern int nodes_below;
+ 
+ void ui_getstr (char *prompt, char *datastorage);
+ 
+--- a/src/ui_draw.c
++++ b/src/ui_draw.c
+@@ -39,9 +39,9 @@
+ 
+ #define KEEPLINES 5
+ 
+-int nodes_above;
+-int active_line;
+-int nodes_below;
++extern int nodes_above;
++extern int active_line;
++extern int nodes_below;
+ 
+ static Node *up (Node *sel, Node *node)
+ {
diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild b/app-text/hnb/hnb-1.9.18-r1.ebuild
index a38796bc73be..2c262725c22e 100644
--- a/app-text/hnb/hnb-1.9.18-r1.ebuild
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A program to organize many kinds of data in one place"
 HOMEPAGE="http://hnb.sourceforge.net/"
@@ -13,20 +14,22 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-include.patch
+	"${FILESDIR}"/${P}-printf.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
+	default
+
 	rm -r ${P} || die
 	rm src/cli_history.o || die
 
-	epatch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-include.patch \
-		"${FILESDIR}"/${P}-printf.patch
-
 	tc-export AR CC PKG_CONFIG
 
 	# bug #532552
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index 8d7a48238e85..e3d6d0cab946 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,5 +1,3 @@
-DIST pastebinit-1.5.tar.bz2 42941 BLAKE2B 678df7f2e77cc832fc9e152fb451538284033d181d9165b1a1194b254ad08ca1ac3e4612dddf7db6c62c1c3c59265ad94a78cc6df9457565264864ab06bff00b SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099
 DIST pastebinit_1.5.1.orig.tar.gz 51448 BLAKE2B a5cfa13c770e234d6e08d4f0b662c09398a5f20ac4e3f7c10ab086261923851239a3e6c1bda78ba6ba810f95cd90e6517b74aa41c5b5e3d50bca5b8c100aa594 SHA512 02b7faa54862d240eac3a8edaae2edb895cbb476cbf89dc71514a5a0a42aa2b0d26f07e5485627d1deb61f62e37018459e4d072bd4aacc886f259fced35e352c
-EBUILD pastebinit-1.5-r1.ebuild 1365 BLAKE2B 2584e030f5112247f4e7404bf6d74626835516649ad7db475b41614f5c0f70356e3f432cf15c86c34daf5709efd6bd84f1308d7b80805f81302014fbe0c3c518 SHA512 e5eb33ac611d75a284009fe64548d7e506f89b297ed02400801292c250da872565f41c9c7eeb5f5d47f8bede51168530940e690fbdeefdaf2d96f7735b5e7c49
-EBUILD pastebinit-1.5.1.ebuild 1339 BLAKE2B 5cc202fcf0b755c095a9339c6b65d6d1f651009e2e565f955b32eb928646482cc702f128880cfbab2468ef1b03f91c03430a9c385b4b4419e39838b1c42e9a46 SHA512 83447d75f08febaed3d832df88fd26e6073581afc894a6e498c0e380a370fbeee185db74577bbb2621763d02fefecb4e24249d12f1a77b943e28966f8a167af4
+EBUILD pastebinit-1.5.1.ebuild 1337 BLAKE2B 1d42bf7cc5d865d0a05e08f8e2e8bda98e5dc890060d4846fa83b604eed8a199586037f783a5fe5e48adecee63893d417ff0535057b47d983d8f8dccad689a9f SHA512 923d2915d80bdc81f4736d4cf776c2fdcab4bc51519a5d81e2a919f7e849d15e8192b2e2482c26c85797a704853817f6a5feff1d0a4971579d71182f2db583b3
 MISC metadata.xml 326 BLAKE2B d50cef7d0035889868a74b6a2794648129bf06b854208dc28eefe82251c2c2bb4562d19103a6abae51e3f40afccfd901a4c1e2ed8bfcf9910fa99d9543b069c3 SHA512 cd582b088098d0163e91ea17e6b4fa2fb5b816e44590ff8f159730215d9b8118b747b43fdcb9d7a6cad3dfbfbcd8d8b6e29cd509b7a9d6e3b860c77c4ac10c4c
diff --git a/app-text/pastebinit/pastebinit-1.5-r1.ebuild b/app-text/pastebinit/pastebinit-1.5-r1.ebuild
deleted file mode 100644
index 753ef0c0f1bf..000000000000
--- a/app-text/pastebinit/pastebinit-1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit python-single-r1
-
-DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
-HOMEPAGE="https://launchpad.net/pastebinit"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="crypt"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-	')
-	crypt? ( app-crypt/gnupg )"
-DEPEND="app-text/docbook-xsl-stylesheets"
-
-src_prepare() {
-	local mo=""
-
-	for lang in ${LINGUAS}; do
-		if [ -f po/${lang}.po ]; then
-			mo="${mo} ${lang}.mo"
-		fi
-	done
-
-	sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile || die
-	sed -i -e "/#!/s/python3/python/" pastebinit || die
-}
-
-src_compile() {
-	emake -C po
-	xsltproc --nonet \
-		"${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
-		pastebinit.xml || die
-}
-
-src_install() {
-	dobin pastebinit utils/pbput
-	python_fix_shebang "${ED}usr/bin/${PN}"
-	dosym pbput /usr/bin/pbget
-	use crypt && dosym pbput /usr/bin/pbputs
-	dodoc README
-	doman pastebinit.1 utils/*.1
-	insinto /usr/share/locale
-	[[ -d po/mo ]] && doins -r po/mo/*
-	insinto /usr/share
-	doins -r pastebin.d
-}
diff --git a/app-text/pastebinit/pastebinit-1.5.1.ebuild b/app-text/pastebinit/pastebinit-1.5.1.ebuild
index 85be87748015..ff6bd37dd9a9 100644
--- a/app-text/pastebinit/pastebinit-1.5.1.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="crypt"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index e34d90ee51bf..a0271ade2180 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -3,5 +3,5 @@ DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f924
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
 EBUILD tree-1.7.0-r1.ebuild 1073 BLAKE2B e3560608b4163160461ad68b090f2c572f5cdc261064ce8316d9dcde7f26dcd54dad5ec9e49a7adb30cd76320e970c28c8cfc1da86a28fc544f34c0218f9e94f SHA512 0aa47789f61b067dc8191b3193dc402019df557693565bca63e6c3bc774d85c203ddf2a1ba430c7e23ed7164bf44a647261f9912df9b2596fa492f475d067067
 EBUILD tree-1.7.0.ebuild 1057 BLAKE2B c95e3fa8698e8630923688de312f104dbcee472ce6acd4b6c4f055e44d8c4942fbd43510b48d06e54db65ce550eb936bd2e61f3f3ae44e06df8716cb47acbb08 SHA512 7109d3b42d21f02b99bae7ad5cb5970907152a6b8a768a3a3016fed1f392d19b721c3b0ff3e54d8d877834543818ca1a139d21f4a34607b77c42c5f6e735f293
-EBUILD tree-1.8.0.ebuild 1043 BLAKE2B 9f63a79474432a7e187e42b22f76b6533d51a0495f8d14ab66b59a1ab06873bfab27b8fea174f8933f4dc6853aa75315705db0be7547b318b92f731f3511385c SHA512 1a4eab036c14b6d0290b34223513c45289abf820d6c39df0d5b4f383c7521746eaa80a1a620df96ee2657e8cbe670ba5310aff97ab1c2e426acb6881ee70e806
+EBUILD tree-1.8.0.ebuild 1041 BLAKE2B ece993680e9263a6c1e93c0ffcdd7a508c2a05ad3e3e7f407930efc84557f34f238c94c6ec64bb76b4180a889b507cd7ee7ac0e91481d9282bf851b739d71ce3 SHA512 491aa6dfd716f70796e18b8a01c1b63b69fee860c6aa6a005a9ec283603b7d848d68e76b34a1e51c6eabab968ca4218fdae5b6ac868e8a937eafd6fc21146154
 MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index 030b3c49ba8e..b862f8493c38 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/u2ps/Manifest b/app-text/u2ps/Manifest
index b3fb2df7dcca..7599178a5ae2 100644
--- a/app-text/u2ps/Manifest
+++ b/app-text/u2ps/Manifest
@@ -1,6 +1,7 @@
 AUX u2ps-1.1-nostrip.patch 579 BLAKE2B 0b76323c430eb56730dc15540424d12ddc509b0dbb4dab2a58a2bdd92d24952d95527faa62d39d295c3eb90f90403ce9fbdac6ee0791c61b021dea8dc4e97ab5 SHA512 8b45c626f439c7f72be092a310dd105bd1348185ed4c2bea05b084360b4b5f01cbd7cc6a2b1b3b9e8510bc1f1cc4feca429b0347bbc7a9c40694cb78af4391ac
+AUX u2ps-1.2-respect-ldflags.patch 337 BLAKE2B bfb1dcfeffe9bef0fa201fa71679e5c63a114c4fbcdecae249da5fb13d8600fc4acc101e6a32a9caab806dc2bfc4b14e73ca14fda478f12f5cd929c24ba51ca3 SHA512 e967f92c06a30a490604efaedc681d4156acc8dee8ace9e73bdc75b693f8a74dfe1ddfa6261c5c0f1dc3e9661868c7085518dd65cddd2ff6c93e4a2f98fb14c3
 DIST u2ps-1.1.tar.gz 110892 BLAKE2B af0dd92d47a8530e8434983132c3bf0f0e6b88ff14cc9d7e73e95c842b4c1dad1b900d91c22a34c8f94373e62382841329e5b2e6b3aa9b51f6e5d6d6d164b596 SHA512 44a470268aafe7b90c17e14a15864924d0ba78b0c8707b9bf076e13b262a9d43d71b6527c5a995f82741e52fe2d07eac6a2626921e7465127a57405d4b5babd3
-DIST u2ps-full-0.8.4.tar.gz 5496922 BLAKE2B 416a206b768328cf1a268b4706578610e6bed45ee7475d52de515e112e51bbfcc777b2f21603826d52da42b9c6a3bd10dd4e95920e77c14e957ad4a6d0888984 SHA512 31e5c22163a934a3e153ec95e2e5dd94ce79f71a72278a386a6446b1dd053161c896344c51b696c37d838eb3f06fa6fe1db6b5daa55812a06467b2525266363e
-EBUILD u2ps-0.8.4.ebuild 871 BLAKE2B ee76a71dbfe790942e74257ec4bba30340b4576892424c032b3b02370b83b2f77dd4f0d6552e7b38d5271bb3ef530e9a1064716f82f8de767afe185dad67dc2b SHA512 eacaf727800f1b06376980ce822a5c059633645b41609254a8134d4deabe6f82acb1027733f056515c12a8d80c8761ae5668ba6e627f761e28c56a6050255b45
-EBUILD u2ps-1.1.ebuild 684 BLAKE2B 1d0fc4e2589e66744b61242c549ef6d650fbcb8e5ddd6c7733b0b3ec4dfd18442b7c56ae8464ba825d05996bb07ba5fcd34614a06844e47cef26126ace7685a6 SHA512 f56ebd5ef238898e355e105d7498e1f78034501a6a2ecfa4adab3b45d399ddaef8a1bdd71d814f9b75119c293b8425a816a9268aad29045aa1ecbfd1acfba1ee
+DIST u2ps-1.2.tar.gz 110917 BLAKE2B 223aec319d36191032e45a73d9053a970ef76c780c9260e3d6a3799c24f80eb0bddd645de87806570844c3e4e763a2eb1929d44bf122daeaebcefd711d61d35d SHA512 3c5c12b50b6d2d50c67a1051375aeb4cfb32a2c8c898837313ac7ff4a11f30c4625f71f77203f7b1367b1ccdb9143a1106b99deaef8f964af3d08336ce686198
+EBUILD u2ps-1.1.ebuild 683 BLAKE2B 03ac72e425c30bb34bfdb9b790b16a697545f51f5d152203f9eb64bb05237e3ec0acaf4e18a1b4935ce8d2fa0020ce185c9ac8b9828710453ed1080b345ed512 SHA512 65d1d3dad868a2bbb3c3dba3fdf5f9037b3a301157f943ba087e8a0733e8447def370f04fdb866231c1b77d4308a8e06551f8bdbc3a2eab2ce88ebe75a7faea4
+EBUILD u2ps-1.2.ebuild 816 BLAKE2B d0a0aa4587135beb17b032c2c6b83881e4f38f9e7eb8d4c819057e26f367a4b08fbdf891b97bbc1ccbd779425b2da09bd23ef39f6c18f571ad051b4cfb4891ef SHA512 e69458dc9c28511127052b3514bf29a192be743ad3415c96b9464fb7ea860d0b8e79af1b0a8cd18d16844bc55c1e0c721a6fba21a2a64cf3a955c83894b71b8e
 MISC metadata.xml 249 BLAKE2B c8d28416ba97bac363e00b75508b255979d89984b4b053fb86e63deb2070dc32a4a363e5594e4fcf4a4c33268fd59e5e4d3c962087c7cd97e2912a6d62f0cefe SHA512 23e993b72c46792c1d03d216adc82fe8392b7b695187308ad3c5b181da2dbd9d1f68b884c60429e3bcae79693112369ef84a02545aeda90460aa2504b4057d5a
diff --git a/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch b/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch
new file mode 100644
index 000000000000..a9d4ac5e1ebf
--- /dev/null
+++ b/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 8a526f0..88b90b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@ u2ps: u2ps.o u2ps_opts.o u2ps_data.o u2ps_file.o u2ps_page.o u2ps_pswr.o \
+ ttf2pt42: ttf2pt42.o warn.o
+ 
+ %: %.o
+-	$(CC) -o $@ $(filter %.o,$^)
++	$(CC) -o $@ $(filter %.o,$^) ${LDFLAGS}
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/app-text/u2ps/u2ps-0.8.4.ebuild b/app-text/u2ps/u2ps-0.8.4.ebuild
deleted file mode 100644
index 62fbac22b42b..000000000000
--- a/app-text/u2ps/u2ps-0.8.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
-HOMEPAGE="https://sourceforge.net/projects/u2ps.berlios/"
-SRC_URI="mirror://sourceforge/project/${PN}.berlios/${PN}-full-${PV}.tar.gz"
-
-LICENSE="GPL-3 GPL-3-with-font-exception free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/perl-5.6
-	dev-perl/Text-CharWidth
-	app-text/ghostscript-gpl
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}-full-${PV}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--datadir=/usr/share \
-		--mandir=/usr/share/man \
-		--with-perl=/usr/bin/perl \
-		--with-gs=/usr/bin/gs \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake
-	emake man
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc README DESIGN
-	doman man/u2ps.1
-}
diff --git a/app-text/u2ps/u2ps-1.1.ebuild b/app-text/u2ps/u2ps-1.1.ebuild
index c28a8ccdd0aa..e8d7cb002289 100644
--- a/app-text/u2ps/u2ps-1.1.ebuild
+++ b/app-text/u2ps/u2ps-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="app-text/ghostscript-gpl"
diff --git a/app-text/u2ps/u2ps-1.2.ebuild b/app-text/u2ps/u2ps-1.2.ebuild
new file mode 100644
index 000000000000..b26e759a2a62
--- /dev/null
+++ b/app-text/u2ps/u2ps-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
+HOMEPAGE="https://github.com/arsv/u2ps"
+SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-nostrip.patch"
+	"${FILESDIR}/${PN}-1.2-respect-ldflags.patch"
+)
+
+src_configure() {
+	# this isnt autoconf, so econf fails...
+	tc-export CC
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}"/usr/share \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--with-gs="${EPREFIX}"/usr/bin/gs \
+		|| die 'configure failed'
+}
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 8646ed317c8d..39752269af4a 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,4 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 886 BLAKE2B 6c3eba64514a8d48d3c681c56e1af19d05b002b3f9695adb806a1ace888bb138e56939666bd006af052845b02fe6e15c9112d32d8f362c3ce3cf09cef0d06332 SHA512 b1928126854f4f2f1cf609b30d94818c72e90897aea2bb5df93afe70e408ad5c7e537c492b9535dc7759023cd8c65f0f992089b603a7a59ab88ccb9a0361ba2d
+EBUILD wdiff-1.2.2-r1.ebuild 881 BLAKE2B a8f97ed114305cfcb840271cdf86485c587e78c82bb8a6748f5a57e0e100b77d467abac66c422e462c8dbc0a6b12968865a2702eab1e25daa999d49c9ad2413a SHA512 88be8fd876c957f39105b950228830634c11e531dad5e9e1828bc1300c23072b63c216b99a90aa40a5b6cfa03b15b90af59af312c44b3a2026ebe7065f121878
 EBUILD wdiff-1.2.2.ebuild 851 BLAKE2B 20168eee855349d4e7a5058b1b8e93ee39bc94231856598a6729db90b41e034c69f1b92ddce2f88d32b57d2da0e1068084ee82352d9924e68a4901901bf6f04b SHA512 2fe11c3f47e3a20ac3b265738182d607cbbbee88629257d288a2a77d97c9249abf5f3523fa19cb2a3799c290854c69f069d7e2efe9e6f99408fb00be3e8d9d57
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index 376f5b78c211..7c8054b50458 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index e79a7c2de877..a2c22d11f588 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,4 +1,4 @@
 AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de245213307b154c8c9f94a4f37b952b7509b7768df53459b1724b91e43bdde3ddb4cacf070d02c4a2dfdf33cbce7cff240c5ec7bc SHA512 70e9b77b5e4eef7a790973737be5c330443ae5eb4f54ac7a706e1404073a3568e0dc42eee1084ae5c4fdecff3384d22ff4666f2b0b24d6d28cf5d66ba3094612
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
-EBUILD wgetpaste-2.29-r1.ebuild 678 BLAKE2B 5f24bbc9ad8872c64496427e9ac5b847a68820042b392f39cabf71cd8152616ddf15b61d2a78d702bbc63949dd583d8dee3190812d70e9fbf4dcc4ada3a8535c SHA512 0d3ee7a7ffd77734719fed157502a6e09786a08fc8812d8021ca23acfb4c2af8bd67c2cd57c6980cd22ec184a7b9fd71bae1d164c40105478572d0ed2f7e846b
+EBUILD wgetpaste-2.29-r1.ebuild 689 BLAKE2B 3f803efebbe86ace4e41a78f358d820f2609f534b6b976cecebef1223754be95ec1301f4c7d03e50579a7a2e7586f7092deab40a224a660a2c2c86b38ea8ec81 SHA512 4818b22025d7b3e985479596558a3832371df3df2e5f9862c08eba3011d3bb022a87c3131ac6e421e99381a3bfb09468be133394e1b5470907f21396311bae13
 MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index 0c181457c667..664406626a3a 100644
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ssl"
 
 DEPEND=""