gentoo resync : 13.06.2020

21 files changed, 45 insertions, 205 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index d6285f3e45cf..b91118bff258 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 2adfef682d4a..ea3a5bebfb6a 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -403,5 +403,5 @@ EBUILD bash-4.3_p48-r2.ebuild 5617 BLAKE2B 5febb079acc827cab20644f938f9b2526fb6f
 EBUILD bash-4.4_p23-r1.ebuild 7255 BLAKE2B 6d846ab53a56395d1bf40cac1f9b1ce9e5344851b78001ffbe57270c6905427f9413291342a33252e6d531c0d2ab4bf00def687e1abcb8208059ebcde2752c2c SHA512 bd66490f6982d689d6879f1fc8cf216e575a367da619b3ebc6dab1cdd9d476b739633c4cbceab609d9dd4d6941a9ca72cfad3b9d0a6946346b215f78026bcef9
 EBUILD bash-5.0_p11.ebuild 7312 BLAKE2B 3805c5443aa6774976a465aaa83690eb851d480484a1ed484fa87bee973e883a4b9ff85d276492110dab74cc82b138ed1dcd6c7cee4a7db42bd1e03ee405d6e4 SHA512 8ffde7c61d201159ba776232f54d6c8c2562dc96f86a6861581ca9b7c0f6c83ee571030236c064e2ebb89c3620e476f8ded95cf45760675f601bf79900a473c6
 EBUILD bash-5.0_p16.ebuild 7312 BLAKE2B 3805c5443aa6774976a465aaa83690eb851d480484a1ed484fa87bee973e883a4b9ff85d276492110dab74cc82b138ed1dcd6c7cee4a7db42bd1e03ee405d6e4 SHA512 8ffde7c61d201159ba776232f54d6c8c2562dc96f86a6861581ca9b7c0f6c83ee571030236c064e2ebb89c3620e476f8ded95cf45760675f601bf79900a473c6
-EBUILD bash-5.0_p17.ebuild 7304 BLAKE2B fcfc64bd1b9a6a4dd324d87c9a411a8a2ee2bf541ec64ad59a192068e40b8f3db13d2ee818c287cc8bfd4b035ee65fb207c2c2f9a02bc734179ae389cbcd2fe3 SHA512 ef7c9b35634c079f581b54b292ed25d19371b7892c15653f278d5cc08ee81d35bf3d959722c181f314b0d5948e2dc9e90e0afa43bfce351a8759135a71ffa8af
+EBUILD bash-5.0_p17.ebuild 7303 BLAKE2B b2444276a28b999222cd9010dd59969a0f0d82b688813c93a122fed323653e5e816ca9d5b59e064f25b089732c41fa00d075f80e0b423147c08f93f736e4e75c SHA512 5c8280ff54b2c1ae1b0b16e56c898ea41bdb49cd8d2dc89806c6b878d9f43cb7a4c7d40d2793713fe21f90f0afc9613f28a0dd767824963c9893879db438e722
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-5.0_p17.ebuild b/app-shells/bash/bash-5.0_p17.ebuild
index d3ec8df9e06e..c40437fdc3a0 100644
--- a/app-shells/bash/bash-5.0_p17.ebuild
+++ b/app-shells/bash/bash-5.0_p17.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 91064b1127bd..d42eb49a4555 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,8 +1,7 @@
 AUX dash-0.5.20.2-gcc-fno-common.patch 1131 BLAKE2B cce4ed8a97d95e294aa7679c0ef164337a836ed9f0b7e18b38a6032545796260eba8c7502817e57bc5948aadb74b9826eb7cb5b02e66cdb954e35a5ed762f460 SHA512 6056f196a353f382b97c6865e89dbc5a63295c404fc9be83551b1458e2a42f93786ec3d0b7dac1b674b40b59e90cd968d6f1e9e0c8ca953704f4de8bb9251cbb
