gentoo resync : 25.08.2020

3 files changed, 148 insertions, 30 deletions

diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index be8ec57bbf6a..59909833e9fc 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.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3 SHA512 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
 EBUILD bash-completion-2.10.ebuild 4694 BLAKE2B 513fbe0f35bb1fc7cb2865ed7ac6fd3fb6a1168833cc254c31777d31c06d8ec3c9189010cb0f7ecc7ed5dea3388975c42f849a364e897af446d73cf249226d02 SHA512 f2c8c3da453145f1b002410048c44e579dbc42babd1d58cf153f3925e7f62018e9db37a776338ef09ae2e601cb2abb24d748b74691578b960e92524f6ad34113
-EBUILD bash-completion-9999.ebuild 4702 BLAKE2B 1f8284b4cd7f93912eccdc0e90a6ff65939bc1df16d2701783bd1f00afe49c60701819438dd95548ca4654ef83713a6a644cecfaf1d642d537882e0eb147ec76 SHA512 46cb8472ea55fd468eca090474a1488389427265f9eb1d20a2b20011c5f6af19bd0f89b1c507667edc52f406b004215bb8f1c0ef2f7fa7dbd6b5949aa2978434
+EBUILD bash-completion-2.11.ebuild 3980 BLAKE2B 4e2259f50e70ccf30c10314eb462de85c3af181a57fef41cb0d9ab120ee51493387da28df3656003b2edeb4212c8203f7769d8afddd702af8ae2c21841b5063d SHA512 530dc47995274b63a8a265b21e6cb8cd77c75ae8ed8d59a2624d894a95d85f65d227e70e5d24b80ee4efbd34a3a1029183b10704b6921e70ea2b2d604ad669b6
+EBUILD bash-completion-9999.ebuild 3895 BLAKE2B 4029f4c92080e9a351cc5f4d3042f39faced24da1d45ae990264424c19e12388394be53b3917eb894d44d1bdde7a048df122a3044ede67e54d192c5b026894ea SHA512 6a58d0a8fa1546525070694f8a3f72a6c9fea9a2a40332cf71a81cdb85d7acf4196fdffc8fab83c7ab6603ba6f54b73be5f91189ee4e8ac529c74de12929c1be
 MISC metadata.xml 1439 BLAKE2B 06bfaf55046a8e6001e3de802ce5a2fc11b32897726930ce1e98b41e75faac78e54ff8ee947f4fc85a207b64c342c6359298ca08e66e39a74a0c8c99cd0fe4cd SHA512 2d6fab5c7b6f5539bc0ea7f56ca787524d0ef20777b86e58c87200423bd10081dc21053e21ba9084e7a7f4ec03d73d71ac4b7cc1082e1da3ca8d1499b996612f
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild
new file mode 100644
index 000000000000..b386f822ac36
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{6..9} )
+inherit bash-completion-r1 python-any-r1 user-info
+
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="+eselect test"
+RESTRICT="!test? ( 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}
+		$(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"
+
+	# redhat-specific, we strip these completions
+	rm test/t/test_if{down,up}.py || die
+	# not available for icedtea
+	rm test/t/test_javaws.py || die
+
+	eapply_user
+}
+
+src_test() {
+	# portage's HOME override breaks tests
+	emake check HOME="$(egethome "${UID}")" PYTESTFLAGS="-vv" NETWORK=none
+}
+
+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-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 9a5d22feb862..7e52aa2b889a 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit autotools git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
@@ -23,9 +23,6 @@ RDEPEND=">=app-shells/bash-4.3_p30-r1:0
 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}]
@@ -85,42 +82,24 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
 	if use eselect; then
 		# generate and apply patch
 		emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch
 		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
+	# redhat-specific, we strip these completions
+	rm test/t/test_if{down,up}.py || die
+	# not available for icedtea
+	rm test/t/test_javaws.py || die
 
+	eapply_user
 	eautoreconf
 }
 
 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"
+	# portage's HOME override breaks tests
+	emake check HOME="$(egethome "${UID}")" PYTESTFLAGS="-vv" NETWORK=none
 }
 
 src_install() {