1 |
prometheanfire 15/07/23 23:03:42 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: puppet-4.2.1.ebuild |
5 |
Removed: puppet-4.2.0-r1.ebuild |
6 |
Log: |
7 |
bup, also fixing bug 555314 |
8 |
|
9 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA) |
10 |
|
11 |
Revision Changes Path |
12 |
1.233 app-admin/puppet/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.233&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.233&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.232&r2=1.233 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
21 |
retrieving revision 1.232 |
22 |
retrieving revision 1.233 |
23 |
diff -u -r1.232 -r1.233 |
24 |
--- ChangeLog 19 Jul 2015 08:49:09 -0000 1.232 |
25 |
+++ ChangeLog 23 Jul 2015 23:03:42 -0000 1.233 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for app-admin/puppet |
28 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.232 2015/07/19 08:49:09 jer Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.233 2015/07/23 23:03:42 prometheanfire Exp $ |
31 |
+ |
32 |
+*puppet-4.2.1 (23 Jul 2015) |
33 |
+ |
34 |
+ 23 Jul 2015; Matthew Thode <prometheanfire@g.o> +puppet-4.2.1.ebuild, |
35 |
+ -puppet-4.2.0-r1.ebuild: |
36 |
+ bup, also fixing bug 555314 |
37 |
|
38 |
19 Jul 2015; Jeroen Roovers <jer@g.o> puppet-4.2.0-r1.ebuild: |
39 |
Mark ~hppa (bug #553952). |
40 |
|
41 |
|
42 |
|
43 |
1.1 app-admin/puppet/puppet-4.2.1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: puppet-4.2.1.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2015 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild,v 1.1 2015/07/23 23:03:42 prometheanfire Exp $ |
53 |
|
54 |
EAPI="5" |
55 |
|
56 |
USE_RUBY="ruby20 ruby21" |
57 |
|
58 |
RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
59 |
|
60 |
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator |
61 |
|
62 |
DESCRIPTION="A system automation and configuration management software." |
63 |
HOMEPAGE="http://puppetlabs.com/" |
64 |
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
65 |
|
66 |
LICENSE="Apache-2.0 GPL-2" |
67 |
SLOT="0" |
68 |
KEYWORDS="~amd64 ~hppa ~ppc ~x86" |
69 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs" |
70 |
|
71 |
ruby_add_rdepend " |
72 |
dev-ruby/hiera |
73 |
>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6* |
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 |
sqlite? ( dev-ruby/sqlite3 ) |
81 |
virtual/ruby-ssl" |
82 |
|
83 |
DEPEND="${DEPEND} |
84 |
dev-lang/ruby |
85 |
>=dev-ruby/facter-3.0.0 |
86 |
emacs? ( virtual/emacs ) |
87 |
xemacs? ( app-editors/xemacs )" |
88 |
RDEPEND="${RDEPEND} |
89 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
90 |
selinux? ( |
91 |
sys-libs/libselinux[ruby] |
92 |
sec-policy/selinux-puppet |
93 |
) |
94 |
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
95 |
>=app-portage/eix-0.18.0" |
96 |
|
97 |
SITEFILE="50${PN}-mode-gentoo.el" |
98 |
|
99 |
pkg_setup() { |
100 |
enewgroup puppet |
101 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
102 |
} |
103 |
|
104 |
all_ruby_prepare() { |
105 |
# Avoid spec that require unpackaged json-schema. |
106 |
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
107 |
|
108 |
# Avoid specs that can only run in the puppet.git repository. This |
109 |
# should be narrowed down to the specific specs. |
110 |
rm spec/integration/parser/compiler_spec.rb || die |
111 |
|
112 |
# Avoid failing spec that need further investigation. |
113 |
rm spec/unit/module_tool/metadata_spec.rb || die |
114 |
} |
115 |
|
116 |
all_ruby_compile() { |
117 |
if use emacs ; then |
118 |
elisp-compile ext/emacs/puppet-mode.el |
119 |
fi |
120 |
|
121 |
if use xemacs ; then |
122 |
# Create a separate version for xemacs to be able to install |
123 |
# emacs and xemacs in parallel. |
124 |
mkdir ext/xemacs |
125 |
cp ext/emacs/* ext/xemacs/ |
126 |
xemacs-elisp-compile ext/xemacs/puppet-mode.el |
127 |
fi |
128 |
} |
129 |
|
130 |
each_ruby_install() { |
131 |
each_fakegem_install |
132 |
# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
133 |
} |
134 |
|
135 |
all_ruby_install() { |
136 |
all_fakegem_install |
137 |
|
138 |
# systemd stuffs |
139 |
insinto /usr/lib/systemd/system |
140 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
141 |
|
142 |
# tmpfiles stuff |
143 |
insinto /usr/lib/tmpfiles.d |
144 |
newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
145 |
|
146 |
# openrc init stuff |
147 |
newinitd "${FILESDIR}"/puppet.init-4.x puppet |
148 |
newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster |
149 |
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
150 |
|
151 |
keepdir /etc/puppetlabs/puppet/ssl |
152 |
|
153 |
keepdir /var/lib/puppet/facts |
154 |
keepdir /var/lib/puppet/files |
155 |
fowners -R puppet:puppet /var/lib/puppet |
156 |
|
157 |
fperms 0750 /var/lib/puppet |
158 |
|
159 |
fperms 0750 /etc/puppetlabs |
160 |
fperms 0750 /etc/puppetlabs/puppet |
161 |
fperms 0750 /etc/puppetlabs/puppet/ssl |
162 |
fowners -R :puppet /etc/puppetlabs |
163 |
fowners -R :puppet /var/lib/puppet |
164 |
|
165 |
if use emacs ; then |
166 |
elisp-install ${PN} ext/emacs/puppet-mode.el* |
167 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
168 |
fi |
169 |
|
170 |
if use xemacs ; then |
171 |
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* |
172 |
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
173 |
fi |
174 |
|
175 |
if use ldap ; then |
176 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
177 |
fi |
178 |
|
179 |
# ext and examples files |
180 |
for f in $(find ext examples -type f) ; do |
181 |
docinto "$(dirname ${f})"; dodoc "${f}" |
182 |
done |
183 |
} |
184 |
|
185 |
pkg_postinst() { |
186 |
elog |
187 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
188 |
elog "cause puppet to hang while installing packages." |
189 |
elog |
190 |
elog "Portage Puppet module with Gentoo-specific resources:" |
191 |
elog "http://forge.puppetlabs.com/gentoo/portage" |
192 |
elog |
193 |
|
194 |
if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then |
195 |
elog |
196 |
elog "If you're upgrading from 3.x then please move everything in /etc/puppet to" |
197 |
elog "/etc/puppetlabs/puppet" |
198 |
elog "Also, puppet now uses config directories for modules and manifests." |
199 |
elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html" |
200 |
elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html" |
201 |
elog "for more information." |
202 |
elog |
203 |
fi |
204 |
|
205 |
use emacs && elisp-site-regen |
206 |
use xemacs && xemacs-elisp-site-regen |
207 |
} |
208 |
|
209 |
pkg_postrm() { |
210 |
use emacs && elisp-site-regen |
211 |
use xemacs && xemacs-elisp-site-regen |
212 |
} |