bup

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

3 files changed, 185 insertions, 16 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 2492e34bdaca..3c4585e7cb9e 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.220 2015/05/06 06:38:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.221 2015/05/27 05:32:52 prometheanfire Exp $
+
+*puppet-4.1.0 (27 May 2015)
+
+  27 May 2015; Matthew Thode <prometheanfire@gentoo.org> +puppet-4.1.0.ebuild:
+  bup
 
   06 May 2015; Matthew Thode <prometheanfire@gentoo.org> puppet-4.0.0-r2.ebuild:
   now with signing
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index b0b9c25dc718..f3b423aa70b8 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -15,27 +15,28 @@ DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb42
 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-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
 EBUILD puppet-3.4.1.ebuild 4252 SHA256 9315ffda620a873edc07dc0dd72fa7e41dcb8f769c9cd6b43f734c45fe479224 SHA512 c1bd57514fb26815f3d3a76ee526dfe5ce2217134e9be8db7863ffa600660e2fea3dfd354c40e0e5ed7da356d60ac54328f20a67b1802270bbbb4e557b7b6dc8 WHIRLPOOL c39cf66e177f31d3e4ca69b36c7036092e51a74c48d6efb4f5e9f40376a8d5dd8cdaa9868d8bcef7b312bb62614134d0bc557cc5cc9214e0e71ff3825f164b82
 EBUILD puppet-3.7.3.ebuild 5182 SHA256 885696503736055d53dfbec01960f0c00394adf19ad26250494db12d607dbabc SHA512 d871f9e71f8d1e076264fd1c979794cb161004c14283f744156cbaf5f53269459f63979eccb19eb47f7d37a0d010070ccf7e8d593b656d4fb21ca98e29b28eec WHIRLPOOL 396fa39d6e224682caab38622f6ebcb5a4f93b9d65380b1bfb949635ef9a4ce7acb4c28ded7c7b0367e9882038911dfaa3439698b9b6ec107e96baaf3ed5f738
 EBUILD puppet-3.7.4-r1.ebuild 5256 SHA256 bdc74c4d96466e71794a330a17d9f5cee040cf0a099a0599a6393ba638552300 SHA512 82cbc7dd7723223a4fbaf168614af0f33f29266e858529216a1acae33645a8e527eacb258c7607b813ba1f9007e9f9485d95c7e1c99a6d8d96cea74304068410 WHIRLPOOL 7f64e36b93816152f93a4058b0e22bdbd3141c309f91dffd3fa41a9250bf2716c1ed1cedffec1ccae4f4247d95b93418523ee4cc8df44cb52e166770cfdee2a8
 EBUILD puppet-3.7.4.ebuild 5246 SHA256 718252136edfc4d8bd4908fb8362dedd34250735a5a4ad3fa83e390ec7d1d177 SHA512 bfc2acde117d3b20ae285cdc5053884d3fd44c14ed817b22aba336b244be4f5d6e1bf8843cd367c52c6664af1524f201b1c607999de487df0e2d513c276fc824 WHIRLPOOL 3a0d4300ede47be728b30d0c4e87ae1cfa75f5146ad5675b5e38f5b6295e8431e1bbb34a07cd0a26ef908cfea91f383f5d7cb94a6cd58395b2b693cd45e7ed84
 EBUILD puppet-4.0.0-r2.ebuild 4484 SHA256 8b87ea61ca4b11a33e587364b82f6146bf1fba68bae9686fd41553d82939845f SHA512 b86ed3d3cead398c5677ee78aeae2581bcb2a773dcad8306ef7314bf1424779337727b7195a3fab6da39de64b6adc2bf18039f58b2684a1e470ba0eae119a201 WHIRLPOOL 25fe2bd9ea079a0153134f1f6dcc5c49533a04efd7f86c473412e57908fbb80ee2a4fae5d30925193e3e2704eb0ed4c83e442bd55c15059ca270d90306c88d0c
