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