Remove reload option from init script as it's broken. See bug #462640.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 205 insertions, 9 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index b8cc261e4fde..c9e48dfd4c26 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.153 2013/03/19 19:19:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.154 2013/03/22 13:24:34 flameeyes Exp $
+
+*puppet-3.1.1-r1 (22 Mar 2013)
+
+  22 Mar 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/puppetmaster.init-r1, +puppet-3.1.1-r1.ebuild:
+  Remove reload option from init script as it's broken. See bug #462640.
 
   19 Mar 2013; Diego E. Pettenò <flameeyes@gentoo.org> files/puppet.init-r1,
   files/puppetmaster.init:
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 3a099f40e8db..c5f334f467ca 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -11,20 +11,22 @@ AUX puppetmaster-2.7.6.init 867 SHA256 3fc62b4850ccd38517d9617671bef2a5d80414738
 AUX puppetmaster-2.7.6.init-CVE-2012-6120 1066 SHA256 4f71739cef2abcc9bb861b744af6c88898032b8a44b145aa2ca1bb7121502c57 SHA512 05268387980aad5a0299aeca114c7285377ca1f1a91af9008366d37d21c64830c5db1b8a19f176eeb8239d616c0499996c6d0082e29de81d3945d3009fb30a90 WHIRLPOOL 8c753fc6a8bba8ec7dad5e02021d8e97e24044c3a90bb0d51682ffd9bfa5c3de6e31fae3154573f4fc2c8f72b622148f51b5f846612868b39257a0becfdc1a44
 AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
 AUX puppetmaster.init 1089 SHA256 8e4ae53b115ec5379961af6e9f822b2d8cfa59241d7d62d3bb8f81600fcd98d9 SHA512 3cedb45ec1c9b29b6c4e8392aa610b866c99fb2204c70d5c149090478bc42ac9454091bdec5155358b662167964a61c82307243839f923f5b15eca9e28a360e6 WHIRLPOOL cb86be91131d65e6f6a54b330e82f551dadb46725b7c882ca0fae3a501adf68f0069204351c57e2b6d69f6704846c9f7ab1aa2c3162ffd9afa93cce386ca991e
+AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b868192e6cf4e6f1f392830 SHA512 b0b08592464111791470b126fef0ba20863dbcb011752cccc7c24303544cbbaf12fefb37eb17ad88551ced4d5d6bf2a4f81fd93e84506411f7b8b51053d34e42 WHIRLPOOL 4027629f5d188ba1a96fb0796ff5a8c8c2887936f2f9a5a4fc41a719be9a48ad4c114b2918437e6b812f01bfcbf22e2b4617092bff84b2b76c107db4c5dfc29b
 DIST puppet-2.7.21.gem 2031616 SHA256 a5eecdbe68cde5ebfd576a9af5ddb0c8c17dae224a7d0b3ec240ef54e6bd88a1 SHA512 638c188b945791fe86c1657343f9d7ec3ef7e86342c35e03dacfae4e99e63d8c09160dd1faf840f244b275e6a0aea3b969668debe9dc1b60cef68cb2513068b5 WHIRLPOOL a4bcb4181e57bda6aaf79fdd484903114e94dcf5196105203538d6d8a1bfefcd6db44f74cbef1c209b086d7b2bfab53d62069da1be034e6c35fe686fd00898bc
 DIST puppet-3.1.1.tar.gz 1587190 SHA256 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d SHA512 48759776b68f83a125a0c703ecc9ad3efe34f10e6cfd9ddcd9e596ff082c9f40bdb7e0489bf7eb0bb0ce8bdb4ad0ae87049d2ad3133e839d0a5a6caa8419074e WHIRLPOOL d7152ba5397edadba9784f3c1800c8cf31ddd547691b35567ad52a42e82e741256326d2ee0bccec0642e82f533ffb74babcaddf3a0ee54361626b875cc618b2f
 EBUILD puppet-2.7.21.ebuild 4731 SHA256 bfe02b716ade3d16d07f1faed6f76b70e91f03a3c4bc75d80815a6963637af6c SHA512 6483b205b96b62ca29378b51bf188b6d0367b389ad4bac4afc5a5b86eb164764dee87da00e0027dbc17eb634ab938bc550b7b98019948cab14d9cbd4ccdb5e52 WHIRLPOOL c876e707366ec3d058db8ee696e3e3b781502b4f8b5da2c6416c1fa0979dd7a9ddcc3278c7dffdbc6c3ad3c8313b9f2036872461e1538595192192cdeb98a697
