puppet version bump from 3.2.2 to 3.2.3

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 183 insertions, 16 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index d5f4ca469288..43c4f46bcc7d 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # 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.160 2013/07/04 12:26:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.161 2013/07/16 14:35:30 prometheanfire Exp $
+
+*puppet-3.2.3 (16 Jul 2013)
+
+  16 Jul 2013; Matthew Thode <prometheanfire@gentoo.org> +puppet-3.2.3.ebuild:
+  puppet version bump from 3.2.2 to 3.2.3
 
   04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> puppet-2.7.22.ebuild:
   Stable for x86, wrt bug #473720
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index c4150b931de1..237c7e0bb05f 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
 AUX puppet-2.7.18-eix_fix.patch 1370 SHA256 9414e985fe18c673256dbe5e654018de3d4f8c3c33765e873e1873da7d06a4d1 SHA512 7a5aa71c6ce987c95224c79be55a4b14b4c37aef3960e1aa34e96397564042192f30f8c9f935949768e33a7191ab3ae6335830c68e9bfb2d02c654dbfdbe1fd4 WHIRLPOOL e318b8f60d787bb7947598b91168b96c6d4886602f5f6b90db7336feac00fee61f0c8b3c4c60d0de25f7bc029172a8b10ab6ce1d2115df7755db4344ccd57a3a
@@ -20,27 +20,29 @@ DIST puppet-2.7.22.tar.gz 2023230 SHA256 bfd79c0aecdeea4e1a8573e9325fbcb48778603
 DIST puppet-3.1.1-CVE-2013-3567.patch 177845 SHA256 48b8998182a6d84fcf10847183feefb4b198b8421bd46d82fb8c45577bc0c5f7 SHA512 fe3e8ad8fecf374b9ebe67f38bc49980891121134fee560d7c2e5c43d8ccda772b4ec5b26f69c0928eb35804eb47fdb29654b065b997cc8f5c190fc3e2cca7f8 WHIRLPOOL bc93d1958b2c31d76a0f5b3fb0a33224e6304b72a0875e1ca3de0516212dccf44b760899ffbc29ed179be741560ff7b16516f5b7b65cd6f6a45414edd4eedda8
 DIST puppet-3.1.1.tar.gz 1587190 SHA256 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d SHA512 48759776b68f83a125a0c703ecc9ad3efe34f10e6cfd9ddcd9e596ff082c9f40bdb7e0489bf7eb0bb0ce8bdb4ad0ae87049d2ad3133e839d0a5a6caa8419074e WHIRLPOOL d7152ba5397edadba9784f3c1800c8cf31ddd547691b35567ad52a42e82e741256326d2ee0bccec0642e82f533ffb74babcaddf3a0ee54361626b875cc618b2f
 DIST puppet-3.2.2.tar.gz 1784340 SHA256 c47745aa73912b2cb1a20b07e8741b8af37a920b9bc8dc8afb14b23d8df7d13d SHA512 e794aa7632a03ff4e6c9b96d577c0c17b096d95ecd840473c43ddba1ea403ecf76652cb99ca2976d3d932be3305d9413cb7c9ac3435ac9ecb118f2eaa2c2974a WHIRLPOOL 8873ff2e32b778e171d7910c6b84b12a23b9f952a565455fc2949c2359e8b65005b57987345a7719409fbb5e5a3393162d01b94ba337ce0538d656d76e9ee5bb
