summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-08-28 08:38:08 +0000
committerUlrich Müller <ulm@gentoo.org>2013-08-28 08:38:08 +0000
commita26cf7e60d11da22c8d876039cb616541faabd89 (patch)
tree905005b108bb5dfaca47b7748b7b7d3fd988ae2c
parentInitial import, split off from app-admin/eselect, keywords carried over from ... (diff)
downloadgentoo-2-a26cf7e60d11da22c8d876039cb616541faabd89.tar.gz
gentoo-2-a26cf7e60d11da22c8d876039cb616541faabd89.tar.bz2
gentoo-2-a26cf7e60d11da22c8d876039cb616541faabd89.zip
Add app-admin/eselect-bashcomp as alternative dependency for providing the bashcomp.eselect module, as discussed with ssuominen.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
-rw-r--r--app-shells/bash-completion/ChangeLog7
-rw-r--r--app-shells/bash-completion/bash-completion-1.3-r2.ebuild4
-rw-r--r--app-shells/bash-completion/bash-completion-2.1.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 097f6c6d0273..1cefc20639b3 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-shells/bash-completion
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.258 2013/08/25 17:05:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.259 2013/08/28 08:38:08 ulm Exp $
+
+ 28 Aug 2013; Ulrich Müller <ulm@gentoo.org> bash-completion-1.3-r2.ebuild,
+ bash-completion-2.1.ebuild:
+ Add app-admin/eselect-bashcomp as alternative dependency for providing the
+ bashcomp.eselect module, as discussed with ssuominen.
25 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
bash-completion-2.1-r1.ebuild:
diff --git a/app-shells/bash-completion/bash-completion-1.3-r2.ebuild b/app-shells/bash-completion/bash-completion-1.3-r2.ebuild
index 669f26ef2494..33bafac6f611 100644
--- a/app-shells/bash-completion/bash-completion-1.3-r2.ebuild
+++ b/app-shells/bash-completion/bash-completion-1.3-r2.ebuild
@@ -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/app-shells/bash-completion/bash-completion-1.3-r2.ebuild,v 1.13 2013/08/24 21:49:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.3-r2.ebuild,v 1.14 2013/08/28 08:38:08 ulm Exp $
EAPI=3
inherit prefix
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbs
IUSE=""
DEPEND=""
-RDEPEND="<app-admin/eselect-1.3.7
+RDEPEND="|| ( app-admin/eselect-bashcomp <app-admin/eselect-1.3.7 )
|| ( >=app-shells/bash-3.2 app-shells/zsh )
sys-apps/miscfiles"
PDEPEND="app-shells/gentoo-bashcomp"
diff --git a/app-shells/bash-completion/bash-completion-2.1.ebuild b/app-shells/bash-completion/bash-completion-2.1.ebuild
index a41dc3f74f2a..0ac07deeae62 100644
--- a/app-shells/bash-completion/bash-completion-2.1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.1.ebuild
@@ -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/app-shells/bash-completion/bash-completion-2.1.ebuild,v 1.4 2013/08/24 21:49:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1.ebuild,v 1.5 2013/08/28 08:38:08 ulm Exp $
EAPI=5
inherit prefix
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE=""
-RDEPEND="<app-admin/eselect-1.3.7
+RDEPEND="|| ( app-admin/eselect-bashcomp <app-admin/eselect-1.3.7 )
|| ( >=app-shells/bash-3.2 app-shells/zsh )
sys-apps/miscfiles"
PDEPEND="app-shells/gentoo-bashcomp"