1 |
prometheanfire 15/04/28 20:05:13 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: puppet-3.7.4-r1.ebuild |
5 |
Log: |
6 |
fixing bug 514710 |
7 |
|
8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA) |
9 |
|
10 |
Revision Changes Path |
11 |
1.217 app-admin/puppet/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.217&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.217&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.216&r2=1.217 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
20 |
retrieving revision 1.216 |
21 |
retrieving revision 1.217 |
22 |
diff -u -r1.216 -r1.217 |
23 |
--- ChangeLog 28 Apr 2015 20:02:57 -0000 1.216 |
24 |
+++ ChangeLog 28 Apr 2015 20:05:13 -0000 1.217 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for app-admin/puppet |
27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.216 2015/04/28 20:02:57 prometheanfire Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.217 2015/04/28 20:05:13 prometheanfire Exp $ |
30 |
+ |
31 |
+*puppet-3.7.4-r1 (28 Apr 2015) |
32 |
+ |
33 |
+ 28 Apr 2015; Matthew Thode <prometheanfire@g.o> |
34 |
+ +puppet-3.7.4-r1.ebuild: |
35 |
+ fixing bug 514710 |
36 |
|
37 |
*puppet-4.0.0-r1 (28 Apr 2015) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 app-admin/puppet/puppet-3.7.4-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-3.7.4-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-3.7.4-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: puppet-3.7.4-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2015 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.4-r1.ebuild,v 1.1 2015/04/28 20:05:13 prometheanfire Exp $ |
52 |
|
53 |
EAPI="5" |
54 |
|
55 |
USE_RUBY="ruby19 ruby20 ruby21" |
56 |
|
57 |
RUBY_FAKEGEM_RECIPE_TEST="rspec" |
58 |
|
59 |
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator |
60 |
|
61 |
DESCRIPTION="A system automation and configuration management software" |
62 |
HOMEPAGE="http://puppetlabs.com/" |
63 |
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
64 |
|
65 |
LICENSE="Apache-2.0 GPL-2" |
66 |
SLOT="0" |
67 |
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
68 |
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs" |
69 |
|
70 |
ruby_add_rdepend " |
71 |
dev-ruby/hiera |
72 |
>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6* |
73 |
>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3 |
74 |
dev-ruby/json |
75 |
augeas? ( dev-ruby/ruby-augeas ) |
76 |
diff? ( dev-ruby/diff-lcs ) |
77 |
doc? ( dev-ruby/rdoc ) |
78 |
ldap? ( dev-ruby/ruby-ldap ) |
79 |
shadow? ( dev-ruby/ruby-shadow ) |
80 |
sqlite3? ( dev-ruby/sqlite3 ) |
81 |
virtual/ruby-ssl" |
82 |
|
83 |
ruby_add_bdepend "test? ( dev-ruby/mocha:0.10 )" |
84 |
|
85 |
DEPEND="${DEPEND} |
86 |
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) |
87 |
emacs? ( virtual/emacs ) |
88 |
xemacs? ( app-editors/xemacs )" |
89 |
RDEPEND="${RDEPEND} |
90 |
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) |
91 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
92 |
selinux? ( |
93 |
sys-libs/libselinux[ruby] |
94 |
sec-policy/selinux-puppet |
95 |
) |
96 |
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
97 |
>=app-portage/eix-0.18.0" |
98 |
|
99 |
SITEFILE="50${PN}-mode-gentoo.el" |
100 |
|
101 |
pkg_setup() { |
102 |
enewgroup puppet |
103 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
104 |
} |
105 |
|
106 |
all_ruby_prepare() { |
107 |
# Avoid spec that require unpackaged json-schema. |
108 |
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
109 |
|
110 |
# Avoid Rails specs to avoid this dependency and because they |
111 |
# currently fail against Rails 4.1. |
112 |
find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die |
113 |
rm -r spec/unit/rails || die |
114 |
rm spec/unit/parser/collector_spec.rb || die |
115 |
|
116 |
# Avoid specs that can only run in the puppet.git repository. This |
117 |
# should be narrowed down to the specific specs. |
118 |
rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die |
119 |
|
120 |
# Avoid failing spec that need further investigation. |
121 |
rm spec/unit/module_tool/metadata_spec.rb || die |
122 |
} |
123 |
|
124 |
all_ruby_compile() { |
125 |
if use emacs ; then |
126 |
elisp-compile ext/emacs/puppet-mode.el |
127 |
fi |
128 |
|
129 |
if use xemacs ; then |
130 |
# Create a separate version for xemacs to be able to install |
131 |
# emacs and xemacs in parallel. |
132 |
mkdir ext/xemacs |
133 |
cp ext/emacs/* ext/xemacs/ |
134 |
xemacs-elisp-compile ext/xemacs/puppet-mode.el |
135 |
fi |
136 |
} |
137 |
|
138 |
each_ruby_install() { |
139 |
each_fakegem_install |
140 |
#${RUBY} install.rb --destdir="${D}" install || die |
141 |
} |
142 |
|
143 |
all_ruby_install() { |
144 |
all_fakegem_install |
145 |
|
146 |
#systemd stuffs |
147 |
insinto /usr/lib/systemd/system |
148 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
149 |
insinto /usr/lib/tmpfiles.d |
150 |
newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
151 |
|
152 |
newinitd "${FILESDIR}"/puppet.init-r1 puppet |
153 |
|
154 |
# Initial configuration files |
155 |
insinto /etc/puppet |
156 |
|
157 |
# Location of log and data files |
158 |
keepdir /var/log/puppet |
159 |
fowners -R puppet:puppet /var/log/puppet |
160 |
|
161 |
if use minimal ; then |
162 |
rm "${ED}/etc/puppet/auth.conf" |
163 |
else |
164 |
insinto /usr/lib/systemd/system |
165 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service" |
166 |
newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster |
167 |
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
168 |
|
169 |
insinto /etc/puppet |
170 |
|
171 |
keepdir /etc/puppet/manifests |
172 |
keepdir /etc/puppet/modules |
173 |
|
174 |
keepdir /var/lib/puppet/ssl |
175 |
keepdir /var/lib/puppet/facts |
176 |
keepdir /var/lib/puppet/files |
177 |
fowners -R puppet:puppet /var/lib/puppet |
178 |
fperms 0750 /var/lib/puppet |
179 |
fi |
180 |
fperms 0750 /etc/puppet |
181 |
fowners :puppet /etc/puppet |
182 |
|
183 |
if use emacs ; then |
184 |
elisp-install ${PN} ext/emacs/puppet-mode.el* |
185 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
186 |
fi |
187 |
|
188 |
if use xemacs ; then |
189 |
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* |
190 |
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
191 |
fi |
192 |
|
193 |
if use ldap ; then |
194 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
195 |
fi |
196 |
|
197 |
# ext and examples files |
198 |
for f in $(find ext examples -type f) ; do |
199 |
docinto "$(dirname ${f})"; dodoc "${f}" |
200 |
done |
201 |
} |
202 |
|
203 |
pkg_postinst() { |
204 |
elog |
205 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
206 |
elog "cause puppet to hang while installing packages." |
207 |
elog |
208 |
elog "Portage Puppet module with Gentoo-specific resources:" |
209 |
elog "http://forge.puppetlabs.com/gentoo/portage" |
210 |
elog |
211 |
|
212 |
if [ \ |
213 |
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ |
214 |
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ |
215 |
-f "${EPREFIX}/etc/puppet/puppetca.conf" \ |
216 |
] ; then |
217 |
elog |
218 |
elog "Please remove deprecated config files." |
219 |
elog " /etc/puppet/puppetca.conf" |
220 |
elog " /etc/puppet/puppetd.conf" |
221 |
elog " /etc/puppet/puppetmasterd.conf" |
222 |
elog |
223 |
fi |
224 |
|
225 |
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then |
226 |
elog |
227 |
elog "If you're upgrading from 2.x then we strongly suggest you to read:" |
228 |
elog "http://docs.puppetlabs.com/guides/upgrading.html" |
229 |
elog |
230 |
fi |
231 |
|
232 |
use emacs && elisp-site-regen |
233 |
use xemacs && xemacs-elisp-site-regen |
234 |
} |
235 |
|
236 |
pkg_postrm() { |
237 |
use emacs && elisp-site-regen |
238 |
use xemacs && xemacs-elisp-site-regen |
239 |
} |