Install initialization script to bashrc.d, bug #338335.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 116 insertions, 16 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 94ec289c9504..c1c76934d38b 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.274 2014/10/27 14:13:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.275 2014/11/09 20:41:38 mgorny Exp $
+
+*bash-completion-2.1-r92 (09 Nov 2014)
+
+  09 Nov 2014; Michał Górny <mgorny@gentoo.org> +bash-completion-2.1-r92.ebuild:
+  Install initialization script to bashrc.d, bug #338335.
 
   27 Oct 2014; Michał Górny <mgorny@gentoo.org> bash-completion-2.1-r91.ebuild:
   Work-around race conditions in the Makefile, bug #526996.
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 1bc9696e759b..a65f80988b5d 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -9,25 +9,26 @@ DIST bashcomp2-pre1.tar.gz 3732 SHA256 fd201638bae06f134c243887cafe402ef0a21f9e6
 EBUILD bash-completion-1.3-r2.ebuild 3218 SHA256 65d588e08f44a8a654d88254fd135976a760c4e5574573cd27b6af65a2e7e8f4 SHA512 ffb70519062e81803c287444355e7b5c51ae70cca366b472aef221d4285535d4ce092bdbeed1359a7b9d5903f3f2bfd5d93734753724a283c861d91d8b2f1a63 WHIRLPOOL eeac8f6835e34e1e7d6dcdee6d6b3289097b2c6c619f024eb624248c2a1a454a1b18abec9df59a0b95107acf9808368cda9ec6ade626aeba2a5542731ee84493
 EBUILD bash-completion-2.1-r2.ebuild 4090 SHA256 34b75f419f50a4f9354775d573b60cae86e3d096904f7eae6faf355a33c64889 SHA512 f0236136e18d38d6a5fb99592c21975b7e2b5058ab9eb883e1be31acf3494f32cbc2dba7ebf424f4fd373a20ccab9dae511111dccd267bef262c850b79f5c13f WHIRLPOOL 3aca5eb741c1f6e0aa0036bada05d5ac7d4cfb0c81c7cb5ae730f99a4e3d905cad86274262d1450d2de5cca703261b265cb0c08d37aa86064d7a86efa60da6ca
 EBUILD bash-completion-2.1-r91.ebuild 3167 SHA256 5c063f0d34645e9b996f28abfbf9dca83c797d03aef112dacc93cce2df8663d3 SHA512 7c47ef36cee93ef33b06182d4e426cfe6b202ff195248120353b4f55689fcfc81f85868946751cf0856b666abef2a7a70922d96ed2450a15c5c91a9e87ab2eae WHIRLPOOL f70dc9429e24368f59e548cef0c006436bbfd8e2f5f3f53a374c24fbfa61db471950e430faf8a346810f68154f82ca2790ab361c7c68002d4588be56b536aea8
+EBUILD bash-completion-2.1-r92.ebuild 3256 SHA256 15ffac547a675b7ff49a4e120452bb325ffd45a00db2da152adf47784533c1f0 SHA512 9053ef23b6397743b800a403f52db01bf9957dc14ab76f5fc71273d1c2108ca4bac1d48dc8346614629d9eaf47979e272ec1f24518231a10d9248d668328e9f2 WHIRLPOOL a8bcd41b4f6aa418727ce5dae369d0487ebf0e6e97ce6eb4098d11805099f7e354bda1879bd07f2d0244d5cda7743badc7c544d72775441526bb21b6bf102318
 EBUILD bash-completion-2.1.ebuild 3430 SHA256 f32bfb8898fd5591e95037095b4d646526448b2ae9d1c0b8045aafeba8f3f21f SHA512 f6b62b85d51b8c327933c58805e1c46cfb4c2fa82f009bab9b91f5e5af790f1f771f08eab8a3a6c2a03c9c9ed1932e4a5641f9afd1ba6cf937fbe6849bda8c9e WHIRLPOOL ad3948f6d1e05002e4d3c2dd3c84007e14fd47461f5973387d2a2d0e221eb1a06aaaaefd13dab69c071039a989d50a3b888d3a615e52a64088113e5afe12401b
