Revision bump; updated tar completion so -xf will work with both gzip and bzip2 archives now that tar-1.15.1 is stable. Closes bug 76957. Tidy old ebuilds.

(Portage version: 2.0.51.19)

9 files changed, 29 insertions, 168 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 15ed83a027ee..0de05cb35b45 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,15 @@
 # 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.111 2005/03/28 12:37:21 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.112 2005/03/29 12:49:53 ka0ttic Exp $
+
+*bash-completion-20050121-r5 (29 Mar 2005)
+
+  29 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +files/20050121-tar.diff,
+  -bash-completion-20050121-r2.ebuild, -bash-completion-20050121-r3.ebuild,
+  -bash-completion-20050121-r4.ebuild, +bash-completion-20050121-r5.ebuild:
+  Revision bump; updated tar completion so -xf will work with both gzip and
+  bzip2 archives now that tar-1.15.1 is stable. Closes bug 76957. Tidy old
+  ebuilds.
 
 *bash-completion-20050121-r4 (28 Mar 2005)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 521cc41dbfdd..8039905fb732 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,28 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f2a71fd63566910b086d82226d7c9b7e bash-completion-20050121-r4.ebuild 1936
 MD5 966a1b97060ac3708d22d088e3cf49d6 bash-completion-20041017-r3.ebuild 2621
 MD5 b8b1307836a8311de6750fff5048b09d bash-completion-20050121-r1.ebuild 2696
-MD5 a436b5b7f3dee45828cc9dd394ae900b bash-completion-20050121-r3.ebuild 1898
-MD5 44c5b3135ff8dbe25ae11bc13a5f8b09 ChangeLog 18158
+MD5 c02c45eced6f92e425b07050a20dda04 bash-completion-20050121-r5.ebuild 1971
+MD5 107027631d9ab187c239315a8791d4a2 ChangeLog 18592
 MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
-MD5 8f9c39e1a1f7ad657433883606d247df bash-completion-20050121-r2.ebuild 2720
 MD5 4406981db9a6c4f413d3f9f4b14eae91 files/gentoo-bashcomp-20050117-equery.diff 3329
 MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152
+MD5 acc2c5e910e8f3fb36ea17f27d27db45 files/20050121-tar.diff 309
 MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
 MD5 35fc8232b26ca995623692bea7df2e5d files/digest-bash-completion-20050121-r1 152
-MD5 7a421855615dce0df4bb65ce82852a0e files/digest-bash-completion-20050121-r2 152
-MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r3 76
-MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r4 76
+MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r5 76
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
 MD5 d2cefd3e4878b47d485936839bdd39ab files/20050121-muttng.diff 2261
 MD5 64ca0b5063d0874c6104a4b174cb0d40 files/20050121-gentoo.diff 1894
 MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCR/qsEZCkKN40op4RAnAdAJ9NUGT8SqFO56N5OHtsGkop45x6jQCfRa0f
