gentoo auto-resync : 10:01:2023 - 23:43:04

3 files changed, 5 insertions, 132 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 52abfbf9f763..57219da38e9c 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,6 +10,5 @@ DIST puppet-7.20.0.tar.gz 2817232 BLAKE2B 479c4e162230371bd69509844fcd97d0d3392e
 DIST puppet-7.21.0.tar.gz 2819997 BLAKE2B 96de8ceefeea12c51288e05af5d7b126811d23388492053b0d581856f11976f0492064eb89bc585ff7f455df537d5c04fb318814945a158d531d32efdd54ff02 SHA512 b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6
 EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
 EBUILD puppet-7.20.0.ebuild 3464 BLAKE2B 6886a93d04137efbf35c6893c705b161ddd3146a7cbeb1189ce85f0475ddf44ad8287971a69163a7d766c2789c722241a7606777b34fa9eacfa5754401931c2f SHA512 6dad2155b69165abf08c886ac634153602bf651c6a59d73ef79089f2baf8def0e75d6fe719b4b6011a296f88eb6d13c5bc25fcbc56c56d4699a227861765a682
-EBUILD puppet-7.21.0-r1.ebuild 3464 BLAKE2B 79354614dd9311c6c6d90de12ededbf4a87ba99832d31ee9028259607144a4ecf94f97871c3428f94c2232e3b5499c34c438d8646dc8658cc4de6895039d5951 SHA512 205f46e44663cc7a14c8d28615ac5ec1fb987aa87deb78cc1e7828d2c5d8cb3e35eb243a90b1476b1b833187d2534ac9fa42b4dd0a0dc5971793c2300978d78c
-EBUILD puppet-7.21.0.ebuild 3466 BLAKE2B ce3608883ebacb011f099fdedccc247e5d81d4e6e3956ffb1bb25ca4e201fd50fc180a7314fc8c8254ede8a841da3ace83253257449fd3a1d6cba70342baaed6 SHA512 0eee8a3d323b5d4f004fbfe55d8e4387dfa8c13e8f49b34304850b3854e72b3639f505e8ef14ddb14c126f52589cf04f16d0bf55de807aca496af9f4a89d69fb
+EBUILD puppet-7.21.0-r1.ebuild 3466 BLAKE2B 269e35b7c3d6275ce9a1979602804a3878a6e9ec285184496603eb6b8e98a298a19fc178718d2c1545bfcba719b3103d411fdd0f2bbe09e91ab9c7790b201ee0 SHA512 568015d5a107ef7d64efb7aef3b454316d801021e4fa7ab28ddac9b95d1b23a3e2669cc4c72b2c5ed0b1feddc2f6d39d7cae075b5cc9b96259dace4c15ab1ba2
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-7.21.0-r1.ebuild b/app-admin/puppet/puppet-7.21.0-r1.ebuild
index 42b2ff4970b6..5d56b2e46a6e 100644
--- a/app-admin/puppet/puppet-7.21.0-r1.ebuild
+++ b/app-admin/puppet/puppet-7.21.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
@@ -74,7 +74,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() {
diff --git a/app-admin/puppet/puppet-7.21.0.ebuild b/app-admin/puppet/puppet-7.21.0.ebuild
deleted file mode 100644
index c4a309bf4bb3..000000000000
--- a/app-admin/puppet/puppet-7.21.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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 ~riscv ~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
-}