Fixed bash completion (bug #477826)

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

7 files changed, 36 insertions, 30 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index ba2c261a8e54..bccfd2e478e7 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.124 2013/07/02 07:01:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.125 2013/07/26 10:54:22 polynomial-c Exp $
+
+  26 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> mercurial-2.4.2.ebuild,
+  mercurial-2.5.4.ebuild, mercurial-2.6.2.ebuild, mercurial-2.6.3.ebuild,
+  mercurial-9999.ebuild:
+  Fixed bash completion. Thanks to Alexander Tsoy for reporting this in bug
+  #477826.
 
 *mercurial-2.6.3 (02 Jul 2013)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 0e705b20d6b6..70ce6915b5c4 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -7,27 +7,27 @@ DIST mercurial-2.4.2.tar.gz 3613392 SHA256 cc21083d7eab4caa8159b941e36c7229acbb6
 DIST mercurial-2.5.4.tar.gz 3673850 SHA256 c86fe9feb9aaada286fa297d9d68d1b16e2f842b8bd645826c81bc705a629d5a SHA512 928fdeaaf0eaec80adbd8765521de9666ab56aaa2101fb9ab2cb392d8b29475d3b052d89652ff9b67522cfcc6cd958717ac715f51b0573ee088e9a595f29afe2 WHIRLPOOL d90a0c6a8752442ad2f7e524a4b07910538aa9d910ae4889196eb41cdcc903dbfb3f17d18f54a788fcf8232e154852566503d652a3904b4b307242a7d306ce80
 DIST mercurial-2.6.2.tar.gz 3740489 SHA256 55b4a0e20e21ebd7a4341c828d2ec4ba72ba77d61b424e937a7f77c385220e3d SHA512 88aa79cb523b77beef0d637159abe096abd590f3193c65294eb8850cbfd355bf21784bb0e39338ce239d161d91be08ac7efb2cb3560f7b3cc83ade6e64a9c1b1 WHIRLPOOL 2a58ff31546cd32ebca207ad54656aa7d6b49a3caaeacd54abe5c774ad3b3fc31810c2ab4b8dd30bd3e5cc3e8613984cc209f7a6564cc4ef66a01002b2ddc119
 DIST mercurial-2.6.3.tar.gz 3736480 SHA256 12308a4210f1ee1185d03f18757742fa8a2759076c2e713f35432f89bf56911c SHA512 f739fb1455be998f0049b5266d8d5b1d8c3700526e853abc18bb215c8afc2b4d77e0c26d113cadab0c20483b9ecd98c9acce23e74e7a76492494b3b33389052c WHIRLPOOL fe12b34d16e5ee24f7da7b0c91a39f042ef4d97cc487f3998df1f52cc6586affa2cce012ab6bbc715dadcffc76d82fc80c2ad9258003d8dee5a5a0987a8b335c
-EBUILD mercurial-2.4.2.ebuild 4205 SHA256 e83115c31a5188e8eaac882ddce4e5a319bfd6bd8b2546f2734b3e9a35f1b014 SHA512 b64c82462d8c2ff4f24088b82e08ec3154b6aac08b44774a5e30d7f64e8346a9e18d624c3abe6e57d8a1e64bf60c9bc47c456186d22a316d0c10f7bb1ce847cc WHIRLPOOL 70d109a32ddc21d494c361ad66c8a2e2b60ea1346fedca67820a9ce32285fc3a24b9e5530501489df15cf1a494b43e54c29b8be3ee5f2c4b11f3cddd3fe80fd8
-EBUILD mercurial-2.5.4.ebuild 4434 SHA256 802a0947aaa8f6e007544d287adf4799cde8cbb649675a44c0626804b3e8f6e3 SHA512 59dbd1704c47309c035b92180681a15ebf1fee604b355303694e8a08d8c3bd2b62cfa3d6a14aaa4e24a58584bc26ce0fad68fd7d881cd29b40490a9a4c51d67c WHIRLPOOL e318ff12ef41f8f04ba2eb95e9b40c28d156cffcb7237ea2db56c7c4eae82d698bb3cdf3e0ef8fe6aa44834e4347a1964c73ac268dc4aa683950843a8871ec54
-EBUILD mercurial-2.6.2.ebuild 4437 SHA256 8ebf4c7beca5db0e92be8d598584d091971ce85951884c7724141f4b5d082a5f SHA512 b2617f92e1e02cf23d834e72d51a3b842939b5318270fc558a2d10027a2d10cba6241bdece5f94c8de854c520c09b51fa1872bc843eb6f1b097de44ca43fe75a WHIRLPOOL 355965786d028ca71eb26af58699b4c9367aad3115121cbeb033f25706ba250657ded3b907d4cb6cd86e86e5c23f9f9afc94da85527a8acdb23a0e3a92fab403
-EBUILD mercurial-2.6.3.ebuild 4437 SHA256 749bf0250d09eff0deee0e7c179895a08cb9d130905d6974d0af03cd82207fe4 SHA512 c79d2e340328580de8cc8e8d94feb8797759def8a0acf5b42d246d6930d9a3d5c8e24aca64a63846edf0e868185cd35d6df1b9b19f3f5bdf6baf8fd091e5d237 WHIRLPOOL e92cff022df6a87aede368052127d0c1a71f9805c651d883e95d59582245910f561fa88c47c0036e11eff5738b03919d4b26d89141001b6226b07ff773578764
-EBUILD mercurial-9999.ebuild 4260 SHA256 5b239abb781847009e4b6b6116ef33dec80c038426621f278dd36e2ebaa83cca SHA512 021945d82dbb6ff4121be9a12fce2c610b241f90a74058b21bec0dc248646081acfc4ed44b29866fb7d1fb19aa9a30ec6a6efb4198965f901cef010f1daf1b6e WHIRLPOOL ffce0e96c7976f12c34dd66443dcee25705d70ebbcda10869c0dd3d95467c81b0b248bcf38af3006717dc2054e6980870081574564abe32605734e027df9c129
-MISC ChangeLog 35319 SHA256 aa2d8238374ee60d4fee2facb547b1e60babdbbbd62538e6a3c96b5b443654d4 SHA512 7235017e1a2ac4acb7e46ef173df644952cf2ab39eba27460ef86ed9cdbdebf600f93a50f24c5820c8d7ff50115666140e2fdf7b7c469b06f99705095b1c915f WHIRLPOOL 69321d7039fe7e1067a59fbe16d1e8af3d933bd9e0ef6c7fbffb3c3fa7981eea43b4706896197ed24b1ad4747d92d72d471759791b4c3690a3460fa3c261642d
+EBUILD mercurial-2.4.2.ebuild 4211 SHA256 e9d9b07b93b06ae53566f32f603660718ee65ccc65a28396bf7c7b59346032e0 SHA512 9f38469f2f2ed21c35c4d69b1efc3430cee27b924de36e8ada008939fd888af446f1bb08ced85306debd17acf947913a60ed1daca8c4391b9e2df574c1c3694d WHIRLPOOL b7d23ebb35d194389c6764e4eebc5861ba6561254357c035bdec5e6ef0cf1d7597d026f2989bed654d8c6842bf2a9648eb077e3b33e18d19ea0127b935f90c91
+EBUILD mercurial-2.5.4.ebuild 4434 SHA256 b13b3f0099fffce2c39ee6a8a315bc746b7bc250182581519249c64525b748bd SHA512 18f5f9daa8b50bbcc7770e0b60964c49ad65f109c596a4ae1cd1373b5c49b0ffb1008ca64465f1d93ff85da4c19f4ce203a81636b4f00fec7bff49d6b284461e WHIRLPOOL 7eb7cf6c49410f058150fc679c24f35d5d10541182e4dbc823eaddedeeccbdac53b01be5daa8bbebd1428c03a32bf688b2a293d02f14b4b9564a413376f42318
+EBUILD mercurial-2.6.2.ebuild 4434 SHA256 5f51c7cd1ff91129beb8d769cea93e39ee044ce17fe2f688bc5b8de2edb899bf SHA512 70c4d46db97c7546f6ad71afb79aa537360a0e4f10a91e7da8e9170108dc4d185a2e4cd7510aea610ae686af4c3d1c9744a79dfce950924586945c996acb9715 WHIRLPOOL 666543272eef9b3bc6fff528b2d96646e7008794b46717286c59a6c0f62f916e5485734c20bd574e67ca71ec35f3c50863d074902272b32a432e8b8b39bc6a69
+EBUILD mercurial-2.6.3.ebuild 4434 SHA256 2b6444406f21a463474033a5fa3c7e9311fdca9bc72bf50389f5e19400aa1ead SHA512 ddba217c846e0abe8720a9071ceb5308d8ecf3e4a4d6b8b1cba6786673dba44a7d2d5ffe83bfa1cfe1872c28218e118be58359c8355ec9a220d130556b3ad60c WHIRLPOOL 2f0bad7ae2d4be3df387b6d18ac4e11ff1ed4558c6741c02615755565f63aaa96cceba8437035c0f2855dc84ed93aef84a0e6ea52e20e5da935f43363bc285d1
+EBUILD mercurial-9999.ebuild 4260 SHA256 8211401a9237bd45804a4a2ee250c91a91dffe14dab3e9129a625a7eaf1c7d8d SHA512 b5e9d7993172f49381e71ebe39e3b17fc42fb33fb6f3d5eb36b01b20a3a694d1a1401b4c263116af2ba0f7087c30a9f7f0a198b7e94d3823f579a8c7d311ce3f WHIRLPOOL 2a162a338c893b27ae8eb9948c28a9a049ec9a899bee335e1c2195e7f045c60b6ea3998a8dd566b30597d67f2934ad4593e85aa4d5c7a73a6e737dc8ed0c18eb
+MISC ChangeLog 35584 SHA256 ed87128512abaddb070d439336d399976dd2ce44d45576ea725767e10d240e3f SHA512 4bf010f1978a4f490c28cf3e4780f002d694ab722a8e1998427cacbafd6721b4d549ca0cd7343fe34d92818401467eee20b815938bc2f45f0f9c359fceb61b6f WHIRLPOOL a38ba0bffdb644e7b16f9b9f8d6d1ff8a6dc091d9e3012d301d91bd8428b085152443df82a2e18ce5b1621faf1e63f4cf64a54088a5904d2d512eed856da9581
 MISC metadata.xml 704 SHA256 76c0566b9a503099f6cf40750ffe09726dcf338e24378e780fb932cbebe1f0c1 SHA512 21a386ecca4b3d337c69019e750752df3f06137de8b8b27199b6218d4a5253bade522c5a9183340dfea61333bd783c14d60ff3f3e46cb58121c7100449722bfd WHIRLPOOL 7f64d01b4d31ae756e63e16be8add1bcba9a073961663ae481be883a5fcc6e3473d5da5f26d524502ade4eba0b2f3692934ed63f1e41bfa8d8b6a0a1532e11b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR0nq5AAoJEPiazRVxLXTFXDQP/RIEBhOXtxK2X8k13h7dc1C4
-3mvY9S8NPzJ6NhjVaVBAKkbFQ0WK7wL6J2hCcZu812r0ZxZAh14ExbNnsZkbJieu
-5lF8M2nRhucZgreuHUnq8CPo9BO9fvKMDVwtnS8o2QbSHTDkp4aroQKgF2MG+Jgn
-DsYgrCBFPjD8q8zU0ucIawzUx5ZYw+oBQqx5H2fuzQOsjfWCQnzbw3cKih5ZMi9Q
-uYpkp/v4sBRB2W/HV+ZCBn4+7EOx/mqjJg80HHPtfZF3lfb0z4c83SXEs7yYViKJ
-svuL6Vg82N8YkCUcGLU0CIuOtdx00msfLcvvJXAc0TNhHpCTxm9litZ+2ZWwtV/Q
-6v+6k6c3m6DvNTCHriSsebzuCvi9q53gO3KPMqEGvPUL3jE+mLDtoqAVIcvuaqQb
-apnLwByh747cTnzxwlmww2IfevjNh/y0jnWiJW2W1H/H1u9WqS/LcUF1BepExuGL
-G5RHfcpa5pUq2cvQ6rlCi6wUHxHkhIM9EKJOZDKk3h/bYgAPGkOG5sCTI7XVQp0n
-Yz+5SblPfTj0a00HYjcXtF5PQ8NqnsKzWdKOwSrRVsQ1bA/xTON0MEKrzhoHUCai
-DTKqdNK9jraBIwg1X9cdWBhxeOw8tYzwfqGgXZ9nlg3BCG3qFDRPQzGqGMu5cTDd
-HzSVgSxs84p4HMmIlh+I
-=PdCF
+iQIcBAEBCAAGBQJR8lVhAAoJEPiazRVxLXTFThAP/RSKF/6017nZDMuf+HOZ2ldj
+px0wtDQl6FZWNVMXA7EYvy+Mo2ZCq4se/+84h9D1RWQEAblC0u89TZI8hc53QNDr
+BedY2BObQ9W82gGOOovJucf1ZyF+MDqzXZykuiGI1LheYxKx8zekqfTS1Jvi6mSa
+bVpGRvIIbU0E05stoFbybhLw7OMseAx9dkFfvr54IQ7jk1wXbHDtYe2K87Ty8uR3
+qUPQMKQQSmT9Z4/KJn6At5MQzRAjoIJE73zcwr8sIUyzCwaXgIh3TmYxurhE9ASO
+w48N1t4GYZZTGkYto8Lkl5cJKMTgYkxQVBYMrkLUjAzj/D1Klb2jNntbPz1Ve8G0
+NoOwkYuZJkjQIFvexHeXxC08fZp51pT3Rf4LF40YsXEobwDVYCX0sjz4s+5A/8lZ
+OJ0xeTqZxCx+mgDw4QZnuDXufgTO4tHvUkUOtGmIEcknZYwJ4/aEHyocJe+RqXSR
+2TQKhW0CXN93rEGjN2zYC0bWnDY9sNQ2hCXvrY4uk1VBicseXSDGCE/x0jTd5wPx
+R8nDrjO1wXgSkz1j/+yqCcGfenYLuMhc0W4fgL0qINOSEYCWcj+tvGtxhprZQw9H
+ua6uaEGrXkrzQnFWsySeGzXWPYlm7lErNfO3OvFo+BoqubUgCk/4x5oVD0212yfq
+XQQXMhIoC0IENUiY+lhj
+=XCqM
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.4.2.ebuild b/dev-vcs/mercurial/mercurial-2.4.2.ebuild
index 555bd3a812be..5974091360b5 100644
--- a/dev-vcs/mercurial/mercurial-2.4.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.2.ebuild,v 1.11 2013/02/10 14:40:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.2.ebuild,v 1.12 2013/07/26 10:54:22 polynomial-c Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -56,7 +56,7 @@ src_install() {
 	distutils_src_install
 	python_convert_shebangs 2 contrib/hg-ssh
 
-	newbashcomp contrib/bash_completion ${PN} || die
+	newbashcomp contrib/bash_completion hg || die
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
diff --git a/dev-vcs/mercurial/mercurial-2.5.4.ebuild b/dev-vcs/mercurial/mercurial-2.5.4.ebuild
index 23dca3488e96..0f650701bc55 100644
--- a/dev-vcs/mercurial/mercurial-2.5.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.5.4.ebuild,v 1.1 2013/04/08 18:38:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.5.4.ebuild,v 1.2 2013/07/26 10:54:22 polynomial-c Exp $
 
 EAPI=5
 
@@ -56,7 +56,7 @@ python_compile_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newbashcomp contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion hg
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
diff --git a/dev-vcs/mercurial/mercurial-2.6.2.ebuild b/dev-vcs/mercurial/mercurial-2.6.2.ebuild
index b3dc329576b2..62e1896f62a5 100644
--- a/dev-vcs/mercurial/mercurial-2.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.6.2.ebuild,v 1.1 2013/06/07 13:45:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.6.2.ebuild,v 1.2 2013/07/26 10:54:22 polynomial-c Exp $
 
 EAPI=5
 
@@ -56,7 +56,7 @@ python_compile_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newbashcomp contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion hg
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
diff --git a/dev-vcs/mercurial/mercurial-2.6.3.ebuild b/dev-vcs/mercurial/mercurial-2.6.3.ebuild
index 4342dc69c003..489cd0bb58b6 100644
--- a/dev-vcs/mercurial/mercurial-2.6.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.6.3.ebuild,v 1.1 2013/07/02 07:01:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.6.3.ebuild,v 1.2 2013/07/26 10:54:22 polynomial-c Exp $
 
 EAPI=5
 
@@ -56,7 +56,7 @@ python_compile_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newbashcomp contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion hg
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index c97beaad4c57..57f3063e2a4d 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.19 2013/04/17 08:52:32 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.20 2013/07/26 10:54:22 polynomial-c Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@ python_compile_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newbashcomp contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion hg
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions