gentoo auto-resync : 17:08:2023 - 03:31:10

9 files changed, 0 insertions, 420 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9fbbeb921d3e..789187ea72db 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index 00486b746434..06f9c60af571 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,5 +1,3 @@
-DIST openrc-settingsd-v1.2.0.tar.bz2 41713 BLAKE2B e4630e934fc55549b3d81cc448adb35cb22cb99b898363a1113909a24acc0709d5693841a9c651b4ecf52044c3a45cc4b8207f9c9a3d0e1e8a4f85edefb23d65 SHA512 b1862e80454d3ca22d083f283f4ef3215dfad4da6d2aa495211fa31014c66fb6891ae87a3a1c6932944ed4c1e7100d247e80abc659f37868adcf5fce3b90385b
 DIST openrc-settingsd-v1.4.0.tar.bz2 41420 BLAKE2B 3890c65e22f1cc55aa8f067ae7d8a46de25618c7ab98acb8e01f38662da4d73f3d0d16583a0526ded3331c4fb4d80bf0b6852917ed875adfa0035d19e19219e6 SHA512 aa5bd4d2afb1b959c4c2d532b30d369ee0bd637010ea75adc8ca7444cdb13bf651ae4c6946141d326c8460f23ba4482c1a3f639a0b48190009a88298a17c22e3
