bup

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

3 files changed, 211 insertions, 5 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 2be652709c92..aef39c17a2f0 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.197 2014/05/18 19:47:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.198 2014/05/24 06:26:06 prometheanfire Exp $
+
+*puppet-3.6.1 (24 May 2014)
+
+  24 May 2014; Matthew Thode <prometheanfire@gentoo.org> +puppet-3.6.1.ebuild:
+  bup
 
 *puppet-3.6.0 (18 May 2014)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index e56f41362d75..0133ba210380 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -15,6 +15,7 @@ DIST puppet-3.4.2.tar.gz 1951200 SHA256 40ad847e7f8f7a2eb2b968280dcc60427de67707
 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
 DIST puppet-3.6.0.tar.gz 2245445 SHA256 147c730db72ff41f83840d6363bad160f94e177df0c0bb6ebeda6be0f6ff460c SHA512 091882977c063ee19f5c97be377cd8ae216e97c51278ecbdfef1564f9ce368bcfe8dd8ff6f2e0d7c65fb49bebe85346d0e8c5579c0af9dc3ad1969e2aa02fb3d WHIRLPOOL 6c9a776980c7065dd6dcb23ee2f278d541b829e8bc6e6a19328d2e0656dd825cf8dff8b6ee7eb837c3ea22ee04a2ce8db93e50343c7629dc6c59dd672f844233
+DIST puppet-3.6.1.tar.gz 2248333 SHA256 f3f8ba0243398f4a79a5f62e780a90b12dd0d770266256b446385952a1f0002f SHA512 42cfccf07ec4626aa520e1e548a617acde227ba1e6766bcdec491cd8e839dedea287c3bdf0271ddaa56c755eac39b7d1a8f6c174edc57b29485e35f361d2d694 WHIRLPOOL 761c23fbfb104deb1e559788f91c1844bd45a2f50cc19c883a205e57c74b82e87a612bc32735a685f9d100705f7463275cbbcf0d602c945573999c00e1c9363c
 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
@@ -23,12 +24,23 @@ EBUILD puppet-3.4.2.ebuild 4261 SHA256 606f8335e457435576f01dd4a7144417466e83650
 EBUILD puppet-3.4.3-r1.ebuild 4352 SHA256 a1f7c5ffbc01d03c17d65c377d350d401da2591e7a7fa80a6c36ad9468d7f736 SHA512 06fd92b2511c3bee7e738961490b7e6bd9f0251f9fc8182591fe6acb570b51df0ce54d4ca9e6e23ff54c34950bff28ed5e46413f4b98682e06d61f4a1cc0fddf WHIRLPOOL df84471a205adb66a4904365cc86f3bde970ca53e4bda8e5b2a6c8647f854043040d7079e110db0fc07bd39c1e0c8698d0a43de07af46e5584b57abacdb6311e
 EBUILD puppet-3.5.1.ebuild 4378 SHA256 985fda25ffb783ed7a2048d74ec063eb8d8c79f61e7187bcf0bd8dd340ef3ed4 SHA512 23ca690ba2e9e3da8ecb7d276f3631ad540c8ce83c8a8f3b3b780f45a82947885a2a77ebcd56c5900d0713dc690b42bfde9e0888afedd75879cbcc2dd09dc396 WHIRLPOOL 2dc9eaa4996ca54f78412e09d8c90761ab36ce92b8454a5eda31eb87446685a93ba6aab61dd011a6b7ae047233ff7f40a482d777738a7126b507deae1dbb6f4b
 EBUILD puppet-3.6.0.ebuild 5192 SHA256 e615cd5b80207e829842bd81512dc65e7ede09024a16dffd171474c88ab84989 SHA512 e1eb0daec721eaa659bf5dd56f2020d0a6c9a977ba4f7aa678b1621922e5135d7b90d4c7dfbf92b6bf3e753ea2450836e74534672f72d0ba390f00daee452129 WHIRLPOOL 6f288f97cf1fe7dccb42af3de3e6c6c4a7fe94d298d6d52ab22b31cda72470cb77a97c5542db9317d89c5b24b7a8f89cc347747b0045f423a32088b3db5e637a
