1 |
commit: 20e2ce47cac557f631d19aa949c8555c346f6d42 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 15 16:07:40 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 15 16:14:52 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e2ce47 |
7 |
|
8 |
app-admin/puppet: 5.5.10 and 6.0.5 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppet/Manifest | 2 - |
14 |
app-admin/puppet/puppet-5.5.10.ebuild | 2 +- |
15 |
app-admin/puppet/puppet-5.5.8.ebuild | 144 ---------------------------------- |
16 |
app-admin/puppet/puppet-6.0.4.ebuild | 138 -------------------------------- |
17 |
app-admin/puppet/puppet-6.0.5.ebuild | 2 +- |
18 |
5 files changed, 2 insertions(+), 286 deletions(-) |
19 |
|
20 |
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest |
21 |
index bde11109c1c..47a97a0e34c 100644 |
22 |
--- a/app-admin/puppet/Manifest |
23 |
+++ b/app-admin/puppet/Manifest |
24 |
@@ -1,7 +1,5 @@ |
25 |
DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2 |
26 |
DIST puppet-5.5.10.tar.gz 3064457 BLAKE2B 04cac9cebc03343b8c6fcf762f681f63bce4ebe27b6e7e727d06b14f0013a6c4b0ed7ff793e01b170931a881a921b4a2f107a5e37d1ac9394046f8611a7adaaf SHA512 70a5684289fc576853bf908adff44c1b1ce4b37d71236e7d7a8d140fa0e3cdd46a4b570cc7e493a3f47641f6be0c3b736ab04a178c30cce4244abe686378bf4b |
27 |
-DIST puppet-5.5.8.tar.gz 3056987 BLAKE2B cfb0599f5a9a6f254b0e853ece390dcc4fb3e8cd40956955b81e9dd9ae3c3c39c18a0f5f010b269c8c21f1b288f50c354e4c40cd0cbd3ad3128dd95c3c7d0cca SHA512 2ed960c0fcd4f6b0a7eacfffd8bc3ca88387bade0ce5ac6cbb247752f18927959286b1238c146d3d2bda7f8bee171fc502b44b129c4778feafbda90d993ee816 |
28 |
-DIST puppet-6.0.4.tar.gz 2804651 BLAKE2B d2e685938b57ec896446a658d6a115f999b2254064711ceb6a139da3c5ffe488ba2dbd2da39b3a6c889027d971f44ff4fc99f87ceec95cc8b79eefc86f43f614 SHA512 fcfc0a9e1a707945c89e3080c1795511fd28143576886552d8e3635d62f526d0b3f9ed2a400ecc0084b63906246cb86e176b288ac049d01d0f9cf47fc65fe332 |
29 |
DIST puppet-6.0.5.tar.gz 2811469 BLAKE2B de25af69b387a02b68fbb31ae13a9fa4aea8f25dcef32bead662e708060909b2f10813c1e889372a9167cb7a10b084679c20b5fa8312d2e06e2b53ebd573082a SHA512 0b34a27a0c21d24cf22e442b495dcfc49ac8b78e40f83eb9eb7f8b82b29350be436a63c6c9c9e969fc3d16096ccb927ca3c4d11e64e51d1e50150001d015bdbc |
30 |
DIST puppet-6.1.0.tar.gz 2818606 BLAKE2B 4fb6b26e5c3711262ff2210c9a4e9a9df0f47f4a989526a79cc36f56fa939fd4e54e41f3afef818aacd4630daf559f1ded7e2f6e3cc258a005a848b4d49b64ae SHA512 b82d5f5b045e23543a26949d9faa7ced78f1413e7699d124dd43a56b8558232d6f151a9fdbe52e1959900eb8fff7d7e873fa7ce986206419a27a7627a56f91f6 |
31 |
DIST puppet-6.2.0.tar.gz 2821615 BLAKE2B 88b8ec856cfc6dacba5dfe44da7abce56a351f514057d3c916ecb5f4188703713cf7981984c2a59cb8073da93eab91a815dc2f52ee4f621c9a412897e9387d5e SHA512 91540169d3c9c1715e78b416961f4f3957a01b0908c3b675fa75226361fb8161730ca47ed98a2e958d8841fd50086c75489c5ee53b41f933392f399d502bad9b |
32 |
|
33 |
diff --git a/app-admin/puppet/puppet-5.5.10.ebuild b/app-admin/puppet/puppet-5.5.10.ebuild |
34 |
index 7f380bcc3fa..e4dc9ec0526 100644 |
35 |
--- a/app-admin/puppet/puppet-5.5.10.ebuild |
36 |
+++ b/app-admin/puppet/puppet-5.5.10.ebuild |
37 |
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
38 |
|
39 |
LICENSE="Apache-2.0 GPL-2" |
40 |
SLOT="0" |
41 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
42 |
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
43 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
44 |
RESTRICT="test" |
45 |
|
46 |
|
47 |
diff --git a/app-admin/puppet/puppet-5.5.8.ebuild b/app-admin/puppet/puppet-5.5.8.ebuild |
48 |
deleted file mode 100644 |
49 |
index e49d432b2e3..00000000000 |
50 |
--- a/app-admin/puppet/puppet-5.5.8.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,144 +0,0 @@ |
53 |
-# Copyright 1999-2018 Gentoo Authors |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
- |
56 |
-EAPI="6" |
57 |
- |
58 |
-USE_RUBY="ruby23 ruby24 ruby25" |
59 |
- |
60 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
61 |
- |
62 |
-RUBY_FAKEGEM_TASK_DOC="doc:all" |
63 |
- |
64 |
-RUBY_FAKEGEM_EXTRAINSTALL="locales" |
65 |
- |
66 |
-inherit eutils user ruby-fakegem eapi7-ver |
67 |
- |
68 |
-DESCRIPTION="A system automation and configuration management software." |
69 |
-HOMEPAGE="http://puppetlabs.com/" |
70 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
71 |
- |
72 |
-LICENSE="Apache-2.0 GPL-2" |
73 |
-SLOT="0" |
74 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
75 |
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
76 |
-RESTRICT="test" |
77 |
- |
78 |
-ruby_add_rdepend " |
79 |
- dev-ruby/hiera |
80 |
- dev-ruby/json:= |
81 |
- >=dev-ruby/facter-3.0.0 |
82 |
- augeas? ( dev-ruby/ruby-augeas ) |
83 |
- diff? ( dev-ruby/diff-lcs ) |
84 |
- doc? ( dev-ruby/rdoc ) |
85 |
- ldap? ( dev-ruby/ruby-ldap ) |
86 |
- shadow? ( dev-ruby/ruby-shadow ) |
87 |
- sqlite? ( dev-ruby/sqlite3 ) |
88 |
- virtual/ruby-ssl |
89 |
- dev-ruby/hocon" |
90 |
- |
91 |
-ruby_add_bdepend " |
92 |
- doc? ( dev-ruby/yard ) |
93 |
- test? ( |
94 |
- dev-ruby/mocha |
95 |
- dev-ruby/rack |
96 |
- dev-ruby/rspec-its |
97 |
- )" |
98 |
-# this should go in the above lists, but isn't because of test deps not being keyworded |
99 |
-# dev-ruby/rspec-collection_matchers |
100 |
- |
101 |
-RDEPEND+=" ${RDEPEND} |
102 |
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
103 |
- selinux? ( |
104 |
- sys-libs/libselinux[ruby] |
105 |
- sec-policy/selinux-puppet |
106 |
- ) |
107 |
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
108 |
- >=app-portage/eix-0.18.0" |
109 |
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" |
110 |
- |
111 |
-pkg_setup() { |
112 |
- enewgroup puppet |
113 |
- enewuser puppet -1 -1 /var/lib/puppet puppet |
114 |
-} |
115 |
- |
116 |
-all_ruby_prepare() { |
117 |
- # Avoid spec that require unpackaged json-schema. |
118 |
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
119 |
- |
120 |
- # can't be run within portage. |
121 |
- epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch" |
122 |
- |
123 |
- # fix systemd path |
124 |
- epatch "${FILESDIR}/puppet-systemd.patch" |
125 |
- |
126 |
- # Avoid specs that can only run in the puppet.git repository. This |
127 |
- # should be narrowed down to the specific specs. |
128 |
- rm spec/integration/parser/compiler_spec.rb || die |
129 |
- |
130 |
- # Avoid failing spec that need further investigation. |
131 |
- rm spec/unit/module_tool/metadata_spec.rb || die |
132 |
-} |
133 |
- |
134 |
-each_ruby_install() { |
135 |
- each_fakegem_install |
136 |
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
137 |
-} |
138 |
- |
139 |
-all_ruby_install() { |
140 |
- all_fakegem_install |
141 |
- |
142 |
- # systemd stuffs |
143 |
- insinto /usr/lib/systemd/system |
144 |
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
145 |
- |
146 |
- # tmpfiles stuff |
147 |
- insinto /usr/lib/tmpfiles.d |
148 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
149 |
- |
150 |
- # openrc init stuff |
151 |
- newinitd "${FILESDIR}"/puppet.init-4.x puppet |
152 |
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster |
153 |
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
154 |
- |
155 |
- keepdir /etc/puppetlabs/puppet/ssl |
156 |
- |
157 |
- keepdir /var/lib/puppet/facts |
158 |
- keepdir /var/lib/puppet/files |
159 |
- fowners -R puppet:puppet /var/lib/puppet |
160 |
- |
161 |
- fperms 0750 /var/lib/puppet |
162 |
- |
163 |
- fperms 0750 /etc/puppetlabs |
164 |
- fperms 0750 /etc/puppetlabs/puppet |
165 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
166 |
- fowners -R :puppet /etc/puppetlabs |
167 |
- fowners -R :puppet /var/lib/puppet |
168 |
- |
169 |
- if use ldap ; then |
170 |
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
171 |
- fi |
172 |
- |
173 |
- # ext and examples files |
174 |
- for f in $(find ext examples -type f) ; do |
175 |
- docinto "$(dirname ${f})"; dodoc "${f}" |
176 |
- done |
177 |
-} |
178 |
- |
179 |
-pkg_postinst() { |
180 |
- elog |
181 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
182 |
- elog "cause puppet to hang while installing packages." |
183 |
- elog |
184 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
185 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
186 |
- elog |
187 |
- |
188 |
- for v in ${REPLACING_VERSIONS}; do |
189 |
- if [ "$(ver_cut 1 "$v")" -eq "4" ]; then |
190 |
- elog |
191 |
- elog "Please see the following url for the release notes for puppet-5" |
192 |
- elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x" |
193 |
- elog |
194 |
- fi |
195 |
- done |
196 |
-} |
197 |
|
198 |
diff --git a/app-admin/puppet/puppet-6.0.4.ebuild b/app-admin/puppet/puppet-6.0.4.ebuild |
199 |
deleted file mode 100644 |
200 |
index 2f3f37b0634..00000000000 |
201 |
--- a/app-admin/puppet/puppet-6.0.4.ebuild |
202 |
+++ /dev/null |
203 |
@@ -1,138 +0,0 @@ |
204 |
-# Copyright 1999-2018 Gentoo Authors |
205 |
-# Distributed under the terms of the GNU General Public License v2 |
206 |
- |
207 |
-EAPI="6" |
208 |
- |
209 |
-USE_RUBY="ruby23 ruby24 ruby25" |
210 |
- |
211 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
212 |
- |
213 |
-RUBY_FAKEGEM_TASK_DOC="doc:all" |
214 |
- |
215 |
-RUBY_FAKEGEM_EXTRAINSTALL="locales" |
216 |
- |
217 |
-inherit eutils user ruby-fakegem eapi7-ver |
218 |
- |
219 |
-DESCRIPTION="A system automation and configuration management software." |
220 |
-HOMEPAGE="http://puppetlabs.com/" |
221 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
222 |
- |
223 |
-LICENSE="Apache-2.0 GPL-2" |
224 |
-SLOT="0" |
225 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
226 |
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
227 |
-RESTRICT="test" |
228 |
- |
229 |
-ruby_add_rdepend " |
230 |
- dev-ruby/hiera |
231 |
- dev-ruby/json:= |
232 |
- dev-ruby/semantic_puppet |
233 |
- >=dev-ruby/facter-3.0.0 |
234 |
- augeas? ( dev-ruby/ruby-augeas ) |
235 |
- diff? ( dev-ruby/diff-lcs ) |
236 |
- doc? ( dev-ruby/rdoc ) |
237 |
- ldap? ( dev-ruby/ruby-ldap ) |
238 |
- shadow? ( dev-ruby/ruby-shadow ) |
239 |
- sqlite? ( dev-ruby/sqlite3 ) |
240 |
- virtual/ruby-ssl |
241 |
- dev-ruby/hocon" |
242 |
- |
243 |
-ruby_add_bdepend " |
244 |
- doc? ( dev-ruby/yard ) |
245 |
- test? ( |
246 |
- dev-ruby/mocha |
247 |
- dev-ruby/rack |
248 |
- dev-ruby/rspec-its |
249 |
- )" |
250 |
-# this should go in the above lists, but isn't because of test deps not being keyworded |
251 |
-# dev-ruby/rspec-collection_matchers |
252 |
- |
253 |
-RDEPEND+=" ${RDEPEND} |
254 |
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
255 |
- selinux? ( |
256 |
- sys-libs/libselinux[ruby] |
257 |
- sec-policy/selinux-puppet |
258 |
- ) |
259 |
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
260 |
- >=app-portage/eix-0.18.0" |
261 |
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" |
262 |
- |
263 |
-pkg_setup() { |
264 |
- enewgroup puppet |
265 |
- enewuser puppet -1 -1 /var/lib/puppet puppet |
266 |
-} |
267 |
- |
268 |
-all_ruby_prepare() { |
269 |
- # Avoid spec that require unpackaged json-schema. |
270 |
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
271 |
- |
272 |
- # can't be run within portage. |
273 |
- epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch" |
274 |
- |
275 |
- # fix systemd path |
276 |
- epatch "${FILESDIR}/puppet-systemd.patch" |
277 |
- |
278 |
- # Avoid specs that can only run in the puppet.git repository. This |
279 |
- # should be narrowed down to the specific specs. |
280 |
- rm spec/integration/parser/compiler_spec.rb || die |
281 |
- |
282 |
- # Avoid failing spec that need further investigation. |
283 |
- rm spec/unit/module_tool/metadata_spec.rb || die |
284 |
-} |
285 |
- |
286 |
-each_ruby_install() { |
287 |
- each_fakegem_install |
288 |
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
289 |
-} |
290 |
- |
291 |
-all_ruby_install() { |
292 |
- all_fakegem_install |
293 |
- |
294 |
- # systemd stuffs |
295 |
- insinto /usr/lib/systemd/system |
296 |
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
297 |
- |
298 |
- # tmpfiles stuff |
299 |
- insinto /usr/lib/tmpfiles.d |
300 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
301 |
- |
302 |
- # openrc init stuff |
303 |
- newinitd "${FILESDIR}"/puppet.init-4.x puppet |
304 |
- |
305 |
- keepdir /etc/puppetlabs/puppet/ssl |
306 |
- |
307 |
- keepdir /var/lib/puppet/facts |
308 |
- keepdir /var/lib/puppet/files |
309 |
- fowners -R puppet:puppet /var/lib/puppet |
310 |
- |
311 |
- fperms 0750 /var/lib/puppet |
312 |
- |
313 |
- fperms 0750 /etc/puppetlabs |
314 |
- fperms 0750 /etc/puppetlabs/puppet |
315 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
316 |
- fowners -R :puppet /etc/puppetlabs |
317 |
- fowners -R :puppet /var/lib/puppet |
318 |
- |
319 |
- if use ldap ; then |
320 |
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
321 |
- fi |
322 |
- |
323 |
- # ext and examples files |
324 |
- for f in $(find ext examples -type f) ; do |
325 |
- docinto "$(dirname ${f})"; dodoc "${f}" |
326 |
- done |
327 |
-} |
328 |
- |
329 |
-pkg_postinst() { |
330 |
- elog |
331 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
332 |
- elog "cause puppet to hang while installing packages." |
333 |
- elog |
334 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
335 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
336 |
- elog |
337 |
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
338 |
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
339 |
- elog "not already done so." |
340 |
- elog |
341 |
-} |
342 |
|
343 |
diff --git a/app-admin/puppet/puppet-6.0.5.ebuild b/app-admin/puppet/puppet-6.0.5.ebuild |
344 |
index 1d12aee25d2..87692a87fff 100644 |
345 |
--- a/app-admin/puppet/puppet-6.0.5.ebuild |
346 |
+++ b/app-admin/puppet/puppet-6.0.5.ebuild |
347 |
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
348 |
|
349 |
LICENSE="Apache-2.0 GPL-2" |
350 |
SLOT="0" |
351 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
352 |
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
353 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
354 |
RESTRICT="test" |