gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-shells
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
58 files changed, 716 insertions, 212 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 86ec8242f4e7..467b7af22059 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 362251d84231..59910b6f295c 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,6 +1,8 @@
 AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162db2f8e35fb20d3a24f9e4c067e5297816d91a85ffcdd3ff43695f3c361959cba59b887afd0d12e75fa317899054d3a615ee3da615a4409ec SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab
+DIST bash-completion-2.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c9578104aa4c8c736801fd27c7268e4de70424eebbb5d1e4d1841273b1c4e169da4f369f2f65276349ead4aa7944aa193b2 SHA512 d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.9-r1.ebuild 4806 BLAKE2B 5d9ec27d3629f36165beb180d9d9e548c547b560e227b65b112b6cb4ff34d55f31a5d01193ed559f7c0d5beb3b95baebf37c6b9263a442865d8c2cb32f9b1da9 SHA512 150ae169e8997a01c403407b177d2ec7f34d5a6c7f422355af97e6f4a717d12fdf24431990455075b1c0d208ae344e6013e67daa1734abdb6e283cf4b3e44406
-EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0
+EBUILD bash-completion-2.10.ebuild 4708 BLAKE2B 4cbe7c7e24f1b2871a0bab43122011f4235e5d7d24837a8d22a564c59c3b76c5025466cf42b08786a509bfd9c88420ce47fa1253eb2244d009fd092013b05d75 SHA512 d7b8a08f7e4d9ddcac4429cbed68f52da1d9b7c25cba59db0a417216f4e8593eeef4634185b6628fd31ae349c8d5dd92407b43b5d2b453f381a2cdade5c38d90
+EBUILD bash-completion-2.9-r1.ebuild 4775 BLAKE2B eaf986b764094f36f1e436382d54f2064f5bf53cb0b3c05c75f1f5afc1f31237892737d8555136d1e8f05a964e527badba47f148c9db150dd2b509bde4ffb96f SHA512 c0cf334103c8ce059e94a0dcdb3b55ed4c5e4a33facdb7df515081ea366446249c0725ad21d810bf13ee9516d2c020e202e303a8709c5d5526e36ed9b684321d
+EBUILD bash-completion-9999.ebuild 4704 BLAKE2B f8386bb63850b650e953561d60c95e82e083e9bcdd14e43fc852c49b3754d13b3a44d31d78215e3bed1c30e79eca3a87be5b023fcdf1312e974bc5c8c65ab317 SHA512 1e4d789d376a85c98867f0696df3b897582cc5978641bc72abb44d2cff6e46522b501392102ced475d6f769c54ca1b491a688f746c9d04b80b6adfd02bd75fdd
 MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.10.ebuild b/app-shells/bash-completion/bash-completion-2.10.ebuild
