Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/
Date: Thu, 27 Jul 2017 19:15:17
Message-Id: 1501182879.26b90f6fbeef34eac6c562bff4def2008d12fecf.prometheanfire@gentoo
1 commit: 26b90f6fbeef34eac6c562bff4def2008d12fecf
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 27 18:53:41 2017 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 27 19:14:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b90f6f
7
8 app-admin/puppet: 4.10.5 bup
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 app-admin/puppet/Manifest | 1 +
13 app-admin/puppet/puppet-4.10.5.ebuild | 192 ++++++++++++++++++++++++++++++++++
14 2 files changed, 193 insertions(+)
15
16 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
17 index 7472cff5a84..7440628d92c 100644
18 --- a/app-admin/puppet/Manifest
19 +++ b/app-admin/puppet/Manifest
20 @@ -1,6 +1,7 @@
21 DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618 WHIRLPOOL 6e3b754f9e6f40c6037652dc7d746e616871a653640e2a91ab7dd3e70b4240c0b377d0f79c543ca95c5d661046c6431e30f263e0f18998cac0ca3089a4634273
22 DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
23 DIST puppet-4.10.4.tar.gz 2968202 SHA256 59b8510ddf2f49342a39ccbe26bc7b2ea5e16d79de9dd572d929de58967aab90 SHA512 e7a47c95a30ccfe31ff6a245ce5df0e2aa1d6b1f07fd70623e40e1822c3df9322a87bcd6e624b4483c7b90756ef3ed34242aa9c6a880df57ff65918c4d31267f WHIRLPOOL f808cb84cebae7294f887fdb3ac0005b4129fca368cc58dcc0e558fa2dbd185b1f416ace96b7428ad7577fc3df45edf1fab0c150880d1205e0e3d1a9afcc7072
24 +DIST puppet-4.10.5.tar.gz 2976455 SHA256 656a64e158c1453087099096d035adae53263dae752d3bac3c8fe0250b3894d1 SHA512 655a89dc5605f722389fbccc3fdfe5304220a45678f6d087170ba77d70a4d8574f9d7d9aadfe331107dbf663dee8ef920775fafebe63d22e91c739402abd419a WHIRLPOOL 87d63967afd7ab7bcd3e4e5ae082fc989b52606c0432d20e9060836d3eecc8966745201c5b88092d1d2003809be2ed736d6e98a893593a30db81ebb88df21ec1
25 DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
26 DIST puppet-4.9.1.tar.gz 2912770 SHA256 db02cffb8339b349bd1ab2b15899511d3f5d449f0f591038256f0fb862f4c7db SHA512 db2bd324e4f58c583debe417ca233c613c296aa8824520c5373c8da45056ae9d09e54ceecba5c6b7d0250ea7228d6e1b83e5b690b1203de43dca8942c8f24ce2 WHIRLPOOL fd5554d5de319f8534fbada7ae6f4100d6de5a98f6646985e21c250a52a3d415ac31fc46c15c987bd7bcbc688bc8bb4d7dc9d37ebd93ecd183b3bd01d3426687
27 DIST puppet-5.0.0.tar.gz 2706319 SHA256 09ae5b56ff799ccfd78e3a1999aa27d6f2bf69a7a5ed19bd758cf88c17a004ab SHA512 4423001340623d00a72de16e7b585ce3874019b020b91abd4edb9b9a524bd0d709107bee4dfcdf20b2eaf99e67b3401e2883ea297659ad1debfea8fb33a665bd WHIRLPOOL 66bbb279fb9d646ada78ce28af3d2377abf63ce059b9e61ee15fc0b3b48796ea0f708f5f2c380e5dd986d4469f6a8b73606c61dfc3280aca5913d9c7fffa4f2f
28
29 diff --git a/app-admin/puppet/puppet-4.10.5.ebuild b/app-admin/puppet/puppet-4.10.5.ebuild
30 new file mode 100644
31 index 00000000000..9709758f904
32 --- /dev/null
33 +++ b/app-admin/puppet/puppet-4.10.5.ebuild
34 @@ -0,0 +1,192 @@
35 +# Copyright 1999-2017 Gentoo Foundation
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI="6"
39 +
40 +USE_RUBY="ruby21 ruby22 ruby23"
41 +
42 +#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
43 +
44 +inherit xemacs-elisp-common eutils user ruby-fakegem versionator
45 +
46 +DESCRIPTION="A system automation and configuration management software."
47 +HOMEPAGE="http://puppetlabs.com/"
48 +SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
49 +
50 +LICENSE="Apache-2.0 GPL-2"
51 +SLOT="0"
52 +KEYWORDS="~amd64 ~hppa ~ppc ~x86"
53 +IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
54 +RESTRICT="test"
55 +
56 +ruby_add_rdepend "
57 + dev-ruby/hiera
58 + >=dev-ruby/rgen-0.6.5
59 + dev-ruby/json:=
60 + >=dev-ruby/facter-3.0.0
61 + augeas? ( dev-ruby/ruby-augeas )
62 + diff? ( dev-ruby/diff-lcs )
63 + doc? ( dev-ruby/rdoc )
64 + ldap? ( dev-ruby/ruby-ldap )
65 + shadow? ( dev-ruby/ruby-shadow )
66 + sqlite? ( dev-ruby/sqlite3 )
67 + virtual/ruby-ssl"
68 +
69 +# ruby_add_bdepend "
70 +# test? (
71 +# dev-ruby/mocha:0.14
72 +# =dev-ruby/rack-1*
73 +# dev-ruby/rspec-its
74 +# dev-ruby/rspec-collection_matchers
75 +# >=dev-ruby/vcr-2.9:2
76 +# >=dev-ruby/webmock-1.24:0
77 +# )"
78 +
79 +DEPEND+=" ${DEPEND}
80 + xemacs? ( app-editors/xemacs )"
81 +RDEPEND+=" ${RDEPEND}
82 + rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
83 + selinux? (
84 + sys-libs/libselinux[ruby]
85 + sec-policy/selinux-puppet
86 + )
87 + vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
88 + >=app-portage/eix-0.18.0"
89 +PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
90 +
91 +SITEFILE="50${PN}-mode-gentoo.el"
92 +
93 +pkg_setup() {
94 + enewgroup puppet
95 + enewuser puppet -1 -1 /var/lib/puppet puppet
96 +}
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 + # can't be run within portage.
103 + epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
104 +
105 + # fix systemd path
106 + epatch "${FILESDIR}/puppet-systemd.patch"
107 +
108 + if use experimental; then
109 + epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
110 + fi
111 +
112 + # Use working version of mocha
113 + sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
114 +
115 + # Avoid specs that can only run in the puppet.git repository. This
116 + # should be narrowed down to the specific specs.
117 + rm spec/integration/parser/compiler_spec.rb || die
118 +
119 + # Avoid failing specs that need further investigation.
120 + sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \
121 + spec/integration/indirector/facts/facter_spec.rb || die
122 + sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die
123 + rm -f spec/unit/indirector/ldap_spec.rb \
124 + spec/unit/parser/functions/create_resources_spec.rb || die
125 +
126 + # Avoid specs that rely on tools from other OSs
127 + rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
128 + spec/unit/provider/user/directoryservice_spec.rb || die
129 +
130 + # Avoid specs that depend on hiera-eyaml to avoid circular
131 + # dependencies
132 + rm -f spec/unit/functions/lookup_spec.rb || die
133 +
134 + # Avoid specs that fail due to an unpackaged file
135 + sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
136 +}
137 +
138 +all_ruby_compile() {
139 + if use xemacs ; then
140 + # Create a separate version for xemacs to be able to install
141 + # emacs and xemacs in parallel.
142 + mkdir ext/xemacs
143 + cp ext/emacs/* ext/xemacs/
144 + xemacs-elisp-compile ext/xemacs/puppet-mode.el
145 + fi
146 +}
147 +
148 +each_ruby_install() {
149 + each_fakegem_install
150 +# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
151 +}
152 +
153 +all_ruby_install() {
154 + all_fakegem_install
155 +
156 + # systemd stuffs
157 + insinto /usr/lib/systemd/system
158 + doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
159 +
160 + # tmpfiles stuff
161 + insinto /usr/lib/tmpfiles.d
162 + newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
163 +
164 + # openrc init stuff
165 + newinitd "${FILESDIR}"/puppet.init-4.x puppet
166 + newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
167 + newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
168 +
169 + keepdir /etc/puppetlabs/puppet/ssl
170 +
171 + keepdir /var/lib/puppet/facts
172 + keepdir /var/lib/puppet/files
173 + fowners -R puppet:puppet /var/lib/puppet
174 +
175 + fperms 0750 /var/lib/puppet
176 +
177 + fperms 0750 /etc/puppetlabs
178 + fperms 0750 /etc/puppetlabs/puppet
179 + fperms 0750 /etc/puppetlabs/puppet/ssl
180 + fowners -R :puppet /etc/puppetlabs
181 + fowners -R :puppet /var/lib/puppet
182 +
183 + if use xemacs ; then
184 + xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
185 + xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
186 + fi
187 +
188 + if use ldap ; then
189 + insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
190 + fi
191 +
192 + # ext and examples files
193 + for f in $(find ext examples -type f) ; do
194 + docinto "$(dirname ${f})"; dodoc "${f}"
195 + done
196 +}
197 +
198 +pkg_postinst() {
199 + elog
200 + elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
201 + elog "cause puppet to hang while installing packages."
202 + elog
203 + elog "Portage Puppet module with Gentoo-specific resources:"
204 + elog "http://forge.puppetlabs.com/gentoo/portage"
205 + elog
206 +
207 + local v
208 + for v in ${REPLACING_VERSIONS}; do
209 + if [ "$(get_major_version $v)" = "3" ]; then
210 + elog
211 + elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
212 + elog "/etc/puppetlabs/puppet"
213 + elog "Also, puppet now uses config directories for modules and manifests."
214 + elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
215 + elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
216 + elog "for more information."
217 + elog
218 + fi
219 + done
220 +
221 + use xemacs && xemacs-elisp-site-regen
222 +}
223 +
224 +pkg_postrm() {
225 + use xemacs && xemacs-elisp-site-regen
226 +}