gentoo resync : 29.10.2017

3 files changed, 130 insertions, 1 deletions

diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 8b0d28d04b28..9fe52a8e1ac9 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -5,8 +5,9 @@ DIST bash-completion-2.7.tar.xz 280048 SHA256 41ba892d3f427d4a686de32673f35401bc
 DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585
 EBUILD bash-completion-2.4-r1.ebuild 3173 SHA256 09d54454ec4c629c21747d071a2c31e432289c207d96b3eebc8cc651ec2fef2a SHA512 5421a782dff1e908fdaafa97b58bcacdaa250ce6d0a701765506bd3384a5f32983bc86e4733336913462102c842b8168fb9e30450180820ce0c6239582467cce WHIRLPOOL b2d3d4d43181c63fa2c49358c6a5d47f310fd6cf578167180aa43eb49784bfa8f0852954460118a34001f00f585459ce975003fb8612931c2b312ab37f038d75
 EBUILD bash-completion-2.5.ebuild 3183 SHA256 2d5e15afb28616799eb7b6129f1c112009155685b7c15fe0dc8214820ae21ae0 SHA512 a3a790e199dfba8150c2f5abdc120e5c3b8b41814f996c034e432b4633b211f79eaf056a3622823b36ea0a259cb9ee3ce09210e3e631250fdd6cc315a2642e0a WHIRLPOOL 35e91efe36b01564a3e913980c5990ee5cd1dcf0f0826d360adc42dc3b3cd07ad011e348c6d3f380a450e351b006dbd847ee7b79469312502bdb4a10e5fce34e
+EBUILD bash-completion-2.7-r1.ebuild 3880 SHA256 cc720c4b6680d7e01ceb6058d7dac216e13d856689debf90bd14533f987acf93 SHA512 ad265aeaddcdacd962972df67c996735a08ab82de41a24e23189f4f1b81fe753d2b8f588e4b36699b98a6b0072a5f23b2267c3cc369857747b4c4d97e041cd16 WHIRLPOOL 990c22675fd92eeea3227ecfe228fab498345e97d973a77467f70b06869533fb5cc7cca3547d900071467c86b320d916531c090855b742c16144e5d4f111a780
 EBUILD bash-completion-2.7.ebuild 3830 SHA256 f9ec686bc229fab63cd5ce40eb1dbae31390b6a5dcf7d5b9beaf0795971509ca SHA512 7d49ec4fe462c1cf62ad61e76d4427d231ad8aeab4dde7fa0a921b13503a4ae4f382d1de820f208c13ec656af2d26aad8e4b107a906e941863e5ece381b5e645 WHIRLPOOL 4e91de2ddba1f285dacba09265a2fdf7f590a9a5d202aae96ecbd09b1bbbc9b71380269e78b6eb9f8a792ce241c23297cd9ad2849d8969a9bf855226ba1f6fd9
-EBUILD bash-completion-9999.ebuild 3798 SHA256 6e46d1c15ed52aeddf28bdb6ab7be20bf445a92f236c70824fc026113d3c23ee SHA512 6c0f24c7202bf08fcdc5a7e1e78187be0349bf83bc1aa98a5f47551adf355c88ab11f53693c0972ba2622c477f549f91d3f5b1bcdb407ab96fab9311cc649a95 WHIRLPOOL e33502210356baacdb67938b790384b1fed0f67e7500866345daf9c7135a5727a17e0c5b3517485ca82e85c1ea5131f1db4394e4575ed5dbb2372cc4599f1ec8
+EBUILD bash-completion-9999.ebuild 3859 SHA256 4916b1c81013285d987cf55c22af96ead1e35f831bf99342a351d709ee49da09 SHA512 01d182b8eba17ea9d661b8c562e5b066c82a3913e593ff82da817f0c882bb13e4ebc825cafd9ff9bf594fd545da90dad2f5db498db5e12a089d58f5e66b87633 WHIRLPOOL 56fc5d5d8aee6983c1b2b1c74f42b8950f8a98c214788eb938a79598a9d23ea61014cb14b0bcfedfb07364042854f8a364bb94e1642ce5f718b7c1e9a765acc9
 MISC ChangeLog 6192 SHA256 7aa78e4d3347e97e9a2676ad90b03dcfbf6bb185ce6f53050786420a7e58b42d SHA512 d689eca6fe0572923dbc618aa95d7a4b43a92654d6485ca14ae974581c3728dfeac45f139788b22b56d17ae86e063316e474f8ce10a7092e43abaad840579c2c WHIRLPOOL de6bc49d153a04b105d21a4de5def31dc028638190a4b51d66d241abaea7206d5704ddba15bef9a5f74acbce2a0b134d9bb38deacac896e9ab4efd16ccc22ddc
 MISC ChangeLog-2015 49155 SHA256 df2d7ecd84a601d6a713409dd0ea3f8c2dacadf9b2f637769c6e8787d66cee1d SHA512 31fec84312c20ff1612f57f1bac506937c128b13005246ba36eaa449c1aff7712cc3645952fb9eebf3a24483590010fb5a954d43f238f47cd759911830fe5205 WHIRLPOOL 1463d6fa3480fd139341ade021e1e70884dd72e5f22aa16cb74eb11c8c4b606014b0b4f6369db06fcc9c76e354016d196a2b206fb0681c5b71237aa37991c914
 MISC metadata.xml 1285 SHA256 efb4f76c8b2dfe1e809c94fd10aac8b3a4e3ada43ceb33f95193ba246a482529 SHA512 e935bab45ac355ca0a05df6f6f9aaf8e20ef73fa3ce4f2bde83b331cccaa7ae7756a6a62a075b148194b556da8f41f4cf2aa72f271958333d026913ddbfcc133 WHIRLPOOL 6e76587fa0d9e19603fb1bd27100c076ed00840f994bd2b73b9208f438503874dcdc02be6a9c986666cf6d00fb9068d6a6f6dbd1de7662e282be11652412ac83
diff --git a/app-shells/bash-completion/bash-completion-2.7-r1.ebuild b/app-shells/bash-completion/bash-completion-2.7-r1.ebuild
new file mode 100644
index 000000000000..421b73926166
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.7-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASHCOMP_P=bashcomp-2.0.2
+inherit versionator
+
+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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="test"
+# Multiple test failures, need to investigate the exact problem
+RESTRICT="test"
+
+RDEPEND=">=app-shells/bash-4.3_p30-r1
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp"
+DEPEND="app-arch/xz-utils
+	test? (
+		${RDEPEND}
+		app-misc/dtach
+		dev-util/dejagnu
+		dev-tcltk/tcllib
+	)"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+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 ifstatus
+
+	# Installed in app-editors/vim-core
+	xxd
+
+	# Now-dead symlinks to deprecated completions
+	hd ncal
+
+	# Installed by sys-apps/util-linux-2.28
+	mount umount mount.linux umount.linux
+
+	# Installed by sys-apps/util-linux-2.31
+	rfkill
+)
+
+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=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${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
+
+	local file
+	for file in "${STRIP_COMPLETIONS[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+	done
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+
+	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 ! version_is_at_least 2.1-r90 ${v}; 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 543a7c362bb1..0d8fdec50aa0 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -45,6 +45,9 @@ STRIP_COMPLETIONS=(
 
 	# Installed by sys-apps/util-linux-2.28
 	mount umount mount.linux umount.linux
+
+	# Deprecated in favor of sys-apps/util-linux-2.31
+	_rfkill
 )
 
 src_unpack() {