gentoo resync : 25.05.2018

3 files changed, 2 insertions, 222 deletions

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index ae324e94d66f..6a3853736431 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,13 +1,11 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-11.1.0.tar.gz 5813863 BLAKE2B 467ebe47d92b8a9c612b6d2c30ca9a3b737b33cf999c3612079cb6d6886ee986e60f9eb15bc6cd3e2adc7ab9c4e956ca41c9324c23f8892cdea9aedd1e1e035c SHA512 193914d69144afba54bda7b3d05a8140501368c2fd44dd203dff5006228dad47602c4da244dc844781cff36581987ee236fc5238c7d78062e7cb78b8795b1f28
-DIST cinder-12.0.0.tar.gz 5359294 BLAKE2B 85a7422ba3a562546cb192cabd6d9614adf8e4daa5cd86d98b6c3a49bd3ecea71027ce9e075f297f998d6539803f02505153fb09586928a159fce7683db6f680 SHA512 dbc65a0231ae584734a9cb9b29429a5ebecb15caf340237e8c3064b7e4c02793e6ec988554588aff46b825a44eac75fb748b25001ac28667752acc8fe199022d
 DIST cinder-12.0.1.tar.gz 5333749 BLAKE2B 9a78b3a4a6212018e9bfa2ec29ee3c26dbb11a77214eeea2a421fcb898f75a15da78a6e7b6d42793b5ac833003b20bc39a56851a177fca6ec1ca96684d7e3bba SHA512 4b07a3cd579ee235446eb6eaf50698b629a6d24d5e7ada2d99635702aa3d53bab2038edf79f7b741d1039a88a752a1a093c454648c88abae8dc7070c59d16c07
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
 DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
 EBUILD cinder-11.1.0.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
-EBUILD cinder-12.0.0.ebuild 8060 BLAKE2B 3682c951bf990f8cae4d173e42696843390d8d31b61da81447457379edcd249e9eba247ea0d3f63af9273fd91a07656a2c44b25647821d061f94b66112038e69 SHA512 0c02a0da61808f23305762971a61842f5bc9bfd5eb8b90915f3a755602b5563dea91e93db46e7a26c1b35a008f2fb2c9f39847e2fad5626d42945d07d8a14452
-EBUILD cinder-12.0.1.ebuild 8062 BLAKE2B d7b7ee7a2d552288c8cd69598dad60d9e3b0432f59fbe330b187de7e2c46f9ac581aa3ee6a205b10d94d50454afa64291a1695cde00e8929d730578cfeb04298 SHA512 3f9a25e897baba087f8206a4348ba41fa36d60bb4bbd32e5e5292f0415a9585396a74ed095c42ed24d4086e9c0039d21a13af99f782afb71cf42c14852b7c791
+EBUILD cinder-12.0.1.ebuild 8060 BLAKE2B 3682c951bf990f8cae4d173e42696843390d8d31b61da81447457379edcd249e9eba247ea0d3f63af9273fd91a07656a2c44b25647821d061f94b66112038e69 SHA512 0c02a0da61808f23305762971a61842f5bc9bfd5eb8b90915f3a755602b5563dea91e93db46e7a26c1b35a008f2fb2c9f39847e2fad5626d42945d07d8a14452
 EBUILD cinder-2017.2.9999.ebuild 7772 BLAKE2B 354ea7431e2e7d3bf9f5322f5b4f313de076977b0b33ef812cdeb9133983d7cbd50b569cf7c1451fc49857023e29741708fbd6a43c5e941c6a107771563ed9dd SHA512 c8a6db8c3d8c3c4ebca2d121250a6dde400a9cfd1092b17e2510e12656c4b945f4ffa8292f9893d06a29f4b1c5eac36202eb08d2b5d28997343070678d973c91
 EBUILD cinder-2018.1.9999.ebuild 8064 BLAKE2B 7fa795367871db689ddabf456eeab9d59b67d6b76195efc7e66fe9370017f043412c1945129b74afa43d8f12e1e96b1f16dbad5f9440498539053998d8f47bc2 SHA512 62c9b7d4dc3b72edb659db5130ecde8502346b1a253e7ae3a62bc1447559fafb0f5ee74672f52307a2257c49fdef37dc1f803cf5742f353525678f906b622888
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-12.0.0.ebuild b/sys-cluster/cinder/cinder-12.0.0.ebuild
deleted file mode 100644
index 1ced12d0b38b..000000000000
--- a/sys-cluster/cinder/cinder-12.0.0.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils git-r3 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/queens/cinder.conf.sample -> queens-cinder.conf.sample"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-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/eventlet-0.21.0[${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.3.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.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.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.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${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.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.64[${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-1.9[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${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
-	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}/pike-cinder.conf.sample" "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-12.0.1.ebuild b/sys-cluster/cinder/cinder-12.0.1.ebuild
index 7c4c55c46c39..1ced12d0b38b 100644
--- a/sys-cluster/cinder/cinder-12.0.1.ebuild
+++ b/sys-cluster/cinder/cinder-12.0.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"