[gentoo-commits] repo/gentoo:master commit in: sys-cluster/heat/

[Matthew Thode]

commit:     cef44c21efce2eb99cf81085fe1eb9530534532a
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 18:57:37 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 19:00:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef44c21

sys-cluster/heat: 13.0.2 bump

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 sys-cluster/heat/Manifest           |   2 -
 sys-cluster/heat/heat-13.0.0.ebuild | 166 ------------------------------------
 sys-cluster/heat/heat-13.0.2.ebuild |   2 +-
 3 files changed, 1 insertion(+), 169 deletions(-)

diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index f71da88333b..80943a6f269 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,8 +1,6 @@
-DIST heat.conf.sample-13.0.0 75054 BLAKE2B 294313cc94bea784536030f7b4cd6b87d8b1624cf842ad98c47451541745d0d0874cccd8167362722b18d9f6cd000dc42ff512ff97a9f40dd31985327a27dbc2 SHA512 53f7c8be06006f81316468144376cb8b6fefcd4d149609735ce491e677d2aca88337801598f2366f2b279d52e4c2f7a8422ec7fd0b8aae0ef21dd70553a289ec
 DIST heat.conf.sample-13.0.2 75054 BLAKE2B 294313cc94bea784536030f7b4cd6b87d8b1624cf842ad98c47451541745d0d0874cccd8167362722b18d9f6cd000dc42ff512ff97a9f40dd31985327a27dbc2 SHA512 53f7c8be06006f81316468144376cb8b6fefcd4d149609735ce491e677d2aca88337801598f2366f2b279d52e4c2f7a8422ec7fd0b8aae0ef21dd70553a289ec
 DIST heat.conf.sample-14.0.0 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
 DIST heat.conf.sample-2019.2.9999 75054 BLAKE2B 294313cc94bea784536030f7b4cd6b87d8b1624cf842ad98c47451541745d0d0874cccd8167362722b18d9f6cd000dc42ff512ff97a9f40dd31985327a27dbc2 SHA512 53f7c8be06006f81316468144376cb8b6fefcd4d149609735ce491e677d2aca88337801598f2366f2b279d52e4c2f7a8422ec7fd0b8aae0ef21dd70553a289ec
 DIST heat.conf.sample-2020.1.9999 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
-DIST openstack-heat-13.0.0.tar.gz 2342125 BLAKE2B 1fe46924ff491301f69d91979e3e1be9297a4b499e1dbf5004b1e37633afee1167fcd5e8bb79a2b87d7cf54c50ba9accfa6f3a56874555a3640e22ad69ccb4dc SHA512 b122cb864982730fa3ae5db0b41aa4f9cc0d2cf93c439595c85ed5946cdb25483b30d9dfaf066f4450d5cb4a9613b5527810dd2535f9090e568c5eb63c6e60a4
 DIST openstack-heat-13.0.2.tar.gz 2345823 BLAKE2B 2e0610bd9b74e0b39130b478f92b6198a2eb27000b0cadcdee2e14eddf88c520cd50da75914ac562104da4784fe02e767b5d01549b5402bfc2e41dfe8911325f SHA512 6388a0c3b5d8f457281b6185f80a2c4108f4956d268ddc9613b98d14239e5e6b0bbe3fe16459472a289abb9d2af245aca037ee09ad31e3abf8597e081a953527
 DIST openstack-heat-14.0.0.tar.gz 2393821 BLAKE2B 93d4728166496213447571afe9745d217431c1871ee415d413ff96e940c7fe0e9e7d97512cec8dc864564796ac15dd8c5f16e62ecabd6603939074ebba81612a SHA512 973818f33d24d057ce84c8826f50516566ae47386e9559ea2124d5c68f7cfbdf53390bcc7786e1cd29482c3f63ecfee2a10c01bb542fa59141f36cf52b0a5ec3

diff --git a/sys-cluster/heat/heat-13.0.0.ebuild b/sys-cluster/heat/heat-13.0.0.ebuild
deleted file mode 100644
index 5fdc092f0f5..00000000000
--- a/sys-cluster/heat/heat-13.0.0.ebuild
+++ /dev/null
@@ -1,166 +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 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/train"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-${PV}
-		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-S="${WORKDIR}/openstack-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-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}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${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/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.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-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/oslo-reports-1.18.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-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-blazarclient-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	!~dev-python/python-mistralclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-octaviaclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zunclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.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/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-	rm -r "${ED}"/usr/etc
-}

diff --git a/sys-cluster/heat/heat-13.0.2.ebuild b/sys-cluster/heat/heat-13.0.2.ebuild
index 5ed1877bf95..09fc9380c97 100644
--- a/sys-cluster/heat/heat-13.0.2.ebuild
+++ b/sys-cluster/heat/heat-13.0.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-${PV}
 		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"