-MISC ChangeLog 32062 SHA256 16d8d88820a7a303641e9e89bbd3b9d210a83b10c3a18a25484a38d5b98d9e29 SHA512 48466abaff8c6713841320879c7f5f82040afceb77a6159f0169230f0dc90a925472c92309a68da87ec47b728ecb8b0ac4bf5160be7cae43d4de9a700664c2c7 WHIRLPOOL 95fb1d52b46c1ee85951d4ce23ddccfbbbe1729277632cc0b807f5b2064833a4163b5482eb406a60c003176d01129b43ed385f16fc566258510ea6360f564e15
+EBUILD puppet-3.6.1.ebuild 5200 SHA256 66041cf004eb5dd0f3720a51efb5870ef49db8a81e2c514da98a84679e09158b SHA512 3df7ffc2dd0660231e7fd1a2ae1d08a916a000014ed59b3dbd86b2e24ac8e1683694b49e02d05f488b97743dac9703dc44ec1e27099361c7473674160633e4f3 WHIRLPOOL e02fdb9263999351e1e7ce01dec33ecd285db93d63c3c94016a3430883381f3a9d7c3222036bfa5b1fc9abf4a9dcb279ad8d57585d3db8c6fdca4b452f87ee17
+MISC ChangeLog 32185 SHA256 0185e91e217c8110d17cea947caa821fe0c1092b96a61babb230b01594cd5a1e SHA512 a24e907941e1d78ad126b87e918c4e43be520466f643ee2eec9c753e5a6149033dc5bc64673806f770787cca317eddcdb5dbb6c8df122e38ac649a92d4f6f8e7 WHIRLPOOL 188538672191e47abde6338eb65e785399cc0157dd0bfd820356072cba3ed2e515b3d331bb77d348d81acbed3afb2b812eceff81a11a5dbab7b2d3718e69b817
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlN5DlkACgkQiIP6VqMIqNcPdAD/bWmZ4xE/IhZ3brAT8D4tE6VZ
-JR/xFd5+eJqxvzFhlbUBAJdVH3Hm1C0J+n6QE/wnIhLfeshgbkTNqc/rbZAQ55ZG
-=+P1B
+iQIcBAEBCAAGBQJTgDuOAAoJECRx6z5ArFrDq4wQAKXGogiOKm8gXwhMPDSRjJrK
+iPzFgwna07mnMYXuzjMTObgEU5KHG0U51N0SIvGx+mcUuOhwTT7Z9oOuRd7yupLr
+3Hs1CmseZQbny4aNIrxtyd2ApiqiwvJYOaEHwE5s1gi3jdN8qx1jKkG2BLGR6ffQ
+1aAn/NPmSpkJbtfjHfijHTxA7k87weROqU7S9I5/n+XjCLdzTpXtL4aZS+r0Y3jb
+RUpXySibA7v9wi/OGWrTwND5X4WcSEUsC/GTelxGJGTUThNarGOM1WRtmusLDkiF
+JF2BED8CIKuIkEO61dsqRedQLXy/gykh0H+ZYlfJVvhgSHXKMM6XvJRYsARSOGIw
+clIiJBW9Pz4lcJPhvZ3IBJRKcMBuI6e5qGWR0XmVR5dZqdv03i7Yo0y5iOll8WwL
+sPY3NcsZb+iQ1L7op0ZwC/5y3vBkkbOVgY+Yl1iRaV2w42qDNggmZ7RBxZxRuevo
+iyTqaFC5Oifn/X+H3dy5t2karWJHqrjzybpzFGvz5MZYH54iItE/kYDESeY0CZ/M
+TJ/OZmglzjaCD1rqhl7CCX0bwmDhn4euNOI6AdeON8+yg8KfjmI+/UzeHVnTjney
+AgG/NFvoGtGT6EZxvmXU6Jm3I90eYdrQG7n1bjndg9+tngNLSzojl+erY9CvvWdM
+x2P/cUu+0SzI5TLQI2tY
+=fWHf
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.6.1.ebuild b/app-admin/puppet/puppet-3.6.1.ebuild
new file mode 100644
index 000000000000..fa9570aa3c2b
--- /dev/null
+++ b/app-admin/puppet/puppet-3.6.1.ebuild
@@ -0,0 +1,189 @@
+# 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.6.1.ebuild,v 1.1 2014/05/24 06:26:06 prometheanfire Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20"
+
+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://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-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 )
+	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_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
+}