1 |
commit: a0cdbe8fa3e4fcd1f363becf8ca0b65d7791df40 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 8 17:44:38 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 8 17:45:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0cdbe8f |
7 |
|
8 |
sys-cluster/heat: 11.0.2 stable amd64/x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
sys-cluster/heat/Manifest | 2 - |
14 |
sys-cluster/heat/heat-11.0.0.ebuild | 160 ------------------------------------ |
15 |
sys-cluster/heat/heat-11.0.2.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 163 deletions(-) |
17 |
|
18 |
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest |
19 |
index eb3de80a96b..ee553fc9fd2 100644 |
20 |
--- a/sys-cluster/heat/Manifest |
21 |
+++ b/sys-cluster/heat/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
-DIST heat-11.0.0.tar.gz 2316538 BLAKE2B c7c56d273761af1846ef69d2a29563f96550afa97022ef749ac5fbd5c62117214bcfd0bd802a315168ea97d94cdf647c5e9c655803dc6f798ca7d64e0f1a9339 SHA512 bc38b062e273d4dfb11ba72c558b4c0ed7a9220a083cf1cc22b42583b864cc4bce8fb80acaa5a88f8f3e1658d585ee2950466d35ca5cb367390141a28aed1e6f |
24 |
-DIST heat.conf.sample-11.0.0 89219 BLAKE2B 6db6b6476c90bedb8bccb88d6e792fd62d599bf4721153f9cd79fc22d6e99f5096dbbbb560d5ead9ee2388529a9ff0514e591444c462621e37ecdc0879ed6f78 SHA512 aedde1cea25ecbdff4de8fe410bcb13cf937a4479b9fa27aab8170f92956499c678c2546cc3f373f58c287f13576b1561613b5ff71e6fae5b60bb3d580a90f4f |
25 |
DIST heat.conf.sample-11.0.2 89219 BLAKE2B 6db6b6476c90bedb8bccb88d6e792fd62d599bf4721153f9cd79fc22d6e99f5096dbbbb560d5ead9ee2388529a9ff0514e591444c462621e37ecdc0879ed6f78 SHA512 aedde1cea25ecbdff4de8fe410bcb13cf937a4479b9fa27aab8170f92956499c678c2546cc3f373f58c287f13576b1561613b5ff71e6fae5b60bb3d580a90f4f |
26 |
DIST heat.conf.sample-12.0.0 74064 BLAKE2B 8ed905ab27d0478a8ff7f705cddb00e1331e52570f799d0d7dda91563fc3a8567a76d50110403ce9e4810efb8c61e9e07fe4871953d66f6bbdcfe90ce3bae772 SHA512 aa4f4d0a306cff8a56b043c3891c5aaa2ec3582ab253adc2c0d4ed51f79086fdbe0286faa22cf57f87029e0f6895f12cd56db6feb51308679d42fcb956ea7b8c |
27 |
DIST heat.conf.sample-2018.2.9999 89219 BLAKE2B 6db6b6476c90bedb8bccb88d6e792fd62d599bf4721153f9cd79fc22d6e99f5096dbbbb560d5ead9ee2388529a9ff0514e591444c462621e37ecdc0879ed6f78 SHA512 aedde1cea25ecbdff4de8fe410bcb13cf937a4479b9fa27aab8170f92956499c678c2546cc3f373f58c287f13576b1561613b5ff71e6fae5b60bb3d580a90f4f |
28 |
|
29 |
diff --git a/sys-cluster/heat/heat-11.0.0.ebuild b/sys-cluster/heat/heat-11.0.0.ebuild |
30 |
deleted file mode 100644 |
31 |
index 1e2a1e22363..00000000000 |
32 |
--- a/sys-cluster/heat/heat-11.0.0.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,160 +0,0 @@ |
35 |
-# Copyright 1999-2019 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
-PYTHON_COMPAT=( python2_7 python3_{5,6} ) |
40 |
- |
41 |
-inherit distutils-r1 eutils linux-info user |
42 |
- |
43 |
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine." |
44 |
-HOMEPAGE="https://launchpad.net/heat" |
45 |
- |
46 |
-if [[ ${PV} == *9999 ]];then |
47 |
- inherit git-r3 |
48 |
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.rocky -> heat.conf.sample-${PV}" |
49 |
- EGIT_REPO_URI="https://github.com/openstack/heat.git" |
50 |
- EGIT_BRANCH="stable/rocky" |
51 |
-else |
52 |
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.rocky -> heat.conf.sample-${PV} |
53 |
- https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
54 |
- KEYWORDS="amd64 ~arm64 x86" |
55 |
-fi |
56 |
- |
57 |
-LICENSE="Apache-2.0" |
58 |
-SLOT="0" |
59 |
-IUSE="+mysql +memcached postgres sqlite" |
60 |
-REQUIRED_USE="|| ( mysql postgres sqlite )" |
61 |
- |
62 |
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] |
63 |
- !~dev-python/pbr-2.1.0" |
64 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
65 |
- ${CDEPEND} |
66 |
- app-admin/sudo" |
67 |
- |
68 |
-RDEPEND=" |
69 |
- ${CDEPEND} |
70 |
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] |
71 |
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] |
72 |
- >=dev-python/croniter-0.3.4[${PYTHON_USEDEP}] |
73 |
- >=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}] |
74 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
75 |
- !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}] |
76 |
- >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}] |
77 |
- >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}] |
78 |
- >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] |
79 |
- !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] |
80 |
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] |
81 |
- >=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}] |
82 |
- >=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}] |
83 |
- >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}] |
84 |
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] |
85 |
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] |
86 |
- >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] |
87 |
- >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] |
88 |
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] |
89 |
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] |
90 |
- >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}] |
91 |
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] |
92 |
- >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}] |
93 |
- >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] |
94 |
- >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] |
95 |
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] |
96 |
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] |
97 |
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] |
98 |
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] |
99 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
100 |
- >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] |
101 |
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
102 |
- >=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}] |
103 |
- >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}] |
104 |
- >=dev-python/python-blazarclient-1.0.0[${PYTHON_USEDEP}] |
105 |
- >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}] |
106 |
- >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}] |
107 |
- >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] |
108 |
- >=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}] |
109 |
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] |
110 |
- >=dev-python/python-magnumclient-2.1.0[${PYTHON_USEDEP}] |
111 |
- >=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}] |
112 |
- >=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}] |
113 |
- !~dev-python/python-mistralclient-3.2.0[${PYTHON_USEDEP}] |
114 |
- >=dev-python/python-monascaclient-1.12.0[${PYTHON_USEDEP}] |
115 |
- >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}] |
116 |
- >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}] |
117 |
- >=dev-python/python-octaviaclient-1.3.0[${PYTHON_USEDEP}] |
118 |
- >=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}] |
119 |
- >=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}] |
120 |
- >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] |
121 |
- >=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}] |
122 |
- >=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}] |
123 |
- >=dev-python/python-zunclient-2.0.0[${PYTHON_USEDEP}] |
124 |
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] |
125 |
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}] |
126 |
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] |
127 |
- >=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}] |
128 |
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] |
129 |
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}] |
130 |
- sqlite? ( |
131 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
132 |
- !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}] |
133 |
- !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}] |
134 |
- !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}] |
135 |
- !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}] |
136 |
- ) |
137 |
- mysql? ( |
138 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
139 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
140 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
141 |
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] |
142 |
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] |
143 |
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] |
144 |
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] |
145 |
- ) |
146 |
- postgres? ( |
147 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
148 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
149 |
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] |
150 |
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] |
151 |
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] |
152 |
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] |
153 |
- ) |
154 |
- >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] |
155 |
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] |
156 |
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] |
157 |
- >=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]" |
158 |
- |
159 |
-PATCHES=( |
160 |
-) |
161 |
- |
162 |
-pkg_setup() { |
163 |
- enewgroup heat |
164 |
- enewuser heat -1 -1 /var/lib/heat heat |
165 |
-} |
166 |
- |
167 |
-python_prepare_all() { |
168 |
- sed -i '/^hacking/d' test-requirements.txt || die |
169 |
- distutils-r1_python_prepare_all |
170 |
-} |
171 |
- |
172 |
-python_install_all() { |
173 |
- distutils-r1_python_install_all |
174 |
- diropts -m0750 -o heat -g heat |
175 |
- keepdir /etc/heat |
176 |
- dodir /etc/heat/environment.d |
177 |
- dodir /etc/heat/templates |
178 |
- |
179 |
- for svc in api api-cfn engine; do |
180 |
- newinitd "${FILESDIR}/heat.initd" heat-${svc} |
181 |
- done |
182 |
- |
183 |
- insinto /etc/heat |
184 |
- insopts -m0640 -o heat -g heat |
185 |
- newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample" |
186 |
- doins "etc/heat/api-paste.ini" |
187 |
- insinto /etc/heat/templates |
188 |
- doins "etc/heat/templates/"* |
189 |
- insinto /etc/heat/environment.d |
190 |
- doins "etc/heat/environment.d/default.yaml" |
191 |
- |
192 |
- dodir /var/log/heat |
193 |
- fowners heat:heat /var/log/heat |
194 |
-} |
195 |
|
196 |
diff --git a/sys-cluster/heat/heat-11.0.2.ebuild b/sys-cluster/heat/heat-11.0.2.ebuild |
197 |
index 1af9685c9cf..264bd5ea49c 100644 |
198 |
--- a/sys-cluster/heat/heat-11.0.2.ebuild |
199 |
+++ b/sys-cluster/heat/heat-11.0.2.ebuild |
200 |
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then |
201 |
else |
202 |
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.rocky -> heat.conf.sample-${PV} |
203 |
https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz" |
204 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
205 |
+ KEYWORDS="amd64 ~arm64 x86" |
206 |
fi |
207 |
S="${WORKDIR}/openstack-${P}" |