-AUX dash-0.5.9.1-dumb-echo.patch 2592 BLAKE2B 95e79281e579d0d40e320f0433fa94185f22e971a2e5c6b8a7686e96479a490c2d7820545875de2bdb81f52f7ce0b7ea0811a207c41601d7e2272c0829f07d14 SHA512 8dcbee6a53b46b78986c17860f84f47c94b3137b84cf46cd521ec9e4f0b5b4f5a2afbc9e7faa8130b591b3a0f9d2c9dc7853803c8b092c4ec1b5c5b7411fecbf
 AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6
 DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
-DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
+DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1
 EBUILD dash-0.5.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
-EBUILD dash-0.5.9.1-r3.ebuild 2097 BLAKE2B b0b5217070496dba9ad28d466a20ec60d7e215ce08d232dd709a07db513d43734b4d82f551c14b4c3793555b4c0d6dc7e1cb2dbe9c1bf0db28b320b8408c693b SHA512 3fd4a0426acd6a10011c248f415e9c206fb027b18a83c7eab4d4c049ef50ff034e3a7f3c5def9b11dd4ec0b3d0f9a7121764606d5820e351dd0e3348fc902cdc
-MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6
+EBUILD dash-0.5.11.ebuild 1494 BLAKE2B 1d49135606a56d499170d54ada356dccd2cc0ca40b2aa701ead2cabf1e7f09a53eb3af44e6dab5ea371a6032e74a2690bab9da6c2e9ce9d28a276ad94245928f SHA512 bec31e98044899ef233c5a082c9d480a5e6a1e19f7d850e3528d21167c4b8e52285a8f4ccc14ceabaa00a41d14b6db915139bec302f77caa50e5be73434bcdd9
+MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.11.ebuild
index 4463f80ecbca..1bd542ff8270 100644
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.11.ebuild
@@ -1,43 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs versionator
-
-#MY_PV="$(get_version_component_range 1-3)"
-DEB_PATCH="" #$(get_version_component_range 4)
-#MY_P="${PN}-${MY_PV}"
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Debian Almquist Shell"
 HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
 SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-if [[ -n "${DEB_PATCH}" ]] ; then
