fixing bug 508500 and bug 508498 (in 3.5.1)

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

3 files changed, 190 insertions, 15 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 59badda7a7b5..900c5a4b7081 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.195 2014/03/16 21:52:37 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.196 2014/05/14 06:36:08 prometheanfire Exp $
+
+*puppet-3.5.1 (14 May 2014)
+
+  14 May 2014; Matthew Thode <prometheanfire@gentoo.org> +puppet-3.5.1.ebuild:
+  fixing bug 508500 and bug 508498 (in 3.5.1)
 
 *puppet-3.4.3-r1 (16 Mar 2014)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0b275362f7b4..709bdd9b252c 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -13,28 +13,30 @@ DIST puppet-2.7.24.tar.gz 2007979 SHA256 4f3109815502d86f0e13c12f899a17d2ff2a1a3
 DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb4235fa594cc2f3219925504b93 SHA512 0bbdd35387d4f1693023d2fe45d089453386d7bfb279365cf019081641298034b8cd84398567b7ce1868ec02406a51a53afc6842059442467e474bb26838d80b WHIRLPOOL 1a5d88f40d69c692a443dece46e282ce8a0415daa56ca1f62391d9d8a9d2f1da77a799605deda384b6c2f7760a7e0046a0c457216b8f350308b5c30d9b40f990
 DIST puppet-3.4.2.tar.gz 1951200 SHA256 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210 SHA512 cbc66e8165d59acab6c22dc8c67a68851cf6dd7011f4db3a733c22367c6abcec30b9e196018199bdafd5e4a06b9cfde424c69068ff52c14fb718e30b8928ee00 WHIRLPOOL 030cd89e23cd1843a2f419026cefdefca660fe9995074b4d46f965e876d547247e8d9f882d920417e633bd9535aa7969924f43c95e48d39047b8b3b49998ce01
 DIST puppet-3.4.3.tar.gz 1952505 SHA256 5f991b54b6a272914f4dda5aaafb86f08855d65adad46941a72192feefe2ba0f SHA512 e14865138b1dc9bb0df14c5103622b59dc7b9db0bd3fe329e7c5b27866e4679095c106c16a0caf828a8c58aeda13288d0ee4f42b8f1a169375c08dbff9d8375a WHIRLPOOL 5b16ee7763d62e492acec7096116df89367a058271ce37495ae6870648aed0cf88f806132ca60710a364b3d4047d9ff6ea7d7899b1cb7e0a5ef2a3f7e4ecf7cb
