1 |
commit: 7692ffcaf4ae9c923833c73cfd40f1c13fb701d5 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 31 23:13:27 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 31 23:13:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7692ffca |
7 |
|
8 |
app-admin/puppet: remove old versions for bug 619016 |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.4 |
11 |
|
12 |
app-admin/puppet/Manifest | 1 - |
13 |
app-admin/puppet/puppet-4.8.1.ebuild | 177 ----------------------------------- |
14 |
2 files changed, 178 deletions(-) |
15 |
|
16 |
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest |
17 |
index c05139709f4..fab5211f6f6 100644 |
18 |
--- a/app-admin/puppet/Manifest |
19 |
+++ b/app-admin/puppet/Manifest |
20 |
@@ -2,5 +2,4 @@ DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd |
21 |
DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd |
22 |
DIST puppet-4.10.6.tar.gz 2977099 SHA256 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1 WHIRLPOOL 4619f7e89a02560f2c6bd1194b1f50699348fcddf5889628884c807deb0afd9b530883d280db20086a787052d2456ef61b2eef84854e95724562f1a0225b2640 |
23 |
DIST puppet-4.10.8.tar.gz 2979824 SHA256 2a11f9230f2b681173107fcfe6574dc38d8061c7d369fa88525dfb652fb7f198 SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d WHIRLPOOL 06ed0f915786e6d0c5698a8bebfb68628d96b236b667ec44c994c043949cb4a47c8d42b2fbe8391178f38862fe816237d28501b4e39a6326d74ef2d62eb438eb |
24 |
-DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685 |
25 |
DIST puppet-5.1.0.tar.gz 2734018 SHA256 ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 WHIRLPOOL a5e4e44c68a503307b01729546121a03a0271bc68f8db139e7d52981f9ce9f6db4e24b18a252633794e7de1c7aceb6d833c817a291099081b31190060bb59d50 |
26 |
|
27 |
diff --git a/app-admin/puppet/puppet-4.8.1.ebuild b/app-admin/puppet/puppet-4.8.1.ebuild |
28 |
deleted file mode 100644 |
29 |
index e2846fe6aef..00000000000 |
30 |
--- a/app-admin/puppet/puppet-4.8.1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,177 +0,0 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI="5" |
37 |
- |
38 |
-USE_RUBY="ruby21 ruby22" |
39 |
- |
40 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
41 |
- |
42 |
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator |
43 |
- |
44 |
-DESCRIPTION="A system automation and configuration management software." |
45 |
-HOMEPAGE="http://puppetlabs.com/" |
46 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
47 |
- |
48 |
-LICENSE="Apache-2.0 GPL-2" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="amd64 hppa ~ppc ~x86" |
51 |
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs" |
52 |
-RESTRICT="test" |
53 |
- |
54 |
-ruby_add_rdepend " |
55 |
- dev-ruby/hiera |
56 |
- >=dev-ruby/rgen-0.6.5 |
57 |
- dev-ruby/json:= |
58 |
- >=dev-ruby/facter-3.0.0 |
59 |
- augeas? ( dev-ruby/ruby-augeas ) |
60 |
- diff? ( dev-ruby/diff-lcs ) |
61 |
- doc? ( dev-ruby/rdoc ) |
62 |
- ldap? ( dev-ruby/ruby-ldap ) |
63 |
- shadow? ( dev-ruby/ruby-shadow ) |
64 |
- sqlite? ( dev-ruby/sqlite3 ) |
65 |
- virtual/ruby-ssl" |
66 |
- |
67 |
-ruby_add_bdepend " |
68 |
- test? ( |
69 |
- dev-ruby/mocha |
70 |
- dev-ruby/rack |
71 |
- dev-ruby/rspec-its |
72 |
- )" |
73 |
-# this should go in the above lists, but isn't because of test deps not being keyworded |
74 |
-# dev-ruby/rspec-collection_matchers |
75 |
- |
76 |
-DEPEND+=" ${DEPEND} |
77 |
- emacs? ( virtual/emacs ) |
78 |
- xemacs? ( app-editors/xemacs )" |
79 |
-RDEPEND+=" ${RDEPEND} |
80 |
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
81 |
- selinux? ( |
82 |
- sys-libs/libselinux[ruby] |
83 |
- sec-policy/selinux-puppet |
84 |
- ) |
85 |
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
86 |
- >=app-portage/eix-0.18.0" |
87 |
- |
88 |
-SITEFILE="50${PN}-mode-gentoo.el" |
89 |
- |
90 |
-pkg_setup() { |
91 |
- enewgroup puppet |
92 |
- enewuser puppet -1 -1 /var/lib/puppet puppet |
93 |
-} |
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 |
- # can't be run within portage. |
100 |
- epatch "${FILESDIR}/puppet-fix-tests-4.7.0.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 |
-all_ruby_compile() { |
111 |
- if use emacs ; then |
112 |
- elisp-compile ext/emacs/puppet-mode.el |
113 |
- fi |
114 |
- |
115 |
- if use xemacs ; then |
116 |
- # Create a separate version for xemacs to be able to install |
117 |
- # emacs and xemacs in parallel. |
118 |
- mkdir ext/xemacs |
119 |
- cp ext/emacs/* ext/xemacs/ |
120 |
- xemacs-elisp-compile ext/xemacs/puppet-mode.el |
121 |
- fi |
122 |
-} |
123 |
- |
124 |
-each_ruby_install() { |
125 |
- each_fakegem_install |
126 |
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
127 |
-} |
128 |
- |
129 |
-all_ruby_install() { |
130 |
- all_fakegem_install |
131 |
- |
132 |
- # systemd stuffs |
133 |
- insinto /usr/lib/systemd/system |
134 |
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
135 |
- |
136 |
- # tmpfiles stuff |
137 |
- insinto /usr/lib/tmpfiles.d |
138 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
139 |
- |
140 |
- # openrc init stuff |
141 |
- newinitd "${FILESDIR}"/puppet.init-4.x puppet |
142 |
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster |
143 |
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
144 |
- |
145 |
- keepdir /etc/puppetlabs/puppet/ssl |
146 |
- |
147 |
- keepdir /var/lib/puppet/facts |
148 |
- keepdir /var/lib/puppet/files |
149 |
- fowners -R puppet:puppet /var/lib/puppet |
150 |
- |
151 |
- fperms 0750 /var/lib/puppet |
152 |
- |
153 |
- fperms 0750 /etc/puppetlabs |
154 |
- fperms 0750 /etc/puppetlabs/puppet |
155 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
156 |
- fowners -R :puppet /etc/puppetlabs |
157 |
- fowners -R :puppet /var/lib/puppet |
158 |
- |
159 |
- if use emacs ; then |
160 |
- elisp-install ${PN} ext/emacs/puppet-mode.el* |
161 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
162 |
- fi |
163 |
- |
164 |
- if use xemacs ; then |
165 |
- xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* |
166 |
- xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
167 |
- fi |
168 |
- |
169 |
- if use ldap ; then |
170 |
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
171 |
- fi |
172 |
- |
173 |
- # ext and examples files |
174 |
- for f in $(find ext examples -type f) ; do |
175 |
- docinto "$(dirname ${f})"; dodoc "${f}" |
176 |
- done |
177 |
-} |
178 |
- |
179 |
-pkg_postinst() { |
180 |
- elog |
181 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
182 |
- elog "cause puppet to hang while installing packages." |
183 |
- elog |
184 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
185 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
186 |
- elog |
187 |
- |
188 |
- local v |
189 |
- for v in ${REPLACING_VERSIONS}; do |
190 |
- if [ "$(get_major_version $v)" = "3" ]; then |
191 |
- elog |
192 |
- elog "If you're upgrading from 3.x then please move everything in /etc/puppet to" |
193 |
- elog "/etc/puppetlabs/puppet" |
194 |
- elog "Also, puppet now uses config directories for modules and manifests." |
195 |
- elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html" |
196 |
- elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html" |
197 |
- elog "for more information." |
198 |
- elog |
199 |
- fi |
200 |
- done |
201 |
- |
202 |
- use emacs && elisp-site-regen |
203 |
- use xemacs && xemacs-elisp-site-regen |
204 |
-} |
205 |
- |
206 |
-pkg_postrm() { |
207 |
- use emacs && elisp-site-regen |
208 |
- use xemacs && xemacs-elisp-site-regen |
209 |
-} |