1 |
commit: 935948cb00c8299aac424a857e255c99a290e178 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 17 22:03:45 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 17 22:36:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=935948cb |
7 |
|
8 |
app-admin/puppet: cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppet/Manifest | 2 - |
14 |
app-admin/puppet/puppet-6.10.1.ebuild | 139 ---------------------------------- |
15 |
app-admin/puppet/puppet-6.11.1.ebuild | 139 ---------------------------------- |
16 |
3 files changed, 280 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest |
19 |
index 8dc2c676543..c79ffb7b7ba 100644 |
20 |
--- a/app-admin/puppet/Manifest |
21 |
+++ b/app-admin/puppet/Manifest |
22 |
@@ -1,6 +1,4 @@ |
23 |
DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2 |
24 |
DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b |
25 |
DIST puppet-5.5.18.tar.gz 2984835 BLAKE2B d5a1d023d3d26e04ccc81efa772131c06fc7ace8ec59c7efa97bddb775bb492d3256290824a87d54df5c28862cbba98c58cf41bb4a0c27a4128701652c06eee0 SHA512 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6 |
26 |
-DIST puppet-6.10.1.tar.gz 2809383 BLAKE2B 1589dcfa7d73b81ab7fbc3fca4b2fe956f5d240d11583c484262d5243e4713bb4aa9cd5c655e9566468050ab2e5c0ec0cc720e3ff9088add0744e02147b4e3bb SHA512 211c9837eb4a77a54bf09811a1a84709eef06f17e0c5c9c598d01bce2e183e69974709ad4dfb8f5fecd7433c1ff52757aa699c623155d1a0742f2e07eaf2ec56 |
27 |
-DIST puppet-6.11.1.tar.gz 2816525 BLAKE2B c4b188d5bf76b70a2748b86df78f1ca6ab99951cbc3a16377d3f2d38e165bc78ef8e5648cb09264a25ae81ac4d379b9323b1f2bbdea6679292c2cf38cabee662 SHA512 f44196206331448651e0ff0e865b09c6ccbb19115edeba4c58c8a29aa35e7d76676d5a3cb35c51cd511a44115c9c9434f1f90d5cbb0a5551a4004741d305c879 |
28 |
DIST puppet-6.12.0.tar.gz 2825392 BLAKE2B fdb7007ca337654f5ee89cd6f3beae300c3eb952570eaf1aa9baad407b84b418916e42aed63855bbb250f1d367be12f98261df54253f6438d33950134ef01cce SHA512 bcb77699f4a4a058ea0fa47ee2b449f19053e3ae859e3e30c65a57ad65fc052a4f05d7a932b9cc4b9974b36dc343ac482258ad8d5a44a151362df474b82c11fe |
29 |
|
30 |
diff --git a/app-admin/puppet/puppet-6.10.1.ebuild b/app-admin/puppet/puppet-6.10.1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 477c81270a0..00000000000 |
33 |
--- a/app-admin/puppet/puppet-6.10.1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,139 +0,0 @@ |
36 |
-# Copyright 1999-2019 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI="6" |
40 |
- |
41 |
-USE_RUBY="ruby23 ruby24 ruby25" |
42 |
- |
43 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
44 |
- |
45 |
-RUBY_FAKEGEM_TASK_DOC="doc:all" |
46 |
- |
47 |
-RUBY_FAKEGEM_EXTRAINSTALL="locales" |
48 |
- |
49 |
-inherit eutils user ruby-fakegem eapi7-ver |
50 |
- |
51 |
-DESCRIPTION="A system automation and configuration management software." |
52 |
-HOMEPAGE="https://puppet.com/" |
53 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
54 |
- |
55 |
-LICENSE="Apache-2.0 GPL-2" |
56 |
-SLOT="0" |
57 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
58 |
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
59 |
-RESTRICT="test" |
60 |
- |
61 |
-ruby_add_rdepend " |
62 |
- dev-ruby/hiera |
63 |
- dev-ruby/json:= |
64 |
- dev-ruby/semantic_puppet |
65 |
- >=dev-ruby/facter-3.0.0 |
66 |
- dev-ruby/concurrent-ruby |
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-6.10.1.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 |
- |
138 |
- keepdir /etc/puppetlabs/puppet/ssl |
139 |
- |
140 |
- keepdir /var/lib/puppet/facts |
141 |
- keepdir /var/lib/puppet/files |
142 |
- fowners -R puppet:puppet /var/lib/puppet |
143 |
- |
144 |
- fperms 0750 /var/lib/puppet |
145 |
- |
146 |
- fperms 0750 /etc/puppetlabs |
147 |
- fperms 0750 /etc/puppetlabs/puppet |
148 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
149 |
- fowners -R :puppet /etc/puppetlabs |
150 |
- fowners -R :puppet /var/lib/puppet |
151 |
- |
152 |
- if use ldap ; then |
153 |
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
154 |
- fi |
155 |
- |
156 |
- # ext and examples files |
157 |
- for f in $(find ext examples -type f) ; do |
158 |
- docinto "$(dirname ${f})"; dodoc "${f}" |
159 |
- done |
160 |
-} |
161 |
- |
162 |
-pkg_postinst() { |
163 |
- elog |
164 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
165 |
- elog "cause puppet to hang while installing packages." |
166 |
- elog |
167 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
168 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
169 |
- elog |
170 |
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
171 |
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
172 |
- elog "not already done so." |
173 |
- elog |
174 |
-} |
175 |
|
176 |
diff --git a/app-admin/puppet/puppet-6.11.1.ebuild b/app-admin/puppet/puppet-6.11.1.ebuild |
177 |
deleted file mode 100644 |
178 |
index 477c81270a0..00000000000 |
179 |
--- a/app-admin/puppet/puppet-6.11.1.ebuild |
180 |
+++ /dev/null |
181 |
@@ -1,139 +0,0 @@ |
182 |
-# Copyright 1999-2019 Gentoo Authors |
183 |
-# Distributed under the terms of the GNU General Public License v2 |
184 |
- |
185 |
-EAPI="6" |
186 |
- |
187 |
-USE_RUBY="ruby23 ruby24 ruby25" |
188 |
- |
189 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
190 |
- |
191 |
-RUBY_FAKEGEM_TASK_DOC="doc:all" |
192 |
- |
193 |
-RUBY_FAKEGEM_EXTRAINSTALL="locales" |
194 |
- |
195 |
-inherit eutils user ruby-fakegem eapi7-ver |
196 |
- |
197 |
-DESCRIPTION="A system automation and configuration management software." |
198 |
-HOMEPAGE="https://puppet.com/" |
199 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
200 |
- |
201 |
-LICENSE="Apache-2.0 GPL-2" |
202 |
-SLOT="0" |
203 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
204 |
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
205 |
-RESTRICT="test" |
206 |
- |
207 |
-ruby_add_rdepend " |
208 |
- dev-ruby/hiera |
209 |
- dev-ruby/json:= |
210 |
- dev-ruby/semantic_puppet |
211 |
- >=dev-ruby/facter-3.0.0 |
212 |
- dev-ruby/concurrent-ruby |
213 |
- augeas? ( dev-ruby/ruby-augeas ) |
214 |
- diff? ( dev-ruby/diff-lcs ) |
215 |
- doc? ( dev-ruby/rdoc ) |
216 |
- ldap? ( dev-ruby/ruby-ldap ) |
217 |
- shadow? ( dev-ruby/ruby-shadow ) |
218 |
- sqlite? ( dev-ruby/sqlite3 ) |
219 |
- virtual/ruby-ssl |
220 |
- dev-ruby/hocon" |
221 |
- |
222 |
-ruby_add_bdepend " |
223 |
- doc? ( dev-ruby/yard ) |
224 |
- test? ( |
225 |
- dev-ruby/mocha |
226 |
- dev-ruby/rack |
227 |
- dev-ruby/rspec-its |
228 |
- )" |
229 |
-# this should go in the above lists, but isn't because of test deps not being keyworded |
230 |
-# dev-ruby/rspec-collection_matchers |
231 |
- |
232 |
-RDEPEND+=" ${RDEPEND} |
233 |
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
234 |
- selinux? ( |
235 |
- sys-libs/libselinux[ruby] |
236 |
- sec-policy/selinux-puppet |
237 |
- ) |
238 |
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
239 |
- >=app-portage/eix-0.18.0" |
240 |
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" |
241 |
- |
242 |
-pkg_setup() { |
243 |
- enewgroup puppet |
244 |
- enewuser puppet -1 -1 /var/lib/puppet puppet |
245 |
-} |
246 |
- |
247 |
-all_ruby_prepare() { |
248 |
- # Avoid spec that require unpackaged json-schema. |
249 |
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
250 |
- |
251 |
- # can't be run within portage. |
252 |
- epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch" |
253 |
- |
254 |
- # fix systemd path |
255 |
- epatch "${FILESDIR}/puppet-systemd.patch" |
256 |
- |
257 |
- # Avoid specs that can only run in the puppet.git repository. This |
258 |
- # should be narrowed down to the specific specs. |
259 |
- rm spec/integration/parser/compiler_spec.rb || die |
260 |
- |
261 |
- # Avoid failing spec that need further investigation. |
262 |
- rm spec/unit/module_tool/metadata_spec.rb || die |
263 |
-} |
264 |
- |
265 |
-each_ruby_install() { |
266 |
- each_fakegem_install |
267 |
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
268 |
-} |
269 |
- |
270 |
-all_ruby_install() { |
271 |
- all_fakegem_install |
272 |
- |
273 |
- # systemd stuffs |
274 |
- insinto /usr/lib/systemd/system |
275 |
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
276 |
- |
277 |
- # tmpfiles stuff |
278 |
- insinto /usr/lib/tmpfiles.d |
279 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
280 |
- |
281 |
- # openrc init stuff |
282 |
- newinitd "${FILESDIR}"/puppet.init-4.x puppet |
283 |
- |
284 |
- keepdir /etc/puppetlabs/puppet/ssl |
285 |
- |
286 |
- keepdir /var/lib/puppet/facts |
287 |
- keepdir /var/lib/puppet/files |
288 |
- fowners -R puppet:puppet /var/lib/puppet |
289 |
- |
290 |
- fperms 0750 /var/lib/puppet |
291 |
- |
292 |
- fperms 0750 /etc/puppetlabs |
293 |
- fperms 0750 /etc/puppetlabs/puppet |
294 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
295 |
- fowners -R :puppet /etc/puppetlabs |
296 |
- fowners -R :puppet /var/lib/puppet |
297 |
- |
298 |
- if use ldap ; then |
299 |
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
300 |
- fi |
301 |
- |
302 |
- # ext and examples files |
303 |
- for f in $(find ext examples -type f) ; do |
304 |
- docinto "$(dirname ${f})"; dodoc "${f}" |
305 |
- done |
306 |
-} |
307 |
- |
308 |
-pkg_postinst() { |
309 |
- elog |
310 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
311 |
- elog "cause puppet to hang while installing packages." |
312 |
- elog |
313 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
314 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
315 |
- elog |
316 |
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
317 |
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
318 |
- elog "not already done so." |
319 |
- elog |
320 |
-} |