diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2016-01-28 23:36:01 +0800 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2016-01-28 23:36:56 +0800 |
| commit | 57ac6ef6b5e07c47d8ae6e423f16d2956412a971 (patch) | |
| tree | 680e60cb2be648858f375c2f339605d1ae29110a /app-shells | |
| parent | app-eselect/eselect-opengl: Add myself as co-maintainer (diff) | |
| parent | app-shells/bash-completion: make use of epatch more consistent (diff) | |
| download | gentoo-57ac6ef6b5e07c47d8ae6e423f16d2956412a971.tar.gz gentoo-57ac6ef6b5e07c47d8ae6e423f16d2956412a971.tar.bz2 gentoo-57ac6ef6b5e07c47d8ae6e423f16d2956412a971.zip | |
Merge remote-tracking branch 'remotes/sbraz/bashcomp'
Pull request: https://github.com/gentoo/gentoo/pull/731
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash-completion/bash-completion-2.1-r94.ebuild | 8 | ||||
| -rw-r--r-- | app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild (renamed from app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild) | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app-shells/bash-completion/bash-completion-2.1-r94.ebuild b/app-shells/bash-completion/bash-completion-2.1-r94.ebuild index 002a448be002..c24324eabddc 100644 --- a/app-shells/bash-completion/bash-completion-2.1-r94.ebuild +++ b/app-shells/bash-completion/bash-completion-2.1-r94.ebuild @@ -21,11 +21,6 @@ RDEPEND=">=app-shells/bash-4.3_p30-r1 !app-eselect/eselect-bashcomp" PDEPEND=">=app-shells/gentoo-bashcomp-20140911" -# Bug 543100 -PATCHES=( - "${FILESDIR}"/${P}-escape-characters.patch -) - # Remove unwanted completions. STRIP_COMPLETIONS=( # Included in util-linux, bug #468544 @@ -41,7 +36,8 @@ STRIP_COMPLETIONS=( src_prepare() { epatch "${WORKDIR}"/bashcomp2-pre1/*.patch - epatch "${PATCHES[@]}" + # Bug 543100 + epatch "${FILESDIR}"/${P}-escape-characters.patch } src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 diff --git a/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild b/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild index 531fd4d3425f..95893afdb79d 100644 --- a/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild +++ b/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -41,6 +41,8 @@ STRIP_COMPLETIONS=( src_prepare() { epatch "${WORKDIR}/${BASHCOMP_P}/${P}"-*.patch + # Bug 543100 + epatch "${FILESDIR}/${PN}-2.1-escape-characters.patch" } src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 |