-	DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}"
-	SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libedit static vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit static"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch )
-
 src_prepare() {
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		eapply "${WORKDIR}"/${DEB_PF}.diff
-		eapply */debian/diff/*
-	fi
-
-	#337329 #527848
-	use vanilla ||  eapply "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch
-
 	default
 
 	# Fix the invalid sort
@@ -53,24 +35,17 @@ src_configure() {
 	# don't redefine stat on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		export ac_cv_func_stat64=yes
+
+		# if your headers strictly adhere to POSIX, you'll need this too
+		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
 	fi
 	append-cppflags -DJOBS=$(usex libedit 1 0)
 	use static && append-ldflags -static
 	# Do not pass --enable-glob due to #443552.
-	# Autotools use $LINENO as a proxy for extended debug support
-	# (i.e. they're running bash), so disable that. #527644
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		--enable-fnmatch
-		--disable-lineno
 		$(use_with libedit)
 	)
 	econf "${myeconfargs[@]}"
 }
-
-src_install() {
-	default
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		dodoc */debian/changelog
-	fi
-}
diff --git a/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch b/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch
deleted file mode 100644
index cbf5febafd19..000000000000
--- a/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-http://bugs.gentoo.org/337329
-http://bugs.gentoo.org/527848
-
-there's no requirement for `echo` to support escape sequences. bash, by default,
-does not, while dash always does.  POSIX permits either behavior:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html
-
-however, since the behavior is not portable, no one should be relying on echo
-having any specific behavior.  they should use `printf` when they want an escape
-sequence.  it also makes dash smaller & faster to disable this logic entirely.
-
---- dash-0.5.9.1/src/bltin/printf.c
-+++ dash-0.5.9.1/src/bltin/printf.c
-@@ -449,21 +449,12 @@
- int
- echocmd(int argc, char **argv)
- {
--	int nonl;
--
--	nonl = *++argv ? equal(*argv, "-n") : 0;
--	argv += nonl;
--
--	do {
--		int c;
--
--		if (likely(*argv))
--			nonl += print_escape_str("%s", NULL, NULL, *argv++);
--		if (likely((nonl + !*argv) > 1))
--			break;
--
--		c = *argv ? ' ' : '\n';
--		out1c(c);
--	} while (*argv);
-+	int i;
-+	for (i = 1; i < argc; ++i) {
-+		outstr(argv[i], out1);
-+		if (i < argc - 1)
-+			outc(' ', out1);
-+	}
-+	outc('\n', out1);
- 	return 0;
- }
---- dash-0.5.9.1/src/dash.1
-+++ dash-0.5.9.1/src/dash.1
-@@ -1182,43 +1182,15 @@
- option turns off the effect of any preceding
- .Fl P
- options.
--.It Xo echo Op Fl n
-+.It Xo echo
- .Ar args... 
- .Xc
- Print the arguments on the standard output, separated by spaces.
--Unless the
--.Fl n
--option is present, a newline is output following the arguments.
- .Pp
--If any of the following sequences of characters is encountered during
--output, the sequence is not output.  Instead, the specified action is
--performed:
--.Bl -tag -width indent
--.It Li \eb
--A backspace character is output.
--.It Li \ec
--Subsequent output is suppressed.  This is normally used at the end of the
--last argument to suppress the trailing newline that
--.Ic echo
--would otherwise output.
--.It Li \ef
--Output a form feed.
--.It Li \en
--Output a newline character.
--.It Li \er
--Output a carriage return.
--.It Li \et
--Output a (horizontal) tab character.
--.It Li \ev
--Output a vertical tab.
--.It Li \e0 Ns Ar digits
--Output the character whose value is given by zero to three octal digits.
--If there are zero digits, a nul character is output.
--.It Li \e\e
--Output a backslash.
--.El
-+No arguments or backslash sequences are supported as they are not portable.
-+They will be printed out exactly as passed in.
- .Pp
--All other backslash sequences elicit undefined behaviour.
-+You can replace `echo -n ...` with the portable `printf %s ...` construct.
- .It eval Ar string ...
- Concatenate all the arguments with spaces.
- Then re-parse and execute the command.
diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml
index 0d01a34d50df..096fcd3509dd 100644
--- a/app-shells/dash/metadata.xml
+++ b/app-shells/dash/metadata.xml
@@ -8,9 +8,6 @@
 	<upstream>
 		<remote-id type="cpe">cpe:/a:dash:dash</remote-id>
 	</upstream>
-	<use>
-		<flag name="vanilla">Support echo -n, and enable echo -e all the time (unsupported)</flag>
-	</use>
 	<longdescription lang="en">
 		DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell)
 		and is POSIX compliant.
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 0c9dd570f764..ed124557af99 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -6,8 +6,8 @@ DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c21
 DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
 DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
-EBUILD fish-3.0.2.ebuild 1655 BLAKE2B fe92bb0efdfff55487758ce2729199743cf3ef7a00509178098a785d8dec6368e02fc18fe978ea403f0987b3ab7cf5f6adb948bd24c668c095205477da2f1ae9 SHA512 9ea057a38f500a0645bbd819c102501b308e5634e05dada1c5a976465327e958546b2b6695c7b3c39716c513bdb507faf499f1a48917c713d8f062d81701fda2
+EBUILD fish-3.0.2.ebuild 1662 BLAKE2B 803c662cd6cda8a2cc4b17d69fac6d89707770c7aaf140acebffda40f690d90f38a253424db4ea19fcea155f0d6e49d6bd92495fade96b750b1d451a04f57903 SHA512 e51b71e0a7bbbcb54a50dea245facd141bfc6e07e5d45199dbad5e2e1a6747b16a5f269b55ffafeffdefa0227c29c39e3b0b039eabacaae700476b14fe9fac09
 EBUILD fish-3.1.0.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570
