summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2016-09-11 11:48:52 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2016-09-11 11:49:50 -0500
commite856d426f84eaee63cc0e50af689bb80c27c03d6 (patch)
treef66cb5c9631ec4c3b3d42fa6eff4cda05ae4be74 /dev-python
parentdev-lisp/sbcl: bump to 1.3.9 (diff)
downloadgentoo-e856d426f84eaee63cc0e50af689bb80c27c03d6.tar.gz
gentoo-e856d426f84eaee63cc0e50af689bb80c27c03d6.tar.bz2
gentoo-e856d426f84eaee63cc0e50af689bb80c27c03d6.zip
clean up more openstack related stuff
Thanks to mm1ke for the proding
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/PyECLib/Manifest1
-rw-r--r--dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild27
-rw-r--r--dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch11
-rw-r--r--dev-python/PyECLib/files/PyECLib-usr-local.patch83
-rw-r--r--dev-python/PyECLib/files/PyECLib-usr-local2.patch51
-rw-r--r--dev-python/hgtools/Manifest1
-rw-r--r--dev-python/hgtools/files/hgtools-doctest-2.0.2.patch11
-rw-r--r--dev-python/hgtools/hgtools-6.3.ebuild30
-rw-r--r--dev-python/keyring/Manifest2
-rw-r--r--dev-python/keyring/files/setup-1.0.patch32
-rw-r--r--dev-python/keyring/keyring-3.7.ebuild28
-rw-r--r--dev-python/keyring/keyring-9.2.1.ebuild31
-rw-r--r--dev-python/keystoneauth/Manifest1
-rw-r--r--dev-python/keystoneauth/keystoneauth-2.4.0.ebuild29
-rw-r--r--dev-python/keystoneauth/keystoneauth-2.4.1.ebuild2
-rw-r--r--dev-python/keystonemiddleware/Manifest4
-rw-r--r--dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch63
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild83
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild88
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.3.ebuild93
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild86
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild2
-rw-r--r--dev-python/pycadf/Manifest4
-rw-r--r--dev-python/pycadf/files/CVE-2014-4615.patch29
-rw-r--r--dev-python/pycadf/pycadf-0.6.0.ebuild73
-rw-r--r--dev-python/pycadf/pycadf-0.8.0.ebuild67
-rw-r--r--dev-python/pycadf/pycadf-1.0.0.ebuild61
-rw-r--r--dev-python/pycadf/pycadf-1.1.0.ebuild61
-rw-r--r--dev-python/python-keystoneclient/files/keystoneclient-1.0.0-cve-2015-1852.patch63
29 files changed, 2 insertions, 1115 deletions
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index 556dd2d399c..2de2225072d 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,2 +1 @@
-DIST PyECLib-1.0.7.tar.gz 8376329 SHA256 f2136f187900fe3b84c75fea671c9bcb3d4d4a6307e44d9f960ed8296ce52dc3 SHA512 8f1bbf6bd0c8ceb62862337fd204e497e5826e01c8b7532bd68485b2203e755144d0ac6b7ee9aa59fb290e8c9ee5fa3bd865203dbbdbf471e0112d10c3ea8720 WHIRLPOOL 62839fe028fc5a5d96005f337425773254d1fb287d4e2d02010ca9e1fb3df6e79f7a7fc4e03797d854b8965c24665dd93010623cf7bae8a5612b1c2e50513e80
DIST PyECLib-1.2.0.tar.gz 6677880 SHA256 0f55656b4288fef1cc85978ebb8eef2e83515482f68bb1cf19903c048c9f8c9b SHA512 6413b8f48e05d96bf43d25640d68941aa17a938fba18f0fc7847e51ac75b222eeb6678ae49eba2a582220d55e253f60a1802b175134d1e138764ac1d15b5d88e WHIRLPOOL d9f14894bec43b97cbcd4bdd0f3f1cc871e8241a4c126fa5b6a3fa83e95da39cda16812e38fea815a21d318f4313c0981a019c2c3d6c874dea82122f6a359ff3
diff --git a/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild b/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild
deleted file mode 100644
index e933c5439f6..00000000000
--- a/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="dev-libs/jerasure"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="dev-libs/liberasurecode
- ${CDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/PyECLib-usr-local2.patch"
-)
diff --git a/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch b/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch
deleted file mode 100644
index 9f12a56cf19..00000000000
--- a/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py 2015-04-15 18:13:08.000000000 -0500
-+++ setup.py.new 2015-08-04 20:36:06.236656803 -0500
-@@ -66,7 +66,7 @@
- default_include_paths = [default_python_incdir,
- '/usr/local/include', '/usr/local/include/jerasure',
- '/usr/include', 'src/c/pyeclib_c',
-- '/usr/local/include']
-+ '/usr/include/liberasurecode', '/usr/local/include']
-
- libflags = ''
- includeflags = ''
diff --git a/dev-python/PyECLib/files/PyECLib-usr-local.patch b/dev-python/PyECLib/files/PyECLib-usr-local.patch
deleted file mode 100644
index 2d923b226cd..00000000000
--- a/dev-python/PyECLib/files/PyECLib-usr-local.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- setup.py 2015-08-26 16:11:51.163684633 -0500
-+++ setup.py.new 2015-08-26 16:14:24.203682415 -0500
-@@ -55,18 +55,16 @@
- # and Tushar) cannot explain what is going on with
- # distutils or libtool here.
- #
--standard_library_paths = [('%s/usr/local/lib' % _exec_prefix),
-- '/lib', '/usr/lib', '/usr/local/lib']
-+standard_library_paths = [('%s/usr/lib' % _exec_prefix),
-+ '/lib', '/usr/lib']
-
- default_library_paths = [default_python_libdir,
-- ('%s/usr/local/lib' % _exec_prefix),
-- '/lib', '/usr/lib', '/usr/local/lib',
-- 'src/c/liberasurecode-1.0.7/src/.libs']
-+ ('%s/usr/lib' % _exec_prefix),
-+ '/lib', '/usr/lib']
-
- default_include_paths = [default_python_incdir,
-- '/usr/local/include', '/usr/local/include/jerasure',
-- '/usr/include', 'src/c/pyeclib_c',
-- '/usr/include/liberasurecode', '/usr/local/include']
-+ '/usr/include', '/usr/include/jerasure', 'src/c/pyeclib_c',
-+ '/usr/include', '/usr/include/liberasurecode']
-
- libflags = ''
- includeflags = ''
-@@ -131,8 +129,9 @@
- if (os.path.isdir(locallibsrcdir)):
- # patch default include, lib paths
- topdir = os.getcwd()
-- libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
-- (topdir + "/" + locallibsrcdir + "/src/.libs ")]
-+ libdirs = []
-+ libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
-+ (topdir + "/" + locallibsrcdir + "/src/.libs ")]
- for d in libdirs:
- libflags = libflags + " -L" + d
- default_library_paths.append(d)
-@@ -148,7 +147,7 @@
- statefile = "." + library + "_configured"
- if (not os.path.isfile(statefile)):
- configure_cmd = ("CFLAGS=\"%s\" LDFLAGS=\"%s\" " % (includeflags, libflags))
-- configure_cmd = ("%s ./configure --prefix=%s/usr/local" % \
-+ configure_cmd = ("%s ./configure --prefix=%s/usr" % \
- (configure_cmd, installroot))
- print(configure_cmd)
- retval = os.system(configure_cmd)
-@@ -218,7 +217,7 @@
- "http://lab.jerasure.org/jerasure/jerasure.git",
- "install", self.distribution)
- installroot = _get_installroot(self.distribution)
-- default_library_paths.insert(0, "%s/usr/local/lib" % installroot)
-+ default_library_paths.insert(0, "%s/usr/lib" % installroot)
- _install.run(self)
-
- # Another Mac-ism... If the libraries are installed
-@@ -231,13 +230,13 @@
- print("***************************************************")
- print("** ")
- print("** PyECLib libraries have been installed to: ")
-- print("** %susr/local/lib" % installroot)
-+ print("** %susr/lib" % installroot)
- print("** ")
- print("** Any user using this library must update: ")
- print("** %s" % ldpath_str)
- print("** ")
- print("** Run 'ldconfig' or place this line: ")
-- print("** export %s=%s" % (ldpath_str, "%susr/local/lib"
-+ print("** export %s=%s" % (ldpath_str, "%susr/lib"
- % installroot))
- print("** ")
- print("** into .bashrc, .profile, or the appropriate shell")
-@@ -256,8 +255,7 @@
- libraries=['erasurecode'],
- # The extra arguments are for debugging
- # extra_compile_args=['-g', '-O0'],
-- extra_link_args=['-Wl,-rpath,%s' %
-- l for l in default_library_paths],
-+ extra_link_args=[],
- sources=['src/c/pyeclib_c/pyeclib_c.c'])
-
- setup(name='PyECLib',
diff --git a/dev-python/PyECLib/files/PyECLib-usr-local2.patch b/dev-python/PyECLib/files/PyECLib-usr-local2.patch
deleted file mode 100644
index c0b23d47741..00000000000
--- a/dev-python/PyECLib/files/PyECLib-usr-local2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- setup.py 2015-08-27 14:33:44.643517647 -0500
-+++ setup.py.new 2015-08-27 14:34:05.202517349 -0500
-@@ -60,13 +60,12 @@
-
- default_library_paths = [default_python_libdir,
- ('%s/usr/local/lib' % _exec_prefix),
-- '/lib', '/usr/lib', '/usr/local/lib',
-- 'src/c/liberasurecode-1.0.7/src/.libs']
-+ '/lib', '/usr/lib', '/usr/local/lib']
-
- default_include_paths = [default_python_incdir,
- '/usr/local/include', '/usr/local/include/jerasure',
- '/usr/include', 'src/c/pyeclib_c',
-- '/usr/local/include']
-+ '/usr/include/liberasurecode', '/usr/local/include']
-
- libflags = ''
- includeflags = ''
-@@ -120,6 +119,7 @@
- if (os.path.isfile(library_file_path)):
- missing = False
- break
-+ missing = False
- if missing:
- # try using an integrated copy of the library
- srcpath = "src/c/"
-@@ -228,24 +228,6 @@
- ldpath_str = "DYLD_LIBRARY_PATH"
- else:
- ldpath_str = "LD_LIBRARY_PATH"
-- print("***************************************************")
-- print("** ")
-- print("** PyECLib libraries have been installed to: ")
-- print("** %susr/local/lib" % installroot)
-- print("** ")
-- print("** Any user using this library must update: ")
-- print("** %s" % ldpath_str)
-- print("** ")
-- print("** Run 'ldconfig' or place this line: ")
-- print("** export %s=%s" % (ldpath_str, "%susr/local/lib"
-- % installroot))
-- print("** ")
-- print("** into .bashrc, .profile, or the appropriate shell")
-- print("** start-up script! Also look at ldconfig(8) man ")
-- print("** page for a more static LD configuration ")
-- print("** ")
-- print("***************************************************")
--
-
- module = Extension('pyeclib_c',
- define_macros=[('MAJOR VERSION', '0'),
diff --git a/dev-python/hgtools/Manifest b/dev-python/hgtools/Manifest
index b0b9645b931..baee02e19ed 100644
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@@ -1,3 +1,2 @@
DIST hgtools-6.0.zip 37542 SHA256 14f3f4d94827c2d45e5a05ffd6efbe2484f662354a3dce2d8d1a29df1b05dd5a SHA512 86443caa03ff5c8fe3b2f5d503c8d28ddc8e29f4818fb7d3b51233b79eb4977c98bd83ccdba0612c3c17ecddacd6d7c7b283dc6ffc935eeb7a5b1a099324e9af WHIRLPOOL d8517f2b6a769201246a5072c971880b4ae52cdfc8aec2f619cd642337eb3cfdf5abee06aa91792a8380c0d81f9a68949a9efa3f44a29a3218b8d9bea8601802
-DIST hgtools-6.3.zip 39805 SHA256 1d0ef6ceaba1673e6923b17d7f09c5ae2f4394d16ef80562812987a27e7836ff SHA512 b5654194f6fbaf37c2a63523b02371ca6af1d7b7f7a89938ba4e405076049a054fff5e6d0d4a8b53560cde7dfc4a1862c5359d710d91c208dd83611913f17a7f WHIRLPOOL efe5bca6ce0970f0199b5c757dd8fd0bd4a03ad64f4ef571e4dbae311afd22c753aa6831fc688718cbc8ef037700a3b81220dae318f82a0ea9fe4d4179cfe4e3
DIST hgtools-6.5.1.tar.gz 22389 SHA256 638a29345707569944459b063763a00c2a3651bc489b1e0dfe0d1d6f3c3c518f SHA512 7a9cd405f4e3f49c57b89e85bca1dff6bfcce91c86a1f006f4223c23a82b13b57468c583815719b9c7e6189070381cf9345c3b7b06d9ed83cf1ed6994293c130 WHIRLPOOL 53f56ab71dca4ed824f84670b9f93e68b827453bb99075f4e2af684ef121fe27d011409819b604d233ea6660f4194c6807d2133f7f819da6d74a732952d322f4
diff --git a/dev-python/hgtools/files/hgtools-doctest-2.0.2.patch b/dev-python/hgtools/files/hgtools-doctest-2.0.2.patch
deleted file mode 100644
index 328e6eee54b..00000000000
--- a/dev-python/hgtools/files/hgtools-doctest-2.0.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hgtools-2.0.2/hgtools/versioning.py 2012-10-09 10:35:38.000000000 +0800
-+++ hgtools-2.0.2.new/hgtools/versioning.py 2013-05-04 16:45:14.883913556 +0800
-@@ -60,7 +60,7 @@
-
- def as_number(self):
- """
-- >>> str(SummableVersion('1.9.3').as_number())
-+ >>> str(round(SummableVersion('1.9.3').as_number(), 12))
- '1.93'
- """
- def combine(subver, ver):
diff --git a/dev-python/hgtools/hgtools-6.3.ebuild b/dev-python/hgtools/hgtools-6.3.ebuild
deleted file mode 100644
index fd495927a74..00000000000
--- a/dev-python/hgtools/hgtools-6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
-HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
-SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="app-arch/unzip
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-vcs/mercurial"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
- pushd "${BUILD_DIR}"/../ > /dev/null
- py.test "${PN}"/tests || die
- popd > /dev/null
-}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 20641992bf0..0511293a073 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,4 +1,2 @@
-DIST keyring-3.7.zip 89249 SHA256 e187358e6a9b8e63cc2e223f6f9d4c40c972c0076f4aa0d65b8c9eb75edbea02 SHA512 7343d40566484b33e3f265d874d75fcf502dbc0abfd653db65536ca4d475fc5596ba23a6472467b88b589fca740f62860a39d18ad7a285696b4cc2c79abe2729 WHIRLPOOL 79967660e4db75f4a89ebc462ee4cb73b3b261bdfc9666979f7a08cfcac6a04b2cbe975b0467155b8b159c630bdf938afcc5d9a3ab25928abfaf54cf6b233844
DIST keyring-8.6.tar.gz 38526 SHA256 92b28d9713ed77bc157680e95a3643a5777f5c3e0690e772c2f2da7df81ce46d SHA512 a139736381ee706da1c5456259ce0ca07d4079003f2eb90bab6b3dc4b8ff6b7bf68a907427f1f4014e861e2222d697bbbc89f7fa68a3b53507632d3f668b8bc0 WHIRLPOOL f242f7b5b4c5f22cddc82ee97223aa55d25d85bdb81ccb139571d434a9b4bb5ceac85395a94e7e95491a1ad19d1bd58681a51f9af58fd6350744f88411fa538a
-DIST keyring-9.2.1.tar.gz 40150 SHA256 c742a3684a5e4f41793fa079eee8e1299d749979ea44a20a5a83db7cbc742a3b SHA512 65109e8b3e11bb1af743087cca3bdb5d74b9eea204ce9da8138f60b2bfd2e75b4c79990f0903543855967ba6d9496c816c914ffbff6aee2b9e58a407c0d6cf73 WHIRLPOOL 7cf33715731582d987d37c6fef7ecf4d0d8df24418075d6ccade2e798eb03460e34717a9d0f10d3b3e8afd6ee6dde419cb7ac8ed9e4eb8e61217d3044f537cc7
DIST keyring-9.3.1.tar.gz 40579 SHA256 3be74f6568fcac1350b837d7e46bd3525e2e9fe2b78b3a3a87dc3b29f24a0c00 SHA512 b899e45e479806e9d01cb490925e291608dfa32bdac212a09922c2fa11196bf18b3ccdefd05aa3777588df43f1dbc5352d6705b93cae23bc7525c727254a938c WHIRLPOOL 5e0213331bafa0e387129f6ae705835cfb01aac3daadd2e142b3ebccc9b6bde1c2ebf7ba30610a89bbcffe728f1fc6efa42227ab2afccef81144ec3d0a7cc935
diff --git a/dev-python/keyring/files/setup-1.0.patch b/dev-python/keyring/files/setup-1.0.patch
deleted file mode 100644
index d510c6376aa..00000000000
--- a/dev-python/keyring/files/setup-1.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- setup.py 2012-11-29 11:01:22.000000000 -0500
-+++ setup.py.wanted 2012-12-27 23:55:56.679344322 -0500
-@@ -39,17 +39,6 @@
- return True
-
-
--test_requirements = [
-- 'pytest',
--]
--"dependencies for running tests"
--
--if sys.version_info < (2, 7) or (
-- sys.version_info >= (3, 0) and sys.version_info < (3, 1)):
-- # Require unittest2 for Python which doesn't contain the new unittest
-- # module (appears in Python 2.7 and Python 3.1)
-- test_requirements.append('unittest2')
--
- setup_params = dict(
- name = 'keyring',
- version = "1.0",
-@@ -74,11 +63,6 @@
- platforms = ["Many"],
- packages = ['keyring', 'keyring.tests', 'keyring.util',
- 'keyring.backends'],
-- extras_require = {'test': test_requirements},
-- tests_require = test_requirements,
-- setup_requires = [
-- 'pytest-runner',
-- ],
- )
-
-
diff --git a/dev-python/keyring/keyring-3.7.ebuild b/dev-python/keyring/keyring-3.7.ebuild
deleted file mode 100644
index bb3c242999a..00000000000
--- a/dev-python/keyring/keyring-3.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} pypy)
-
-inherit distutils-r1
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://bitbucket.org/kang/python-keyring-lib"
-SRC_URI="mirror://pypi/k/${PN}/${P}.zip"
-
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- app-arch/unzip
- test? ( dev-python/pytest-runner[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pycrypto[$(python_gen_usedep 'python2*' 'python3*')] )"
-RDEPEND=""
-
-python_test() {
- py.test || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-9.2.1.ebuild b/dev-python/keyring/keyring-9.2.1.ebuild
deleted file mode 100644
index ab7471ad9b9..00000000000
--- a/dev-python/keyring/keyring-9.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-python_test() {
- py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 6e14536f840..020aed13bd5 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,2 +1 @@
-DIST keystoneauth1-2.4.0.tar.gz 151550 SHA256 4d7fda675f47cab4456f0a4bae91899b37f38d540a6f0972a93935c75df8cb53 SHA512 69614a96cddfa6652ba5ca0abcd44305be605c1b1359a62aadc8e5315a9ddb3442eef677688e8646feaab0d184d4a9c96071effb1b2b9044b7362c1727868ab6 WHIRLPOOL 91994ee1639e5f8da3a85560a53b61fa71ed8653d11ff897b05d06c7c3fb06b38803e0488fdbc9d8b953284f2b2a2fd7c6136a38f1aa3b4e669fb5daf044c69d
DIST keystoneauth1-2.4.1.tar.gz 150586 SHA256 61a2f4cf374b55f10a0d8250a532ccb93dff2ea81994ced15b2a34af055d4e78 SHA512 f9e8fcea7b23001b907d643d5bf67fc4779c8729cca213b3240ef988eda9de1212b15c2031f6fd8b431aafac85e773346eda71e0b414fe967728611b6817fb05 WHIRLPOOL 42644ede5c0db10ffe77ef106d78764dcb49d455dbc09e3660160b9d7a9eb3453118f6777469f9779e2fca34eb9e09cf3ef759f2f27cc38b8dca8520b9febd43
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
deleted file mode 100644
index ebaae9bc60c..00000000000
--- a/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
- >=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
- !~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
index fa1557e802f..ebaae9bc60c 100644
--- a/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}1-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 2be64ccd8f6..9807f7ec000 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,5 +1 @@
-DIST keystonemiddleware-2.3.1.tar.gz 181764 SHA256 9970f8187cb0a91cb2d78ef9a088147b2c9457653e95caa7b8bcd11bd450bec1 SHA512 976aece1d308607eec6f406bb94f1e6dddc27edebc8d99bd7bc00dfbc1f21479da2c76404a99eb677e6647afd42f68b82d6f519659d7483db6fa9d68f839cf5f WHIRLPOOL e6a568e7c96886907eaeba9bc843833ffece8f441bfbe760b77c597c38a5a2720b702a527830d61f07bf0e3adbe4a90d6198b97b487ca08c3e4829058f7e0ef4
-DIST keystonemiddleware-2.3.2.tar.gz 180429 SHA256 ba4a3bc6224d8ba85319741034d3c6f0c569096e38c6f75a5f044b1c742feeb3 SHA512 ef3a36cd8daa2456b960b9677f06d3753ed3eb7bad83b5d32a1fb2e69239237a495649b5c8138b92b1ab2b6b8e7a8db9e1d02dd7c595962f82681c478e5dfb78 WHIRLPOOL 846b4efdb61a0680d6a71cfe7605c88c3e908c0391b974ba6517c0122a2720bbc5b8990c41907a306ace5d0d25f9362260acc44dfd8e7c9e8dcf6b19213fcda8
-DIST keystonemiddleware-2.3.3.tar.gz 185140 SHA256 3a71fdd81d835dbf95086df29bed4f72a05f6588a193ee207877cdb954b9d155 SHA512 cc5a9d5d7411e59471993deff33e71198fe0124252f668e01dc32f84dd2cec56a3256c3a1f05c5f9ed15c25598472fce79a26809ed34123ad10fb90aa8bfde7a WHIRLPOOL 88cf95922b4f32e673b0c77ee95a4effc2f0a65aa3118d5e49c0f25ba83e356bd1af4aa05efe71dc69c1bc3453fea132eab3c53d24815edf1aebcebe01beeaa2
-DIST keystonemiddleware-4.4.0.tar.gz 196504 SHA256 65d574c0bfcd0152391ce5d32261702f9e44736c3c80f22447961d682ebc8367 SHA512 0f42d5d28b81538d4ee8ecaa563d671dd62b19162661edc3959b564bc6143750f31f6946aae494c42934f78954b9861c45212f4f19c1460b73351f1ab9dafc4b WHIRLPOOL 81c94eb7e9b72e46ca1312af800ab131a12aa3ee32318e1181fbfdfdf540e8a3a5c1348217b3967b50efcfc05c67412f208bec15e19de5e46f42d40112ac0908
DIST keystonemiddleware-4.4.1.tar.gz 194711 SHA256 dff35f0e4acb77f34c9c880bd4f456bbe26a1c4701815d82e8c27ff74a5dfb52 SHA512 c04383836740222d49324cb5f25f8b156424abaa74ac9482a2deb2e1d54cc6d990a864451a075bc12c3d7d38da7235f236e8a8cfb4c3748953c14a4505eeb99f WHIRLPOOL 76a96e6140752cd8eb1d060591c5dec1181abf873c82595be89d9597e3c3e5d3344739fab6b8d0058ae2ab47863e5169d4bbcb4a83f46a24dea042c0ccfac8d0
diff --git a/dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch b/dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch
deleted file mode 100644
index 6ea8f99d5c3..00000000000
--- a/dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/keystonemiddleware/s3_token.py b/keystonemiddleware/s3_token.py
-index d56482f..3fe13f9 100644
---- a/keystonemiddleware/s3_token.py
-+++ b/keystonemiddleware/s3_token.py
-@@ -35,6 +35,7 @@ import logging
- import webob
-
- from oslo_serialization import jsonutils
-+from oslo_utils import strutils
- import requests
- import six
- from six.moves import urllib
-@@ -116,7 +117,7 @@ class S3Token(object):
- auth_port)
-
- # SSL
-- insecure = conf.get('insecure', False)
-+ insecure = strutils.bool_from_string(conf.get('insecure', False))
- cert_file = conf.get('certfile')
- key_file = conf.get('keyfile')
-
-diff --git a/keystonemiddleware/tests/test_s3_token_middleware.py b/keystonemiddleware/tests/test_s3_token_middleware.py
-index fdadb76..4b910a6 100644
---- a/keystonemiddleware/tests/test_s3_token_middleware.py
-+++ b/keystonemiddleware/tests/test_s3_token_middleware.py
-@@ -124,7 +124,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
- @mock.patch.object(requests, 'post')
- def test_insecure(self, MOCK_REQUEST):
- self.middleware = (
-- s3_token.filter_factory({'insecure': True})(FakeApp()))
-+ s3_token.filter_factory({'insecure': 'True'})(FakeApp()))
-
- text_return_value = jsonutils.dumps(GOOD_RESPONSE)
- if six.PY3:
-@@ -142,6 +142,28 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
- mock_args, mock_kwargs = MOCK_REQUEST.call_args
- self.assertIs(mock_kwargs['verify'], False)
-
-+ def test_insecure_option(self):
-+ # insecure is passed as a string.
-+
-+ # Some non-secure values.
-+ true_values = ['true', 'True', '1', 'yes']
-+ for val in true_values:
-+ config = {'insecure': val, 'certfile': 'false_ind'}
-+ middleware = s3_token.filter_factory(config)(FakeApp())
-+ self.assertIs(False, middleware._verify)
-+
-+ # Some "secure" values, including unexpected value.
-+ false_values = ['false', 'False', '0', 'no', 'someweirdvalue']
-+ for val in false_values:
-+ config = {'insecure': val, 'certfile': 'false_ind'}
-+ middleware = s3_token.filter_factory(config)(FakeApp())
-+ self.assertEqual('false_ind', middleware._verify)
-+
-+ # Default is secure.
-+ config = {'certfile': 'false_ind'}
-+ middleware = s3_token.filter_factory(config)(FakeApp())
-+ self.assertIs('false_ind', middleware._verify)
-+
-
- class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
- def setUp(self):
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
deleted file mode 100644
index c56c57bf18d..00000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-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"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/mock-1.2[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
- >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}/CVE-2015-7546_2.3.2.patch"
-)
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- 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/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
deleted file mode 100644
index b1c565ed44f..00000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/mock-1.2[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
- >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
- !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
- !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}/CVE-2015-7546_2.3.2.patch"
-)
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- 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/keystonemiddleware/keystonemiddleware-2.3.3.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.3.ebuild
deleted file mode 100644
index e318c0c7fcd..00000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/mock-1.2[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
- >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
- >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
- !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
- !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
- !~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- 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/keystonemiddleware/keystonemiddleware-4.4.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
deleted file mode 100644
index 0d7402f1ccd..00000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/mock-1.2[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
- >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
- >=dev-python/bandit-0.17.3[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
- >=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
- !~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
- !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
- !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
- !~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- 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/keystonemiddleware/keystonemiddleware-4.4.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
index 639a7674025..a2215eecc0e 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index a3d43a4983c..27def38b0c7 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,5 +1 @@
-DIST pycadf-0.6.0.tar.gz 277434 SHA256 9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4d80b703944a0a1f75c7093f SHA512 97e223296e5cf77bbc2f7f8b2caba70f76d418ccd476bbc07462dac2c01399f920ae7801f1e30ef91ac6dbfe340b8b45dff2426bf457c1239f54293dbadeef61 WHIRLPOOL 96644ae4b82352cd0a296f3a9adf161b8500d043d8d2bce239c23473a53e1a2feb43f60d92c67bf1543b3b101bbf722bf9104b2c6b16fa7240b94e86cc6a2aa1
-DIST pycadf-0.8.0.tar.gz 255774 SHA256 240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1 SHA512 3b8446c33f0bf740b0f2384bb9e4c5ab5d960690e50bd52cf2217eb184f9f8061dfe39da9b21ef275a7c66ba4e35b912bfd9476469b28c3c2cd6f33d912ac6f7 WHIRLPOOL bf28052eee894a1a986c1903f44f2f800f096979188a6b0ff502b7316d38ce7c43197405e635da097de038e24c1d870140a4ddd1c0eaa543841b3073055f1c19
-DIST pycadf-1.0.0.tar.gz 247178 SHA256 8278865dba0c6d7d2c83f51629c0f215393e8cbc36719c845b591f40dd80609f SHA512 7f7a4bb1d89ee3a63c9c74980995864b6e80a4e7df2111b4bafb42ba977ab2b86aac5e288d930068789cae9cabee13300ede7ae3c520440cc5fdfdac057085c0 WHIRLPOOL 68eab74a8e7a727d178dfdaa7cef27d0a41538540c450446a768775de61854eb82ca070792e694bad422ccacfae894b73226ab9224d82f742fdcd037ebd2c725
-DIST pycadf-1.1.0.tar.gz 248161 SHA256 af114ba08d535ad9600e961c1048e1c7214c669a7ee3611f46ea06b917b46953 SHA512 f3215fda9c76422ffdaa65d11c65c3835562539f61f02c91e167433c8e65a55b81290792ae827a8b4e7c497878322b802e42c666658a3cf11682e2a72002c8cf WHIRLPOOL d75adc656d344a667ff1b5d3063f300be8fe57d9e5fd32b86bfa242d132e3ee587f72aa4d1eb104c468c71005e3b9825581c145dc7c8b64b7c701274016004da
DIST pycadf-2.2.0.tar.gz 246623 SHA256 bdb3427a28d318c6ce073b54993c2f4cc9148be498b30ad1b362ade45eb4f7fb SHA512 366e30b387ec1164aa52f1f79141263ea411313ff06f72de753f316ba1c0cd1b751633cd899383ba375747903c531976938d8c0733a25340a85d2b5d61d0425d WHIRLPOOL 6e9be54670196a35fe6f0c4a95429bb24947332e7fd8aaa9d99af9a57e9174cd60befe1d2a8a1a8e2d69debae67b1d23d6369ada543dda42e906913b9efa00a2
diff --git a/dev-python/pycadf/files/CVE-2014-4615.patch b/dev-python/pycadf/files/CVE-2014-4615.patch
deleted file mode 100644
index 54596a5c2cb..00000000000
--- a/dev-python/pycadf/files/CVE-2014-4615.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://review.openstack.org/#/c/94878/
-Owner gordon chung
-Project openstack/pycadf
-Branch master
-Topic bug1321080
-Uploaded May 22, 2014 10:12 PM
-Updated May 23, 2014 3:34 AM
-Status Merged
-
-Commit Message: remove token from notifier middleware
-
-notifier middleware is capturing token and sending it to MQ. this
-is not advisable so we should filter it out.
-
-Change-Id: I11d9f2f23fc3b60c945c33d4d02bd7640d88a083
-Closes-Bug: #1321080
-diff --git a/pycadf/middleware/notifier.py b/pycadf/middleware/notifier.py
-index fc921f8..621c8b4 100644
---- a/pycadf/middleware/notifier.py
-+++ b/pycadf/middleware/notifier.py
-@@ -88,7 +88,7 @@
- include them.
- """
- return dict((k, v) for k, v in six.iteritems(environ)
-- if k.isupper())
-+ if k.isupper() and k != 'HTTP_X_AUTH_TOKEN')
-
- @log_and_ignore_error
- def process_request(self, request):
diff --git a/dev-python/pycadf/pycadf-0.6.0.ebuild b/dev-python/pycadf/pycadf-0.6.0.ebuild
deleted file mode 100644
index 88289d3745f..00000000000
--- a/dev-python/pycadf/pycadf-0.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
- <dev-python/pbr-1.0[${PYTHON_USEDEP}]
- test? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
- dev-python/oslo-sphinx[${PYTHON_USEDEP}]
- ~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
- <dev-python/hacking-0.10[${PYTHON_USEDEP}]
- >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0[${PYTHON_USEDEP}]
- >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
- >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )
- doc? (
- dev-python/oslo-sphinx[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- )"
-
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
- dev-python/posix_ipc[${PYTHON_USEDEP}]
- >=dev-python/pytz-2010h[${PYTHON_USEDEP}]
- >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=()
-
-python_prepare_all() {
- # ? typo error in conf.py
- sed -e s':oslosphinx:oslo.sphinx:' -i doc/source/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- nosetests ${PN}/tests || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-0.8.0.ebuild b/dev-python/pycadf/pycadf-0.8.0.ebuild
deleted file mode 100644
index 55962001d84..00000000000
--- a/dev-python/pycadf/pycadf-0.8.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
- <dev-python/pbr-1.0[${PYTHON_USEDEP}]
- test? (
- >=dev-python/hacking-0.10[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
- !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
- doc? (
- dev-python/oslo-sphinx[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
- )"
-# !=1.2.0 of sphinx deleted since it is not in portage anyway
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytz-2013d[${PYTHON_USEDEP}]
- >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]"
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- nosetests ${PN}/tests || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-1.0.0.ebuild b/dev-python/pycadf/pycadf-1.0.0.ebuild
deleted file mode 100644
index 50dfd63d0cd..00000000000
--- a/dev-python/pycadf/pycadf-1.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/pbr[${PYTHON_USEDEP}]
- test? (
- >=dev-python/hacking-0.10[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
- >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
- !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- )
- doc? (
- dev-python/oslo-sphinx[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
- )"
-# !=1.2.0 of sphinx deleted since it is not in portage anyway
-RDEPEND=">=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_compile_all() {
- use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
- testr init || die "testr init failed under ${EPYTHON}"
- testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-1.1.0.ebuild b/dev-python/pycadf/pycadf-1.1.0.ebuild
deleted file mode 100644
index 560f539c188..00000000000
--- a/dev-python/pycadf/pycadf-1.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/pbr[${PYTHON_USEDEP}]
- test? (
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
- >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- )
- doc? (
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
- )"
-# !=1.2.0 of sphinx deleted since it is not in portage anyway
-RDEPEND="
- >=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
- testr init || die "testr init failed under ${EPYTHON}"
- testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/files/keystoneclient-1.0.0-cve-2015-1852.patch b/dev-python/python-keystoneclient/files/keystoneclient-1.0.0-cve-2015-1852.patch
deleted file mode 100644
index 4b278dfec03..00000000000
--- a/dev-python/python-keystoneclient/files/keystoneclient-1.0.0-cve-2015-1852.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/keystoneclient/middleware/s3_token.py b/keystoneclient/middleware/s3_token.py
-index b27b9ce..4ced7a7 100644
---- a/keystoneclient/middleware/s3_token.py
-+++ b/keystoneclient/middleware/s3_token.py
-@@ -34,6 +34,7 @@ This WSGI component:
- import logging
-
- from oslo.serialization import jsonutils
-+from oslo_utils import strutils
- import requests
- import six
- from six.moves import urllib
-@@ -116,7 +117,7 @@ class S3Token(object):
- self.request_uri = '%s://%s:%s' % (auth_protocol, auth_host, auth_port)
-
- # SSL
-- insecure = conf.get('insecure', False)
-+ insecure = strutils.bool_from_string(conf.get('insecure', False))
- cert_file = conf.get('certfile')
- key_file = conf.get('keyfile')
-
-diff --git a/keystoneclient/tests/test_s3_token_middleware.py b/keystoneclient/tests/test_s3_token_middleware.py
-index ab77b79..91c3e81 100644
---- a/keystoneclient/tests/test_s3_token_middleware.py
-+++ b/keystoneclient/tests/test_s3_token_middleware.py
-@@ -124,7 +124,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
- @mock.patch.object(requests, 'post')
- def test_insecure(self, MOCK_REQUEST):
- self.middleware = (
-- s3_token.filter_factory({'insecure': True})(FakeApp()))
-+ s3_token.filter_factory({'insecure': 'True'})(FakeApp()))
-
- text_return_value = jsonutils.dumps(GOOD_RESPONSE)
- if six.PY3:
-@@ -142,6 +142,28 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
- mock_args, mock_kwargs = MOCK_REQUEST.call_args
- self.assertIs(mock_kwargs['verify'], False)
-
-+ def test_insecure_option(self):
-+ # insecure is passed as a string.
-+
-+ # Some non-secure values.
-+ true_values = ['true', 'True', '1', 'yes']
-+ for val in true_values:
-+ config = {'insecure': val, 'certfile': 'false_ind'}
-+ middleware = s3_token.filter_factory(config)(FakeApp())
-+ self.assertIs(False, middleware.verify)
-+
-+ # Some "secure" values, including unexpected value.
-+ false_values = ['false', 'False', '0', 'no', 'someweirdvalue']
-+ for val in false_values:
-+ config = {'insecure': val, 'certfile': 'false_ind'}
-+ middleware = s3_token.filter_factory(config)(FakeApp())
-+ self.assertEqual('false_ind', middleware.verify)
-+
-+ # Default is secure.
-+ config = {'certfile': 'false_ind'}
-+ middleware = s3_token.filter_factory(config)(FakeApp())
-+ self.assertIs('false_ind', middleware.verify)
-+
-
- class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
- def setUp(self):