Fixed bash completion (bug #477826)

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

6 files changed, 17 insertions, 11 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/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