-EBUILD fish-3.1.2.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570
-EBUILD fish-9999.ebuild 1577 BLAKE2B aa41c8e8271d32267c94e09e7879f80e70fdbbd0007bcc4f0031f375189310448f6492e607e3ac8b39792372ec5e83c98fafecffb6170c60933addf843cd3bec SHA512 f18c48e2200f6f4837d9f572514181f13598a3b4681b7cd2d994793845f858751be475fa02105eb2266b4b924ebdb048a146f56d92738613450e2a136c82d775
+EBUILD fish-3.1.2.ebuild 1571 BLAKE2B 91cf51764d5969c2d941612b5f74456133de08c4ab101e38d80d2169da6661e5711ce449edf677106bfdb55a75a75549efbea36673dc0b11384a10c137819391 SHA512 b8b956ae839cfec8acfece28ca1b6b9b8cc9875112f27a728ab32f7d3b1a929ea9044f0e3dabf3723683c92309b6e2e56cc04638f1e74741de0da4779b19e68a
+EBUILD fish-9999.ebuild 1591 BLAKE2B 1133b6360cbdb5e3ac7d4c8ad799bc14dfb6590829535345ec69159abc46a52e7ad1192ed371d05d91dabad83ca78108de2a86d10ab65097faba70f849516703 SHA512 62c2e273b74443551ec12502c5fc1f2246e49229ed32a919ffcc5f9f577fd47654c58746b5357bef198f105ec84fa360fed764a88af5a8c05b2a9b1bcbcebe89
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 74c634df070a..03142f16ead5 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fish/fish-3.1.2.ebuild b/app-shells/fish/fish-3.1.2.ebuild
index 77f6617e11c3..41f05f29b640 100644
--- a/app-shells/fish/fish-3.1.2.ebuild
+++ b/app-shells/fish/fish-3.1.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 44df9a8565df..34e66d1137bb 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 4fa0603da623..9a97dd32af73 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -47,4 +47,4 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.zip 287793
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 EBUILD fzf-0.21.0.ebuild 6476 BLAKE2B 963c8c04123e93eb681e3f9bfc1e50f2636f1b89710623c2c6d52d21107369050455b356c53ab7d74c9ba6fe760f0665da7b4d1d774c842957047d701269c5e8 SHA512 3112aea2d3289b0450d11d6a3f40d29fbcce9d6ff1d9dc14cb6a48d43990c98572bf33d7d675f3e3ca31770938cde0758b73f7bcfe4fb3d476d9ea2c4da3b490
 EBUILD fzf-0.21.1.ebuild 4117 BLAKE2B a461ff1ccb839ca31ba79e72ac2825fdf8b5ba3d7246160c1e6581c71575a0e00d1fabb72984518b677d565bdb7cc6767455093e793af2281c2a264042bc2830 SHA512 050c6952140386b356e966c7600e300e805222d8adefe027c8b18422c4805841b17aa400d490d35a125ee494ce013f510e8b7ab259ae70ef7b5f90480e03ac83
