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