gentoo resync : 12.05.2022

3 files changed, 131 insertions, 2 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index c14a1897a9ec..ac8f8d7da49c 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,8 +6,10 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-7.14.0.tar.gz 2816077 BLAKE2B c4aacf7179208e801fad2aa384691e38ca4bd1329819d4ca15b7a3cf25c5787e8adef12c91d233c5adbc301ab77cdf9748f094a1904c78c62d6ac73dafb4a634 SHA512 36aaa9c8cce9d1c40e77eee1e3544c0b0c665bbfa3b8184401905d6f15c142be8490421af0dac57856849de343b288f67153c551db68f8cea9e0ed3ad251feb3
 DIST puppet-7.15.0.tar.gz 2817137 BLAKE2B ce76ad71251a9202d31e858706eb994c6210cbe97f31e56d95b8c36d541d0ce8d1e65ab33d399e7dca1c5ea8e7f4dfccb3a2a4d36baaed6ca31516b7e449bf2a SHA512 0d68bda85a5f61fdb74c3e70304d414afef238dff4f7a4cd60c17f5cc26fcb18ba7f81065d6295adde33bc181031b458d259daa84a41156c9589f5c0e3cb8951
+DIST puppet-7.16.0.tar.gz 2817116 BLAKE2B d367005ea69ceb0f89f4294e74639ad61305f23929e5edf0385eb2cce5da76fa157c5bc7408599dcca4d9adba39c3b29250e78d8f584873f72bb34452a90a74d SHA512 b1f3c6072821225c9068089f44ad9ab955534f2d91bf88b44f762e0588442b9d6191eb89909dc05b7efc3a82302d2d3dc5a5a040fbc84f81645817d695b4db72
 EBUILD puppet-5.5.22-r1.ebuild 3750 BLAKE2B 4cfe9e58f764927a378ccb706ea14ed3ac8e981356c2000d16b8a33b924c7d08fd8cc6f27c70cf66f859d5649c13a33d4982ea69573ba73d4b19375c8da95cdb SHA512 87fff4d2c68e882894b3a24f28db1d0b68b081530eeaaf3149314aa1968094fe3f0b37b57c5240e2e4dfe19828084b82b07e0bc3105a1dee0b52f9e28f034cb4
 EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
 EBUILD puppet-7.14.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
-EBUILD puppet-7.15.0.ebuild 3459 BLAKE2B 3afedefaf365433acf67a6696c7d6919aecf8850d84733f2f25679ddbff2611f484d192cf558c7b01ed36a323006fc8932f9c491bdb79776e2219ac031fb0b5a SHA512 09059194222f23c8d7183409cc2534d272615e2154bdd25c4bf83c85ef80f48188e0ca420cdfbbc1e91aae0cdc1b7483daa21d1f5714ff6c52a11fd425170c07
+EBUILD puppet-7.15.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
+EBUILD puppet-7.16.0.ebuild 3459 BLAKE2B 3afedefaf365433acf67a6696c7d6919aecf8850d84733f2f25679ddbff2611f484d192cf558c7b01ed36a323006fc8932f9c491bdb79776e2219ac031fb0b5a SHA512 09059194222f23c8d7183409cc2534d272615e2154bdd25c4bf83c85ef80f48188e0ca420cdfbbc1e91aae0cdc1b7483daa21d1f5714ff6c52a11fd425170c07
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-7.15.0.ebuild b/app-admin/puppet/puppet-7.15.0.ebuild
index 98baf706218d..b0c6d6d3ffe3 100644
--- a/app-admin/puppet/puppet-7.15.0.ebuild
+++ b/app-admin/puppet/puppet-7.15.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~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-7.16.0.ebuild b/app-admin/puppet/puppet-7.16.0.ebuild
new file mode 100644
index 000000000000..98baf706218d
--- /dev/null
+++ b/app-admin/puppet/puppet-7.16.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+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 ~arm64 ~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/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	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
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	eapply -p0 "${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
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	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
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	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
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}