+EBUILD puppet-3.1.1-r1.ebuild 4233 SHA256 fb00642ac6f410927720448f0c80a1519c1282c47b76bb9ca1961692fbbe27fa SHA512 8281161f77d2c68c7355e1d223b0cc7bb0205f8e9b7131a6b08a62f6ad12fb1fa32064bd46bc092d8c1414867d7068f57c1a8c07c1ee046e7cf0a94b3d13c83b WHIRLPOOL f3e0c92209782602f06dcf3c05e2b0f8bc0eda64594505a4df3690baf3bd2a7511b8cd2b3179a948443cf0bf96ee531de0b2720f3b98f84596bfc15156e6b030
 EBUILD puppet-3.1.1.ebuild 4232 SHA256 4830d8083f7adff8b38bc367225d8a514513cb90d8e31b11d9fe7d4b99b46c29 SHA512 384f9f6e82d306390d67b6516fc82a27cc336d6166147825888b35dc49237d34015877ff1b3bdea4cf283d3b3810e007ca66654caa303038986abc1a17cd13e4 WHIRLPOOL a88bd973a41fe9c6050fba047904650df11582e48a5cde27a2eb80b341cb6b79634a46de01ce85cc75755f266e3a8634028be470352585e79e0a9ccd9423d877
-MISC ChangeLog 25060 SHA256 e06c81a05374db53134e6b5d7add223de1ff4cb1c299974db9699e82218d172d SHA512 014c220b763bf0b051302290e4837b242c9766a5a1b2f19338c2c022208072446a258d62f5d662e085a7d92587ce6cdabf0ce828edede7e198a3865ae1ba1925 WHIRLPOOL 2b3944fe9577eb81233d73cdf60f7e272d77e98f345bc8ca03305cde3b03df9a1cf6dbc2ac0758fa64884e8eadf6f859962787ab5694bd82fa6b59214db542ed
+MISC ChangeLog 25278 SHA256 0ad1f50d81c91db48608d3c71db2d7bbfef1857a349fb7ed5066f3c55e0790c5 SHA512 b9d626a2e85d0f398ab91c9984c4791de80570347ea3df43cf797b0c3cf1a93bb60e02c6050b1f9049e9bfc8a3845286b624f38f9eac1996c53a6b528c244b0f WHIRLPOOL 65d1fc6715da98dcac16ec4fb4b9c327990993f6c0f0259282659922461931fb0780724f038d3d807bd60a058f784f2e4d5dbd948f0d4650a61581f2a7f6d5dc
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRSLpwAAoJEBzRPIrUMBNClf8H/1NX4S3TLGh4+nahsMI5YOXA
-pHvebK3UUe0V5Pm/t+CiI23CNkQokeu6WX5CgzjT+9r5ZMEKB3kXoN+7leHGYSWB
-mIc7zje2R9dKPQTs4NVwbGJsrAlg79BrsTqmSAlmT1BsTPfMjq34WzOUClCG5dQA
-nlVEC+VIsGRznC2EQz8MfevqlQtAaBdnryI+KRBLLGVT1g+MIsLD0P+gU0tweXvk
-SJO8X4ftW+CewGIbTdsNUGTDorFn1+g9TMmSMxTo7KM4UgR1Vkx9QsvnZXKd94Xj
-xowCik8q2jgFMeCWHCy4/+O2RbEu+3Sf2CKj8dG9WsUvvlKIZW2AwZvR0NGgrUA=
-=cnV2
+iQEcBAEBCAAGBQJRTFugAAoJEBzRPIrUMBNC/8sIAJ2p6a5L35nfHVO3ULuicPEm
+/BEGSkyLMvLU6EpxQQPdIru5MEDGyPzx65/lOi+EvPtls6YB0mPyhHpktRKZtbHj
+iLSghiaOyGB3jgsyrUv4OGnczL0UEmpeurzwF7Inq3NNJ6NpJ49q5di9fvolCHeJ
+Eig9jfbI2wzoiMc2WOVazibFQxG7m1bOKVcLo2HC73RotLyJaN90wI2/uze11hK2
+aYBJ8bP2vVufd7MEzh6/84jQiTmJQHCRpgDFhDJP/dHcY7iu+hrj9a8Tl27nZrBU
+VPfvhboWfVgL4ue/GKtZM/jualDwPQMN0JK/gTJtjB7ooN4kMIsvgf7pjVAYmvw=
+=WWSQ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppetmaster.init-r1 b/app-admin/puppet/files/puppetmaster.init-r1
new file mode 100644
index 000000000000..f665991b81a6
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.init-r1
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+	PUPPETMASTER_PID="master"
+else
+	PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+
+command="/usr/bin/puppet"
+
+depend() {
+	need localmount
+	use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
diff --git a/app-admin/puppet/puppet-3.1.1-r1.ebuild b/app-admin/puppet/puppet-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..b73c47f3a727
--- /dev/null
+++ b/app-admin/puppet/puppet-3.1.1-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1-r1.ebuild,v 1.1 2013/03/22 13:24:34 flameeyes Exp $
+
+EAPI="4"
+
+USE_RUBY="ruby18 ruby19"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/facter-1.6.2
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite3? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_compile() {
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+
+	# Location of log and data files
+	keepdir /var/log/puppet
+	fowners -R puppet:puppet /var/log/puppet
+
+	if use minimal ; then
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+		insinto /etc/puppet
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/lib/puppet
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	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 "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/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
+
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		elog
+		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+		elog "http://docs.puppetlabs.com/guides/upgrading.html"
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}