750 on /var/lib/puppet and /etc/puppet

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

3 files changed, 186 insertions, 15 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index f4ca23860ab4..94aec9665bdb 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.190 2014/01/08 16:07:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.191 2014/01/15 19:07:03 prometheanfire Exp $
+
+*puppet-3.4.2-r1 (15 Jan 2014)
+
+  15 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +puppet-3.4.2-r1.ebuild:
+  750 on /var/lib/puppet and /etc/puppet
 
 *puppet-3.4.2 (08 Jan 2014)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index d61f9271a960..e156057de658 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -18,23 +18,24 @@ EBUILD puppet-2.7.23.ebuild 4812 SHA256 e62eab0753c9e571636a4faf90bd67518f555916
 EBUILD puppet-2.7.24.ebuild 4808 SHA256 e35c0e168bf0c24b35e2fff211fe54eab4f078f5ff8913f99833c29f54d73b94 SHA512 e4e8f8ca3e8f43e7e3052e4276b8928c5d42167d145e7aab9810ed3b3bcc4613ed86c714bb648bba733e5c490a955f684503d4ef90bba4d3d07617abb41d8e17 WHIRLPOOL b39d9d5d8afb88e4bd0a84c96f21dff16f7a22fd60735b470530c57d16de66aab55eea4815e661a3fcf4a7f682ac9f6fe9ec4aa164851f09311c5a76232f6746
 EBUILD puppet-3.2.4.ebuild 4287 SHA256 521003a7dcc2af67e3d9f6cbeef4af910b38cb1d338516873f54ae4f370b6d9e SHA512 26ef5e33be6c8ce9de262542c90aec3135aed33c9d31a09f95abf33bac9dd23b16f7f17a0d7e4f6c528b6de4b9748748d9d812211dfbf25e965ad1fa6a5a7a8e WHIRLPOOL eec50c46fb4e5d402bc769c2986e533636974f4b1f77d4ff29530a14509cfe197942364a6db6027a236b27b97023bfde7775bc9f88d05a293e0b0fe0431af22f
 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.ebuild 4261 SHA256 606f8335e457435576f01dd4a7144417466e83650f7a40d1e592ed6ed07418fa SHA512 8d56db686225e325dd301ab28f650376cb53d06efe89d978f9ce0e024e68c6cbe5ea212567392658e63a0391f63bfb2200cdb59bd2ff6876dc13e325b6fee063 WHIRLPOOL 26a185a98d6b926fb03a93548795093e4659db78b5fd638966a3533e9b9e35fb749507b16be32feff1adb3fe871281598525051fb0c6143714f2f526ddab07ae
