From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 16 Oct 2011 21:26:10 +0000 (+0000)
Subject: Migrate to bash-completion-r1.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79db5eabeb0dc04f04788733f74adaf528dec5aa;p=gentoo.git

Migrate to bash-completion-r1.

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

diff --git a/app-portage/flaggie/ChangeLog b/app-portage/flaggie/ChangeLog
index 6772c48d9a42..59a1d6f0f36a 100644
--- a/app-portage/flaggie/ChangeLog
+++ b/app-portage/flaggie/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-portage/flaggie
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/ChangeLog,v 1.20 2011/10/08 17:36:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/ChangeLog,v 1.21 2011/10/16 21:26:10 mgorny Exp $
+
+  16 Oct 2011; Michał Górny <mgorny@gentoo.org> flaggie-0.1.4.ebuild:
+  Migrate to bash-completion-r1.
 
 *flaggie-0.1.4 (08 Oct 2011)
 
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index b038d512f7d4..ef86b4dcd3a9 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST flaggie-0.1.4.tar.bz2 16677 RMD160 4fe42ed85b374e475f70c77724dc8664be66b55b SHA1 4a397360529c0f584e4b6c8a351270040230d493 SHA256 0b1055241c0ccd9f5fd1ba806cf834b38d56722df271006e0c4fe0f7cc1c2467
-EBUILD flaggie-0.1.4.ebuild 1167 RMD160 4e9dfa7577435527ebfa0b5b77977964c8c1cc25 SHA1 3bdb9758ce6b1a125207395db5b2cbe5460be961 SHA256 efda27d6c81021940f0fdc78a8e8027fda0bc1f3bd86be962e85719bdc4615d7
-MISC ChangeLog 4124 RMD160 2bfe6c39e66bfaa8b073bc0ef5fc3f4f26900a4d SHA1 e0f1e988bb2c1bfd5236420b2776e91a425e3251 SHA256 7214cc69fc60635b5c83b4fd8fe0a193d61f1a144f94105f0322e2e070e0fd2e
+EBUILD flaggie-0.1.4.ebuild 1249 RMD160 a65cccf104cd2b6f444390d3d0155c633044cb91 SHA1 e819ac7edfa680d19c7698b66b5cdc977c586e3a SHA256 0dd6a6968379080f2ca9c6c052473c7561c59eb92cc12e49f868ed030dba357c
+MISC ChangeLog 4230 RMD160 8178ed79ba9cdde35ebe8e34cd633c245434f4cc SHA1 fc11071e583390443d28f8e74aa3965aa67246c4 SHA256 6ec242e1754de3206acc728aff7336247ae24c69c1f26f07656f7558aff76469
 MISC metadata.xml 773 RMD160 4a01708dede89165ee3796d7c68743befa4905fb SHA1 bf66e0c5ace0bd2fa82734825a6c9ab8fecdbbf8 SHA256 7c48a4f68548c2a414efdeb0d29a0ec7f8e1ccaffcfb42c55d7ed36265bf734c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk6QiqcACgkQfXuS5UK5QB0BpAP8CpGQnvE4jZlNoMtIB1DipIt6
-rG1M5HQqW10LoJmvMhxvh22ERIwg0hk93aNZw+mSlK6Wmvhxl85QnjzsFZFq4JOf
-J27GdBmu64eIWpN5QT51eQU7ydaA/PV/6Zn4FAx6HfpdJuKBaA38FdIFonivfCVk
-AyVT/Nnmq50Tzikt2Yc=
-=d0wr
+iJwEAQEIAAYFAk6bS/kACgkQfXuS5UK5QB1CCAP+K6vzD7YDhGrVm1XCloeECqtb
+iyuR9ttVsPsxN/lFQX2JSRwxLsQSiX0qBX50J4+cCckzG1g+pR09VBfW1+V1J0BK
+fRH5K7F246rT4isveequeAPYAsqRy2pDk0tB6BhFKn7JyJc02kXI2PtxUQaEliHk
+kQQNM+GfLtFo592ewmE=
+=gsWz
 -----END PGP SIGNATURE-----
diff --git a/app-portage/flaggie/flaggie-0.1.4.ebuild b/app-portage/flaggie/flaggie-0.1.4.ebuild
index ced995cfb75e..2bc123ec9049 100644
--- a/app-portage/flaggie/flaggie-0.1.4.ebuild
+++ b/app-portage/flaggie/flaggie-0.1.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.1.4.ebuild,v 1.1 2011/10/08 17:36:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.1.4.ebuild,v 1.2 2011/10/16 21:26:10 mgorny Exp $
 
 EAPI=3
 PYTHON_DEPEND="*:2.6"
 SUPPORT_PYTHON_ABIS=1
 RESTRICT_PYTHON_ABIS="2.4 2.5"
 
-inherit base bash-completion distutils
+inherit base bash-completion-r1 distutils
 
 DESCRIPTION="A smart CLI mangler for package.* files"
 HOMEPAGE="https://github.com/mgorny/flaggie/"
@@ -18,8 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-RDEPEND=">=sys-apps/portage-2.1.8.3
-	bash-completion? ( app-shells/gentoo-bashcomp )"
+RDEPEND=">=sys-apps/portage-2.1.8.3"
 
 src_prepare() {
 	base_src_prepare
@@ -29,7 +28,7 @@ src_prepare() {
 src_install() {
 	distutils_src_install
 
-	dobashcompletion contrib/bash-completion/${PN}.bash-completion || die
+	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN} || die
 }
 
 pkg_postinst() {
@@ -39,6 +38,9 @@ pkg_postinst() {
 	ewarn "before performing each change through appending a single '~'."
 	ewarn "If you'd like to keep your own backup of them, please use another"
 	ewarn "naming scheme (or even better some VCS)."
-
-	bash-completion_pkg_postinst
+	elog
+	elog "bash-completion support requires:"
+	elog "	app-shells/gentoo-bashcomp"
+	has_version app-shells/gentoo-bashcomp && \
+		elog "(installed already)"
 }