9 files changed, 446 insertions, 0 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9d0377ccd704..8289b8cffdd0 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e5c3b33760b3..738dd74c7f85 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -5,7 +5,10 @@ DIST puppet-agent_8.3.1-1focal_amd64.deb 35930206 BLAKE2B 8a636bfd9a76a364f03022
 DIST puppet-agent_8.3.1-1focal_arm64.deb 35420834 BLAKE2B b95702ba60df28ca511c7ea1efeacf7b537d666987e76f83048552667d0ee1ae41041166d07f41a6d1f0e1e6eceea9af427c8e4feef0efa1108b33edf2b64001 SHA512 89d0183dd8762ec9e96ca218d179a5c6278c6b106e4679370dac5b96beb5bb6ec5c18f52a6d076a7ae71f9bbcb9466351b65f096b5c961cb6d8f03a2c7fe171e
 DIST puppet-agent_8.4.0-1focal_amd64.deb 35930626 BLAKE2B ad299aaceba51bd2831c6aa15a1794c12e03026866e7b1fd59c49d078d7c32bc8af2f0eba9f699f21e0bde98147b3a7edb88db3ada2ec8cb9601c2ed64210240 SHA512 18148a6cbd237afc66bbce1bc5d9eec63426efd5d7a2625e4f8a7d962a97c25da7e5ef208972323ea10e35c174beaacacc131d7dd1043a9013f1d8c8ae8a8c70
 DIST puppet-agent_8.4.0-1focal_arm64.deb 35421066 BLAKE2B 348f4cb16b83e0703fe8ec1fc6a5ebd992384c02f51b8d38d597d629b19f070f21e0f944ba1c6188bd9d93d0689e66ef10a4c717847ffca2534b4c6a3fa0eb4d SHA512 5ba2d6d41e6d98e0e7830fc6140500173e1e18efd9c228c84ec124c5154df847657f4c43f994d05830774fc6431b49d57081ded579ed1215927623c7b83155a7
+DIST puppet-agent_8.5.0-1focal_amd64.deb 35945720 BLAKE2B 485fa3e93006c63265df27ba99e61e1c9b253f71976aa92af1bc0ee474b575c27d3e1d3ddde21a919f5a21e151777b1ab8f7d849f5927a48898ca58b14edaa8b SHA512 a252240e206fb93bfc882f88e593a93b29c61442bb7fc95e1d3465e30af6b7bd82a362287590a36460ed04d4759fc244d3eff118ef8790885112ef78206a14f9
+DIST puppet-agent_8.5.0-1focal_arm64.deb 35436786 BLAKE2B 712f893f05f9f75bf7af0cf40556f0746a81fabbd8e588ad598f59856bfe4948c53eb92e2eaa7a621507183c572d17ecb2b426b13a91bbd0b98cc2463070a60e SHA512 ce1752d13b2d4b9442ef11006e8bc0edf98e855df051491efd2760b6919c41f0dda2030910e5794658ae99d3b8341e9bf64aa57c65069f9d83a3f328f1d2dd41
 EBUILD puppet-agent-7.24.0-r1.ebuild 2593 BLAKE2B 08fcc0a7e5887d7767d6f740501b862957a9436ef9e5b0f7ad89077a273d22e3f9ba13f2ae5e557f0f5526889cf5f92489fdd5165e0608c655f94bed6e08a002 SHA512 98d999200a527076993b9c8bb45fcce2d980b081c19afa058d7129193861ab89b323b2ea73886190cde8a633dffc96bf459b29facad8e3cbeef46be9029fac39
 EBUILD puppet-agent-8.3.1-r1.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 EBUILD puppet-agent-8.4.0-r1.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
