Fix bug in bash completion for lzma man pages. Fix by Jan Hruban in bug 254814. Convert to EAPI-2, add die() messages as needed

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 23 insertions, 15 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index b7db07c18ab0..0eef1ca9a4ab 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.150 2009/02/11 19:07:44 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.151 2009/02/20 05:31:48 darkside Exp $
+
+*bash-completion-20081218-r1 (20 Feb 2009)
+
+  20 Feb 2009; Jeremy Olexa <darkside@gentoo.org>
+  -bash-completion-20081218.ebuild, +bash-completion-20081218-r1.ebuild:
+  Fix bug in bash completion for lzma man pages. Fix by Jan Hruban in bug
+  254814. Convert to EAPI-2, add die() messages as needed
 
   11 Feb 2009; Jeremy Olexa <darkside@gentoo.org> metadata.xml:
   add myself to metadata
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 0692c5163073..9d657845b806 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -23,6 +23,6 @@ EBUILD bash-completion-20050121-r10.ebuild 1977 RMD160 726390e1861587da97c6ed6f7
 EBUILD bash-completion-20050721.ebuild 1984 RMD160 c39f2d87d83038682f23d17247c7430bd47440eb SHA1 dca1808abcf50bd32bf6f05f4ff354071dfeeaef SHA256 1435cc14d429f0de16c1f793ab715f9bb9eb5375c3a64c56b023c88c87608516
 EBUILD bash-completion-20060301-r3.ebuild 3254 RMD160 ff10c9a067ee77f17c43502021b4ecacd0dfc448 SHA1 4cbaaa5816eb7b1996a9c854c160368c012f78e9 SHA256 69c4b9e199b70275c1186306b343656a27150546bd683e833349ca7870baaf58
 EBUILD bash-completion-20060301.ebuild 2028 RMD160 bb70aadac43288a100a1b4b1da59f62722a6e76d SHA1 0ed21636b110cbe78459ab24ffba80669169b9af SHA256 e0033958d97490ba7e571eac3574e2bee66c9994c6e0cd912c89943a8461a38d
-EBUILD bash-completion-20081218.ebuild 3153 RMD160 2d6c4191446842d304e83586245fa5d038f3cdce SHA1 006a56774eb398da03d01ac9ec26d304a5243c48 SHA256 5c83b5939e819eff9bb4a45f48c340daf40392389667878d19469bc1ab2a2d42
-MISC ChangeLog 26591 RMD160 ed883fb33ed77ac4bd31631172d5fd5a170e3b10 SHA1 b7b7dbe02e8e5e8c7dd61bc16d3726e90b2ee48a SHA256 c4196d580918b038c4a6efc2a46473c97d64011030aff82b1becf22afec87b48
+EBUILD bash-completion-20081218-r1.ebuild 3274 RMD160 72e6cad8611d7bdd77bfe7bbd9a824112938d691 SHA1 6656bccec2a360e02a5f3ef358e0adea5ae4579a SHA256 35aeee9bb8f7ac3d18b9f9eb5fb9e697031afc2c7054ed334f743e58f2dac31b
+MISC ChangeLog 26891 RMD160 fc9aad836463d069cd76f2d2bd52edbd227390bc SHA1 ab425d6d29dd1e9f08cabb0d5ca7bcfa4ed6a595 SHA256 cdfee351b85a8256789cb4eec54d6d790b1fc5785e0f84dd4661b1641a176c08
 MISC metadata.xml 990 RMD160 582968f0d3e6ee5f257530569329c3a2347eeef1 SHA1 458be162d67b1854080f8c4aecdb2409140167b3 SHA256 fe8d14b3cb05d24c7fd48911a567396bd36d92270f31e3a613d2204bac52d580
diff --git a/app-shells/bash-completion/bash-completion-20081218.ebuild b/app-shells/bash-completion/bash-completion-20081218-r1.ebuild
index 7d56c3cb7013..7cbadb46a927 100644
--- a/app-shells/bash-completion/bash-completion-20081218.ebuild
+++ b/app-shells/bash-completion/bash-completion-20081218-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-20081218.ebuild,v 1.1 2008/12/18 22:54:51 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20081218-r1.ebuild,v 1.1 2009/02/20 05:31:48 darkside Exp $
+
+EAPI="2"
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="http://bash-completion.alioth.debian.org/"
@@ -22,13 +24,10 @@ PDEPEND="app-shells/gentoo-bashcomp"
 
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV}
-
-	# bug #111681
-	sed -i -e "/^complete.* xine /d" bash_completion
+src_prepare() {
+	# bug #111681 
+	sed -i -e "/^complete.* xine /d" \
+		-e '0,/gz|bz2/s//gz|bz2|lzma/' bash_completion || die "sed failed"
 }
 
 src_install() {
@@ -36,7 +35,7 @@ src_install() {
 	# 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
+	dodir /usr/share/bash-completion || die "dodir failed"
 	awk -v D="$D" '
 		BEGIN { out=".pre" }
 		/^# A lot of the following one-liners/ { out="base" }
@@ -69,7 +68,7 @@ pkg_postinst() {
 	elog
 	elog "Versions of bash-completion prior to 20060301-r1 required each user to"
 	elog "explicitly source /etc/profile.d/bash-completion in ~/.bashrc.  This"
-	elog "was kludgy and inconsistent with the completion modules which are"
+	elog "was inconsistent with the completion modules which are"
 	elog "enabled with eselect bashcomp.  Now any user can enable the base"
 	elog "completions without editing their .bashrc by running"
 	elog
@@ -84,13 +83,15 @@ pkg_postinst() {
 	elog
 	elog "If you use non-login shells you still need to source"
 	elog "/etc/profile.d/bash-completion.sh in your ~/.bashrc."
+	elog "Note this is bash-completion.sh, not bash-completion. Lots of people"
+	elog "overlook this"
 	elog
 
 	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"
+		#elog "  http://zshwiki.org/ZshSwitchingTo" (doesn't exist)
 		elog
 	fi
 }