commit: f741ca90126b001763694738673d8a14a1bde594
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 02:23:51 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 02:23:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f741ca90
sys-cluster/heat: 9.0.3 bup
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-cluster/heat/Manifest | 2 ++
sys-cluster/heat/heat-2017.2.9999.ebuild | 20 +++++++++++++-------
.../{heat-2017.2.9999.ebuild => heat-9.0.3.ebuild} | 20 +++++++++++++-------
3 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index ebe3a36063d..ed3fd123a98 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,3 +1,5 @@
DIST heat-9.0.2.tar.gz 2364044 BLAKE2B
ca2c6e1f504e7b443906e1c33d2105293313223d9af851a5c46719b5c74d95687d11ea2460f7fc3e818719c9132bb8e0041b4ae123d5a0eb12b5bff22606f474
SHA512
c27dbcd74abed231b5e375461c03e32d5a55c08d04619bf7f315baad14fb20e2041aa92656b7e597bc7c804533c6496f569ce450e81a52cab5735d6d84af2734
+DIST heat-9.0.3.tar.gz 2364843 BLAKE2B
4edbd6716a84e6003cd02511e8c8036c84510bd4d842d9a32caae7c837bee591fb46d3edc8786d8015b8ffd09d4dde7bde4f49a6994766af40284715b2b99713
SHA512
5db5f0189da095951963d2cf30c7c3279e40537041a66b3d13cfebd13ba4256b74db49ba6269e14b2c4e21d10b7b00e77d5b94050e30c436dc271b406e4e9432
DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B
050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d
SHA512
f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
DIST heat.conf.sample-9.0.2 88901 BLAKE2B
050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d
SHA512
f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
+DIST heat.conf.sample-9.0.3 88901 BLAKE2B
050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d
SHA512
f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
diff --git a/sys-cluster/heat/heat-2017.2.9999.ebuild
b/sys-cluster/heat/heat-2017.2.9999.ebuild
index 08a656c38a7..472f8a0a47d 100644
--- a/sys-cluster/heat/heat-2017.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2017.2.9999.ebuild
@@ -4,17 +4,24 @@
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit distutils-r1 eutils git-r3 linux-info user
+inherit distutils-r1 eutils linux-info user
DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration
engine."
HOMEPAGE="https://launchpad.net/heat";
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike
-> heat.conf.sample-${PV}"
-EGIT_REPO_URI="https://github.com/openstack/heat.git";
-EGIT_BRANCH="stable/pike"
+
+if [[ ${PV} == *9999 ]];then
+ inherit git-r3
+
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike
-> heat.conf.sample-${PV}"
+ EGIT_REPO_URI="https://github.com/openstack/heat.git";
+ EGIT_BRANCH="stable/pike"
+else
+
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike
-> heat.conf.sample-${PV}
+ https://tarballs.openstack.org/${PN}/${P}.tar.gz";
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS=""
IUSE="+mysql +memcached postgres sqlite"
REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -81,8 +88,7 @@ RDEPEND="
>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
- >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
- !~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
+ >=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/heat/heat-2017.2.9999.ebuild
b/sys-cluster/heat/heat-9.0.3.ebuild
similarity index 91%
copy from sys-cluster/heat/heat-2017.2.9999.ebuild
copy to sys-cluster/heat/heat-9.0.3.ebuild
index 08a656c38a7..472f8a0a47d 100644
--- a/sys-cluster/heat/heat-2017.2.9999.ebuild
+++ b/sys-cluster/heat/heat-9.0.3.ebuild
@@ -4,17 +4,24 @@
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit distutils-r1 eutils git-r3 linux-info user
+inherit distutils-r1 eutils linux-info user
DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration
engine."
HOMEPAGE="https://launchpad.net/heat";
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike
-> heat.conf.sample-${PV}"
-EGIT_REPO_URI="https://github.com/openstack/heat.git";
-EGIT_BRANCH="stable/pike"
+
+if [[ ${PV} == *9999 ]];then
+ inherit git-r3
+
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike
-> heat.conf.sample-${PV}"
+ EGIT_REPO_URI="https://github.com/openstack/heat.git";
+ EGIT_BRANCH="stable/pike"
+else
+
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike
-> heat.conf.sample-${PV}
+ https://tarballs.openstack.org/${PN}/${P}.tar.gz";
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS=""
IUSE="+mysql +memcached postgres sqlite"
REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -81,8 +88,7 @@ RDEPEND="
>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
- >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
- !~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
+ >=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
