Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/
Date: Tue, 29 Jun 2021 02:54:17
Message-Id: 1624935244.a87f27ff44f246daab69e7f5effde068cdcfbf3b.prometheanfire@gentoo
1 commit: a87f27ff44f246daab69e7f5effde068cdcfbf3b
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 29 02:50:12 2021 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 29 02:54:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87f27ff
7
8 app-admin/puppet: cleanup
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.2
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 app-admin/puppet/Manifest | 3 -
14 app-admin/puppet/puppet-5.5.19-r1.ebuild | 138 -------------------------------
15 app-admin/puppet/puppet-7.5.0.ebuild | 132 -----------------------------
16 app-admin/puppet/puppet-7.7.0.ebuild | 132 -----------------------------
17 4 files changed, 405 deletions(-)
18
19 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
20 index fc0db1e40ce..2b3d525549d 100644
21 --- a/app-admin/puppet/Manifest
22 +++ b/app-admin/puppet/Manifest
23 @@ -1,7 +1,4 @@
24 -DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
25 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
26 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
27 -DIST puppet-7.5.0.tar.gz 2859905 BLAKE2B 59c6b8fee0ce13b1aeb7a59eab21e84835682e606598dac79a838d514352988d260f610aef0f0b00547a141c503f8779668006d109c3ad86133f413b57309adc SHA512 7b3ac681a91160055e4b26c904153b0800f55222201a83e8e5f20d74a7ef153e6b029ab59b237726f20576379ea7d81e64e24126e72e8f709bbc6473c3c0793b
28 DIST puppet-7.6.1.tar.gz 2861371 BLAKE2B acc117a03906d710329dcd4bc3881bc9792640b4685ffb771e67e819cf21705b1635178ec527b6548245b8312c3625622827fa744227d79a81af9bae194938a9 SHA512 f7b7265f5ffca4e342e0f687cf4fbf7704c6518025d178925ae04b8902a2df2ceaa76179ecd5a1c1eb3456e29c049f701e8b45c8da7dc3b0a8948ef85ee3268a
29 -DIST puppet-7.7.0.tar.gz 2891530 BLAKE2B a6284f4928fc57733a5ef5fad71e25657a7a5e76cbd2214ac74184cc223d24fb664486f6aa1958f9b26f00597a0209a9613dc1e33b73fe4951b3507e115fc48a SHA512 2cd1bf799bfe5a3d5d3458db84021a29d119651faae111b8c3bfd374c2c1b008610f2c15d4b434dbd13caa91aea073503d40071d85e86687fa330e997b80f220
30 DIST puppet-7.8.0.tar.gz 2893281 BLAKE2B cef1d56048a72ffa18c9fe2917e4f616dd4d778eddc91c88becf06a418471af1e2cf1688aa05ad3e71f24d5bb1923eaf35b8a1419ed05a72b299af970d1427e6 SHA512 189fabe199afefc77951ee3f2bf20c749f6efe290cc3a76f5ba58892c80cc76082b1ce77c23bca87f57f62816410bc5536e4206806fe31517915c72046ace08d
31
32 diff --git a/app-admin/puppet/puppet-5.5.19-r1.ebuild b/app-admin/puppet/puppet-5.5.19-r1.ebuild
33 deleted file mode 100644
34 index 228ec107592..00000000000
35 --- a/app-admin/puppet/puppet-5.5.19-r1.ebuild
36 +++ /dev/null
37 @@ -1,138 +0,0 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI="6"
42 -
43 -USE_RUBY="ruby24 ruby25 ruby26 ruby27"
44 -
45 -RUBY_FAKEGEM_RECIPE_TEST="rspec3"
46 -
47 -RUBY_FAKEGEM_TASK_DOC="doc:all"
48 -
49 -RUBY_FAKEGEM_EXTRAINSTALL="locales"
50 -
51 -inherit ruby-fakegem eapi7-ver
52 -
53 -DESCRIPTION="A system automation and configuration management software."
54 -HOMEPAGE="https://puppet.com/"
55 -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
56 -
57 -LICENSE="Apache-2.0 GPL-2"
58 -SLOT="0"
59 -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
60 -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
61 -RESTRICT="test"
62 -
63 -ruby_add_rdepend "
64 - dev-ruby/hiera
65 - dev-ruby/json:=
66 - >=dev-ruby/facter-3.0.0
67 - augeas? ( dev-ruby/ruby-augeas )
68 - diff? ( dev-ruby/diff-lcs )
69 - doc? ( dev-ruby/rdoc )
70 - ldap? ( dev-ruby/ruby-ldap )
71 - shadow? ( dev-ruby/ruby-shadow )
72 - sqlite? ( dev-ruby/sqlite3 )
73 - virtual/ruby-ssl
74 - dev-ruby/hocon"
75 -
76 -ruby_add_bdepend "
77 - doc? ( dev-ruby/yard )
78 - test? (
79 - dev-ruby/mocha
80 - dev-ruby/rack
81 - dev-ruby/rspec-its
82 - )"
83 -# this should go in the above lists, but isn't because of test deps not being keyworded
84 -# dev-ruby/rspec-collection_matchers
85 -
86 -RDEPEND+=" ${RDEPEND}
87 - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
88 - selinux? (
89 - sys-libs/libselinux[ruby]
90 - sec-policy/selinux-puppet
91 - )
92 - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
93 - >=app-portage/eix-0.18.0
94 - acct-user/puppet
95 - acct-group/puppet"
96 -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
97 -
98 -all_ruby_prepare() {
99 - # Avoid spec that require unpackaged json-schema.
100 - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
101 -
102 - # fix systemd path
103 - eapply -p0 "${FILESDIR}/puppet-systemd.patch"
104 -
105 - # Avoid specs that can only run in the puppet.git repository. This
106 - # should be narrowed down to the specific specs.
107 - rm spec/integration/parser/compiler_spec.rb || die
108 -
109 - # Avoid failing spec that need further investigation.
110 - rm spec/unit/module_tool/metadata_spec.rb || die
111 -}
112 -
113 -each_ruby_install() {
114 - each_fakegem_install
115 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
116 -}
117 -
118 -all_ruby_install() {
119 - all_fakegem_install
120 -
121 - # systemd stuffs
122 - insinto /usr/lib/systemd/system
123 - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
124 -
125 - # tmpfiles stuff
126 - insinto /usr/lib/tmpfiles.d
127 - newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
128 -
129 - # openrc init stuff
130 - newinitd "${FILESDIR}"/puppet.init-4.x puppet
131 - newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
132 - newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
133 -
134 - keepdir /etc/puppetlabs/puppet/ssl
135 -
136 - keepdir /var/lib/puppet/facts
137 - keepdir /var/lib/puppet/files
138 - fowners -R puppet:puppet /var/lib/puppet
139 -
140 - fperms 0750 /var/lib/puppet
141 -
142 - fperms 0750 /etc/puppetlabs
143 - fperms 0750 /etc/puppetlabs/puppet
144 - fperms 0750 /etc/puppetlabs/puppet/ssl
145 - fowners -R :puppet /etc/puppetlabs
146 - fowners -R :puppet /var/lib/puppet
147 -
148 - if use ldap ; then
149 - insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
150 - fi
151 -
152 - # ext and examples files
153 - for f in $(find ext examples -type f) ; do
154 - docinto "$(dirname ${f})"; dodoc "${f}"
155 - done
156 -}
157 -
158 -pkg_postinst() {
159 - elog
160 - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
161 - elog "cause puppet to hang while installing packages."
162 - elog
163 - elog "Portage Puppet module with Gentoo-specific resources:"
164 - elog "http://forge.puppetlabs.com/gentoo/portage"
165 - elog
166 -
167 - for v in ${REPLACING_VERSIONS}; do
168 - if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
169 - elog
170 - elog "Please see the following url for the release notes for puppet-5"
171 - elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
172 - elog
173 - fi
174 - done
175 -}
176
177 diff --git a/app-admin/puppet/puppet-7.5.0.ebuild b/app-admin/puppet/puppet-7.5.0.ebuild
178 deleted file mode 100644
179 index 65ed31b7def..00000000000
180 --- a/app-admin/puppet/puppet-7.5.0.ebuild
181 +++ /dev/null
182 @@ -1,132 +0,0 @@
183 -# Copyright 1999-2021 Gentoo Authors
184 -# Distributed under the terms of the GNU General Public License v2
185 -
186 -EAPI="6"
187 -
188 -USE_RUBY="ruby24 ruby25 ruby26 ruby27"
189 -RUBY_FAKEGEM_RECIPE_TEST="rspec3"
190 -RUBY_FAKEGEM_TASK_DOC="doc:all"
191 -RUBY_FAKEGEM_EXTRAINSTALL="locales"
192 -
193 -inherit epatch ruby-fakegem
194 -
195 -DESCRIPTION="A system automation and configuration management software."
196 -HOMEPAGE="https://puppet.com/"
197 -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
198 -
199 -LICENSE="Apache-2.0 GPL-2"
200 -SLOT="0"
201 -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
202 -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
203 -RESTRICT="test"
204 -
205 -ruby_add_rdepend "
206 - dev-ruby/hiera
207 - dev-ruby/json:=
208 - dev-ruby/semantic_puppet
209 - >=dev-ruby/facter-3.0.0
210 - dev-ruby/concurrent-ruby
211 - augeas? ( dev-ruby/ruby-augeas )
212 - diff? ( dev-ruby/diff-lcs )
213 - doc? ( dev-ruby/rdoc )
214 - ldap? ( dev-ruby/ruby-ldap )
215 - shadow? ( dev-ruby/ruby-shadow )
216 - sqlite? ( dev-ruby/sqlite3 )
217 - virtual/ruby-ssl
218 - dev-ruby/hocon"
219 -
220 -ruby_add_bdepend "
221 - doc? ( dev-ruby/yard )
222 - test? (
223 - dev-ruby/mocha
224 - dev-ruby/rack
225 - dev-ruby/rspec-its
226 - )"
227 -# this should go in the above lists, but isn't because of test deps not being keyworded
228 -# dev-ruby/rspec-collection_matchers
229 -
230 -RDEPEND+=" ${RDEPEND}
231 - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
232 - selinux? (
233 - sys-libs/libselinux[ruby]
234 - sec-policy/selinux-puppet
235 - )
236 - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
237 - >=app-portage/eix-0.18.0
238 - acct-user/puppet
239 - acct-group/puppet"
240 -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
241 -
242 -all_ruby_prepare() {
243 - # Avoid spec that require unpackaged json-schema.
244 - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
245 -
246 - # fix systemd path
247 - epatch "${FILESDIR}/puppet-systemd.patch"
248 -
249 - # Avoid specs that can only run in the puppet.git repository. This
250 - # should be narrowed down to the specific specs.
251 - rm spec/integration/parser/compiler_spec.rb || die
252 -
253 - # Avoid failing spec that need further investigation.
254 - rm spec/unit/module_tool/metadata_spec.rb || die
255 -}
256 -
257 -each_ruby_install() {
258 - each_fakegem_install
259 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
260 -}
261 -
262 -all_ruby_install() {
263 - all_fakegem_install
264 -
265 - # systemd stuffs
266 - insinto /usr/lib/systemd/system
267 - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
268 -
269 - # tmpfiles stuff
270 - insinto /usr/lib/tmpfiles.d
271 - newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
272 -
273 - # openrc init stuff
274 - newinitd "${FILESDIR}"/puppet.init-4.x puppet
275 -
276 - keepdir /etc/puppetlabs/puppet/ssl
277 -
278 - keepdir /var/lib/puppet/facts
279 - keepdir /var/lib/puppet/files
280 - fowners -R puppet:puppet /var/lib/puppet
281 -
282 - fperms 0750 /var/lib/puppet
283 -
284 - fperms 0750 /etc/puppetlabs
285 - fperms 0750 /etc/puppetlabs/puppet
286 - fperms 0750 /etc/puppetlabs/puppet/ssl
287 - fowners -R :puppet /etc/puppetlabs
288 - fowners -R :puppet /var/lib/puppet
289 -
290 - if use ldap ; then
291 - insinto /etc/openldap/schema
292 - doins ext/ldap/puppet.schema
293 - fi
294 -
295 - # ext and examples files
296 - for f in $(find ext examples -type f) ; do
297 - docinto "$(dirname ${f})"
298 - dodoc "${f}"
299 - done
300 -}
301 -
302 -pkg_postinst() {
303 - elog
304 - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
305 - elog "cause puppet to hang while installing packages."
306 - elog
307 - elog "Portage Puppet module with Gentoo-specific resources:"
308 - elog "http://forge.puppetlabs.com/gentoo/portage"
309 - elog
310 - elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
311 - elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
312 - elog "not already done so."
313 - elog
314 -}
315
316 diff --git a/app-admin/puppet/puppet-7.7.0.ebuild b/app-admin/puppet/puppet-7.7.0.ebuild
317 deleted file mode 100644
318 index 125aa53e82c..00000000000
319 --- a/app-admin/puppet/puppet-7.7.0.ebuild
320 +++ /dev/null
321 @@ -1,132 +0,0 @@
322 -# Copyright 1999-2021 Gentoo Authors
323 -# Distributed under the terms of the GNU General Public License v2
324 -
325 -EAPI="6"
326 -
327 -USE_RUBY="ruby24 ruby25 ruby26 ruby27"
328 -RUBY_FAKEGEM_RECIPE_TEST="rspec3"
329 -RUBY_FAKEGEM_TASK_DOC="doc:all"
330 -RUBY_FAKEGEM_EXTRAINSTALL="locales"
331 -
332 -inherit ruby-fakegem
333 -
334 -DESCRIPTION="A system automation and configuration management software."
335 -HOMEPAGE="https://puppet.com/"
336 -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
337 -
338 -LICENSE="Apache-2.0 GPL-2"
339 -SLOT="0"
340 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
341 -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
342 -RESTRICT="test"
343 -
344 -ruby_add_rdepend "
345 - dev-ruby/hiera
346 - dev-ruby/json:=
347 - dev-ruby/semantic_puppet
348 - >=dev-ruby/facter-3.0.0
349 - dev-ruby/concurrent-ruby
350 - augeas? ( dev-ruby/ruby-augeas )
351 - diff? ( dev-ruby/diff-lcs )
352 - doc? ( dev-ruby/rdoc )
353 - ldap? ( dev-ruby/ruby-ldap )
354 - shadow? ( dev-ruby/ruby-shadow )
355 - sqlite? ( dev-ruby/sqlite3 )
356 - virtual/ruby-ssl
357 - dev-ruby/hocon"
358 -
359 -ruby_add_bdepend "
360 - doc? ( dev-ruby/yard )
361 - test? (
362 - dev-ruby/mocha
363 - dev-ruby/rack
364 - dev-ruby/rspec-its
365 - )"
366 -# this should go in the above lists, but isn't because of test deps not being keyworded
367 -# dev-ruby/rspec-collection_matchers
368 -
369 -RDEPEND+=" ${RDEPEND}
370 - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
371 - selinux? (
372 - sys-libs/libselinux[ruby]
373 - sec-policy/selinux-puppet
374 - )
375 - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
376 - >=app-portage/eix-0.18.0
377 - acct-user/puppet
378 - acct-group/puppet"
379 -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
380 -
381 -all_ruby_prepare() {
382 - # Avoid spec that require unpackaged json-schema.
383 - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
384 -
385 - # fix systemd path
386 - eapply -p0 "${FILESDIR}/puppet-systemd.patch"
387 -
388 - # Avoid specs that can only run in the puppet.git repository. This
389 - # should be narrowed down to the specific specs.
390 - rm spec/integration/parser/compiler_spec.rb || die
391 -
392 - # Avoid failing spec that need further investigation.
393 - rm spec/unit/module_tool/metadata_spec.rb || die
394 -}
395 -
396 -each_ruby_install() {
397 - each_fakegem_install
398 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
399 -}
400 -
401 -all_ruby_install() {
402 - all_fakegem_install
403 -
404 - # systemd stuffs
405 - insinto /usr/lib/systemd/system
406 - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
407 -
408 - # tmpfiles stuff
409 - insinto /usr/lib/tmpfiles.d
410 - newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
411 -
412 - # openrc init stuff
413 - newinitd "${FILESDIR}"/puppet.init-4.x puppet
414 -
415 - keepdir /etc/puppetlabs/puppet/ssl
416 -
417 - keepdir /var/lib/puppet/facts
418 - keepdir /var/lib/puppet/files
419 - fowners -R puppet:puppet /var/lib/puppet
420 -
421 - fperms 0750 /var/lib/puppet
422 -
423 - fperms 0750 /etc/puppetlabs
424 - fperms 0750 /etc/puppetlabs/puppet
425 - fperms 0750 /etc/puppetlabs/puppet/ssl
426 - fowners -R :puppet /etc/puppetlabs
427 - fowners -R :puppet /var/lib/puppet
428 -
429 - if use ldap ; then
430 - insinto /etc/openldap/schema
431 - doins ext/ldap/puppet.schema
432 - fi
433 -
434 - # ext and examples files
435 - for f in $(find ext examples -type f) ; do
436 - docinto "$(dirname ${f})"
437 - dodoc "${f}"
438 - done
439 -}
440 -
441 -pkg_postinst() {
442 - elog
443 - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
444 - elog "cause puppet to hang while installing packages."
445 - elog
446 - elog "Portage Puppet module with Gentoo-specific resources:"
447 - elog "http://forge.puppetlabs.com/gentoo/portage"
448 - elog
449 - elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
450 - elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
451 - elog "not already done so."
452 - elog
453 -}