Fixed init.d scripts for filepath issue.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 224 insertions, 2 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 1ff565c3104f..239281283375 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.44 2009/08/29 17:50:11 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.45 2009/09/04 16:07:20 matsuu Exp $
+
+*puppet-0.25.0_rc1-r1 (04 Sep 2009)
+
+  04 Sep 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +puppet-0.25.0_rc1-r1.ebuild, +files/puppet-0.25.init,
+  +files/puppetmaster-0.25.init:
+  Fixed init.d scripts for filepath issue.
 
   29 Aug 2009; nixnut <nixnut@gentoo.org> puppet-0.24.8-r1.ebuild:
   ppc stable #270432
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0914fc7583e5..b4f8fa4939e1 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -3,7 +3,9 @@ AUX puppet-0.24.2-gentoo.patch 628 RMD160 9149d2b68a82a87dc4bcdae3ef5608ca0f1529
 AUX puppet-0.24.4-openrc_initd.patch 624 RMD160 1cc74a411a961f13e752fb2f05a21f102118e220 SHA1 3fa676dd62d7e7efffbd1888effe6b19d18b3d95 SHA256 c723c1f2bb56e6013b8d4deeba0ce73c7c798508d4425dbd18a280719babeb0b
 AUX puppet-0.24.6-eix.patch 2228 RMD160 a2465eba3775cacb54d9e20f97efd6cbb3e91627 SHA1 17e828e676d6e8f6abd7b008ca250e69557b2ea9 SHA256 d822a12eaaa6eaf8316fe04fc6c9b654f0427e4d80fb6c5cd15ca2a7368bb754
 AUX puppet-0.24.8-rc-update-show.patch 961 RMD160 2fed961a81b4e5b7659db3c587b17e81ea463bc5 SHA1 832b1a2bd32e6efc0764fa82bf4ef9f705348df3 SHA256 94a32f3d969d00de29564f895426f8c7c9cdbe6b8962d051a4f28b02efa17449
+AUX puppet-0.25.init 923 RMD160 2133414233baee5f12542618747a6ccc278e8df9 SHA1 a009d9d266a49ca8065dec62cb7828a5ae550a48 SHA256 e60dfe6639ef591b4e9795499b7abe872a4069212e8beac72a2b1e6541ca98df
 AUX puppet.init 922 RMD160 428dca973054f771b829bc24781b75ba5ccf3ef1 SHA1 bea4c5e97c2749be6874516beb71f501d3fbb1d3 SHA256 c355dfb24bb73ff21a750a73513518620cde2c63f0969074d81c60bb4e315425
+AUX puppetmaster-0.25.init 1006 RMD160 9b1878992fc0380cbacf7c1eada2e6a283749a26 SHA1 3dfa2be66706183518a03b7a7a52da66d4934d45 SHA256 6a2acb189cfe4541348fd16c4e48e6a2fd97f59cd36f314c32d9c7fd3fb00d2c
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
 AUX puppetmaster.init 1005 RMD160 eca4418abb7b6de674e7580f949b27f73b3c9b59 SHA1 3efa92e55e7f1df55d384b59b36704f6a0ee42d8 SHA256 c3a658b778d89084fa8a21b477c7caf77f59e82bb1bef8c8086afed533da5a3a
 DIST puppet-0.24.4.tgz 652572 RMD160 e675d27216dfeb3717c8140d3c89625e6be351e9 SHA1 e79671d8765e08df93c6a4c76b198467c3e13a7a SHA256 0d54f6db7cf1210d123264bcb35b07b36837ebc12a4f2bd01aee6127836adfb9
@@ -11,6 +13,7 @@ DIST puppet-0.24.8.tgz 1099188 RMD160 edb187da9225c9faee9839a5d644b5c9c91f3d5f S
 DIST puppet-0.25.0rc1.tar.gz 1391184 RMD160 aae58abf32210a85be6c8d0b1936d1118d837d7b SHA1 159fd33368727a2b090c300414fbdd847c159ec2 SHA256 197037212db27e6a91b392d9ac38474c9fb0ac4db0c65e54e460b4bf6c411dfd
 EBUILD puppet-0.24.4.ebuild 3384 RMD160 4ff3c32277999475dcfe32f86d9edc18b3d3f249 SHA1 6269ed7fd264796547b8f62acd3144100a7ec066 SHA256 13190bbb1a61010e42d7f9b21f9b86873a550b2257d29ab47953923290015e00
 EBUILD puppet-0.24.8-r1.ebuild 3606 RMD160 6e362f409da47e02e636c62526810759b8149ad5 SHA1 4c525585ff4ec0aa557be3315c06ec5aeb177ebe SHA256 33c496a5adba0a2a24b0dba5cef117b3c0de184babb2da3a345c106f3d12a3de
