gentoo resync : 10.11.2019

5 files changed, 6 insertions, 221 deletions

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index c318d06e833e..c931ffb21f39 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,21 +1,18 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-13.0.6.tar.gz 5474090 BLAKE2B 564cace126d1b4ae9b08852d294b3a1a8acacebdb40530b24ef51a445c250c0ca290ea0edc7b517bbb46f785b029e284b6d4651b47a92ad59a07e288a6653776 SHA512 03ed956fe906969f9064692cd0bda9e966287245f7f038024024a9b0dc32c5ddf7b8cf91ec503a35c3628d1126c2522f74cdfe686067b8893c800df2ec53dfd3
 DIST cinder-13.0.7.tar.gz 5477179 BLAKE2B 210abb3b1e961eae43edb598deaeddee8ac2ff948519cacf8410d42d306b7e3476e46ecd0acc9392453647ca886bea512c5b7c48f8ae83e2ddf012c4556a8d18 SHA512 4ae3939b5b43ede09d36aeafc623baa4b2dd55b801b22d95230ff3fa2130c84cd2891351d14caf5516982294fcbcab7fd5f4f59a63e8e46e63d5493ba94f9d98
 DIST cinder-14.0.1.tar.gz 5504153 BLAKE2B 1f895cd93a433e93907e5c8eb69675084f3d2f4f3fd5e605e1bbc505795bd853bca15acc1e6af86a0dea88063e9ee5d95dad17dc62abf2ee2a8a4db8efe962b3 SHA512 f2ba53f67fe15216c4f7296fbf5135e9289ead41e6ca94d1b9a003d21000cf0b178c156b100868796c6f36a4bb2bc1cf081fca5c30e6d4cc3ee36d396a3d53f3
 DIST cinder-15.0.0.tar.gz 5515047 BLAKE2B c7b62dc424bda2a86b9369f283fae4d891f55922228dc2c05206cee67bb7553b75b98e86f8d90035d0566baddad28a76aa4ca454fb4e003eaff346d2bb49a699 SHA512 f80705782976ec778681ef65f5da79ee2028a8dccbe9a14150b3577354882beedbde73f562b40ec395427e23766688299e07bf173476627c579bc812eec065fa
-DIST cinder.conf.sample-13.0.6 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-13.0.7 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-14.0.1 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-15.0.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2019.1.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
-EBUILD cinder-13.0.6.ebuild 7807 BLAKE2B 4f8fcb254a66c4cdafbdc760d6640136b97e48c857aa868f08a379695d7529fa2f8fb05c20e6aeed33ec56b9ee66ec040bdd382ab1517231329d7084f94c758d SHA512 8b4f16da33f2c868dcee627275aed329cc9676f8509e5be763226b9453bff26ecf5dfbd85b3bc06198210e44ff8a07b56eb48b931b18517f2f7cd78ca89c3d54
-EBUILD cinder-13.0.7.ebuild 7809 BLAKE2B 25e88e7eeeab5230ed34fde72301ca280da38b3c2a37e28fc2474d7e8252bfd0bfea6025a10ede5166f4335cd869e7baa8f2a95bf2138c8cc8c5b7a18b888924 SHA512 e662bb768f38ea5f972118a0bdafd963a89f04b96ee784475ec7002f4fd2f7b1434e13d5517d1250d481eba995d2b44f0ac4a1717b8b5885d3c57433f7187413
+EBUILD cinder-13.0.7.ebuild 7807 BLAKE2B 4f8fcb254a66c4cdafbdc760d6640136b97e48c857aa868f08a379695d7529fa2f8fb05c20e6aeed33ec56b9ee66ec040bdd382ab1517231329d7084f94c758d SHA512 8b4f16da33f2c868dcee627275aed329cc9676f8509e5be763226b9453bff26ecf5dfbd85b3bc06198210e44ff8a07b56eb48b931b18517f2f7cd78ca89c3d54
 EBUILD cinder-14.0.1.ebuild 7816 BLAKE2B 80417911501fdf0749bbc7dc633a6a4acb210faa2cdaf96ef2b836365a5bb348c199711b3ab07c367addb14eab568be23ae4b72a42c1b482822b7df7bbe2461c SHA512 9d63f69225be43b41483d2ff42ed2278efcad71e900e89ea42ba1d273302f0f6760782283680e1eb8988000000908a3a546ce5aef3ad6e9d01d3bc7dd581376b
