revbump for another init script ommision, forgot to source ~/.bash_completion.d/base. Add Gentoo Prefix compatibility to ebuild

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 34 insertions, 16 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index fd8067be3b73..a96d4dca5291 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.195 2009/10/16 02:34:31 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.196 2009/10/16 03:01:09 darkside Exp $
+
+*bash-completion-1.1-r2 (16 Oct 2009)
+
+  16 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
+  -bash-completion-1.1-r1.ebuild, +bash-completion-1.1-r2.ebuild,
+  files/bash-completion.sh:
+  revbump for another init script ommision, forgot to source
+  ~/.bash_completion.d/base. Add Gentoo Prefix compatibility to ebuild
 
   16 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
   bash-completion-1.1-r1.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index af17f6aa093e..189f59907b84 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -2,10 +2,10 @@ AUX bash-completion 724 RMD160 dc15f6b02f08a2fa656fa2d0c9ed15d20a7b9dc8 SHA1 d71
 AUX bash-completion-1.0-bash4.patch 861 RMD160 865e8f745b8cc53125db6903b1954523f99a277e SHA1 503b825408f4a366d1d4795e3ae4f6e51cf500d5 SHA256 e0ecf183746f6b8075ecc7891e265a10b4a3593f6690f66c320fc18b023ac1ca
 AUX bash-completion-1.0-gentoo.patch 2125 RMD160 33682926cca6bcccc971a8c3dde91180cdf858e1 SHA1 e9a5da746221148dcd7661a6a996a9c4ba7ef149 SHA256 8a7bcd782b8980c8f370ca022872b7f894596f8289dbbd800327659b95a9a85a
 AUX bash-completion-1.0-shadow-compat.patch 879 RMD160 77921832e335109df5aa48475eefe6819a6bc108 SHA1 3139a6431bc9506cc4c4f2b80b516c0d365832f9 SHA256 5e877f2ad0c33c3e1bc7766d5389e18515518ac9ff6ffff4855bf7de59cf9297
-AUX bash-completion.sh 1888 RMD160 020882a80ac7c75b99b545535efb957dba7360f4 SHA1 54178af9b9140fb9d342765d5a070b8b9a01eec8 SHA256 51556eab62b7977e7f6ddb9c79cc1b20f8f8037de282f8d00d67925a12db3677
+AUX bash-completion.sh 2024 RMD160 b36a37eebfa07fc9f5b6d65a9d82df0e40f37ad0 SHA1 e96df0ce4038da4fbd12b97f24cf306246434e19 SHA256 81844627cd1079b471d2df07c42711a673bf116d1b1a9c1600d7ca7255d4360b
 DIST bash-completion-1.0.tar.gz 143578 RMD160 b590c2633c5c10c3e98b14a74f4e96c910b6177d SHA1 61040795731f5ff509c46e818a1edf0a7a93e11d SHA256 bd96e7d2858f02783046908a984993736f1189d07d82e9ce4b465068dd7187ef
 DIST bash-completion-1.1.tar.bz2 135741 RMD160 e5e3c250d1b791007e916f0ce06511501675ba85 SHA1 dde4ca656c72adb8326a21f1774dd906f8aaef09 SHA256 7cd415c948e44e143c2f76b6ac6f52e1e44a2762db9201cd2892fe81df807ca4
 EBUILD bash-completion-1.0-r5.ebuild 3288 RMD160 78030933452fdf4c5c2f9f26f506c857f67cc1a6 SHA1 1c7db015c3b1244461408cf6495417e671ec48c3 SHA256 4964393657764362283caa4c0f67c423998dca97831fff4e634174ba4938cf86
-EBUILD bash-completion-1.1-r1.ebuild 2460 RMD160 0415c975e2495aacf160452a5cc84562c56f7ec2 SHA1 58bccbacde5595b78fd380b8df0a42bcfa4e0b98 SHA256 b2b00f723ce821a59613959bd35800eb8544f0d689e7a5713e70d63d79a9f187
-MISC ChangeLog 34504 RMD160 a5ce9bc23229caa844693ce8b00e1317d1e6215d SHA1 c84bf6d2221daeb3577e5e7c0c946f0657889674 SHA256 c0987374aeacdc9fc2b9e1017c5e2165ab18b389e15fec748d597beabeb1c25a
+EBUILD bash-completion-1.1-r2.ebuild 2662 RMD160 a3817f056647b9e16f32a74d52f33624db6b9a6d SHA1 43478032caf15f2cd2657ffdbe91f975a6734837 SHA256 b6133b5a09baedfe0e401fba50a9947e4ea82fe1f5bb42eb89f5e814ea443d7d
+MISC ChangeLog 34820 RMD160 e95890d01f227dadef20eee9355c531a3b72af74 SHA1 885be060f4ab49d2cf6652f563651b151605d979 SHA256 1a0cc2412ec29de61bbfd22e9036bb4cdc65243a990ad3c7745e891ba50d90bd
 MISC metadata.xml 930 RMD160 e6718602012b2cfcb5be5bfc962889bf88f4dc73 SHA1 a585c9cfc0bdb59ee4c7ff1e786bc53d28d36aac SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9
