sys-cluster/nova: 15.0.2 14.0.5 and 13.1.4 bups

Package-Manager: Portage-2.3.3, Repoman-2.3.1

6 files changed, 17 insertions, 231 deletions

diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 3ee503e1abdb..4d9c105326c4 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,11 +1,9 @@
 DIST mitaka-nova.conf.sample 36427 SHA256 dd4c3ccab89fbe9f69df520f47d439c7ffa440d3f8b288b0ab99ac328a02ec75 SHA512 169671bde5cb5bb89065d801f80aa0d3c664af652d9ddb0c409ed3e0af2c0b94f1dbd0ebf834849e3e75dc38972935ec65a6e533d86148a7315839597d577cad WHIRLPOOL 20f95a296c3d112a532c9c5cc911d30b67472868d94bcfd52fadfd7105f9095a6b77020ca1caa6a70319548239358868d809feed363a82e4d574aceb6e5f016d
 DIST newton-nova.conf.sample 44496 SHA256 a7d9b95e67b77d0335edac760e037ad117d8c9f18c4792939ba8bb02739eae58 SHA512 ac917f0fed24c6705cbe43b4e1af31138bb656ea06f0cbe66d5b820677a47ca854abf6ca7fdf76a9a7f3a5afff758dac294ffd778d1bda82bb9f95c48d103d6e WHIRLPOOL 3c54dc8e4721f4289a8f64e9ac215c4b2e4b6afd2904fea4080659d3c292dcd942535d998b463efa4dd96a6090afb9830dfa6b9b3f2062439a8d03ec09356adc
 DIST nova-13.1.2.tar.gz 5419167 SHA256 8e6762e09ff3bb1ab401881657faa460c75b32b730ca55e89b3de0a921843b99 SHA512 3ea9e4a26ef10dc6175b417d66817ed5f00915197fd7184778a2ce70ef56208a5e5e6c8fe72228c90eb4999b278eb9a2f6743f5430f1e14e5b5aa2d7c53e79f7 WHIRLPOOL bd025f3a434332acf61da52f9df72d644f1cea19e38a702c39939e32a8a45b1996340b1f93f253e9844098e0cfb73dc286cfadb13181751545f4b8356342487d
-DIST nova-13.1.3.tar.gz 5427465 SHA256 48af5378d8b0efb3479b8eb2a440f4f7dab01e763debe5c93e1e03e8c55165cb SHA512 0e490c01215d58b21ff08184b8d76c254e7005d17622bd2421d9d01bf2b8304dc4a7f6743af56f8c37cc1744750e9c1b42b699cf7893375ce23b66d57a3ad09f WHIRLPOOL 1b5733867734a391887e84062c9c2b964406853495858713670fdc1d6f876783a9cc4927c830634c9e97557c203d867b44db363ae7dca6fd3b32c13ae11c4abe
+DIST nova-13.1.4.tar.gz 5419307 SHA256 9ce2a44e94126b9992478bf3fb11c80a8ea6acd0d5a1a3614fbe1204bb101505 SHA512 a70783ceed1961201d198f4e8db118a8d6326ccf264061caf6610f21041a62836409f1acdfb668ad79c85192143bd7ddc1db4bc9b44f033d02d6578380d8c7d9 WHIRLPOOL 62c1a890a75d74ed8971ef465d95ae0883b304cad1282db021c24466c0fabdc16ab8f9bccc8bd081314032895ffee8f118938736ede7227b04870a47af004606
 DIST nova-14.0.3.tar.gz 5584926 SHA256 e5a93e747824cb77a0d389a3e74eaaa63954048530df942533c68bda1534e826 SHA512 9fff4b9370799f05c8d0984d19020ff794ffec3924e607eb2677e29e87990c32f9132e0f70137e8bb2142140476cc612e0dfdb1abeb3a8e6ae14b98703b1dffc WHIRLPOOL e73cfeb570722e081ee28f4ff06ef3175af93e2d82c1bced374178192296186d387c23e0b1d835253e3a33e70ee5681f70c0fc7867a6f080d16083dd4364b210
