1 |
matsuu 08/11/22 07:28:21 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: puppet-0.24.6-r1.ebuild |
5 |
Removed: puppet-0.24.5-r3.ebuild puppet-0.24.6.ebuild |
6 |
Log: |
7 |
Fixed dependency. Fixed eix patch. |
8 |
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.29 app-admin/puppet/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.29&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.29&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.28&r2=1.29 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
20 |
retrieving revision 1.28 |
21 |
retrieving revision 1.29 |
22 |
diff -u -r1.28 -r1.29 |
23 |
--- ChangeLog 21 Nov 2008 17:13:40 -0000 1.28 |
24 |
+++ ChangeLog 22 Nov 2008 07:28:20 -0000 1.29 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for app-admin/puppet |
27 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.28 2008/11/21 17:13:40 matsuu Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.29 2008/11/22 07:28:20 matsuu Exp $ |
30 |
+ |
31 |
+*puppet-0.24.6-r1 (22 Nov 2008) |
32 |
+ |
33 |
+ 22 Nov 2008; MATSUU Takuto <matsuu@g.o> |
34 |
+ files/puppet-0.24.6-eix.patch, -puppet-0.24.5-r3.ebuild, |
35 |
+ -puppet-0.24.6.ebuild, +puppet-0.24.6-r1.ebuild: |
36 |
+ Fixed dependency. Fixed eix patch. Removed old versions. |
37 |
|
38 |
*puppet-0.24.6 (21 Nov 2008) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 app-admin/puppet/puppet-0.24.6-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.24.6-r1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.24.6-r1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: puppet-0.24.6-r1.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2008 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.6-r1.ebuild,v 1.1 2008/11/22 07:28:21 matsuu Exp $ |
53 |
|
54 |
inherit elisp-common eutils ruby |
55 |
|
56 |
DESCRIPTION="A system automation and configuration management software" |
57 |
HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html" |
58 |
SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
IUSE="emacs ldap rrdtool vim-syntax" |
63 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
64 |
|
65 |
DEPEND="emacs? ( virtual/emacs ) |
66 |
>=dev-ruby/facter-1.5.0" |
67 |
RDEPEND="${DEPEND} |
68 |
>=app-portage/eix-0.9.4 |
69 |
ldap? ( dev-ruby/ruby-ldap ) |
70 |
rrdtool? ( |
71 |
|| ( |
72 |
>=net-analyzer/rrdtool-1.2.23 |
73 |
dev-ruby/ruby-rrd |
74 |
) |
75 |
)" |
76 |
# || ( |
77 |
# www-servers/webrick |
78 |
# www-servers/mongrel |
79 |
# ) |
80 |
# dev-ruby/diff-lcs |
81 |
# dev-ruby/rails |
82 |
# dev-ruby/ruby-shadow |
83 |
|
84 |
USE_RUBY="ruby18 ruby19" |
85 |
|
86 |
SITEFILE="50${PN}-mode-gentoo.el" |
87 |
|
88 |
pkg_setup() { |
89 |
built_with_use virtual/ruby ipv6 || \ |
90 |
die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run" |
91 |
|
92 |
if use rrdtool && \ |
93 |
has_version '>=net-analyzer/rrdtool-1.2.23' && \ |
94 |
! built_with_use '>=net-analyzer/rrdtool-1.2.23' ruby |
95 |
then |
96 |
die "net-analyzer/rrdtool must be built with ruby USE flag." |
97 |
fi |
98 |
|
99 |
enewgroup puppet |
100 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
101 |
} |
102 |
|
103 |
src_unpack() { |
104 |
unpack ${A} |
105 |
cd "${S}" |
106 |
|
107 |
epatch "${FILESDIR}/${PN}-0.24.2-gentoo.patch" |
108 |
epatch "${FILESDIR}/${P}-eix.patch" |
109 |
} |
110 |
|
111 |
src_compile() { |
112 |
if use emacs ; then |
113 |
elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed" |
114 |
fi |
115 |
} |
116 |
|
117 |
src_install() { |
118 |
DESTDIR="${D}" ruby_einstall "$@" || die |
119 |
DESTDIR="${D}" erubydoc |
120 |
|
121 |
# |
122 |
# bug #237071 |
123 |
# |
124 |
#doinitd conf/gentoo/init.d/puppetmaster |
125 |
newinitd "${FILESDIR}"/puppetmaster.init puppetmaster |
126 |
#doconfd conf/gentoo/conf.d/puppetmaster |
127 |
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
128 |
#doinitd conf/gentoo/init.d/puppet |
129 |
newinitd "${FILESDIR}"/puppet.init puppet |
130 |
doconfd conf/gentoo/conf.d/puppet |
131 |
|
132 |
# Initial configuration files |
133 |
keepdir /etc/puppet/manifests |
134 |
insinto /etc/puppet |
135 |
doins conf/gentoo/puppet/* |
136 |
|
137 |
# Location of log and data files |
138 |
keepdir /var/run/puppet |
139 |
keepdir /var/log/puppet |
140 |
keepdir /var/lib/puppet/ssl |
141 |
keepdir /var/lib/puppet/files |
142 |
fowners -R puppet:puppet /var/{run,log,lib}/puppet |
143 |
|
144 |
if use emacs ; then |
145 |
elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed" |
146 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
147 |
fi |
148 |
|
149 |
if use ldap ; then |
150 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
151 |
fi |
152 |
|
153 |
if use vim-syntax ; then |
154 |
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim |
155 |
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim |
156 |
fi |
157 |
|
158 |
# ext and examples files |
159 |
for f in $(find ext examples -type f) ; do |
160 |
docinto "$(dirname ${f})"; dodoc "${f}" |
161 |
done |
162 |
docinto conf; dodoc conf/namespaceauth.conf |
163 |
} |
164 |
|
165 |
pkg_postinst() { |
166 |
elog |
167 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
168 |
elog "cause puppet to hang while installing packages." |
169 |
elog |
170 |
elog "Puppet uses eix to get information about currently installed packages," |
171 |
elog "so please keep the eix metadata cache updated so puppet is able to properly" |
172 |
elog "handle package installations." |
173 |
elog |
174 |
elog "Currently puppet only supports adding and removing services to the default" |
175 |
elog "runlevel, if you want to add/remove a service from another runlevel you may" |
176 |
elog "do so using symlinking." |
177 |
elog |
178 |
|
179 |
if [ \ |
180 |
-f "${ROOT}/etc/puppet/puppetd.conf" -o \ |
181 |
-f "${ROOT}/etc/puppet/puppetmaster.conf" -o \ |
182 |
-f "${ROOT}/etc/puppet/puppetca.conf" \ |
183 |
] ; then |
184 |
elog |
185 |
elog "Please remove deprecated config files." |
186 |
elog " /etc/puppet/puppetca.conf" |
187 |
elog " /etc/puppet/puppetd.conf" |
188 |
elog " /etc/puppet/puppetmasterd.conf" |
189 |
elog |
190 |
fi |
191 |
use emacs && elisp-site-regen |
192 |
} |
193 |
pkg_postrm() { |
194 |
use emacs && elisp-site-regen |
195 |
} |