+DIST puppet-3.5.1.tar.gz 2083311 SHA256 4117bea9ddeda97cf8dd3f1fc9f056ab3fe4dfded2e24b3a5c3d3b811a055e48 SHA512 cb86a641d2659e4fac3548ba8daf2149b3897f0789bae2ce744019a8bba1ff32f82c143eab9c4f8da6c704d749ac4837b1a667816b1129db34e5427588322fc4 WHIRLPOOL a093c3b370c4e16d575644d9a0562bf05d406bf41586611b584bf61258a272033035a42dbd0bb9b09d9569a54941c096ab31bdba8dd834f667b5680d820d9676
 EBUILD puppet-2.7.24.ebuild 4808 SHA256 e35c0e168bf0c24b35e2fff211fe54eab4f078f5ff8913f99833c29f54d73b94 SHA512 e4e8f8ca3e8f43e7e3052e4276b8928c5d42167d145e7aab9810ed3b3bcc4613ed86c714bb648bba733e5c490a955f684503d4ef90bba4d3d07617abb41d8e17 WHIRLPOOL b39d9d5d8afb88e4bd0a84c96f21dff16f7a22fd60735b470530c57d16de66aab55eea4815e661a3fcf4a7f682ac9f6fe9ec4aa164851f09311c5a76232f6746
 EBUILD puppet-3.4.1.ebuild 4245 SHA256 afd2d667437d610bef96e9087b840f8293c2f545c0d7fd184a13e4a2218b6bea SHA512 eefb3bad68cf3a2b476fb5e6050ffd916cfb5c6f1b0f2a6474700484166fdbebefb913e45716a5d00b9a23d6997fd2ff263a9549c5fb91d910394ec7d09d3a63 WHIRLPOOL 065cf79d7a6469bd32183a93442b044426ec0a0a982083a76dee243cc9b9d1d712e32ae233dc803641044859707bfcd9f53fc8e2551e92c274088bf69280064d
 EBUILD puppet-3.4.2-r1.ebuild 4319 SHA256 bc02af088d9e0757b5453c89e464f7083b5802bf644cc282c2f014ab670f7411 SHA512 0e5b8823f9e82afb94d06a0891cbdbee35e5e2ebba96e67d22603fd402a47f083304cc8535a485a150b96f764000e24204fdc430f73134aa2b59ce6298cfc176 WHIRLPOOL c49d77d68fbec67964ae67c4b32cebda81a3de1b460d8c39fcf7b2b02d49d34a119fc579b9ca7616db45607c5120998a1f8a90252efa552b88f239e2ecf32764
 EBUILD puppet-3.4.2-r2.ebuild 4334 SHA256 573931d9bcfd4636504f02367b875b8db2621cfeab9b22e8e8eea6a4f461e6d4 SHA512 47b8ad61f8a9d1ef84d90d4527e5be1c5bcc60b68545cae86529b305e8ed94d6bea5d4b02af27ce3d0d83f5dc17cf84ebc68f7098943b8107757c88132ab698f WHIRLPOOL 8f6efff93e8c9ca8d8eca6737cbf3a73e6869b2653647bcdfae74da641f96e929827f96d48870fc5320dfbb46df4ba83f79bae4e8a22a4c6444c7dc97dd3159c
 EBUILD puppet-3.4.2.ebuild 4261 SHA256 606f8335e457435576f01dd4a7144417466e83650f7a40d1e592ed6ed07418fa SHA512 8d56db686225e325dd301ab28f650376cb53d06efe89d978f9ce0e024e68c6cbe5ea212567392658e63a0391f63bfb2200cdb59bd2ff6876dc13e325b6fee063 WHIRLPOOL 26a185a98d6b926fb03a93548795093e4659db78b5fd638966a3533e9b9e35fb749507b16be32feff1adb3fe871281598525051fb0c6143714f2f526ddab07ae
 EBUILD puppet-3.4.3-r1.ebuild 4352 SHA256 a1f7c5ffbc01d03c17d65c377d350d401da2591e7a7fa80a6c36ad9468d7f736 SHA512 06fd92b2511c3bee7e738961490b7e6bd9f0251f9fc8182591fe6acb570b51df0ce54d4ca9e6e23ff54c34950bff28ed5e46413f4b98682e06d61f4a1cc0fddf WHIRLPOOL df84471a205adb66a4904365cc86f3bde970ca53e4bda8e5b2a6c8647f854043040d7079e110db0fc07bd39c1e0c8698d0a43de07af46e5584b57abacdb6311e
