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