Added vim-syntax USE flag, bug #208399.

Fixed ensure running services issue, bug #209218.
(Portage version: 2.1.3.19)

3 files changed, 138 insertions, 1 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index a25bad81639c..2ee0fecad378 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.9 2008/01/07 14:46:41 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.10 2008/02/07 16:45:04 matsuu Exp $
+
+*puppet-0.24.1-r1 (07 Feb 2008)
+
+  07 Feb 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/puppet-0.24.1-service.patch, +puppet-0.24.1-r1.ebuild:
+  Added vim-syntax USE flag, bug #208399.
+  Fixed ensure running services issue, bug #209218.
 
 *puppet-0.24.1 (07 Jan 2008)
 
diff --git a/app-admin/puppet/files/puppet-0.24.1-service.patch b/app-admin/puppet/files/puppet-0.24.1-service.patch
new file mode 100644
index 000000000000..e7aed5adcf2b
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.24.1-service.patch
@@ -0,0 +1,14 @@
+diff -Naur puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb puppet-0.24.1/lib/puppet/provider/service/gentoo.rb
+--- puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/lib/puppet/provider/service/gentoo.rb	2008-02-08 01:41:22.000000000 +0900
+@@ -8,6 +8,10 @@
+ 
+     defaultfor :operatingsystem => :gentoo
+ 
++    def self.defpath
++       superclass.defpath
++    end
++
+     def disable
+         begin
+             output = update :del, @resource[:name], :default
diff --git a/app-admin/puppet/puppet-0.24.1-r1.ebuild b/app-admin/puppet/puppet-0.24.1-r1.ebuild
new file mode 100644
index 000000000000..6a9f1788ea0e
--- /dev/null
+++ b/app-admin/puppet/puppet-0.24.1-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.1-r1.ebuild,v 1.1 2008/02/07 16:45:04 matsuu Exp $
+
+inherit elisp-common eutils ruby
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
+SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="emacs vim-syntax"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	>=dev-ruby/facter-1.3.5
+	>=app-portage/eix-0.9.4"
+
+USE_RUBY="ruby18"
+
+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"
+
+	enewgroup puppet || die "Problem creating group puppet"
+	enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-service.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
+
+	# Installation of init scripts and configuration
+	doinitd conf/gentoo/init.d/puppetmaster
+	doconfd conf/gentoo/conf.d/puppetmaster
+	doinitd conf/gentoo/init.d/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 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
+}
+
+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
+}