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: Tue, 02 Jun 2020 00:13:33
Message-Id: 1591056800.b4f16ac05ba09d575591f0d9e2879daf77f31205.prometheanfire@gentoo
1 commit: b4f16ac05ba09d575591f0d9e2879daf77f31205
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 2 00:09:28 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 2 00:13:20 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f16ac0
7
8 app-admin/puppet: 6.15.0 stable amd64/x86 with cleanup
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 app-admin/puppet/Manifest | 1 -
14 app-admin/puppet/puppet-6.14.0.ebuild | 136 ----------------------------------
15 app-admin/puppet/puppet-6.15.0.ebuild | 2 +-
16 3 files changed, 1 insertion(+), 138 deletions(-)
17
18 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
19 index 6502e552786..ae545332efe 100644
20 --- a/app-admin/puppet/Manifest
21 +++ b/app-admin/puppet/Manifest
22 @@ -1,4 +1,3 @@
23 DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
24 DIST puppet-5.5.20.tar.gz 2995117 BLAKE2B f147be28967da748bf8d5f7250eae9045caafaa3925f850cc0a77acc19a6a47ed92d4ec81278334608839f6f8c83cab19324f2753bc05d3a042a3bfaccb72a46 SHA512 83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4
25 -DIST puppet-6.14.0.tar.gz 2842351 BLAKE2B db9a467d8e0f4f25d45c2f735ee9d11ac6ed4e47c16b95ded3ff9f1c5055ea866735bcda27c19c2988035d9592035e433ef0d79a19781c99f4e97388edf46b93 SHA512 066ad8de6393cb58b1f92fae450dc72dabcbe912cdbb3417848a66955fe17696a68abf67d86b107a2b1c54e7037d38da7264a9234a8833b56065c8e407ff57a4
26 DIST puppet-6.15.0.tar.gz 2880562 BLAKE2B 082f6a6b0ee56cdb1cd98b8cade8b07b7970ae0a78a9cf7c80e9af945eb722ad156b28004ad565c51750a63fa5932e99b1dd39ac0d4008d3ed225868e7671a31 SHA512 ac7e17bd87ee924fd928d565389b424ff2ed45b9b08e1be4eff4dec3688545657e2dfede46adeb48faecf3875c640c99b07ed6e09906b3e66b4654bb984d9296
27
28 diff --git a/app-admin/puppet/puppet-6.14.0.ebuild b/app-admin/puppet/puppet-6.14.0.ebuild
29 deleted file mode 100644
30 index 11fd2d3c508..00000000000
31 --- a/app-admin/puppet/puppet-6.14.0.ebuild
32 +++ /dev/null
33 @@ -1,136 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="6"
38 -
39 -USE_RUBY="ruby24 ruby25 ruby26 ruby27"
40 -
41 -RUBY_FAKEGEM_RECIPE_TEST="rspec3"
42 -
43 -RUBY_FAKEGEM_TASK_DOC="doc:all"
44 -
45 -RUBY_FAKEGEM_EXTRAINSTALL="locales"
46 -
47 -inherit eutils ruby-fakegem eapi7-ver
48 -
49 -DESCRIPTION="A system automation and configuration management software."
50 -HOMEPAGE="https://puppet.com/"
51 -SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
52 -
53 -LICENSE="Apache-2.0 GPL-2"
54 -SLOT="0"
55 -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
56 -IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
57 -RESTRICT="test"
58 -
59 -ruby_add_rdepend "
60 - dev-ruby/hiera
61 - dev-ruby/json:=
62 - dev-ruby/semantic_puppet
63 - >=dev-ruby/facter-3.0.0
64 - dev-ruby/concurrent-ruby
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 - acct-user/puppet
93 - acct-group/puppet"
94 -PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
95 -
96 -all_ruby_prepare() {
97 - # Avoid spec that require unpackaged json-schema.
98 - rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
99 -
100 - # can't be run within portage.
101 - epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
102 -
103 - # fix systemd path
104 - epatch "${FILESDIR}/puppet-systemd.patch"
105 -
106 - # Avoid specs that can only run in the puppet.git repository. This
107 - # should be narrowed down to the specific specs.
108 - rm spec/integration/parser/compiler_spec.rb || die
109 -
110 - # Avoid failing spec that need further investigation.
111 - rm spec/unit/module_tool/metadata_spec.rb || die
112 -}
113 -
114 -each_ruby_install() {
115 - each_fakegem_install
116 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
117 -}
118 -
119 -all_ruby_install() {
120 - all_fakegem_install
121 -
122 - # systemd stuffs
123 - insinto /usr/lib/systemd/system
124 - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
125 -
126 - # tmpfiles stuff
127 - insinto /usr/lib/tmpfiles.d
128 - newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
129 -
130 - # openrc init stuff
131 - newinitd "${FILESDIR}"/puppet.init-4.x puppet
132 -
133 - keepdir /etc/puppetlabs/puppet/ssl
134 -
135 - keepdir /var/lib/puppet/facts
136 - keepdir /var/lib/puppet/files
137 - fowners -R puppet:puppet /var/lib/puppet
138 -
139 - fperms 0750 /var/lib/puppet
140 -
141 - fperms 0750 /etc/puppetlabs
142 - fperms 0750 /etc/puppetlabs/puppet
143 - fperms 0750 /etc/puppetlabs/puppet/ssl
144 - fowners -R :puppet /etc/puppetlabs
145 - fowners -R :puppet /var/lib/puppet
146 -
147 - if use ldap ; then
148 - insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
149 - fi
150 -
151 - # ext and examples files
152 - for f in $(find ext examples -type f) ; do
153 - docinto "$(dirname ${f})"; dodoc "${f}"
154 - done
155 -}
156 -
157 -pkg_postinst() {
158 - elog
159 - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
160 - elog "cause puppet to hang while installing packages."
161 - elog
162 - elog "Portage Puppet module with Gentoo-specific resources:"
163 - elog "http://forge.puppetlabs.com/gentoo/portage"
164 - elog
165 - elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
166 - elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
167 - elog "not already done so."
168 - elog
169 -}
170
171 diff --git a/app-admin/puppet/puppet-6.15.0.ebuild b/app-admin/puppet/puppet-6.15.0.ebuild
172 index f50ee1410b0..11fd2d3c508 100644
173 --- a/app-admin/puppet/puppet-6.15.0.ebuild
174 +++ b/app-admin/puppet/puppet-6.15.0.ebuild
175 @@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
176
177 LICENSE="Apache-2.0 GPL-2"
178 SLOT="0"
179 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
180 +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
181 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
182 RESTRICT="test"