new file mode 100644
index 000000000000..0c09bd75cb84
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.10.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit bash-completion-r1 python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="
+	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="+eselect test"
+RESTRICT="test"
+
+# completion collision with net-fs/mc
+RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+	sys-apps/miscfiles
+	!!net-fs/mc"
+DEPEND="
+	test? (
+		${RDEPEND}
+		app-misc/dtach
+		dev-util/dejagnu
+		dev-tcltk/tcllib
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+strip_completions() {
+	# Remove unwanted completions.
+	local strip_completions=(
+		# Slackware package stuff, quite generic names cause collisions
+		# (e.g. with sys-apps/pacman)
+		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+		# Debian/Red Hat network stuff
+		ifdown ifup ifquery ifstatus
+
+		# Installed in app-editors/vim-core
+		xxd
+
+		# Now-dead symlinks to deprecated completions
+		hd ncal
+	)
+	if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
+		strip_completions+=(
+			freebsd-update kldload kldunload portinstall portsnap
+			pkg_deinstall pkg_delete pkg_info
+		)
+	fi
+
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
+
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+python_check_deps() {
+	has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use eselect &&
+		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
+	# Bug 543100, update bug 601194
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+	eapply_user
+}
+
+src_test() {
+	# Tests need an interactive shell, #477066
+	# idea stolen from:
+	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	# override the default expect timeout and buffer size to avoid tests
+	# failing randomly due to cold cache, busy system or just more output
+	# than upstream anticipated (they run tests on pristine docker
+	# installs of binary distros)
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" PYTESTFLAGS="-vv" \
+			&> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	strip_completions
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	if use eselect; then
+		insinto /usr/share/eselect/modules
+		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 2.1-r90; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
index 220069bc3750..a49edc05f8d6 100644
--- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
@@ -22,7 +22,6 @@ RESTRICT="test"
 # completion collision with net-fs/mc
 RDEPEND=">=app-shells/bash-4.3_p30-r1:0
 	sys-apps/miscfiles
-	!app-eselect/eselect-bashcomp
 	!!net-fs/mc"
 DEPEND="app-arch/xz-utils
 	test? (
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index ee27e7fcf8fe..4fdb9c19f7fd 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 # completion collision with net-fs/mc
 RDEPEND=">=app-shells/bash-4.3_p30-r1:0
 	sys-apps/miscfiles
-	!app-eselect/eselect-bashcomp
 	!!net-fs/mc"
 DEPEND="
 	test? (
@@ -93,6 +92,11 @@ src_prepare() {
 		eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
 	fi
 
+	# our setup is close enough to container to cause the same tests
+	# to fail
+	sed -i -e '/def in_container/a \
+    return True' test/t/conftest.py || die
+
 	eautoreconf
 }
 
diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index ebe14a13cddf..05932909f782 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -1,6 +1,6 @@
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
 DIST bashdb-4.4-1.0.1.tar.bz2 701807 BLAKE2B 8d41a39831ce9466f5fcd205cf84e337ca7d876fddaea8b8c013fe4ac93a143c9f5b5e46bcc8edbb50fe4c77e87bd282ff9a244e41df007897d3b37f732bb0a3 SHA512 306fc5a49490fe04828cd6c64b23302e0f48ba8558780c93d45d9c615206e91dac5d8ff3d0660e50bc3204873131d1296492bccc23119d2f58c990bd3603221c
 DIST bashdb-5.0-1.1.0.tar.bz2 693459 BLAKE2B f8697c0f4a10b57215b0923cfb49c76536cc75de5273e6ed1709aaa56fcced8c5b3f281f15f01b8bd72363ad7c47acbd6d06a3bb3ba58b9a2daae017c101ae46 SHA512 0da69ea426c57d2f2b3f208356ee893b3fa8b96c68bf321446b5747b6bfb2eac502be6a01e3922fa873684a3953c6a3ded4a30f5682e4030680d698ee5062143
-EBUILD bashdb-4.4.1.0.1.ebuild 1035 BLAKE2B e6ba503594afcea73547da2b937945929285b50ba84afbb1efd5456c15a586ec792d8d7d585c692d50d8d2f733de741c69056e5b7b1173e516c4518419d2c575 SHA512 7e9d014345b909c635481975bbb1229cbfefc8440b3940507efb2e7bb65a2209a83d9960946018705de6e05ef88adf4b6ce7e50a199024b286e43ed19104bd58
-EBUILD bashdb-5.0.1.1.0.ebuild 1037 BLAKE2B 92d8611c4f984ccc50776c0f22b9395bf24ac202c7793308e64610018d19fa4fc04c552bb87209e98fdd813408651d0e64528897a12843ee20e43c0d3a0b5991 SHA512 d5adfd6d7fdf4a021b0f871103b391fc322c3b36dbdd797ca876ec740b4255e4ff46264d630e2860ca55f9a2f9c78a3ace5680de353697c4ebca2c048f592310
+EBUILD bashdb-4.4.1.0.1.ebuild 1062 BLAKE2B 51762bb709b2c6234197db4c0ad466219a7896dea92c9de7b614f1eb3a53bfc4bcb2991312b9df902d41fc3f67abccb0064846913797260a3f4b863db46bd461 SHA512 ac35a5096a77039d581d037c4857847c7e6e8aa65d447f23fc2492a9d7bba06407cbe325d30afb3889ec8f4dc456e0d0bf9a8bcb365d46df28d9303873f3102e
+EBUILD bashdb-5.0.1.1.0.ebuild 1064 BLAKE2B ea70dfbce1cdc413e11d981152d64f77e15dfd720b1f1e27bbc8cfd81b3a1b2f40b715bc39f5f97d6b2611f4d680918bbfbb12a8e4787f60e645c62074ff6d4b SHA512 a0d9696201f4e6e0672faa1a6f0f65119220dcd43be49743e54dc43435ae6faa38fc72a68ffd4c422c2aded0af3627cd4f306e794974c5bf0994285bdeffd24f
 MISC metadata.xml 333 BLAKE2B 3d15d5b1c4dc17fb6eb805020e6cacb0b835ec4113cccec2756d5b3ccd6be5ce427383598b136f9e13280452e1d9252a609671d3016fffd14ccd898fa7553ad8 SHA512 eb1b078a7e431900181f558710bba93fb5c4633733364664e85e07b4bd05c8ba7492948d4a3ac8cb4866f128b116d82b5b6f1c8b2966318fb9ed61a9c78dda82
diff --git a/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild b/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
index 2a5f481e651b..c9cb3cee1324 100644
--- a/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
+++ b/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
 
diff --git a/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
index d83f4069ad11..0448dc38e718 100644
--- a/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
+++ b/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
 
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 4feaeeac7e94..7e964277419b 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,7 +3,7 @@ AUX fish-2.7.1-fix-printf-o-handling-on-ppc.patch 408 BLAKE2B 61ca4723e06eb2c969
 AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6b6f53e28be5832285e91092f4fbb7e5efc31bb1ab7ca2fbf9bec1b91e2f7d57817f5ddee38f2b3f120589fcbea1668f5 SHA512 07fb970b7eec223c3427b6058134101a5c032006d8ec16f2873352e9c701c38fe254506e9ff4e05f2ad684bd192c764452ec957af44a04f1beccf7f47bf58bb0
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
-EBUILD fish-2.7.1.ebuild 2419 BLAKE2B b94dbcf8431311f50ec2b49ab8ad62e8af3519262b2518d4b72a0074e837b38bf3aea6e93655d7b60ccbb09ef2abbbab946ba5012337c15de73a3c7d910295a8 SHA512 d818578a42171939d35ecd9dadbe875bbf93427e662783fb6bfb3033f17ab3298df58999f4e71e4ec8af666c7388fbc6bd694af119c0d1532c78ff5de1286b41
-EBUILD fish-3.0.2.ebuild 1685 BLAKE2B 3ab99c8d632ff698afce7d304b05df5d0622020da6224f54e80c0148aa7a82ce2dffd9e160c57dee9516e1706c72eb6f4cfb9193c1d2807cd52fe1d0935bebde SHA512 882eea43aafe70967305a9833965fa37dab518a924367b567c8461f0ab3bf7af0e464619d744ed96854fe5b481d8916b14604ba9be9b153faaf583ee2500b854
-EBUILD fish-9999.ebuild 1619 BLAKE2B 0153dd8b58b2215d878421411226a7b32d7bca3ba69622456506b0c75bfde528a0ba2ad10000c046f87f4b4d77d828a1fa102c56be0f9972707d7017f7ce4e57 SHA512 f695e364fd3cd033775787fab19135bb8c10bdcb9f90d2943d7c62fe12dd8c0f8e4c58ad78577239a7019828b461da3fd820300cc5f0e314b215f72a7a3c9400
+EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
+EBUILD fish-3.0.2.ebuild 1712 BLAKE2B 42c6c3e82411cb7d17ded1bdab4794885916de6103d3769770f06684b2905e286ffd90edbc709c0e8ffc1dc871785f52ad9de2f859ad4e579fa679311360eabd SHA512 058a568ed69f26eda948193d289f1854494bdfb4c0543cc7a02618f1c9a5ffc01774da701ab44577838e8281c286031467300e477728825a91cb0271103e7a7b
+EBUILD fish-9999.ebuild 1646 BLAKE2B 43b768d1486e891af7ee855f10896b5e32b761ab88b15d2b0bc205dedf02ba72303995d7e97bb4ea61ff80cc1fa2c3b21824fbee9b65e4d4014f0e9dba8bed43 SHA512 508e6659728e34efe8260a08caa1985570924af97f023c1dae658802a58e93a95392852ae34a7374cf6f866bd456d829689c1e253d54bd5c6831d033ecf5cfef
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index b5c48166ee18..9b7755d9b03e 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 [[ "${PV}" = *_* ]] || \
 KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="nls test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libpcre2-10.21[pcre32]
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 047dd2c59a77..540ec26c1feb 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -23,6 +23,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="doc nls test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libpcre2-10.21[pcre32]
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 3e54844e456b..cf5816108b09 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="doc nls test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libpcre2-10.32[pcre32]
diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest
index 7b46ffd377a1..31725a1bf31c 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,5 +1,5 @@
 AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0.ebuild 1113 BLAKE2B c5d8df73779d272cc8da1a49f5ad747b6f872ae815543cdb9d865029e84fffac4646556b2d457f282e6c10cbafb19888e0a3c5801baf20113ea04006b36774d3 SHA512 802b8edba43561e917c0fba3fad33bd53d2ac53eb95659ba7f6788a17355702e95a3867148f61fc501298168c3bcfbe132a6a3811e0512625098df465a2a3fcb
-EBUILD fzy-9999.ebuild 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
+EBUILD fzy-1.0.ebuild 1140 BLAKE2B dd43a6af686eb670901b916b5f892ef81a770636f99f97c1b3828e34d0b25714eda200a0df6afd996011cd6cd8186eb00163ca2d1c7ca885777e132781422670 SHA512 23d2a7bfc89d4faed9217a15e71182c958f8c072c6d177744db60a2a2e5611cfa34c0c56a825773989240ce58d08318e4d70553ed39bd3d39b24aae8bb6f175c
+EBUILD fzy-9999.ebuild 1135 BLAKE2B 8dc3d18ffe57ebaff3e829499d2370d5a4a2f9098986178063846b5b1b81564c1e01d2e5ded7b1ec5485c40053b05c5aaa42c86e98730e26b38fba46fdc46ef0 SHA512 9b640390022027a82b034a61fa79993e10c02f41272c7a84d4a4094dca32183dab30820e93ede60a5dff47ff1944ebfb75abfc21fc39b32f8f35c11a24cb8d06
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0.ebuild
index 29f85a6e78c9..38f54c0bf9d7 100644
--- a/app-shells/fzy/fzy-1.0.ebuild
+++ b/app-shells/fzy/fzy-1.0.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://github.com/jhawthorn/fzy"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/fzy-0.9-cflags.patch )
 
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild
index a3c83e613fea..8fb7bb35ba12 100644
--- a/app-shells/fzy/fzy-9999.ebuild
+++ b/app-shells/fzy/fzy-9999.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://github.com/jhawthorn/fzy"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/fzy-0.9-cflags.patch )
 
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index fd05e9a80504..4ae8a471a6e4 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,3 +1,4 @@
+AUX hstr-2.0-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
-EBUILD hstr-2.0.ebuild 584 BLAKE2B d0474503726d6db4141e3a7b23850e5360556f19defd5d0ae9f4e068304d78d35ed622d399133d5909c100e663ed83560ed6cb099d6425fe8f4da0fc9eeb22cd SHA512 561bc4fac391c4337f3da85cb99f2e004a7ee7d1ae674242e1ec6c19c7ca42b1dedaeac35ea1404636fd42d9274e3cf708dc57c4a2266c60c4cf7df8b5923e4a
+EBUILD hstr-2.0.ebuild 642 BLAKE2B 83c4bdcd14bea1f873828f3856183a529144bca3876b960895b86c2c1f2bb82d66d48d9d68a541aa719c9e07f2a072ce7d77783bc32dbc2a5db89de945503140 SHA512 30d50d5190f4476969aa97af6e1af4111f91cbe457fca2b51b34c9c4ac42e24d9e68fb305cd1898c3088faa23ad581b27c03084fc306992b8af4b657304d6a07
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch
new file mode 100644
index 000000000000..215fd5cedfc9
--- /dev/null
+++ b/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch
@@ -0,0 +1,81 @@
+diff --git a/configure.ac b/configure.ac
+index 1676ec8..73c8be5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,39 +47,33 @@ then
+ fi
+ 
+ # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed
+-AC_CHECK_LIB(ncursesw, killwchar, [],
+-[
+-    AC_CHECK_LIB(ncurses, killwchar, [], 
+-    [
+-        AC_SUBST([NCURSESW_CFLAGS])
+-        AC_SUBST([NCURSESW_LIBS])
+-        if pkg-config --exists ncursesw
+-        then
+-            AC_MSG_NOTICE([Module ncursesw found])
+-            NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+-            NCURSESW_LIBS=`pkg-config --libs ncursesw`
+-        else
+-            if pkg-config --exists ncurses
+-            then
+-                AC_MSG_NOTICE([Module ncurses found])
+-                NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+-                NCURSESW_LIBS=`pkg-config --libs ncurses`
+-            else
+-                AS_CASE([$host_os],
+-                  [darwin*],
+-                    [
+-                      AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
+-                      AC_CHECK_HEADER(curses.h)
+-                    ],
+-                  [
+-                    AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
+-                    AC_CHECK_HEADER(ncursesw/curses.h)
+-                  ]
+-                )
+-            fi
+-        fi
+-    ]) # FAIL of ncurses
+-]) # FAIL of ncursesw
++AC_SUBST([NCURSESW_CFLAGS])
++AC_SUBST([NCURSESW_LIBS])
++if pkg-config --exists ncursesw
++then
++		AC_MSG_NOTICE([Module ncursesw found])
++		NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
++		NCURSESW_LIBS=`pkg-config --libs ncursesw`
++else
++		if pkg-config --exists ncurses
++		then
++				AC_MSG_NOTICE([Module ncurses found])
++				NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
++				NCURSESW_LIBS=`pkg-config --libs ncurses`
++		else
++				AS_CASE([$host_os],
++					[darwin*],
++						[
++							AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
++							AC_CHECK_HEADER(curses.h)
++						],
++					[
++						AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
++						AC_CHECK_HEADER(ncursesw/curses.h)
++					]
++				)
++		fi
++fi
+ 
+ 
+ # Checks for libraries.
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7640d21..17a82b7 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,4 +37,4 @@ hstr_SOURCES = 						\
+ install-exec-hook:
+ 	ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT)
+ 
+-hstr_LDADD = $(NCURSES_LIBS)
++hstr_LDADD = $(NCURSESW_LIBS)
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
index 206760fd98b8..b2332147a9b4 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -22,6 +22,8 @@ DEPEND="
 
 DOCS=( CONFIGURATION.md README.md )
 
+PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
+
 src_prepare() {
 	default
 	sed \
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index c1161dff95d5..8b775bc28c1d 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,6 +1,6 @@
 AUX ksh-2020.0.0-ensure-user-set.patch 1017 BLAKE2B 8a0d9fd9fd8940969741214f6ba9251ae1b404bae80385d79428ab7231a5809bafcaa5033084af0582872171666e89b590b7c2cfba1ded740da49c77b1751888 SHA512 bea76ef4350d2813395bbfaa682b97a34548292efe9986a1d63dde2476bbfbfd21dc9b10ccb7ac3bcf33e9aeb3c0eebdcffb22a3b6472302597473ac994b2493
 AUX ksh-2020.0.0-skip-api-test.patch 1394 BLAKE2B bcf521012bb197d234b119dc56ddc068f8ec3e46b6f4c6d82e1043629368bfcabd1a5d360bae702777e5b01914ac70c9edbdce5ee0bba7e9f69916a3c38b1820 SHA512 e4314599821b3f654b4c87900aa696930953a96b984f43ca00fd17aa91b968ed8f277944c6736ebddae4ee7086e9806f84e3432b24450565d1c679bdbb39e01a
 DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792
-EBUILD ksh-2020.0.0.ebuild 1033 BLAKE2B b930755c2170d179ce1537efbf45606b79392444b0307eb95d119e56accf91b7a0c4511933e4594c6957f261daaef71331ddf1e2f5932c66d8b913a0e1688f4a SHA512 e0005f7021cc75f96e6e89a19c384c18def298d53b63a3a45a49d9498d94824bfaaa993f9e6dca4a02a03f3913a530ca02ff104ba2c7a935c246d492cd4ce882
-EBUILD ksh-9999.ebuild 700 BLAKE2B f402dd243201aed831b1f6dd097e58fe108a0f5f75d31446c22cbf8750b6757e186abf564dd18498b8a35918cde04f3680d34d8546a25e145deb8a37cc5e8a1f SHA512 496e89142f08dde07852dc6d6db8756b2e0b3cadce077a2ad53e5d680265a7774fd21460acd6e744a583a8896f2e3c492986fcf759210ae72d97604695e11682
+EBUILD ksh-2020.0.0.ebuild 1087 BLAKE2B d4de3298e870b57abfd03b24e8bd7c40d166749452317ca52fde421634e6ba6ead52b3e736df297b04f8e6575735df0cbf0ff620e473a942abf6c61af51660a9 SHA512 69440a0266c563586fce52171e986b742ff40abcf9089b3a9f3b8307a221f5d0f9d0f5b944ada20216a404d99d86998b9d02045d78af4b61142f863e5ec63d2a
+EBUILD ksh-9999.ebuild 976 BLAKE2B 4807cd3805a2f7f05a726019c707c6fe0106b636f0d221f31dd08b62b249df4815cb4bf6c5b0309863e2916a919c53aabcbe4c8efe3e8218655f2078cbb03361 SHA512 09f6498596ea5cf1c9a49eec1d8572a30b27649b0aa3a1eda99eaff959279627db59fd3a694a5929e8075dc2e641bfa65442a1a4819b9f1af5ca174d91bb5fb5
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/ksh-2020.0.0.ebuild b/app-shells/ksh/ksh-2020.0.0.ebuild
index c2f9bb7797eb..6b40cd312997 100644
--- a/app-shells/ksh/ksh-2020.0.0.ebuild
+++ b/app-shells/ksh/ksh-2020.0.0.ebuild
@@ -30,12 +30,13 @@ PATCHES=(
 )
 
 src_test() {
+	# https://bugs.gentoo.org/702570
+	addwrite /proc/self
 	local cmd=(
 		meson test
 		-C "${BUILD_DIR}"
 		--num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})"
 	)
-
 	echo "${cmd[@]}" >&2
 	# https://github.com/att/ast/issues/1392
 	env -u T "${cmd[@]}" || die
diff --git a/app-shells/ksh/ksh-9999.ebuild b/app-shells/ksh/ksh-9999.ebuild
index 2ccad3528bf3..9e136daa8efa 100644
--- a/app-shells/ksh/ksh-9999.ebuild
+++ b/app-shells/ksh/ksh-9999.ebuild
@@ -24,6 +24,19 @@ SLOT="0"
 
 RDEPEND="!app-shells/pdksh"
 
+src_test() {
+	# https://bugs.gentoo.org/702570
+	addwrite /proc/self
+	local cmd=(
+		meson test
+		-C "${BUILD_DIR}"
+		--num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})"
+	)
+	echo "${cmd[@]}" >&2
+	# https://github.com/att/ast/issues/1392
+	env -u T "${cmd[@]}" || die
+}
+
 src_install() {
 	meson_src_install
 	dodir /bin
diff --git a/app-shells/localshell/Manifest b/app-shells/localshell/Manifest
index 2229b4eec152..2ebb3217922f 100644
--- a/app-shells/localshell/Manifest
+++ b/app-shells/localshell/Manifest
@@ -1,3 +1,3 @@
 DIST localshell-1.3.4.tar.bz2 113170 BLAKE2B cf135b8ee2a6252f7bb792c71efdf86a9f063791346e05f4545ba88fd9503032d1448241cdc4e9babe1fd7e8a265a170f22e1df2e8d46cc1a4ac14d8533d66d6 SHA512 3a302b7d1b00e6ac8025a2145b3d12b916a60a9bad811d63c78c6eaac1b9a832f8796ab4429c677423287f70d6f6b31283aa2c90d3634ebe4bed52e1e240390d
-EBUILD localshell-1.3.4-r1.ebuild 856 BLAKE2B 8932a98d66a1c1619f85b71ff6484a37355608b680f6b198d9597ea5f942fd2afffe9d817fe14fafc017312334adecca0dd634c35ffdf5cc31d806ded0830ffe SHA512 671a5ef03e741c5fd779adaac6519b6d662d31f5af7c188ffcfd7c2fc46ba0767051fd5ea2c894e8bdaf7ef5854fc28f62ae21688b3adbb06411ccd1503cfa52
+EBUILD localshell-1.3.4-r1.ebuild 826 BLAKE2B 9dd264400138d520f4eb03160bdaaae240d09794ab92c3060f495b65aab668e91463908cf38e06307361c2982fdecbfaaf606f8916d7a4ef5264daf6126a0756 SHA512 1787e9689b394669433d516234706834649741edecae9f9923fd2248ff169c2b0ad16678643f7e2ad85c140ae560a1c28188f8f38cdfa0292c9c2fc693917b28
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-shells/localshell/localshell-1.3.4-r1.ebuild b/app-shells/localshell/localshell-1.3.4-r1.ebuild
index dbc6064a4f9f..f2c8e8a51be3 100644
--- a/app-shells/localshell/localshell-1.3.4-r1.ebuild
+++ b/app-shells/localshell/localshell-1.3.4-r1.ebuild
@@ -20,7 +20,7 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	emake install DESTDIR="${D}"
 	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL}
 }
 
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 0e3c010d9b75..85ab05de95e5 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,7 +1,8 @@
 DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
 DIST mksh-R57.tgz 419604 BLAKE2B 11af09535ace3fdd982189fb7d7f3e5961776c3bdbf6b981f4f1506a66ebdbd893efb9aa50a5a36fd8b3b7bd3e149021aad154888dc81e0de29f41e91eeb583c SHA512 7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3
 EBUILD mksh-56c.ebuild 992 BLAKE2B 1ecbe94f3d96371818512d89b3f077402118058f382f1e3dfd9f57826eb783256bc193b4697272626cce52ccb8fe29a479646107750e1db94859b95b7bb7c524 SHA512 1f17fcf0f5cae5de4128feded4c1c92c9d75b3c507deb7e265058251c225bbb852c9ad305ac5bac0f4fb8739eb38c325e0f85c33dc1fa10fe6ede6e4a71a41b6
-EBUILD mksh-57-r1.ebuild 1010 BLAKE2B da381d59adade8902014bf730bbecf56730de750f81ea4462f904ec4459cd0f23bdf9ebb4a284f9b408b3e3cbcc08f80d124ba1c5269325a5619e4113a03c2b5 SHA512 6d9a8435f42fcf1a08a2d0a21daf95bc4706d704b0d9281e3efef49d06e4d0e557349c4e80ee8056e8543774ddb1b268847ae69ab6c62fb216fefa4647a69b16
+EBUILD mksh-57-r1.ebuild 1037 BLAKE2B c9e511b80490286bc0743126b858018658d372d7a8a76dc313eb485fed4a908a1985c2d26a737324a3ecac8629d1dfa24b8d9eed719dddeb94abaf016d8b0cf6 SHA512 3534b627236192a846cb6993973820af5c4ebee5514273c05e5d3eefd091c99f96fb4af4d510f8121c60115c9bb6e03b2f5356dacca9ea7395f06cd6601ff86d
+EBUILD mksh-57-r2.ebuild 1604 BLAKE2B 26c835c620d0ce8b0af908df5e309fff652a835759dc07f28442f1ba63f8406a7f68e672a46bf08d4b777554d8128310f2e2ccf3171316682c84f4210e26c374 SHA512 d7b105454422ef6ecbab9d8ec6cb3c4e3786dce1e692eb827ab6c0c6b82817337d3516abdab7eae1e3e244a4f5bda35674b5be7804b2e6e519b5eeaebf7e0692
 EBUILD mksh-57.ebuild 995 BLAKE2B 0e9efe4a046e26c35f3b5882e6fc6f81adb85f47acd9e84f7de768e6557e2725dcea05a18b30d8ff26e20383a452a4ba434c6dfebcb8476ce7c03fef8a2aa8da SHA512 e259c3b4c8cacc5655ea5fe444cacbcab8d646e4a1dbff949dfc8ffe2fb032a8c51cf1017c23f7b4191309285d08936a31a7791f0104384264865495f973e616
-EBUILD mksh-9999.ebuild 1010 BLAKE2B da381d59adade8902014bf730bbecf56730de750f81ea4462f904ec4459cd0f23bdf9ebb4a284f9b408b3e3cbcc08f80d124ba1c5269325a5619e4113a03c2b5 SHA512 6d9a8435f42fcf1a08a2d0a21daf95bc4706d704b0d9281e3efef49d06e4d0e557349c4e80ee8056e8543774ddb1b268847ae69ab6c62fb216fefa4647a69b16
-MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
+EBUILD mksh-9999.ebuild 1604 BLAKE2B 26c835c620d0ce8b0af908df5e309fff652a835759dc07f28442f1ba63f8406a7f68e672a46bf08d4b777554d8128310f2e2ccf3171316682c84f4210e26c374 SHA512 d7b105454422ef6ecbab9d8ec6cb3c4e3786dce1e692eb827ab6c0c6b82817337d3516abdab7eae1e3e244a4f5bda35674b5be7804b2e6e519b5eeaebf7e0692
+MISC metadata.xml 565 BLAKE2B 7bbb94f30f910e5a73f6fca91db59bd8b9825e358903bfc3116222c9bcb9927b5609b4c31bb5f36db5898023631a0d8dd2ad8d6a218136bb2e1786337db58fed SHA512 a10bf827859a6176fef847313a096d8ce04dfb6a271452602f8fe3638c8aeb7da11a5ea7a9d30257e516d8344365e30372e4c16d31d23c19e97c3d7ddd333914
diff --git a/app-shells/mksh/metadata.xml b/app-shells/mksh/metadata.xml
index 9df017effeb6..c22c0afc77d8 100644
--- a/app-shells/mksh/metadata.xml
+++ b/app-shells/mksh/metadata.xml
@@ -9,4 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="lksh">
+variant that uses POSIX-compliant arithmetics with the host “long” data type 
+and is automatically in POSIX mode when called as /bin/sh
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-shells/mksh/mksh-57-r1.ebuild b/app-shells/mksh/mksh-57-r1.ebuild
index 3aa638fe2453..ba0d160f76a5 100644
--- a/app-shells/mksh/mksh-57-r1.ebuild
+++ b/app-shells/mksh/mksh-57-r1.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
 LICENSE="BSD"
 SLOT="0"
 IUSE="static test"
+RESTRICT="!test? ( test )"
 RDEPEND="static? ( dev-libs/klibc )"
 DEPEND="
 	${RDEPEND}
diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild
new file mode 100644
index 000000000000..ff84abaff24a
--- /dev/null
+++ b/app-shells/mksh/mksh-57-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ $PV = 9999 ]]; then
+	inherit cvs
+	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
+	ECVS_MODULE="mksh"
+	ECVS_USER="_anoncvs"
+	ECVS_AUTH="ext"
+	KEYWORDS=""
+else
+	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MirBSD Korn Shell"
+# Host is TLSv1.0-only, keep to http for compatibility with modern browsers
+HOMEPAGE="http://mirbsd.de/mksh"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="lksh static test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-lang/perl
+		sys-apps/ed
+	)
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	if use lksh; then
+		cp -pr "${S}" "${S}"_lksh || die
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	use static && export LDSTATIC="-static"
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+
+	if use lksh; then
+		pushd "${S}"_lksh >/dev/null || die
+		CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
+			sh Build.sh -r -L || die
+		popd >/dev/null || die
+	fi
+
+	sh Build.sh -r || die
+}
+
+src_install() {
+	into /
+	dobin mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+
+	if use lksh; then
+		dobin "${S}"_lksh/lksh
+		doman "${S}"_lksh/lksh.1
+	fi
+}
+
+src_test() {
+	einfo "Testing regular mksh."
+	./mksh test.sh -v || die
+
+	if use lksh; then
+		einfo "Testing lksh, POSIX long-bit mksh."
+		pushd "${S}"_lksh >/dev/null || die
+		./lksh test.sh -v || die
+		popd >/dev/null || die
+	fi
+}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index 3aa638fe2453..ff84abaff24a 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -13,30 +13,47 @@ if [[ $PV = 9999 ]]; then
 	ECVS_AUTH="ext"
 	KEYWORDS=""
 else
