bup

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

3 files changed, 213 insertions, 15 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 87950f8e575d..3546dc782a96 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.234 2015/07/24 00:24:19 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.235 2015/08/07 06:47:14 prometheanfire Exp $
+
+*puppet-3.8.2 (07 Aug 2015)
+
+  07 Aug 2015; Matthew Thode <prometheanfire@gentoo.org> +puppet-3.8.2.ebuild:
+  bup
 
   24 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
   +files/puppet-fix-tests-4.x.patch, puppet-4.2.1.ebuild:
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 5eac39116709..d503b231b9d7 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -15,30 +15,32 @@ AUX tmpfiles.d 39 SHA256 bc0c1f0aa01e1df559fa6e0b8bb686a8fc83b1272bcf4f6671fbb2a
 DIST puppet-3.7.3.tar.gz 2594007 SHA256 4a3bd7ddb51072c3dd898a8de158cde204a2d8fd0b84e8ac806b84c074348637 SHA512 74baae5525090ac6213cc8ef27ad74cde5372ac08f8d5c11ed2a4bd2f6ed2b9940fa141ddb705328785611cbd0d32d70a40f1b44dbc9b167e11f0ad1051efc8b WHIRLPOOL 7ff9909c6bfb4d83caf8fbfcac11dff27c3a7583a68336040d404745bf35f4676933b6494d2c65c1f87fc9de5928ac9ae79f81e0b0a356088c0be5d8526ad42a
 DIST puppet-3.7.4.tar.gz 2600191 SHA256 957c09ab253f76e624809766999da6d872f79b3a64b54b8c66bdd8907c291745 SHA512 868a80df0e07b68f0de2fe31dcc55ab1f9da160d66e151298ecb11c17382c13939a88f2925e387a14d2713be5375c2606f26ff52c11dd214874d71f17b3c0617 WHIRLPOOL d5dfb53a062532427ed32acb834517d8eaeba9f53e85bccb79de93f5f947e7d4df472b40c0bed91703b8977ac99c9764944290627815dc60430a8cfe2098519b
 DIST puppet-3.8.1.tar.gz 2633982 SHA256 033d99125276c7062fa5928e3de38c5e487b406530b3c50e84027b3abfd945a8 SHA512 a188c9f5baad3260c7cc2ea26d79d6655b504809deefe90a9e9ed81d3a66c1e10cc0b72b63c9ef34e5dd9266d3588cb7dc0d55e7a762f5fa5bbdc1ebe347979d WHIRLPOOL fd476519032d7b346a8813e4c73826daafc69fc4f7a8924efb35dfc6d691a7734322a7746008484df3f62f32865b23c6203f38662f354057aff5e75c20bf1965