-DIST nova-14.0.4.tar.gz 5586891 SHA256 c7f4b14e5fa50a6a232d31a1561e6ea7b9fc6877d244d3ee71e47bf26ee8e5aa SHA512 e66a74faf6dc7e389ae892b992071dc9e1b41500a3d597aeef6367beb4008d9d39827f0cad53619c8e30d1fb309f2edb127519a3563372b0de8c35b9d90a7944 WHIRLPOOL de3dc8cc7358570b031abd693ae98771f00489ea7ead8d9f8169388a0ba708e68b52bcde976f202682469d338fea92d3edb1b551019b38b6eb391966d112f177
-DIST nova-15.0.0.tar.gz 5730683 SHA256 f3769208225ba7257273f7a97ffa2bc8cfa2372f61082fbcbae9b0fd5fcb0aa6 SHA512 999e4ca1de8fe1cee73cfb559fa6ad2f38e55937541d3ddb7f76a773d2056bfdbbbf490efe959acd09d4fb456c186b1601a47eaa4e794ec8067458904b7182af WHIRLPOOL ce7d396e7fad0dd73d40922dfc2d6fc382954daea77325b57d651295fb76c60a0baa7d3efac34a3e6938a25007d0a1ab2a749e952080e08ab032f89ddc7a0aeb
-DIST nova-15.0.1.tar.gz 5734645 SHA256 9e6d41c63f7774349f4ce10c0640fafcba81e2ae8f6525ea3817e376581b599c SHA512 6ad9fe16a35ba07c0875e5d07e2f18adc015d4ca77df587eaaef0242f178310a915dadfd32f41d47a629013df9382ea6a23ea7e9c05006af7570583b3e9415c4 WHIRLPOOL 84b474d5772be8b88cace4e18be76976f43f9d8935daa594186e8f4e49269ebb349e4c5d26865e1971e04ca6e85f4a64bac18e2a66cd4e117d1782bf9bea0a4a
-DIST nova.conf.sample-15.0.0 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
-DIST nova.conf.sample-15.0.1 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
+DIST nova-14.0.5.tar.gz 5595066 SHA256 762f18a0e18bda9d2c962e906424b8a60e3c2692d9b597d728a5c9b3ae28926a SHA512 8e169c625f65b1333dbf0737fd3451903ebf0a95bfac37394f588182d5395e3dc7d037075ef572306e9a07530c42a2d560bc26cb23ecc28c320e7412b5b1b093 WHIRLPOOL d6147e64405c11640ab3c7e1605d9e17a56fc1e4831516049059e1b114eab44d0f2ef6ea29209646caf5a80c5f595e69577c1936fc99507efd7ac3a2629c9d83
+DIST nova-15.0.2.tar.gz 5737318 SHA256 bd1d5fd8b92bed97cc9b9ef51106a31f269096e294441744298a9d07c2f88f52 SHA512 d04804bcdf22a3f18fe2bc02c6c07bd5f894e674b01f64940587dc77c8d80904fcd802d3034c7dde4fa25bbbda4e2e6044bf6e877c658562242dde6d5d906628 WHIRLPOOL 58619c3cfbf7c618035ef90b967e355b35925f2a556ba1b610363753aaf4d038d8e782dce3f8ae4429be2c4d00b1f84146833ab08e73f14c58057a9669abd9f6
+DIST nova.conf.sample-15.0.2 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
 DIST nova.conf.sample-2017.1.9999 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
diff --git a/sys-cluster/nova/nova-13.1.3.ebuild b/sys-cluster/nova/nova-13.1.4.ebuild
index 5de77af67576..5de77af67576 100644
--- a/sys-cluster/nova/nova-13.1.3.ebuild
+++ b/sys-cluster/nova/nova-13.1.4.ebuild
diff --git a/sys-cluster/nova/nova-14.0.4.ebuild b/sys-cluster/nova/nova-14.0.5.ebuild
index cfc13d1a7c13..cfc13d1a7c13 100644
--- a/sys-cluster/nova/nova-14.0.4.ebuild
+++ b/sys-cluster/nova/nova-14.0.5.ebuild
diff --git a/sys-cluster/nova/nova-15.0.0.ebuild b/sys-cluster/nova/nova-15.0.0.ebuild
deleted file mode 100644
index c44343dc4f1b..000000000000
--- a/sys-cluster/nova/nova-15.0.0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.1.1[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-15.0.1.ebuild b/sys-cluster/nova/nova-15.0.2.ebuild
index 8091ac78fa29..8091ac78fa29 100644
--- a/sys-cluster/nova/nova-15.0.1.ebuild
+++ b/sys-cluster/nova/nova-15.0.2.ebuild
diff --git a/sys-cluster/nova/nova-2017.1.9999.ebuild b/sys-cluster/nova/nova-2017.1.9999.ebuild
index 865208ac7652..0e298e4add40 100644
--- a/sys-cluster/nova/nova-2017.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2017.1.9999.ebuild
@@ -20,9 +20,20 @@ REQUIRED_USE="
 	!compute-only? ( || ( mysql postgres sqlite ) )
 	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
 
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
+CDEPEND="
 	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="
 	${CDEPEND}
 	app-admin/sudo"
 
@@ -90,8 +101,6 @@ RDEPEND="
 	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
 	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]