gentoo auto-resync : 27:10:2023 - 22:23:02

13 files changed, 4 insertions, 342 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f10430956eb0..1c09d5a14534 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index cb95c46d655c..f851da2c35f9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -6,7 +6,7 @@ DIST aws-cli-1.29.70.gh.tar.gz 2567544 BLAKE2B 2ca8db4f53d414dce916ab1cbfe997c34
 DIST aws-cli-1.29.71.gh.tar.gz 2567815 BLAKE2B de39bf456d2933a5b652acd700b561ded9866b3cdbaa15a00439f4af40e0b00ef1acaac03316c542a34ba72f18e2b72b4345cd4824e46f1e6370ad7c254e203b SHA512 cca46c16470352df72216f6620cd58d243eeb038842149c92726d641107707c263c6aeec49fb09cef5bf273eed179ce74f0a20377c6f3b49a731c7bdcee305dd
 DIST aws-cli-1.29.72.gh.tar.gz 2568335 BLAKE2B 6919744a90e77e14e143d94cba5e666eb50c6768cd2237920f737777f9487bb0b1284bc1d028d17b00f2fe9c38fcc294e42a6fa3f7aaab88b2ef52e16e118341 SHA512 ffca4a27896033be4672c0054b272dc7c88b73eb724a291fce61a4b267c22b23218b834c7b0baecdee6fe275cfd732ac24d779475dfd60f0d799e7cfed370570
 EBUILD awscli-1.29.62.ebuild 2854 BLAKE2B b471b1f5758613e807ae70018b4066b8998db8dfb251b8cbc31dde9535a2d3f4d66e1ba2f01a4c36e5d3bd1b3dcc77a233c2791e8a290379dfeaa461c845a382 SHA512 7aea2225079104faa2ab0ed6607533e5b7e4ca737b14a8adfd54442c1bcbca4d671ac12ce24f6436048a65f7de78b312b86bd8b891dbb272b8af63949e0ef2b9
-EBUILD awscli-1.29.63.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
+EBUILD awscli-1.29.63.ebuild 2854 BLAKE2B b471b1f5758613e807ae70018b4066b8998db8dfb251b8cbc31dde9535a2d3f4d66e1ba2f01a4c36e5d3bd1b3dcc77a233c2791e8a290379dfeaa461c845a382 SHA512 7aea2225079104faa2ab0ed6607533e5b7e4ca737b14a8adfd54442c1bcbca4d671ac12ce24f6436048a65f7de78b312b86bd8b891dbb272b8af63949e0ef2b9
 EBUILD awscli-1.29.68.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
 EBUILD awscli-1.29.69.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
 EBUILD awscli-1.29.70.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
diff --git a/app-admin/awscli/awscli-1.29.63.ebuild b/app-admin/awscli/awscli-1.29.63.ebuild
index 941051349113..c73a3ec49732 100644
--- a/app-admin/awscli/awscli-1.29.63.ebuild
+++ b/app-admin/awscli/awscli-1.29.63.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 817149c0acb4..ea901138dd05 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.26.tar.xz 184332 BLAKE2B ee1e8890802fc50646c8d1d5219f1ab0ec5cfc0138c758f73ad6baccf673992bbf3e763d8e84491f33e724ba4e1cf3bed6971ba7fa4373e0f06464ff4a5fa1e6 SHA512 397ae2f15d90d722eb84225b08f1afaaf6f89758bfae5d93b0a1c3eddc997c21e74ab62e09ee5e71941d3a8587b3372b64336d12054c3bbf0e56e1ba398a26f9
 DIST eselect-1.4.27.tar.xz 184464 BLAKE2B 718874f4d0651194f361ca3202e5140982812bf486c8efe82354944d55206b0113fa135992203e8baa00019c3fd773a90ddaf67157c16f4ac2d69965d9822fbd SHA512 f534785fc1f79869840f420b4ab2b2bf35593c504cce878a6d3d07f75012cf32288009ea9ac2a5607dba216a794110a64c5f2c54d5d8a3c641328489cecc024b
 EBUILD eselect-1.4.26.ebuild 1635 BLAKE2B 5769f9cd67a29ca73a50d4306b15cda0e7c096c8bd800153d54f197b65a39ffeb5aa66402834563bd9a110b076fc8697d6fc44bb0d96e67964eb376d62c68bbe SHA512 c624a47e225516253c7274f268a18c977e6d1b96b8a2ed617dd29c212b6f146a5a8c8173e5ac8ab11f82435d3fddfe51c7e364821bec55880dd86286838bc059
