Fixed init.d issue again, bug #237712. Added ldap and rrdtool USE flags, bug #237717.

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 x86_64

6 files changed, 191 insertions, 35 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index bbe7b18bb3cf..d629db786cf9 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.22 2008/09/15 00:35:23 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.23 2008/09/24 14:49:03 matsuu Exp $
+
+*puppet-0.24.5-r2 (24 Sep 2008)
+
+  24 Sep 2008; MATSUU Takuto <matsuu@gentoo.org> files/puppet.init,
+  files/puppetmaster.init, metadata.xml, +puppet-0.24.5-r2.ebuild:
+  Fixed init.d issue again, bug #237712. Added ldap and rrdtool USE flags,
+  bug #237717.
 
   15 Sep 2008; MATSUU Takuto <matsuu@gentoo.org> puppet-0.24.4.ebuild,
   -puppet-0.24.5.ebuild, puppet-0.24.5-r1.ebuild:
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 644cd0bac896..a24024df03b1 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,11 +1,12 @@
 AUX 50puppet-mode-gentoo.el 257 RMD160 c8ee412f60fed83c44091bb56d18e200bb0c7e03 SHA1 208a9a008dec0de89839c71e4d3a86c08be6931d SHA256 1dbae981327dd736b9e0b0a63be0bc6bf662eeb51506da60394f9c9a9b314fde
 AUX puppet-0.24.2-gentoo.patch 628 RMD160 9149d2b68a82a87dc4bcdae3ef5608ca0f152973 SHA1 d7bd432ef27be9dc14dc4e37b8302659caa0f3f4 SHA256 abc592df144baec0c93cc90459ab273fe2aec9f195670ca5dba5d8bc4e6ee886
 AUX puppet-0.24.4-openrc_initd.patch 624 RMD160 1cc74a411a961f13e752fb2f05a21f102118e220 SHA1 3fa676dd62d7e7efffbd1888effe6b19d18b3d95 SHA256 c723c1f2bb56e6013b8d4deeba0ce73c7c798508d4425dbd18a280719babeb0b
-AUX puppet.init 1080 RMD160 cef3b7177d46777444e9b4c8854336a389bde554 SHA1 3ddbabedada1ba35d1237fd0dab1bd5e7c878efe SHA256 ad0309778c20cba24c320eca4425f1546a77e4b6d16445e4236152ca3d7746dc
-AUX puppetmaster.init 1374 RMD160 a367064b0a659e28b326a259cc9f9ce028d691a5 SHA1 a2fbf7a6144889d5fdc78bf5a760fb43a6145ed4 SHA256 7871fc9710541f7b257d7069df1aaef2120420f3dec53a17b442e63a7bbb0141
+AUX puppet.init 884 RMD160 e91c0d01cab6a069e701f22f4962c955c42d8b09 SHA1 4c8b0b88e2a00dc836f0aa3b3ff04635bf662cff SHA256 d3b84279f21cc7c895ea6f99bd2beacbf8ccd30f0039c9385f33ed7f77f514e0
+AUX puppetmaster.init 1448 RMD160 6f50aa652015241078b3306009196f4009905566 SHA1 49320c70dcabe066cb057cc8d7be0400c7e844ca SHA256 cf0f78b4b656b70e81a9dfe0e834963cbcecc4d966114a92e90e42800a64333b
 DIST puppet-0.24.4.tgz 652572 RMD160 e675d27216dfeb3717c8140d3c89625e6be351e9 SHA1 e79671d8765e08df93c6a4c76b198467c3e13a7a SHA256 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9
 DIST puppet-0.24.5.tgz 872803 RMD160 be85ce18ce6a56939eaf83c60cc55d1c5134ef36 SHA1 fe3d63bf30169eb6ec2b30e43d489a51bb36d090 SHA256 0b5ff82b06699a5d10b2ee6e995f427b76540cc0e67ffa8243ee6fc03d8e641d
 EBUILD puppet-0.24.4.ebuild 3269 RMD160 1e94112b41772cf206799ac18e46a55fa4bd616c SHA1 f213a6b927f9daefc0b2e8f0b5dc9dbe5ecd69a5 SHA256 177b3d1c9613c42eae6966119c13e7ea71ccb849dd1c6730339fa4f8d60efbc1
 EBUILD puppet-0.24.5-r1.ebuild 3229 RMD160 66b9bfc732908fcac806a7b92f82a959d0d4c179 SHA1 5a2d083f1f4301f78714d32252bb80db3d104639 SHA256 a955b77b0a328051b278e171bcd3702cfd8c87dfd5f11bf4ebe89c1818e214e8
