From 434d713861b70f6c6563d6ee50a8e64f14c970d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Feb 2018 16:58:00 +0000 Subject: gentoo resync : 15.02.2018 --- app-admin/glance/Manifest | 4 +- app-admin/glance/glance-15.0.1.ebuild | 150 +++++++++++++++++++++++++++++ app-admin/glance/glance-2017.2.9999.ebuild | 14 ++- 3 files changed, 163 insertions(+), 5 deletions(-) create mode 100644 app-admin/glance/glance-15.0.1.ebuild (limited to 'app-admin/glance') diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest index 72f9b3dbff5d..7ab63b51e1f2 100644 --- a/app-admin/glance/Manifest +++ b/app-admin/glance/Manifest @@ -1,5 +1,7 @@ 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-2017.2.9999.ebuild 5151 BLAKE2B 6d251e35b8bc16b1ea08fc83e5269cd159b1cc4d5b7925f779e487365a0ced20c1c5b3d6fd730c69b9bac6b984c49b6b26979348c2e4e737fb10cd22f041f27f SHA512 e75ae4339b67632a84385cdb17d18f41101b189e79c4a2ad6d5113895881b400688c5693f86b10133934ac5b8860ff27f81249c153e10777bf45a9e5056f2c11 +EBUILD glance-15.0.1.ebuild 5279 BLAKE2B 9b19e16abf18a0f7fbff0cb3fef24e6a5d60774b7ca5cec7b6b30b97331d5a556102586eea8c2d37fc7e0772757d02e39e993d1c178c4782a78c525dc38c4a1b SHA512 be9cea54014cfe17004cb4a6825e26e0f516bf0036a61741d3be73bdbd77f2825c1bdf6fd89eff252581074a1661a5b02187e247d7b9c5453e52933faa4e1fbf +EBUILD glance-2017.2.9999.ebuild 5279 BLAKE2B 9b19e16abf18a0f7fbff0cb3fef24e6a5d60774b7ca5cec7b6b30b97331d5a556102586eea8c2d37fc7e0772757d02e39e993d1c178c4782a78c525dc38c4a1b SHA512 be9cea54014cfe17004cb4a6825e26e0f516bf0036a61741d3be73bdbd77f2825c1bdf6fd89eff252581074a1661a5b02187e247d7b9c5453e52933faa4e1fbf MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a diff --git a/app-admin/glance/glance-15.0.1.ebuild b/app-admin/glance/glance-15.0.1.ebuild new file mode 100644 index 000000000000..d1d9d7d36392 --- /dev/null +++ b/app-admin/glance/glance-15.0.1.ebuild @@ -0,0 +1,150 @@ +# 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/pike" +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} + 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/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.7.5[${PYTHON_USEDEP}] + >=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}] + !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}] + !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] + >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}] + >=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/keystoneauth-3.1.0[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] + >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}] + >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}] + =dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] + !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] + =dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] + !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}] + >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}] + !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}] + >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}] + >=dev-python/oslo-policy-1.23.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.6[${PYTHON_USEDEP}] + !~dev-python/cryptography-2.0[${PYTHON_USEDEP}] + >=dev-python/cursive-0.1.2[${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 +} diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild index 34a29aa8cf51..d1d9d7d36392 100644 --- a/app-admin/glance/glance-2017.2.9999.ebuild +++ b/app-admin/glance/glance-2017.2.9999.ebuild @@ -4,16 +4,22 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) -inherit distutils-r1 git-r3 user +inherit distutils-r1 user DESCRIPTION="Services for discovering, registering, and retrieving VM images" HOMEPAGE="https://launchpad.net/glance" -EGIT_REPO_URI="https://github.com/openstack/glance.git" -EGIT_BRANCH="stable/pike" + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openstack/glance.git" + EGIT_BRANCH="stable/pike" +else + SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="" IUSE="doc mysql postgres +sqlite +swift" REQUIRED_USE="|| ( mysql postgres sqlite )" -- cgit v1.2.3