-MISC ChangeLog 35528 SHA256 3e9eb95b3d44d80dd5256bfb933d3be3ba72f02dff8587bbfcb0022d737c75a1 SHA512 28cca584c1a4739d237bb33049e571e1dd2fc925716634df9bed026822fb794ab2d2a3468115f2a2b76dea69e47460c43e4ed2e40c4c52516ed5a508bf64457c WHIRLPOOL 92293c728faa85649a7de8619463f123e11f957a66684c84f33c74796bb44a01d66357d2006ac1dc09da8a546e1cb0c5946d16e8c01f1e3756336348f3e485d5
+EBUILD puppet-4.1.0.ebuild 4481 SHA256 93f731db802583371f05a30ee0d38eb38d7c460ca2aa4469eef9302c7c1f3557 SHA512 bcef899e43af8f2b01547fb330c42cdf70af20b6d4c7593d6d11d62028e36a5587e89802300db6ee8363b0f780a21cdf01dc5657e32038f2218372f1d44a5a92 WHIRLPOOL a9576c8d726d6bf421301817713a0549ff3307eaaa0c504fd505f9874812369717b61d68b543f4561cd1ed78b30431f3194747915cc2b4d90ee4d889ae8675ad
+MISC ChangeLog 35643 SHA256 ef962d7d5619c6860c0cc6df2185121b830b33065dc9267057b9ec1a60c4cd4d SHA512 fa52faa34d3eacfbea9089fa3374894d27ecbc032a05fd2a09a2a01f2ce178cf93e13f31e236029767d49897303cd9874a64e8c2df444e5a9e39daba14bed66b WHIRLPOOL fc5d4acb5bf0d949039cd0787c14ab69a544360c969f6533a56ab0eb0e363f755ba2088f9888682cb9ca85a8cdbfb1763fc2086722dd23c8ae4d57984001dc4a
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVSbcQAAoJEGSje+quGaToIOkP/jCKpp4SX+n094fQcrmxCCUD
-bTuK0F88kO4CW5ny065Fb9OpY/FTbtI96+tv3we3m2BRHHRk/GN1I/Gt5x8OsanY
-fJgSVC/HP825cXxdFKsh77lVb8noVvOVpP5ezPjpJwM2Iqgf1izafbW1nV7WXMo9
-Ek4VRm5kX7MKUewb4q4H6hgsTwq47IYZkS9qb4wayXvybMXH6GVp/mrpT/HK4rb6
-wjvvU6nBYlt/7xqQ/9Cs2ETZEugAnxe40wfcePou1jY7OlQ17LP8fpy87dBSNQTS
-NsnYcGhUTW8E/o61hJsLyPGIYyFs/HJekIzuol2eEbbc+/mNwSdMJoBD39QboRD2
-mKiRV4hYY44OLEWFkbslcvkPNh9eejKIX9W8mjNMwZac+lyIZ/jISMtbKp6SoMdx
-9wgS/fwHgwGOv2Y9SCnCNNVHXwlDVX0f5BeSijCj1ioAhpILdPqzde+IuEXSxxoA
-KTJgKgaO46v6ueJfVGx4RZVU5tlUxSaGd3qneAOPYKDM7FVUmw3jWoBR0DMdWa9a
-+nWmPwft480lx5zf6NhpSnYYGiSTPMu/CXqerVS97M8pvNxJWCAmoA5jmhgyFKit
-CKnBwlsEzJXYr/50d8vL6HZFu5eXQPu/eN8J0IJlwPfOtEEdKudt2N/dpHtSPYDo
-FD0QUGGRGH09ChlrTOKv
-=Gcsy
+iQIcBAEBCAAGBQJVZVcYAAoJEGSje+quGaTokTEP/2YFK9tG+gpG+CDxeqhJ+MwJ
+HIBu3M4UMaZWbPzlQIz3xZ7G1L4kPp5Wmo1RXMnh2OaIytUKfoO4Hoz5Bl70yoRc
+J4n5UcEwS2Zca+s4Ax+J3PdzwlLcrs21Ljr4YOatyM9oTl/Q/hD4GwxRP5UVsC5I
+SBJYAmRiLl2H+kLjgBlDP3EstkxL7K4fIsD9vlb+YhFrqvll/GkmXA6jnqW0VTqR
+M7ihzjik8ZVJ9XZXE56A6ezjtRe3GIqS/j0sxdKCcwyoa6E44HC5BWYAsmRRct8A
+fNngbfoy8pSYxW9QFl+jcLLMc3fiwX38D6JDLr/mb9qvmveoHTtArRijNqkUHeM+
+unOgUyTTBpcKL7Or0a5a5kBMlbA/UZAhfHVK2scG6z1581SF7uYA9uJuroAorkYB
+yscFBREAESlp8D6P3CS0DJKeZn1YfOKEsCVskhDIi4L+bjc6fwgmumRkTH5SQg7v
+WzEtJ+9Dne8W+urUoX3qlIxLPS57z+XUjXyVCFQPNJHD5MNZ6eubWpR/p90nOlwY
+3EX4sHM+wz8yOqmwFsUmBb2EpQJ/faQDuTtQBeuF1wZaRE9emw9V4b6lgpRUFTl+
+dqdr3Pz2eBcbSvHCEoWxa8QV/Xg1ewazKpi6rzxW2zls6+jtW6STfgkYqiTe5R+m
+leMk98VXNVSR5Ip07Du9
+=9Eh6
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-4.1.0.ebuild b/app-admin/puppet/puppet-4.1.0.ebuild
new file mode 100644
index 000000000000..c0f736765498
--- /dev/null
+++ b/app-admin/puppet/puppet-4.1.0.ebuild
@@ -0,0 +1,163 @@
+# 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-4.1.0.ebuild,v 1.1 2015/05/27 05:32:52 prometheanfire Exp $
+
+EAPI="5"
+
+USE_RUBY="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 rrdtool selinux shadow sqlite vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=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"
+
+DEPEND="${DEPEND}
+	dev-lang/ruby
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	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 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 || 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
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/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 [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
+		elog
+		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+		elog "/etc/puppetlabs/puppet"
+		elog "Also, puppet now uses config directories for modules and manifests."
+		elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+		elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+		elog "for more information."
+		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
+}