gentoo resync : 02.08.2019

4 files changed, 151 insertions, 5 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index bf0bff39976c..162d67502bf5 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -12,12 +12,14 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
-DIST puppet-6.4.1.tar.gz 2893151 BLAKE2B 5c48b30083f93ce3625551020cc3b386cbc4ca8ab249099249099dc7aa8866186c197732ad603366d5fa54c3fc1664d7b457d323a2e6d9266faa754f7d4fa4ca SHA512 260f933dac3a3033e807c5b7c63d5562d9d8d29d11550efd38b0a94eac811f27444156cc11db38da170dc2369981072288df471fd05738a0f0e951bbdffe2a52
+DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
 DIST puppet-6.4.2.tar.gz 2891159 BLAKE2B dfd8e5d9935d54272096fac66a037b8eab75dedc42caf18bafe29738e749a66869ad2e741753e8b38d872e21b1a261f2b4017c54faa57043754d619cf27652ed SHA512 7ec2746ef2a021d1cc3e3076840a9f1195fe51ba591cf2907e542b3f450cb1f4002fa3c958aee966c5976245073ba3cfacc9fd2a653d1d823720b33984aff911
 DIST puppet-6.6.0.tar.gz 2898687 BLAKE2B 67370b191985f75f783d795d7ef38df53fbf28efa8ab79ae309dba985f4ba296d2862fb366b68a46d03f526c3f27c51b1e1cefcccbaa96f6694dc888a7adcc2c SHA512 e7e7367565d12c208654bd353112542fb84b736f262dc86adb940e02a4e34d473e7bb5f084e0caa5fab01be4ef479ad2baa3e751d4d86ee447cf960f400413e5
+DIST puppet-6.7.2.tar.gz 2907345 BLAKE2B bbb0f789ae64b5039e5b1bd2ce985e89ba693d33352baee7a1d11df7f314663aa3606a73d42d6b20042f81ee405a72cd17b9cf8f3c3cb257869e982f84cfd552 SHA512 6ebcaff30bda27fc17870b991287d620d455db8cf9a41c59833efc2a7541d3622228a7278689eb0494d0f6328cd334764f21ffe8700a567696e05398a5c16b7d
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
 EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
-EBUILD puppet-6.4.1.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
+EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
 EBUILD puppet-6.4.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
-EBUILD puppet-6.6.0.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
+EBUILD puppet-6.6.0.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
+EBUILD puppet-6.7.2.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.16.ebuild b/app-admin/puppet/puppet-5.5.16.ebuild
new file mode 100644
index 000000000000..b28efbe22bd9
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.16.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	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
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+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"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+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
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-5.5.14.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# 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
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.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 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
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppet/puppet-6.6.0.ebuild b/app-admin/puppet/puppet-6.6.0.ebuild
index 0038f1ebf433..eeefd4e8c63d 100644
--- a/app-admin/puppet/puppet-6.6.0.ebuild
+++ b/app-admin/puppet/puppet-6.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.4.1.ebuild b/app-admin/puppet/puppet-6.7.2.ebuild
index eeefd4e8c63d..0038f1ebf433 100644
--- a/app-admin/puppet/puppet-6.4.1.ebuild
+++ b/app-admin/puppet/puppet-6.7.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"