-EBUILD openrc-settingsd-1.2.0.ebuild 1411 BLAKE2B 637c6b4f227778dfc953d1929fb10757e27bf836ef5a6774e7b0da81d25472dc7571c6ee0fa05ad9141077b9829f5b30864ca96a027185f0ea7aa947b91f9bd8 SHA512 afd3b64ba50379a5de82d387ef50ca7202591eee22b9169c5a4fdc0508b4aa517271aeb32504d4d22c8376a093a77236819cc82810af0fb0f2b97219c0166279
 EBUILD openrc-settingsd-1.4.0.ebuild 1442 BLAKE2B 032a097fd4d4ecfaceec3bd96210e0fc8dbcfcc2bf47df92203f5b1b6bececbaaa476e16af44025c123b68f0523403464169240e0cd94e0a32c46a843c2e3413 SHA512 ddda718b2c507fd6c415d760749096e8e8a9b667b1ef15cd459684e8daa778802e41c12d7986e0e829fa7e77ef40d5d184707732216487cfc8f897492d0badef
 MISC metadata.xml 489 BLAKE2B 9da8f8d72d161ece48f9f2bd5ac900836bf5be45de25e604b3742b3aa38820f2fb6b4039062a8701a1aa0e9b6f5893f389b99e178dd31f70ec008928587f661c SHA512 aeab0c7da85043d609af29f344fdefb7d8fcf62b7bdd113dd56131c99d82e738a2ea7d261b4de365443d9dd1747bce4069ec3e0fdcfe2de91fe117726024e127
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.2.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.2.0.ebuild
deleted file mode 100644
index 79e79909aaba..000000000000
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="System settings D-Bus service for OpenRC"
-HOMEPAGE="https://gitlab.com/postmarketOS/openrc-settingsd/"
-SRC_URI="https://gitlab.com/postmarketOS/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.30:2
-	sys-apps/dbus
-	sys-auth/polkit
-	dev-libs/libdaemon:0=
-	sys-apps/openrc
-"
-RDEPEND="
-	${DEPEND}
-	systemd? ( >=sys-apps/systemd-197 )
-	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_configure() {
-	local emesonargs=(
-		-Dopenrc=enabled
-		-Denv-update=/usr/bin/env-update
-		-Dhostname-style=gentoo
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use systemd; then
-		# Avoid file collision with systemd
-		rm -vr "${ED}"/usr/share/{dbus-1,polkit-1} "${ED}"/etc/dbus-1 || die "rm failed"
-	fi
-}
-
-pkg_postinst() {
-	if use systemd; then
-		elog "You installed ${PN} with USE=systemd. In this mode,"
-		elog "${PN} will not start via simple dbus activation, so you"
-		elog "will have to manually enable it as an rc service:"
-		elog " # /etc/init.d/openrc-settingsd start"
-		elog " # rc-update add openrc-settingsd default"
-	fi
-}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 21e2f1c1476f..0835e553c958 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,11 +1,8 @@
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
 DIST puppet-agent_7.24.0-1focal_amd64.deb 31418478 BLAKE2B 201c0a5adbeca2b6f572d3f8b89df06314171e5c7bb95f574311cee5af1910bdf7f5574eaa5f514bcf0c1ceb5c04c30a2079069183c4b37dd90581596a70092e SHA512 7912360597c21abf048d578783262821210d6568dc41f79b2d21cdb08851f8bd4cbe5a6114aa8af302c9046de424b8b15fe34be1fc51b529f36ccb99445bc7dc
 DIST puppet-agent_7.24.0-1focal_arm64.deb 31160744 BLAKE2B 22dfc3f0855c2e88c7202f2a9d98efd4ad9ef3a191ab9b5b8c37a6869306a47d1225d568fec9f0fc52cdf236f8258b5ca206a360049cc39e1825f1f8afc5d4af SHA512 db1b7cb25a04d6aeedd7f3bb125fe0fcac420c2881f9f3aba729143e253908376cd118073753de018d8fd1a6d7f38139766b4ec4bfb23f840ca7ee32143a8a48
-DIST puppet-agent_8.0.0-1focal_amd64.deb 35686934 BLAKE2B 1604178a8ce2a9112e411d2054b013a9bba5e28d6ecbb119da112ffd01cb620a482c118b84313a95f50efac755c0cb3551b966d95d77ae242c5ca515d3f82d72 SHA512 df6fe25f582fe5339648cada3563cd3820e39ebe383cf8189bb2517e03e21477af6cffcdf4d1894960fd69a5c4168990c45a1f74789bca0881f31fd09dccf0d2
-DIST puppet-agent_8.0.0-1focal_arm64.deb 35445806 BLAKE2B b66669c98d44eadead8d9b09faf679dd9ca938bfba7cd5c67d9083cd856afa61ee416a389672a978d8b9394a0ec7b404fd97db4a181b4ffbbdb813aff2b3d697 SHA512 c47167e2be146eb18fab055fb5dc94583e3b53006ce71573c41d76016e0a9ef57ba8a9d9807e020763acbfbe243ebb4080a84773f3d7339beb408f4b437cc864
 DIST puppet-agent_8.1.0-1focal_amd64.deb 35868180 BLAKE2B 9c3c952a35670883aae31e05a47b5d23e79c3e53cf54760444a8d0dbf7d7ca6385b043ec82eb748d0b6e9573fcb79de457323ec46441f3dd5a60c14cc51aeaae SHA512 450b37c556f39d02d124009d276c70e8b8f46f75ff14df4ab13656a54ace2612441202e8fcf5a266ec25998ad05271eda2f1088580091009b8f2c98b1b8462d8
 DIST puppet-agent_8.1.0-1focal_arm64.deb 35364600 BLAKE2B 25965e453f13b936962bf8a786171dc7fce3fe4868f856352a6a46c463f8e84d32d44f3a7ca7f4d9ce21880a9d38a623b7dffe1c0dbcff5c4e48971776dce960 SHA512 1d77cb14600d38547deac90a57218d0559797f011b9acae708d745946a20299c6a802276aac9e06eba2b8e5ae631e2f9da030b11fdfa26ab656ed7c2db631d7b
 EBUILD puppet-agent-7.24.0.ebuild 2593 BLAKE2B a73b46e5e5bd8f3d8bbd45478bcb311a80d0f2b6ca84c23e13b70ca82820be978912ee1e0019c5efc05bcc2c1f30590117ff1d28e789238adbf085e6fd0709fc SHA512 b5e3e76e28d1abaed04fd2749333d465272aacef931531e29041dc19e6206dbf66bb468e64deaa861348bb36d7d45ddd236d9bc2be84df41dbba54c7f3c3e857
-EBUILD puppet-agent-8.0.0.ebuild 2595 BLAKE2B 0f775b39ea28e424db14aab962e1f502a01e086cabd065bff638e08dece28ae18b01f56f35e44730eac8ba356038ebf057abb20bcc4f3c6cbdd3bfeebc6fdd29 SHA512 047349be58b6d724e56696f604233ba488354d39cfb301431b6fdb971c91c92fd6ff48993a7b8403dac28cb43be2021ec9599dba79668e81355e7d3985f6d5a0
 EBUILD puppet-agent-8.1.0.ebuild 2595 BLAKE2B 0f775b39ea28e424db14aab962e1f502a01e086cabd065bff638e08dece28ae18b01f56f35e44730eac8ba356038ebf057abb20bcc4f3c6cbdd3bfeebc6fdd29 SHA512 047349be58b6d724e56696f604233ba488354d39cfb301431b6fdb971c91c92fd6ff48993a7b8403dac28cb43be2021ec9599dba79668e81355e7d3985f6d5a0
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-8.0.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.0.0.ebuild
deleted file mode 100644
index 7544b551c95b..000000000000
--- a/app-admin/puppet-agent/puppet-agent-8.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 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 8955f04c6de0..ea1f61cfefc1 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,9 +2,7 @@ AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c8153
 AUX puppet.init 760 BLAKE2B 1803b602178f711cb4a0784a8e74e5bc63b66db11ce4a9855f76c1b51956eea6f2fa9d3ee898f5219ad2648e34c6d60e700f67dcfcaef85f586f3f6d5a44b8fd SHA512 f70660aad14fd9690f83a2689fa46370fdda0f04601146956d9436d1363a9a12739f0d1c0d4540c239c8cffe29149e2464787a5bbadda80453128a2a843d84bb
 AUX tmpfiles.d-2 35 BLAKE2B 333994788552e5c52273752f4e3c2947666737d03f9d340e16ada790607efe77da1ba9bb4852bc8274174fbb96ce0c7ae81062f7197e63ea4701e539b2650b3b SHA512 fdf00147c497bd822a14f0e42bad825a43ce0977ec6c0265d267dedeef56295e3ce319f7972d0ec2ab9f04f2407856947f4261d6e62054a36c6e1672b45f86f0
 DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9
-DIST puppet-8.0.0.tar.gz 2874596 BLAKE2B 64a609c0375c942520f17bd6281225568b9803cd7af3e9f4da8311eb4f2680184174b0b5c992b243ba9680912b77038934bb3506ae28a964c64b0f1f8feca62e SHA512 78ba9d603831874fbecca7ce3e2802ed54188a71ad7d6f7a24fa3390330e41a7b43b074c6c51e32cfdf10ff92f6b087f8fbe9220ea65efb917f517776451ef56
 DIST puppet-8.1.0.tar.gz 2877086 BLAKE2B 24fde48d04790ca308ef80ca51021b69dd08f703eec49724f753aabe36b824d338d135e985a5741b7e412f807ee35edf7898d2bc12d61bd9243e3fc1540808e2 SHA512 7811d67f83c72d67d5d463ccddece8889868f302217229f748a1d95df8b64213d9ee86a34e42af3beed9fc55cf70a14f63e6b8a6fcd18feb259e1d027dc35259
 EBUILD puppet-7.24.0.ebuild 3667 BLAKE2B 596aba703f8e8154cde0c6dd8d11cde9118aac72546a3579bfbe43e69748b80e89ffed85baf5e0be36f5cb3e969837fe731523827581a60535df6f43ba9a5691 SHA512 9db45b40a7c9b7367583181a28dc5901c845fe814298a48fe1fe2ea9b3d7eec9c55ab3076f934902f1c8885deffc89eac90e8fa13d6a4fdf16e313f031d3cc6f
-EBUILD puppet-8.0.0-r2.ebuild 3492 BLAKE2B 9712521f8dad46f304896c7abac0ecd4a39653226e597099707ea2f0589aa56bb1b80cb13fee68f6f243fed1db1a51c524ce4ce646722475bce4bc20524fda79 SHA512 7ea8b62f82ce1b0a5e17ea01c27caa62879141cc92b1b220dfdfe2a7d15cbd214db634e7642f83d60e9453ed056fa9d3f0ff998d5d4222f8aaed1cc262a4c65e
 EBUILD puppet-8.1.0.ebuild 3492 BLAKE2B 9712521f8dad46f304896c7abac0ecd4a39653226e597099707ea2f0589aa56bb1b80cb13fee68f6f243fed1db1a51c524ce4ce646722475bce4bc20524fda79 SHA512 7ea8b62f82ce1b0a5e17ea01c27caa62879141cc92b1b220dfdfe2a7d15cbd214db634e7642f83d60e9453ed056fa9d3f0ff998d5d4222f8aaed1cc262a4c65e
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
diff --git a/app-admin/puppet/puppet-8.0.0-r2.ebuild b/app-admin/puppet/puppet-8.0.0-r2.ebuild
deleted file mode 100644
index 941bb6094717..000000000000
--- a/app-admin/puppet/puppet-8.0.0-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 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"
-
-# <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 "
-	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-1.2
-	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/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 75b65cb14c5e..d8acb05235ae 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,9 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79
-DIST puppetserver-8.0.0.tar.gz 60976845 BLAKE2B af9e389ec946ea20b7028535c12a0fbc99dc4ee0790cfb9625ae881e3024c96727e8eb671a25895ade878c5a2b264991a5b3f49dc7453e49ba85be0042ba0bc6 SHA512 1b67c472795c5baad5696f4b553fc95a3561b4fbb9fcd0cc7be2c168bbbbe3b788a6fc2d0821fa9d459c452a9e9ee754a6ba2f8b8cae55ab6490896bd228ce06
 DIST puppetserver-8.1.0.tar.gz 61109210 BLAKE2B 562f765d0f36926d16575d6c6fe9e55ee1d732f9288ae3ab0cfa653868de87f4de6176d616e49568298de754a94951e37d61e129b6723ca1f1da6bb3bb191d54 SHA512 a6112d8c4eeaa58dfcb72e91f60104a0918a3c55f8fce4e555b40fa42d0027aaddf94e8751ecd854240f3dcf6034233dc52a750ee7791e35f0a6a7a9609a8c35
 EBUILD puppetserver-7.11.0.ebuild 5355 BLAKE2B 5e11c389026d93c2ae38f28e2f8da12fe25bc65a1600a2f8051003b726e110498f7892355ff0e9ed556547db5cedc3c45c01253f3722f7ff7705f147585e2f82 SHA512 edfc5b094ea7db88c30cb71ecc3e3476b52789b37f7b893526db5dc7b96dbfd52a4e4bd2a38aa4164ebc8cd0b967cdd5b6af077a49fe242cf2c762b155c3ce16
-EBUILD puppetserver-8.0.0.ebuild 5352 BLAKE2B f9d2849e80e3baf2ed7567b7a744d75eb998dcc1b4bde77661033ffd5a90f17f6141c382dbea7c1cb8035b9e3a8e1a11a2739a94c79866fd5919c02deee63fcb SHA512 0e1e56bee2d15ad2f5dcba00be3d832fc62d6a284c716fed144238ec02ff996d3976919a6aa0bed16949bc1f320e246d6c3a2508405c86ff1336f70387842f3d
 EBUILD puppetserver-8.1.0.ebuild 5352 BLAKE2B f9d2849e80e3baf2ed7567b7a744d75eb998dcc1b4bde77661033ffd5a90f17f6141c382dbea7c1cb8035b9e3a8e1a11a2739a94c79866fd5919c02deee63fcb SHA512 0e1e56bee2d15ad2f5dcba00be3d832fc62d6a284c716fed144238ec02ff996d3976919a6aa0bed16949bc1f320e246d6c3a2508405c86ff1336f70387842f3d
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-8.0.0.ebuild b/app-admin/puppetserver/puppetserver-8.0.0.ebuild
deleted file mode 100644
index 34a4a96140ca..000000000000
--- a/app-admin/puppetserver/puppetserver-8.0.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 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"
-}