[gentoo-commits] gentoo-x86 commit in eclass: bash-completion-r1.eclass

[Samuli Suominen (ssuominen)]

ssuominen    14/01/22 19:29:05

  Modified:             bash-completion-r1.eclass
  Log:
  Clean cruft for the removed -r1 bash-completion ebuild

Revision  Changes    Path
1.11                 eclass/bash-completion-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion-r1.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion-r1.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion-r1.eclass?r1=1.10&r2=1.11

Index: bash-completion-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bash-completion-r1.eclass	10 Sep 2013 19:12:17 -0000	1.10
+++ bash-completion-r1.eclass	22 Jan 2014 19:29:05 -0000	1.11
@@ -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 @@
 # 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_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