-nLEu/ELrZ75Wm+pVSnvV9P0=
-=aIyd
------END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20050121-r2.ebuild b/app-shells/bash-completion/bash-completion-20050121-r2.ebuild
deleted file mode 100644
index 720377f7621b..000000000000
--- a/app-shells/bash-completion/bash-completion-20050121-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050121-r2.ebuild,v 1.1 2005/02/07 15:08:00 ka0ttic Exp $
-
-inherit eutils
-
-GENCOMP_VERS="20050207"
-
-DESCRIPTION="Programmable Completion for bash (includes emerge and ebuild commands)"
-HOMEPAGE="http://www.caliban.org/bash/index.shtml#completion"
-SRC_URI="http://www.caliban.org/files/bash/${P}.tar.bz2
-	http://download.berlios.de/gentoo-bashcomp/gentoo-bashcomp-${GENCOMP_VERS}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-arch/tar
-	app-arch/bzip2"
-RDEPEND="|| (
-				>=app-shells/bash-2.05a
-				app-shells/zsh
-			)"
-
-S="${WORKDIR}/${PN/-/_}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo.diff
-#    cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
-#    epatch ${FILESDIR}/gentoo-bashcomp-${GENCOMP_VERS}-XXX.diff
-}
-
-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
-
-	# gentoo-bashcomp
-	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
-	doins gentoo || die "failed to install gentoo completions"
-	dodir /etc/bash_completion.d
-	dosym ../../usr/share/bash-completion/gentoo /etc/bash_completion.d/gentoo \
-		|| die "dosym gentoo-bashcomp failed"
-	docinto gentoo
-	dodoc AUTHORS TODO ChangeLog
-}
-
-pkg_postinst() {
-	echo
-	einfo "Add the following line to your ~/.bashrc to"
-	einfo "activate completion support in your bash:"
-	einfo "[ -f /etc/profile.d/bash-completion ] && . /etc/profile.d/bash-completion"
-	einfo
-	einfo "Additional complete functions can be enabled by symlinking them from"
-	einfo "/usr/share/bash-completion to /etc/bash_completion.d"
-
-	local g="${ROOT}/etc/bash_completion.d/gentoo"
-	if [[ -e "${g}" && ! -L "${g}" ]] ; then
-		echo
-		ewarn "The gentoo completion functions have moved to /usr/share/bash-completion."
-		ewarn "Please run etc-update to replace /etc/bash_completion.d/gentoo with a symlink."
-	fi
-	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/bash-completion-20050121-r3.ebuild b/app-shells/bash-completion/bash-completion-20050121-r3.ebuild
deleted file mode 100644
index 88f83c76779f..000000000000
--- a/app-shells/bash-completion/bash-completion-20050121-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050121-r3.ebuild,v 1.1 2005/03/16 12:45:39 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 ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-arch/tar
-	app-arch/bzip2"
-RDEPEND="|| (
-				>=app-shells/bash-2.05a
-				app-shells/zsh
-			)"
-PDEPEND="app-shells/gentoo-bashcomp"
-
-S="${WORKDIR}/${PN/-/_}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo.diff
-}
-
-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 line to your ~/.bashrc to"
-	einfo "activate completion support in your bash:"
-	einfo "[ -f /etc/profile.d/bash-completion ] && . /etc/profile.d/bash-completion"
-	einfo
-	einfo "Additional complete functions can be enabled by symlinking them from"
-	einfo "/usr/share/bash-completion to /etc/bash_completion.d"
-	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/bash-completion-20050121-r4.ebuild b/app-shells/bash-completion/bash-completion-20050121-r5.ebuild
index 2aba5c54ca29..69f154873961 100644
--- a/app-shells/bash-completion/bash-completion-20050121-r4.ebuild
+++ b/app-shells/bash-completion/bash-completion-20050121-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050121-r4.ebuild,v 1.1 2005/03/28 12:37:21 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050121-r5.ebuild,v 1.1 2005/03/29 12:49:53 ka0ttic Exp $
 
 inherit eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gentoo.diff
 	epatch ${FILESDIR}/${PV}-muttng.diff
+	epatch ${FILESDIR}/${PV}-tar.diff
 }
 
 src_install() {
diff --git a/app-shells/bash-completion/files/20050121-tar.diff b/app-shells/bash-completion/files/20050121-tar.diff
new file mode 100644
index 000000000000..618134e0367c
--- /dev/null
+++ b/app-shells/bash-completion/files/20050121-tar.diff
@@ -0,0 +1,13 @@
+--- bash_completion.orig	2005-03-28 23:32:38.000000000 -0500
++++ bash_completion	2005-03-28 23:42:13.000000000 -0500
+@@ -2773,8 +2773,8 @@
+ 		return 0
+ 		;;
+ 	+([^IZzjy])f)
+-		ext='tar'
+-		regex=$ext
++		ext='t?(ar.)@(gz|Z|bz?(2))'
++		regex='t\(ar\.\)\(gz\|Z\|bz2\?\)'
+ 		;;
+ 	*[Zz]*f)
+ 		ext='t?(ar.)@(gz|Z)'
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121-r2 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r2
deleted file mode 100644
index 5574bbf415d5..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20050121-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 90140
-MD5 38ee47358b278c7b0253fc444a39c544 gentoo-bashcomp-20050207.tar.bz2 17068
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121-r4 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r4
deleted file mode 100644
index 5b0dcdfbb97e..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20050121-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 90140
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121-r3 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r5
index 5b0dcdfbb97e..5b0dcdfbb97e 100644
--- a/app-shells/bash-completion/files/digest-bash-completion-20050121-r3
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050121-r5