From 43a8fc1adbe9ce91eed239f6975127e01cc40132 Mon Sep 17 00:00:00 2001 From: Aaron Walker Date: Wed, 20 Apr 2005 18:03:42 +0000 Subject: Tidy. Package-Manager: portage-2.0.51.19 --- app-shells/bash-completion/ChangeLog | 8 ++- app-shells/bash-completion/Manifest | 15 ++-- .../bash-completion-20041017-r3.ebuild | 82 ---------------------- .../bash-completion/files/20041017-gentoo.diff | 39 ---------- app-shells/bash-completion/files/20041017-rcs.diff | 19 ----- .../bash-completion/files/20050121-find.diff | 23 ------ .../bash-completion/files/20050121-muttng.diff | 69 ------------------ app-shells/bash-completion/files/20050121-tar.diff | 13 ---- .../files/digest-bash-completion-20041017-r3 | 2 - 9 files changed, 11 insertions(+), 259 deletions(-) delete mode 100644 app-shells/bash-completion/bash-completion-20041017-r3.ebuild delete mode 100644 app-shells/bash-completion/files/20041017-gentoo.diff delete mode 100644 app-shells/bash-completion/files/20041017-rcs.diff delete mode 100644 app-shells/bash-completion/files/20050121-find.diff delete mode 100644 app-shells/bash-completion/files/20050121-muttng.diff delete mode 100644 app-shells/bash-completion/files/20050121-tar.diff delete mode 100644 app-shells/bash-completion/files/digest-bash-completion-20041017-r3 diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog index ccd459b0f74a..9eda9b890c06 100644 --- a/app-shells/bash-completion/ChangeLog +++ b/app-shells/bash-completion/ChangeLog @@ -1,6 +1,12 @@ # 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.116 2005/04/20 15:10:52 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.117 2005/04/20 18:03:42 ka0ttic Exp $ + + 20 Apr 2005; Aaron Walker + -files/20041017-gentoo.diff, -files/20041017-rcs.diff, + -files/20050121-find.diff, -files/20050121-muttng.diff, + -files/20050121-tar.diff, -bash-completion-20041017-r3.ebuild: + Tidy. *bash-completion-20050121-r7 (20 Apr 2005) diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest index d993dad23b01..18d7c888d167 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -1,22 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 966a1b97060ac3708d22d088e3cf49d6 bash-completion-20041017-r3.ebuild 2621 MD5 6eeb1d7aba8dbb67d3909a7f2f35da08 bash-completion-20050121-r1.ebuild 2695 -MD5 d92b535b552dab1cbf568de126df4e24 ChangeLog 19753 +MD5 fdecfd1c6e03f73b6e407d9edb3f42ea ChangeLog 19991 MD5 08ab540760a142dbc2af127d5f71be07 metadata.xml 1019 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 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 @@ -28,7 +21,7 @@ MD5 a68ebcc5af6af06535fcc9895b6066b3 files/20050121/04_all_mplayer.diff 974 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCZnETEZCkKN40op4RAtlnAJ4xtRx90GHs1DKdQewxUI5eFeVpqgCgmquU -PES24c7IBaJ1RwTdEvL2vx0= -=163r +iD8DBQFCZpmTEZCkKN40op4RAkEOAKCduCU1HK2B5q3Ap4gbukkXcdz+4gCff1Lk +9f/T5fFBUBxyOoGMVZ7LNzs= +=5XyP -----END PGP SIGNATURE----- diff --git a/app-shells/bash-completion/bash-completion-20041017-r3.ebuild b/app-shells/bash-completion/bash-completion-20041017-r3.ebuild deleted file mode 100644 index fd230d7ded2e..000000000000 --- a/app-shells/bash-completion/bash-completion-20041017-r3.ebuild +++ /dev/null @@ -1,82 +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-20041017-r3.ebuild,v 1.12 2005/01/21 20:13:04 pylon Exp $ - -inherit eutils - -GENCOMP_VERS="1.0_beta4" - -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 - mirror://sourceforge/gentoo-bashcomp/gentoo-bashcomp-${GENCOMP_VERS}.tar.gz" - -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 - epatch ${FILESDIR}/${PV}-rcs.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 src/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 NEWS TODO -} - -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/files/20041017-gentoo.diff b/app-shells/bash-completion/files/20041017-gentoo.diff deleted file mode 100644 index f1c5eb855e00..000000000000 --- a/app-shells/bash-completion/files/20041017-gentoo.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN bash_completion.orig/bash_completion bash_completion/bash_completion ---- bash_completion.orig/bash_completion 2004-11-27 04:26:41.356337311 -0500 -+++ bash_completion/bash_completion 2004-11-27 04:27:07.461009682 -0500 -@@ -104,7 +104,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 -@@ -4693,7 +4694,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) -@@ -4985,7 +4986,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|RM|ram|RAM|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|RM|ram|RAM|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 -urN bash_completion.orig/contrib/gkrellm bash_completion/contrib/gkrellm ---- bash_completion.orig/contrib/gkrellm 2004-11-27 04:26:41.354337642 -0500 -+++ bash_completion/contrib/gkrellm 2004-11-27 04:33:27.155938637 -0500 -@@ -34,3 +34,4 @@ - - } - complete -F _gkrellm gkrellm -+complete -F _gkrellm gkrellm2 diff --git a/app-shells/bash-completion/files/20041017-rcs.diff b/app-shells/bash-completion/files/20041017-rcs.diff deleted file mode 100644 index 75602c017051..000000000000 --- a/app-shells/bash-completion/files/20041017-rcs.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- bash_completion/bash_completion 2004/12/21 21:40:48 1.1 -+++ bash_completion/bash_completion 2004/12/21 21:41:49 -@@ -4409,10 +4409,15 @@ _rcs() - - for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do - file=${COMPREPLY[$i]##*/} -- file=${file%,v} - dir=${COMPREPLY[$i]%RCS/*} - COMPREPLY[$i]=$dir$file - done -+ -+ COMPREPLY=( "${COMPREPLY[@]}" $( compgen -G "$dir/$file*,v" ) ) -+ -+ for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do -+ COMPREPLY[$i]=${COMPREPLY[$i]%,v} -+ done - - # default to files if nothing returned and we're checking in. - # otherwise, default to directories diff --git a/app-shells/bash-completion/files/20050121-find.diff b/app-shells/bash-completion/files/20050121-find.diff deleted file mode 100644 index 9950fe478349..000000000000 --- a/app-shells/bash-completion/files/20050121-find.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- bash_completion.orig 2005-04-06 12:19:18.102705608 +0100 -+++ 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-muttng.diff b/app-shells/bash-completion/files/20050121-muttng.diff deleted file mode 100644 index 04f06ace04f8..000000000000 --- a/app-shells/bash-completion/files/20050121-muttng.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- 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/20050121-tar.diff b/app-shells/bash-completion/files/20050121-tar.diff deleted file mode 100644 index eecacb9ebb5f..000000000000 --- a/app-shells/bash-completion/files/20050121-tar.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-20041017-r3 b/app-shells/bash-completion/files/digest-bash-completion-20041017-r3 deleted file mode 100644 index 216ce7e723b7..000000000000 --- a/app-shells/bash-completion/files/digest-bash-completion-20041017-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 3fd0836127d01606a9dc4262f3e2e1fb bash-completion-20041017.tar.bz2 86227 -MD5 d6d22c935ff339c2ebcc0757f5d306d0 gentoo-bashcomp-1.0_beta4.tar.gz 15477 -- cgit v1.2.3-65-gdbad