From c7528604e4b6f672992481a7acb3b34ed18831d0 Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Tue, 22 Aug 2017 11:20:59 -0500
Subject: [PATCH] dev-python/python-neutronclient: bup and cleanup

Package-Manager: Portage-2.3.6, Repoman-2.3.3
---
 dev-python/python-neutronclient/Manifest      |  3 +-
 dev-python/python-neutronclient/metadata.xml  | 26 ++---
 .../python-neutronclient-4.1.1.ebuild         | 95 -------------------
 ...uild => python-neutronclient-6.1.1.ebuild} | 42 ++++----
 4 files changed, 32 insertions(+), 134 deletions(-)
 delete mode 100644 dev-python/python-neutronclient/python-neutronclient-4.1.1.ebuild
 rename dev-python/python-neutronclient/{python-neutronclient-6.0.0.ebuild => python-neutronclient-6.1.1.ebuild} (64%)

diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 1aeda833751c..42c371c8c1ef 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,3 +1,2 @@
-DIST python-neutronclient-4.1.1.tar.gz 187794 SHA256 4d5c60358272174afb019d68940f67ddad09367b2e6210e3206d19566777c293 SHA512 654a7e8d98b1b6c3fbd1a183196982ea8bb9a0a97707e7a4ddb4cde47a97e93c3356961193c305b3ab33cb8ee2273b1a941c2655e1f56a3e2a8131deaed54922 WHIRLPOOL ead87cb41f57f285a03583ca91e843a0f9c4edaefaa7020d38c949dbd56d46611f44e36c087a9684d2e87c0d236ff8124022b2afacd9b8438b6b8b6716ec9c81
-DIST python-neutronclient-6.0.0.tar.gz 205872 SHA256 a30556f8b9541e94f44a9911d9af89037710761755758a2c1598fa92809293a2 SHA512 eb9a71fee8e551d4436236bbb93ea03496f6094b6b444a1624a98bc85c26122b5bbe3a935fbc8a1f921b6449a481deaba284645ca62c56e3771d57bf526c6d8a WHIRLPOOL 966ced0e9f195b2e71cf7944f3eeb699ef59c7ca7a4df4cb2835dbb1d7f8c47f4483ea51deb974b56c43ceec8b52f92778d56f7d89aec3d0c5fee74b1dc13048
 DIST python-neutronclient-6.1.0.tar.gz 229036 SHA256 b6b68e6a3bd4945f9ececf730a88cebde73c5edfd88588a335ea871af872faed SHA512 12d1c1ab1e50852f9b7db0591208cc46fa830bf7747cd7b5f67914ffa1c5822e600a6932b213e297ec6fdd068beb9e1b0abace627f0388091f7b4c649a7032a4 WHIRLPOOL 78ed52ecef306ca0a896e9c10968fa423c7b71cc7691fad88ef01be9da6ca72f419ac7534083109951951a6246c888c806beb54185e4e15da2dfae0f1157f491
+DIST python-neutronclient-6.1.1.tar.gz 238212 SHA256 3eb2101d6224423eb7acd22e874e5a10a908f8190b213fb05ebe0e7dc52383c7 SHA512 b2cb1261bba6fbd5dfbf3b303f09925420730fc3e8a9d64fa5c57e1f13f1a1e19abffa9d7098d15081f2d49d40a43efb55759d1b52a2a6592a780c9feb451d37 WHIRLPOOL 4edfa91fb4e07bbd38fbdabbadfe0649314a2ca6a6f846e58ea3187ed0fe32568c6623e3acdc4a14c7654c03d12d4330ca78015f7030133e310dbd2c5baa09e6
diff --git a/dev-python/python-neutronclient/metadata.xml b/dev-python/python-neutronclient/metadata.xml
index 52a750b70030..295d065c537d 100644
--- a/dev-python/python-neutronclient/metadata.xml
+++ b/dev-python/python-neutronclient/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>openstack@gentoo.org</email>
-		<name>Openstack</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
     CLI and python client library for OpenStack Neutron
   </longdescription>
-	<upstream>
-		<remote-id type="pypi">python-neutronclient</remote-id>
-		<remote-id type="launchpad">neutron</remote-id>
-	</upstream>
+  <upstream>
+    <remote-id type="pypi">python-neutronclient</remote-id>
+    <remote-id type="launchpad">neutron</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/python-neutronclient/python-neutronclient-4.1.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-4.1.1.ebuild
deleted file mode 100644
index c5b6bf85af34..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-4.1.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-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 test"
-REQUIRED_USE="test? ( doc )"
-
-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/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${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/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.14.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${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/os-client-config-1.13.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	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
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.1.1.ebuild
similarity index 64%
rename from dev-python/python-neutronclient/python-neutronclient-6.0.0.ebuild
rename to dev-python/python-neutronclient/python-neutronclient-6.1.1.ebuild
index f5367df896ba..1f7b0c17647e 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,56 +12,50 @@ 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 test"
 REQUIRED_USE="test? ( doc )"
 
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 	)
 	doc? (
-		>=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/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
 	)"
 
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
 	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.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.16.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
-- 
2.26.2