partial fix for bug 505976

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

6 files changed, 9 insertions, 267 deletions

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index 25fcb8456701..28dbc4111627 100644
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-keystoneclient
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.28 2014/03/27 21:51:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.29 2014/03/27 22:03:22 prometheanfire Exp $
+
+  27 Mar 2014; Matthew Thode <prometheanfire@gentoo.org>
+  -python-keystoneclient-0.3.1.ebuild, -python-keystoneclient-0.3.2.ebuild,
+  -python-keystoneclient-0.4.1.ebuild, -python-keystoneclient-0.6.0.ebuild,
+  python-keystoneclient-0.2.5.ebuild:
+  partial fix for bug 505976
 
 *python-keystoneclient-0.7.1 (27 Mar 2014)
 
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.2.5.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.2.5.ebuild
index 7efcf7a54239..075761c1c1a9 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.2.5.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.2.5.ebuild,v 1.3 2013/11/08 03:38:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.2.5.ebuild,v 1.4 2014/03/27 22:03:22 prometheanfire Exp $
 
 EAPI=5
 #restricted due to packages missing and bad depends in the test ==webob-1.0.8
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.3.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.3.1.ebuild
deleted file mode 100644
index e9fd190c1d7a..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.3.1.ebuild,v 1.8 2013/12/19 02:05:16 prometheanfire Exp $
-
-EAPI=5
-
-#PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/Babel[${PYTHON_USEDEP}]
-			dev-python/coverage[${PYTHON_USEDEP}]
-			dev-python/fixtures[${PYTHON_USEDEP}]
-			dev-python/keyring[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/mox[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/nose-exclude[${PYTHON_USEDEP}]
-			dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-			dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-			=dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/testtools-0.9.25[${PYTHON_USEDEP}]
-			dev-python/unittest2[${PYTHON_USEDEP}]
-			>=dev-python/webob-1.0.8[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
-		<dev-python/d2to1-0.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5[${PYTHON_USEDEP}]
-		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-0.8.8[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_test() {
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1174410; last touched on
-	# 2013-05-29 with 'importance:  Undecided → Medium' and never worked since.
-	nosetests -I 'test_http*' -e test_auth_token_middleware.py || die "testsuite failed"
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild
deleted file mode 100644
index 0b61c851945a..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild,v 1.6 2013/12/19 02:05:16 prometheanfire Exp $
-
-EAPI=5
-#testsuite has unpretty httpretty deps
-#PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-#Note: https://github.com/gabrielfalcao/HTTPretty/blob/b5827151ddde2e3fed49f5a1ca7f2bb2ef8876a1/requirements.txt
-#https://github.com/openstack/python-keystoneclient/blob/0.3.2/test-requirements.txt
-#https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-#				>=dev-python/httpretty-0.6.3[${PYTHON_USEDEP}]
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.7[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.12[${PYTHON_USEDEP}]
-				>=dev-python/keyring-1.6.1[${PYTHON_USEDEP}]
-				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
-				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-				>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-				<dev-python/testtools-0.9.25[${PYTHON_USEDEP}]
-				>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-				<dev-python/webob-1.3[${PYTHON_USEDEP}]
-				>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}] )"
-RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_test() {
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1174410; last touched on 
-	# 2013-05-29 with 'importance: 	Undecided → Medium' and never worked since.
-	sed -e 's:test_encrypt_cache_data:_&:' \
-		-e 's:test_no_memcache_protection:_&:' \
-		-e 's:test_sign_cache_data:_&:' \
-		-i tests/test_auth_token_middleware.py
-	rm -f $(find . -name "test_http*") || die
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests || die "run over tests folder by flake8 drew error"
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild
deleted file mode 100644
index 646f31fef09b..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild,v 1.3 2014/01/06 10:44:44 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/keyring-1.6.1[${PYTHON_USEDEP}]
-				<dev-python/keyring-2.0[${PYTHON_USEDEP}]
-				>=dev-python/httpretty-0.6.3[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-				>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-				<dev-python/testtools-0.9.33[${PYTHON_USEDEP}]
-				>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-				<dev-python/webob-1.3[${PYTHON_USEDEP}]
-			) "
-
-RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/sphinx_mapping.patch
-)
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.6.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.6.0.ebuild
deleted file mode 100644
index 209390105bce..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.6.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.6.0.ebuild,v 1.2 2014/03/19 23:06:01 bicatali Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
-				>=dev-python/keyring-1.6.1[${PYTHON_USEDEP}]
-				<dev-python/keyring-2.0[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-				>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-				>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-				<dev-python/webob-1.3[${PYTHON_USEDEP}]
-			) "
-
-RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/sphinx_mapping.patch
-)
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-	distutils-r1_python_install_all
-}