-MISC ChangeLog 46447 SHA256 265821bdacaabf4c53d5446f53edc18bb8cf497ddeb199d4b55324425ac5b24f SHA512 d320f762c1e8314a2bb8f63c662a64fb541ac558406621beab776c5919263916f9d8ed31df78d357103f132b2929546569782b0af2f0d2a84224fbe842e8ac2e WHIRLPOOL 5bb9f6a459babac45547c8dee08424254137110c35be8ebb64370346324a16cc0023d9840dd3800a4bc3326c58f8e8dea563029a29137ac752e800593863ccbf
+MISC ChangeLog 46629 SHA256 2b66b15627f13748db31585847d35e94f97670cd74bc5749f749f065c1f245f9 SHA512 20ce31e2320bab1e404158f0c62d26c68515e1d8b6dec9ecc5f8b97792c313449543be4b89e3a6bf2c6760aa2a67cff82ca44319dbe724318c7b6867aeb34221 WHIRLPOOL 57d1cf6dca9ec78c51b0a0eadc7524f030c58b83ee9e90971456cabfaaab79fd2dd0000081e6118e9d5aa184f1dfd113c923249bcb972cfdb95c480bcf5a86e0
 MISC metadata.xml 1020 SHA256 785eaa20ef6e8c3d46916e22ecbf772ddc9ac12243d2f50ffd149b5f0e5c51c2 SHA512 305eddc1c77d281e6c64417c9d1c2373d20b6a88ae1f27764488814343eb7d5409705e645b31fb978774352c76cf4a14d0d51949a2f2945a8e8e168dd6d59528 WHIRLPOOL 52db2505ddd82f53c74675babc2ea35d3551091254f13638390662cb151bd65f87d36b26245ae90605cb6c9b8ba74cb25ce27158ce2016e8e2192ee47ea6f979
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUTlL6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUX9GEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXAwP/RpoPDtk2xo1VrnrXwYYI/vX
-v9F1ztA6zjO7TABC6Ooaj3np0FezVEltKCb2L7A8M3DvMX4DVzv0fJz1lrbLmASd
-NZowMzj3jPg+whnwDrNtTOQly+8iYXoUHyxkvO31RJOLGa58HiF0xX17y7x7O8Ww
-jQwcJdFa1tQUg3k89MdCaR8Nf8YzKfSgVuuaf5oClJPT93nEOODgIdI5oITtRqT+
-oAAoIWRbXrOYZGZR/uicgTB9wqyp/gpnJAPEu0+r8lOfy62Y9QXPMWGTgeOn4vsr
-zUdcU54vpb6aHDV8VHSpSsButHDnviJItBz6an+T6vboOcI79wNu7JvbCLsaTWUc
-5/J6wlQhdxIL2+5o1JqlSpQ6yRnSQ7XIP+fEqlU4eCG4XCwnZszjonLIv7aeGV72
-WI6dQkymXD5bmv0JPAufcmwwPRHLY3fGS1hMnwY4AaEg6ILxFSAI4Pr/qKVm7teh
-4Xlf8toLUYdspV5OfvI5fDuQcM7SXNy3Dd/EFhBJlq9cdm4bIzwjnRSFz80xbEsM
-c44Dkym6GwiWlCtaW+FZ6sVhapJi59h3UvL8gsRPpkL7NoJaczUZ725MvjWq6mOh
-uRojQh2Zpy1zOU1c3cSTri+xPBmcc8Nh0duSOk0ZmtISa7QB6RV05UMyrhJhrGeV
-vPS0/67e07hMDQ32LmoA
-=XCvG
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFcMQAMj3Yr04RQ+hFFjyjfMBqE7h
+fg38itqpU9g4ZMI6EwEfEi/K4UwNxf7rJIjHDUxNYdbVoMpK+Rqp8f+W7dUPyPV/
+Xv8F6CWwwHRJtxvC5Nnk0OrLoGjuywGJmf1wHZcSyMRJRfTggO+z4sJbwVLfC3om
+9xR+CKzqW+4nACYZcTTwK+J5WrX/8yblwt1Mp4PULtCePA6sngSUhBpx9+g51b7D
+1byBlReo0KNF5zQUj2FfQYPata3UO2aqaRRoQub/dW8hVM5IMTomLO5pRQzlWmjg
+oMOzLEtAgPHQ55Y2wRimMPqLabFdC0tgL9O7pNsT/GLa6BBsRQer0mHpoOVvpycX
+Wg5nCxKbMXustHzYfTF5JyUtx8r3Hc71ef+LjKHT2DAwOs8yPqSHfRUfXXcw/OM6
+2FmHsy/INF/atPW+LbgsaKNFZysd//c0aP97LSI0/l1TpP+jbnXORV06NJy+44My
+sEb8fx5iuZxWo9Qsnr3P5SIRDs7NkwP6vyXaimkKWzMYrNOysvFu67VL9vudKE6F
+3dd1esXXxCWSAJlPClQgak101FYUN68cCYV6rE386HEuoMwhrOzx8zapT+VlioHO
+UVuYkTgWyJtNoj/lemut7or1IfR3+G1P3wGxM3l0+QYd9ZM2a9lBHqlFNqc5Op6W
+BmfmCLUG5oqv6hrukElJ
+=z7ct
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-2.1-r92.ebuild b/app-shells/bash-completion/bash-completion-2.1-r92.ebuild
new file mode 100644
index 000000000000..1d9053d77592
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.1-r92.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild,v 1.1 2014/11/09 20:41:38 mgorny Exp $
+
+EAPI=5
+
+inherit versionator
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="http://bash-completion.alioth.debian.org/"
+SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2
+	http://dev.gentoo.org/~mgorny/dist/bashcomp2-pre1.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 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+RDEPEND="|| ( >=app-shells/bash-4.3_p30-r1 app-shells/zsh )
+	sys-apps/miscfiles
+	!app-admin/eselect-bashcomp
+	!!<app-shells/bash-4.3_p30-r1"
+
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+	# Included in util-linux, bug #468544
+	cal dmesg eject hd hexdump hwclock ionice look ncal renice rtcwake
+
+	# 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
+)
+
+src_prepare() {
+	epatch "${WORKDIR}"/bashcomp2-pre1/*.patch
+}
+
+src_test() { :; } # Skip testsuite because of interactive shell wrt #477066
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir=/etc/bash/bashrc.d install
+
+	# use the copies from >=sys-apps/util-linux-2.23 wrt #468544 -> hd and ncal
+	# becomes dead symlinks as a result
+	local file
+	for file in "${STRIP_COMPLETIONS[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+	done
+
+	# use the copy from app-editors/vim-core:
+	rm "${ED}"/usr/share/bash-completion/completions/xxd || die
+
+	# use the copy from net-misc/networkmanager:
+	rm "${ED}"/usr/share/bash-completion/completions/nmcli || die
+
+	dodoc AUTHORS CHANGES README
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}"/bashcomp2-pre1/bashcomp.eselect
+	doman "${WORKDIR}"/bashcomp2-pre1/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
+}