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