diff --git a/app-shells/bash-completion/bash-completion-1.1-r1.ebuild b/app-shells/bash-completion/bash-completion-1.1-r2.ebuild
index 35663715b5d7..7d4e1731de2c 100644
--- a/app-shells/bash-completion/bash-completion-1.1-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-1.1-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.1-r1.ebuild,v 1.2 2009/10/16 02:34:31 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.1-r2.ebuild,v 1.1 2009/10/16 03:01:09 darkside Exp $
 
 EAPI="2"
+inherit prefix
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="http://bash-completion.alioth.debian.org/"
@@ -10,7 +11,7 @@ SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
@@ -19,18 +20,23 @@ RDEPEND="app-admin/eselect
 	sys-apps/miscfiles"
 PDEPEND="app-shells/gentoo-bashcomp"
 
+src_prepare() {
+	cp "${FILESDIR}/bash-completion.sh" "${T}" || die
+	eprefixify "${T}/bash-completion.sh"
+}
+
 src_install() {
+	use prefix || local ED=${D}
 	emake DESTDIR="${D}" install || die
 
 	dodir /etc/profile.d
-	cp "${FILESDIR}/bash-completion.sh" \
-		"${D}/etc/profile.d/bash-completion.sh" || die "cp failed"
+	cp "${T}/bash-completion.sh" \
+		"${ED}/etc/profile.d/bash-completion.sh" || die "cp failed"
 
 	dodir /usr/share/bash-completion
-	mv "${D}"/etc/bash_completion.d/* "${D}/usr/share/bash-completion/" \
+	mv "${ED}"/etc/bash_completion.d/* "${ED}/usr/share/bash-completion/" \
 		|| die "installation failed to move files"
-	rm -r "${D}"/etc/bash_completion.d || die "rm failed"
-	awk -v D="$D" '
+	awk -v D="$ED" '
 	BEGIN { out=".pre" }
 	/^# A lot of the following one-liners/ { out="base" }
 	/^# start of section containing completion functions called by other functions/ { out=".pre" }
@@ -40,6 +46,9 @@ src_install() {
 	out != "" { print > D"/usr/share/bash-completion/"out }' \
 	bash_completion || die "failed to split bash_completion"
 
+	# clean up
+	rm -r "${ED}"/etc/bash_completion{,.d} || die "rm failed"
+
 	dodoc AUTHORS README TODO || die "dodocs failes"
 }
 
diff --git a/app-shells/bash-completion/files/bash-completion.sh b/app-shells/bash-completion/files/bash-completion.sh
index 2ef091fc9cb3..7f8896921b43 100644
--- a/app-shells/bash-completion/files/bash-completion.sh
+++ b/app-shells/bash-completion/files/bash-completion.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion.sh,v 1.5 2009/10/16 01:43:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion.sh,v 1.6 2009/10/16 03:01:10 darkside Exp $
 
 # Check for interactive bash and that we haven't already been sourced.
 [ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return
@@ -21,9 +21,9 @@ if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
         # in .pre.  See the ebuild for how this is created.
         if ! $loaded_pre; then
             if [[ ${BASH_COMPLETION-unset} == unset ]]; then
-            BASH_COMPLETION=/usr/share/bash-completion/base
+            BASH_COMPLETION="@GENTOO_PORTAGE_EPREFIX@"/usr/share/bash-completion/base
             fi
-            source /usr/share/bash-completion/.pre
+            source "@GENTOO_PORTAGE_EPREFIX@"/usr/share/bash-completion/.pre
             loaded_pre=true
         fi
 
@@ -42,8 +42,9 @@ if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
     # 4. Load user completion file last, overrides modules at user discretion
 	# This order is subject to change once upstream decides on something.
     _load_completions \
-    /etc/bash_completion.d/base \
-    /etc/bash_completion.d/* \
+    "@GENTOO_PORTAGE_EPREFIX@"/etc/bash_completion.d/base \
+    ~/.bash_completion.d/base \
+    "@GENTOO_PORTAGE_EPREFIX@"/etc/bash_completion.d/* \
     ~/.bash_completion.d/* \
     ~/.bash_completion
 fi