1 |
commit: 80948c826a3ddf08e12868f3f8a259e9935a4f20 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 24 17:04:43 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 24 17:06:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80948c82 |
7 |
|
8 |
app-admin/puppet: 7.8.0 and 7.9.0 cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppet/Manifest | 2 - |
14 |
app-admin/puppet/puppet-7.8.0-r1.ebuild | 132 -------------------------------- |
15 |
app-admin/puppet/puppet-7.9.0-r1.ebuild | 132 -------------------------------- |
16 |
3 files changed, 266 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest |
19 |
index 44cce79a4fb..b65e080e5a4 100644 |
20 |
--- a/app-admin/puppet/Manifest |
21 |
+++ b/app-admin/puppet/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58 |
24 |
DIST puppet-7.10.0.tar.gz 2856888 BLAKE2B 9322d59f0a8af26343f474e7b4295dfa3bfc105137498d7333776abf366c35fe66af137595ca26ea0d8cf0474151e290825240b4ee87679f25a817fa0ffdeb9d SHA512 686a9023549fb137d49c381f9c21402451503531d3edc4381a0c80dda584eac1621b1a33013e63c07158c8cec08c6e864ba70d0be4cd0c2cfeaf4f9fce9ed36a |
25 |
DIST puppet-7.11.0.tar.gz 2860556 BLAKE2B 4db6e9ba7da3c3fa8af845a9afa4a1029ae9f6e33b1a3977ab06058bdd1c230ec2cb7a7bbe54bfd6a193093f3020136f9dcfcb035f5031c06885d1df51b0f467 SHA512 dca5359c4caa07296c1ae79840d56b96b506521a9b7f32ff5aa4fbecb6277b579dff2f4d0df0c939d5f466f55b56ac8c7e2bd0ad83c024bf403f2652ecac3988 |
26 |
-DIST puppet-7.8.0.tar.gz 2893281 BLAKE2B cef1d56048a72ffa18c9fe2917e4f616dd4d778eddc91c88becf06a418471af1e2cf1688aa05ad3e71f24d5bb1923eaf35b8a1419ed05a72b299af970d1427e6 SHA512 189fabe199afefc77951ee3f2bf20c749f6efe290cc3a76f5ba58892c80cc76082b1ce77c23bca87f57f62816410bc5536e4206806fe31517915c72046ace08d |
27 |
-DIST puppet-7.9.0.tar.gz 2899891 BLAKE2B 06f675fc9eaac4ddfa7957847abe33928f0779f3c18dbf339067525ec69b6b87d274294a1133ec8332fbbed6111b568c63478493f3de467c63e2948bcf446b71 SHA512 6329d89530d2cb008e28116de655024e9bf944b3f41d086e0e47c41c74af3da51c283a912ac966cf7bac52f86e54304df6cf31477a5663cae09fb4d18f958cf2 |
28 |
|
29 |
diff --git a/app-admin/puppet/puppet-7.8.0-r1.ebuild b/app-admin/puppet/puppet-7.8.0-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index f2b79f3d4dc..00000000000 |
32 |
--- a/app-admin/puppet/puppet-7.8.0-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,132 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI="6" |
39 |
- |
40 |
-USE_RUBY="ruby24 ruby25 ruby26 ruby27" |
41 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
42 |
-RUBY_FAKEGEM_TASK_DOC="doc:all" |
43 |
-RUBY_FAKEGEM_EXTRAINSTALL="locales" |
44 |
- |
45 |
-inherit ruby-fakegem systemd tmpfiles |
46 |
- |
47 |
-DESCRIPTION="A system automation and configuration management software." |
48 |
-HOMEPAGE="https://puppet.com/" |
49 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
50 |
- |
51 |
-LICENSE="Apache-2.0 GPL-2" |
52 |
-SLOT="0" |
53 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
54 |
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
55 |
-RESTRICT="test" |
56 |
- |
57 |
-ruby_add_rdepend " |
58 |
- dev-ruby/hiera |
59 |
- dev-ruby/json:= |
60 |
- dev-ruby/semantic_puppet |
61 |
- >=dev-ruby/facter-3.0.0 |
62 |
- dev-ruby/concurrent-ruby |
63 |
- augeas? ( dev-ruby/ruby-augeas ) |
64 |
- diff? ( dev-ruby/diff-lcs ) |
65 |
- doc? ( dev-ruby/rdoc ) |
66 |
- ldap? ( dev-ruby/ruby-ldap ) |
67 |
- shadow? ( dev-ruby/ruby-shadow ) |
68 |
- sqlite? ( dev-ruby/sqlite3 ) |
69 |
- virtual/ruby-ssl |
70 |
- dev-ruby/hocon" |
71 |
- |
72 |
-ruby_add_bdepend " |
73 |
- doc? ( dev-ruby/yard ) |
74 |
- test? ( |
75 |
- dev-ruby/mocha |
76 |
- dev-ruby/rack |
77 |
- dev-ruby/rspec-its |
78 |
- )" |
79 |
-# this should go in the above lists, but isn't because of test deps not being keyworded |
80 |
-# dev-ruby/rspec-collection_matchers |
81 |
- |
82 |
-RDEPEND+=" ${RDEPEND} |
83 |
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
84 |
- selinux? ( |
85 |
- sys-libs/libselinux[ruby] |
86 |
- sec-policy/selinux-puppet |
87 |
- ) |
88 |
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
89 |
- >=app-portage/eix-0.18.0 |
90 |
- acct-user/puppet |
91 |
- acct-group/puppet" |
92 |
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" |
93 |
- |
94 |
-all_ruby_prepare() { |
95 |
- # Avoid spec that require unpackaged json-schema. |
96 |
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
97 |
- |
98 |
- # fix systemd path |
99 |
- eapply -p0 "${FILESDIR}/puppet-systemd.patch" |
100 |
- |
101 |
- # Avoid specs that can only run in the puppet.git repository. This |
102 |
- # should be narrowed down to the specific specs. |
103 |
- rm spec/integration/parser/compiler_spec.rb || die |
104 |
- |
105 |
- # Avoid failing spec that need further investigation. |
106 |
- rm spec/unit/module_tool/metadata_spec.rb || die |
107 |
-} |
108 |
- |
109 |
-each_ruby_install() { |
110 |
- each_fakegem_install |
111 |
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
112 |
-} |
113 |
- |
114 |
-all_ruby_install() { |
115 |
- all_fakegem_install |
116 |
- |
117 |
- # systemd stuffs |
118 |
- systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
119 |
- |
120 |
- # tmpfiles stuff |
121 |
- newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" |
122 |
- |
123 |
- # openrc init stuff |
124 |
- newinitd "${FILESDIR}"/puppet.init-4.x puppet |
125 |
- |
126 |
- keepdir /etc/puppetlabs/puppet/ssl |
127 |
- |
128 |
- keepdir /var/lib/puppet/facts |
129 |
- keepdir /var/lib/puppet/files |
130 |
- fowners -R puppet:puppet /var/lib/puppet |
131 |
- |
132 |
- fperms 0750 /var/lib/puppet |
133 |
- |
134 |
- fperms 0750 /etc/puppetlabs |
135 |
- fperms 0750 /etc/puppetlabs/puppet |
136 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
137 |
- fowners -R :puppet /etc/puppetlabs |
138 |
- fowners -R :puppet /var/lib/puppet |
139 |
- |
140 |
- if use ldap ; then |
141 |
- insinto /etc/openldap/schema |
142 |
- doins ext/ldap/puppet.schema |
143 |
- fi |
144 |
- |
145 |
- # ext and examples files |
146 |
- for f in $(find ext examples -type f) ; do |
147 |
- docinto "$(dirname ${f})" |
148 |
- dodoc "${f}" |
149 |
- done |
150 |
-} |
151 |
- |
152 |
-pkg_postinst() { |
153 |
- tmpfiles_process puppet.conf |
154 |
- |
155 |
- elog |
156 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
157 |
- elog "cause puppet to hang while installing packages." |
158 |
- elog |
159 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
160 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
161 |
- elog |
162 |
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
163 |
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
164 |
- elog "not already done so." |
165 |
- elog |
166 |
-} |
167 |
|
168 |
diff --git a/app-admin/puppet/puppet-7.9.0-r1.ebuild b/app-admin/puppet/puppet-7.9.0-r1.ebuild |
169 |
deleted file mode 100644 |
170 |
index f2b79f3d4dc..00000000000 |
171 |
--- a/app-admin/puppet/puppet-7.9.0-r1.ebuild |
172 |
+++ /dev/null |
173 |
@@ -1,132 +0,0 @@ |
174 |
-# Copyright 1999-2021 Gentoo Authors |
175 |
-# Distributed under the terms of the GNU General Public License v2 |
176 |
- |
177 |
-EAPI="6" |
178 |
- |
179 |
-USE_RUBY="ruby24 ruby25 ruby26 ruby27" |
180 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
181 |
-RUBY_FAKEGEM_TASK_DOC="doc:all" |
182 |
-RUBY_FAKEGEM_EXTRAINSTALL="locales" |
183 |
- |
184 |
-inherit ruby-fakegem systemd tmpfiles |
185 |
- |
186 |
-DESCRIPTION="A system automation and configuration management software." |
187 |
-HOMEPAGE="https://puppet.com/" |
188 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
189 |
- |
190 |
-LICENSE="Apache-2.0 GPL-2" |
191 |
-SLOT="0" |
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 |
-ruby_add_rdepend " |
197 |
- dev-ruby/hiera |
198 |
- dev-ruby/json:= |
199 |
- dev-ruby/semantic_puppet |
200 |
- >=dev-ruby/facter-3.0.0 |
201 |
- dev-ruby/concurrent-ruby |
202 |
- augeas? ( dev-ruby/ruby-augeas ) |
203 |
- diff? ( dev-ruby/diff-lcs ) |
204 |
- doc? ( dev-ruby/rdoc ) |
205 |
- ldap? ( dev-ruby/ruby-ldap ) |
206 |
- shadow? ( dev-ruby/ruby-shadow ) |
207 |
- sqlite? ( dev-ruby/sqlite3 ) |
208 |
- virtual/ruby-ssl |
209 |
- dev-ruby/hocon" |
210 |
- |
211 |
-ruby_add_bdepend " |
212 |
- doc? ( dev-ruby/yard ) |
213 |
- test? ( |
214 |
- dev-ruby/mocha |
215 |
- dev-ruby/rack |
216 |
- dev-ruby/rspec-its |
217 |
- )" |
218 |
-# this should go in the above lists, but isn't because of test deps not being keyworded |
219 |
-# dev-ruby/rspec-collection_matchers |
220 |
- |
221 |
-RDEPEND+=" ${RDEPEND} |
222 |
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
223 |
- selinux? ( |
224 |
- sys-libs/libselinux[ruby] |
225 |
- sec-policy/selinux-puppet |
226 |
- ) |
227 |
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
228 |
- >=app-portage/eix-0.18.0 |
229 |
- acct-user/puppet |
230 |
- acct-group/puppet" |
231 |
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" |
232 |
- |
233 |
-all_ruby_prepare() { |
234 |
- # Avoid spec that require unpackaged json-schema. |
235 |
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
236 |
- |
237 |
- # fix systemd path |
238 |
- eapply -p0 "${FILESDIR}/puppet-systemd.patch" |
239 |
- |
240 |
- # Avoid specs that can only run in the puppet.git repository. This |
241 |
- # should be narrowed down to the specific specs. |
242 |
- rm spec/integration/parser/compiler_spec.rb || die |
243 |
- |
244 |
- # Avoid failing spec that need further investigation. |
245 |
- rm spec/unit/module_tool/metadata_spec.rb || die |
246 |
-} |
247 |
- |
248 |
-each_ruby_install() { |
249 |
- each_fakegem_install |
250 |
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
251 |
-} |
252 |
- |
253 |
-all_ruby_install() { |
254 |
- all_fakegem_install |
255 |
- |
256 |
- # systemd stuffs |
257 |
- systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
258 |
- |
259 |
- # tmpfiles stuff |
260 |
- newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf" |
261 |
- |
262 |
- # openrc init stuff |
263 |
- newinitd "${FILESDIR}"/puppet.init-4.x puppet |
264 |
- |
265 |
- keepdir /etc/puppetlabs/puppet/ssl |
266 |
- |
267 |
- keepdir /var/lib/puppet/facts |
268 |
- keepdir /var/lib/puppet/files |
269 |
- fowners -R puppet:puppet /var/lib/puppet |
270 |
- |
271 |
- fperms 0750 /var/lib/puppet |
272 |
- |
273 |
- fperms 0750 /etc/puppetlabs |
274 |
- fperms 0750 /etc/puppetlabs/puppet |
275 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
276 |
- fowners -R :puppet /etc/puppetlabs |
277 |
- fowners -R :puppet /var/lib/puppet |
278 |
- |
279 |
- if use ldap ; then |
280 |
- insinto /etc/openldap/schema |
281 |
- doins ext/ldap/puppet.schema |
282 |
- fi |
283 |
- |
284 |
- # ext and examples files |
285 |
- for f in $(find ext examples -type f) ; do |
286 |
- docinto "$(dirname ${f})" |
287 |
- dodoc "${f}" |
288 |
- done |
289 |
-} |
290 |
- |
291 |
-pkg_postinst() { |
292 |
- tmpfiles_process puppet.conf |
293 |
- |
294 |
- elog |
295 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
296 |
- elog "cause puppet to hang while installing packages." |
297 |
- elog |
298 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
299 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
300 |
- elog |
301 |
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
302 |
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
303 |
- elog "not already done so." |
304 |
- elog |
305 |
-} |