Migrate to bash-completion-r1.

Package-Manager: portage-2.2.0_alpha51_p82/cvs/Linux x86_64

8 files changed, 38 insertions, 41 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 26d2b579b93c..e0255da6aaae 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.50 2011/09/01 18:50:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.51 2011/09/09 16:50:10 mgorny Exp $
+
+  09 Sep 2011; Michał Górny <mgorny@gentoo.org> mercurial-1.8.2.ebuild,
+  mercurial-1.8.3.ebuild, mercurial-1.9.ebuild, mercurial-1.9.1.ebuild,
+  mercurial-1.9.2.ebuild, mercurial-9999.ebuild:
+  Migrate to bash-completion-r1.
 
 *mercurial-1.9.2 (01 Sep 2011)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index d4f41aa33ff1..1188d68ba224 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
 DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
@@ -9,22 +9,20 @@ DIST mercurial-1.9.1.tar.gz 2970705 RMD160 13d3212e3b9ffb4a4b20108241b676611bab7
 DIST mercurial-1.9.2.tar.gz 2972849 RMD160 fa5824a16481dd612aafc59ca99903375470b994 SHA1 3eabcaa265d2497fa0fdd6751a73061fcaeb4200 SHA256 481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa
 DIST mercurial-1.9.tar.gz 2964382 RMD160 f533234095f2028ef742dce96a23751ee023a7f1 SHA1 e7d80abf520849e1327ad5e7606a09628f646584 SHA256 711e4b1cd2924a7a88499d6c431a9122390183bf554d4e153edbb3b2f30123e0
 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2
-EBUILD mercurial-1.8.2.ebuild 3800 RMD160 1b345cbd9217e7a61bd1b0eed7e50db57a1a8874 SHA1 39f2aab67f01cf9d195538fb32382e3ab9b6ba44 SHA256 a5f4327e1c5bdc4580fd68cf44c0dcc9407b91061579d928c8d863c240aba95b
-EBUILD mercurial-1.8.3.ebuild 3807 RMD160 7d97525c86a7ff10cf65d0859b8ce43c114c12d1 SHA1 900375fe3ddc77a4065373654d3e9bc6f9a99672 SHA256 4462640da5f77549dccee68bf8a71e45486a0e4c0c01c2495643abf5778d61b2
-EBUILD mercurial-1.9.1.ebuild 3802 RMD160 20a6f33e4c8e035e2a6d3464978fc68a5c94c306 SHA1 13d9b5c781a64a8a4b2401fa03905f984a855be4 SHA256 0a44fbf448a5662dda357d121c8981a21fed84df580adb551523a06bc98c48bc
-EBUILD mercurial-1.9.2.ebuild 3807 RMD160 fff4e140f7f336b720e57803f9cbaab423b87310 SHA1 948c84313eded613c8d6d81f576121c560d9fa55 SHA256 78270ccc3d8076e1d05fcf3d4e0073b41089acfcdd6f5a4c18796fb55c61c164
-EBUILD mercurial-1.9.ebuild 3805 RMD160 1cecc44be8513860c993483260ca3b716de320e7 SHA1 181e3df4f17a773a193d07c16c428ac09608fbb0 SHA256 1b771e28c99aa4fea2d5eb52e3c2e6480bfc6cf2baab083ec41eab3d9c9412e9
-EBUILD mercurial-9999.ebuild 3426 RMD160 91f6483efac5eae0d216212c8c9c7805138bf603 SHA1 dc24d5db8e80f75f5680599ff9c9b889cee68d43 SHA256 3861ce259f51eeac801e1e49ff22eb6a422efa82d6ae890e7e903188e60a8239
-MISC ChangeLog 24962 RMD160 6d206d9f60794af5039fbe6fe34ee57d59c9a177 SHA1 70965416f836cae273ab52a6c7a8b0de33ae5574 SHA256 1bf1da22bff305ab840e9cc1811ee4db47ef1b7c87aba5411da87a264baec79e
+EBUILD mercurial-1.8.2.ebuild 3774 RMD160 19bcea35acd398c1b81efc1da25d03c223d0d09d SHA1 33c6c73ca75c2ac2f2a4224dbe347638b8119f7b SHA256 62203d8c7c57a758841892198f8c59e60b68ae8a915f58d2a89486128fb9698b
+EBUILD mercurial-1.8.3.ebuild 3780 RMD160 389f6cc6bc1d8fab70529fe1b7742b0e40c6255f SHA1 d4d25d4aec0d3943bcb9a35863543a912c6db9a9 SHA256 6aea4eea2688ba120538d873a7cfd07050fdf53ba3536e0b8f4b709534b20538
+EBUILD mercurial-1.9.1.ebuild 3780 RMD160 30306faaddcdff35bb6f0023b4670cc9aa7598b6 SHA1 33325246d14a30893c9d888bf2162db9001d7407 SHA256 0eae0f81d9a7c4df56395c7f5099a158dea7b31f94e123318147fac629707ff0
+EBUILD mercurial-1.9.2.ebuild 3780 RMD160 250e1ef235579cfd10a4f155f55537b0badd1519 SHA1 568775dc62be89b9974cc83a13ef17b49cb17c07 SHA256 98f8c0d9a1cebbf0473c49d7a87f7192e1d68dfa65035c09fad326ded360750a
+EBUILD mercurial-1.9.ebuild 3778 RMD160 39d86f7eae68d2dd562d0c40e5298b7df8bfeee8 SHA1 db1be10116ad085502e01c327ed0b0e0fb28118e SHA256 2119d42ac089616baa1492423cb30c456c31b06d620e7e4e9a3af18e7cd887a6
+EBUILD mercurial-9999.ebuild 3400 RMD160 da98241f4ac161e92e1bd2edf1d376e3fa8287cc SHA1 868f8eeec559b0187e823f5de9778ca2f3f7c10f SHA256 5d2c3e7445864f34459c1cf74783ff2518cf6a3c675705ce18c515b535e094b0
+MISC ChangeLog 25189 RMD160 0c8d2e57a53297c1e3564241eddab16a84967a94 SHA1 af5bba238b17bdb01b25eb66743cde8ee80eb385 SHA256 47402a74f98a0201ae30e88472da8f629bb083c6954663a8c45e023e422b6767
 MISC metadata.xml 560 RMD160 d2c84db005e2bb001ecb78da10c1e732ca39849e SHA1 18dde8a3194320ab1fce68aada7c2bcc177c675a SHA256 279657b5c4f96eab16e370c3cabe306f2421447f0afe5ab981232bf9da83774b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOX9QPAAoJEBZyv1r2qA5G3W4H/1Fw0pIxbnZBQ5Qtk1fJj0hp
