[gentoo-commits] gentoo-x86 commit in app-shells/bash-completion: bash-completion-2.1-r92.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in app-shells/bash-completion: bash-completion-2.1-r92.ebuild ChangeLog

[Michal Gorny (mgorny)]

mgorny      14/11/10 17:59:34

  Modified:             bash-completion-2.1-r92.ebuild ChangeLog
  Log:
  Remove the bash blocker, and just depend on bash. There is no point having || ( bash zsh ) when bash is obligatory for ebuilds.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.2                  app-shells/bash-completion/bash-completion-2.1-r92.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild?r1=1.1&r2=1.2

Index: bash-completion-2.1-r92.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-2.1-r92.ebuild	9 Nov 2014 20:41:38 -0000	1.1
+++ bash-completion-2.1-r92.ebuild	10 Nov 2014 17:59:34 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild,v 1.1 2014/11/09 20:41:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild,v 1.2 2014/11/10 17:59:34 mgorny Exp $
 
 EAPI=5
 
@@ -16,10 +16,9 @@
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
-RDEPEND="|| ( >=app-shells/bash-4.3_p30-r1 app-shells/zsh )
+RDEPEND=">=app-shells/bash-4.3_p30-r1
 	sys-apps/miscfiles
-	!app-admin/eselect-bashcomp
-	!!<app-shells/bash-4.3_p30-r1"
+	!app-admin/eselect-bashcomp"
 
 # Remove unwanted completions.
 STRIP_COMPLETIONS=(



1.276                app-shells/bash-completion/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/ChangeLog?rev=1.276&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/ChangeLog?rev=1.276&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/ChangeLog?r1=1.275&r2=1.276

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- ChangeLog	9 Nov 2014 20:41:38 -0000	1.275
+++ ChangeLog	10 Nov 2014 17:59:34 -0000	1.276
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.275 2014/11/09 20:41:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.276 2014/11/10 17:59:34 mgorny Exp $
+
+  10 Nov 2014; Michał Górny <mgorny@gentoo.org> bash-completion-2.1-r92.ebuild:
+  Remove the bash blocker, and just depend on bash. There is no point having ||
+  ( bash zsh ) when bash is obligatory for ebuilds.
 
 *bash-completion-2.1-r92 (09 Nov 2014)
 

[gentoo-commits] gentoo-x86 commit in app-shells/bash-completion: bash-completion-2.1-r92.ebuild ChangeLog

[Michal Gorny (mgorny)]

mgorny      14/11/09 20:41:38

  Modified:             ChangeLog
  Added:                bash-completion-2.1-r92.ebuild
  Log:
  Install initialization script to bashrc.d, bug #338335.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.275                app-shells/bash-completion/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/ChangeLog?rev=1.275&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/ChangeLog?rev=1.275&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/ChangeLog?r1=1.274&r2=1.275

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- ChangeLog	27 Oct 2014 14:13:13 -0000	1.274
+++ ChangeLog	9 Nov 2014 20:41:38 -0000	1.275
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.274 2014/10/27 14:13:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.275 2014/11/09 20:41:38 mgorny Exp $
+
+*bash-completion-2.1-r92 (09 Nov 2014)
+
+  09 Nov 2014; Michał Górny <mgorny@gentoo.org> +bash-completion-2.1-r92.ebuild:
+  Install initialization script to bashrc.d, bug #338335.
 
   27 Oct 2014; Michał Górny <mgorny@gentoo.org> bash-completion-2.1-r91.ebuild:
   Work-around race conditions in the Makefile, bug #526996.



1.1                  app-shells/bash-completion/bash-completion-2.1-r92.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild?rev=1.1&content-type=text/plain

Index: bash-completion-2.1-r92.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild,v 1.1 2014/11/09 20:41:38 mgorny Exp $

EAPI=5

inherit versionator

DESCRIPTION="Programmable Completion for bash"
HOMEPAGE="http://bash-completion.alioth.debian.org/"
SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2
	http://dev.gentoo.org/~mgorny/dist/bashcomp2-pre1.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE=""

RDEPEND="|| ( >=app-shells/bash-4.3_p30-r1 app-shells/zsh )
	sys-apps/miscfiles
	!app-admin/eselect-bashcomp
	!!<app-shells/bash-4.3_p30-r1"

# Remove unwanted completions.
STRIP_COMPLETIONS=(
	# Included in util-linux, bug #468544
	cal dmesg eject hd hexdump hwclock ionice look ncal renice rtcwake

	# Slackware package stuff, quite generic names cause collisions
	# (e.g. with sys-apps/pacman)
	explodepkg installpkg makepkg pkgtool removepkg upgradepkg

	# Debian/Red Hat network stuff
	ifdown ifup ifstatus
)

src_prepare() {
	epatch "${WORKDIR}"/bashcomp2-pre1/*.patch
}

src_test() { :; } # Skip testsuite because of interactive shell wrt #477066

src_install() {
	# work-around race conditions, bug #526996
	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die

	emake DESTDIR="${D}" profiledir=/etc/bash/bashrc.d install

	# use the copies from >=sys-apps/util-linux-2.23 wrt #468544 -> hd and ncal
	# becomes dead symlinks as a result
	local file
	for file in "${STRIP_COMPLETIONS[@]}"; do
		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
	done

	# use the copy from app-editors/vim-core:
	rm "${ED}"/usr/share/bash-completion/completions/xxd || die

	# use the copy from net-misc/networkmanager:
	rm "${ED}"/usr/share/bash-completion/completions/nmcli || die

	dodoc AUTHORS CHANGES README

	# install the eselect module
	insinto /usr/share/eselect/modules
	doins "${WORKDIR}"/bashcomp2-pre1/bashcomp.eselect
	doman "${WORKDIR}"/bashcomp2-pre1/bashcomp.eselect.5
}

pkg_postinst() {
	local v
	for v in ${REPLACING_VERSIONS}; do
		if ! version_is_at_least 2.1-r90 ${v}; then
			ewarn "For bash-completion autoloader to work, all completions need to"
			ewarn "be installed in /usr/share/bash-completion/completions. You may"
			ewarn "need to rebuild packages that installed completions in the old"
			ewarn "location. You can do this using:"
			ewarn
			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
			ewarn
			ewarn "After the rebuild, you should remove the old setup symlinks:"
			ewarn
			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
		fi
	done

	if has_version 'app-shells/zsh'; then
		elog
		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
	fi
}