Version bump; closes bugs 101311, 111681, 111765, 117770, and 122591.

(Portage version: 2.1_pre5-r2)

6 files changed, 117 insertions, 15 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 2507687f4ce9..c951548970c3 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/bash-completion
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.132 2006/02/08 21:56:57 tove Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.133 2006/03/02 12:03:27 ka0ttic Exp $
+
+*bash-completion-20060301 (02 Mar 2006)
+
+  02 Mar 2006; Aaron Walker <ka0ttic@gentoo.org>
+  +files/20060301/01_all_no_xine.diff,
+  +files/20060301/02_all_mplayer_flac.diff,
+  +bash-completion-20060301.ebuild:
+  Version bump; closes bugs 101311, 111681, 111765, 117770, and 122591.
 
   25 Nov 2005; Tom Gall <tgall@gentoo.org> 
   bash-completion-20050121-r10.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 6b18dcb68f8e..f29aec57ecb9 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 86d1179f40be9a82b01d29564706aa82 ChangeLog 23207
-RMD160 a060fb72c5c97243e6f6ebff0f2299fab20c568a ChangeLog 23207
-SHA256 0d7e2f28a181a78620b49bf66c5842e2d091fe4b02a2b6bb89c31b5a16eb148b ChangeLog 23207
+MD5 bac68b55a22290018f7edae038539511 ChangeLog 23489
+RMD160 e6babe051612c7db2d1fc5f48119d40196c6a084 ChangeLog 23489
+SHA256 195da5a3d43bc336235aa9b784a1c08eef2935a205e670fd9fa61295ead3529c ChangeLog 23489
 MD5 d16038abdb251bdd8d087142cb14f4a6 bash-completion-20050121-r10.ebuild 2000
 RMD160 cabc7ad1e3558b64e43c00be5163bf999cd33be1 bash-completion-20050121-r10.ebuild 2000
 SHA256 67283fc48236b3def3a0b9722e01de32509eac1e186c12dfab26044421406cb0 bash-completion-20050121-r10.ebuild 2000
 MD5 66eb82e5a9df017daec7510a9a188f47 bash-completion-20050721.ebuild 2009
 RMD160 bf8c44338677996c7c8d8c29663dfa57d57c59ab bash-completion-20050721.ebuild 2009
 SHA256 7e26826d461ff73a183cbe5f9174901ae9f305b27c0993b8a1d2d4141f47f531 bash-completion-20050721.ebuild 2009
+MD5 84dcad445e9144c93ac985275967fa1f bash-completion-20060301.ebuild 2059
+RMD160 59552d9f63c47b979e6575af2f0f970cd759724b bash-completion-20060301.ebuild 2059
+SHA256 a07b0643f28b63aeb69096ed3fcdd743a9109affc115c64c0fb1d2b065d34e56 bash-completion-20060301.ebuild 2059
 MD5 bc7bb8b50049a7c6d412b60b273b55d4 files/20050121/01_all_gkrellm.diff 246
 RMD160 def8fc4574f42096fc86308d4d57a0c502fec2a9 files/20050121/01_all_gkrellm.diff 246
 SHA256 a0fe56bf9b04331b5ba1eab3b4bc81ad5d6064770e5753be095078d8f3fd5d14 files/20050121/01_all_gkrellm.diff 246
@@ -49,6 +49,12 @@ SHA256 c58c0a2a30b40cf7fcbb8bba92188f1dd2ef4ec17b02f97f83c0865e16b5e945 files/20
 MD5 bb517a3e3dea3755291f4629330481f2 files/20050721/04_all_command.diff 492
 RMD160 9b28f3dcaaa5be0d2773feee3562ad19b2ef33c2 files/20050721/04_all_command.diff 492
 SHA256 e7a928637bdb777366f27baf495854d8a2a444b47e34c9d429cc0f9d0c6f6265 files/20050721/04_all_command.diff 492
+MD5 446dcb05f2c367b96e6bd5d03f7e88e3 files/20060301/01_all_no_xine.diff 868
+RMD160 87c39896ac86c3264a0e4f75a6a36c5768671abc files/20060301/01_all_no_xine.diff 868
+SHA256 2375a581a7d1dee5872e082bba59620f8ffd6fc0aea2916aada35db6f11c7144 files/20060301/01_all_no_xine.diff 868
+MD5 47b4e0365c93cc9c2b7ae8560fe81427 files/20060301/02_all_mplayer_flac.diff 481
+RMD160 dec76457b90b7c745e6e9027a4c15d7cc2932f8c files/20060301/02_all_mplayer_flac.diff 481
+SHA256 6f3efc7cf2b0d52f99f1f9d402d4be0c3d619e00275b599eb60eb47f265d02e7 files/20060301/02_all_mplayer_flac.diff 481
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
 RMD160 dc15f6b02f08a2fa656fa2d0c9ed15d20a7b9dc8 files/bash-completion 724
 SHA256 6898275f2b0ab67af4b35c8a239d04a233e0c252acb5ed76692fd65881d3be0e files/bash-completion 724
@@ -58,13 +64,9 @@ SHA256 0efc6025548096b9d0a2c18ac016e15b6984bdc9c08cc59a6c744b583727dcb6 files/di
 MD5 b1cfae1023e07fa54d4d7eba57de0f7a files/digest-bash-completion-20050721 76
 RMD160 7dd798bc633204cf5353c6aadac1c7f9ab714c6e files/digest-bash-completion-20050721 76
 SHA256 371f0a0f432d2d023837cfde177ac40ec42f06f68ae725314a4a1ac3f7cbb882 files/digest-bash-completion-20050721 76