-EBUILD eselect-1.4.27.ebuild 1635 BLAKE2B 5043aad7e669cae230baa90cdba8ddd061b07402fe5cb1feeb55c1f1d014023732e7abbac3c4ea88744157650f0cc26371fa14b050a5193e2d9c8bf8ed53d69b SHA512 f02f72d9cf093842d3ba44d78e1fff705b1d3c15fc4f3ed8d3d8639cafe8aa1c0393f807330aa27ebb5ff940c1dbe0d3a891f57734f588dec7adb5c2b5b4932d
+EBUILD eselect-1.4.27.ebuild 1634 BLAKE2B df9dcdabdacb583059591bd117ef048078eacf497e50e2a2051bba732e8de912abff8b6ea77d83d7ef7fede103ec2c7cbf605543ec4de8be7f355820b1aa409c SHA512 91ad34b8dc9fbc41ed9137ab1d38ccb5973f34d9c6e7b4f9a4a893ed24d8955a50e70c394223867e9e1a339c5c30307e3fc98f572263b183b089c7fb70dd78e7
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 347 BLAKE2B 58c9ec8100f46cbb91dfcc6fc6f223e4d45553f401fe7312e36c0260c433a5842b07f894cef7dfd6c518ee5b664d86e3a4d434892ad3ea9c78c26c6f621e3063 SHA512 1963bcefd43ff52163c81a03bac522ca792688ff5317691ac30ec4375c6da4ebbf07f96da7bc1ecaa9554cee18c9f51f8b867e7e15bb652bdc7eee542f4a8d2b
diff --git a/app-admin/eselect/eselect-1.4.27.ebuild b/app-admin/eselect/eselect-1.4.27.ebuild
index 95a9cd926af9..61a54674f589 100644
--- a/app-admin/eselect/eselect-1.4.27.ebuild
+++ b/app-admin/eselect/eselect-1.4.27.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 03b361a4c810..edbad26bd055 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,6 +1,5 @@
 AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3419dbb7b3e418f8903f3104fcf8d525cb117ce278f4669551a6cbeadd7f03d3bd022781a88c335c6ac84600d3bdf02a3d8277d3 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db
 AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
-AUX mcelog-194-musl-fix.patch 531 BLAKE2B 011d06596a0f74078547701bfe0215ed96a027b4f3450b6bd14d2ddb29444f81c1776e1c968a56b1b7d64999a9ea6185d44d17cd876db9f64595d1b22337bfb9 SHA512 aff5916df652c33489c2af9631fcc3441554e64cf053d1d9b8e456fb6e2d5b5b6e3814e57518fe19963a0be65b3a38679343b7e620eb1c91a3ea0bfe3033747e
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 DIST mcelog-195.tar.gz 318965 BLAKE2B aebfcac2a5e5aab43cf3b08d169c75469c81d8724d2e907890bb5b947e1dbea8e418fdf4c00512112ddc67d1ddcc3a014409c7a546bd60c8e36b2e7af72480c7 SHA512 45436f5859a3ffd1c0eaf998282910ad317b85d03f15130a66a2d4e32e2653dbd86b2033db7f6b321a4b9692354adb92773c26958eb5d474954e12c9ab4a9cda
 EBUILD mcelog-195.ebuild 1128 BLAKE2B f68d0ab92db7f01fa8ae10b583e65a9a720b70e2bd8aa5dcc6ee9a1bb4baaa918390bc32b86fd8434c60d058d16e034d14896c6b2e6029fa1ec82aed8d0f4584 SHA512 7203aa8fd67d61cb324d622af8d9b0c58719d55f30d7929645f46fdc320e4573554e53a81d1476cd4b5e5cc36e77b1fba722fc6916988d8ab25dfb7a219150cf
