summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2013-11-08 07:35:56 +0000
committerIan Delaney <idella4@gentoo.org>2013-11-08 07:35:56 +0000
commit9017f3139802800345a9700aa3d5131290ce48f5 (patch)
treebab5f96dde30385a800e83ae6d96f42cadf2bd3d /sys-auth
parentUndo unintended change to test phase of keystone-2013.1.4.ebuild (diff)
downloadgentoo-2-9017f3139802800345a9700aa3d5131290ce48f5.tar.gz
gentoo-2-9017f3139802800345a9700aa3d5131290ce48f5.tar.bz2
gentoo-2-9017f3139802800345a9700aa3d5131290ce48f5.zip
Effectively extract 'test?' USE conditional from RDEPEND
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/keystone/ChangeLog5
-rw-r--r--sys-auth/keystone/keystone-2013.2.ebuild9
2 files changed, 9 insertions, 5 deletions
diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 1c4d36a18ceb..0e23f31f6963 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-auth/keystone
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.44 2013/11/08 07:31:14 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.45 2013/11/08 07:35:56 idella4 Exp $
+
+ 08 Nov 2013; Ian Delaney <idella4@gentoo.org> keystone-2013.2.ebuild:
+ Effectively extract 'test?' USE conditional from RDEPEND
08 Nov 2013; Ian Delaney <idella4@gentoo.org>
+files/no_admin_token_auth-paste.ini, keystone-2013.2.ebuild:
diff --git a/sys-auth/keystone/keystone-2013.2.ebuild b/sys-auth/keystone/keystone-2013.2.ebuild
index dab8e602dd82..d443ff27602a 100644
--- a/sys-auth/keystone/keystone-2013.2.ebuild
+++ b/sys-auth/keystone/keystone-2013.2.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/sys-auth/keystone/keystone-2013.2.ebuild,v 1.2 2013/11/08 07:15:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.ebuild,v 1.3 2013/11/08 07:35:56 idella4 Exp $
EAPI=5
@@ -45,8 +45,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/python-memcached )
>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
<dev-python/pbr-1.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- >=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
<dev-python/webob-1.3[${PYTHON_USEDEP}]
>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
@@ -72,7 +71,9 @@ RDEPEND="${DEPEND}
>=dev-python/dogpile-cache-0.5.0[${PYTHON_USEDEP}]
dev-python/python-daemon[${PYTHON_USEDEP}]
virtual/python-argparse[${PYTHON_USEDEP}]
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ >=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]"
python_prepare_all() {
mkdir ${PN}/tests/tmp || die