| 1 |
matsuu 11/06/29 17:44:07 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: puppet-2.7.1.ebuild puppet-2.6.9.ebuild |
| 5 |
Log: |
| 6 |
Version bumped, bug #373163 and #373165. Added xemacs USE flag, bug #373141. |
| 7 |
|
| 8 |
(Portage version: 2.1.10.3/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.76 app-admin/puppet/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.76&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.76&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.75&r2=1.76 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
| 20 |
retrieving revision 1.75 |
| 21 |
retrieving revision 1.76 |
| 22 |
diff -u -r1.75 -r1.76 |
| 23 |
--- ChangeLog 29 Apr 2011 07:06:14 -0000 1.75 |
| 24 |
+++ ChangeLog 29 Jun 2011 17:44:07 -0000 1.76 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for app-admin/puppet |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.75 2011/04/29 07:06:14 matsuu Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.76 2011/06/29 17:44:07 matsuu Exp $ |
| 30 |
+ |
| 31 |
+*puppet-2.7.1 (29 Jun 2011) |
| 32 |
+*puppet-2.6.9 (29 Jun 2011) |
| 33 |
+ |
| 34 |
+ 29 Jun 2011; MATSUU Takuto <matsuu@g.o> +puppet-2.6.9.ebuild, |
| 35 |
+ +puppet-2.7.1.ebuild: |
| 36 |
+ Version bumped, bug #373163 and #373165. Added xemacs USE flag, bug #373141. |
| 37 |
|
| 38 |
*puppet-2.6.8 (29 Apr 2011) |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 app-admin/puppet/puppet-2.7.1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: puppet-2.7.1.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.7.1.ebuild,v 1.1 2011/06/29 17:44:07 matsuu Exp $ |
| 53 |
|
| 54 |
EAPI="3" |
| 55 |
# ruby19: dev-ruby/ruby-ldap has no ruby19 |
| 56 |
USE_RUBY="ruby18" |
| 57 |
|
| 58 |
RUBY_FAKEGEM_TASK_DOC="" |
| 59 |
RUBY_FAKEGEM_TASK_TEST="test" |
| 60 |
RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*" |
| 61 |
|
| 62 |
inherit elisp-common xemacs-elisp-common eutils ruby-fakegem |
| 63 |
|
| 64 |
DESCRIPTION="A system automation and configuration management software" |
| 65 |
HOMEPAGE="http://puppetlabs.com/" |
| 66 |
|
| 67 |
LICENSE="Apache-2.0" |
| 68 |
SLOT="0" |
| 69 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs" |
| 70 |
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
| 71 |
|
| 72 |
ruby_add_rdepend " |
| 73 |
>=dev-ruby/facter-1.5.1 |
| 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-ruby ) |
| 80 |
virtual/ruby-ssl" |
| 81 |
# couchdb? ( dev-ruby/couchrest ) |
| 82 |
# mongrel? ( www-servers/mongrel ) |
| 83 |
# rack? ( >=dev-ruby/rack-1 ) |
| 84 |
# rails? ( |
| 85 |
# dev-ruby/rails |
| 86 |
# >=dev-ruby/activerecord-2.1 |
| 87 |
# ) |
| 88 |
# stomp? ( dev-ruby/stomp ) |
| 89 |
|
| 90 |
DEPEND="${DEPEND} |
| 91 |
emacs? ( virtual/emacs ) |
| 92 |
xemacs? ( app-editors/xemacs )" |
| 93 |
RDEPEND="${RDEPEND} |
| 94 |
emacs? ( virtual/emacs ) |
| 95 |
xemacs? ( app-editors/xemacs ) |
| 96 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
| 97 |
selinux? ( sys-libs/libselinux[ruby] ) |
| 98 |
>=app-portage/eix-0.18.0" |
| 99 |
|
| 100 |
SITEFILE="50${PN}-mode-gentoo.el" |
| 101 |
|
| 102 |
pkg_setup() { |
| 103 |
enewgroup puppet |
| 104 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
| 105 |
} |
| 106 |
|
| 107 |
all_ruby_compile() { |
| 108 |
all_fakegem_compile |
| 109 |
|
| 110 |
if use emacs ; then |
| 111 |
elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed" |
| 112 |
fi |
| 113 |
|
| 114 |
if use xemacs ; then |
| 115 |
# Create a separate version for xemacs to be able to install |
| 116 |
# emacs and xemacs in parallel. |
| 117 |
mkdir ext/xemacs || die |
| 118 |
cp ext/emacs/* ext/xemacs/ || die |
| 119 |
xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-elisp-compile failed" |
| 120 |
fi |
| 121 |
} |
| 122 |
|
| 123 |
each_fakegem_install() { |
| 124 |
${RUBY} install.rb --destdir="${D}" install || die |
| 125 |
} |
| 126 |
|
| 127 |
all_ruby_install() { |
| 128 |
all_fakegem_install |
| 129 |
|
| 130 |
newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die |
| 131 |
doconfd conf/gentoo/conf.d/puppetmaster || die |
| 132 |
newinitd "${FILESDIR}"/puppet.init puppet || die |
| 133 |
doconfd conf/gentoo/conf.d/puppet || die |
| 134 |
|
| 135 |
# Initial configuration files |
| 136 |
keepdir /etc/puppet/manifests || die |
| 137 |
keepdir /etc/puppet/modules || die |
| 138 |
insinto /etc/puppet |
| 139 |
|
| 140 |
# Bug #338439 |
| 141 |
#doins conf/gentoo/puppet/* || die |
| 142 |
doins conf/redhat/*.conf || die |
| 143 |
doins conf/auth.conf || die |
| 144 |
|
| 145 |
# Location of log and data files |
| 146 |
keepdir /var/run/puppet || die |
| 147 |
keepdir /var/log/puppet || die |
| 148 |
keepdir /var/lib/puppet/ssl || die |
| 149 |
keepdir /var/lib/puppet/facts || die |
| 150 |
keepdir /var/lib/puppet/files || die |
| 151 |
fowners -R puppet:puppet /var/{run,log,lib}/puppet || die |
| 152 |
|
| 153 |
if use emacs ; then |
| 154 |
elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed" |
| 155 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
| 156 |
fi |
| 157 |
|
| 158 |
if use xemacs ; then |
| 159 |
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed" |
| 160 |
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
| 161 |
fi |
| 162 |
|
| 163 |
if use ldap ; then |
| 164 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die |
| 165 |
fi |
| 166 |
|
| 167 |
if use vim-syntax ; then |
| 168 |
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die |
| 169 |
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die |
| 170 |
fi |
| 171 |
|
| 172 |
# ext and examples files |
| 173 |
for f in $(find ext examples -type f) ; do |
| 174 |
docinto "$(dirname ${f})"; dodoc "${f}" || die |
| 175 |
done |
| 176 |
docinto conf; dodoc conf/namespaceauth.conf || die |
| 177 |
} |
| 178 |
|
| 179 |
pkg_postinst() { |
| 180 |
elog |
| 181 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
| 182 |
elog "cause puppet to hang while installing packages." |
| 183 |
elog |
| 184 |
elog "Puppet uses eix to get information about currently installed packages," |
| 185 |
elog "so please keep the eix metadata cache updated so puppet is able to properly" |
| 186 |
elog "handle package installations." |
| 187 |
elog |
| 188 |
elog "Currently puppet only supports adding and removing services to the default" |
| 189 |
elog "runlevel, if you want to add/remove a service from another runlevel you may" |
| 190 |
elog "do so using symlinking." |
| 191 |
elog |
| 192 |
|
| 193 |
if [ \ |
| 194 |
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ |
| 195 |
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ |
| 196 |
-f "${EPREFIX}/etc/puppet/puppetca.conf" \ |
| 197 |
] ; then |
| 198 |
elog |
| 199 |
elog "Please remove deprecated config files." |
| 200 |
elog " /etc/puppet/puppetca.conf" |
| 201 |
elog " /etc/puppet/puppetd.conf" |
| 202 |
elog " /etc/puppet/puppetmasterd.conf" |
| 203 |
elog |
| 204 |
fi |
| 205 |
|
| 206 |
use emacs && elisp-site-regen |
| 207 |
use xemacs && xemacs-elisp-site-regen |
| 208 |
} |
| 209 |
|
| 210 |
pkg_postrm() { |
| 211 |
use emacs && elisp-site-regen |
| 212 |
use xemacs && xemacs-elisp-site-regen |
| 213 |
} |
| 214 |
|
| 215 |
|
| 216 |
|
| 217 |
1.1 app-admin/puppet/puppet-2.6.9.ebuild |
| 218 |
|
| 219 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.6.9.ebuild?rev=1.1&view=markup |
| 220 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.6.9.ebuild?rev=1.1&content-type=text/plain |
| 221 |
|
| 222 |
Index: puppet-2.6.9.ebuild |
| 223 |
=================================================================== |
| 224 |
# Copyright 1999-2011 Gentoo Foundation |
| 225 |
# Distributed under the terms of the GNU General Public License v2 |
| 226 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.9.ebuild,v 1.1 2011/06/29 17:44:07 matsuu Exp $ |
| 227 |
|
| 228 |
EAPI="3" |
| 229 |
USE_RUBY="ruby18" |
| 230 |
|
| 231 |
RUBY_FAKEGEM_TASK_DOC="" |
| 232 |
RUBY_FAKEGEM_TASK_TEST="test" |
| 233 |
RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*" |
| 234 |
|
| 235 |
inherit elisp-common xemacs-elisp-common eutils ruby-fakegem |
| 236 |
|
| 237 |
DESCRIPTION="A system automation and configuration management software" |
| 238 |
HOMEPAGE="http://puppetlabs.com/" |
| 239 |
|
| 240 |
LICENSE="GPL-2" |
| 241 |
SLOT="0" |
| 242 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs" |
| 243 |
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
| 244 |
|
| 245 |
ruby_add_rdepend " |
| 246 |
>=dev-ruby/facter-1.5.1 |
| 247 |
augeas? ( dev-ruby/ruby-augeas ) |
| 248 |
diff? ( dev-ruby/diff-lcs ) |
| 249 |
doc? ( dev-ruby/rdoc ) |
| 250 |
ldap? ( dev-ruby/ruby-ldap ) |
| 251 |
shadow? ( dev-ruby/ruby-shadow ) |
| 252 |
sqlite3? ( dev-ruby/sqlite3-ruby ) |
| 253 |
virtual/ruby-ssl" |
| 254 |
# couchdb? ( dev-ruby/couchrest ) |
| 255 |
# mongrel? ( www-servers/mongrel ) |
| 256 |
# rack? ( >=dev-ruby/rack-1 ) |
| 257 |
# rails? ( |
| 258 |
# dev-ruby/rails |
| 259 |
# >=dev-ruby/activerecord-2.1 |
| 260 |
# ) |
| 261 |
# stomp? ( dev-ruby/stomp ) |
| 262 |
|
| 263 |
DEPEND="${DEPEND} |
| 264 |
emacs? ( virtual/emacs ) |
| 265 |
xemacs? ( app-editors/xemacs )" |
| 266 |
RDEPEND="${RDEPEND} |
| 267 |
emacs? ( virtual/emacs ) |
| 268 |
xemacs? ( app-editors/xemacs ) |
| 269 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
| 270 |
selinux? ( sys-libs/libselinux[ruby] ) |
| 271 |
>=app-portage/eix-0.18.0" |
| 272 |
|
| 273 |
SITEFILE="50${PN}-mode-gentoo.el" |
| 274 |
|
| 275 |
pkg_setup() { |
| 276 |
enewgroup puppet |
| 277 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
| 278 |
} |
| 279 |
|
| 280 |
all_ruby_compile() { |
| 281 |
all_fakegem_compile |
| 282 |
|
| 283 |
if use emacs ; then |
| 284 |
elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed" |
| 285 |
fi |
| 286 |
|
| 287 |
if use xemacs ; then |
| 288 |
# Create a separate version for xemacs to be able to install |
| 289 |
# emacs and xemacs in parallel. |
| 290 |
mkdir ext/xemacs || die |
| 291 |
cp ext/emacs/* ext/xemacs/ || die |
| 292 |
xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-elisp-compile failed" |
| 293 |
fi |
| 294 |
} |
| 295 |
|
| 296 |
each_fakegem_install() { |
| 297 |
${RUBY} install.rb --destdir="${D}" install || die |
| 298 |
} |
| 299 |
|
| 300 |
all_ruby_install() { |
| 301 |
all_fakegem_install |
| 302 |
|
| 303 |
newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die |
| 304 |
doconfd conf/gentoo/conf.d/puppetmaster || die |
| 305 |
newinitd "${FILESDIR}"/puppet.init puppet || die |
| 306 |
doconfd conf/gentoo/conf.d/puppet || die |
| 307 |
|
| 308 |
# Initial configuration files |
| 309 |
keepdir /etc/puppet/manifests || die |
| 310 |
keepdir /etc/puppet/modules || die |
| 311 |
insinto /etc/puppet |
| 312 |
|
| 313 |
# Bug #338439 |
| 314 |
#doins conf/gentoo/puppet/* || die |
| 315 |
doins conf/redhat/*.conf || die |
| 316 |
doins conf/auth.conf || die |
| 317 |
|
| 318 |
# Location of log and data files |
| 319 |
keepdir /var/run/puppet || die |
| 320 |
keepdir /var/log/puppet || die |
| 321 |
keepdir /var/lib/puppet/ssl || die |
| 322 |
keepdir /var/lib/puppet/facts || die |
| 323 |
keepdir /var/lib/puppet/files || die |
| 324 |
fowners -R puppet:puppet /var/{run,log,lib}/puppet || die |
| 325 |
|
| 326 |
if use emacs ; then |
| 327 |
elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed" |
| 328 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
| 329 |
fi |
| 330 |
|
| 331 |
if use xemacs ; then |
| 332 |
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed" |
| 333 |
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
| 334 |
fi |
| 335 |
|
| 336 |
if use ldap ; then |
| 337 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die |
| 338 |
fi |
| 339 |
|
| 340 |
if use vim-syntax ; then |
| 341 |
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die |
| 342 |
insinto /usr/share/vim/vimfiles/ftplugin; doins ext/vim/ftplugin/puppet.vim || die |
| 343 |
insinto /usr/share/vim/vimfiles/indent; doins ext/vim/indent/puppet.vim || die |
| 344 |
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die |
| 345 |
fi |
| 346 |
|
| 347 |
# ext and examples files |
| 348 |
for f in $(find ext examples -type f) ; do |
| 349 |
docinto "$(dirname ${f})"; dodoc "${f}" || die |
| 350 |
done |
| 351 |
docinto conf; dodoc conf/namespaceauth.conf || die |
| 352 |
} |
| 353 |
|
| 354 |
pkg_postinst() { |
| 355 |
elog |
| 356 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
| 357 |
elog "cause puppet to hang while installing packages." |
| 358 |
elog |
| 359 |
elog "Puppet uses eix to get information about currently installed packages," |
| 360 |
elog "so please keep the eix metadata cache updated so puppet is able to properly" |
| 361 |
elog "handle package installations." |
| 362 |
elog |
| 363 |
elog "Currently puppet only supports adding and removing services to the default" |
| 364 |
elog "runlevel, if you want to add/remove a service from another runlevel you may" |
| 365 |
elog "do so using symlinking." |
| 366 |
elog |
| 367 |
|
| 368 |
if [ \ |
| 369 |
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ |
| 370 |
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ |
| 371 |
-f "${EPREFIX}/etc/puppet/puppetca.conf" \ |
| 372 |
] ; then |
| 373 |
elog |
| 374 |
elog "Please remove deprecated config files." |
| 375 |
elog " /etc/puppet/puppetca.conf" |
| 376 |
elog " /etc/puppet/puppetd.conf" |
| 377 |
elog " /etc/puppet/puppetmasterd.conf" |
| 378 |
elog |
| 379 |
fi |
| 380 |
|
| 381 |
use emacs && elisp-site-regen |
| 382 |
use xemacs && xemacs-elisp-site-regen |
| 383 |
} |
| 384 |
|
| 385 |
pkg_postrm() { |
| 386 |
use emacs && elisp-site-regen |
| 387 |
use xemacs && xemacs-elisp-site-regen |
| 388 |
} |
Archives