-MISC ChangeLog 30999 SHA256 ba5553873a1431a176d7ceff60109d8ba55c4cd7dfc4ce55d09c421ba7512e4a SHA512 0d98fe2abb5327c59cd1680fc038a98b4ee938a334aa651b2cfb707ca78223daecd1fb83144324adb20c3e74dbaf9cdeb89f4ebb845cba4492ac0de787320d10 WHIRLPOOL 39d205926cab805c01ba3c1d4be60078403d6a203401755cad66adeb30fac3874b7723ffccb54f268c9ee1141f67201ebd1da47c0be2daf953faee9d1dc4dd32
+MISC ChangeLog 31157 SHA256 7389a804e641d2d3791ba8898176906ca5fe3e292cdf0cf9c4028b3a51044028 SHA512 a7e48e52c80ada201e9b75eeba9b31c8297cc1d6c3db63383341e6e569a85a6f4b0bf81f20527e4cac777608a5a2c1e62738d508f597c863365541fdd6c1f8fb WHIRLPOOL 8dba0cd795c4bc4038fd97181ad4d55d99546e9a19eafd8afde3d5be88eb3ff80ad0e1caf96428030b626cdb701b91723f4d148cab29ca072ffbe227be26ff33
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzXgCAAoJECRx6z5ArFrDtWYP/i2McTSDqwrtEfAaPcn84qbn
-rVBH2EOFGtlxE5IvfUGILNQDRhExKWu4vSA5poAKdzkIexp/LxRJVavag0SRj5br
-fIoKAPHCKxP2vnqLo+vHQ7s9PoNYfKCFLwqFMnLk1mFoEJ/vITKsXt0JPqvIX0Te
-hW3v1Z0nV8+yTKPyyFwCfP+V7qOyyhh7XYn6xzGUf4N9t7Sx+lc7JYGBnqyc5bjH
-PHyML/fnGe4J3VtK7iL9Wft8yHi60LtlKZkBMQ5eHUe8qGdwrTsXR19fXP3hKN0K
-n9mbOp3NmUrZDqcyuRY9FI174D4qjNy0JyfVZocg/JW5ufWGufSP5Wst2GyjN20X
-6hlTphKa/u4sSgg0MvkDkYxv6AFA+H3AUg+xqVdjlcN/BEKH4B6OW3pNHHGTET/L
-Jof7HVNzw21o1uA95cvQAbOM7/MCHRRdKqstxKcpuZEtL+D5XEUNp3ruEHnB8FIs
-5C7mkJbKD6U6YULm/jFaoHgsC0xPgXmomitFTvWruFiv4FKvpKkDfRuLnBNRm4AO
-0SXYPbKlWQhQGjMiMjgHQn5rCjevmxRjvC6OjFEuNEozy6UEsfNT2t2GsjFgfvUP
-hZfEusYbKm/MuY+8sYGSi2b70EgjtiWD4zeSp72YLLy944X3yHYIYSxoDR8XwU2N
-chejQn49YrbW7XaHw8NY
-=Pk8V
+iQIcBAEBCAAGBQJS1tx/AAoJECRx6z5ArFrDZJEP/0Rv8j8zjuITtVescYTWqUFx
+QdfaSyHJX4V48jJcvsG9DAXBuEBAdcTdeZqtpqhsqWQR8utFd77PFbfA0u42bHQd
+QH7dI5SnWd4QHYJN5UeNIbcmQOgTCBJs5fewkEW7Eb0KsOJy2RRc2qUx6o7q8EI3
+lwO0b2tSjXLtI3pxkBlHIqmbd8qCPyVO/nzBaVrfXTnsnSFpda3WuaD/GCIFUH2F
+s79lkJkKmwkLLWWs+yW1u7h1MA8okrvx51PKU+0VoWSa0KXZKOXdwhy+EjCOQDEp
+Yb/biMaD+dphpc7ZOXBcMx7lffW+KTDfx0t3F2rxcSX/9AuNH3FewkxIeO22Vp8f
+uB8qgr4Yebmt6HoLy2hNY0xme5CFq5+bD/afViAe4Mvq64LKHI4PmFIHnmkbDt/g
+w7FD8a/5gNpxwtULePEfbnA3cbbFYPC0PbXMdCiK9rNc7CszrxaCVrJIVEMwNayS
+aHDUw4zUOB+vilEH8OwKbHQ+ioNF/6zvi86UyqHTPElFwcsf+px42z6SpwOWixVM
+yAfZcc4262mEKRBdo0Vuanqd6ruF/gQfUYkFADfbHF9eVYjZ52kCkCrjb3v9FvWd
+R79jOnODsi1VD85OBsuroEZF3Vp2JJ7x7MQJi1OprwO3vu8z+QJYfy+9UYaRvV24
+8kKZIdEi5YjZX4rc6/q0
+=X5qM
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.4.2-r1.ebuild b/app-admin/puppet/puppet-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..26c6f4ee1c83
--- /dev/null
+++ b/app-admin/puppet/puppet-3.4.2-r1.ebuild
@@ -0,0 +1,164 @@
+# 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.4.2-r1.ebuild,v 1.1 2014/01/15 19:07:03 prometheanfire Exp $
+
+EAPI="5"
+
+#supports ruby20, but needs deps first
+USE_RUBY="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 ~sparc ~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() {
+	#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
+
+	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
+}