+EBUILD puppet-agent-8.5.0.ebuild 2596 BLAKE2B 8468abd827d23a1790ef84ff0a073f7bfb48e62d05d01056a030c92609f8356292fed0e53d9d23517936910775815814c077c414126413820302092d8ae0fbfa SHA512 dfb1b5ab54f528c1e4d28f551d2198b7617ccd673d9987b01d47341fb54c0940b7a4a5f73257da318b4db87bf3a3386f271b2c26985d680f86c2d503104ab542
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild
new file mode 100644
index 000000000000..f5524d744e1b
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
+arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet
+	virtual/libcrypt:="
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt[compat]
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+
+	# Handling of the path to the crypt library during the ongoing migration
+	# from glibc[crypt] to libxcrypt
+	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+	if has_version "sys-libs/glibc[crypt]"; then
+		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+	else
+		local crypt_target='../../../../usr/lib/libcrypt.so.1'
+	fi
+	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 201962f035cd..e628c784a0c8 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,9 +6,11 @@ DIST puppet-7.27.0.tar.gz 2825666 BLAKE2B dffc2329c28588a5b4a08996f5fbff95c09296
 DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3158cfede2ffda90ee23ebcfecfdabcf35459d1a048c3a204e13611f67852028233e4da4b9ed2ea08cad07a37c9 SHA512 d570452ceec764c657f4678f7179400d30f8513766edc6f020db35c3a4246c1d857615a647ca481920a7d1a40cf9a15057432468ccd4697e4335dca55e121faa
 DIST puppet-8.3.1.tar.gz 2879699 BLAKE2B 6710d345714e6400ef04aeac8dedb933f39443688bda0b24316a3456a6c6bf2719286472a0ce764ddafd40754f8cd95767a4c311c5b5e2bd72b8bc92ec4d0e85 SHA512 0aff032caf7a3966f7e369d6f1785f0ada16e419f96f34dafee61457d2e97979b7934195eb356e44ef323401fa40be5eef608a175b3c2907f25ca92901ec81d2
 DIST puppet-8.4.0.tar.gz 2882328 BLAKE2B de46a8fbdc7522f022d19953845c73e6872ed430a9380f157809bb95e7d7315063f136b5159468708dcb5dcb4353cc89eacffffbd4045458351c63261a6d9bd0 SHA512 23d5aede9ba55e4e63a7f815fd1d274e97d5d0c35aa1b5444c24b223a59d5d913ac5b4652acc2258b1721a213e4c24e1e8b4a146ca6a1b81a1536a51ed856270
+DIST puppet-8.5.0.tar.gz 1565122 BLAKE2B c787b981c64f2b52cc3c8998516599891980bb176cb3bce6596cb4b139fbae2f58e156fb007a3aa2bd2a5bb069dc63eb7fc36bde3f3533c27729fccfa19ee0e7 SHA512 1adf88f69b3b5a7071a2ee5dad66c3cd3fc1db57fdeaf7945f8cb167d1b76dcf12e85e17eefc418cda67952a4c75a6b43d320d0c0f1db610411d188304994cdc
 EBUILD puppet-7.24.0-r1.ebuild 3667 BLAKE2B b23b5cc737843739d0244a7459eae5f3550a77770f2294f23c484a1cc907251784926e0bedf42b6b751089e5e0dfe13f098cd5885cfb7195982fd30a15cedce8 SHA512 e1bf9c6f1046f17c83f28eadd71a93f0f653fc9c00511b069860ca1738dfe09f2983b07272b6bce79c9b398d88bf4439d6809167f0d0b72c1d5ea2fe4f9e28eb
 EBUILD puppet-7.27.0-r1.ebuild 3461 BLAKE2B bcefb809d752b83637a74afcf8eea7c3ab945409474f1896e211718e8f33aff3b93d09c253f75a8baed3d687ea9f2338ff4ba4f61780a8c3a4830db49dc06d22 SHA512 82871cac6db38c905370cac15cae7f5dcfb4943dfe7be7a24e7ea5c8bdf278760b986178f63b533bfc5fc44bc5682ba7b32a6f2ecc804b200c3d58de671f2dbe
 EBUILD puppet-7.28.0-r1.ebuild 3461 BLAKE2B bcefb809d752b83637a74afcf8eea7c3ab945409474f1896e211718e8f33aff3b93d09c253f75a8baed3d687ea9f2338ff4ba4f61780a8c3a4830db49dc06d22 SHA512 82871cac6db38c905370cac15cae7f5dcfb4943dfe7be7a24e7ea5c8bdf278760b986178f63b533bfc5fc44bc5682ba7b32a6f2ecc804b200c3d58de671f2dbe
 EBUILD puppet-8.3.1-r1.ebuild 3284 BLAKE2B 428c4b53e8f7cdb84473679c67b395f4381077c697d535b63fe610b2098a28ef9bd07d061f796c636da3713fcd815ab3543456f58e345eb4503a099720912cbb SHA512 a5edb63a61b4789e4b289ce7467334870cf36c6820b3f448bc0d66fb5a8ea99f2d8f58af54d86bc8f4d230993aba68cec97c288c5d29707b78fb961b5de8de39
 EBUILD puppet-8.4.0-r1.ebuild 3284 BLAKE2B 428c4b53e8f7cdb84473679c67b395f4381077c697d535b63fe610b2098a28ef9bd07d061f796c636da3713fcd815ab3543456f58e345eb4503a099720912cbb SHA512 a5edb63a61b4789e4b289ce7467334870cf36c6820b3f448bc0d66fb5a8ea99f2d8f58af54d86bc8f4d230993aba68cec97c288c5d29707b78fb961b5de8de39
