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

[Ulrich Mueller (ulm)]

ulm         09/12/31 15:57:04

  Modified:             bash-completion.eclass
  Log:
  Add a test for app-admin/eselect around RDEPEND to avoid circular dependencies.
  Clarify elog message.

Revision  Changes    Path
1.22                 eclass/bash-completion.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.21&r2=1.22

Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bash-completion.eclass	21 Feb 2009 20:17:01 -0000	1.21
+++ bash-completion.eclass	31 Dec 2009 15:57:04 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.21 2009/02/21 20:17:01 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.22 2009/12/31 15:57:04 ulm Exp $
 
 # @ECLASS: bash-completion.eclass
 # @MAINTAINER:
@@ -21,7 +21,10 @@
 
 IUSE="bash-completion"
 
-RDEPEND="bash-completion? (	app-admin/eselect )"
+# Allow eclass to be inherited by eselect without a circular dependency
+if [[ ${CATEGORY}/${PN} != app-admin/eselect ]]; then
+	RDEPEND="bash-completion? ( app-admin/eselect )"
+fi
 
 # @FUNCTION: dobashcompletion
 # @USAGE: < file > [ new_file ]
@@ -48,7 +51,8 @@
 # The bash-completion pkg_postinst function, which is exported
 bash-completion_pkg_postinst() {
 	if useq bash-completion ; then
-		elog "To enable command-line completion for ${PN}, run:"
+		elog "In the case that you haven't yet enabled command-line completion"
+		elog "for ${PN}, you can run:"
 		elog
 		elog "  eselect bashcomp enable ${BASH_COMPLETION_NAME:-${PN}}"
 		elog