diff --git a/app-admin/mcelog/files/mcelog-194-musl-fix.patch b/app-admin/mcelog/files/mcelog-194-musl-fix.patch
deleted file mode 100644
index 6ea3c1f79303..000000000000
--- a/app-admin/mcelog/files/mcelog-194-musl-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/andikleen/mcelog/pull/115
-From: Brahmajit Das <brahmajit.xyz@gmail.com>
-Date: Mon, 12 Jun 2023 10:56:44 +0000
-Subject: [PATCH] client: Fix build w/ musl libc
-
-Refer: https://github.com/andikleen/mcelog/pull/115
-Bug: https://bugs.gentoo.org/894316
-Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
---- a/client.c
-+++ b/client.c
-@@ -19,6 +19,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
-+#include <string.h>
- #include "mcelog.h"
- #include "client.h"
- #include "paths.h"
--- 
-2.41.0
-
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 34abd07b0c63..07cb9c519a16 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.1.0-1focal_amd64.deb 35868180 BLAKE2B 9c3c952a35670883aae31e05a47b5d23e79c3e53cf54760444a8d0dbf7d7ca6385b043ec82eb748d0b6e9573fcb79de457323ec46441f3dd5a60c14cc51aeaae SHA512 450b37c556f39d02d124009d276c70e8b8f46f75ff14df4ab13656a54ace2612441202e8fcf5a266ec25998ad05271eda2f1088580091009b8f2c98b1b8462d8
-DIST puppet-agent_8.1.0-1focal_arm64.deb 35364600 BLAKE2B 25965e453f13b936962bf8a786171dc7fce3fe4868f856352a6a46c463f8e84d32d44f3a7ca7f4d9ce21880a9d38a623b7dffe1c0dbcff5c4e48971776dce960 SHA512 1d77cb14600d38547deac90a57218d0559797f011b9acae708d745946a20299c6a802276aac9e06eba2b8e5ae631e2f9da030b11fdfa26ab656ed7c2db631d7b
 DIST puppet-agent_8.2.0-1focal_amd64.deb 35899030 BLAKE2B 67af546a361c5ff2284eacac49c395baf693fe16a185f63a1e656fc47a6420395f0d26ab27fa2c944e9cb3e520fae32168ba35ff46e8b8d4239bd8fe322154db SHA512 b5f869cfb39e23e401eb1d8ddde0e2d4c07660e4fd8753e53ccfa08c82c51d6d525637e7fbfdf01ee98d776781837fe7dc6e10d2d5a6dcc635479468194e2900
 DIST puppet-agent_8.2.0-1focal_arm64.deb 35390104 BLAKE2B a4dad98dfb0779ebece815f17174fe119c22ccd06d19a678b2cca2ecd46330b609eb6d6ce834c5cad57f1a81417914f9bd98a3bdd8697b1dc7eb6ef115834865 SHA512 24b458205f8420a2a4168c9eb397d2c8a871a2837b34d10ffc3d43e5e3bf6c94c87856c396ea86826b107daa6aafa4b37b1524bd32f98b11f17627a60a69068d
 EBUILD puppet-agent-7.24.0.ebuild 2593 BLAKE2B a73b46e5e5bd8f3d8bbd45478bcb311a80d0f2b6ca84c23e13b70ca82820be978912ee1e0019c5efc05bcc2c1f30590117ff1d28e789238adbf085e6fd0709fc SHA512 b5e3e76e28d1abaed04fd2749333d465272aacef931531e29041dc19e6206dbf66bb468e64deaa861348bb36d7d45ddd236d9bc2be84df41dbba54c7f3c3e857
-EBUILD puppet-agent-8.1.0.ebuild 2595 BLAKE2B 0f775b39ea28e424db14aab962e1f502a01e086cabd065bff638e08dece28ae18b01f56f35e44730eac8ba356038ebf057abb20bcc4f3c6cbdd3bfeebc6fdd29 SHA512 047349be58b6d724e56696f604233ba488354d39cfb301431b6fdb971c91c92fd6ff48993a7b8403dac28cb43be2021ec9599dba79668e81355e7d3985f6d5a0
 EBUILD puppet-agent-8.2.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.1.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.1.0.ebuild
deleted file mode 100644
index 7544b551c95b..000000000000
--- a/app-admin/puppet-agent/puppet-agent-8.1.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 97744e0e821b..ded448086130 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.1.0.tar.gz 2877086 BLAKE2B 24fde48d04790ca308ef80ca51021b69dd08f703eec49724f753aabe36b824d338d135e985a5741b7e412f807ee35edf7898d2bc12d61bd9243e3fc1540808e2 SHA512 7811d67f83c72d67d5d463ccddece8889868f302217229f748a1d95df8b64213d9ee86a34e42af3beed9fc55cf70a14f63e6b8a6fcd18feb259e1d027dc35259
 DIST puppet-8.2.0.tar.gz 2882267 BLAKE2B b109e5cc9fddfa96ebc3be6b892d46a4616a5c1cec677937d02e16d0de6e39c147a9b117514e37ce29b39203f167a33dfe3a6c849fc7ebabecd48925b0d2595b SHA512 40e46350aadd19e187cc2a3c46cfa9f85bb2ffb944b0dcb18d084b10a8baca4c3c830e1361c840490c4f6257930a3ccb556d76b1a933e579ef37103556991b0e
 EBUILD puppet-7.24.0.ebuild 3667 BLAKE2B 596aba703f8e8154cde0c6dd8d11cde9118aac72546a3579bfbe43e69748b80e89ffed85baf5e0be36f5cb3e969837fe731523827581a60535df6f43ba9a5691 SHA512 9db45b40a7c9b7367583181a28dc5901c845fe814298a48fe1fe2ea9b3d7eec9c55ab3076f934902f1c8885deffc89eac90e8fa13d6a4fdf16e313f031d3cc6f