+MD5 c2f575e2eb05dcb99e4715921cf0ee65 files/digest-bash-completion-20060301 277
+RMD160 25c058254d036eb2d95cbd1394a48e2e30b16c73 files/digest-bash-completion-20060301 277
+SHA256 6db83773985ad0568d96f86d5b972bd85777b3feb321961823cff1aaba5edb5b files/digest-bash-completion-20060301 277
 MD5 08ab540760a142dbc2af127d5f71be07 metadata.xml 1019
 RMD160 cdc1aaaf47ada6e5e6651c8da3894482291553ad metadata.xml 1019
 SHA256 8befa6a5366b7142e59ccfc58745cd874b8a47fe7aef571d90a31d78057223a5 metadata.xml 1019
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6mk1V3J2n04EauwRAu5zAJ9skLIswv9K58Gl6/3WGdVFRJQSVgCfRV2Y
-wg16GMnCQXHGNd9+qdjkYCI=
-=uJZG
------END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20060301.ebuild b/app-shells/bash-completion/bash-completion-20060301.ebuild
new file mode 100644
index 000000000000..84458dacae9f
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-20060301.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20060301.ebuild,v 1.1 2006/03/02 12:03:27 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="http://www.caliban.org/bash/index.shtml#completion"
+SRC_URI="http://www.caliban.org/files/bash/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| (
+				>=app-shells/bash-2.05a
+				app-shells/zsh
+			)"
+PDEPEND="app-shells/gentoo-bashcomp"
+
+S="${WORKDIR}/${PN/-/_}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_SUFFIX="diff" epatch ${FILESDIR}/20050721
+	EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV}
+}
+
+src_install() {
+	insinto /etc
+	doins bash_completion || die "failed to install bash_completion"
+	exeinto /etc/profile.d
+	doexe ${FILESDIR}/bash-completion || die "failed to install profile.d"
+
+	# dev-util/subversion provides an extremely superior completion
+	rm contrib/subversion
+	insinto /usr/share/bash-completion
+	doins contrib/* || die "failed to install contrib completions"
+
+	dodoc Changelog README
+}
+
+pkg_postinst() {
+	echo
+	einfo "Add the following to your ~/.bashrc to enable completion support."
+	einfo "NOTE: to avoid things like Gentoo bug #98627, you should set aliases"
+	einfo "after sourcing /etc/profile.d/bash-completion."
+	einfo
+	einfo "[[ -f /etc/profile.d/bash-completion ]] && \\ "
+	einfo "    source /etc/profile.d/bash-completion"
+	einfo
+	einfo "Additional completion functions can be enabled by installing"
+	einfo "app-admin/eselect and using the included bashcomp module."
+	echo
+
+	if has_version 'app-shells/zsh' ; then
+		einfo "If you are interested in using the provided bash completion functions with"
+		einfo "zsh, valuable tips on the effective use of bashcompinit are available:"
+		einfo "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		einfo "  http://zshwiki.org/ZshSwitchingTo"
+		echo
+	fi
+}
diff --git a/app-shells/bash-completion/files/20060301/01_all_no_xine.diff b/app-shells/bash-completion/files/20060301/01_all_no_xine.diff
new file mode 100644
index 000000000000..e81ad8202a5c
--- /dev/null
+++ b/app-shells/bash-completion/files/20060301/01_all_no_xine.diff
@@ -0,0 +1,11 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN bash_completion.orig/bash_completion bash_completion/bash_completion
+--- bash_completion.orig/bash_completion	2006-03-02 07:08:39.000000000 -0500
++++ bash_completion/bash_completion	2006-03-02 07:09:12.000000000 -0500
+@@ -94,7 +94,6 @@
+ complete -f -X '!*.texi*' makeinfo texi2html
+ complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
+ complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay
+-complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX|mng|MNG)' xine aaxine fbxine kaffeine
+ complete -f -X '!*.@(avi|asf|wmv)' aviplay
+ complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
+ complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim
diff --git a/app-shells/bash-completion/files/20060301/02_all_mplayer_flac.diff b/app-shells/bash-completion/files/20060301/02_all_mplayer_flac.diff
new file mode 100644
index 000000000000..5d37878e14fa
--- /dev/null
+++ b/app-shells/bash-completion/files/20060301/02_all_mplayer_flac.diff
@@ -0,0 +1,12 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN bash_completion.orig/bash_completion bash_completion/bash_completion
+--- bash_completion.orig/bash_completion	2006-03-02 06:55:56.000000000 -0500
++++ bash_completion/bash_completion	2006-03-02 07:01:47.000000000 -0500
+@@ -5602,7 +5602,7 @@
+ 			return 0
+ 			;;
+ 		-audiofile)
+-			_filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|wav|WAV|mid|MID)'
++			_filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|wav|WAV|mid|MID|flac|FLAC)'
+ 			return 0
+ 			;;
+ 		-font)
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20060301 b/app-shells/bash-completion/files/digest-bash-completion-20060301
new file mode 100644
index 000000000000..845b62873eb5
--- /dev/null
+++ b/app-shells/bash-completion/files/digest-bash-completion-20060301
@@ -0,0 +1,3 @@
+MD5 ed95a89f57357a42b8e4eb95487bf9d0 bash-completion-20060301.tar.bz2 102357
+RMD160 eaa9112289607bae51868f047a9673ee6f3e6a0c bash-completion-20060301.tar.bz2 102357
+SHA256 16727406bd3fbb6a23da375d4f3ca7c5d518afeb7dfb82c061a452eb7a93ceca bash-completion-20060301.tar.bz2 102357