-MISC metadata.xml 1574 BLAKE2B 6e971949fbb1f63ed4b9dde31eed159d3d2d0e903120020d4e49159e0dd6d07d582c9952bfdecf727663aafe8d50397ef15d69ee4ba050b33712ef5b67619d71 SHA512 81dc9b9b9f1d597356cbecf84c12536d3467bbc8ac29a79f1aa2566078df9f344ac031efbf0d6690ac9321f4e7c0713769c4cc30959ab86284c2b0f09dcf2397
+MISC metadata.xml 577 BLAKE2B 119ae624d966298426aa682f1e018c9445063356a9c9b99513c6e1819f8ba2f8701958e36d71a48d44d7383cd2793dab779d11e2b60366d2cbf7675b00429681 SHA512 3c9936fee0571f7271fae7b4029f96a14f154d0ad1951d6f2fb32970ae9efd703217c237e1c26e3dc4555a7b16598073d13d7b8bef0421e44c4a661ba6a2ea29
diff --git a/app-shells/fzf/metadata.xml b/app-shells/fzf/metadata.xml
index 55c90b89b4ec..aec0ee8918a8 100644
--- a/app-shells/fzf/metadata.xml
+++ b/app-shells/fzf/metadata.xml
@@ -13,29 +13,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>
-		fzf is a general-purpose command-line fuzzy finder. It's an interactive Unix filter for command-line
-		that can be used with any list; files, command history, processes, hostnames, bookmarks, git commits, etc.
-		Fuzzy completion for files and directories can be triggered if the word before the cursor ends with the
-		trigger sequence which is by default **.
-		To use the fzf key-binding for your shell, make sure to source the right file for your shell
-		from /usr/share/fzf/
-
-		For bash, add the following line to ~/.bashrc
-		# source /usr/share/fzf/fzf.sh
-
-		Or symlink the fzf bash script
-		# ln -s /usr/share/fzf/fzf.sh /etc/bash/bashrc.d/fzf.sh
-
-		For fish, make sure to symlink the file
-		# ln -s /usr/share/fzf/fzf.fish /usr/share/fish/functions/fzf.fish
-
-		For zsh, make sure to symlink the file
-		# ln -s /usr/share/fzf/fzf.fish /usr/share/zsh/site-contrib/fzf.fish
-
-		Or add the following line to your ~/.zshrc
-		# source /usr/share/fzf/fzf.zsh
-	</longdescription>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">junegunn/fzf</remote-id>
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 96ad0002eb23..1b765d113362 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
 DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
 EBUILD gentoo-bashcomp-20180302.ebuild 744 BLAKE2B 79e049b8badb4ac977ac7dc2cd2322cfa22baa717d827aa3034532b017432cef76fee54feb0db7a7c54ea87b4497b5dc7d5bfb2c22a98e31d1d2991216132114 SHA512 9b4da0add28c7af16350430d37962153b92945f08406cbeace1a2b571f9df4ca7f15d96a78b54b45ac9c48ecf27b35d45effeaff4a6241333ec59a283701ec77
-EBUILD gentoo-bashcomp-20190211.ebuild 744 BLAKE2B d17a499c6ebcfdb2d79e729177880a808508dc2ea79643152161c2121fb0edea9d31c3c6e07bdef9dcc8dc8090b8a5acabbf3908fd487172a2994b03a587f9be SHA512 71a6f1fd8732d08c40dc5b9c44310e8e572b081da7522e9d4d40805c73044facffe13e5ccec6d4a2e4bfa2e3b19bfd0c47c250cc297505a1f3e710c3032ec409
+EBUILD gentoo-bashcomp-20190211.ebuild 755 BLAKE2B a3b2304d62f49d011e4c557fa197d359a379be77de9210335b4aa5b51be06077e9ba2bd63be694b822c6fcb7bfb4dc37e2bb2ea2d784ed3f812cfbf6414afa8b SHA512 27808b896acf08d17094276d6f971ffcb88438d37491d3ace2ca95b5bdcda52b4622266fb26afa6d7d6c5f7bf4b2c42ac1c728208fb770b4c8d1f34f13ade751
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 8a686b160318..8e516d4b9020 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit bash-completion-r1
 
 DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/"
 SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index ad49d0869f46..d3b598a32462 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,5 +1,3 @@