-EBUILD puppet-8.1.0.ebuild 3492 BLAKE2B 9712521f8dad46f304896c7abac0ecd4a39653226e597099707ea2f0589aa56bb1b80cb13fee68f6f243fed1db1a51c524ce4ce646722475bce4bc20524fda79 SHA512 7ea8b62f82ce1b0a5e17ea01c27caa62879141cc92b1b220dfdfe2a7d15cbd214db634e7642f83d60e9453ed056fa9d3f0ff998d5d4222f8aaed1cc262a4c65e
 EBUILD puppet-8.2.0.ebuild 3492 BLAKE2B 9712521f8dad46f304896c7abac0ecd4a39653226e597099707ea2f0589aa56bb1b80cb13fee68f6f243fed1db1a51c524ce4ce646722475bce4bc20524fda79 SHA512 7ea8b62f82ce1b0a5e17ea01c27caa62879141cc92b1b220dfdfe2a7d15cbd214db634e7642f83d60e9453ed056fa9d3f0ff998d5d4222f8aaed1cc262a4c65e
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
diff --git a/app-admin/puppet/puppet-8.1.0.ebuild b/app-admin/puppet/puppet-8.1.0.ebuild
deleted file mode 100644
index 941bb6094717..000000000000
--- a/app-admin/puppet/puppet-8.1.0.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/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index ca888f2bfdd8..a90475cb3c98 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-7.13.0.tar.gz 49917440 BLAKE2B 7cb01b2dbd6b6b22aad11a7fbcabff1c8452d51437bd0b3db3c8afe9d72bb853b66a9c8056c4c7c33f284efc4a90c788a05411fe6f80ae081ef817bb7f609bf3 SHA512 ba94031b3c15d38a2719390145e034be453a5f8368b5c53420bf3b371cc36a49f0b416447ec4d9de41ef0618b32ec806b9bae996ec3c4ca0ce05fb152940c2f2
-DIST puppetdb-8.0.0.tar.gz 50152833 BLAKE2B 89ed62b107f97252aaaffe6124e6f6627b19092fd161b51c8e27d703896d4c7f0c86c0f8ca79f26995abcb29e756f3670f82aa1c6c9b84c6c411451399c6f2de SHA512 7beeaed5b26361c306d8e6319747fc1eb809a82aac503f17b5ca1caebb1972a718e19c118da4b6717914e25aa7bdf410925865bad6a34deba411e1032538b19a
 DIST puppetdb-8.1.0.tar.gz 56647151 BLAKE2B ba1fa54db6413ab45780546a33039799e2e1fbb16f99c5e3e54a382d2f6d1c2a2b8a65d0dbfe881284b9218f4b0f0b105e6c2d8ade12a7d2c25c3505bb9f4d07 SHA512 76ee2b616373c60496d4bc1f90a01b6d30fa6254ce8788a8438e28cabe55358a10653cfcb78ceda00c90c499c77cf2f77138a3f49daf9b4ebe77255fd134e017
 EBUILD puppetdb-7.13.0.ebuild 2705 BLAKE2B 7328385eb13d39f37a2affa82b49ed2fac94e68db460ff735fd4a78d26bed884b6047b4d6c5a91b7fd7f93a955e261f9f97cf0833b1d6fa67d06b65fa7eb7080 SHA512 2fccfbbab1518ca3bc804844948547f489a69b908ce04ac93ed88f2b5f241203bfe623e87a0900fddfc2b2ffe5636768bf0ef1258f1dd27d233fbfcbbbbef74b
-EBUILD puppetdb-8.0.0.ebuild 2702 BLAKE2B 41d534e1642cefba515a29e4528ba3645273b99b7eb8009035a7b51a8bc119faf9e40fdee84ae00afbb9a605c198b5b357b5195a7490ab31e3da0936165089d1 SHA512 8c68b1186a7b1b35711a78b802acf38e1bace13e2f334ec38f30c54dfc8ff6b8608f86f2b195f1aabb96e0f6bf2ef16df005aed32c98b1e2693b07f57ae6c103
 EBUILD puppetdb-8.1.0.ebuild 2702 BLAKE2B 41d534e1642cefba515a29e4528ba3645273b99b7eb8009035a7b51a8bc119faf9e40fdee84ae00afbb9a605c198b5b357b5195a7490ab31e3da0936165089d1 SHA512 8c68b1186a7b1b35711a78b802acf38e1bace13e2f334ec38f30c54dfc8ff6b8608f86f2b195f1aabb96e0f6bf2ef16df005aed32c98b1e2693b07f57ae6c103
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
diff --git a/app-admin/puppetdb/puppetdb-8.0.0.ebuild b/app-admin/puppetdb/puppetdb-8.0.0.ebuild
deleted file mode 100644
index 44b569aab29c..000000000000
--- a/app-admin/puppetdb/puppetdb-8.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 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'"
-}