Revision bump; extend mutt completion to also work with muttng. Thanks to Marcin 'aye' Kryczek <aye@gentoo.pl> in bug 86853 for the patch.

(Portage version: 2.0.51.19)

5 files changed, 153 insertions, 19 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 8a06d46b1134..15ed83a027ee 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.110 2005/03/27 09:49:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.111 2005/03/28 12:37:21 ka0ttic Exp $
+
+*bash-completion-20050121-r4 (28 Mar 2005)
+
+  28 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/20050121-muttng.diff, +bash-completion-20050121-r4.ebuild:
+  Revision bump; extend mutt completion to also work with muttng. Thanks to
+  Marcin 'aye' Kryczek <aye@gentoo.pl> in bug 86853 for the patch.
 
   27 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
   bash-completion-20050121-r1.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 193e3dfa44d1..0462b6b5830b 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d6053cb09d7606d3c443403835b133cc ChangeLog 17852
-MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
-MD5 8f9c39e1a1f7ad657433883606d247df bash-completion-20050121-r2.ebuild 2720
+MD5 6c4b0c3d9f61489e086c67fc14720042 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 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
+MD5 2f8d14b047361d808d637a46d20d6c7e ChangeLog 18157
+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 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
+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 4406981db9a6c4f413d3f9f4b14eae91 files/gentoo-bashcomp-20050117-equery.diff 3329
-MD5 64ca0b5063d0874c6104a4b174cb0d40 files/20050121-gentoo.diff 1894
 MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r3 76
+MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r4 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
-MD5 35fc8232b26ca995623692bea7df2e5d files/digest-bash-completion-20050121-r1 152
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCRoHbugEuf3OQ0akRAnBJAJ4vrxJSWFAUAzhKWuw5nQEf0R4QsgCfaJiJ
-ZwOFAnx0s7YcSs10DTHFtwY=
-=DknP
------END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20050121-r4.ebuild b/app-shells/bash-completion/bash-completion-20050121-r4.ebuild
new file mode 100644
index 000000000000..2aba5c54ca29
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-20050121-r4.ebuild
@@ -0,0 +1,64 @@
+# 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 $
+
+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
+	epatch ${FILESDIR}/${PV}-muttng.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/files/20050121-muttng.diff b/app-shells/bash-completion/files/20050121-muttng.diff
new file mode 100644
index 000000000000..04f06ace04f8
--- /dev/null
+++ b/app-shells/bash-completion/files/20050121-muttng.diff
@@ -0,0 +1,69 @@
+--- bash_completion.orig	2005-03-27 23:40:42.000000000 -0500
++++ bash_completion	2005-03-27 23:42:50.000000000 -0500
+@@ -4544,7 +4544,7 @@
+ #
+ # Mutt doesn't have an "addressbook" like Pine, but it has aliases and
+ # a "query" function to retrieve addresses, so that's what we use here.
+-have mutt && {
++have mutt || have muttng && {
+ _muttaddr()
+ {
+ 	_muttaliases
+@@ -4577,9 +4577,10 @@
+ 	local -a conffiles aliases
+ 	cur=${COMP_WORDS[COMP_CWORD]}
+ 
+-	[ -f ~/.mutt/muttrc ] && muttrc="~/.mutt/muttrc"
+-	[ -f ~/.muttrc ] && muttrc="~/.muttrc"
++	[ -f ~/.${muttcmd}/${muttcmd}rc ] && muttrc="~/.${muttcmd}/${muttcmd}rc"
++	[ -f ~/.${muttcmd}rc ] && muttrc="~/.${muttcmd}rc"
+ 	[ -z "$muttrc" ] && return 0
++
+ 	conffiles=( $(eval _muttconffiles $muttrc $muttrc) )
+ 	aliases=( $( sed -rn 's|^alias[[:space:]]+([^[:space:]]+).*$|\1|p' \
+ 			$(eval echo ${conffiles[@]}) ) )
+@@ -4594,7 +4595,7 @@
+ 	local -a queryresults
+ 	cur=${COMP_WORDS[COMP_CWORD]}
+ 
+-	querycmd="$( mutt -Q query_command  | sed -r 's|^query_command=\"(.*)\"$|\1|; s|%s|'$cur'|' )"
++	querycmd="$( $muttcmd -Q query_command  | sed -r 's|^query_command=\"(.*)\"$|\1|; s|%s|'$cur'|' )"
+ 	if [ -z "$cur" -o -z "$querycmd" ]; then
+ 	    queryresults=()
+ 	else 
+@@ -4616,7 +4617,7 @@
+ 	# This is currently not working so well. Perhaps this function should
+ 	# just call _filedir() for the moment.
+ 	if [[ $cur == [=+]* ]]; then
+-		folder="$( mutt -Q folder | sed -r 's|^folder=\"(.*)\"$|\1|' )"
++		folder="$( $muttcmd -Q folder | sed -r 's|^folder=\"(.*)\"$|\1|' )"
+ 		: folder:=~/Mail
+ 
+ 		# Match any file in $folder beginning with $cur
+@@ -4625,7 +4626,7 @@
+ 		COMPREPLY=( ${COMPREPLY[@]#$folder/} )
+ 		return 0
+ 	elif [ "$cur" == !* ]; then
+-		spoolfile="$( mutt -Q spoolfile | sed -r 's|^spoolfile=\"(.*)\"$|\1|' )"
++		spoolfile="$( $muttcmd -Q spoolfile | sed -r 's|^spoolfile=\"(.*)\"$|\1|' )"
+ 		[ ! -z "$spoolfile" ] && eval cur="${cur/^!/$spoolfile}";
+ 	fi
+ 	_filedir
+@@ -4640,6 +4641,8 @@
+ 	prev=${COMP_WORDS[COMP_CWORD-1]}
+ 
+ 	COMPREPLY=()
++	
++	[ ${COMP_WORDS[0]} == muttng ] && muttcmd="muttng" || muttcmd="mutt"
+ 
+ 	case "$cur" in
+ 	-*)
+@@ -4670,7 +4673,7 @@
+ 	esac
+ 	
+ }
+-complete -F _mutt $default $filenames mutt
++complete -F _mutt $default $filenames mutt muttng
+ }
+ 
+ _configure_func()
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121-r4 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r4
new file mode 100644
index 000000000000..5b0dcdfbb97e
--- /dev/null
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050121-r4
@@ -0,0 +1 @@
+MD5 fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 90140