-EBUILD cinder-15.0.0.ebuild 7818 BLAKE2B d62001279741a5f6baf0eb76b0123011cde22df07412b1c6fa92b43dece64cf2a69de6e7f0b7d3b3ef00722e4a79ae4bd64687c589459ef17080a13117894313 SHA512 4af0fa9a256050b13d40cada3619ae692f7058e1cc60a9c82a129926bc5064cc19542b681956d7ecaa01e9bce7addab2da6d98c22061378eb6212e33e4e27cc3
+EBUILD cinder-15.0.0.ebuild 7839 BLAKE2B 8ae66c0408c55ff93fe92341414f6c0a9a3b1960e32971a30b96482943cf5375002ee50f479df5698d77eca72eb3d864c47ef3b23ee297026f68bba3199c5c6c SHA512 71bb997f4f7bced54fc57cbfd5a83047ca82445814dcd7159e728a185147c761c8d080ceebbd084f5e9d6044506544b0c50a74e0c6af4a17e2e27883667b28f1
 EBUILD cinder-2018.2.9999.ebuild 7809 BLAKE2B 25e88e7eeeab5230ed34fde72301ca280da38b3c2a37e28fc2474d7e8252bfd0bfea6025a10ede5166f4335cd869e7baa8f2a95bf2138c8cc8c5b7a18b888924 SHA512 e662bb768f38ea5f972118a0bdafd963a89f04b96ee784475ec7002f4fd2f7b1434e13d5517d1250d481eba995d2b44f0ac4a1717b8b5885d3c57433f7187413
 EBUILD cinder-2019.1.9999.ebuild 7818 BLAKE2B da3671b1b1b1153ad9bac111d63e2d408989107817e8efae04bbf9e77b8c1886e413786c2ca2185c0d78b935ab55afbc086443eec4265e6dbea305df85d214d9 SHA512 eb9c70b521aebc02f3d699b480f2a83e913143a67c5521c6b8a7c75e3ff1b59fc0bd499810da89ea048b939bda3b143ee9e1f40a7943a0a21d59cf331ac2825d
-EBUILD cinder-2019.2.9999.ebuild 7818 BLAKE2B d62001279741a5f6baf0eb76b0123011cde22df07412b1c6fa92b43dece64cf2a69de6e7f0b7d3b3ef00722e4a79ae4bd64687c589459ef17080a13117894313 SHA512 4af0fa9a256050b13d40cada3619ae692f7058e1cc60a9c82a129926bc5064cc19542b681956d7ecaa01e9bce7addab2da6d98c22061378eb6212e33e4e27cc3
+EBUILD cinder-2019.2.9999.ebuild 7892 BLAKE2B 9995521e6dca02917f5168eabf13c7c64d0458a66bdc0857d79af1a1c18bbf2863c96fe3b98915f76b0a7e154eb98a953718b5418a6a7e0603c3bd46c08bea08 SHA512 cddf48fe8de4d95f724794a4b91d6d9b374fb7feed065a855ca2901ac6675f3e9be2ece35cafa190743527e210c242fda75581bfbda5b1fa1109a0c0ba908cff
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-13.0.6.ebuild b/sys-cluster/cinder/cinder-13.0.6.ebuild
deleted file mode 100644
index b599d7a7b07b..000000000000
--- a/sys-cluster/cinder/cinder-13.0.6.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/rocky"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[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.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# only used for docs
-	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-13.0.7.ebuild b/sys-cluster/cinder/cinder-13.0.7.ebuild
index dedea484546e..b599d7a7b07b 100644
--- a/sys-cluster/cinder/cinder-13.0.7.ebuild
+++ b/sys-cluster/cinder/cinder-13.0.7.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/cinder/cinder-15.0.0.ebuild b/sys-cluster/cinder/cinder-15.0.0.ebuild
index 7d0be5d94d56..c4e15f6641ee 100644
--- a/sys-cluster/cinder/cinder-15.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-15.0.0.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2_7')
 	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/cinder/cinder-2019.2.9999.ebuild b/sys-cluster/cinder/cinder-2019.2.9999.ebuild
index 7d0be5d94d56..75715418265b 100644
--- a/sys-cluster/cinder/cinder-2019.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2019.2.9999.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
 	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2_7')
 	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]