+DIST puppet-3.8.2.tar.gz 2637591 SHA256 5a89c623f22fc96a2919801ff874b10f8f1a66e95c09976c73b257b8bbc39986 SHA512 b209a7b009e1d9510753a7484e620c3fb34a83058e8dbc2d9de2c33aca97e813fa85046d9b4de2fad9cb8fb7db257d46c221dd6eb9c0f86e1343cce6e1a9ca5a WHIRLPOOL 55bc7ece7ee918fab29e0f116f8ebc58322b42c07285a8965f2acae9dcff9c13e90cfc9c3c2537f9d21c663062015482fd48e24a1505fc7445fb6b949bc805bc
 DIST puppet-4.0.0.tar.gz 2498445 SHA256 c02a5cceb68d6c26228c242a312d68cf054233842e914e9d3aec32b38034e013 SHA512 c8ec0771105e83498f7558e1dfa8679d94cb2d526589041319f35cce214a4c8602ebf8541a15fa64ce542168d101042153815887fb8350bce0c4371c490f396f WHIRLPOOL af53d8b14b7110e6648873e9822de37a8bb17b7f635800d9a9fb1fff7df22000cd13604b45913ddddbae58b7af198c80e84c001cc8b6d1643db9ead4ece42bb7
 DIST puppet-4.1.0.tar.gz 2532579 SHA256 a168ac45a7b25932dfc78bd5da3efe41363e239c7361dd5c4f91615dc17bb275 SHA512 85ba32fb3a7e9f3413f201263943411fbb6b57a4aa13461954b32c1095b06d04f26288a216c5624290cf89d09183bc86bb5f57769fe2ccadc44bf57cd601f5d3 WHIRLPOOL 5288b3204a5c5b96da4eabdee19c1156e71b3a76662d8d28fc8e43988e76ca52618d423c207c1a25d5d92638c559db76ee3c8ce336286d3a5e875c1dc538f8b8
 DIST puppet-4.2.1.tar.gz 2546267 SHA256 519842dfa03ff78c94e77fb28867aef12933691b9e2ce41788f80c5c2865fe7e SHA512 d4ce3f6cd0fbca4270a9121671c27985c9aaa5360a1a317afcc8f79cd81d285e1661cc77d50dda47abd8e50309762d5931545ea4d675b9fb6c32b612e570fd3d WHIRLPOOL 492294158f7f5eb78b93098c759c97ca53a09fc7b24a8350dfd76220a1d578f78375ba3bd9d618b97299931001af83cc5475c4f6ad9bbb1c3d9744fa07585bfd
 EBUILD puppet-3.7.3-r1.ebuild 5184 SHA256 192206cdc83aff5ed668799474a7fbecd62796efcf01ea38ee54fdd8bc5a74de SHA512 3b42d51a089545cd627fa1ac3b07334a5d8ad992989fdb12ad61757282bd1d013aa6852789c7f8fe87db3890782cee123a1d09c9a036edb127bb08578f012232 WHIRLPOOL 99f50da1115836299de7e0885e72f310c69dca3f02ba0705bebc0f57de2c1e5661c6f6f82d0a795c275ff27507a3394ff1e73eb993b17324055bf2e70529b4d6
 EBUILD puppet-3.7.4-r2.ebuild 5246 SHA256 8c1b4e0d69c71c8d0de390a0a3c5192354e9ffb4f7d2ae164d87fd782886279c SHA512 fec69920ceadd6c66cd5d91f6565e4205d427013f1e30311e5d97e8b32dac331ed03a794559cc3e9d2f1d1e1dd298c76bc503bbfc2ecb2792d3503e85e5e25a8 WHIRLPOOL e4d415156f00efbb6ce8868f0a3b3744da0fec5f8a1cdc5b6a8a8d28545af315031158097d2d9d0b598b29e58f9863075bd166c9006e77fb110fa9acbe566651
 EBUILD puppet-3.8.1-r1.ebuild 5221 SHA256 5943c19eb5bb5db2c02a25b08d34d017e00e83785e84dfe95439817b0d5a23dc SHA512 ede1726941acff9abf7c799b44b577be6b3651fcee931eb6c092775e0b88c944456a0b97829f2a04675193c259e9de9d17ccb9d5cda0f246686493b232d67445 WHIRLPOOL fdca27d4ee2d5b7076fb03b6ed42128b9fd7892802d882ad0d24a964827932f275dd9d8603fe57eeb1d603a4c2124b31e4a46d9355f9c93f407f059d7c892186
