# ChangeLog for app-shells/bash-completion
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.214 2010/05/13 20:22:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.215 2010/07/02 14:48:41 darkside Exp $
+
+ 02 Jul 2010; Jeremy Olexa <darkside@gentoo.org>
+ -bash-completion-1.0-r5.ebuild, -files/bash-completion-1.0-bash4.patch,
+ -files/bash-completion-1.0-gentoo.patch,
+ -files/bash-completion-1.0-shadow-compat.patch, -files/bash-completion:
+ remove old
13 May 2010; Fabian Groffen <grobian@gentoo.org>
bash-completion-1.1-r5.ebuild:
-AUX bash-completion 724 RMD160 dc15f6b02f08a2fa656fa2d0c9ed15d20a7b9dc8 SHA1 d71224475d73b134085bf5f70fb1eb311397cae2 SHA256 6898275f2b0ab67af4b35c8a239d04a233e0c252acb5ed76692fd65881d3be0e
-AUX bash-completion-1.0-bash4.patch 861 RMD160 865e8f745b8cc53125db6903b1954523f99a277e SHA1 503b825408f4a366d1d4795e3ae4f6e51cf500d5 SHA256 e0ecf183746f6b8075ecc7891e265a10b4a3593f6690f66c320fc18b023ac1ca
-AUX bash-completion-1.0-gentoo.patch 2125 RMD160 33682926cca6bcccc971a8c3dde91180cdf858e1 SHA1 e9a5da746221148dcd7661a6a996a9c4ba7ef149 SHA256 8a7bcd782b8980c8f370ca022872b7f894596f8289dbbd800327659b95a9a85a
-AUX bash-completion-1.0-shadow-compat.patch 879 RMD160 77921832e335109df5aa48475eefe6819a6bc108 SHA1 3139a6431bc9506cc4c4f2b80b516c0d365832f9 SHA256 5e877f2ad0c33c3e1bc7766d5389e18515518ac9ff6ffff4855bf7de59cf9297
AUX bash-completion.sh 2109 RMD160 fe90ae478a2b50672b733187a359a84fc1f57913 SHA1 e73ca453425abb7eaf26c15f30471f79a9a72dc1 SHA256 98022951b80b4af62cb254b5b738592835785784b5ddad4b8f71187f15f03b80
-DIST bash-completion-1.0.tar.gz 143578 RMD160 b590c2633c5c10c3e98b14a74f4e96c910b6177d SHA1 61040795731f5ff509c46e818a1edf0a7a93e11d SHA256 bd96e7d2858f02783046908a984993736f1189d07d82e9ce4b465068dd7187ef
DIST bash-completion-1.1.tar.bz2 135741 RMD160 e5e3c250d1b791007e916f0ce06511501675ba85 SHA1 dde4ca656c72adb8326a21f1774dd906f8aaef09 SHA256 7cd415c948e44e143c2f76b6ac6f52e1e44a2762db9201cd2892fe81df807ca4
-EBUILD bash-completion-1.0-r5.ebuild 3291 RMD160 0b8f31b029300416f4715d52a2ec77572a11d207 SHA1 e082d79bd123f27e156437106de4456ddb0c5ef4 SHA256 bfce40008c594375070567a9aacbc883495ffd862f7db61d4d431b309485b364
EBUILD bash-completion-1.1-r5.ebuild 3021 RMD160 4727d3130be6c57e6d8e3eee3f8aa383c4555f93 SHA1 3b226c93fb001eda4a2adea7832abe98c5bcaca1 SHA256 74a650479eadc248934270adadbab417b7b911d59bc32f26f54e48c25d834014
-MISC ChangeLog 37438 RMD160 1f13f468c06089ffc4e49da642d22c439144a950 SHA1 f8790660ecde96088cc0540fe39488f696b01f23 SHA256 4c23fb35de8e2e094edcdc2433d215b61e0f23c4546f1195a338c358a88178bb
+MISC ChangeLog 37694 RMD160 6836bff4dfdc0d772d9df21594251df5ff42cc45 SHA1 24fa27eea3452c00dff57157d1722d87f220e4f8 SHA256 81a5d3ed604671004120822938f7c1a3f273e09b51601d5b7646da82e4c9cf91
MISC metadata.xml 930 RMD160 e6718602012b2cfcb5be5bfc962889bf88f4dc73 SHA1 a585c9cfc0bdb59ee4c7ff1e786bc53d28d36aac SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.0-r5.ebuild,v 1.11 2010/01/06 17:46:01 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="http://bash-completion.alioth.debian.org/"
-SRC_URI="mirror://debian/pool/main/b/bash-completion/${PN}_${PV}.orig.tar.gz ->
-bash-completion-1.0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-admin/eselect
- || (
- >=app-shells/bash-2.05a
- app-shells/zsh
- )
- sys-apps/miscfiles
- !<=games-misc/cowsay-3.03-r1"
-PDEPEND="app-shells/gentoo-bashcomp"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.0-gentoo.patch"
- epatch "${FILESDIR}/${PN}-1.0-bash4.patch"
- # module-init-tools-3.8 changed locations
- sed -i 's:/sbin/lsmod:/bin/lsmod:' bash_completion
- # Fixed in next release
- epatch "${FILESDIR}/${PN}-1.0-shadow-compat.patch"
-
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- # Upstream will soon be splitting this for us.
- # split /etc/bash_completion into three parts:
- # 1. /usr/share/bash-completion/.pre -- hidden from eselect
- # 2. /usr/share/bash-completion/base -- eselectable
- # 3. /usr/share/bash-completion/.post -- hidden from eselect
- dodir /usr/share/bash-completion
- awk -v D="$D" '
- BEGIN { out=".pre" }
- /^# A lot of the following one-liners/ { out="base" }
- /^# start of section containing completion functions called by other functions/ { out=".pre" }
- /^# start of section containing completion functions for bash built-ins/ { out="base" }
- /^# source completion directory/ { out="" }
- /^unset -f have/ { out=".post" }
- out != "" { print > D"/usr/share/bash-completion/"out }' \
- bash_completion || die "failed to split bash_completion"
-
- dodir /etc/profile.d
- cp bash_completion.sh "${D}/etc/profile.d/bash-completion.sh" \
- || die "cp failed"
-
- dodoc AUTHORS CHANGES README TODO || die "dodocs failes"
-
- # bug 146726
- rm "${D}/etc/bash_completion.d/svk" || die "rm failed"
-
- # Upstream provides no easy way to move modules. sigh
- dodir /usr/share/bash-completion
- mv "${D}"/etc/bash_completion.d/* "${D}/usr/share/bash-completion/" \
- || die "installation failed to move files"
- # cleanup the mess
- rm -r "${D}"/etc/bash_completion{,.d} || die "rm failed"
-}
-
-pkg_postinst() {
- elog "Any user can enable the base completions without editing their"
- elog ".bashrc by running:"
- elog
- elog " eselect bashcomp enable base"
- elog
- elog "The system administrator can also be enable this globally with"
- elog
- elog " eselect bashcomp enable --global base"
- elog
- elog "Additional completion functions can also be enabled or"
- elog "disabled using eselect's bashcomp module."
- elog
- elog "If you use non-login shells you still need to source"
- elog "/etc/profile.d/bash-completion.sh in your ~/.bashrc."
-
- if has_version 'app-shells/zsh' ; then
- elog "If you are interested in using the provided bash completion functions with"
- elog "zsh, valuable tips on the effective use of bashcompinit are available:"
- elog " http://www.zsh.org/mla/workers/2003/msg00046.html"
- #elog " http://zshwiki.org/ZshSwitchingTo" (doesn't exist)
- elog
- fi
-}
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion,v 1.7 2004/11/12 23:44:04 ka0ttic Exp $
-#
-# START bash completion -- do not remove this line
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-# interactive shell
-if [ "$PS1" ]; then
- if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -ge 3 ]; then
- [ -f /etc/bash_completion ] && . /etc/bash_completion
- if [ -d ~/.bash_completion.d ] ; then
- for file in ~/.bash_completion.d/* ; do
- [ -f $file ] && . $file
- done
- fi
- fi
-fi
-unset bash bmajor bminor
-# END bash completion -- do not remove this line
+++ /dev/null
-commit 1421e55aac075e13491cd212b796bdd453214a2c
-Author: Mike Kelly <pioto@pioto.org>
-Date: Thu Apr 2 11:16:46 2009 -0400
-
- Fix _filedir on bash 4.
-
- We don't need to double-quote things for compgen w/ bash 4. Just putting
- each file in double quotes is sufficient.
-
- See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
-
-diff --git a/bash_completion b/bash_completion
-index 0246cd8..4d21cf8 100644
---- a/bash_completion
-+++ b/bash_completion
-@@ -209,6 +209,12 @@ quote()
- # results in the original argument
- quote_readline()
- {
-+ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then
-+ # This function isn't really necessary on bash 4
-+ # See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
-+ echo "${1}"
-+ return
-+ fi
- local t="${1//\\/\\\\}"
- echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting
- }
+++ /dev/null
-Gentoo does something different than upstream. This patch allows multiple
-directories to be sourced. Upstream is trying to come to a consensus on this
-issue and it is expected to change. Therefore it is a moot point to send this
-upstream now.
-
---- bash_completion.sh.orig 2009-04-08 23:14:34.736632335 -0500
-+++ bash_completion.sh 2009-04-08 23:17:59.670875954 -0500
-@@ -4,9 +4,46 @@
- # Check for recent enough version of bash.
- bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
- if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
-- if [ -r /etc/bash_completion ]; then
-- # Source completion code.
-- . /etc/bash_completion
-- fi
-+ _load_completions() {
-+ declare f x loaded_pre=false
-+ for f; do
-+ if [[ -f $f ]]; then
-+ # Prevent loading base twice, initially and via glob
-+ if $loaded_pre && [[ $f == */base ]]; then
-+ continue
-+ fi
-+
-+ # Some modules, including base, depend on the definitions
-+ # in .pre. See the ebuild for how this is created.
-+ if ! $loaded_pre; then
-+ if [[ ${BASH_COMPLETION-unset} == unset ]]; then
-+ BASH_COMPLETION=/usr/share/bash-completion/base
-+ fi
-+ source /usr/share/bash-completion/.pre
-+ loaded_pre=true
-+ fi
-+
-+ source "$f"
-+ fi
-+ done
-+
-+ # Clean up
-+ $loaded_pre && source /usr/share/bash-completion/.post
-+ unset -f _load_completions # not designed to be called more than once
-+ }
-+
-+ # 1. Load base, if eselected. This was previously known as
-+ # /etc/bash_completion
-+ # 2. Load completion modules, maintained via eselect bashcomp --global
-+ # 3. Load user completion modules, maintained via eselect bashcomp
-+ # 4. Load user completion file last, overrides modules at user discretion
-+ # This order is subject to change once upstream decides on something.
-+ _load_completions \
-+ /etc/bash_completion.d/base \
-+ ~/.bash_completion.d/base \
-+ /etc/bash_completion.d/* \
-+ ~/.bash_completion.d/* \
-+ ~/.bash_completion
- fi
-+
- unset bash bminor bmajor
+++ /dev/null
-commit 86574164df810ecbd53ae841c15b38e5b06dc068
-Author: Ville Skyttä <ville.skytta@iki.fi>
-Date: Tue Apr 14 00:46:12 2009 +0300
-
- Always use /etc/shells for chsh -s completion, don't complete on
- comment lines in it.
-
- Invoking chsh -l does unwanted things on some systems, such as FreeBSD.
-
-diff --git a/bash_completion b/bash_completion
-index e50da69..6f84e31 100644
---- a/bash_completion
-+++ b/bash_completion
-@@ -2569,13 +2569,10 @@ _chsh()
- prev=${COMP_WORDS[COMP_CWORD-1]}
-
- if [ "$prev" = "-s" ]; then
-- if [ -f /etc/debian_version ]; then
-- COMPREPLY=( $( </etc/shells ) )
-- else
-- COMPREPLY=( $( chsh -l | grep "^$cur" ) )
-- fi
-+ COMPREPLY=( $( compgen -W '$( grep "^[[:space:]]*/" \
-+ /etc/shells 2>/dev/null )' -- $cur ) )
- else
-- COMPREPLY=( $( compgen -u -- $cur ) )
-+ COMPREPLY=( $( compgen -u -- $cur ) )
- fi
-
- return 0
projects / gentoo.git / commitdiff