summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-01-22 19:29:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-01-22 19:29:05 +0000
commit02ba9226963c4b054024c0e95fe61def919982ac (patch)
tree96b0aadcd8ce4bc2ef3dcce2f862895b111d8601 /eclass/bash-completion-r1.eclass
parentRemove -r1 for now (and work on it in overlay) (diff)
downloadgentoo-2-02ba9226963c4b054024c0e95fe61def919982ac.tar.gz
gentoo-2-02ba9226963c4b054024c0e95fe61def919982ac.tar.bz2
gentoo-2-02ba9226963c4b054024c0e95fe61def919982ac.zip
Clean cruft for the removed -r1 bash-completion ebuild
Diffstat (limited to 'eclass/bash-completion-r1.eclass')
-rw-r--r--eclass/bash-completion-r1.eclass10
1 files changed, 3 insertions, 7 deletions
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index 9676f6b6ae77..db24b9890f85 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.10 2013/09/10 19:12:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.11 2014/01/22 19:29:05 ssuominen Exp $
# @ECLASS: bash-completion-r1.eclass
# @MAINTAINER:
@@ -36,7 +36,7 @@ esac
# First argument is name of the string in bash-completion.pc
# Second argument is the fallback directory if the string is not found
# @EXAMPLE:
-# _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion/completions
+# _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion
_bash-completion-r1_get_bashdir() {
debug-print-function ${FUNCNAME} "${@}"
@@ -57,11 +57,7 @@ _bash-completion-r1_get_bashdir() {
_bash-completion-r1_get_bashcompdir() {
debug-print-function ${FUNCNAME} "${@}"
- if has_version '>=app-shells/bash-completion-2.1-r1'; then
- _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion/completions
- else
- _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion
- fi
+ _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion
}
# @FUNCTION: _bash-completion-r1_get_helpersdir