gentoo resync : 10.11.2019

9 files changed, 84 insertions, 192 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 039510739149..016adcb12a1d 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 10a4ee7a41a1..362251d84231 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,8 +1,6 @@
 AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162db2f8e35fb20d3a24f9e4c067e5297816d91a85ffcdd3ff43695f3c361959cba59b887afd0d12e75fa317899054d3a615ee3da615a4409ec SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
-DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 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-2.9.ebuild 4694 BLAKE2B 5bff08075de6af572d855425a249eff6a858593128f59864601f77aa2526a6a59b7dd73a27eb7d7926104d1e8e269222931c59bb0bd11504ed3814efaffed28b SHA512 5559c40fbd2881cd9de31134721d2e7c7bea57c241820673e0cd8b9b495375e4c2f9b38cc4a1c7cc18e95bd36082e608fac41498201d9ad495fd258d497b2df2
 EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0
 MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.9.ebuild b/app-shells/bash-completion/bash-completion-2.9.ebuild
deleted file mode 100644
index da4cf1463bc5..000000000000
--- a/app-shells/bash-completion/bash-completion-2.9.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASHCOMP_P=bashcomp-2.0.2
-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
-	https://bitbucket.org/mgorny/bashcomp2/downloads/${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="test"
-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? (
-		${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
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.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
-	# fix missing aliases
-	bashcomp_alias tar bsdtar gtar star
-
-	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
-
-	# install the eselect module
-	insinto /usr/share/eselect/modules
-	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
-}
-
-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/kshdb/Manifest b/app-shells/kshdb/Manifest
new file mode 100644
index 000000000000..402199b7491a
--- /dev/null
+++ b/app-shells/kshdb/Manifest
@@ -0,0 +1,4 @@
+AUX kshdb-1.0.0-remove-COLORFGBG-message.patch 1456 BLAKE2B bcf118c00b0324c8691a9a2518db272a20d1d23eb4ed1f5d5c00f92a4b8a42877658711ef0e72d2ef4eaa306b76970e152ab453fc480f972e2ce59cf94cbce8b SHA512 c25ec469594ac839c6ae068534ecb63ba72e7193985c0f190dc61840c8a6ab0d127b47a97ed3454d64a03a68063aa67a99fbed7ba125063af5a0fa5a493f3cf6
+DIST kshdb-1.0.0.tar.gz 153633 BLAKE2B 91e5d77e1a74f98149ef4c953c34b6a4ac43f68c930092bde6f5313be6d581072fb8ef39a500204e5eb544e1e6bc53d1f5f7800ba1d333020f6908bbde2268f6 SHA512 f010b3b739f1a9fdead52c251a536405f8cbae67882c554b034ef115a9d9ecd60438d883d51dd282a747068e108ad8e5d9442380b6563a2aa262c35b423ee1dd
+EBUILD kshdb-1.0.0.ebuild 463 BLAKE2B 4ac370d244aa038eb3b7fe07726669c2b9fd4e15d1d9c97c2ee7465c5dfec97eb36d96df97ff161a2081f407518fe4603f7150bc46b1974dc68e86c84ab750bc SHA512 5277dfa16043151398c863fa86dcc3902a0be0fbfd69ff6c94e77feded826dd70e1087bc5eee6d9a67f39d01b493b7bdc5e82e99447ce0074e30e1db390bf104
+MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/app-shells/kshdb/files/kshdb-1.0.0-remove-COLORFGBG-message.patch b/app-shells/kshdb/files/kshdb-1.0.0-remove-COLORFGBG-message.patch
new file mode 100644
index 000000000000..48db4dbccfd5
--- /dev/null
+++ b/app-shells/kshdb/files/kshdb-1.0.0-remove-COLORFGBG-message.patch
@@ -0,0 +1,47 @@
+From a989aef80767d6608f3c3c9db007c5aafd022358 Mon Sep 17 00:00:00 2001
+From: rocky <rocky@gnu.org>
+Date: Sun, 3 Nov 2019 18:23:07 -0500
+Subject: [PATCH] Remove COLORFGBG message from term-background.sh
+
+---
+ init/term-background.sh | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/init/term-background.sh b/init/term-background.sh
+index 63f6e7d..716bb04 100644
+--- a/init/term-background.sh
++++ b/init/term-background.sh
+@@ -57,9 +57,9 @@ get_default_bg() {
+ # Pass as parameters R G B values in hex
+ # On return, variable is_dark_bg is set
+ is_dark_rgb() {
+-    typeset r g b
++    typeset -i r g b
+     r=$1; g=$2; b=$3
+-    if (( (16#$r + 16#$g + 16#$b) < $TERMINAL_COLOR_MIDPOINT )) ; then
++    if (( (16#r + 16#g + 16#b) < TERMINAL_COLOR_MIDPOINT )) ; then
+ 	is_dark_bg=1
+     else
+ 	is_dark_bg=0
+@@ -172,11 +172,7 @@ if (( !success )) && [[ -n $TERM ]] ; then
+ fi
+ 
+ if (( success )) ; then
+-    if (( is_dark_bg == 1 )) ; then
+-	echo "Dark background from ${method}"
+-    else
+-	echo "Light background from ${method}"
+-    fi
++    :
+ elif [[ -n $COLORFGBG ]] ; then
+     # Note that this can be wrong if
+     # COLORFGBG was set prior invoking a terminal
+@@ -196,7 +192,7 @@ fi
+ # some environment variables
+ if is_sourced  ; then
+     if (( exitrc == 0 )) ; then
+-	if (( $is_dark_bg == 1 ))  ; then
++	if (( is_dark_bg == 1 ))  ; then
+ 	    export DARK_BG=1
+ 	    [[ -z $COLORFGBG ]] && export COLORFGBG='0;15'
+ 	else
diff --git a/app-shells/kshdb/kshdb-1.0.0.ebuild b/app-shells/kshdb/kshdb-1.0.0.ebuild
new file mode 100644
index 000000000000..e2a594debadc
--- /dev/null
+++ b/app-shells/kshdb/kshdb-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Korn Shell Debugger"
+HOMEPAGE="https://github.com/rocky/kshdb"
+SRC_URI="https://github.com/rocky/kshdb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-shells/ksh"
+
+PATCHES=(
+	"${FILESDIR}"/kshdb-1.0.0-remove-COLORFGBG-message.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-shells/kshdb/metadata.xml b/app-shells/kshdb/metadata.xml
new file mode 100644
index 000000000000..de09ffd8b089
--- /dev/null
+++ b/app-shells/kshdb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index d764305ac50a..6b668d778035 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,7 +1,6 @@
 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-fix_infinite_recursion.patch 1102 BLAKE2B b5bcf1cec800e83726479be36525870329e6543220e58b72c9a9ed89d9c28f459fc5fedea2986a8e6b89bbeeb303e4d9a1e00e3ab2a3602e9c09389d745a9a16 SHA512 f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353
 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
diff --git a/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch b/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch
deleted file mode 100644
index 042b948b23d7..000000000000
--- a/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001
-From: dana <dana@dana.is>
-Date: Sun, 27 Jan 2019 00:26:31 -0600
-Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion
-
----
- ChangeLog                                      | 5 +++++
- Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 -
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 81668ccc9..be243c1b8 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2018-01-27  dana  <dana@dana.is>
-+
-+	* 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
-+	infinite recursion
-+
- 2018-01-24  dana  <dana@dana.is>
- 
- 	* unposted: Config/version.mk: Post-release version bump
-diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-index d171c68ee..5ec21da9f 100644
---- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
- }
- 
- 
--(( ${+functions[VCS_INFO_detect_p4]} )) ||
- VCS_INFO_detect_p4() {
-   local serverport p4where
-