diff options
author | Aaron Walker <ka0ttic@gentoo.org> | 2005-04-20 15:10:52 +0000 |
---|---|---|
committer | Aaron Walker <ka0ttic@gentoo.org> | 2005-04-20 15:10:52 +0000 |
commit | 9d6cdc7a8faf98cf0cf7458a8b4420b4146d0e01 (patch) | |
tree | c9cad19f9abaf731a6de3fedfa4fe91d04550fd5 /app-shells | |
parent | Stable x86. (diff) | |
download | historical-9d6cdc7a8faf98cf0cf7458a8b4420b4146d0e01.tar.gz historical-9d6cdc7a8faf98cf0cf7458a8b4420b4146d0e01.tar.bz2 historical-9d6cdc7a8faf98cf0cf7458a8b4420b4146d0e01.zip |
Revision bump; fixes bug 82810. New patch layout since we're starting to get quite a few. Also include gkrellm patch which was accidentally dropped at some point.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/bash-completion/ChangeLog | 14 | ||||
-rw-r--r-- | app-shells/bash-completion/Manifest | 34 | ||||
-rw-r--r-- | app-shells/bash-completion/bash-completion-20050121-r7.ebuild (renamed from app-shells/bash-completion/bash-completion-20050121-r6.ebuild) | 10 | ||||
-rw-r--r-- | app-shells/bash-completion/files/20050121/01_all_gkrellm.diff | 8 | ||||
-rw-r--r-- | app-shells/bash-completion/files/20050121/02_all_cvs.diff | 11 | ||||
-rw-r--r-- | app-shells/bash-completion/files/20050121/03_all_timidity.diff | 12 | ||||
-rw-r--r-- | app-shells/bash-completion/files/20050121/04_all_mplayer.diff | 20 | ||||
-rw-r--r-- | app-shells/bash-completion/files/20050121/05_all_muttng.diff | 69 | ||||
-rw-r--r-- | app-shells/bash-completion/files/20050121/06_all_tar.diff | 13 | ||||
-rw-r--r-- | app-shells/bash-completion/files/20050121/07_all_find.diff | 23 | ||||
-rw-r--r-- | app-shells/bash-completion/files/20050121/08_all_lvm.diff | 29 | ||||
-rw-r--r-- | app-shells/bash-completion/files/digest-bash-completion-20050121-r7 (renamed from app-shells/bash-completion/files/digest-bash-completion-20050121-r6) | 0 |
12 files changed, 222 insertions, 21 deletions
diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog index 5614322c2dc7..ccd459b0f74a 100644 --- a/app-shells/bash-completion/ChangeLog +++ b/app-shells/bash-completion/ChangeLog @@ -1,6 +1,18 @@ # 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.115 2005/04/06 11:46:23 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.116 2005/04/20 15:10:52 ka0ttic Exp $ + +*bash-completion-20050121-r7 (20 Apr 2005) + + 20 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> + +files/20050121/02_all_cvs.diff, +files/20050121/04_all_mplayer.diff, + +files/20050121/03_all_timidity.diff, +files/20050121/05_all_muttng.diff, + +files/20050121/01_all_gkrellm.diff, +files/20050121/06_all_tar.diff, + +files/20050121/07_all_find.diff, +files/20050121/08_all_lvm.diff, + -bash-completion-20050121-r6.ebuild, +bash-completion-20050121-r7.ebuild: + Revision bump; fixes bug 82810. New patch layout since we're starting to get + quite a few. Also include gkrellm patch which was accidentally dropped at + some point. 06 Apr 2005; Ciaran McCreesh <ciaranm@gentoo.org> bash-completion-20050121-r1.ebuild: diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest index 8287e2bcc7fd..d993dad23b01 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -1,26 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 4d61eb63099291cf70516969a23a9f93 ChangeLog 19125 MD5 966a1b97060ac3708d22d088e3cf49d6 bash-completion-20041017-r3.ebuild 2621 MD5 6eeb1d7aba8dbb67d3909a7f2f35da08 bash-completion-20050121-r1.ebuild 2695 +MD5 d92b535b552dab1cbf568de126df4e24 ChangeLog 19753 MD5 08ab540760a142dbc2af127d5f71be07 metadata.xml 1019 -MD5 76a60166ba7f3931477cea544f053c2d bash-completion-20050121-r6.ebuild 2007 -MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032 -MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574 -MD5 64ca0b5063d0874c6104a4b174cb0d40 files/20050121-gentoo.diff 1894 -MD5 d2cefd3e4878b47d485936839bdd39ab files/20050121-muttng.diff 2261 -MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724 -MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152 -MD5 35fc8232b26ca995623692bea7df2e5d files/digest-bash-completion-20050121-r1 152 +MD5 1ef56d1b4ea7fbb95686a7cf933d3c6d bash-completion-20050121-r7.ebuild 1879 MD5 4406981db9a6c4f413d3f9f4b14eae91 files/gentoo-bashcomp-20050117-equery.diff 3329 +MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152 MD5 be3ee952819bf05163462ba9bbc69f0a files/20050121-tar.diff 315 +MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574 +MD5 35fc8232b26ca995623692bea7df2e5d files/digest-bash-completion-20050121-r1 152 +MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r7 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 cd58de29e9c7c320649a05ce73ab4df1 files/20050121-find.diff 915 -MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r6 76 +MD5 d53ba451ff7064515327649c28ec37fb files/20050121/08_all_lvm.diff 868 +MD5 bc7bb8b50049a7c6d412b60b273b55d4 files/20050121/01_all_gkrellm.diff 246 +MD5 61f83b8578faa6f1d522ce1a9411e0cd files/20050121/05_all_muttng.diff 2293 +MD5 314c97f7275538773e79b8c61eb9412b files/20050121/02_all_cvs.diff 406 +MD5 5a5965b5055a1d6ee5d7ae884bc0cc18 files/20050121/07_all_find.diff 947 +MD5 ffcc2a25851c78eed228d5bf9a34a471 files/20050121/03_all_timidity.diff 844 +MD5 49c5f3ad15cbf56b194b4fa56bbe8342 files/20050121/06_all_tar.diff 347 +MD5 a68ebcc5af6af06535fcc9895b6066b3 files/20050121/04_all_mplayer.diff 974 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCU8vcLLFUmVNQ7rkRAhuNAJwLjux36Zqde/XJObRtw5l2OXoLBwCeNJzl -aDbThYsoNyDK9BRnclbgktE= -=Yd5P +iD8DBQFCZnETEZCkKN40op4RAtlnAJ4xtRx90GHs1DKdQewxUI5eFeVpqgCgmquU +PES24c7IBaJ1RwTdEvL2vx0= +=163r -----END PGP SIGNATURE----- diff --git a/app-shells/bash-completion/bash-completion-20050121-r6.ebuild b/app-shells/bash-completion/bash-completion-20050121-r7.ebuild index 324a9fb29c10..5fed4914ea29 100644 --- a/app-shells/bash-completion/bash-completion-20050121-r6.ebuild +++ b/app-shells/bash-completion/bash-completion-20050121-r7.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-r6.ebuild,v 1.1 2005/04/06 11:43:49 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050121-r7.ebuild,v 1.1 2005/04/20 15:10:52 ka0ttic Exp $ inherit eutils @@ -13,8 +13,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86" IUSE="" -DEPEND="app-arch/tar - app-arch/bzip2" +DEPEND="" RDEPEND="|| ( >=app-shells/bash-2.05a app-shells/zsh @@ -26,10 +25,7 @@ S="${WORKDIR}/${PN/-/_}" src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${PV}-gentoo.diff - epatch ${FILESDIR}/${PV}-muttng.diff - epatch ${FILESDIR}/${PV}-tar.diff - epatch ${FILESDIR}/${PV}-find.diff + EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV} } src_install() { diff --git a/app-shells/bash-completion/files/20050121/01_all_gkrellm.diff b/app-shells/bash-completion/files/20050121/01_all_gkrellm.diff new file mode 100644 index 000000000000..d8e92af45d26 --- /dev/null +++ b/app-shells/bash-completion/files/20050121/01_all_gkrellm.diff @@ -0,0 +1,8 @@ +--- bash_completion.orig/contrib/gkrellm 2005-04-20 02:19:05.000000000 -0400 ++++ bash_completion/contrib/gkrellm 2005-04-20 02:19:21.000000000 -0400 +@@ -33,4 +33,4 @@ + fi + + } +-complete -F _gkrellm gkrellm ++complete -F _gkrellm gkrellm gkrellm2 diff --git a/app-shells/bash-completion/files/20050121/02_all_cvs.diff b/app-shells/bash-completion/files/20050121/02_all_cvs.diff new file mode 100644 index 000000000000..529ec8f311a7 --- /dev/null +++ b/app-shells/bash-completion/files/20050121/02_all_cvs.diff @@ -0,0 +1,11 @@ +--- bash_completion.orig/bash_completion 2005-01-20 06:29:03.982356288 -0500 ++++ bash_completion/bash_completion 2005-01-20 06:44:08.957779112 -0500 +@@ -1582,7 +1583,7 @@ + COMPREPLY=( $( compgen -W '${changed[@]:-} \ + ${newremoved[@]:-}' -- $cur ) ) + else +- _filedir ++ COMPREPLY=($(compgen $default -- "$cur")) + fi + else + COMPREPLY=( $( compgen -W '-n -R -l -f -F -m -r' -- \ diff --git a/app-shells/bash-completion/files/20050121/03_all_timidity.diff b/app-shells/bash-completion/files/20050121/03_all_timidity.diff new file mode 100644 index 000000000000..8418cafa39e6 --- /dev/null +++ b/app-shells/bash-completion/files/20050121/03_all_timidity.diff @@ -0,0 +1,12 @@ +--- bash_completion.orig/bash_completion 2005-01-20 06:29:03.982356288 -0500 ++++ bash_completion/bash_completion 2005-01-20 06:44:08.957779112 -0500 +@@ -105,7 +105,8 @@ + complete -f -X '!*.@(ogg|OGG|m3u|flac|spx)' ogg123 + complete -f -X '!*.@(mp3|MP3|ogg|OGG|pls|m3u)' gqmpeg freeamp + complete -f -X '!*.fig' xfig +-complete -f -X '!*.@(mid?(i))' timidity playmidi ++complete -f -X '!*.@(mid?(i))' playmidi ++complete -f -X '!*.@(mid?(i)|rmi|RMI)' timidity + complete -f -X '*.@(o|so|so.!(conf)|a|tar?(.@(gz|bz2))|tgz|tbz2|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview + complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs + complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR)' wine diff --git a/app-shells/bash-completion/files/20050121/04_all_mplayer.diff b/app-shells/bash-completion/files/20050121/04_all_mplayer.diff new file mode 100644 index 000000000000..c6e3386f924c --- /dev/null +++ b/app-shells/bash-completion/files/20050121/04_all_mplayer.diff @@ -0,0 +1,20 @@ +--- bash_completion.orig/bash_completion 2005-01-20 06:29:03.982356288 -0500 ++++ bash_completion/bash_completion 2005-01-20 06:44:08.957779112 -0500 +@@ -5318,7 +5319,7 @@ + return 0 + ;; + -audiofile) +- _filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|wav|WAV)' ++ _filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|wav|WAV|mid|MID)' + return 0 + ;; + -font) +@@ -5610,7 +5611,7 @@ + -xvidencopts -of --verbose' -- $cur) ) + ;; + *) +- _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV)' ++ _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|mid|MID|ts|TS)' + ;; + esac + diff --git a/app-shells/bash-completion/files/20050121/05_all_muttng.diff b/app-shells/bash-completion/files/20050121/05_all_muttng.diff new file mode 100644 index 000000000000..9388a73510de --- /dev/null +++ b/app-shells/bash-completion/files/20050121/05_all_muttng.diff @@ -0,0 +1,69 @@ +--- bash_completion.orig/bash_completion 2005-03-27 23:40:42.000000000 -0500 ++++ bash_completion/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/20050121/06_all_tar.diff b/app-shells/bash-completion/files/20050121/06_all_tar.diff new file mode 100644 index 000000000000..2615bddaadf5 --- /dev/null +++ b/app-shells/bash-completion/files/20050121/06_all_tar.diff @@ -0,0 +1,13 @@ +--- bash_completion.orig/bash_completion 2005-03-28 23:32:38.000000000 -0500 ++++ bash_completion/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/20050121/07_all_find.diff b/app-shells/bash-completion/files/20050121/07_all_find.diff new file mode 100644 index 000000000000..84ce8d3fb86b --- /dev/null +++ b/app-shells/bash-completion/files/20050121/07_all_find.diff @@ -0,0 +1,23 @@ +--- bash_completion.orig/bash_completion 2005-04-06 12:19:18.102705608 +0100 ++++ bash_completion/bash_completion 2005-04-06 12:23:24.310276368 +0100 +@@ -925,8 +925,8 @@ + _command + return 0 + ;; +- -[acm]min|-[acm]time|-?(i)?(l)name|-inum|-?(i)path|-?(i)regex| \ +- -links|-perm|-size|-used|-printf) ++ -[acm]min|-[acm]time|-?(i)?(l)?(whole)name|-inum|-?(i)path| \ ++ -?(i)regex|-links|-perm|-size|-used|-printf) + # do nothing, just wait for a parameter to be given + return 0 + ;; +@@ -953,7 +953,8 @@ + -links -lname -mmin -mtime -name -newer -nouser \ + -nogroup -perm -regex -size -true -type -uid -used \ + -user -xtype -exec -fls -fprint -fprint0 -fprintf -ok \ +- -print -print0 -printf -prune -ls' -- $cur ) ) ++ -print -print0 -printf -prune -ls -wholename \ ++ -iwholename' -- $cur ) ) + + # this removes any options from the list of completions that have + # already been specified somewhere on the command line, as long as diff --git a/app-shells/bash-completion/files/20050121/08_all_lvm.diff b/app-shells/bash-completion/files/20050121/08_all_lvm.diff new file mode 100644 index 000000000000..35c3d068392b --- /dev/null +++ b/app-shells/bash-completion/files/20050121/08_all_lvm.diff @@ -0,0 +1,29 @@ +--- bash_completion.orig/bash_completion 2005-04-20 09:19:28.000000000 -0400 ++++ bash_completion/bash_completion 2005-04-20 09:52:28.000000000 -0400 +@@ -6755,20 +6755,20 @@ + have lvm && { + _volumegroups() + { +- COMPREPLY=( $( vgscan | \ +- awk -F'"' '/Found/ {if ($2 ~ /^'$cur'/) print $2}' ) ) ++ COMPREPLY=( $(compgen -W "$( vgscan 2>/dev/null | \ ++ sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- $cur ) ) + } + + _physicalvolumes() + { +- COMPREPLY=( $( pvscan | \ +- awk '/PV/ {if ($2 ~ /^'$cur'/) print $2}' ) ) ++ COMPREPLY=( $(compgen -W "$( pvscan 2>/dev/null | \ ++ sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- $cur ) ) + } + + _logicalvolumes() + { +- COMPREPLY=( $( lvscan 2>/dev/null | \ +- awk -F"'" '{if ($2 ~ /^'$cur'/) print $2}' ) ) ++ COMPREPLY=( $(compgen -W "$( lvscan 2>/dev/null | \ ++ sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- $cur ) ) + } + + _units() diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121-r6 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r7 index 5b0dcdfbb97e..5b0dcdfbb97e 100644 --- a/app-shells/bash-completion/files/digest-bash-completion-20050121-r6 +++ b/app-shells/bash-completion/files/digest-bash-completion-20050121-r7 |