-	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
+# Host is TLSv1.0-only, keep to http for compatibility with modern browsers
 HOMEPAGE="http://mirbsd.de/mksh"
+
 LICENSE="BSD"
 SLOT="0"
-IUSE="static test"
-RDEPEND="static? ( dev-libs/klibc )"
+IUSE="lksh static test"
+RESTRICT="!test? ( test )"
+
 DEPEND="
-	${RDEPEND}
 	test? (
 		dev-lang/perl
 		sys-apps/ed
 	)
 "
+
 S="${WORKDIR}/${PN}"
 
+src_prepare() {
+	default
+	if use lksh; then
+		cp -pr "${S}" "${S}"_lksh || die
+	fi
+}
+
 src_compile() {
 	tc-export CC
-	# we want to build static with klibc
-	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
+	use static && export LDSTATIC="-static"
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+
+	if use lksh; then
+		pushd "${S}"_lksh >/dev/null || die
+		CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
+			sh Build.sh -r -L || die
+		popd >/dev/null || die
+	fi
+
 	sh Build.sh -r || die
 }
 
@@ -45,8 +62,21 @@ src_install() {
 	dobin mksh
 	doman mksh.1
 	dodoc dot.mkshrc
+
+	if use lksh; then
+		dobin "${S}"_lksh/lksh
+		doman "${S}"_lksh/lksh.1
+	fi
 }
 
 src_test() {
-	./test.sh -v || die
+	einfo "Testing regular mksh."
+	./mksh test.sh -v || die
+
+	if use lksh; then
+		einfo "Testing lksh, POSIX long-bit mksh."
+		pushd "${S}"_lksh >/dev/null || die
+		./lksh test.sh -v || die
+		popd >/dev/null || die
+	fi
 }
diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index 9b8e39ef2b5d..e79339e7a8eb 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,3 +1,3 @@
 DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
-EBUILD pdsh-2.26-r1.ebuild 1287 BLAKE2B 4acd78fedf0a8ec33a223502d0c93d0038d912ddea66fa0513a018f2e8ca3a437c17566feee8c63f3cd527a50c2b1968354c7940764bb3c1e49366f5411c266e SHA512 5af633bc908bb1176ffbe79c8ca69689807315aac079a0ba80cfedd08bce905ec7dbb2c97e2aab564db47db9a7139459fbfab995624e6b9780388407514ca20a
+EBUILD pdsh-2.26-r1.ebuild 1311 BLAKE2B c6267cef6c7ec26205ba3994002b84f9171a28d37f2baacf373ed65f3379d258b8689081c5387e111a3713b92ea60e7faad59d5014f41c1edcd462adc5074748 SHA512 308235f52db4448a3f5d541c6c11c9542e9add603672ced12280e1583382c7eeb71967ea66aee053dab6f35fa710182035727ebf14397ed5d240845d7702b03a
 MISC metadata.xml 1204 BLAKE2B db664f8622eaf0976ab1899583abab0268758d2edcdf0dd038ef59f54f1cf86c30956aa9cac35fa1a28a6760196050da01cfdbfcb56742aa233075aaa77a4eed SHA512 abaa972d578e11c47d16497fecbf7d72a07915b0b57c7f6458f82b0a36b55575b2d94a43f6f6a71a925a0e4ed56346056f9bc1d939a4190f2c899fcf58c9c752
diff --git a/app-shells/pdsh/pdsh-2.26-r1.ebuild b/app-shells/pdsh/pdsh-2.26-r1.ebuild
index cd2b214c3640..095ad29902e1 100644
--- a/app-shells/pdsh/pdsh-2.26-r1.ebuild
+++ b/app-shells/pdsh/pdsh-2.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="crypt readline rsh static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	crypt? ( net-misc/openssh )
diff --git a/app-shells/peco/Manifest b/app-shells/peco/Manifest
index 707f10827652..ee142f198a0c 100644
--- a/app-shells/peco/Manifest
+++ b/app-shells/peco/Manifest
@@ -6,7 +6,5 @@ DIST github.com-nsf-termbox-go-e2050e41c8847748ec5288741c0b19a8cb26d084.tar.gz 3
 DIST github.com-pkg-errors-248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz 11334 BLAKE2B 7d703863f2420dab1975063ab8fe27d4b1b203bfda9f279d288cf50b2ff97e94417fc6cd5dbbe1575b4ba8de3e64efbb1e2903965a3735b9bd6308126fb299c9 SHA512 ee488416799f9359958e1cf68cd17a13019a11687dccee7db2633fcd361c7a48da0f6afec6275977f09a38f8475625b66d9f51a4003d2337d07aadf091f5e1d9
 DIST github.com-stretchr-testify-18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz 83549 BLAKE2B 7bdaac806a8ea401ad991f995e1f94fa2983debe6ed8ec4f54462a6f7641084c2ffe14814ad265aa825aa2132fc357d023fce43540e7ea3a433a16064cd3e833 SHA512 e9af02a015b8eff0c83ba7ad6236d83804f75206586ac7a260c2ee663764aa41af445420f296d793ab7ebd3ac9f346dfdd5f1bfda20a4cbdf0a7b29452c7ce37
 DIST peco-0.5.3.tar.gz 77415 BLAKE2B 9f060e191550d39eed8dbf4b4379e424886476589e40af2c8bd2758c90636c6e9ab8e7551a32726f1f2d3338c7e59d47432d58f6493f03bbd3b8670095e27382 SHA512 c1b5678b369caa35e3bd2679eee857762c73bcc8a815d83e136fa1c30e48728a60f22be5d92132c8a733d591728f9293a973fc387502db79f5676ae1f45c6774
-EBUILD peco-0.5.3-r1.ebuild 1591 BLAKE2B 6c3cb74040b59eb901b9e06672bfee82c7775996a65daefbaff1f47c8c09447adbec43029ae294c99caf726343074051a3362da8ee3b1c8d1c5c499c7f05c091 SHA512 191048f7f616216f7a295f285f2f94ac27708434291f334d9da15636d926748b0df735e00e3f33a9533514f3a6983777eb285f236282343f2f6e6761de33b5d0
 EBUILD peco-0.5.3-r2.ebuild 1486 BLAKE2B 29300f27965261a64269f68433ee707e91084f512c439da179d61df3b588d29358bbcdd1663a1aa532ea4190e42f12231405e4913ea85bb2960e0c352e967482 SHA512 ffa9cdf9e861b2093ab6f2fdacce82113b65d8e790a25bdeb380a0e06bfdb205a9ecd04cdb706fa48dbd6c83f3634fbd75f9218e737877975ac87712bb26557a
-EBUILD peco-0.5.3.ebuild 1591 BLAKE2B 606d3404cee5fb38b0290ce3dd59fb5fc0308eb7c28c67d85f586c3fbff25b979d1eaafc78c76b2922ecfcfaa82ca40ac086dc2da1f488d36712a57d4a535ed9 SHA512 fb9e2909748a9064c3cd5894d19353fcc6b7481cafe8e41354f0e99a7d5d5f539a9c8c4542a95db615b4c280f7e5ffec93118dab5d18bec2a0dad495a592aae2
 MISC metadata.xml 666 BLAKE2B e1594259e0f02808e487707acd6d8d1dcf20510aa92410aa03953606bace24777316a408c9079e342c8c6f7ab5680058fea2bfc65e5614751c7580aed78f00e2 SHA512 aab34e7bd48c51784cf3b1119c596893d56113b5a90dfa7e2782ca11e78d0ce2f80a9fdcde4e81e6fb6802a3075ba20bcd19fa9fb162fe2c68bdc1e91d3b6ef7
