1 |
matsuu 11/09/29 12:28:01 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: puppet-2.6.10.ebuild puppet-2.7.4.ebuild |
5 |
Removed: puppet-2.6.7.ebuild puppet-2.7.1.ebuild |
6 |
puppet-2.6.8.ebuild puppet-2.7.3.ebuild |
7 |
Log: |
8 |
Version bumped, bug #384859. |
9 |
|
10 |
(Portage version: 2.1.10.19/cvs/Linux x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.80 app-admin/puppet/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.80&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.80&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.79&r2=1.80 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
22 |
retrieving revision 1.79 |
23 |
retrieving revision 1.80 |
24 |
diff -u -r1.79 -r1.80 |
25 |
--- ChangeLog 19 Sep 2011 21:54:21 -0000 1.79 |
26 |
+++ ChangeLog 29 Sep 2011 12:28:01 -0000 1.80 |
27 |
@@ -1,6 +1,14 @@ |
28 |
# ChangeLog for app-admin/puppet |
29 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.79 2011/09/19 21:54:21 maekke Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.80 2011/09/29 12:28:01 matsuu Exp $ |
32 |
+ |
33 |
+*puppet-2.7.4 (29 Sep 2011) |
34 |
+*puppet-2.6.10 (29 Sep 2011) |
35 |
+ |
36 |
+ 29 Sep 2011; MATSUU Takuto <matsuu@g.o> -puppet-2.6.7.ebuild, |
37 |
+ -puppet-2.6.8.ebuild, +puppet-2.6.10.ebuild, -puppet-2.7.1.ebuild, |
38 |
+ -puppet-2.7.3.ebuild, +puppet-2.7.4.ebuild: |
39 |
+ Version bumped, bug #384859. Removed old versions. |
40 |
|
41 |
19 Sep 2011; Markus Meier <maekke@g.o> puppet-2.6.9.ebuild: |
42 |
x86 stable, bug #380529 |
43 |
|
44 |
|
45 |
|
46 |
1.1 app-admin/puppet/puppet-2.6.10.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.6.10.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.6.10.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: puppet-2.6.10.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2011 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.10.ebuild,v 1.1 2011/09/29 12:28:01 matsuu Exp $ |
56 |
|
57 |
EAPI="3" |
58 |
USE_RUBY="ruby18" |
59 |
|
60 |
RUBY_FAKEGEM_TASK_DOC="" |
61 |
RUBY_FAKEGEM_TASK_TEST="test" |
62 |
RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*" |
63 |
|
64 |
inherit elisp-common xemacs-elisp-common eutils ruby-fakegem |
65 |
|
66 |
DESCRIPTION="A system automation and configuration management software" |
67 |
HOMEPAGE="http://puppetlabs.com/" |
68 |
|
69 |
LICENSE="GPL-2" |
70 |
SLOT="0" |
71 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs" |
72 |
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
73 |
|
74 |
ruby_add_rdepend " |
75 |
>=dev-ruby/facter-1.5.1 |
76 |
augeas? ( dev-ruby/ruby-augeas ) |
77 |
diff? ( dev-ruby/diff-lcs ) |
78 |
doc? ( dev-ruby/rdoc ) |
79 |
ldap? ( dev-ruby/ruby-ldap ) |
80 |
shadow? ( dev-ruby/ruby-shadow ) |
81 |
sqlite3? ( dev-ruby/sqlite3-ruby ) |
82 |
virtual/ruby-ssl" |
83 |
# couchdb? ( dev-ruby/couchrest ) |
84 |
# mongrel? ( www-servers/mongrel ) |
85 |
# rack? ( >=dev-ruby/rack-1 ) |
86 |
# rails? ( |
87 |
# dev-ruby/rails |
88 |
# >=dev-ruby/activerecord-2.1 |
89 |
# ) |
90 |
# stomp? ( dev-ruby/stomp ) |
91 |
|
92 |
DEPEND="${DEPEND} |
93 |
emacs? ( virtual/emacs ) |
94 |
xemacs? ( app-editors/xemacs )" |
95 |
RDEPEND="${RDEPEND} |
96 |
emacs? ( virtual/emacs ) |
97 |
xemacs? ( app-editors/xemacs ) |
98 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
99 |
selinux? ( sys-libs/libselinux[ruby] ) |
100 |
>=app-portage/eix-0.18.0" |
101 |
|
102 |
SITEFILE="50${PN}-mode-gentoo.el" |
103 |
|
104 |
pkg_setup() { |
105 |
enewgroup puppet |
106 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
107 |
} |
108 |
|
109 |
all_ruby_compile() { |
110 |
all_fakegem_compile |
111 |
|
112 |
if use emacs ; then |
113 |
elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed" |
114 |
fi |
115 |
|
116 |
if use xemacs ; then |
117 |
# Create a separate version for xemacs to be able to install |
118 |
# emacs and xemacs in parallel. |
119 |
mkdir ext/xemacs || die |
120 |
cp ext/emacs/* ext/xemacs/ || die |
121 |
xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-elisp-compile failed" |
122 |
fi |
123 |
} |
124 |
|
125 |
each_fakegem_install() { |
126 |
${RUBY} install.rb --destdir="${D}" install || die |
127 |
} |
128 |
|
129 |
all_ruby_install() { |
130 |
all_fakegem_install |
131 |
|
132 |
newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die |
133 |
doconfd conf/gentoo/conf.d/puppetmaster || die |
134 |
newinitd "${FILESDIR}"/puppet.init puppet || die |
135 |
doconfd conf/gentoo/conf.d/puppet || die |
136 |
|
137 |
# Initial configuration files |
138 |
keepdir /etc/puppet/manifests || die |
139 |
keepdir /etc/puppet/modules || die |
140 |
insinto /etc/puppet |
141 |
|
142 |
# Bug #338439 |
143 |
#doins conf/gentoo/puppet/* || die |
144 |
doins conf/redhat/*.conf || die |
145 |
doins conf/auth.conf || die |
146 |
|
147 |
# Location of log and data files |
148 |
keepdir /var/run/puppet || die |
149 |
keepdir /var/log/puppet || die |
150 |
keepdir /var/lib/puppet/ssl || die |
151 |
keepdir /var/lib/puppet/facts || die |
152 |
keepdir /var/lib/puppet/files || die |
153 |
fowners -R puppet:puppet /var/{run,log,lib}/puppet || die |
154 |
|
155 |
if use emacs ; then |
156 |
elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed" |
157 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
158 |
fi |
159 |
|
160 |
if use xemacs ; then |
161 |
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed" |
162 |
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
163 |
fi |
164 |
|
165 |
if use ldap ; then |
166 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die |
167 |
fi |
168 |
|
169 |
if use vim-syntax ; then |
170 |
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die |
171 |
insinto /usr/share/vim/vimfiles/ftplugin; doins ext/vim/ftplugin/puppet.vim || die |
172 |
insinto /usr/share/vim/vimfiles/indent; doins ext/vim/indent/puppet.vim || die |
173 |
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die |
174 |
fi |
175 |
|
176 |
# ext and examples files |
177 |
for f in $(find ext examples -type f) ; do |
178 |
docinto "$(dirname ${f})"; dodoc "${f}" || die |
179 |
done |
180 |
docinto conf; dodoc conf/namespaceauth.conf || die |
181 |
} |
182 |
|
183 |
pkg_postinst() { |
184 |
elog |
185 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
186 |
elog "cause puppet to hang while installing packages." |
187 |
elog |
188 |
elog "Puppet uses eix to get information about currently installed packages," |
189 |
elog "so please keep the eix metadata cache updated so puppet is able to properly" |
190 |
elog "handle package installations." |
191 |
elog |
192 |
elog "Currently puppet only supports adding and removing services to the default" |
193 |
elog "runlevel, if you want to add/remove a service from another runlevel you may" |
194 |
elog "do so using symlinking." |
195 |
elog |
196 |
|
197 |
if [ \ |
198 |
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ |
199 |
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ |
200 |
-f "${EPREFIX}/etc/puppet/puppetca.conf" \ |
201 |
] ; then |
202 |
elog |
203 |
elog "Please remove deprecated config files." |
204 |
elog " /etc/puppet/puppetca.conf" |
205 |
elog " /etc/puppet/puppetd.conf" |
206 |
elog " /etc/puppet/puppetmasterd.conf" |
207 |
elog |
208 |
fi |
209 |
|
210 |
use emacs && elisp-site-regen |
211 |
use xemacs && xemacs-elisp-site-regen |
212 |
} |
213 |
|
214 |
pkg_postrm() { |
215 |
use emacs && elisp-site-regen |
216 |
use xemacs && xemacs-elisp-site-regen |
217 |
} |
218 |
|
219 |
|
220 |
|
221 |
1.1 app-admin/puppet/puppet-2.7.4.ebuild |
222 |
|
223 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.4.ebuild?rev=1.1&view=markup |
224 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.4.ebuild?rev=1.1&content-type=text/plain |
225 |
|
226 |
Index: puppet-2.7.4.ebuild |
227 |
=================================================================== |
228 |
# Copyright 1999-2011 Gentoo Foundation |
229 |
# Distributed under the terms of the GNU General Public License v2 |
230 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.4.ebuild,v 1.1 2011/09/29 12:28:01 matsuu Exp $ |
231 |
|
232 |
EAPI="3" |
233 |
# ruby19: dev-ruby/ruby-ldap has no ruby19 |
234 |
USE_RUBY="ruby18" |
235 |
|
236 |
RUBY_FAKEGEM_TASK_DOC="" |
237 |
RUBY_FAKEGEM_TASK_TEST="test" |
238 |
RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*" |
239 |
|
240 |
inherit elisp-common xemacs-elisp-common eutils ruby-fakegem |
241 |
|
242 |
DESCRIPTION="A system automation and configuration management software" |
243 |
HOMEPAGE="http://puppetlabs.com/" |
244 |
|
245 |
LICENSE="Apache-2.0" |
246 |
SLOT="0" |
247 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs" |
248 |
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
249 |
|
250 |
ruby_add_rdepend " |
251 |
>=dev-ruby/facter-1.5.1 |
252 |
augeas? ( dev-ruby/ruby-augeas ) |
253 |
diff? ( dev-ruby/diff-lcs ) |
254 |
doc? ( dev-ruby/rdoc ) |
255 |
ldap? ( dev-ruby/ruby-ldap ) |
256 |
shadow? ( dev-ruby/ruby-shadow ) |
257 |
sqlite3? ( dev-ruby/sqlite3-ruby ) |
258 |
virtual/ruby-ssl" |
259 |
# couchdb? ( dev-ruby/couchrest ) |
260 |
# mongrel? ( www-servers/mongrel ) |
261 |
# rack? ( >=dev-ruby/rack-1 ) |
262 |
# rails? ( |
263 |
# dev-ruby/rails |
264 |
# >=dev-ruby/activerecord-2.1 |
265 |
# ) |
266 |
# stomp? ( dev-ruby/stomp ) |
267 |
|
268 |
DEPEND="${DEPEND} |
269 |
emacs? ( virtual/emacs ) |
270 |
xemacs? ( app-editors/xemacs )" |
271 |
RDEPEND="${RDEPEND} |
272 |
emacs? ( virtual/emacs ) |
273 |
xemacs? ( app-editors/xemacs ) |
274 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
275 |
selinux? ( sys-libs/libselinux[ruby] ) |
276 |
>=app-portage/eix-0.18.0" |
277 |
|
278 |
SITEFILE="50${PN}-mode-gentoo.el" |
279 |
|
280 |
pkg_setup() { |
281 |
enewgroup puppet |
282 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
283 |
} |
284 |
|
285 |
all_ruby_compile() { |
286 |
all_fakegem_compile |
287 |
|
288 |
if use emacs ; then |
289 |
elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed" |
290 |
fi |
291 |
|
292 |
if use xemacs ; then |
293 |
# Create a separate version for xemacs to be able to install |
294 |
# emacs and xemacs in parallel. |
295 |
mkdir ext/xemacs || die |
296 |
cp ext/emacs/* ext/xemacs/ || die |
297 |
xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-elisp-compile failed" |
298 |
fi |
299 |
} |
300 |
|
301 |
each_fakegem_install() { |
302 |
${RUBY} install.rb --destdir="${D}" install || die |
303 |
} |
304 |
|
305 |
all_ruby_install() { |
306 |
all_fakegem_install |
307 |
|
308 |
newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die |
309 |
doconfd conf/gentoo/conf.d/puppetmaster || die |
310 |
newinitd "${FILESDIR}"/puppet.init puppet || die |
311 |
doconfd conf/gentoo/conf.d/puppet || die |
312 |
|
313 |
# Initial configuration files |
314 |
keepdir /etc/puppet/manifests || die |
315 |
keepdir /etc/puppet/modules || die |
316 |
insinto /etc/puppet |
317 |
|
318 |
# Bug #338439 |
319 |
#doins conf/gentoo/puppet/* || die |
320 |
doins conf/redhat/*.conf || die |
321 |
doins conf/auth.conf || die |
322 |
|
323 |
# Location of log and data files |
324 |
keepdir /var/run/puppet || die |
325 |
keepdir /var/log/puppet || die |
326 |
keepdir /var/lib/puppet/ssl || die |
327 |
keepdir /var/lib/puppet/facts || die |
328 |
keepdir /var/lib/puppet/files || die |
329 |
fowners -R puppet:puppet /var/{run,log,lib}/puppet || die |
330 |
|
331 |
if use emacs ; then |
332 |
elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed" |
333 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
334 |
fi |
335 |
|
336 |
if use xemacs ; then |
337 |
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed" |
338 |
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
339 |
fi |
340 |
|
341 |
if use ldap ; then |
342 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die |
343 |
fi |
344 |
|
345 |
if use vim-syntax ; then |
346 |
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die |
347 |
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die |
348 |
fi |
349 |
|
350 |
# ext and examples files |
351 |
for f in $(find ext examples -type f) ; do |
352 |
docinto "$(dirname ${f})"; dodoc "${f}" || die |
353 |
done |
354 |
docinto conf; dodoc conf/namespaceauth.conf || die |
355 |
} |
356 |
|
357 |
pkg_postinst() { |
358 |
elog |
359 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
360 |
elog "cause puppet to hang while installing packages." |
361 |
elog |
362 |
elog "Puppet uses eix to get information about currently installed packages," |
363 |
elog "so please keep the eix metadata cache updated so puppet is able to properly" |
364 |
elog "handle package installations." |
365 |
elog |
366 |
elog "Currently puppet only supports adding and removing services to the default" |
367 |
elog "runlevel, if you want to add/remove a service from another runlevel you may" |
368 |
elog "do so using symlinking." |
369 |
elog |
370 |
|
371 |
if [ \ |
372 |
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ |
373 |
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ |
374 |
-f "${EPREFIX}/etc/puppet/puppetca.conf" \ |
375 |
] ; then |
376 |
elog |
377 |
elog "Please remove deprecated config files." |
378 |
elog " /etc/puppet/puppetca.conf" |
379 |
elog " /etc/puppet/puppetd.conf" |
380 |
elog " /etc/puppet/puppetmasterd.conf" |
381 |
elog |
382 |
fi |
383 |
|
384 |
use emacs && elisp-site-regen |
385 |
use xemacs && xemacs-elisp-site-regen |
386 |
} |
387 |
|
388 |
pkg_postrm() { |
389 |
use emacs && elisp-site-regen |
390 |
use xemacs && xemacs-elisp-site-regen |
391 |
} |