+DIST puppet-3.2.3.tar.gz 1782059 SHA256 6a19927d6126b9f6f40e94997c0896a618da8983178ca0e30264122b70edf819 SHA512 5f599a33322dcd96aaec78180ff6f5022fa6f536a5e37641fbae1e6b6d9fe2491d54021668aa9971b9951d526caa5215f89ceae2bcd4f0c9be31a1e6479aabb5 WHIRLPOOL 9fec0bb8375346187d07996d80d6b2315b7d5b9531cb5332ccf0d47da9abd81853fcf8ca2fc7d4357648a9cad32db42c861b513d2a73e5113489b56b58443a63
 EBUILD puppet-2.7.21-r1.ebuild 4973 SHA256 59c9f09d5020a8eb5969655ef7c9a4a63dbbc9dac2f5500fef7e32182ef48376 SHA512 4cd6aec2cd2efe0417be64bee36cf85df3dba7292bfd571d7522a9c01c46eb72d1051222f179e079039c9464664960c365c15b77c27aab7c9021ccf7c3022dad WHIRLPOOL fbce157e1f25d985f4d8d66afbbe04a151ed858184401f3077e47e32af5704b62f647326b24af47b11f06c017e4ed4a6944c15dff712486707d94134b154a57a
 EBUILD puppet-2.7.21.ebuild 4731 SHA256 bfe02b716ade3d16d07f1faed6f76b70e91f03a3c4bc75d80815a6963637af6c SHA512 6483b205b96b62ca29378b51bf188b6d0367b389ad4bac4afc5a5b86eb164764dee87da00e0027dbc17eb634ab938bc550b7b98019948cab14d9cbd4ccdb5e52 WHIRLPOOL c876e707366ec3d058db8ee696e3e3b781502b4f8b5da2c6416c1fa0979dd7a9ddcc3278c7dffdbc6c3ad3c8313b9f2036872461e1538595192192cdeb98a697
 EBUILD puppet-2.7.22.ebuild 4816 SHA256 0a01a9801559fbc6bd9c1f064277f5ede14850e0bb9bb89b57884d16a598fdd3 SHA512 6fe924b07ac9a5088ef84769927dd4b1caf3805b839c23cfa14817b0ac0b355aa72e2da4e14f3f73177158c9e483aa687325c58c2c09c9a9548b6d5e980101f5 WHIRLPOOL 697f8c9276e934e812fa2fb6b358df24f4ccb9448f1306f8ec68a6ae009a4d0caec8b7c95770dd7dde3075f928f50b165f5336b9288088396bd0d9abf728d427
 EBUILD puppet-3.1.1-r3.ebuild 4443 SHA256 bba3ad9dc41943d76a5b3bddb04066131e858927305323b012c5beb27f3e09ab SHA512 f957c2cf733d756d874513fa2bf70e2fc88bdf673c97a5b3ae357cbf45d89affa80722a4a47c4b87c813a344894f41abc33d9e7fb32c6841c99cf6ffea2d23d8 WHIRLPOOL fc256c9efc54992ae921f936116b0fddf10ee1d7bffa641a7334516a12664df4fac404b1377857a92266c5335ab6752c19576c1d0f897aa94e1c09482c177393
 EBUILD puppet-3.2.2.ebuild 4298 SHA256 79b49e2b1289c66c7e61d340ab20784efaf1f599f97a36eed7e2959d83050c7c SHA512 5ed817537c0abc99206093d9fa64d5754fed6f943e8dace152f12715d3a532d9cf86dc1d85256e4d72beeec0f257c0b5e28e2e82ca3579a18a95c250d08df943 WHIRLPOOL 495a24725914c1f22888d7cfae22b624772724c541090e756d3bf4d602ddcf249c871af84c4b96fd3e6a3b677e52c21e606b06874d4e886e710e83f9c78d415b
