Version bump, bug 265240. Big thanks to ColdWind for re-working the awk split in the ebuild

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

4 files changed, 160 insertions, 2 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 83318a57baf3..33f61f63d568 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.164 2009/04/07 04:20:22 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.165 2009/04/09 04:38:24 darkside Exp $
+
+*bash-completion-1.0 (09 Apr 2009)
+
+  09 Apr 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/bash-completion-1.0-gentoo.patch, +bash-completion-1.0.ebuild:
+  Version bump, bug 265240. Big thanks to ColdWind for re-working the awk
+  split in the ebuild
 
   07 Apr 2009; Jeremy Olexa <darkside@gentoo.org>
   -files/20050121/01_all_gkrellm.diff, -files/20050121/03_all_timidity.diff,
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index b57e9f3e6040..987a358a048d 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,6 +1,9 @@
 AUX bash-completion 724 RMD160 dc15f6b02f08a2fa656fa2d0c9ed15d20a7b9dc8 SHA1 d71224475d73b134085bf5f70fb1eb311397cae2 SHA256 6898275f2b0ab67af4b35c8a239d04a233e0c252acb5ed76692fd65881d3be0e
+AUX bash-completion-1.0-gentoo.patch 2125 RMD160 33682926cca6bcccc971a8c3dde91180cdf858e1 SHA1 e9a5da746221148dcd7661a6a996a9c4ba7ef149 SHA256 8a7bcd782b8980c8f370ca022872b7f894596f8289dbbd800327659b95a9a85a
 AUX bash-completion.sh 1683 RMD160 f5d723122d1a0431af0a19838330e30f6f7e324f SHA1 1d7136206699886bc98d3b2dccfbdb3eff524ceb SHA256 3f742e1296597241b5d01565bc3220db9b1340dcb3d7bca3f0b107b2122791d7
+DIST bash-completion-1.0.tar.gz 143578 RMD160 b590c2633c5c10c3e98b14a74f4e96c910b6177d SHA1 61040795731f5ff509c46e818a1edf0a7a93e11d SHA256 bd96e7d2858f02783046908a984993736f1189d07d82e9ce4b465068dd7187ef
 DIST bash-completion-20081219.tar.bz2 91246 RMD160 4fd868363f3ee7277c8ad8769a37fe7c6de76efd SHA1 c13987837c46feefd6d7832c181d2c6f15878ead SHA256 c3869a95654ba6c976ee156d7553d066d597225d764dbf63706041583cfe5a7f
+EBUILD bash-completion-1.0.ebuild 3030 RMD160 e1d1110f92e01287a901356b7e8ecc284c7732a7 SHA1 e1979a8fb48e104bbd7112d7a9fcd7b62087c54f SHA256 e54b3cc7b89800a7058c54ea3b04e15ae7df510ab07aa26db057f04110810db4
 EBUILD bash-completion-20081219-r1.ebuild 3365 RMD160 b8e327d71b224d88cb340bbeaa6ab19f5323c0a6 SHA1 3d7de271183683a01826693a7ef5e1c2bb561da1 SHA256 f04be1d74f2d2c8e2e9b4d384afe2b075b58d619771ae064312af96a8a35b465
-MISC ChangeLog 29712 RMD160 68f137ab6eb7af39afcc9bb0a3ffb33c37cfe43e SHA1 5c34017a91f4242374393d2d7487fb14a217b0c0 SHA256 67bbc62af7ffe7a9d761049753a1abfdc7bcae29f4e22f3187cda7c80f6c69e6
+MISC ChangeLog 29967 RMD160 f15c1f6e327532d21fd427e1fe31c74e3ef521ba SHA1 36eb1c576320efc70d357fffac80333462a8efeb SHA256 c005c215b1d3da04da1b4b659985b9a13300e190678ba7588b7a8057659c12fa
 MISC metadata.xml 930 RMD160 e6718602012b2cfcb5be5bfc962889bf88f4dc73 SHA1 a585c9cfc0bdb59ee4c7ff1e786bc53d28d36aac SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9