diff --git a/app-shells/peco/peco-0.5.3-r1.ebuild b/app-shells/peco/peco-0.5.3-r1.ebuild
deleted file mode 100644
index b548d1894884..000000000000
--- a/app-shells/peco/peco-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=( "github.com/google/btree 0c3044bc8bada22db67b93f5760fe3f05d6a5c25"
-	"github.com/jessevdk/go-flags 8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"
-	"github.com/lestrrat/go-pdebug 2e6eaaa5717f81bda41d27070d3c966f40a1e75f"
-	"github.com/mattn/go-runewidth 737072b4e32b7a5018b4a7125da8d12de90e8045"
-	"github.com/nsf/termbox-go e2050e41c8847748ec5288741c0b19a8cb26d084"
-	"github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302"
-	"github.com/stretchr/testify 18a02ba4a312f95da08ff4cfc0055750ce50ae9e" )
-
-EGO_PN="github.com/peco/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Simplistic interactive filtering tool"
-HOMEPAGE="https://github.com/peco/peco"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? ( dev-go/glide )"
-
-DOCS=( src/"${EGO_PN}"/{Changes,README.md} )
-
-src_prepare() {
-	default
-
-	# Don't install dependencies, make build verbose
-	sed -i -e '/peco\$(SUFFIX):/s/ installdeps//' \
-		-e '/test:/s/ installdeps//' \
-		-e '/go build/s/-o/-v -x -o/' \
-		-e '/go test -v/s#$(INTERNAL_BIN_DIR)/$(THIS_GOOS)/$(THIS_GOARCH)/##' \
-		src/"${EGO_PN}"/Makefile || die "sed failed"
-}
-
-src_compile() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" build
-}
-
-src_test() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" test
-}
-
-src_install() {
-	einstalldocs
-	dobin src/"${EGO_PN}"/releases/peco_linux_amd64/peco
-}
diff --git a/app-shells/peco/peco-0.5.3.ebuild b/app-shells/peco/peco-0.5.3.ebuild
deleted file mode 100644
index c40d5b888512..000000000000
--- a/app-shells/peco/peco-0.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/google/btree 0c3044bc8bada22db67b93f5760fe3f05d6a5c25"
-	"github.com/jessevdk/go-flags 8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"
-	"github.com/lestrrat/go-pdebug 2e6eaaa5717f81bda41d27070d3c966f40a1e75f"
-	"github.com/mattn/go-runewidth 737072b4e32b7a5018b4a7125da8d12de90e8045"
-	"github.com/nsf/termbox-go e2050e41c8847748ec5288741c0b19a8cb26d084"
-	"github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302"
-	"github.com/stretchr/testify 18a02ba4a312f95da08ff4cfc0055750ce50ae9e" )
-
-EGO_PN="github.com/peco/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Simplistic interactive filtering tool"
-HOMEPAGE="https://github.com/peco/peco"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? ( dev-go/glide )"
-
-DOCS=( src/"${EGO_PN}"/{Changes,README.md} )
-
-src_prepare() {
-	default
-
-	# Don't install dependencies, make build verbose
-	sed -i -e '/peco\$(SUFFIX):/s/ installdeps//' \
-		-e '/test:/s/ installdeps//' \
-		-e '/go build/s/-o/-v -x -o/' \
-		-e '/go test -v/s#$(INTERNAL_BIN_DIR)/$(THIS_GOOS)/$(THIS_GOARCH)/##' \
-		src/"${EGO_PN}"/Makefile || die "sed failed"
-}
-
-src_compile() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" build
-}
-
-src_test() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" test
-}
-
-src_install() {
-	einstalldocs
-	dobin src/"${EGO_PN}"/releases/peco_linux_amd64/peco
-}
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index a878cf5dab7c..9d5e399bb41b 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1,4 +1,4 @@
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
-EBUILD powerline-2.7.ebuild 682 BLAKE2B ff81667b6a8f94cf95b579f5c456a85db05dcb03f7d3799564c43c191cde961c3d9473891cea7444f327ac61b02dc5df7d638d8fb6f2bce761914a51ffca3add SHA512 b42ad0cf024ed32d253a88f29b36b12dfa0e5155caecff931485ab6d23cdb2b192b0de812126142a66f7dcbbbaf12254674b2ea43b476e8898be863af3cf4d78
-EBUILD powerline-9999.ebuild 682 BLAKE2B ff81667b6a8f94cf95b579f5c456a85db05dcb03f7d3799564c43c191cde961c3d9473891cea7444f327ac61b02dc5df7d638d8fb6f2bce761914a51ffca3add SHA512 b42ad0cf024ed32d253a88f29b36b12dfa0e5155caecff931485ab6d23cdb2b192b0de812126142a66f7dcbbbaf12254674b2ea43b476e8898be863af3cf4d78
+EBUILD powerline-2.7.ebuild 709 BLAKE2B ee1573dc224938c8d3f267cfc8972ec3c15f028ed186782928480acaf8a89a520aedf521546b139479b5a3a98124da57f4d18fe6c7e014df0b938661b824aad2 SHA512 696c4af943ce9150e0d1fde4ff51208d33983850ad170db19d1b489f0df359098add7d3c3399e0c05cd83a3f6b4821b9225aa00d93a29bf2ea2bb3d934b10f5e
+EBUILD powerline-9999.ebuild 709 BLAKE2B ee1573dc224938c8d3f267cfc8972ec3c15f028ed186782928480acaf8a89a520aedf521546b139479b5a3a98124da57f4d18fe6c7e014df0b938661b824aad2 SHA512 696c4af943ce9150e0d1fde4ff51208d33983850ad170db19d1b489f0df359098add7d3c3399e0c05cd83a3f6b4821b9225aa00d93a29bf2ea2bb3d934b10f5e
 MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/powerline-2.7.ebuild b/app-shells/powerline/powerline-2.7.ebuild
index 79ff69b517e6..3e81968af2ac 100644
--- a/app-shells/powerline/powerline-2.7.ebuild
+++ b/app-shells/powerline/powerline-2.7.ebuild
@@ -21,6 +21,7 @@ S="${WORKDIR}/${PN}-status-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/app-shells/powerline/powerline-9999.ebuild b/app-shells/powerline/powerline-9999.ebuild
index 79ff69b517e6..3e81968af2ac 100644
--- a/app-shells/powerline/powerline-9999.ebuild
+++ b/app-shells/powerline/powerline-9999.ebuild
@@ -21,6 +21,7 @@ S="${WORKDIR}/${PN}-status-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/app-shells/sash/Manifest b/app-shells/sash/Manifest
index 0edac8cb7926..6a3500e5448f 100644
--- a/app-shells/sash/Manifest
+++ b/app-shells/sash/Manifest
@@ -1,4 +1,4 @@
 AUX sash-3.7-builtin.patch 465 BLAKE2B 9665d97abbb0da68065dee7934f9604f59436af5522a45dad3331ec3540e86634c7e1415f18be2868297b3261f0fa829ba2e6329723c61746f18d913357b3165 SHA512 3c278b7a6570195d62aee65582edffa74e12a68cd684b7855256083b45c99a5a8f6506e2c59ab4edbd1ba094e7d512dfe7c90a79945f2be5261a5975d5b95d23
 DIST sash-3.8.tar.gz 53049 BLAKE2B 151e24e3f1f56231a12fa332505ad21586c97c7bb9cc3858e12ea4aa410d4e30da4af8201b4e24f0b960f2f142c964ac1996f3475ec9a104bdc52a5e1a55c010 SHA512 e544721dbb5d13d2184531a2caa4b90fb29fc360e2b80f64adb2433cbe4e5588171f3567bde03b520fbe7cbd0f3007e0e9c9c41cb16570709b03cedc2dfbe291
-EBUILD sash-3.8.ebuild 943 BLAKE2B 0b12e1b905a0e9105285105a94b756add018ce8f51a16c4297a5ea0a91c2293e47cdc7fc30d0e1102fd3f83b672254cced92bc8924d6d035100d9a5540b603ee SHA512 cea96aa1f7cbe08ec8a06ca668e0a09dc1348a09adf64b671b09d8f14aa4fb98a8c0b60e71e41ddfcf07a5b2cfd52122276adbf6605f94d60ac75fec81ce13e3
+EBUILD sash-3.8.ebuild 940 BLAKE2B ac509d4b71c96d7dbf7bd75353d7bc20b09e9a179f6d34cfbbf2c4577065ec1227cd410c6f4f94eb301c9719da18cc61debe068ef17110cebc41a27cd25d2ee9 SHA512 f3e4f84f973b4928d28ed47339ff83a476f310e8b980a1770dd945bd4ae7b88f246f592fc8c1a5208a3ea73060f99cf70dc1ebee75bcf2e3a650d7c836f1eec1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/sash/sash-3.8.ebuild b/app-shells/sash/sash-3.8.ebuild
index 6c2ee580ce04..e584cdbcd922 100644
--- a/app-shells/sash/sash-3.8.ebuild
+++ b/app-shells/sash/sash-3.8.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A small (static) UNIX Shell"
-HOMEPAGE="http://www.canb.auug.org.au/~dbell/"
-SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
+HOMEPAGE="https://www.canb.auug.org.au/~dbell/"
+SRC_URI="https://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
@@ -20,7 +20,7 @@ DEPEND="
 RDEPEND="!static? ( ${DEPEND} )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/sash-3.7-builtin.patch
+	eapply "${FILESDIR}"/sash-3.7-builtin.patch
 
 	sed \
 		-e "s:-O3:${CFLAGS}:" \