+EBUILD puppet-3.8.2.ebuild 5226 SHA256 91961d95b38748c489b06200acb488617b6157653c515ca0c0b378f48c75118a SHA512 282b182ec43a4d58472ea6cff789c97fe3d36b1a75484eaa149b9eb02bd8f9e217e2831a52407147fb20b60b15f447995ca0751ca8083e537df5c487a13a143a WHIRLPOOL b3e533fc58517275930fdcec362b807171f1d1c819a24f620ec31b237c1051e28e494ef36bf101e10b8499cf8d39197a126113acdc6a60deb2dffe34e1097d8d
 EBUILD puppet-4.0.0-r2.ebuild 4484 SHA256 8b87ea61ca4b11a33e587364b82f6146bf1fba68bae9686fd41553d82939845f SHA512 b86ed3d3cead398c5677ee78aeae2581bcb2a773dcad8306ef7314bf1424779337727b7195a3fab6da39de64b6adc2bf18039f58b2684a1e470ba0eae119a201 WHIRLPOOL 25fe2bd9ea079a0153134f1f6dcc5c49533a04efd7f86c473412e57908fbb80ee2a4fae5d30925193e3e2704eb0ed4c83e442bd55c15059ca270d90306c88d0c
 EBUILD puppet-4.1.0.ebuild 4481 SHA256 93f731db802583371f05a30ee0d38eb38d7c460ca2aa4469eef9302c7c1f3557 SHA512 bcef899e43af8f2b01547fb330c42cdf70af20b6d4c7593d6d11d62028e36a5587e89802300db6ee8363b0f780a21cdf01dc5657e32038f2218372f1d44a5a92 WHIRLPOOL a9576c8d726d6bf421301817713a0549ff3307eaaa0c504fd505f9874812369717b61d68b543f4561cd1ed78b30431f3194747915cc2b4d90ee4d889ae8675ad
 EBUILD puppet-4.2.1.ebuild 4825 SHA256 372dd6e52e977c6590fbe9e939a33d660989c590092ad57de178b338a2d1d6c3 SHA512 740f5e7e3889b642ee50122976d3b8c50319c1eba3469e114bdd852146d037feaca6b8a553aeff31993260880550c9c44bc47695e21342272d38a9ff94fa44d6 WHIRLPOOL b0d6e2be63fc1486c864c7c2a496c8f41bd91ce6cc72e7bc5588a867c89061dae48e967454108b87cb087c14e9c96c3dff7c31b6bc143b3f11ff489e978c710f
