Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/puppet: puppet-0.25.4-r1.ebuild ChangeLog puppet-0.25.1-r1.ebuild puppet-0.25.4.ebuild
Date: Tue, 02 Mar 2010 12:12:00
Message-Id: E1NmQx8-0005eK-4C@stork.gentoo.org
1 matsuu 10/03/02 12:11:54
2
3 Modified: ChangeLog
4 Added: puppet-0.25.4-r1.ebuild
5 Removed: puppet-0.25.1-r1.ebuild puppet-0.25.4.ebuild
6 Log:
7 Fixed rrd issue again, bug #294304. Removed old versions.
8 (Portage version: 2.1.7.17/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.54 app-admin/puppet/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.54&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.54&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.53&r2=1.54
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v
20 retrieving revision 1.53
21 retrieving revision 1.54
22 diff -u -r1.53 -r1.54
23 --- ChangeLog 2 Mar 2010 10:42:59 -0000 1.53
24 +++ ChangeLog 2 Mar 2010 12:11:53 -0000 1.54
25 @@ -1,6 +1,15 @@
26 # ChangeLog for app-admin/puppet
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.53 2010/03/02 10:42:59 fauli Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.54 2010/03/02 12:11:53 matsuu Exp $
30 +
31 +*puppet-0.25.4-r1 (02 Mar 2010)
32 +
33 + 02 Mar 2010; MATSUU Takuto <matsuu@g.o>
34 + -files/puppet-0.25.0-cert-names.patch, -puppet-0.25.1-r1.ebuild,
35 + -files/puppet-0.25.1-eix-0.18.patch, -puppet-0.25.4.ebuild,
36 + +puppet-0.25.4-r1.ebuild, +files/puppet-0.25.4-r1-rrd.patch,
37 + -files/puppet-0.25.4-rrd.patch:
38 + Fixed rrd issue again, bug #294304. Removed old versions.
39
40 02 Mar 2010; Christian Faulhammer <fauli@g.o> puppet-0.25.3.ebuild:
41 stable x86, bug 306195
42
43
44
45 1.1 app-admin/puppet/puppet-0.25.4-r1.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.25.4-r1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.25.4-r1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: puppet-0.25.4-r1.ebuild
51 ===================================================================
52 # Copyright 1999-2010 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.4-r1.ebuild,v 1.1 2010/03/02 12:11:53 matsuu Exp $
55
56 EAPI="2"
57 inherit elisp-common eutils ruby
58
59 DESCRIPTION="A system automation and configuration management software"
60 HOMEPAGE="http://reductivelabs.com/projects/puppet"
61 SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tar.gz"
62
63 LICENSE="GPL-2"
64 SLOT="0"
65 IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
66 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
67
68 DEPEND="dev-lang/ruby[ssl]
69 emacs? ( virtual/emacs )
70 >=dev-ruby/facter-1.5.0"
71 RDEPEND="${DEPEND}
72 >=app-portage/eix-0.18.0
73 augeas? ( dev-ruby/ruby-augeas )
74 ldap? ( dev-ruby/ruby-ldap )
75 rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
76 shadow? ( dev-ruby/ruby-shadow )"
77
78 USE_RUBY="ruby18"
79
80 SITEFILE="50${PN}-mode-gentoo.el"
81
82 pkg_setup() {
83 enewgroup puppet
84 enewuser puppet -1 -1 /var/lib/puppet puppet
85 }
86
87 src_prepare() {
88 # Bug #294304
89 epatch "${FILESDIR}/${PF}-rrd.patch"
90 }
91
92 src_compile() {
93 if use emacs ; then
94 elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
95 fi
96 }
97
98 src_install() {
99 DESTDIR="${D}" ruby_einstall "$@" || die
100 DESTDIR="${D}" erubydoc || die
101
102 newinitd "${FILESDIR}"/puppetmaster-0.25.init puppetmaster || die
103 doconfd conf/gentoo/conf.d/puppetmaster || die
104 newinitd "${FILESDIR}"/puppet-0.25.init puppet || die
105 doconfd conf/gentoo/conf.d/puppet || die
106
107 # Initial configuration files
108 keepdir /etc/puppet/manifests || die
109 insinto /etc/puppet
110 doins conf/gentoo/puppet/* || die
111 doins conf/auth.conf || die
112
113 # Location of log and data files
114 keepdir /var/run/puppet || die
115 keepdir /var/log/puppet || die
116 keepdir /var/lib/puppet/ssl || die
117 keepdir /var/lib/puppet/files || die
118 fowners -R puppet:puppet /var/{run,log,lib}/puppet || die
119
120 if use emacs ; then
121 elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
122 elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
123 fi
124
125 if use ldap ; then
126 insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
127 fi
128
129 if use vim-syntax ; then
130 insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
131 insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die
132 fi
133
134 # ext and examples files
135 for f in $(find ext examples -type f) ; do
136 docinto "$(dirname ${f})"; dodoc "${f}" || die
137 done
138 docinto conf; dodoc conf/namespaceauth.conf || die
139 }
140
141 pkg_postinst() {
142 elog
143 elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
144 elog "cause puppet to hang while installing packages."
145 elog
146 elog "Puppet uses eix to get information about currently installed packages,"
147 elog "so please keep the eix metadata cache updated so puppet is able to properly"
148 elog "handle package installations."
149 elog
150 elog "Currently puppet only supports adding and removing services to the default"
151 elog "runlevel, if you want to add/remove a service from another runlevel you may"
152 elog "do so using symlinking."
153 elog
154
155 if [ \
156 -f "${ROOT}/etc/puppet/puppetd.conf" -o \
157 -f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
158 -f "${ROOT}/etc/puppet/puppetca.conf" \
159 ] ; then
160 elog
161 elog "Please remove deprecated config files."
162 elog " /etc/puppet/puppetca.conf"
163 elog " /etc/puppet/puppetd.conf"
164 elog " /etc/puppet/puppetmasterd.conf"
165 elog
166 fi
167
168 use emacs && elisp-site-regen
169 }
170
171 pkg_postrm() {
172 use emacs && elisp-site-regen
173 }