+EBUILD puppet-0.25.0_rc1-r1.ebuild 3610 RMD160 4bc4e1fe8032784e87bdcaafaa1574080f0f2ddc SHA1 f4a480d1fee966d78cd374b69e7b108fa3fea38a SHA256 ec62b1a0b2238f07ae00bbda0218e8242e9197e5a6d2e06dafee171a9e5b4b08
 EBUILD puppet-0.25.0_rc1.ebuild 3597 RMD160 bdfa06684fc6e88a6bd965f321a81195862d1ab5 SHA1 f4c48bc9cec8bad94aaf9ee09f0a8debc0b88dab SHA256 f65d4a489e8e69cbd9e6f375d1e4c26942ed712889891d34669b532c99d7ae4a
-MISC ChangeLog 8258 RMD160 a1c3e0618bb3b6d451e970c2c92ac7d1232f43c0 SHA1 92ca876d365022a049883835e417f36f0d0284a1 SHA256 3c61db5f4113c091aa6d15a76f8a36d5c106e5b9a846299acf19f4ff1ae01e2e
+MISC ChangeLog 8478 RMD160 1246730690e1072171e7dadd0e421cb7c9b777b4 SHA1 2c72b244a4fb499f707736b4bf4f6917030317da SHA256 9e7e5bfb0b2a56eeff41aadc6ea7fafc468ead96e3ce7ac0176dd1bec7d872fb
 MISC metadata.xml 1104 RMD160 c2e40f737c1f334d2d4e7a34e1dba61b53ebdfff SHA1 ab42f340e0d8add11e9c4cd6c6791f3cc5ec6484 SHA256 c228b29cc44ea8fe2545f43d05688bc6364395adf7cf2d86290d25e86207fefb
diff --git a/app-admin/puppet/files/puppet-0.25.init b/app-admin/puppet/files/puppet-0.25.init
new file mode 100755
index 000000000000..2a11820351de
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.25.init
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount net
+	use dns logger puppetmaster netmount nfsmount
+}
+
+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
+
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	local options=""
+	[ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}"
+
+	ebegin "Starting puppet"
+	start-stop-daemon --start --quiet \
+		--pidfile "${PUPPET_PID_DIR}/puppetd.pid" \
+		--exec /usr/sbin/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}
+}
diff --git a/app-admin/puppet/files/puppetmaster-0.25.init b/app-admin/puppet/files/puppetmaster-0.25.init
new file mode 100755
index 000000000000..a543e99405a2
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster-0.25.init
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount net
+	use dns logger slapd netmount nfsmount
+}
+
+checkconfig() {
+	if [ ! -d "${PUPPETMASTER_PID_DIR}" ] ; then
+		eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	local options=""
+	[ -n "${PUPPETMASTER_EXTRA_OPTS}" ] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
+
+	ebegin "Starting puppetmaster"
+	start-stop-daemon --start --quiet \
+		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" \
+		--exec /usr/sbin/puppetmasterd -- ${options}
+	eend $? "Failed to start puppetmaster"
+}
+
+stop() {
+	ebegin "Stopping puppetmaster"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
+	local ret=$?
+	eend ${ret} "Failed to stop puppetmaster"
+	rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
+	return ${ret}
+}
diff --git a/app-admin/puppet/puppet-0.25.0_rc1-r1.ebuild b/app-admin/puppet/puppet-0.25.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..b2205746cbe2
--- /dev/null
+++ b/app-admin/puppet/puppet-0.25.0_rc1-r1.ebuild
@@ -0,0 +1,132 @@
+# 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.25.0_rc1-r1.ebuild,v 1.1 2009/09/04 16:07:20 matsuu Exp $
+
+EAPI="2"
+inherit elisp-common eutils ruby
+
+MY_P="${P/_}"
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://reductivelabs.com/projects/puppet"
+SRC_URI="http://reductivelabs.com/downloads/${PN}/${MY_P}.tar.gz"
+
+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
+
+S="${WORKDIR}/${MY_P}"
+USE_RUBY="ruby18"
+
+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-0.25.init puppetmaster
+	#doconfd conf/gentoo/conf.d/puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+	#doinitd conf/gentoo/init.d/puppet
+	newinitd "${FILESDIR}"/puppet-0.25.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
+}