1 |
commit: a8d5d6b6cc73283f9d7fc97e38b2b6604e9487b1 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 28 15:46:42 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 28 15:51:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d5d6b6 |
7 |
|
8 |
app-admin/puppet: 7.6.1 stable amd64/x86 with cleanup of 7.4.0 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppet/Manifest | 1 - |
14 |
app-admin/puppet/puppet-7.4.0.ebuild | 130 ----------------------------------- |
15 |
app-admin/puppet/puppet-7.6.1.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 132 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest |
19 |
index e0e356db3ba..5f75b21b450 100644 |
20 |
--- a/app-admin/puppet/Manifest |
21 |
+++ b/app-admin/puppet/Manifest |
22 |
@@ -1,6 +1,5 @@ |
23 |
DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3 |
24 |
DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58 |
25 |
DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01 |
26 |
-DIST puppet-7.4.0.tar.gz 2857763 BLAKE2B 980180d10c3329f8c94f02c6a8b403d88a3836fcc5567fd00eb4e2b4ae63d7a03709f3f14a337cdface62be04f9bb9082436f69b95f8d37996a9a933801a163a SHA512 ffb4ffb5121fcbd4b61ab1ad51fce96c1f2415b85ec785c858721a7f5604a6a8de4d595b6806657b9b1757e70763b2c495ca4d8ee694d668532cd15dd38a9c7f |
27 |
DIST puppet-7.5.0.tar.gz 2859905 BLAKE2B 59c6b8fee0ce13b1aeb7a59eab21e84835682e606598dac79a838d514352988d260f610aef0f0b00547a141c503f8779668006d109c3ad86133f413b57309adc SHA512 7b3ac681a91160055e4b26c904153b0800f55222201a83e8e5f20d74a7ef153e6b029ab59b237726f20576379ea7d81e64e24126e72e8f709bbc6473c3c0793b |
28 |
DIST puppet-7.6.1.tar.gz 2861371 BLAKE2B acc117a03906d710329dcd4bc3881bc9792640b4685ffb771e67e819cf21705b1635178ec527b6548245b8312c3625622827fa744227d79a81af9bae194938a9 SHA512 f7b7265f5ffca4e342e0f687cf4fbf7704c6518025d178925ae04b8902a2df2ceaa76179ecd5a1c1eb3456e29c049f701e8b45c8da7dc3b0a8948ef85ee3268a |
29 |
|
30 |
diff --git a/app-admin/puppet/puppet-7.4.0.ebuild b/app-admin/puppet/puppet-7.4.0.ebuild |
31 |
deleted file mode 100644 |
32 |
index 4feaa50a174..00000000000 |
33 |
--- a/app-admin/puppet/puppet-7.4.0.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,130 +0,0 @@ |
36 |
-# Copyright 1999-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI="6" |
40 |
- |
41 |
-USE_RUBY="ruby24 ruby25 ruby26 ruby27" |
42 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
43 |
-RUBY_FAKEGEM_TASK_DOC="doc:all" |
44 |
-RUBY_FAKEGEM_EXTRAINSTALL="locales" |
45 |
- |
46 |
-inherit epatch ruby-fakegem |
47 |
- |
48 |
-DESCRIPTION="A system automation and configuration management software." |
49 |
-HOMEPAGE="https://puppet.com/" |
50 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
51 |
- |
52 |
-LICENSE="Apache-2.0 GPL-2" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
55 |
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
56 |
-RESTRICT="test" |
57 |
- |
58 |
-ruby_add_rdepend " |
59 |
- dev-ruby/hiera |
60 |
- dev-ruby/json:= |
61 |
- dev-ruby/semantic_puppet |
62 |
- >=dev-ruby/facter-3.0.0 |
63 |
- dev-ruby/concurrent-ruby |
64 |
- augeas? ( dev-ruby/ruby-augeas ) |
65 |
- diff? ( dev-ruby/diff-lcs ) |
66 |
- doc? ( dev-ruby/rdoc ) |
67 |
- ldap? ( dev-ruby/ruby-ldap ) |
68 |
- shadow? ( dev-ruby/ruby-shadow ) |
69 |
- sqlite? ( dev-ruby/sqlite3 ) |
70 |
- virtual/ruby-ssl |
71 |
- dev-ruby/hocon" |
72 |
- |
73 |
-ruby_add_bdepend " |
74 |
- doc? ( dev-ruby/yard ) |
75 |
- test? ( |
76 |
- dev-ruby/mocha |
77 |
- dev-ruby/rack |
78 |
- dev-ruby/rspec-its |
79 |
- )" |
80 |
-# this should go in the above lists, but isn't because of test deps not being keyworded |
81 |
-# dev-ruby/rspec-collection_matchers |
82 |
- |
83 |
-RDEPEND+=" ${RDEPEND} |
84 |
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
85 |
- selinux? ( |
86 |
- sys-libs/libselinux[ruby] |
87 |
- sec-policy/selinux-puppet |
88 |
- ) |
89 |
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
90 |
- >=app-portage/eix-0.18.0 |
91 |
- acct-user/puppet |
92 |
- acct-group/puppet" |
93 |
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" |
94 |
- |
95 |
-all_ruby_prepare() { |
96 |
- # Avoid spec that require unpackaged json-schema. |
97 |
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
98 |
- |
99 |
- # fix systemd path |
100 |
- epatch "${FILESDIR}/puppet-systemd.patch" |
101 |
- |
102 |
- # Avoid specs that can only run in the puppet.git repository. This |
103 |
- # should be narrowed down to the specific specs. |
104 |
- rm spec/integration/parser/compiler_spec.rb || die |
105 |
- |
106 |
- # Avoid failing spec that need further investigation. |
107 |
- rm spec/unit/module_tool/metadata_spec.rb || die |
108 |
-} |
109 |
- |
110 |
-each_ruby_install() { |
111 |
- each_fakegem_install |
112 |
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
113 |
-} |
114 |
- |
115 |
-all_ruby_install() { |
116 |
- all_fakegem_install |
117 |
- |
118 |
- # systemd stuffs |
119 |
- insinto /usr/lib/systemd/system |
120 |
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
121 |
- |
122 |
- # tmpfiles stuff |
123 |
- insinto /usr/lib/tmpfiles.d |
124 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
125 |
- |
126 |
- # openrc init stuff |
127 |
- newinitd "${FILESDIR}"/puppet.init-4.x puppet |
128 |
- |
129 |
- keepdir /etc/puppetlabs/puppet/ssl |
130 |
- |
131 |
- keepdir /var/lib/puppet/facts |
132 |
- keepdir /var/lib/puppet/files |
133 |
- fowners -R puppet:puppet /var/lib/puppet |
134 |
- |
135 |
- fperms 0750 /var/lib/puppet |
136 |
- |
137 |
- fperms 0750 /etc/puppetlabs |
138 |
- fperms 0750 /etc/puppetlabs/puppet |
139 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
140 |
- fowners -R :puppet /etc/puppetlabs |
141 |
- fowners -R :puppet /var/lib/puppet |
142 |
- |
143 |
- if use ldap ; then |
144 |
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
145 |
- fi |
146 |
- |
147 |
- # ext and examples files |
148 |
- for f in $(find ext examples -type f) ; do |
149 |
- docinto "$(dirname ${f})"; dodoc "${f}" |
150 |
- done |
151 |
-} |
152 |
- |
153 |
-pkg_postinst() { |
154 |
- elog |
155 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
156 |
- elog "cause puppet to hang while installing packages." |
157 |
- elog |
158 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
159 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
160 |
- elog |
161 |
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
162 |
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
163 |
- elog "not already done so." |
164 |
- elog |
165 |
-} |
166 |
|
167 |
diff --git a/app-admin/puppet/puppet-7.6.1.ebuild b/app-admin/puppet/puppet-7.6.1.ebuild |
168 |
index d241ec554c3..65ed31b7def 100644 |
169 |
--- a/app-admin/puppet/puppet-7.6.1.ebuild |
170 |
+++ b/app-admin/puppet/puppet-7.6.1.ebuild |
171 |
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
172 |
|
173 |
LICENSE="Apache-2.0 GPL-2" |
174 |
SLOT="0" |
175 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
176 |
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
177 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
178 |
RESTRICT="test" |