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: ChangeLog puppet-2.6.8.ebuild puppet-2.6.4.ebuild puppet-2.6.2.ebuild
Date: Fri, 29 Apr 2011 07:06:26
Message-Id: 20110429070614.685C420054@flycatcher.gentoo.org
1 matsuu 11/04/29 07:06:14
2
3 Modified: ChangeLog
4 Added: puppet-2.6.8.ebuild
5 Removed: puppet-2.6.4.ebuild puppet-2.6.2.ebuild
6 Log:
7 Version bumped. Fixed test issue, bug #363451. Removed old versions.
8
9 (Portage version: 2.1.9.46/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.75 app-admin/puppet/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.75&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.75&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.74&r2=1.75
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v
21 retrieving revision 1.74
22 retrieving revision 1.75
23 diff -u -r1.74 -r1.75
24 --- ChangeLog 11 Apr 2011 15:04:16 -0000 1.74
25 +++ ChangeLog 29 Apr 2011 07:06:14 -0000 1.75
26 @@ -1,6 +1,12 @@
27 # ChangeLog for app-admin/puppet
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.74 2011/04/11 15:04:16 matsuu Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.75 2011/04/29 07:06:14 matsuu Exp $
31 +
32 +*puppet-2.6.8 (29 Apr 2011)
33 +
34 + 29 Apr 2011; MATSUU Takuto <matsuu@g.o> -puppet-2.6.2.ebuild,
35 + -puppet-2.6.4.ebuild, +puppet-2.6.8.ebuild:
36 + Version bumped. Fixed test issue, bug #363451. Removed old versions.
37
38 *puppet-2.6.7 (11 Apr 2011)
39
40
41
42
43 1.1 app-admin/puppet/puppet-2.6.8.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.6.8.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.6.8.ebuild?rev=1.1&content-type=text/plain
47
48 Index: puppet-2.6.8.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.8.ebuild,v 1.1 2011/04/29 07:06:14 matsuu Exp $
53
54 EAPI="2"
55 USE_RUBY="ruby18"
56
57 RUBY_FAKEGEM_TASK_DOC=""
58 RUBY_FAKEGEM_TASK_TEST="test"
59 RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
60
61 inherit elisp-common eutils ruby-fakegem
62
63 DESCRIPTION="A system automation and configuration management software"
64 HOMEPAGE="http://puppetlabs.com/"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax"
69 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
70
71 ruby_add_rdepend "
72 >=dev-ruby/facter-1.5.1
73 augeas? ( dev-ruby/ruby-augeas )
74 diff? ( dev-ruby/diff-lcs )
75 doc? ( dev-ruby/rdoc )
76 ldap? ( dev-ruby/ruby-ldap )
77 shadow? ( dev-ruby/ruby-shadow )
78 sqlite3? ( dev-ruby/sqlite3-ruby )
79 virtual/ruby-ssl"
80 # couchdb? ( dev-ruby/couchrest )
81 # mongrel? ( www-servers/mongrel )
82 # rack? ( >=dev-ruby/rack-1 )
83 # rails? (
84 # dev-ruby/rails
85 # >=dev-ruby/activerecord-2.1
86 # )
87 # stomp? ( dev-ruby/stomp )
88
89 DEPEND="${DEPEND}
90 emacs? ( virtual/emacs )"
91 RDEPEND="${RDEPEND}
92 emacs? ( virtual/emacs )
93 rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
94 selinux? ( sys-libs/libselinux[ruby] )
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_compile() {
105 all_fakegem_compile
106
107 if use emacs ; then
108 elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
109 fi
110 }
111
112 each_fakegem_install() {
113 ${RUBY} install.rb --destdir="${D}" install || die
114 }
115
116 all_ruby_install() {
117 all_fakegem_install
118
119 newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die
120 doconfd conf/gentoo/conf.d/puppetmaster || die
121 newinitd "${FILESDIR}"/puppet.init puppet || die
122 doconfd conf/gentoo/conf.d/puppet || die
123
124 # Initial configuration files
125 keepdir /etc/puppet/manifests || die
126 keepdir /etc/puppet/modules || die
127 insinto /etc/puppet
128
129 # Bug #338439
130 #doins conf/gentoo/puppet/* || die
131 doins conf/redhat/*.conf || die
132 doins conf/auth.conf || die
133
134 # Location of log and data files
135 keepdir /var/run/puppet || die
136 keepdir /var/log/puppet || die
137 keepdir /var/lib/puppet/ssl || die
138 keepdir /var/lib/puppet/facts || die
139 keepdir /var/lib/puppet/files || die
140 fowners -R puppet:puppet /var/{run,log,lib}/puppet || die
141
142 if use emacs ; then
143 elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
144 elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
145 fi
146
147 if use ldap ; then
148 insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
149 fi
150
151 if use vim-syntax ; then
152 insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
153 insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die
154 fi
155
156 # ext and examples files
157 for f in $(find ext examples -type f) ; do
158 docinto "$(dirname ${f})"; dodoc "${f}" || die
159 done
160 docinto conf; dodoc conf/namespaceauth.conf || die
161 }
162
163 pkg_postinst() {
164 elog
165 elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
166 elog "cause puppet to hang while installing packages."
167 elog
168 elog "Puppet uses eix to get information about currently installed packages,"
169 elog "so please keep the eix metadata cache updated so puppet is able to properly"
170 elog "handle package installations."
171 elog
172 elog "Currently puppet only supports adding and removing services to the default"
173 elog "runlevel, if you want to add/remove a service from another runlevel you may"
174 elog "do so using symlinking."
175 elog
176
177 if [ \
178 -f "${ROOT}/etc/puppet/puppetd.conf" -o \
179 -f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
180 -f "${ROOT}/etc/puppet/puppetca.conf" \
181 ] ; then
182 elog
183 elog "Please remove deprecated config files."
184 elog " /etc/puppet/puppetca.conf"
185 elog " /etc/puppet/puppetd.conf"
186 elog " /etc/puppet/puppetmasterd.conf"
187 elog
188 fi
189
190 use emacs && elisp-site-regen
191 }
192
193 pkg_postrm() {
194 use emacs && elisp-site-regen
195 }