@@ -29,6 +29,7 @@ src_prepare() {
 	sed \
 		-e 's:linux/ext2_fs.h:ext2fs/ext2_fs.h:g' \
 		-i cmd_chattr.c || die
+	eapply_user
 }
 
 src_compile() {
@@ -38,7 +39,6 @@ src_compile() {
 }
 
 src_install() {
-	into /
 	dobin sash
 	doman sash.1
 	dodoc README
diff --git a/app-shells/smrsh/Manifest b/app-shells/smrsh/Manifest
index ce7cbf7ae930..c90af7547d9f 100644
--- a/app-shells/smrsh/Manifest
+++ b/app-shells/smrsh/Manifest
@@ -1,4 +1,4 @@
 AUX site.config.m4 524 BLAKE2B 79841306c8d161fa2f96deb2295acacf6d6c5e26519fa4fb92bddcb7fc29d862cbc297ac242b355165571f2a78eef4e5ffd97c47a31710956ab98e24aefb57ec SHA512 9461e85b83fdf8d13649d1a63ae630ce91c94c8707237f8855c0a5567e550e08e3f7b5297c105f9fa5a8d5639dd5f411245191ab1c3ac5931ad0ae6b3251577d
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
-EBUILD smrsh-8.15.2.ebuild 1196 BLAKE2B 0257c24566cb41d3410c08364c1c1c4d418f41e5343cbb88d445206fadddbb1469ff63d3f8aeac763cc798f7d3f7987c440f0b30e9e9463c49add08c73a7277a SHA512 5bc3ee052802bb5445b09110ae7185f3282a6e31cf46bbe2d08633779ff04c96c57d82521504a0d59d7c5fc3af94cbe48be291da81548f93417c70aad9fe4cd5
+EBUILD smrsh-8.15.2.ebuild 1175 BLAKE2B 928d3ea6fe817a6f827d7ff7b5f13fba4dff80b10cc7cbb5de1f1047fdc23a7c645c9ead90c122d68d43d06cb233a2648cfdda06be5abc8bc4c97a70f6f72305 SHA512 7353c73a2c1dcff8c63ce067f43834a5cdf8a93d0b1c0bf0a31999f60cf78b29bc87da0f464fc060715f286919da093d778e0848af38e19d65be52f1d6ef5448
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/smrsh/smrsh-8.15.2.ebuild b/app-shells/smrsh/smrsh-8.15.2.ebuild
index c825f0f179de..a3333b5cad37 100644
--- a/app-shells/smrsh/smrsh-8.15.2.ebuild
+++ b/app-shells/smrsh/smrsh-8.15.2.ebuild
@@ -38,11 +38,11 @@ src_compile() {
 }
 
 src_install() {
-	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die
+	dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}"
 
 	cd "${S}/${PN}" || die
-	doman "${PN}.8" || die
-	dodoc README || die
+	doman "${PN}.8"
+	dodoc README
 
 	keepdir "/var/lib/${PN}"
 }
diff --git a/app-shells/soapbox/Manifest b/app-shells/soapbox/Manifest
index a13652e00aac..7347cc116fbc 100644
--- a/app-shells/soapbox/Manifest
+++ b/app-shells/soapbox/Manifest
@@ -1,3 +1,3 @@
 DIST soapbox-0.3.1.tar.bz2 19947 BLAKE2B bbf271d1e48b43e1aa7a274e0020b69a7f389374b7ac14ec2084bca4cd8f1cc5312082a33e6f79527dd92756d88631eb77a37256d0315c45853bab0176a8a95e SHA512 c74420e6ea7e088347c897c275095fce5ecd093af9eb7f95ece4959d174fcc79e600704b6116ba9f36534fc8139dee70393db33ab22cd8f870cd77c449e2f430
-EBUILD soapbox-0.3.1-r2.ebuild 913 BLAKE2B 890d017a9e136678475aaa145f9b7fa3e79a82146464a83c61f3d3c833c036c16b712eb0afc608a00edd0b41639f55358408c5a6a8046deac3cabe25e2372694 SHA512 0c72020f7da3ed963ea153192166b706d0a629cd8a85d01740514d0a25dd521f240fa1c513f4c2f3b36f9bd0ec79d3fad80eaba04cabaf0eaa515978889edd30
+EBUILD soapbox-0.3.1-r2.ebuild 850 BLAKE2B 3bd2889bd5f86f195890f63404f1efae39cd895fb081d912c0059ec270e9724ada786931ffa7570b61b56f0ff5cfd0854d5ea8b4fda640772be0187b04fae481 SHA512 f1b7327375bfd4c6cbf3fcc6a3fecacc120fd005e430d7cf76e3924b76be4eee3cb4baaf9f921fd27b49439036a39bcc62ab5a15b2813a004a335c7339628067
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/soapbox/soapbox-0.3.1-r2.ebuild b/app-shells/soapbox/soapbox-0.3.1-r2.ebuild
index 79b53cdb9220..0dee6af50c31 100644
--- a/app-shells/soapbox/soapbox-0.3.1-r2.ebuild
+++ b/app-shells/soapbox/soapbox-0.3.1-r2.ebuild
@@ -29,12 +29,11 @@ src_compile() {
 		CC="$(tc-getCC)" \
 		LD="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} -fPIC" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	dolib.so libsoapbox.so || die "soapsox.so"
-	newbin soapbox.sh soapbox || die "soapbox"
+	dolib.so libsoapbox.so
+	newbin soapbox.sh soapbox
 	dodoc AUTHORS BUGS ChangeLog README THANKS TODO
 }
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index b5404225c95b..9fea8f4c3dae 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -6,6 +6,6 @@ AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1
 DIST tcsh-6.20.00.tar.gz 1001696 BLAKE2B dfebde21c70f236e1070a93621a331ce1a53efab4496c44f25b51e98e843a8d0e3ca503da46a4fc0177b57b682e3ecc07f8120cde25ecf466c8ff094df5f9463 SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
 DIST tcsh-6.21.00.tar.gz 1001909 BLAKE2B 7f2be382a3a344d55e0785eace79377e20dd2cd2eb9e9533168fbb6286631cdcd35bdc06cd42d9439a29a7cd1a911416bfe6b0245065535aebdf5adb58d2c301 SHA512 d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
-EBUILD tcsh-6.20.00.ebuild 2644 BLAKE2B 9bbd15bae9458a6ee8a006c0d42e37b93dd601481727774cd5ed9768e9f44c20b7a0b719ff401c493dc04c487a5a168945b96c9023c0b2c98b735214ba8e4016 SHA512 ec8d5a4cee39bf34c006272aabd9d0c92ee43a473966b61b70203e96ead403af5938e6ecdde499207404e9adecebae92d1e93704fba7479335a9eca3f726c75c
+EBUILD tcsh-6.20.00.ebuild 2643 BLAKE2B 1a91321f67f53006b82c6e04a2467ea83812ceb52366c22bb8ecf6e11966f7ceeb0b518068e6dfb0a97688a0febf454e962069075f9e3ff9ba3b03576d940484 SHA512 6f38defcf12bae3924f97ef25e533012d50e3217064052c1adee07aa96946abcf5b611e5a3586897a5f51e1ce850ba8de4970df99b76fbb3b224fd5ba21fba11
 EBUILD tcsh-6.21.00.ebuild 2695 BLAKE2B 43b3801a20c5616c145ba1d0ac5e6527cb3003113feace99579c665b1fe1f9d5096ac45c4cf4f4dd1373384df1df1a3afd74ec8c6ced6a98e6299f560cd687fc SHA512 4f42a4d14eb965215d53fde9c345438a02244ec6e0e321039288dd2ccd7930195c8e24098085a06c98a66221d6b39c435068df8cbbd721f5fc717257abf1b651
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index aa6dc07e85ae..d598e0bea3d3 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 
diff --git a/app-shells/thefuck/Manifest b/app-shells/thefuck/Manifest
index d931822bfbf5..9d14a20ec55c 100644
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@@ -1,5 +1,5 @@
 DIST thefuck-3.27.tar.gz 1367120 BLAKE2B a840ac3e8f6807df632948e2fe2789a47bdcfececfd4a9bb0f1836bbaa641501e13c559221b9a2f25bbd93505c8b03db102636e480ece116a42c46f341d5cd35 SHA512 766c589f0e99a9773e74094e91c6a74d00e5be8b7241680ad664ecc3f549b597416bc7a4d289f399ed3a0d9ccad629ed78bb983edc809664c303c687ea1eec1a
 DIST thefuck-3.28.tar.gz 1369230 BLAKE2B 0825ead15eae174b08bc2608ff64e1cd5993484a8aa6cc5cd1f6dbb3a856898e7c77eb9d5f92884f01261cf5cc5b00696c6e706a6553ce661866689e3d94d746 SHA512 6c3edcfff604567a18209bf46aceb662ed4549efd0e3b0daee1abee8a93fbe3ff4dfa260eb74c3d560b3a798e3cc90f911072d694a0d986a09c8581e951421d2
-EBUILD thefuck-3.27.ebuild 951 BLAKE2B bb5d5753ad97a2c585776ce8c249f7587bf1603afba3854d1f6b28e23d73001d5e3faa6a8615c22a8670bf5cb6e4d89ece83863e10a69a44566eefc8b635be53 SHA512 df6b339a9cf742df687f3e3d6c5487f795d7b6f50393d007deea0c87d11e2f52dd13658dcdaa019937dedef8f93958984fac9cb936f6871a72a4f28163a317e7
-EBUILD thefuck-3.28.ebuild 957 BLAKE2B 2ef870e3cbf8a252ed6d977a99d25d0d3b496fedc8e1c3add4f16445fffdfb32e5487d0ea7dc79b4c547c539febe7ce5f3ebb0aba6b8806824bedca41fd1a669 SHA512 41cb0c4d3069fdc65e2e3f6a43717f263ea6e3f4900146344d0ac61c4e21e746e2c296a5f16d2bde2672ae65c25f66e08a20c225d2116072c43dfbd3207e6ba5
+EBUILD thefuck-3.27.ebuild 978 BLAKE2B 16d2da916fb50d825ca824a53f776537e03a321b346a2261cdd21a27f4775919e04354b7a1cdbc84a3795799ff0d3d625e309557023a11c764d38e504080a5eb SHA512 df90a00d582fc35a87a9f78c20a4dcaeeae7c384c21c84d8d6e596f5fc50b5a0c802ddc37ea6578a812ec7c3d91a7d097742ee5c9bdda512edd6c34021763c87
+EBUILD thefuck-3.28.ebuild 984 BLAKE2B 06afa96290d76d5b6108f100f33d5314c2e1da27415db8b5567d17b8bc999166fd0fba1308ac2bae6ed696ae9d6609046c6d2ca099c66a6984d1b479601781fb SHA512 3f3cde6f2c497c90efa737105935b387e85c207538b17b7388b327cd5a29530a535c9c8f27b9f0f2fadf2fed973fd4d08b87d697be42e7afb5cc40d0c883c299
 MISC metadata.xml 438 BLAKE2B d3843cefa84dd13bfae30b161dc6241f2e2f165e5ff67c3b46a02e077a7de95f82eda40535950da12f675abf820912254e9e54231b7d81ff0e3a96c1f8f70f8a SHA512 fddc4c1f47a17601ac2e066d984716cd6ab7c290bcebbc34f991ca59adf4395b072530b012895cfa49863d18884817f4f26e553f6ffb7eb28f9e1161b46edba6
diff --git a/app-shells/thefuck/thefuck-3.27.ebuild b/app-shells/thefuck/thefuck-3.27.ebuild
index ae01c0b9ebf2..75bf36f757e7 100644
--- a/app-shells/thefuck/thefuck-3.27.ebuild
+++ b/app-shells/thefuck/thefuck-3.27.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/app-shells/thefuck/thefuck-3.28.ebuild b/app-shells/thefuck/thefuck-3.28.ebuild
index 9eec68162d9b..858e81a6697d 100644
--- a/app-shells/thefuck/thefuck-3.28.ebuild
+++ b/app-shells/thefuck/thefuck-3.28.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/app-shells/yash/Manifest b/app-shells/yash/Manifest
index 845242131a24..efc3958a9ba0 100644
--- a/app-shells/yash/Manifest
+++ b/app-shells/yash/Manifest
@@ -1,5 +1,5 @@
 DIST yash-2.48.tar.xz 736280 BLAKE2B bbb7d2f723000bbb168ce8d354c27d80b350d5b5b1fc450987b8ff45a3d0f3c94986632ead5510de70b27689498cdc370bef8bbcdded66dc8d43061358c438b8 SHA512 51201a5bec24ebfb550d3e6b52114c83221d2e4b54cde577b76def1ccdd3476758ea2c8e1468047bcfccd6e8cdc3fc1d35d6c0dc8b7017c8d290c4aea66350f3
 DIST yash-2.49.tar.xz 740780 BLAKE2B 61fa2d2ab8a5f672cb21cc39c78f18076a4acd79d84fa2285bb35b03a697a58fa77584e5d66268dedbf69b5b2f2e00a7d2b6f6954ffa37a5e9fee3995851034b SHA512 99d98cfbe09aa746f2707217ecb506d8d5998df4a603ac276a8a67782fdcb3a7bd41fb34744f3834e319b0fdb0b1fd480cf9e2a4b835fec3e758280e13036db5
-EBUILD yash-2.48.ebuild 728 BLAKE2B 322f44099ad24c88e751e95073415c72d4a2dcfeac513e2616fb0c918c0f91dd6b6544acd740a14e87617fdeb29926fa06392634beb16962ba5ae0fd92f44c76 SHA512 9c46a3de5e306c0fc0d91b5c1248878d5f0a92bf8fdba02843356b2e7fc216d20e12ca1023c885fdda3c29605b1502b84f7664f84fbf72a1b9c04d1ca405018e
-EBUILD yash-2.49.ebuild 730 BLAKE2B 67e8e580bea8e2d4f2358e4b4ab6b8504b316702beb2a52b8e8f1b08200e2cac73c7aa973807948ae064578c1e1234c824a6f6479450b9243d63bf5e6b606c6a SHA512 47f92402c93603ea3a34ea991b12619333bc23614249dd0d7e914f3c9d62afbe67a85a524effd25105abd2ecdb215f81d1a3381f8c62ebcf96de544ed6d42bbc
+EBUILD yash-2.48.ebuild 755 BLAKE2B 1c958f592561f655e7f5700ebd61b86edd9c9db43431c09b4142524c3d876c09044490ad868f092254b856726788637217f49cd5c4aba76eab3426de3b5f162c SHA512 f5f6125e45d159bb740dd3befdfc28c2c71fc0a2ceacc6bb0a821150336ce9901599987b85e133c05207a502c289c6fdde307a7996f4abf83c0cca1488951903
+EBUILD yash-2.49.ebuild 757 BLAKE2B df37c3ea6ef12f438f71ee4a50971fff6bb219e839c78840aa365d54100f7898f3c4baeffa661711268106bdea79d37d049be2b6df5eb880bc974c98403f0d18 SHA512 d6f57ad4fa77c5431b4b4070dc2dbced0fe5c0ad41fd0bdd5801a6b53612caab8267c151091efe0dd89399f4b6dcee6bf68a8ac2caffc3bf10082de27fa682e2
 MISC metadata.xml 1043 BLAKE2B a83b4a65aace09de65f4c1f44b99711171ffe1d5abc453f0c616fc02d0dfb63828ca7dc7ca431641c6c87d4aab15c5160802ee534de055e0f53bc0350a4110d5 SHA512 004f1faa56032de6e2f37af8199f165c4394a4f7a3c2e2eebd79254a5155bf429e0e0d1e97e7b025037d7a3fbcf91d14b67e37dbe0313fe1ca38a2a7d56ec9f4
diff --git a/app-shells/yash/yash-2.48.ebuild b/app-shells/yash/yash-2.48.ebuild
index 1b5d2260d0db..39eaefe2728f 100644
--- a/app-shells/yash/yash-2.48.ebuild
+++ b/app-shells/yash/yash-2.48.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
 	nls? ( virtual/libintl )"
diff --git a/app-shells/yash/yash-2.49.ebuild b/app-shells/yash/yash-2.49.ebuild
index 2a5af19fe466..bb1d804ac188 100644
--- a/app-shells/yash/yash-2.49.ebuild
+++ b/app-shells/yash/yash-2.49.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
 	nls? ( virtual/libintl )"
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index e20b531fe89f..7ae4c31e393e 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,6 +1,4 @@
-DIST zsh-completions-0.29.0.tar.gz 251934 BLAKE2B 474f15cc8d492da0bbabc2a93edf316b9bb44bfb64ef8b8feae67fc381393b76701d9aca6eb64f6430f881b73a136985c8b17b392da139bd64afabe71e8183ba SHA512 4b2d79dd69576ce688fe24fe8c6e337319f2b96f5e668b9d58c8eb04f68198695a2652e8ad1e93a7ef9cf04cc53265c8db62f420b9ab6e1a2aff97ae24414945
 DIST zsh-completions-0.31.0.tar.gz 247806 BLAKE2B 1923013feab9800f2dd0eef7b2263b0e252dd35b21d865e3f42f7946eeba2d1a882179e05fd16fdf473006646896ef87ca1da5cbc9bf69b52c66bcf99e82c010 SHA512 3f707e96c5d08103359304905cd36889d2b8dae82f0ea3781048a8fbd2f1db509abc1a181dc75215552214a59ee532d207897167fdb3850a5b1cc40e13b2b108
-EBUILD zsh-completions-0.29.0.ebuild 793 BLAKE2B f699b7b91fca760ecbd3cd58ee524481e0220d4f93452e6c53c0843b0832abddd9b68f1927a4a2180f927e4d88130a1a59815b2b9b5e0c869d1d6e16debc6e0b SHA512 2a6b46272a8ea217d9c059557a085900987e8562fbafc12e763f14792db6dd7aa25fc376a9fb736731332664205ed495a8d5dd47e23c1e675b60adb1a3b20ccb
-EBUILD zsh-completions-0.31.0.ebuild 801 BLAKE2B 888827bd421d0a3bd3a43d969d1b176ad311bee1f1f196e1afde24bfe75fc91c140d5e24fc9a16dc768986e42e814eb34e9be808ee737ad1a3856f08fc63e8f8 SHA512 bd8235417a58274880fcc42773a89bb27c5ba9b88cf03a04f74d9bd121263c2fceb83817cf6e4bf13138fa0e70d3ff61a561ce0fa2d7dc899053dc956135d401
+EBUILD zsh-completions-0.31.0.ebuild 800 BLAKE2B 8cd0c838f544a7dff4cd7e5ab1c38308a25cbedfe141bcbadd9909e6af260c739fe1a961e265b8a90851be304077f38792c0043e15d732fdcf16351f0da86131 SHA512 565c3633835f5fa660f1cf25129455b1909e772faf3357b0eac5150d81f574b1caeb2d7a7c0bc4b3abe180a70feba08f0f5444d90dd3a01c05a22141a0a7f792
 EBUILD zsh-completions-9999.ebuild 785 BLAKE2B 41e5cb4e18fc3947a5478e4927c1552ff20441d8e249f2589efbe2b1796d625381bb02d6180d8eae4c7e415b66aacdf386993089ba360ac4b039df8fee89f700 SHA512 6801846ac6ca49cded07839324e97ac8d32fbb46454b60e56dd0a5644d918bff08b316ebfd9e5cb4c5d96cd4d12d3f1644abfc3893062e9267964386b4f5a8e7
-MISC metadata.xml 345 BLAKE2B 6d43d457793d6548b98d393ec863c59a4f1fadf22cdc64b8366cc2f96f7b1899bb1924006e95d42db0609d72dd7664e743468c99eb2cecc9033a5a29867ac191 SHA512 e09a3412d8ea166270e3d6ce1d708cb989efa6889116d219ff76d96d0d92d533d7988504208ebc5e6a186327b6acc4e8b2c719c21c86bd84154292f6eac4a430
+MISC metadata.xml 262 BLAKE2B 3da59cbc52cd06fd6aa07842e28a11ccfdc1f1db2d44b2a6d1496325ffe72f536797631682e751e9f3b4cbc6b9b61fd52795758bce69e3cdc4f84098ae2bac22 SHA512 61b2418f9a970c2404f413abfd65d7600bf985c248718801021e1e7846b5c8b453b3672123cf0d5815af0a1930fb45928494b20a18d86384d77e6a57bdfc35c2
diff --git a/app-shells/zsh-completions/metadata.xml b/app-shells/zsh-completions/metadata.xml
index d1f5bfca20a4..5d5af9487f46 100644
--- a/app-shells/zsh-completions/metadata.xml
+++ b/app-shells/zsh-completions/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mrueg@gentoo.org</email>
-    <name>Manuel Rüger</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">zsh-users/zsh-completions</remote-id>
   </upstream>
diff --git a/app-shells/zsh-completions/zsh-completions-0.29.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.29.0.ebuild
deleted file mode 100644
index 0f1e354b7908..000000000000
--- a/app-shells/zsh-completions/zsh-completions-0.29.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
-else
-	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~sparc ~x86"
-fi
-
-DESCRIPTION="Additional completion definitions for Zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-completions"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-shells/zsh"
-
-src_install() {
-	insinto /usr/share/zsh/site-functions
-	doins src/_*
-}
-
-pkg_postinst() {
-	elog
-	elog "If you happen to compile your functions, you may need to delete"
-	elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
-	elog "to your shell."
-	elog
-}
diff --git a/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
index 574d178e5961..062d59b04010 100644
--- a/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index b59cda27726b..71347b2dc6e7 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,11 +1,13 @@
 AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0e85c04d653bed9c1f1c28a07621fffd22819d62050cf019f3d6d4c127088055bc69a0cc0cb990e8435f2be SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0
 AUX zprofile-4 1273 BLAKE2B df8730eceb621ffe6b38a9185e1ca0a46d6ac2cc5e28e3e9888a2f26f4a6adedc6adfd39744b20aa450a613284b9670dffe02038f40f78edff22e951e209dbf5 SHA512 fbe89782f757bf351a60f691e40d70786324b8b8eea90ca5e788ae349fa5642daa24969e303af6029b8d38d0b5505ba422523081b91ae7b71fec388624ad48d0
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
+AUX zsh-5.7.1-ncurses_colors.patch 1379 BLAKE2B dafadc92d84237182f44accfe0ff4e76f664d5a203af4b4f160ef86751e582cd6475f25666b252296c0d579b055e35721866872ea869726a6c934184c24c3f67 SHA512 6e8a4e41dacf9464435726e8a7db65ff02c104c6328f4acdf24963d08786051ea6845558beb102f47ab7ffc3116f572d1f6b3263a69e7673653f80bd2280d5e2
 DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8f6d859a765037660fb18341f1c79002811a42ec795e41eb2bbe899e12d4bcd055ea5c66e7b73bd488bdf8bbb55 SHA512 5102314e2857b032c6e6b4b715c261970b2f0c28663aff99fb87f7bb6c3971f88f8e8892ed349793570beae3fb68ff7923c82e99a3c1bb485e4639f01caaad4a
 DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b4431630ab305abc9f1ef722698f7c565d0aa421b0d94c21f2c830f9d529709fd62a4205be1a20acf0f94a845a SHA512 f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2
 DIST zsh-5.7.1-doc.tar.xz 3062112 BLAKE2B cb67aada97d79b4b5b1116fb0737294785a2a510c2f4396cf77b671b62631e778ee9d57a32dcd257e079a9e4c35acaeeb68c0ec951b6ae8d8d8b647c05ef365c SHA512 e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c
 DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879654a376ce838986211af4bddb7ab521a8a35cc06701f730a75a9778c633726b447f31845f5c140ec1e8d80 SHA512 a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
 EBUILD zsh-5.6.2.ebuild 5796 BLAKE2B 23454fd9fe184d2a52d325f35785f73da3c87aa8016d267458edeae5194bb0e0981b7b6b6e9c815a844cee79e5203ddcb1ff33e926ebcad9eb6b0db5d222d215 SHA512 f7e89fef58005a2e8d51c8b24487557dabde870624fc8e33d8efc2c6b78c0d7e14e523ecf17a4682c3834d855492de98afaf5e3f5cd8107d9a6276dbb5492095
+EBUILD zsh-5.7.1-r1.ebuild 6049 BLAKE2B 9e4bc853edd91abbfc81b91370b2143b26b38c9b2541e3e84f7af1aa7a7f734c9ac24b2804d2ce4c5b3f3ca92c9087f04cf5fd3c4b3749f9e71add8d629e17da SHA512 29117f87f446eb960f015d1088a00df8554736569af31110c75738d4e0bf659a396d137d47ab99ace88b8a6a3c270206bf15dda24f5e31fd9884ea8599c69629
 EBUILD zsh-5.7.1.ebuild 5918 BLAKE2B 157c02c1885f49e39ef74ffcb4a8f3725cab0ab3bb909a163da7d4f9987e26c39d6ba63e3456a39deefd84442236498f839f5761c1dc92b53f60c10e38cff863 SHA512 dd61bccc222da83e4b4bb05fcb36aa929068698f7006f9425f90c0800763e1541acfdde472bb9e030d8246548d5ce6a6463445839823576d04df4b264063f973
-EBUILD zsh-9999.ebuild 5894 BLAKE2B d421ee14a23f359781a2b6ac242a96ace0b09509057cebb155c0f1cf02fe6e7fd5278890654001ff606b7903e74fc802b8035486bed1a51f3f78a804e4505d33 SHA512 64a7cbe8d309f3fc598e9984f0a15644f94a50fbd3e2e8f047b712a50ece4f55bf94253f57175e14bb3e3c77b9a1d9c9606c109f3eab31e814986ba0e6f62b27
+EBUILD zsh-9999.ebuild 5988 BLAKE2B 75c08411ac48ed84ff2b2f870ef8b5495cbbfa601039c328c6fff902736876d5c21f2237dbf82f345feec4b03337349bf842fa165ba9f0f31212b1c105ee8d0a SHA512 528ad315f72b5237313d6438da799cbe8288c85e2150a8cdbc7c623b70ad6238f31ae67d212a4ba5e5beb2351e384128f4780700756e30de88bc1355cb5c06e7
 MISC metadata.xml 514 BLAKE2B 63d77a851911c67bbf8bd722cd8a4766bd0ff0184c2cc6bd2629b27186ea1bdba9b15bed73cee6a261ff499a22a9ef9b8582b22b76eb3752709553bf49e92071 SHA512 bb460e1e123c3f9b7bcad9a6abfcd42ac69f9a2071d6b2dcbee968c3fe82b9bb940e28021b1d619642d99fc595f492247b1a97e6ad51133be73bbb5fd997ef0d
diff --git a/app-shells/zsh/files/zsh-5.7.1-ncurses_colors.patch b/app-shells/zsh/files/zsh-5.7.1-ncurses_colors.patch
new file mode 100644
index 000000000000..3dc2a7d5a1af
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.7.1-ncurses_colors.patch
@@ -0,0 +1,37 @@
+From 7ce49801cc8ebc6f3a343ee5b829007f8cfb2bce Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 11 Dec 2019 14:56:25 +0100
+Subject: [PATCH] configure.ac: check for has_colors symbol in curses lib
+
+Otherwise zsh/curses module won't get built if ncurses was built with
+separate tinfo lib.
+One could still force-build the module but loading it later yields the
+following error message:
+
+  failed to load module `zsh/curses': /usr/lib64/zsh/5.7.1/zsh/curses.so:
+  undefined symbol: COLORS
+
+That is because the final linker call requires -lncurses(w) but it only
+contains -ltinfo(w).
+
+Reported-by: Tetja Rediske <tetja@tetja.de>
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5513e25f1..792ad4db0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -814,6 +814,7 @@ AC_SEARCH_LIBS(tgetent, [$termcap_curses_order],
+ This is probably a library called 'curses' or 'ncurses'.  You may
+ need to install a package called 'curses-devel' or 'ncurses-devel' on your
+ system."], 255))
++AC_SEARCH_LIBS(has_colors, [$termcap_curses_order])
+ AC_CHECK_HEADERS(curses.h, [],
+ [AC_CACHE_CHECK(for Solaris 8 curses.h mistake, ac_cv_header_curses_solaris,
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[]])],[ac_cv_header_curses_h=yes
+-- 
+2.24.1
+
diff --git a/app-shells/zsh/zsh-5.7.1-r1.ebuild b/app-shells/zsh/zsh-5.7.1-r1.ebuild
new file mode 100644
index 000000000000..391dda5cc547
--- /dev/null
+++ b/app-shells/zsh/zsh-5.7.1-r1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
+		https://www.zsh.org/pub/old/${P}.tar.xz
+		mirror://sourceforge/${PN}/${P}.tar.xz
+		doc? (
+			https://www.zsh.org/pub/${P}-doc.tar.xz
+			mirror://sourceforge/${PN}/${P}-doc.tar.xz
+		)"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0=
+	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	!<sys-apps/baselayout-2.4.1
+"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+if [[ ${PV} == 9999* ]] ; then
+	DEPEND+=" app-text/yodl
+		doc? (
+			sys-apps/texinfo
+			app-text/texi2html
+			virtual/latex-base
+		)"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-ncurses_colors.patch"
+)
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# fix zshall problem with soelim
+		ln -s Doc man1 || die
+		mv Doc/zshall.1 Doc/zshall.1.soelim || die
+		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+
+		# add openrc specific options for init.d completion
+		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+	fi
+
+	default
+
+	hprefixify configure.ac
+	if [[ ${PV} == 9999* ]] ; then
+		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-etcdir="${EPREFIX}"/etc/zsh
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+		--enable-function-subdirs
+		--with-tcsetpgrp
+		--with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
+		$(use_enable maildir maildir-support)
+		$(use_enable pcre)
+		$(use_enable caps cap)
+		$(use_enable unicode multibyte)
+		$(use_enable gdbm)
+	)
+
+	if use static ; then
+		myconf+=( --disable-dynamic )
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=(
+			--enable-zsh-debug
+			--enable-zsh-mem-debug
+			--enable-zsh-mem-warning
+			--enable-zsh-secure-free
+			--enable-zsh-hash-debug
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --enable-libs=-liconv )
+		append-ldflags -Wl,-x
+	fi
+
+	econf "${myconf[@]}"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			-i "${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_compile() {
+	default
+
+	if [[ ${PV} == 9999* ]] && use doc ; then
+		emake -C Doc everything
+	fi
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install $(usex doc "install.info" "")
+
+	insinto /etc/zsh
+	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
+	newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	local i
+
+	# install miscellaneous scripts (bug #54520)
+	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+		-i {Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/${PV%_*}/${i}
+		doins ${i}/*
+	done
+
+	# install header files (bug #538684)
+	insinto /usr/include/zsh
+	doins config.h Src/*.epro
+	for i in Src/{zsh.mdh,*.h} ; do
+		sed -e 's@\.\./config\.h@config.h@' \
+			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+			-i "${i}"
+		doins "${i}"
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dodoc Doc/zsh.{dvi,pdf}
+		docinto html
+		dodoc Doc/*.html
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you want to enable Portage completions and Gentoo prompt,"
+		elog "emerge app-shells/gentoo-zsh-completions and add"
+		elog "	autoload -U compinit promptinit"
+		elog "	compinit"
+		elog "	promptinit; prompt gentoo"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Also, if you want to enable cache for the completions, add"
+		elog "	zstyle ':completion::complete:*' use-cache 1"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Note that a system zprofile startup file is installed. This will override"
+		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
+		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
+		elog "or other user startup files that are sourced after the system zprofile."
+		echo
+		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
+		elog "one method is to use a separate path-setting file that is conditionally sourced"
+		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
+		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
+		echo
+		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
+		echo
+	fi
+}
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 73b57b6dba70..503a4d64a9e4 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-inherit flag-o-matic prefix
+inherit autotools flag-o-matic prefix
 
 if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3 autotools
+	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -64,10 +64,11 @@ src_prepare() {
 
 	default
 
+	hprefixify configure.ac
 	if [[ ${PV} == 9999* ]] ; then
 		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
-		eautoreconf
 	fi
+	eautoreconf
 }
 
 src_configure() {
@@ -80,6 +81,7 @@ src_configure() {
 		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
 		--enable-function-subdirs
 		--with-tcsetpgrp
+		--with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
 		$(use_enable maildir maildir-support)
 		$(use_enable pcre)
 		$(use_enable caps cap)
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-shells
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)