+EBUILD puppet-8.5.0.ebuild 3286 BLAKE2B 0b409b086af67967a0201279da1695db33fb31fa8edfca84aa19be0dcc25fb6215bd336b5295fa4f24bfd6da78667d5a43f1604f398502872b57fbf8950b258c SHA512 fe635a384f58266865529eff5737c7ae731efbbf4912e578b56105039a364df38ef6f0a91f409ebe912963a54760405083f595e5d153fa4e0d269c60bf3ad47f
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
diff --git a/app-admin/puppet/puppet-8.5.0.ebuild b/app-admin/puppet/puppet-8.5.0.ebuild
new file mode 100644
index 000000000000..35a0b5843001
--- /dev/null
+++ b/app-admin/puppet/puppet-8.5.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="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="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 hiera ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	hiera? ( dev-ruby/hiera )
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/deep_merge
+	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-2" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init 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
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 49229cec4d1a..e42e540474c5 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -2,6 +2,8 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-7.13.0.tar.gz 49917440 BLAKE2B 7cb01b2dbd6b6b22aad11a7fbcabff1c8452d51437bd0b3db3c8afe9d72bb853b66a9c8056c4c7c33f284efc4a90c788a05411fe6f80ae081ef817bb7f609bf3 SHA512 ba94031b3c15d38a2719390145e034be453a5f8368b5c53420bf3b371cc36a49f0b416447ec4d9de41ef0618b32ec806b9bae996ec3c4ca0ce05fb152940c2f2
 DIST puppetdb-8.2.0.tar.gz 59250096 BLAKE2B ed1009e87cad366a1d3399eb55b51d8aaad325f1b2da9c2fc5f77a1ad43581009ebc23f5e6756cd86430eb300d389a9022b14c29bdd4ea392cf956627df0f1fe SHA512 59d894710c2591566f9900a7fc1a396f971152e66ae423b54d73b0b9d474eaf4f58926fb6dc4815865dac8bd2dc458161685876ffdc9db5a3d049d0ffeb9b601
+DIST puppetdb-8.4.1.tar.gz 60378645 BLAKE2B eb107fd2016335f814ce9de5431abb2573fd71e8b1a37faf3dad0079ca464f15785bde79eaa49f343a8dd146b9977dbb9ce4e23bce61ba39e5526e422995a497 SHA512 89f405e5364eff1ecf1482ff620de1a7fbb818b3a7ab2463f6ff47fcba0552ac440639c72f2875de956127ea3da9a5d59aa3bb220e59d0994ed3683cac22309c
 EBUILD puppetdb-7.13.0.ebuild 2705 BLAKE2B 7328385eb13d39f37a2affa82b49ed2fac94e68db460ff735fd4a78d26bed884b6047b4d6c5a91b7fd7f93a955e261f9f97cf0833b1d6fa67d06b65fa7eb7080 SHA512 2fccfbbab1518ca3bc804844948547f489a69b908ce04ac93ed88f2b5f241203bfe623e87a0900fddfc2b2ffe5636768bf0ef1258f1dd27d233fbfcbbbbef74b
 EBUILD puppetdb-8.2.0.ebuild 2702 BLAKE2B 41d534e1642cefba515a29e4528ba3645273b99b7eb8009035a7b51a8bc119faf9e40fdee84ae00afbb9a605c198b5b357b5195a7490ab31e3da0936165089d1 SHA512 8c68b1186a7b1b35711a78b802acf38e1bace13e2f334ec38f30c54dfc8ff6b8608f86f2b195f1aabb96e0f6bf2ef16df005aed32c98b1e2693b07f57ae6c103