-MISC ChangeLog 4191 RMD160 6d3e47df53aeaad0983b8a15b310862a8f710534 SHA1 8b6f2c4da5da86917da0f875cd1561c30e6e3cf2 SHA256 e679a7ed4474eece582ddd1fab6d93072cde6c3b0f4f901c1dae771289530fbe
-MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
+EBUILD puppet-0.24.5-r2.ebuild 3452 RMD160 cdab25cb03e1d312c9676694eaceedd518aff7bc SHA1 bd6beb82d77174051100128337518f25f3c0fa52 SHA256 a8efc94ad10a84ce38a91206b032036076531a033d31c75ca4b283ac96175c3c
+MISC ChangeLog 4450 RMD160 85a7e786236d8cc0b79c118de60b015fd0556c9b SHA1 0d5a978ff893cf9de9af8c8fdf5dfffe88bc7cc4 SHA256 7f95cc3fa52f2995b9df0aa14f350c452b5a9e2b3042b7471d2db21c3ffbb101
+MISC metadata.xml 1002 RMD160 172f4fc2883017a49b71d7e48c558bbc6c54770b SHA1 0386fcc01ff39593cf1755051a3d1283e6b4f2b7 SHA256 eb49ad59455c53c1666eeca292c0670b399968f9e10e9017b88f1e206098f8a5
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
index 019b51680ac7..e909f88aa6e7 100755
--- a/app-admin/puppet/files/puppet.init
+++ b/app-admin/puppet/files/puppet.init
@@ -1,38 +1,40 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init,v 1.1 2008/09/09 09:20:05 matsuu Exp $
 
 depend() {
-        need net
-        use dns logger
+	need net
+	use dns logger
 }
 
 checkconfig() {
-        if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then
-               eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
-               return 1
-        fi
+	if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then
+		eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
+		return 1
+	fi
 
-        return 0
+	return 0
 }
 
 start() {
-        checkconfig || return $?
+	checkconfig || return $?
 
-        local options=""
-        [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}"
+	local options=""
+	[[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}"
 
-        ebegin "Starting puppet"
-        start-stop-daemon --start --quiet --exec /usr/bin/puppetd -- ${options}
-        eend $? "Failed to start puppet"
+	ebegin "Starting puppet"
+	start-stop-daemon --start --quiet \
+		--pidfile "${PUPPET_PID_DIR}/puppetd.pid" \
+		--exec /usr/bin/puppetd -- ${options}
+	eend $? "Failed to start puppet"
 }
 
 stop() {
-        ebegin "Stopping puppet"
-        start-stop-daemon --stop --quiet --pidfile ${PUPPET_PID_DIR}/puppetd.pid
-        local ret=$?
-        eend ${ret} "Failed to stop puppet"
-        rm -f ${PUPPET_PID_DIR}/puppetd.pid
-        return ${ret}
+	ebegin "Stopping puppet"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${PUPPET_PID_DIR}/puppetd.pid"
+	local ret=$?
+	eend ${ret} "Failed to stop puppet"
+	rm -f "${PUPPET_PID_DIR}/puppetd.pid"
+	return ${ret}
 }
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
index e5ff580f6758..4cc59794ba84 100755
--- a/app-admin/puppet/files/puppetmaster.init
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -4,6 +4,7 @@
 
 depend() {
 	need net
+	after slapd
 	before puppet
 	use dns logger
 }
@@ -34,18 +35,18 @@ start() {
 	[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
 
 	ebegin "Starting puppetmaster"
-	start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \
-		-- ${options}
+	start-stop-daemon --start --quiet \
+		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" \
+		--exec /usr/bin/puppetmasterd -- ${options}
 	eend $? "Failed to start puppetmaster"
 }
 
 stop() {
 	ebegin "Stopping puppetmaster"
 	start-stop-daemon --stop --quiet \
-		--pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
 	local ret=$?
 	eend ${ret} "Failed to stop puppetmaster"
-	rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+	rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
 	return ${ret}
 }
-
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index 70313d27d4f6..3d84a31e5dbe 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -1,8 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>matsuu@gentoo.org</email>
-</maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>matsuu@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Centralised configuration management for networks
+		Puppet lets you centrally manage every important aspect of your system
+		using a cross-platform specification language that manages all the
+		separate elements normally aggregated in different files, like users,
+		cron jobs, and hosts, along with obviously discrete elements like
+		packages, services, and files.
+
+		Puppet's simple declarative specification language provides powerful
+		classing abilities for drawing out the similarities between hosts while
+		allowing them to be as specific as necessary, and it handles dependency
+		and prerequisite relationships between objects clearly and explicitly.
+	</longdescription>
+	<use>
+		<flag name='rrdtool'>Eanble rrdtool support</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/puppet/puppet-0.24.5-r2.ebuild b/app-admin/puppet/puppet-0.24.5-r2.ebuild
new file mode 100644
index 000000000000..bacc1b5d7185
--- /dev/null
+++ b/app-admin/puppet/puppet-0.24.5-r2.ebuild
@@ -0,0 +1,129 @@
+# 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.5-r2.ebuild,v 1.1 2008/09/24 14:49:03 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 ldap rrdtool vim-syntax"
+#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="emacs? ( virtual/emacs )
+	>=dev-ruby/facter-1.1.0"
+RDEPEND="${DEPEND}
+	>=app-portage/eix-0.9.4
+	ldap? ( dev-ruby/ruby-ldap )
+	rrdtool? ( 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"
+
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.24.2-gentoo.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
+	#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 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
+}