gentoo resync : 24.02.2018

5 files changed, 152 insertions, 6 deletions

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 7ab63b51e1f2..54567cb5f1f7 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,7 +1,8 @@
 AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
 DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5
 DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
-EBUILD glance-15.0.0.ebuild 5137 BLAKE2B fc41aadc655ec1cbf88820a51114944efaff287087105b79fa08e886f80f6abec36aeaad1f1a5d3162bde04e6e3590427adf5c7837ef3b7b915be1c9f9f397af SHA512 127baee4875ca362a2f791c7218aa8ed531efe63b54d36f7c57e2d3761d8ba09d5f599bff5503ae20df232978d575b7ed6abae255725df0c20f08565c0815a96
-EBUILD glance-15.0.1.ebuild 5279 BLAKE2B 9b19e16abf18a0f7fbff0cb3fef24e6a5d60774b7ca5cec7b6b30b97331d5a556102586eea8c2d37fc7e0772757d02e39e993d1c178c4782a78c525dc38c4a1b SHA512 be9cea54014cfe17004cb4a6825e26e0f516bf0036a61741d3be73bdbd77f2825c1bdf6fd89eff252581074a1661a5b02187e247d7b9c5453e52933faa4e1fbf
-EBUILD glance-2017.2.9999.ebuild 5279 BLAKE2B 9b19e16abf18a0f7fbff0cb3fef24e6a5d60774b7ca5cec7b6b30b97331d5a556102586eea8c2d37fc7e0772757d02e39e993d1c178c4782a78c525dc38c4a1b SHA512 be9cea54014cfe17004cb4a6825e26e0f516bf0036a61741d3be73bdbd77f2825c1bdf6fd89eff252581074a1661a5b02187e247d7b9c5453e52933faa4e1fbf
+EBUILD glance-15.0.0.ebuild 5135 BLAKE2B 0b2055f6e1ffb2cf59eec038d8656ca51aa80227c2698b0fd139119b1f3c7dff9cc8e23081c31852150cbb95693f46b7e5252b8f203362b70a33e3c8a0415e9b SHA512 b8291f97a9cbfc2336fa596c23142ae8ddb74a929e109cecc1f8195cf07b0e6070bd987b7b063be01b66fdafb155a1f7e8655a968f5caba105bf452457f8ce42
+EBUILD glance-15.0.1.ebuild 5277 BLAKE2B b6b68c59d4d45ee94c78ffd465c38d3d3f1dce98fc4b71051d23b1858a7cdc199dc1ab64f6153c9f5a75c4263528cf75334f085a1b556a37220619d1d11e6fd2 SHA512 f79d9aaccc149061028bc1a4fa8ba131fcdbe2f7b708da4dc71d91c78bc26e8f2e8102ebd62fd7aafac0f58e73e5aea19b62a00dfdd0af372ebd3d1e980e6147
+EBUILD glance-2017.2.9999.ebuild 5277 BLAKE2B b6b68c59d4d45ee94c78ffd465c38d3d3f1dce98fc4b71051d23b1858a7cdc199dc1ab64f6153c9f5a75c4263528cf75334f085a1b556a37220619d1d11e6fd2 SHA512 f79d9aaccc149061028bc1a4fa8ba131fcdbe2f7b708da4dc71d91c78bc26e8f2e8102ebd62fd7aafac0f58e73e5aea19b62a00dfdd0af372ebd3d1e980e6147
+EBUILD glance-2018.1.9999.ebuild 5041 BLAKE2B 95bf44041a4e387394ffe140a08699aa895dd8b99e1d28ddc1f35700840e530555134885bad23e03771e6ac29ea66471eb4ae38f83d8e7a3b9cdb077b88f3386 SHA512 4408e7cdc946b1f1ac47a259f87ac68ba3d5e1756da49cbc2260f92c7c5e6533b511283b013f0d2585c9ccbbd712fbed03b82689b8410e240eb09c476557b0f7
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-15.0.0.ebuild b/app-admin/glance/glance-15.0.0.ebuild
index 56945afeb415..601d8f56ec29 100644
--- a/app-admin/glance/glance-15.0.0.ebuild
+++ b/app-admin/glance/glance-15.0.0.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
 	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
diff --git a/app-admin/glance/glance-15.0.1.ebuild b/app-admin/glance/glance-15.0.1.ebuild
index d1d9d7d36392..408b991b18c1 100644
--- a/app-admin/glance/glance-15.0.1.ebuild
+++ b/app-admin/glance/glance-15.0.1.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
 	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild
index d1d9d7d36392..408b991b18c1 100644
--- a/app-admin/glance/glance-2017.2.9999.ebuild
+++ b/app-admin/glance/glance-2017.2.9999.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
 	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
diff --git a/app-admin/glance/glance-2018.1.9999.ebuild b/app-admin/glance/glance-2018.1.9999.ebuild
new file mode 100644
index 000000000000..a3a068b143c5
--- /dev/null
+++ b/app-admin/glance/glance-2018.1.9999.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 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 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/defusedxml-0.5.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/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${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-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${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/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-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_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}