From 11c25e59dd87cfb0706f280689cdfa8c177a9f22 Mon Sep 17 00:00:00 2001 From: Aaron Walker Date: Tue, 4 Jan 2005 11:57:23 +0000 Subject: New upstream release; marked 20041017-r3 stable on x86. --- app-shells/bash-completion/ChangeLog | 9 ++- app-shells/bash-completion/Manifest | 15 ++-- .../bash-completion-20041017-r2.ebuild | 85 ---------------------- .../bash-completion-20041017-r3.ebuild | 4 +- .../bash-completion-20050103.ebuild | 81 +++++++++++++++++++++ .../bash-completion/files/20050103-gentoo.diff | 39 ++++++++++ .../files/digest-bash-completion-20041017-r2 | 2 - .../files/digest-bash-completion-20050103 | 2 + 8 files changed, 140 insertions(+), 97 deletions(-) delete mode 100644 app-shells/bash-completion/bash-completion-20041017-r2.ebuild create mode 100644 app-shells/bash-completion/bash-completion-20050103.ebuild create mode 100644 app-shells/bash-completion/files/20050103-gentoo.diff delete mode 100644 app-shells/bash-completion/files/digest-bash-completion-20041017-r2 create mode 100644 app-shells/bash-completion/files/digest-bash-completion-20050103 (limited to 'app-shells') diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog index 6549925bb26d..92f791ff9c9b 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.90 2005/01/02 16:13:44 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.91 2005/01/04 11:57:23 ka0ttic Exp $ + +*bash-completion-20050103 (04 Jan 2005) + + 04 Jan 2005; Aaron Walker + +files/20050103-gentoo.diff, -bash-completion-20041017-r2.ebuild, + bash-completion-20041017-r3.ebuild, +bash-completion-20050103.ebuild: + New upstream release; marked 20041017-r3 stable on x86. 02 Jan 2005; Aaron Walker +files/20041017-rcs.diff, bash-completion-20041017-r3.ebuild: diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest index 683c54356d63..335a0d303097 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -2,24 +2,25 @@ Hash: SHA1 MD5 5c025c16b6b1214ae6b54beb797a0af1 bash-completion-20041017-r1.ebuild 2265 -MD5 60c048219cc84969cfde5643beb92f33 bash-completion-20041017-r3.ebuild 2689 +MD5 15c7c8c672e702877c1a35cb145a720a bash-completion-20041017-r3.ebuild 2688 MD5 1e7793d7236ad87efdd637cb3901f980 bash-completion-20040711.ebuild 2093 -MD5 fa1078f6300ecb232f9dbbc9e1bf6bdb bash-completion-20041017-r2.ebuild 2364 +MD5 d475312b16e2adccf7dd8984ca93b78f bash-completion-20050103.ebuild 2646 MD5 b14e733dad85348f883a6214d21cfee7 bash-completion-20040704-r1.ebuild 2091 -MD5 a0192a2cffb217ac7bb87ee8a021efcd ChangeLog 13607 +MD5 7ae006acb377acdf827cb302e1642f06 ChangeLog 13896 MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930 MD5 236fd9c517ac5642cae8df109dbaf9f6 files/digest-bash-completion-20041017-r1 152 -MD5 23f48288589834ae8496f6dc07d0d689 files/digest-bash-completion-20041017-r2 152 MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152 MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724 MD5 73c3177da25971c1db7bb6482b5d1580 files/digest-bash-completion-20040711 151 +MD5 6bfeb038d793aa50d7496c6d08913183 files/digest-bash-completion-20050103 152 +MD5 62c632c282cbbd0b28ba064ec57e2111 files/20050103-gentoo.diff 2060 MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032 MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB2B3BEZCkKN40op4RAuJmAJ9dwE+fnwFL9gP9in8vhAHADBfmfQCaAvGJ -gdTslzCVycBrsi5tcm04i+g= -=SZlT +iD8DBQFB2oTnEZCkKN40op4RAijgAJwMOVWMlVO26jn77xZHmZ0IacpY7QCeJ+Oh +JMokIK/XDvWD6y/yoTA9W/A= +=uNNF -----END PGP SIGNATURE----- diff --git a/app-shells/bash-completion/bash-completion-20041017-r2.ebuild b/app-shells/bash-completion/bash-completion-20041017-r2.ebuild deleted file mode 100644 index 4b27633af7d4..000000000000 --- a/app-shells/bash-completion/bash-completion-20041017-r2.ebuild +++ /dev/null @@ -1,85 +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-r2.ebuild,v 1.2 2005/01/01 15:56:58 eradicator Exp $ - -inherit eutils - -GENCOMP_VERS="1.0_beta3" - -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 ~ppc-macos ~s390 ~sparc ~x86 ~ppc64" -IUSE="" - -DEPEND="app-arch/tar - app-arch/bzip2" -RDEPEND=">=app-shells/bash-2.05a" - -S=${WORKDIR}/${PN/-/_} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PV}-gentoo.diff -} - -src_install() { - insinto /etc - doins bash_completion - - # >=dev-util/subversion-1.1.1-r3 provides extremely superior completions - has_version ">=dev-util/subversion-1.1.1-r3" && rm contrib/subversion - - insinto /usr/share/bash-completion - doins contrib/* - - exeinto /etc/profile.d - doexe ${FILESDIR}/bash-completion - - dodoc Changelog README - - cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS} - insinto /etc/bash_completion.d - doins src/gentoo - - 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" - - if [ -f ${ROOT}/etc/bash_completion.d/gentoo.completion ] - then - echo - ewarn "The file 'gentoo.completion' in '/etc/bash_completion.d/' has been" - ewarn "replaced with 'gentoo'. Remove gentoo.completion to avoid problems." - fi - - local bcfile moved - for bcfile in ${ROOT}/etc/bash_completion.d/{unrar,harbour,isql,larch,lilypond,p4,ri} - do - - [ -f "${bcfile}" -a ! -L "${bcfile}" ] && moved="${bcfile##*/} ${moved}" - done - - if [ -n "${moved}" ] - then - echo - ewarn "The contrib files: ${moved}" - ewarn "have been moved to /usr/share/bash-completion. Please DELETE" - ewarn "those old files in /etc/bash_completion.d and create symlinks." - fi - echo -} diff --git a/app-shells/bash-completion/bash-completion-20041017-r3.ebuild b/app-shells/bash-completion/bash-completion-20041017-r3.ebuild index c2d9f74e5059..d2f297f159b8 100644 --- a/app-shells/bash-completion/bash-completion-20041017-r3.ebuild +++ b/app-shells/bash-completion/bash-completion-20041017-r3.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-20041017-r3.ebuild,v 1.4 2005/01/02 16:13:44 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20041017-r3.ebuild,v 1.5 2005/01/04 11:57:23 ka0ttic Exp $ inherit eutils @@ -13,7 +13,7 @@ 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 ~s390 ~sparc ~x86 ~ppc64" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~s390 ~sparc x86 ~ppc64" IUSE="" DEPEND="app-arch/tar diff --git a/app-shells/bash-completion/bash-completion-20050103.ebuild b/app-shells/bash-completion/bash-completion-20050103.ebuild new file mode 100644 index 000000000000..55bfbb8fa7a4 --- /dev/null +++ b/app-shells/bash-completion/bash-completion-20050103.ebuild @@ -0,0 +1,81 @@ +# 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-20050103.ebuild,v 1.1 2005/01/04 11:57:23 ka0ttic 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 ~ppc-macos ~s390 ~sparc ~x86 ~ppc64" +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 +} + +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-1.1.1-r3 provides extremely superior completions + has_version ">=dev-util/subversion-1.1.1-r3" && 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 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/20050103-gentoo.diff b/app-shells/bash-completion/files/20050103-gentoo.diff new file mode 100644 index 000000000000..0e2f0a239a86 --- /dev/null +++ b/app-shells/bash-completion/files/20050103-gentoo.diff @@ -0,0 +1,39 @@ +diff -urN bash_completion.orig/bash_completion bash_completion/bash_completion +--- bash_completion.orig/bash_completion 2005-01-04 06:37:22.323617704 -0500 ++++ bash_completion/bash_completion 2005-01-04 06:44:00.703054824 -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 +@@ -5260,7 +5261,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) +@@ -5552,7 +5553,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 -urN bash_completion.orig/contrib/gkrellm bash_completion/contrib/gkrellm +--- bash_completion.orig/contrib/gkrellm 2005-01-04 06:37:22.306620288 -0500 ++++ bash_completion/contrib/gkrellm 2005-01-04 06:38:09.936379464 -0500 +@@ -34,3 +34,4 @@ + + } + complete -F _gkrellm gkrellm ++complete -F _gkrellm gkrellm2 diff --git a/app-shells/bash-completion/files/digest-bash-completion-20041017-r2 b/app-shells/bash-completion/files/digest-bash-completion-20041017-r2 deleted file mode 100644 index 7e8362f97797..000000000000 --- a/app-shells/bash-completion/files/digest-bash-completion-20041017-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 3fd0836127d01606a9dc4262f3e2e1fb bash-completion-20041017.tar.bz2 86227 -MD5 5ea2243f1e08c50d7ee1d0388afd0f47 gentoo-bashcomp-1.0_beta3.tar.gz 15059 diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050103 b/app-shells/bash-completion/files/digest-bash-completion-20050103 new file mode 100644 index 000000000000..771839999aae --- /dev/null +++ b/app-shells/bash-completion/files/digest-bash-completion-20050103 @@ -0,0 +1,2 @@ +MD5 0ee7009b18ff862f8a63c2395e5fd100 bash-completion-20050103.tar.bz2 89246 +MD5 d6d22c935ff339c2ebcc0757f5d306d0 gentoo-bashcomp-1.0_beta4.tar.gz 15477 -- cgit v1.2.3-65-gdbad