+EBUILD puppetdb-8.4.1.ebuild 2704 BLAKE2B 9a97efa49f2a73bda1245a0c42b318fff7f78231072c95d5040ff949889a2c6e58cd4fa04e392923cc1418b5777b08c31cb8f06f08d243846ebaac749b94eaba SHA512 b2b3b6a32b5b542ea8f3d2ab40818d9429efeef33c316160c159ede665e61ac44f4d07c3686d7ca9980af7a45b52364be35f9498979b461a6f893ea7e854d967
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
diff --git a/app-admin/puppetdb/puppetdb-8.4.1.ebuild b/app-admin/puppetdb/puppetdb-8.4.1.ebuild
new file mode 100644
index 000000000000..d08261a3e451
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-8.4.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="PuppetDB collects data generated by Puppet"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-11"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	doins ext/config/conf.d/auth.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetdb.conf
+
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index da7017d1c2cf..d66cb82ca505 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,6 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79
 DIST puppetserver-8.3.0.tar.gz 63318772 BLAKE2B 863337c364573b340b802b83f0593fdc510424bfbcf6c6b9f8a8e56729a4db689ce5d4c0d9e1a91399e123e05f42ed0547e6a2e86905d0166c189c79966cd9f3 SHA512 c9aa0f84f989dc544ee5d8d268f753b0961f6766531d832a2c99012701dd219d1c2abf4371835242b3445428a7518e86718552678b559b3bf9b027cbf72977fb
+DIST puppetserver-8.5.0.tar.gz 64463953 BLAKE2B 305f75165f919299301209c5a502237bf931342a9d0bf77d91f81f7801760faa421f1767eff283ac82e2cc49792b94126354b177e7b68bda9be61430d123621f SHA512 cb826e2450aa36380a93e95ee8055e6187944d2eecc6d5c339d4b183662d4a56d1e14847fd17b2bc50316f029dbe36791441947832686c9bfb6b0176edf7b22e
 EBUILD puppetserver-7.11.0.ebuild 5355 BLAKE2B 5e11c389026d93c2ae38f28e2f8da12fe25bc65a1600a2f8051003b726e110498f7892355ff0e9ed556547db5cedc3c45c01253f3722f7ff7705f147585e2f82 SHA512 edfc5b094ea7db88c30cb71ecc3e3476b52789b37f7b893526db5dc7b96dbfd52a4e4bd2a38aa4164ebc8cd0b967cdd5b6af077a49fe242cf2c762b155c3ce16
 EBUILD puppetserver-8.3.0.ebuild 5352 BLAKE2B f9d2849e80e3baf2ed7567b7a744d75eb998dcc1b4bde77661033ffd5a90f17f6141c382dbea7c1cb8035b9e3a8e1a11a2739a94c79866fd5919c02deee63fcb SHA512 0e1e56bee2d15ad2f5dcba00be3d832fc62d6a284c716fed144238ec02ff996d3976919a6aa0bed16949bc1f320e246d6c3a2508405c86ff1336f70387842f3d
+EBUILD puppetserver-8.5.0.ebuild 5353 BLAKE2B d1ffcb31a0fd0cb751cf81c0669834933c558fbe6830dd4b51c3c53646442016817e84df39167447e114015ae6bdefd1d0bb75c7c0057d816cd79e2985ae5f92 SHA512 28cde01e7c29f2f72635ef2d1f76497c539d9b48a7ee8bb6508a8b4c854de8ae1551ac797bd8a3a3015c59f52c8f0f8640d0deb3b3ca150ac0ffd96ae071fb5b
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-8.5.0.ebuild b/app-admin/puppetserver/puppetserver-8.5.0.ebuild
new file mode 100644
index 000000000000..b19d42ecbb7c
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-8.5.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords in puppet-agent (puppet-agent now has arm64)
+KEYWORDS="~amd64"
+
+RDEPEND+="
+		>=virtual/jdk-11
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetserver.conf
+
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}