diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-10-24 23:03:19 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-10-24 23:03:19 +0000 |
| commit | fcf70c44277c9a0d7a1b5fbbcd961d8626a933e5 (patch) | |
| tree | 7c0912d40cc2d7cdecd1ae689372417ab2317983 /app-shells/bash-completion | |
| parent | Mask new sys-apps/pacman for bashcomp collision. (diff) | |
| download | gentoo-2-fcf70c44277c9a0d7a1b5fbbcd961d8626a933e5.tar.gz gentoo-2-fcf70c44277c9a0d7a1b5fbbcd961d8626a933e5.tar.bz2 gentoo-2-fcf70c44277c9a0d7a1b5fbbcd961d8626a933e5.zip | |
Remove Slackware packaging tool completions because of collisions. Remove Debian/Red Hat ifup/ifdown completions.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-shells/bash-completion')
| -rw-r--r-- | app-shells/bash-completion/ChangeLog | 9 | ||||
| -rw-r--r-- | app-shells/bash-completion/bash-completion-2.1-r91.ebuild (renamed from app-shells/bash-completion/bash-completion-2.1-r90.ebuild) | 17 |
2 files changed, 23 insertions, 3 deletions
diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog index b1ba4a04b394..028c6464a421 100644 --- a/app-shells/bash-completion/ChangeLog +++ b/app-shells/bash-completion/ChangeLog @@ -1,6 +1,13 @@ # 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.271 2014/10/14 11:38:16 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.272 2014/10/24 23:03:19 mgorny Exp $ + +*bash-completion-2.1-r91 (24 Oct 2014) + + 24 Oct 2014; Michał Górny <mgorny@gentoo.org> +bash-completion-2.1-r91.ebuild, + -bash-completion-2.1-r90.ebuild: + Remove Slackware packaging tool completions because of collisions. Remove + Debian/Red Hat ifup/ifdown completions. 14 Oct 2014; Tobias Klausmann <klausman@gentoo.org> bash-completion-2.1.ebuild: diff --git a/app-shells/bash-completion/bash-completion-2.1-r90.ebuild b/app-shells/bash-completion/bash-completion-2.1-r91.ebuild index f2f82155a519..cb4dc34989c6 100644 --- a/app-shells/bash-completion/bash-completion-2.1-r90.ebuild +++ b/app-shells/bash-completion/bash-completion-2.1-r91.ebuild @@ -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-r90.ebuild,v 1.2 2014/10/13 09:40:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r91.ebuild,v 1.1 2014/10/24 23:03:19 mgorny Exp $ EAPI=5 @@ -20,6 +20,19 @@ RDEPEND="|| ( >=app-shells/bash-4.1 app-shells/zsh ) sys-apps/miscfiles !app-admin/eselect-bashcomp" +# 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 } @@ -32,7 +45,7 @@ src_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 cal dmesg eject hd hexdump hwclock ionice look ncal renice rtcwake; do + for file in "${STRIP_COMPLETIONS[@]}"; do rm "${ED}"/usr/share/bash-completion/completions/${file} || die done |