Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/heat/
Date: Wed, 14 Feb 2018 03:18:00
Message-Id: 1518575031.f741ca90126b001763694738673d8a14a1bde594.prometheanfire@gentoo
1 commit: f741ca90126b001763694738673d8a14a1bde594
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 14 02:23:51 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 14 02:23:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f741ca90
7
8 sys-cluster/heat: 9.0.3 bup
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-cluster/heat/Manifest | 2 ++
13 sys-cluster/heat/heat-2017.2.9999.ebuild | 20 +++++++++++++-------
14 .../{heat-2017.2.9999.ebuild => heat-9.0.3.ebuild} | 20 +++++++++++++-------
15 3 files changed, 28 insertions(+), 14 deletions(-)
16
17 diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
18 index ebe3a36063d..ed3fd123a98 100644
19 --- a/sys-cluster/heat/Manifest
20 +++ b/sys-cluster/heat/Manifest
21 @@ -1,3 +1,5 @@
22 DIST heat-9.0.2.tar.gz 2364044 BLAKE2B ca2c6e1f504e7b443906e1c33d2105293313223d9af851a5c46719b5c74d95687d11ea2460f7fc3e818719c9132bb8e0041b4ae123d5a0eb12b5bff22606f474 SHA512 c27dbcd74abed231b5e375461c03e32d5a55c08d04619bf7f315baad14fb20e2041aa92656b7e597bc7c804533c6496f569ce450e81a52cab5735d6d84af2734
23 +DIST heat-9.0.3.tar.gz 2364843 BLAKE2B 4edbd6716a84e6003cd02511e8c8036c84510bd4d842d9a32caae7c837bee591fb46d3edc8786d8015b8ffd09d4dde7bde4f49a6994766af40284715b2b99713 SHA512 5db5f0189da095951963d2cf30c7c3279e40537041a66b3d13cfebd13ba4256b74db49ba6269e14b2c4e21d10b7b00e77d5b94050e30c436dc271b406e4e9432
24 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
25 DIST heat.conf.sample-9.0.2 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
26 +DIST heat.conf.sample-9.0.3 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
27
28 diff --git a/sys-cluster/heat/heat-2017.2.9999.ebuild b/sys-cluster/heat/heat-2017.2.9999.ebuild
29 index 08a656c38a7..472f8a0a47d 100644
30 --- a/sys-cluster/heat/heat-2017.2.9999.ebuild
31 +++ b/sys-cluster/heat/heat-2017.2.9999.ebuild
32 @@ -4,17 +4,24 @@
33 EAPI=6
34 PYTHON_COMPAT=( python2_7 python3_{4,5} )
35
36 -inherit distutils-r1 eutils git-r3 linux-info user
37 +inherit distutils-r1 eutils linux-info user
38
39 DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
40 HOMEPAGE="https://launchpad.net/heat"
41 -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
42 -EGIT_REPO_URI="https://github.com/openstack/heat.git"
43 -EGIT_BRANCH="stable/pike"
44 +
45 +if [[ ${PV} == *9999 ]];then
46 + inherit git-r3
47 + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
48 + EGIT_REPO_URI="https://github.com/openstack/heat.git"
49 + EGIT_BRANCH="stable/pike"
50 +else
51 + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
52 + https://tarballs.openstack.org/${PN}/${P}.tar.gz"
53 + KEYWORDS="~amd64 ~arm64 ~x86"
54 +fi
55
56 LICENSE="Apache-2.0"
57 SLOT="0"
58 -KEYWORDS=""
59 IUSE="+mysql +memcached postgres sqlite"
60 REQUIRED_USE="|| ( mysql postgres sqlite )"
61
62 @@ -81,8 +88,7 @@ RDEPEND="
63 >=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
64 >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
65 >=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
66 - >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
67 - !~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
68 + >=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
69 >=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
70 >=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
71 >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
72
73 diff --git a/sys-cluster/heat/heat-2017.2.9999.ebuild b/sys-cluster/heat/heat-9.0.3.ebuild
74 similarity index 91%
75 copy from sys-cluster/heat/heat-2017.2.9999.ebuild
76 copy to sys-cluster/heat/heat-9.0.3.ebuild
77 index 08a656c38a7..472f8a0a47d 100644
78 --- a/sys-cluster/heat/heat-2017.2.9999.ebuild
79 +++ b/sys-cluster/heat/heat-9.0.3.ebuild
80 @@ -4,17 +4,24 @@
81 EAPI=6
82 PYTHON_COMPAT=( python2_7 python3_{4,5} )
83
84 -inherit distutils-r1 eutils git-r3 linux-info user
85 +inherit distutils-r1 eutils linux-info user
86
87 DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
88 HOMEPAGE="https://launchpad.net/heat"
89 -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
90 -EGIT_REPO_URI="https://github.com/openstack/heat.git"
91 -EGIT_BRANCH="stable/pike"
92 +
93 +if [[ ${PV} == *9999 ]];then
94 + inherit git-r3
95 + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
96 + EGIT_REPO_URI="https://github.com/openstack/heat.git"
97 + EGIT_BRANCH="stable/pike"
98 +else
99 + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
100 + https://tarballs.openstack.org/${PN}/${P}.tar.gz"
101 + KEYWORDS="~amd64 ~arm64 ~x86"
102 +fi
103
104 LICENSE="Apache-2.0"
105 SLOT="0"
106 -KEYWORDS=""
107 IUSE="+mysql +memcached postgres sqlite"
108 REQUIRED_USE="|| ( mysql postgres sqlite )"
109
110 @@ -81,8 +88,7 @@ RDEPEND="
111 >=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
112 >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
113 >=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
114 - >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
115 - !~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
116 + >=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
117 >=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
118 >=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
119 >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]