gentoo auto-resync : 07:04:2023 - 17:30:27

2 files changed, 25 insertions, 35 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 56f1a5cc381f..503bb5ac2ef6 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -5,10 +5,10 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 AUX tmpfiles.d-2 35 BLAKE2B 333994788552e5c52273752f4e3c2947666737d03f9d340e16ada790607efe77da1ba9bb4852bc8274174fbb96ce0c7ae81062f7197e63ea4701e539b2650b3b SHA512 fdf00147c497bd822a14f0e42bad825a43ce0977ec6c0265d267dedeef56295e3ce319f7972d0ec2ab9f04f2407856947f4261d6e62054a36c6e1672b45f86f0
-DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-7.21.0.tar.gz 2819997 BLAKE2B 96de8ceefeea12c51288e05af5d7b126811d23388492053b0d581856f11976f0492064eb89bc585ff7f455df537d5c04fb318814945a158d531d32efdd54ff02 SHA512 b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6
 DIST puppet-7.23.0.tar.gz 2820654 BLAKE2B c9e2b544400c7fa9e59dd1d40bf89d1444ee62664b11e7aafa30aecd5fd14aa217dfe0bc24795a951c5e04b04762adb0239f6d7289b431b8f2a040716e95c642 SHA512 a66ef2bdbe38741a176e825cf7cdf117616459548731d4f5482b49263b08dcb3550305e5f0e35d228f873b330b730b682c02d38b4243f5f8bb4a190ed0f60310
-EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
+DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9
 EBUILD puppet-7.21.0-r1.ebuild 3466 BLAKE2B 269e35b7c3d6275ce9a1979602804a3878a6e9ec285184496603eb6b8e98a298a19fc178718d2c1545bfcba719b3103d411fdd0f2bbe09e91ab9c7790b201ee0 SHA512 568015d5a107ef7d64efb7aef3b454316d801021e4fa7ab28ddac9b95d1b23a3e2669cc4c72b2c5ed0b1feddc2f6d39d7cae075b5cc9b96259dace4c15ab1ba2
 EBUILD puppet-7.23.0-r1.ebuild 3667 BLAKE2B 596aba703f8e8154cde0c6dd8d11cde9118aac72546a3579bfbe43e69748b80e89ffed85baf5e0be36f5cb3e969837fe731523827581a60535df6f43ba9a5691 SHA512 9db45b40a7c9b7367583181a28dc5901c845fe814298a48fe1fe2ea9b3d7eec9c55ab3076f934902f1c8885deffc89eac90e8fa13d6a4fdf16e313f031d3cc6f
+EBUILD puppet-7.24.0.ebuild 3669 BLAKE2B 1d9bda9449626c6b1e23f33f2564557631cdd9236253e6b089544c29b89bb35691ca78dcc614f5bb80acbc5ba7f87280541eadb4112fe6b3c413db63abbf808d SHA512 52ed50c70e4e7580cd7d2df5430b07a0673841f53697fc60782855bf7dbaee53891fbfaa8995608e9447b8b2dd267977f5ccc27802e78e2638e622e670cb03c1
 MISC metadata.xml 1447 BLAKE2B 1ad2b749a8ed307103509bf28bff6ada3c49d4a972cffefee3a286b88e6fc5ab38db1f0fa5afccad74729d0db52786b877945afc2fcaef77e26c1df209a782f0 SHA512 5258a5083e6155d15286a10e1d71d4969e806e2e9b9bdc8e3665e71209e069e23f4e5dba71dba002e47f6dbc75d7301065b1bb4e59097f3451fe1c6540da4785
diff --git a/app-admin/puppet/puppet-5.5.22-r2.ebuild b/app-admin/puppet/puppet-7.24.0.ebuild
index 7f79dde74e75..82ff7c0a5640 100644
--- a/app-admin/puppet/puppet-5.5.22-r2.ebuild
+++ b/app-admin/puppet/puppet-7.24.0.ebuild
@@ -1,35 +1,34 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
+EAPI="7"
 
+USE_RUBY="ruby27 ruby30 ruby31"
 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="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
+# <dev-ruby/concurrent-ruby-1.2 for bug #900206
+# - https://tickets.puppetlabs.com/browse/PUP-11722 (workaround, pinning)
+# - https://tickets.puppetlabs.com/browse/PUP-11723 (bug for fixing the pinning)
 ruby_add_rdepend "
-	>=dev-ruby/hiera-3.2.1:0
-	=dev-ruby/facter-3*
-	>=dev-ruby/fast_gettext-1.1.2:0
-	>=dev-ruby/locale-2.1:0
-	>=dev-ruby/multi_json-1.10:0
-	dev-ruby/sync
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	<dev-ruby/concurrent-ruby-1.2
 	augeas? ( dev-ruby/ruby-augeas )
 	diff? ( dev-ruby/diff-lcs )
 	doc? ( dev-ruby/rdoc )
@@ -78,7 +77,8 @@ all_ruby_prepare() {
 
 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}"
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+#	"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
 }
 
 all_ruby_install() {
@@ -88,12 +88,10 @@ all_ruby_install() {
 	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
 
 	# tmpfiles stuff
-	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+	newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
 
 	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+	newinitd "${FILESDIR}"/puppet.init puppet
 
 	keepdir /etc/puppetlabs/puppet/ssl
 
@@ -109,13 +107,10 @@ all_ruby_install() {
 	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}"
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
 	done
 }
 
@@ -129,13 +124,8 @@ pkg_postinst() {
 	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
+	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
 }