-Ts6LeMaMjVZa2Jyv5TT5f61djc8duSMaqw0tKr1itzhbKPolW6qpppgDUWOkWpc8
-EGgVzjXxGQU8UuldFPaUgdC+CX2qZZzKQKNGhUDCjniWQAvRbOOfjmuuZpIfCTiR
-l610M6kZZdfz/HHpV9aD87ALf3XEJaW4/MuvaKzvDgsWSORrmsVVC+uZckFZ1HO2
-Hy/CHjr33Z3BSNY08JypCPoTafmxjXnb/+C992Pm7i1V4tf3YwhFb+A2DnC+VXKq
-oxWmn3Kpb6sK3tliKB0Eeh7g/+PemJxSL43X+Qzfas3JdTRRiwMBo9D+ki0NwIs=
-=TBRr
+iJwEAQEIAAYFAk5qREQACgkQfXuS5UK5QB1/eQQAkC/l1kf2bvooVtX+YlvoH0rq
+WUXLxdXewwyCou2qT4CXl4Wy/p8SXTIPrE4iqzCNLRZpzlgse6hfzjXj1hJoQJc3
+8qwC7sBqaKrU1rcAPBNvi5y2DdW1UMZV+odwsc7xuKq1UxGKVHIX+AbBLvaMiieD
+SoX0SF9icGt7KqweTJw=
+=3Fa9
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-1.8.2.ebuild b/dev-vcs/mercurial/mercurial-1.8.2.ebuild
index 86f6a305979b..78e849b3e435 100644
--- a/dev-vcs/mercurial/mercurial-1.8.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.8.2.ebuild,v 1.3 2011/05/04 09:04:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.8.2.ebuild,v 1.4 2011/09/09 16:50:10 mgorny Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ PYTHON_USE_WITH="threads"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit bash-completion elisp-common eutils distutils
+inherit bash-completion-r1 elisp-common eutils distutils
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -57,7 +57,7 @@ src_compile() {
 src_install() {
 	distutils_src_install
 
-	dobashcompletion contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion ${PN} || die
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
@@ -123,7 +123,6 @@ src_test() {
 pkg_postinst() {
 	distutils_pkg_postinst
 	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
diff --git a/dev-vcs/mercurial/mercurial-1.8.3.ebuild b/dev-vcs/mercurial/mercurial-1.8.3.ebuild
index cd48750440f2..0f6eb89ad8e5 100644
--- a/dev-vcs/mercurial/mercurial-1.8.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.8.3.ebuild,v 1.2 2011/08/02 06:05:58 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.8.3.ebuild,v 1.3 2011/09/09 16:50:10 mgorny Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ PYTHON_USE_WITH="threads"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit bash-completion elisp-common eutils distutils
+inherit bash-completion-r1 elisp-common eutils distutils
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -57,7 +57,7 @@ src_compile() {
 src_install() {
 	distutils_src_install
 
-	dobashcompletion contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion ${PN} || die
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
@@ -123,7 +123,6 @@ src_test() {
 pkg_postinst() {
 	distutils_pkg_postinst
 	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
diff --git a/dev-vcs/mercurial/mercurial-1.9.1.ebuild b/dev-vcs/mercurial/mercurial-1.9.1.ebuild
index 1507429d56a7..b84c4cfe579a 100644
--- a/dev-vcs/mercurial/mercurial-1.9.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.9.1.ebuild,v 1.1 2011/08/09 08:25:24 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.9.1.ebuild,v 1.2 2011/09/09 16:50:10 mgorny Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ PYTHON_USE_WITH="threads"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit bash-completion elisp-common eutils distutils
+inherit bash-completion-r1 elisp-common eutils distutils
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -57,7 +57,7 @@ src_compile() {
 src_install() {
 	distutils_src_install
 
-	dobashcompletion contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion ${PN} || die
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
@@ -123,7 +123,6 @@ src_test() {
 pkg_postinst() {
 	distutils_pkg_postinst
 	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
diff --git a/dev-vcs/mercurial/mercurial-1.9.2.ebuild b/dev-vcs/mercurial/mercurial-1.9.2.ebuild
index c7fcf3abe199..1990dccc5f15 100644
--- a/dev-vcs/mercurial/mercurial-1.9.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.9.2.ebuild,v 1.1 2011/09/01 18:50:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.9.2.ebuild,v 1.2 2011/09/09 16:50:10 mgorny Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ PYTHON_USE_WITH="threads"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit bash-completion elisp-common eutils distutils
+inherit bash-completion-r1 elisp-common eutils distutils
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -57,7 +57,7 @@ src_compile() {
 src_install() {
 	distutils_src_install
 
-	dobashcompletion contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion ${PN} || die
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
@@ -123,7 +123,6 @@ src_test() {
 pkg_postinst() {
 	distutils_pkg_postinst
 	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
diff --git a/dev-vcs/mercurial/mercurial-1.9.ebuild b/dev-vcs/mercurial/mercurial-1.9.ebuild
index 8b5abaf0dcf9..73a9f9d08422 100644
--- a/dev-vcs/mercurial/mercurial-1.9.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.9.ebuild,v 1.2 2011/08/02 06:05:58 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.9.ebuild,v 1.3 2011/09/09 16:50:10 mgorny Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ PYTHON_USE_WITH="threads"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit bash-completion elisp-common eutils distutils
+inherit bash-completion-r1 elisp-common eutils distutils
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -57,7 +57,7 @@ src_compile() {
 src_install() {
 	distutils_src_install
 
-	dobashcompletion contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion ${PN} || die
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
@@ -123,7 +123,6 @@ src_test() {
 pkg_postinst() {
 	distutils_pkg_postinst
 	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 228c16e24a66..1fcdbd9321b8 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.9 2010/12/25 15:08:40 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.10 2011/09/09 16:50:10 mgorny Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ PYTHON_USE_WITH="threads"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit bash-completion elisp-common eutils distutils mercurial
+inherit bash-completion-r1 elisp-common eutils distutils mercurial
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -53,7 +53,7 @@ src_compile() {
 src_install() {
 	distutils_src_install
 
-	dobashcompletion contrib/bash_completion ${PN}
+	newbashcomp contrib/bash_completion ${PN} || die
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
@@ -119,7 +119,6 @@ src_test() {
 pkg_postinst() {
 	distutils_pkg_postinst
 	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"