-DIST loksh-6.6.tar.gz 251931 BLAKE2B 8671b2a7b5f4d8247c8572a925a078a7bbf7e6f0ae11b9198798c66def35c5bdb5c3b39e5c37e0dcbc068a1757e6cdcb667088640c6c9a556c64a9a4c0582102 SHA512 7f5188b3f0af3167f1c5847043689a35f22d5075cee2ec4ce3ebd324a59233e89db1c864dc62a05ad036ddd541ee89c680fa82e22b85cd2c82ad32c5ebad51be
-DIST loksh-6.7.1.tar.xz 209448 BLAKE2B 812ebeae15a6a5db12439d58a58a2d0c85b324db5b0918a55e76e125c02ee94a0a773fba49b183f7b2bf6af35b0be6e5c3b976cc2761651cbbdacf9f85e3fdf7 SHA512 c8ffe19e6bd1b1ae60432729a94539503961230fa9392dbcc79999f7b402c83a51ba644c8fc2706cff071195de641ec4e0e1b550d823cad949b37fbdf0ab572b
-EBUILD loksh-6.6.ebuild 655 BLAKE2B 43e662f026305b41e36c948185ddbc88e1a6c7bb0079ca88b275f61ec0cda330b0aae325b4456a1829e5018e49c208305c6b199999a588ebd09e4084736d6e1b SHA512 a4604492b6354377003a39839dc6dae4edce00c981201e6a95a0d3f0938e838a9059c25181a029b7b91b88ddeac0a6982f01bb2a550ee617c322ee8c5b2ababe
-EBUILD loksh-6.7.1-r1.ebuild 641 BLAKE2B 56dbb90d38a9aefe788c4788926c6f47c1796b43364511cfd95fd57272c0bfd3027656992509336ce08766912e843c376bf76a6196e0c1177c0597c6b0bfdc46 SHA512 ef92665722e956b8d29c2294990593668117ba0bf18eea19cd3436974a40668eb04a44898b28ad6290fa024839f2137da5f74530adfcee0e777eaf2ca94e2d85
+DIST loksh-6.7.2.tar.xz 209520 BLAKE2B 37635721b4ed99b3a8ffd0bc6806e29e96c68618db32d8aad32e8cafb2c669ff44e0228588631478c189fb804a790245a66abe700bd78d06f3fdbd3baaa03778 SHA512 0008905c97c0d65ab246c05ddcd733925cdf2e35bc0eb09dd4301718236cab3f2682bee250e3630f3f9d801c1e20ee2db71194ac01f9ea4c2c8ff437328f5d08
+EBUILD loksh-6.7.2.ebuild 641 BLAKE2B 56dbb90d38a9aefe788c4788926c6f47c1796b43364511cfd95fd57272c0bfd3027656992509336ce08766912e843c376bf76a6196e0c1177c0597c6b0bfdc46 SHA512 ef92665722e956b8d29c2294990593668117ba0bf18eea19cd3436974a40668eb04a44898b28ad6290fa024839f2137da5f74530adfcee0e777eaf2ca94e2d85
 MISC metadata.xml 328 BLAKE2B 74e5126dbb36b09f5711c125eec5a9be8209f5f340e3e45f342dd274548ebea9ff3859b0452e999f06cececb81e6a75434ffb32e6bbdc414483d7460fd974831 SHA512 f7118cf845948d1bae282c8cecfe861802163b20ddc0ad1f7c427211dc0333471bf6e18fc807837359247fb021749c7b2b910b6233e55b389551e09429fc7b58
diff --git a/app-shells/loksh/loksh-6.6.ebuild b/app-shells/loksh/loksh-6.6.ebuild
deleted file mode 100644
index ccdbc481485b..000000000000
--- a/app-shells/loksh/loksh-6.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux port of OpenBSD's ksh"
-HOMEPAGE="https://github.com/dimkr/loksh"
-SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0="
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	!app-shells/ksh"
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	emake \
-		BIN_DIR="${EROOT}/bin" \
-		DESTDIR="${D}" \
-		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \
-		install
-
-	dodoc NOTES
-}
diff --git a/app-shells/loksh/loksh-6.7.1-r1.ebuild b/app-shells/loksh/loksh-6.7.2.ebuild
index ca44f5e3fd4f..ca44f5e3fd4f 100644
--- a/app-shells/loksh/loksh-6.7.1-r1.ebuild
+++ b/app-shells/loksh/loksh-6.7.2.ebuild
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index f86dbfc1c1b4..374971973787 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1,4 +1,5 @@
+AUX 2.7-ldflags.patch 837 BLAKE2B a1a873a898f3090dab586b968a755e1920ab20158237b9f375a9da2df18d87ba0b3cdf2f671a02ec3163f1ee95436a0c0537b2f7fccc0f8326f1fe25fdcc73c3 SHA512 85872900eeb44e46685b9a229bddd569d06d131ba4c187b44ee916a8ae1e705e10a47b87432c36d855021a0e0e3880c5fe80279a9694ac42f473a06ef3a33565
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
-EBUILD powerline-2.7.ebuild 697 BLAKE2B bbf4002244911524b210c3f051c9d5c2e2ec380fbaa3a413f9fbc98b357cc05e77bb2f5bf145d70c50630245e6f03f7dc73864b81544d09d3c0716dc29c0506d SHA512 05f969b77f3ad5033078bc79de74d6ac5b5717d18fcde20c37153aae549cc3756985f96585f11e594fde744b6e1c86ac87143826aaaa0dcb6b6e3ee715d498a6
+EBUILD powerline-2.7-r1.ebuild 743 BLAKE2B bd93e5352b00bd1bd73db6e5dc7d6ee85e0f4d30ec05e7b62d54ef79d7ba368a8d560b2d008cb6476716f19133614aea9a6eaf52ec3cd6aa126462c87d4a5bbd SHA512 c967665b40de94391df7a9e33cc20371fc7d2146865d63ec6c9bbb4a6ca0441e8bf16fd09aed8ff28451821471df7853aa8f3a21c3aaf6e4fd74a6abe49757a4
 EBUILD powerline-9999.ebuild 730 BLAKE2B 5d75497b2323d373e00df5deabaa205d6286363f4181f409e8cecaf614b0bb7ed4c3b624b61fe54f5d94c27307cdf97bd69109e8ba508b62e76a1c9693428bdf SHA512 c08cdb58cc2b88a88860eefdcc03a7894b4bf2765ff0ed23cf257c36c4436e8153ed336838c13035e21334c7571452bb48f4d098b60047100a4add9fd88b1a34
 MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/files/2.7-ldflags.patch b/app-shells/powerline/files/2.7-ldflags.patch
new file mode 100644
index 000000000000..077c28af2a07
--- /dev/null
+++ b/app-shells/powerline/files/2.7-ldflags.patch
@@ -0,0 +1,15 @@
+diff -Naur powerline-status-2.7/setup.py powerline-status-2.7.new/setup.py
+--- powerline-status-2.7/setup.py	2018-08-12 14:41:44.000000000 -0500
++++ powerline-status-2.7.new/setup.py	2020-06-01 14:56:25.977968288 -0500
+@@ -30,9 +30,10 @@
+ 		from distutils.ccompiler import new_compiler
+ 		compiler = new_compiler().compiler
+ 		cflags = os.environ.get('CFLAGS', str('-O3'))
++		ldflags = os.environ.get('LDFLAGS', str(''))
+ 		# A normal split would do a split on each space which might be incorrect. The
+ 		# shlex will not split if a space occurs in an arguments value.
+-		subprocess.check_call(compiler + shlex.split(cflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
++		subprocess.check_call(compiler + shlex.split(cflags) + shlex.split(ldflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
+ 
+ try:
+ 	compile_client()
diff --git a/app-shells/powerline/powerline-2.7.ebuild b/app-shells/powerline/powerline-2.7-r1.ebuild
index 946e4c10304a..623ac6d9568c 100644
--- a/app-shells/powerline/powerline-2.7.ebuild
+++ b/app-shells/powerline/powerline-2.7-r1.ebuild
@@ -25,3 +25,7 @@ RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/2.7-ldflags.patch
+)