From 4e5195e1e5213156fea457b298f074000cb3cb27 Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Tue, 14 Apr 2009 15:42:10 +0000 Subject: it is better to have a revision bump here so we can avoid any file collision business in the future. (Portage version: 2.1.6.11/cvs/Linux x86_64) --- app-shells/bash-completion/ChangeLog | 9 ++- .../bash-completion/bash-completion-1.0-r2.ebuild | 93 ---------------------- .../bash-completion/bash-completion-1.0-r3.ebuild | 93 ++++++++++++++++++++++ 3 files changed, 101 insertions(+), 94 deletions(-) delete mode 100644 app-shells/bash-completion/bash-completion-1.0-r2.ebuild create mode 100644 app-shells/bash-completion/bash-completion-1.0-r3.ebuild (limited to 'app-shells') diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog index 470b47772496..a467e01bce29 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.170 2009/04/14 15:38:31 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.171 2009/04/14 15:42:10 darkside Exp $ + +*bash-completion-1.0-r3 (14 Apr 2009) + + 14 Apr 2009; Jeremy Olexa + -bash-completion-1.0-r2.ebuild, +bash-completion-1.0-r3.ebuild: + it is better to have a revision bump here so we can avoid any file collision + business in the future. 14 Apr 2009; Jeremy Olexa bash-completion-1.0-r2.ebuild: diff --git a/app-shells/bash-completion/bash-completion-1.0-r2.ebuild b/app-shells/bash-completion/bash-completion-1.0-r2.ebuild deleted file mode 100644 index 3d88b65000e7..000000000000 --- a/app-shells/bash-completion/bash-completion-1.0-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2009 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-r2.ebuild,v 1.2 2009/04/14 15:38:31 darkside 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 ~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" -} - -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 -} diff --git a/app-shells/bash-completion/bash-completion-1.0-r3.ebuild b/app-shells/bash-completion/bash-completion-1.0-r3.ebuild new file mode 100644 index 000000000000..d8654abaf01b --- /dev/null +++ b/app-shells/bash-completion/bash-completion-1.0-r3.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/04/14 15:42:10 darkside 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 ~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" +} + +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 +} -- cgit v1.2.3-65-gdbad