Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/
Date: Mon, 28 Dec 2020 07:52:59
Message-Id: 1609141877.b253636d1bd9714d7c085f510786bc243eb2c2f1.graaff@gentoo
1 commit: b253636d1bd9714d7c085f510786bc243eb2c2f1
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 28 07:51:17 2020 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 28 07:51:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b253636d
7
8 app-admin/puppet: cleanup
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
11 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
12
13 app-admin/puppet/Manifest | 1 -
14 app-admin/puppet/puppet-5.5.21.ebuild | 140 ----------------------------------
15 2 files changed, 141 deletions(-)
16
17 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
18 index cffabbeca38..d2a968cacbe 100644
19 --- a/app-admin/puppet/Manifest
20 +++ b/app-admin/puppet/Manifest
21 @@ -1,5 +1,4 @@
22 DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
23 -DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df38266b9ee8078b433860b675f36b3c4da0d13d8fb456069250e6cb6470686c83581bc6b57801a44375f829be195 SHA512 b33191c104cb58fc842d065c3cf7dec8ce723ddc9b273c930f56692e252eb6c51bc3b0442db6500cf015fe24ec3eb133428aa09d845ca92b05de2da39bce8bfd
24 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
25 DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
26 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
27
28 diff --git a/app-admin/puppet/puppet-5.5.21.ebuild b/app-admin/puppet/puppet-5.5.21.ebuild
29 deleted file mode 100644
30 index e80f5165b8c..00000000000
31 --- a/app-admin/puppet/puppet-5.5.21.ebuild
32 +++ /dev/null
33 @@ -1,140 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -USE_RUBY="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 ruby-fakegem
48 -
49 -DESCRIPTION="A system automation and configuration management software."
50 -HOMEPAGE="https://puppet.com/"
51 -SRC_URI="https://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-3.2.1:0
61 - >=dev-ruby/facter-3.0.0
62 - >=dev-ruby/fast_gettext-1.1.2:0
63 - >=dev-ruby/locale-2.1:0
64 - >=dev-ruby/multi_json-1.10: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 - 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 - # fix systemd path
101 - eapply -p0 "${FILESDIR}/puppet-systemd.patch"
102 -
103 - # Avoid specs that can only run in the puppet.git repository. This
104 - # should be narrowed down to the specific specs.
105 - rm spec/integration/parser/compiler_spec.rb || die
106 -
107 - # Avoid failing spec that need further investigation.
108 - rm spec/unit/module_tool/metadata_spec.rb || die
109 -}
110 -
111 -each_ruby_install() {
112 - each_fakegem_install
113 -# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
114 -}
115 -
116 -all_ruby_install() {
117 - all_fakegem_install
118 -
119 - # systemd stuffs
120 - insinto /usr/lib/systemd/system
121 - doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
122 -
123 - # tmpfiles stuff
124 - insinto /usr/lib/tmpfiles.d
125 - newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
126 -
127 - # openrc init stuff
128 - newinitd "${FILESDIR}"/puppet.init-4.x puppet
129 - newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
130 - newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
131 -
132 - keepdir /etc/puppetlabs/puppet/ssl
133 -
134 - keepdir /var/lib/puppet/facts
135 - keepdir /var/lib/puppet/files
136 - fowners -R puppet:puppet /var/lib/puppet
137 -
138 - fperms 0750 /var/lib/puppet
139 -
140 - fperms 0750 /etc/puppetlabs
141 - fperms 0750 /etc/puppetlabs/puppet
142 - fperms 0750 /etc/puppetlabs/puppet/ssl
143 - fowners -R :puppet /etc/puppetlabs
144 - fowners -R :puppet /var/lib/puppet
145 -
146 - if use ldap ; then
147 - insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
148 - fi
149 -
150 - # ext and examples files
151 - for f in $(find ext examples -type f) ; do
152 - docinto "$(dirname ${f})"; dodoc "${f}"
153 - done
154 -}
155 -
156 -pkg_postinst() {
157 - elog
158 - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
159 - elog "cause puppet to hang while installing packages."
160 - elog
161 - elog "Portage Puppet module with Gentoo-specific resources:"
162 - elog "http://forge.puppetlabs.com/gentoo/portage"
163 - elog
164 -
165 - for v in ${REPLACING_VERSIONS}; do
166 - if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
167 - elog
168 - elog "Please see the following url for the release notes for puppet-5"
169 - elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
170 - elog
171 - fi
172 - done
173 -}