-MISC ChangeLog 26272 SHA256 d56cdf0a587eb4a207f4271f5688e13c0259af730790b97b793c000f783896fb SHA512 82f870bcfe41c6c5ad64d991bca8a351fc7500e49bd6260f6810f89d784003de9f6d56f0395ba1f4e1fb546d8c8fe170fd8bff92ea0c62b19e21defd0a0e0fad WHIRLPOOL 88ecd094188fdf117c8db6129781802ae3456a41daecce3d1b9f22bb74bc939ce570ec350cae3dc4d3a6a72cf24bfe9d876ff5a302851d6ab4913443ae2ebd5a
+EBUILD puppet-3.2.3.ebuild 4298 SHA256 1275c7e3bf89fa8edabcd4d629b5ea1203983ca1fbaab80b1d81e5bedd690b1f SHA512 bf0542cb9bcf500b4343e31a5a38fe2dfb3033f6c4215a21e2393fca1dea87f35b315f71ac895f60a7c28132a60663d5d785491c382d5e55325396683b360759 WHIRLPOOL ee90abe009340d495ebb79bf750db474bbeefd4a474c6ad011f95f8faaf6bc7c5cb04fad86c757706627fbffb81f4a55fb76ae301477123fef56b098a4d2d094
+MISC ChangeLog 26434 SHA256 b3bc6d453b549da5fd7c1f21ac6a14ee5345a51ed2f819ddae40d38275885481 SHA512 146a98cca2d585e8baddd49f3c59562b7859ac247984e0e7e9941c13da127585d83e4375127b60df23e41f26e8051995bb2841f4d26c6f2b136b7d6b93280329 WHIRLPOOL 693f310ddabf7f19870ec4a188b47e5a394c8ac6da3dee151e4a48805b5e0fb29cc8dd27b451ded11fcc874cdab7fe8cecddea3af123bbcc599c9625bb136f13
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR1Wn5AAoJELp701BxlEWfPN8P/0h73wWDFQB/M/s0Zd1IrU9s
-NGXLtgLHDnAori+eNsGFgmjyR65ELYbGRDJj3hdT3UidJ0lQ0GwuZmLfBWbzJUpf
-Lup546b458i2l8DGTyKPEvufIVt4yUAq70k/U3VQg7TPnExioNge2DbMhqs2V7No
-Ej6wm5QB3he5Tng5W6tI0WokyswCyPLq3PrSw8t+Kt6xzcNlXLa3R91MCGHaMG5V
-PPzRvvgomtbQrtauOL0gpXAnsn5Xw8I6AkUKGIK2Tw/zL0+bkE6Yqwvxun5jMXGx
-JG/ukHrVhiG6ZbGA25jKqcdv3PoEEKfmHH+z3o2aGSTMB45peDG6uqknrOYOcN03
-ziGgEbYt8hnarIRX21ZK65PcdYsaUs7S01zy/iJdWWOUOtwmBpmSLCOAY0Iw6fWN
-i2rybvD0yK36MosouiGYM1k4bLlq0mcFpm+cFLkciCzXDMC56QGAPhdV5u9b00ax
-097Si3dEOKhj58G8JlRomAsu8X7ImyCvCtM923pRyeUJgKmA3S+Easl28pJR+0WE
-o29APEyOvRpnbvY7noEplmi07BcRrnDfCUK1bvYA2WbDu87ApqYAqLBzZM01O3aO
-TsNvFUxoC1ounnXR4CweQmXDT8f91PZQxKD3s31YVUngug/ddqnHxQ4JvUrerPhs
-lVnq3YI0dyL7Hv4KbeR8
-=WnaS
+iQIcBAEBCAAGBQJR5VpiAAoJECRx6z5ArFrD+LYP/0SxYVA3+9I+ydIe/c7hk4Gn
+6gP7yEN2pwCxmtAYxOHUrOUqrmwCVpyR1FC0Go77aGaKfSMLEF8UXpP92pFgjibj
+LpIhGtmfHUFL8eY1N21mPPoKQq9IKta7hyXjJOYO54TM3S0SZXlaGlqNfYPH1Xrc
+rszLfXW2Uus6Ifw6TVYijfartUZl6LdTBiwj8wmg98LkZW4X30x3KY6X/Xr5oG+c
+JJ9i2gc/qHf+tgCV/v0WfnxfwJokKY6g1YAYhpDJgi2Na286BXUDse9Ce/oSpVrh
+iyndDFgzgvQGeP82CPrmR+WTV8yJKEKNr1svNjtUML1r/Nqe7YawmU5N900g33l6
+7H6Kwy3Ta6nLOe4IlMsujflOMx5TzEC7IrY7/lwtKy/L6HdiwEiofE7oz+5z73ce
+sMTOWBkwv1RZFb6j2368qcP0bxcP4W2Q4pg6aM9iEArGXGGOI7D/mRRTCSysYi+q
+NlFRfdhF5ZI/FX7gLcoAdTgImLK3RN9e4cHS5EjZVkfiTQt7lWmbqTDW4ioAFxiN
+6QQPQ8BkUvTLGVe77VbLqFRpcI/t/9eaoFtULy0oWY7czlOdiW+Oqj9JJfcEQ+CD
+2DcsldtPdxpq6DlnqZLDf9zCYjh0tM47W70YAlSXVUjbWLG4evSJszBqtTtTmfkH
+clEuRAyYrdvaf2nwv3Ig
+=vm2t
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.2.3.ebuild b/app-admin/puppet/puppet-3.2.3.ebuild
new file mode 100644
index 000000000000..1b49e5857e67
--- /dev/null
+++ b/app-admin/puppet/puppet-3.2.3.ebuild
@@ -0,0 +1,160 @@
+# 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.2.3.ebuild,v 1.1 2013/07/16 14:35:30 prometheanfire 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"
+
+RUBY_PATCHES=( "${FILESDIR}/puppet-openrc-status-fix.patch" )
+
+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
+}