fixing bug 514710

Package-Manager: portage-2.2.14/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 9dd4987161b4..cc622bf4a97d 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.216 2015/04/28 20:02:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.217 2015/04/28 20:05:13 prometheanfire Exp $
+
+*puppet-3.7.4-r1 (28 Apr 2015)
+
+  28 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +puppet-3.7.4-r1.ebuild:
+  fixing bug 514710
 
 *puppet-4.0.0-r1 (28 Apr 2015)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 75c26be4b67c..7f39e2539fe0 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -15,24 +15,25 @@ DIST puppet-3.7.4.tar.gz 2600191 SHA256 957c09ab253f76e624809766999da6d872f79b3a
 DIST puppet-4.0.0.tar.gz 2801435 SHA256 4bfc6e7ae1a4d2b46fe06781fc0e6183c2a82eaa3c578060059dbed1f5d02fc8 SHA512 2faa8599aa461e4b10b2351208f3466db233ad0c49b955d18b85c3ecd4ed3bced733fdf68cc5d18ef41aa1a030da24348f7679984120d9ff403eeeed293c6526 WHIRLPOOL dd9696e6ac995d89aa3d1fd2aab8ffde4c89cce2e1c82e2c43d77668082e66ad3d5f875c16e0443e7827d4b4bc94f0171d7434b6ce428f4a01007c3aef67bd7b
 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-r1.ebuild 4902 SHA256 48767c048e78cff7855d2ea0ff9d94b8432ec4d7ac226bc082ea64cb17052271 SHA512 752d41ecedfa992ea345a62c74e21d3801e453b1a35b7209c38d84c2d20c45730d45d85425ba35c96305e5e31575d70b9fef2c42f7b8e382c37f6a60ef8095bf WHIRLPOOL 5bf388624b8ff4ef0b23ae49e5557512b7ded0d4a8d172cc31fb2664ddd7ba09cbcd2f3ffba37b8e65b599211ab4763ff91d1b0f3cd1b09a4583e3b43034cd9a
-MISC ChangeLog 34945 SHA256 343ba4e315fbf7458cb3660f7956682f3b3319a84acccdabd17872e53479ceb3 SHA512 97d7b1cc112196091cdfd73b9f7e288932bfbd8ebe270389d3e8c46b41a30ca5ac589097f4d476d660a83cbcc5985cba5790f11f0f88a0e407f34396dbc525df WHIRLPOOL af55d00580c69477029b368afb5816c910c208af99ee1940416da5c2266c33add140019e0a48390f9f7547c9ce408073b8691951c666c2fcdf2c9e195c27c0c0
+MISC ChangeLog 35082 SHA256 025fc942c5541383d8fd653c5e18956ba9aa761d28ecea44bf624702cfc3c820 SHA512 c217dc1fe0803980b790d1d5d44eb737196deb2d3580b91f1e9b8c5d223041e5e0e63cf68afe464a727415d5db67e5fa673afc7ad0f2f36c01700ba66bc6c757 WHIRLPOOL b9940dcefd447db3714e67d8c44d402f2c123005acca5efd72d7616b56e8707eff3a0167c813e5a60d47919cac053b12379c5e57cac67c3c506a9a3315e7f5f4
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVP+eIAAoJEGSje+quGaToAJoP/1alqpTG4JeL2nhK2nta/uX8
-N/vs0+ZdWqHxf9LQHyIyBpMvp/PShPqB1+0BB9cDgz8mWpKnDnHmWtYrCfPsB09T
-m140pZTYDnUaz1X8U7FnotpAoWyE0InzQ9recrait3MrzcTjLotaf/3JjPBC2jGB
-JQTSpojz+PkOhh66Uz368+fOhkOs116nZ0hKZV9Y/YJk9zTw278Af7hyq93nOheJ
-IBN47haJSrZ3tnZf5Fbr2GfcbcMaqnHWEGm5b6biERE7itL/r4LUGvnJQI0Y0vCW
-S3RreiXkFRmZjdPxfLu8I7Te7cRLGECynaiTyQyUbsG5drBHd76eRZB385KiC4yZ
-bYGfOoVTfJoBCOjOW4TSr/IpCFR7Kie1wYYXnsg7MikzHjCNActV4thZ/F1wic+b
-VGoqTOOcffyVCnzKIHqNtyp0D+8Q9TszIqwk6u4iMBsCyD1ddRKBpBfuOJw0Lj/x
-jJnK4JzH8exr4zyhmWxyNWbALEmnKWU6F4nIsPoO1v20+pb1K9iE310n903zAmWl
-ajvofDq6b05pR4LGQhzNveefHV1P18XNZUjxyECcWIK7zMSOvIr93I1gAw48SyIt
-zr03SUeVnLDTv3LznceQkgB/IgdG9IYdRAy0AcBN+MtIIJJtOIh3BAlf4OL+o5U4
-3Ljc0PHlvVEZ+VcEKKC2
-=lBUs
+iQIcBAEBCAAGBQJVP+gPAAoJEGSje+quGaToS4YP/21dXaZsVWnqBUcWhyCeTHzY
+R1/PWuIcoXHpqIWBU1xt30i9gJi/8vHdKACj//dddVmHlDrmnUx3Ax4l8pYF4C+2
+qn5t9QlomMQuj5ikgj+3zNIlpYB9Wm83URCtHQg1igzo/DaNADZm18InbxIkHZVD
+xyGuTPhBmdmhemGBnFnwx9aS8xP6NCL+LO0vQbP0OfOHziqTOBrfHcE8jPqpqBtb
+GWoCAzNwPz4BrKxzCuODRu6BYMMqY4CpMz49qAQfQBV+CjxkQv8dFzOSRBLPlSOE
+lveGt8lznrhLT15+MSqvjuZ4ngEj1YlP1OoOs+sLFTejto5oyXioyCi2RTMABkRy
+bLJ3TUKXF3viRqm0WvAcRppsNm2uVpgfi2Sb5FO2OkMXhCUjZZ5gx31PvxVEQYIF
+oxcMmiTZQ8Si5/C26D6NpPmBNTpwbrCpGBABhU2iwonLuRdb2aTSk0Ab+xETIF2N
+xtkBm7Ow3iq3LhbZRZQ9GTioSMNcLvFFFnkSscyZzBPrzr18eT2aFalXeHYtpISP
+RXv/vin5z+uAOD9LG5Vf24lwyurIqTeLnSs0vnjRrsBr8dSe+kKvs7JJT08fV8sP
+hu9e+3P8pENty7UdH498Q3PKySnb0aq/nu2XObLFctL/HrJHGRtuWIRodTOL7BKN
+1G5fuvV6NzIlUVrpI1ln
+=STsh
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.7.4-r1.ebuild b/app-admin/puppet/puppet-3.7.4-r1.ebuild
new file mode 100644
index 000000000000..db2797d3f21b
--- /dev/null
+++ b/app-admin/puppet/puppet-3.7.4-r1.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.7.4-r1.ebuild,v 1.1 2015/04/28 20:05:13 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 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"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.10 )"
+
+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
+}