diff --git a/app-shells/bash-completion/bash-completion-1.0.ebuild b/app-shells/bash-completion/bash-completion-1.0.ebuild
new file mode 100644
index 000000000000..dc487a34e0ae
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-1.0.ebuild
@@ -0,0 +1,90 @@
+# 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.0.ebuild,v 1.1 2009/04/09 04:38:24 darkside Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="http://bash-completion.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/b/bash-completion/${PN}_${PV}.orig.tar.gz ->
+bash-completion-1.0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/eselect
+	|| (
+		>=app-shells/bash-2.05a
+		app-shells/zsh
+	)"
+PDEPEND="app-shells/gentoo-bashcomp"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.0-gentoo.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	
+	# Upstream will soon be splitting this for us.
+	# split /etc/bash_completion into three parts:
+	# 1. /usr/share/bash-completion/.pre    -- hidden from eselect
+	# 2. /usr/share/bash-completion/base -- eselectable
+	# 3. /usr/share/bash-completion/.post   -- hidden from eselect
+	dodir /usr/share/bash-completion
+	awk -v D="$D" '
+    BEGIN { out=".pre" }
+    /^# A lot of the following one-liners/ { out="base" }
+    /^# start of section containing completion functions called by other functions/ { out=".pre" }
+    /^# start of section containing completion functions for bash built-ins/ { out="base" }
+    /^# source completion directory/ { out="" }
+    /^unset -f have/ { out=".post" }
+    out != "" { print > D"/usr/share/bash-completion/"out }' \
+	bash_completion || die "failed to split bash_completion"
+
+	dodir /etc/profile.d
+	cp bash_completion.sh "${D}/etc/profile.d/" || die "cp failed"
+
+	dodoc AUTHORS CHANGES README TODO || die "dodocs failes"
+	
+	# bug 146726
+	rm "${D}/etc/bash_completion.d/svk" || die "rm failed"
+
+	# Upstream provides no easy way to move modules. sigh
+	dodir /usr/share/bash-completion
+	mv "${D}"/etc/bash_completion.d/* "${D}/usr/share/bash-completion/" \
+		|| die "installation failed to move files"
+	# cleanup the mess
+	rm -r "${D}"/etc/bash_completion{,.d} || die "rm failed"
+}
+
+pkg_postinst() {
+	elog "Any user can enable the base completions without editing their"
+	elog ".bashrc by running:"
+	elog
+	elog "    eselect bashcomp enable base"
+	elog
+	elog "The system administrator can also be enable this globally with"
+	elog
+	elog "    eselect bashcomp enable --global base"
+	elog
+	elog "Additional completion functions can also be enabled or"
+	elog "disabled using eselect's bashcomp module."
+	elog
+	elog "If you use non-login shells you still need to source"
+	elog "/etc/profile.d/bash-completion.sh in your ~/.bashrc."
+
+
+	if has_version 'app-shells/zsh' ; then
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		#elog "  http://zshwiki.org/ZshSwitchingTo" (doesn't exist)
+		elog
+	fi
+}
diff --git a/app-shells/bash-completion/files/bash-completion-1.0-gentoo.patch b/app-shells/bash-completion/files/bash-completion-1.0-gentoo.patch
new file mode 100644
index 000000000000..1f0eaff60551
--- /dev/null
+++ b/app-shells/bash-completion/files/bash-completion-1.0-gentoo.patch
@@ -0,0 +1,58 @@
+Gentoo does something different than upstream. This patch allows multiple
+directories to be sourced. Upstream is trying to come to a consensus on this
+issue and it is expected to change. Therefore it is a moot point to send this
+upstream now.
+
+--- bash_completion.sh.orig	2009-04-08 23:14:34.736632335 -0500
++++ bash_completion.sh	2009-04-08 23:17:59.670875954 -0500
+@@ -4,9 +4,46 @@
+ # Check for recent enough version of bash.
+ bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+ if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
+-  if [ -r /etc/bash_completion ]; then
+-    # Source completion code.
+-    . /etc/bash_completion
+-  fi
++    _load_completions() {
++    declare f x loaded_pre=false
++    for f; do
++        if [[ -f $f ]]; then
++        # Prevent loading base twice, initially and via glob
++        if $loaded_pre && [[ $f == */base ]]; then
++            continue
++        fi
++
++        # Some modules, including base, depend on the definitions
++        # 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
++            fi
++            source /usr/share/bash-completion/.pre
++            loaded_pre=true
++        fi
++
++        source "$f"
++        fi
++    done
++
++    # Clean up
++    $loaded_pre && source /usr/share/bash-completion/.post
++    unset -f _load_completions  # not designed to be called more than once
++    }
++
++    # 1. Load base, if eselected.  This was previously known as
++    #    /etc/bash_completion
++    # 2. Load completion modules, maintained via eselect bashcomp --global
++    # 3. Load user completion modules, maintained via eselect bashcomp
++    # 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 \
++    ~/.bash_completion.d/base \
++    /etc/bash_completion.d/* \
++    ~/.bash_completion.d/* \
++    ~/.bash_completion
+ fi
++
+ unset bash bminor bmajor