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: Wed, 01 May 2019 00:15:30
Message-Id: 1556669711.eb1985a89363b835f4deefe753cbce98899c2e67.prometheanfire@gentoo
1 commit: eb1985a89363b835f4deefe753cbce98899c2e67
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 1 00:01:10 2019 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed May 1 00:15:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1985a8
7
8 app-admin/puppet: 5.5.14 and 6.4.2 bump
9
10 Package-Manager: Portage-2.3.62, 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.14.ebuild | 144 ++++++++++++++++++++++++++++++++++
15 app-admin/puppet/puppet-6.4.2.ebuild | 138 ++++++++++++++++++++++++++++++++
16 3 files changed, 284 insertions(+)
17
18 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
19 index db72122e4a6..52c8336dd41 100644
20 --- a/app-admin/puppet/Manifest
21 +++ b/app-admin/puppet/Manifest
22 @@ -1,4 +1,6 @@
23 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
24 DIST puppet-5.5.12.tar.gz 3073481 BLAKE2B 8044af48e7d86e754f767b42199814ff9b2dcda04f1e13920cea332ae79b23997cc1a17fe761bb5216d174bc5d77c244a9eba7752c004bf1558a648c334f698a SHA512 33d844d671710adae1dbe184981143883bf4f3ac1516f8aedd1cd8d30157bc947a3a66df30c10a2357a8cb42dafe02a80a24007312b2107c68350ed0871a3249
25 +DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
26 DIST puppet-6.3.0.tar.gz 2831909 BLAKE2B ccf6353c0fc1fcdd4ac06e79bd8d91980162b8f1b2012fc2bfc1cdea3d2d6b22bf55216cea9b94a4024273ca9f76eedcc92a861de9db348408a361596033b51c SHA512 1d30706049fe378facddb923a9ecb521d37faa84740251602ac340ea1299c247252fbdaca17f1ea450ff716ab26ac4e9524f1137080318e6d9237a9e2699f6b8
27 DIST puppet-6.4.1.tar.gz 2893151 BLAKE2B 5c48b30083f93ce3625551020cc3b386cbc4ca8ab249099249099dc7aa8866186c197732ad603366d5fa54c3fc1664d7b457d323a2e6d9266faa754f7d4fa4ca SHA512 260f933dac3a3033e807c5b7c63d5562d9d8d29d11550efd38b0a94eac811f27444156cc11db38da170dc2369981072288df471fd05738a0f0e951bbdffe2a52
28 +DIST puppet-6.4.2.tar.gz 2891159 BLAKE2B dfd8e5d9935d54272096fac66a037b8eab75dedc42caf18bafe29738e749a66869ad2e741753e8b38d872e21b1a261f2b4017c54faa57043754d619cf27652ed SHA512 7ec2746ef2a021d1cc3e3076840a9f1195fe51ba591cf2907e542b3f450cb1f4002fa3c958aee966c5976245073ba3cfacc9fd2a653d1d823720b33984aff911
29
30 diff --git a/app-admin/puppet/puppet-5.5.14.ebuild b/app-admin/puppet/puppet-5.5.14.ebuild
31 new file mode 100644
32 index 00000000000..7f380bcc3fa
33 --- /dev/null
34 +++ b/app-admin/puppet/puppet-5.5.14.ebuild
35 @@ -0,0 +1,144 @@
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="http://puppetlabs.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/facter-3.0.0
65 + augeas? ( dev-ruby/ruby-augeas )
66 + diff? ( dev-ruby/diff-lcs )
67 + doc? ( dev-ruby/rdoc )
68 + ldap? ( dev-ruby/ruby-ldap )
69 + shadow? ( dev-ruby/ruby-shadow )
70 + sqlite? ( dev-ruby/sqlite3 )
71 + virtual/ruby-ssl
72 + dev-ruby/hocon"
73 +
74 +ruby_add_bdepend "
75 + doc? ( dev-ruby/yard )
76 + test? (
77 + dev-ruby/mocha
78 + dev-ruby/rack
79 + dev-ruby/rspec-its
80 + )"
81 +# this should go in the above lists, but isn't because of test deps not being keyworded
82 +# dev-ruby/rspec-collection_matchers
83 +
84 +RDEPEND+=" ${RDEPEND}
85 + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
86 + selinux? (
87 + sys-libs/libselinux[ruby]
88 + sec-policy/selinux-puppet
89 + )
90 + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
91 + >=app-portage/eix-0.18.0"
92 +PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
93 +
94 +pkg_setup() {
95 + enewgroup puppet
96 + enewuser puppet -1 -1 /var/lib/puppet puppet
97 +}
98 +
99 +all_ruby_prepare() {
100 + # Avoid spec that require unpackaged json-schema.
101 + rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
102 +
103 + # can't be run within portage.
104 + epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
105 +
106 + # fix systemd path
107 + epatch "${FILESDIR}/puppet-systemd.patch"
108 +
109 + # Avoid specs that can only run in the puppet.git repository. This
110 + # should be narrowed down to the specific specs.
111 + rm spec/integration/parser/compiler_spec.rb || die
112 +
113 + # Avoid failing spec that need further investigation.
114 + rm spec/unit/module_tool/metadata_spec.rb || die
115 +}
116 +
117 +each_ruby_install() {
118 + each_fakegem_install
119 +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
120 +}
121 +
122 +all_ruby_install() {
123 + all_fakegem_install
124 +
125 + # systemd stuffs
126 + insinto /usr/lib/systemd/system
127 + doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
128 +
129 + # tmpfiles stuff
130 + insinto /usr/lib/tmpfiles.d
131 + newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
132 +
133 + # openrc init stuff
134 + newinitd "${FILESDIR}"/puppet.init-4.x puppet
135 + newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
136 + newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
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 +
171 + for v in ${REPLACING_VERSIONS}; do
172 + if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
173 + elog
174 + elog "Please see the following url for the release notes for puppet-5"
175 + elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
176 + elog
177 + fi
178 + done
179 +}
180
181 diff --git a/app-admin/puppet/puppet-6.4.2.ebuild b/app-admin/puppet/puppet-6.4.2.ebuild
182 new file mode 100644
183 index 00000000000..0fa5d710120
184 --- /dev/null
185 +++ b/app-admin/puppet/puppet-6.4.2.ebuild
186 @@ -0,0 +1,138 @@
187 +# Copyright 1999-2019 Gentoo Authors
188 +# Distributed under the terms of the GNU General Public License v2
189 +
190 +EAPI="6"
191 +
192 +USE_RUBY="ruby23 ruby24 ruby25"
193 +
194 +RUBY_FAKEGEM_RECIPE_TEST="rspec3"
195 +
196 +RUBY_FAKEGEM_TASK_DOC="doc:all"
197 +
198 +RUBY_FAKEGEM_EXTRAINSTALL="locales"
199 +
200 +inherit eutils user ruby-fakegem eapi7-ver
201 +
202 +DESCRIPTION="A system automation and configuration management software."
203 +HOMEPAGE="http://puppetlabs.com/"
204 +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
205 +
206 +LICENSE="Apache-2.0 GPL-2"
207 +SLOT="0"
208 +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
209 +IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
210 +RESTRICT="test"
211 +
212 +ruby_add_rdepend "
213 + dev-ruby/hiera
214 + dev-ruby/json:=
215 + dev-ruby/semantic_puppet
216 + >=dev-ruby/facter-3.0.0
217 + augeas? ( dev-ruby/ruby-augeas )
218 + diff? ( dev-ruby/diff-lcs )
219 + doc? ( dev-ruby/rdoc )
220 + ldap? ( dev-ruby/ruby-ldap )
221 + shadow? ( dev-ruby/ruby-shadow )
222 + sqlite? ( dev-ruby/sqlite3 )
223 + virtual/ruby-ssl
224 + dev-ruby/hocon"
225 +
226 +ruby_add_bdepend "
227 + doc? ( dev-ruby/yard )
228 + test? (
229 + dev-ruby/mocha
230 + dev-ruby/rack
231 + dev-ruby/rspec-its
232 + )"
233 +# this should go in the above lists, but isn't because of test deps not being keyworded
234 +# dev-ruby/rspec-collection_matchers
235 +
236 +RDEPEND+=" ${RDEPEND}
237 + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
238 + selinux? (
239 + sys-libs/libselinux[ruby]
240 + sec-policy/selinux-puppet
241 + )
242 + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
243 + >=app-portage/eix-0.18.0"
244 +PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
245 +
246 +pkg_setup() {
247 + enewgroup puppet
248 + enewuser puppet -1 -1 /var/lib/puppet puppet
249 +}
250 +
251 +all_ruby_prepare() {
252 + # Avoid spec that require unpackaged json-schema.
253 + rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
254 +
255 + # can't be run within portage.
256 + epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
257 +
258 + # fix systemd path
259 + epatch "${FILESDIR}/puppet-systemd.patch"
260 +
261 + # Avoid specs that can only run in the puppet.git repository. This
262 + # should be narrowed down to the specific specs.
263 + rm spec/integration/parser/compiler_spec.rb || die
264 +
265 + # Avoid failing spec that need further investigation.
266 + rm spec/unit/module_tool/metadata_spec.rb || die
267 +}
268 +
269 +each_ruby_install() {
270 + each_fakegem_install
271 +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
272 +}
273 +
274 +all_ruby_install() {
275 + all_fakegem_install
276 +
277 + # systemd stuffs
278 + insinto /usr/lib/systemd/system
279 + doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
280 +
281 + # tmpfiles stuff
282 + insinto /usr/lib/tmpfiles.d
283 + newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
284 +
285 + # openrc init stuff
286 + newinitd "${FILESDIR}"/puppet.init-4.x puppet
287 +
288 + keepdir /etc/puppetlabs/puppet/ssl
289 +
290 + keepdir /var/lib/puppet/facts
291 + keepdir /var/lib/puppet/files
292 + fowners -R puppet:puppet /var/lib/puppet
293 +
294 + fperms 0750 /var/lib/puppet
295 +
296 + fperms 0750 /etc/puppetlabs
297 + fperms 0750 /etc/puppetlabs/puppet
298 + fperms 0750 /etc/puppetlabs/puppet/ssl
299 + fowners -R :puppet /etc/puppetlabs
300 + fowners -R :puppet /var/lib/puppet
301 +
302 + if use ldap ; then
303 + insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
304 + fi
305 +
306 + # ext and examples files
307 + for f in $(find ext examples -type f) ; do
308 + docinto "$(dirname ${f})"; dodoc "${f}"
309 + done
310 +}
311 +
312 +pkg_postinst() {
313 + elog
314 + elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
315 + elog "cause puppet to hang while installing packages."
316 + elog
317 + elog "Portage Puppet module with Gentoo-specific resources:"
318 + elog "http://forge.puppetlabs.com/gentoo/portage"
319 + elog
320 + elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
321 + elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
322 + elog "not already done so."
323 + elog
324 +}