From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- app-admin/glance/Manifest | 6 +- app-admin/glance/glance-19.0.1.ebuild | 144 ----------------------------- app-admin/glance/glance-19.0.2.ebuild | 144 +++++++++++++++++++++++++++++ app-admin/glance/glance-2019.2.9999.ebuild | 2 +- 4 files changed, 148 insertions(+), 148 deletions(-) delete mode 100644 app-admin/glance/glance-19.0.1.ebuild create mode 100644 app-admin/glance/glance-19.0.2.ebuild (limited to 'app-admin/glance') diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest index dfb26dd3bb45..2ecd1ee1aad0 100644 --- a/app-admin/glance/Manifest +++ b/app-admin/glance/Manifest @@ -1,5 +1,5 @@ AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5 -DIST glance-19.0.1.tar.gz 1943385 BLAKE2B 5e2530a05a171f640499a3e595ad15be29e95a10e6f22a186514cc73c4fc77d0ae5bf00a3d43616e8cb53ccde748a6560dd448db631c86343b2667c0dc6719a1 SHA512 b672d84d709149191103ed54cca91d604b43460b1bd6ab56263c1b8c382d1c4261ebfd58ca9e233ee50b248327bcbfd7bfd47fee57c8c08a9635b2ca0c0cffe4 -EBUILD glance-19.0.1.ebuild 5131 BLAKE2B a5f35f76dc9a26571c1a369b670240de63e8d437a20eb6db1d3df517a6117f4ea3f2508af05ecdfcd5ab6528f652d634c056ef26227aef6c6742f57eddb2e449 SHA512 57f5801915e951b019ec8afc759a6380663cdddc626c496834ac00763800862de3c67c5939dd4de66fc1edfe4d3a090c1bb1baebfa6af4efdece09b2c88f6f8f -EBUILD glance-2019.2.9999.ebuild 5133 BLAKE2B 42a2ddaa7b201f54435990b6e0e61d9959b5ffa1ac03c54aad5f899f54cc5cbc59d1c9c3abd35167093694ef94bb4969f60e0f3b435caab2ddfdcab094fa83df SHA512 f48d2c7e92b0b1854872a9ed237fd3c4a79022e0f6bfa1162ba74ae50a7348f0db04832d47d9c64dcde0abfa72422c4bed8092afaf8215e4e95d32c8305e32c1 +DIST glance-19.0.2.tar.gz 1943984 BLAKE2B 2fc0d30a11a056b02471e1d038f85b327632b02b7ee177fc4b44e571be9713905cd5bfc6c3d8103edb7a04bf5c51dcc1edc31ce81f25951df84236ad5a6898c6 SHA512 cd0e88f8bba81536eb95f49d1e3f029d8951b2c81208fcd6c32dc877ce51df6026521a6829705e97c8aacd2bc6e4f5eddeae98dfea0c41e00c7f6757dbcfbfa2 +EBUILD glance-19.0.2.ebuild 5124 BLAKE2B b7da40b1feaf8d6f81ab1a605953b2b96554f37fc7caa45c3570d7670c4011fdc7f6c8508ee49029c587760c23318e2442d4e09d04253081e3e0d033f7a38577 SHA512 0d7e92e19eeb2bd079e7c9542e3c4d1e8ae4dfd3a552e03795bdd4bdf9d1e50ab44920bbff8f1396272d0eafc03d556cfd6c580539a92b94de8e2ae4047081d8 +EBUILD glance-2019.2.9999.ebuild 5126 BLAKE2B 458afeb68f845e09b6f5760f61cab9f183b3884bec4cbdcefd929d4e531a40de77a99c60ba647843597af6e3ba2639eb576ae1991a57275b6d78f19619855cd0 SHA512 54b5b077ceaf19c81c3fef14bef15f24cc97d93e3a176febd81879ad5e1fa279ac3f8b1f2a286b2cfd70c1926c17e5ef0845a8fe05933c3df3acb4bf435589c8 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a diff --git a/app-admin/glance/glance-19.0.1.ebuild b/app-admin/glance/glance-19.0.1.ebuild deleted file mode 100644 index a166d654eaa6..000000000000 --- a/app-admin/glance/glance-19.0.1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 - -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/train" -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.22.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] - >=dev-python/webob-1.8.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.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-upgradecheck-0.1.0[${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.4.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/paste-2.0.2[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.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-messaging-9.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-1.18.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-1.0.0[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.1[${PYTHON_USEDEP}] - >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] - >=dev-python/castellan-0.17.0[${PYTHON_USEDEP}] - acct-user/glance - acct-group/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() { - if [ ! -z ${EGIT_BRANCH+x} ]; then - use doc && "${PYTHON}" setup.py build_sphinx - fi -} - -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 - rm -r "${ED}"/usr/etc -} diff --git a/app-admin/glance/glance-19.0.2.ebuild b/app-admin/glance/glance-19.0.2.ebuild new file mode 100644 index 000000000000..de55f1ee9571 --- /dev/null +++ b/app-admin/glance/glance-19.0.2.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +inherit distutils-r1 + +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/train" +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.22.0[${PYTHON_USEDEP}] + !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] + !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] + >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] + >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] + >=dev-python/webob-1.8.1[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] + >=dev-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.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-upgradecheck-0.1.0[${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.4.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/paste-2.0.2[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] + >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-17.1.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-messaging-9.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] + >=dev-python/oslo-reports-1.18.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-1.0.0[${PYTHON_USEDEP}] + >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.1[${PYTHON_USEDEP}] + >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}] + >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] + >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] + >=dev-python/castellan-0.17.0[${PYTHON_USEDEP}] + acct-user/glance + acct-group/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() { + if [ ! -z ${EGIT_BRANCH+x} ]; then + use doc && "${PYTHON}" setup.py build_sphinx + fi +} + +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 + rm -r "${ED}"/usr/etc +} diff --git a/app-admin/glance/glance-2019.2.9999.ebuild b/app-admin/glance/glance-2019.2.9999.ebuild index 35a2c3732358..3a95ba49d66b 100644 --- a/app-admin/glance/glance-2019.2.9999.ebuild +++ b/app-admin/glance/glance-2019.2.9999.ebuild @@ -66,7 +66,7 @@ RDEPEND=" >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] >=dev-python/webob-1.8.1[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] - >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}] + >=dev-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.2.0[${PYTHON_USEDEP}] -- cgit v1.2.3