Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-admin/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/puppet')
-rw-r--r--app-admin/puppet/ChangeLog8
-rwxr-xr-xapp-admin/puppet/files/puppet.init6
-rwxr-xr-xapp-admin/puppet/files/puppetmaster.init6
-rw-r--r--app-admin/puppet/puppet-0.24.7-r1.ebuild148
-rw-r--r--app-admin/puppet/puppet-0.24.8-r1.ebuild4
-rw-r--r--app-admin/puppet/puppet-0.24.8.ebuild130
6 files changed, 15 insertions, 287 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 401db19b95de..ed4332563d93 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/puppet
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.40 2009/05/19 15:41:56 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.41 2009/07/21 22:12:15 matsuu Exp $
+
+ 21 Jul 2009; MATSUU Takuto <matsuu@gentoo.org> -puppet-0.24.7-r1.ebuild,
+ -puppet-0.24.8.ebuild, puppet-0.24.8-r1.ebuild, files/puppet.init,
+ files/puppetmaster.init:
+ Removed ruby19 from USE_RUBY, bug #276788. Added localmount, netmount and
+ nfsmount to init script, bug #278593. Removed old versions.
19 May 2009; Ferris McCormick <fmccor@gentoo.org> puppet-0.24.8-r1.ebuild:
Sparc stable, Bug #270432.
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
index 27b453024750..9aeebfd39595 100755
--- a/app-admin/puppet/files/puppet.init
+++ b/app-admin/puppet/files/puppet.init
@@ -1,10 +1,10 @@
#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
depend() {
- need net
- use dns logger puppetmaster
+ need localmount net
+ use dns logger puppetmaster netmount nfsmount
}
checkconfig() {
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
index 03297cb489c5..56fcb1dca711 100755
--- a/app-admin/puppet/files/puppetmaster.init
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -1,10 +1,10 @@
#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
depend() {
- need net
- use dns logger slapd
+ need localmount net
+ use dns logger slapd netmount nfsmount
}
checkconfig() {
diff --git a/app-admin/puppet/puppet-0.24.7-r1.ebuild b/app-admin/puppet/puppet-0.24.7-r1.ebuild
deleted file mode 100644
index abb8a9bef562..000000000000
--- a/app-admin/puppet/puppet-0.24.7-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.7-r1.ebuild,v 1.2 2009/04/07 00:04:56 matsuu Exp $
-
-inherit elisp-common eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://reductivelabs.com/projects/puppet"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="emacs ldap rrdtool vim-syntax"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="emacs? ( virtual/emacs )
- >=dev-ruby/facter-1.5.0"
-RDEPEND="${DEPEND}
- >=app-portage/eix-0.9.4
- ldap? ( dev-ruby/ruby-ldap )
- rrdtool? (
- || (
- >=net-analyzer/rrdtool-1.2.23
- dev-ruby/ruby-rrd
- )
- )"
-# || (
-# www-servers/webrick
-# www-servers/mongrel
-# )
-# dev-ruby/diff-lcs
-# dev-ruby/rails
-# dev-ruby/ruby-shadow
-
-USE_RUBY="ruby18 ruby19"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
- built_with_use virtual/ruby ipv6 || \
- die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
-
- built_with_use virtual/ruby ssl || \
- die "Ruby must be built with ssl support, otherwise puppet will not be able to run"
-
- if use rrdtool && \
- has_version '>=net-analyzer/rrdtool-1.2.23' && \
- ! built_with_use '>=net-analyzer/rrdtool-1.2.23' ruby
- then
- die "net-analyzer/rrdtool must be built with ruby USE flag."
- fi
-
- enewgroup puppet
- enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${PN}-0.24.6-eix.patch"
-}
-
-src_compile() {
- if use emacs ; then
- elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
- fi
-}
-
-src_install() {
- DESTDIR="${D}" ruby_einstall "$@" || die
- DESTDIR="${D}" erubydoc
-
- #
- # bug #237071
- #
- #doinitd conf/gentoo/init.d/puppetmaster
- newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
- #doconfd conf/gentoo/conf.d/puppetmaster
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
- #doinitd conf/gentoo/init.d/puppet
- newinitd "${FILESDIR}"/puppet.init puppet
- doconfd conf/gentoo/conf.d/puppet
-
- # Initial configuration files
- keepdir /etc/puppet/manifests
- insinto /etc/puppet
- doins conf/gentoo/puppet/*
-
- # Location of log and data files
- keepdir /var/run/puppet
- keepdir /var/log/puppet
- keepdir /var/lib/puppet/ssl
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/{run,log,lib}/puppet
-
- if use emacs ; then
- elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- if use ldap ; then
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
- insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
- fi
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"; dodoc "${f}"
- done
- docinto conf; dodoc conf/namespaceauth.conf
-}
-
-pkg_postinst() {
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Puppet uses eix to get information about currently installed packages,"
- elog "so please keep the eix metadata cache updated so puppet is able to properly"
- elog "handle package installations."
- elog
- elog "Currently puppet only supports adding and removing services to the default"
- elog "runlevel, if you want to add/remove a service from another runlevel you may"
- elog "do so using symlinking."
- elog
-
- if [ \
- -f "${ROOT}/etc/puppet/puppetd.conf" -o \
- -f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
- -f "${ROOT}/etc/puppet/puppetca.conf" \
- ] ; then
- elog
- elog "Please remove deprecated config files."
- elog " /etc/puppet/puppetca.conf"
- elog " /etc/puppet/puppetd.conf"
- elog " /etc/puppet/puppetmasterd.conf"
- elog
- fi
- use emacs && elisp-site-regen
-}
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-0.24.8-r1.ebuild b/app-admin/puppet/puppet-0.24.8-r1.ebuild
index eedd2ef3f956..15542b86c05e 100644
--- a/app-admin/puppet/puppet-0.24.8-r1.ebuild
+++ b/app-admin/puppet/puppet-0.24.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.8-r1.ebuild,v 1.2 2009/05/19 15:41:56 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.8-r1.ebuild,v 1.3 2009/07/21 22:12:15 matsuu Exp $
EAPI="2"
inherit elisp-common eutils ruby
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}
# dev-ruby/diff-lcs
# dev-ruby/rails
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
SITEFILE="50${PN}-mode-gentoo.el"
diff --git a/app-admin/puppet/puppet-0.24.8.ebuild b/app-admin/puppet/puppet-0.24.8.ebuild
deleted file mode 100644
index 4e42d899f13c..000000000000
--- a/app-admin/puppet/puppet-0.24.8.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.8.ebuild,v 1.5 2009/04/19 11:47:43 hollow Exp $
-
-EAPI="2"
-inherit elisp-common eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://reductivelabs.com/projects/puppet"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="dev-lang/ruby[ssl]
- emacs? ( virtual/emacs )
- >=dev-ruby/facter-1.5.0"
-RDEPEND="${DEPEND}
- >=app-portage/eix-0.9.4
- augeas? ( dev-ruby/ruby-augeas )
- ldap? ( dev-ruby/ruby-ldap )
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- shadow? ( dev-ruby/ruby-shadow )"
-# || (
-# www-servers/webrick
-# www-servers/mongrel
-# )
-# dev-ruby/diff-lcs
-# dev-ruby/rails
-
-USE_RUBY="ruby18 ruby19"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-0.24.6-eix.patch"
-}
-
-src_compile() {
- if use emacs ; then
- elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
- fi
-}
-
-src_install() {
- DESTDIR="${D}" ruby_einstall "$@" || die
- DESTDIR="${D}" erubydoc
-
- #
- # bug #237071
- #
- #doinitd conf/gentoo/init.d/puppetmaster
- newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
- #doconfd conf/gentoo/conf.d/puppetmaster
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
- #doinitd conf/gentoo/init.d/puppet
- newinitd "${FILESDIR}"/puppet.init puppet
- doconfd conf/gentoo/conf.d/puppet
-
- # Initial configuration files
- keepdir /etc/puppet/manifests
- insinto /etc/puppet
- doins conf/gentoo/puppet/*
-
- # Location of log and data files
- keepdir /var/run/puppet
- keepdir /var/log/puppet
- keepdir /var/lib/puppet/ssl
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/{run,log,lib}/puppet
-
- if use emacs ; then
- elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- if use ldap ; then
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
- insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
- fi
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"; dodoc "${f}"
- done
- docinto conf; dodoc conf/namespaceauth.conf
-}
-
-pkg_postinst() {
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Puppet uses eix to get information about currently installed packages,"
- elog "so please keep the eix metadata cache updated so puppet is able to properly"
- elog "handle package installations."
- elog
- elog "Currently puppet only supports adding and removing services to the default"
- elog "runlevel, if you want to add/remove a service from another runlevel you may"
- elog "do so using symlinking."
- elog
-
- if [ \
- -f "${ROOT}/etc/puppet/puppetd.conf" -o \
- -f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
- -f "${ROOT}/etc/puppet/puppetca.conf" \
- ] ; then
- elog
- elog "Please remove deprecated config files."
- elog " /etc/puppet/puppetca.conf"
- elog " /etc/puppet/puppetd.conf"
- elog " /etc/puppet/puppetmasterd.conf"
- elog
- fi
- use emacs && elisp-site-regen
-}
-pkg_postrm() {
- use emacs && elisp-site-regen
-}