-MISC ChangeLog 31747 SHA256 5f094e58eb7713efbd8f233ae8bb4aeab8cf3b5e6858c16b7222c0177cdf4bd6 SHA512 07ff15fafbc8a1da388af359e5aafb6d4a9a48186f5c6e4e5f6f1b7fcea72a9e61620a6490bd6111e5cf0cf74987b376a42b77fbbb3451399fd831c1d3feb3dc WHIRLPOOL ecd1cd3bcd59f2f49903547ea3f2b0367c4ec67be50ba256cc85a8b729bdbaa4a801287e7bd460c2d3d8cf5205ca2818a50a6277061297181057115ebaf7f37e
+EBUILD puppet-3.5.1.ebuild 4378 SHA256 985fda25ffb783ed7a2048d74ec063eb8d8c79f61e7187bcf0bd8dd340ef3ed4 SHA512 23ca690ba2e9e3da8ecb7d276f3631ad540c8ce83c8a8f3b3b780f45a82947885a2a77ebcd56c5900d0713dc690b42bfde9e0888afedd75879cbcc2dd09dc396 WHIRLPOOL 2dc9eaa4996ca54f78412e09d8c90761ab36ce92b8454a5eda31eb87446685a93ba6aab61dd011a6b7ae047233ff7f40a482d777738a7126b507deae1dbb6f4b
+MISC ChangeLog 31902 SHA256 a1f85bddcdd13eae230ef86aadb2dcb3626381d7fea3f05ffebcc47a09c2f4a1 SHA512 be4b148d96e6a6e698552e2c617e91f7d2291958ecf86def384a22802d8dd2943ca82624349c08dc0ff14999fa3897f2af2377a759bd56d1f5b772b59cafbf4a WHIRLPOOL c06fe21b58fa570fbdc7abb679e5cc20a2cc521f5e438a4e6a53366340c04ecdc890a7fb4f31408fef34f9c35939df921d433a74ac268cda3f32aaa58cb695dd
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTJh1aAAoJECRx6z5ArFrDlgQP+wZfdkEGkpsDqLuPqdNjNIEw
-A5vMqbmtgqycbaCyz+5lIipkcl6Z1F2tdT9bC73/W28m8Kx4s9QF21UqTmWK6x9j
-W5OK6fkSOTLaFrw6bVzStC/DXfU940vxWer0GmnzLb4Fuj0kvClcobRRggCrEwEe
-A2s+j+EK0ZTN0aFYdFL0/Ou9ghKdS00LLgWhZANnQkeNYMMPtUdVEffHe69Otx2K
-sbQUmUGcdWtXCa0Me0a3ZEAoepxOkVXj0CKe11OLTrBZpgVzTzyJ/rDnvDuueIHJ
-PdLQC5SGZh0hWXO37seNmoZdPGFIELIpmgCcVI9bU46sp0YnN9v2lrJgYRRajYCl
-IpHyoimZtX1ehSJZDowzddJJFwvIUhsdRQap5QBArceQMPFpHvOnwelf9s3Nc1Qt
-DCIglKljGBd8LgORBnTpYGq+jTvks5G/yovp/s7ZEbL8AFF3Yil763bx1AWQqHmv
-Da2xpod9J/whrx2HCxOkpwXsZMvRHIN8JXhgE4sOOwUghO8M6dJssgLwnqaoQlIq
-xmiH/9tLr2ZYSNUpV+wJ2TkXBsJuQjVMLT4XhypGITTDii0xeGGHVPrrvcuMW+LQ
-TY8p6WPw7vUJJytnLUBfuc9T6byOWYQStge5WC50Y/PIF6zUJ625dM79BIyPQ/F2
-0oTQIzOqOrmdfzqGYliJ
-=3Ldn
+iQIcBAEBCAAGBQJTcw7jAAoJECRx6z5ArFrDcyQP/2Ga3Xt1nC9EYptJZgI8X//F
+tm2BzfLyfeQn21Y8d/e+dPc6J3p+PcQUBNIMmOyL5j9M9mNAoK1nUNhp7crmnShi
+xqzmiTcfxgJHr8r+rG9vTsyCZ4CQ0IwwVkEDH4FP4lghOUcfEXxWl6uNz0vJEiR0
+FYRfpuW16WojS1Up9T6qZLXoG3THkfZP0gWfyWbg+Jq5T3CteCRNlkjdOv/J2d9B
+3M9r84uejit8VvV42H2AwmZlKz40QSPIUeqrb88tcG+ejmODewapu3hlYKY8FveB
+anE9ilzcR6guVFNY/fOcLLo+MYWnoZpgEi+2meIyVGYicdQvDrgFq3fFAMjQ8T3D
+r+khbUJ+w4PIp79r2HARoeYwklGlg9is/8DxnSd4gpMwUrNqQSQdNH5+Ysij+1Ak
+MnL07fflu8bdlZJAaCWopdYr1szhk+LnRNvYiNmdQSjoX98zKi3K3moWqcmfuJRG
+PHN9ZUgVrWDV6n5w3GW6VD9J66cMQdYbRYtuAcXyCI9u5DbT+T9mCyMc5xazPCIv
+qQpT1JMjOXQ26Mnnno0og8cHA8TXejPVEy1QZYCLRKOUzoVOkVcTy60V8wsv6SiQ
+6zb4Lj9C91gZpJBhYGVKQCaNQp8mOR1tJKs5QguUL/iWOFiUGT6VmDnNxCokD+Vu
+23f22GziC2QyFFhUMZg3
+=CezS
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.5.1.ebuild b/app-admin/puppet/puppet-3.5.1.ebuild
new file mode 100644
index 000000000000..83716b54edea
--- /dev/null
+++ b/app-admin/puppet/puppet-3.5.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.5.1.ebuild,v 1.1 2014/05/14 06:36:08 prometheanfire Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem 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 ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/rgen
+	>=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() {
+	each_fakegem_install
+	#${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	#systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	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
+		insinto /usr/lib/systemd/system
+		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+		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
+		fperms 0750 /var/lib/puppet
+	fi
+	fperms 0750 /etc/puppet
+	fowners :puppet /etc/puppet
+
+	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 "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	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
+}