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