-MISC ChangeLog 37655 SHA256 e281ac75b030af2a584cfcce76afe4844023966d9123d6a20c254b2fb683b2fc SHA512 2c743f4a39c02aa25e5d485f51f96a6ebf9013fa84196e302ea9d682158dcb50db5e2bacaa8dbfa283af96c6338b3b825bae9db815c6f496fdfbe52034620964 WHIRLPOOL 0db5557321f8913f159e355e254730518a17cf4758eca45f4286648c83a0ff49f0c8915392f50a125e493f3d621b152524534cf026afe28c8c4868d46b95132b
+MISC ChangeLog 37770 SHA256 3183b2d4bab4f43c30b81d32da261e55a0311a0e0f32127fe36e7678a7964670 SHA512 5495eb8a18269cf58f6d8f5e20049da35692ce6e30fe126f65c0c15b77c477206b3dca3e2b61ac165d82ed2fc665775b474cf4bc667d3746aa5d12a58f55c51a WHIRLPOOL c5401b362aa38e38685603c8d0365a06c08f3f4b46533d2242b614133ddbca4c5ebe8897d60109c7c383cd4f5a61f118313e7c949f501e3f80473981ef26498d
 MISC metadata.xml 1241 SHA256 6dc0cd19fc91fdc3d38a020329de7a9eaadeaa4f96e4d779211b36b3720951ff SHA512 81a8d21ba798de148e406cc22ee465c466fbebe4c14b8e71274da8369fcf1c3e23f11514f3e061c78acd4adc9015dc664e2c20d443e38a6f9162d35f6ec2856e WHIRLPOOL 2e709845671c7cd441519203f09a5d1312dfb6a6eebac91c24fe4100c95b70a5b7e0f897f03b280dbc156ddd1fe3c2d33f820777f40e5ee3c1e55c53ff686e97
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVsYX5AAoJEGSje+quGaTodPYQALd2ZTo3rUUAQt1LTrzc32ls
-hpT5ZY9BMBxZWBPVpcQu+jsEqlWVvVyXNKvgQDj7VT0hepM4KcuZ1YP79w9kCkOh
-let8dv+xLiOdVQb2Y9+hTaVzwucxAqYhnjXhidNwc2hNR9WCJ7l8A3bdohQv8Ovb
-Mtbz16R4haNZMNiLyJ4m93IZ3ozc9wjw5+FOtsV4dmCtdi9dhXSdQ7/vxtK4TUa1
-cxHoELpsMeFZUUMtbZaUcNi/xqoxbledkyvDHuCl7ZYCtTjEreVKBRf64d4n8P0i
-lo8zL+NrvTFP2JQvTwhF7nXy4+xOk8wrjH5nDUkoNlci3we9aRr3URzpg+w1wIZs
-zHXBnvIFyVpbrUbCh53TelmtGhB8+81DR3WmehGxo0eROFe0tYvb412PhH/JO0jr
-mNlPXzyvJ3ZCdJ0GozU+v0WFu+BUsBg6q2TiiVCG4FpyAdafQHkpFZ6qA1gki87N
-VRSCHkUp1ZFYrNu/fPTIeWWqZOSpB1Mjr9+khOEJ3+ogJm1dbwHrg4PAEfz8ZUu9
-haPM7WcucfHYHoZTPuqad/oR76YE+FsI2VidZPcSfuS8xcuoHxE1gf8LBQWzl1iT
-JjDoYBzWgEPmVXfm9rVqqs0bGQQzHdRutuZ7wfhhAhFsMXItHcXv0XBlZRRRVAsL
-pwLTN/cmHFqvUyCHCi8F
-=SCuF
+iQIcBAEBCAAGBQJVxFS/AAoJEGSje+quGaToQa0P/iAdrRBQKqt1x113fL0jU8F3
+mbDwFDRQM2BtIXroI4Prp8ap1lJIc/R6wuUtT6OJZv/qXua+q/w2MEGxavhrW+kc
+RpCmWakVyeaWw/qaugXFoUy0SzxPy427d/r9RtyQfuHchHzqmeyReYaJuP/aT/DZ
+Q5tESYugVmsEbQ0TLgtcHb8gAW7PU/JVlsr5S49rPosgSJccP5rbkQkt/VB8Ox/p
+nJPOofefxzuvM40KYrCuPfY0MeRiaFg7NkZpyPYI3hvcuAdzq1DMNsJKGcyUAQFU
+FzN6HpDCiZDK23TUI3LBj3nf3zw/0ZbQWr4D4wiQ4YiwU8yerRBZwhqvgppRTctM
+oFvXlxVf9FvkGFkAuqHS/a5lSQHXyFmXU/wWwPF7rk3xLa72Fi81jllMnR0TGSKz
+JMgPfQAQGJINMZ/xNGVlcl1ogRfLEEaFeR41eklEtKCz+c3WWPLSpvZJQcODovvS
+m9G3GDQ1MwyN4mMBkqHI3A8kQIvLJSurYDxg/4295ZZPrtMh3qHM3wROnWWmA+Os
+YHuraZl8LOIpjAhoG2Gsh1a1DR1SzoXBsmUzoTbuKwgaawrQqUCSKYfd8Q+uZd65
+da8eQKDJbP3YUe9occifxjsx9gYVDwO6xgdLOGZ+zZSIe7GHLT2Wnv5szqWyfUnq
+vGrXiKMO+iSiz9+nmgfL
+=Bhnc
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.8.2.ebuild b/app-admin/puppet/puppet-3.8.2.ebuild
new file mode 100644
index 000000000000..f5296fec5535
--- /dev/null
+++ b/app-admin/puppet/puppet-3.8.2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.8.2.ebuild,v 1.1 2015/08/07 06:47:14 prometheanfire Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+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://downloads.puppetlabs.com/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 sqlite vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.7.0
+	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
+	dev-ruby/json
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+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_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# Avoid Rails specs to avoid this dependency and because they
+	# currently fail against Rails 4.1.
+	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
+	rm -r spec/unit/rails || die
+	rm spec/unit/parser/collector_spec.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+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
+}