19 files changed, 214 insertions, 1145 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4132c15fcc17..ec5f52df6b83 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 3e1266259363..5125fb928e76 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -3,6 +3,8 @@ AUX calamares-gentoo-branding.desc 10382 BLAKE2B 1a8f68c54d1e7d4392f4545b4d5cb3b
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
 DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc SHA512 6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2
+DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6
 EBUILD calamares-3.2.60-r5.ebuild 2824 BLAKE2B a4931b7a2e77a3f9fb286374469f463d90a6687617836153a3a4150823528300c79ec90a26b794d1fbd45d5de9f880957da9d27c231d41b05ac9faed5c1fc223 SHA512 d2a5e6f0d8b2b4a97d1cc305db65b73dd1a1a527b6e17228386f27d41381f864b899af6e2a20a5444641031babb4d0b76342ceaac6923d46e304e77be118d2f4
 EBUILD calamares-3.3.5.ebuild 4419 BLAKE2B d2ce67ac7db2e1aa6766060015c63872245976cee3f5ab4e740f1aca1f918f1bf310cdbdf92937e2bc1ac6f9a2c62a8d0c6ca4613bba1775c7b2a531d6974c9d SHA512 c9ab1c71656dd0f22eeb879e4026107ffb78b74ed275c3da0f8479ed096be99edde48acc441183a3f6a4b736c36b7a4f8520fec463de8f2d8f1b7370c65d8a40
+EBUILD calamares-3.3.6.ebuild 4176 BLAKE2B fbfdb43f6405b3d146678b7a89d5215e02bb9fdc18f0177fa355304d280250caed28fffc7af4325d32c36f56e724e99c66ab30b67d2bc9d5e6fc2c099d1b44d3 SHA512 b41c675427d9254155090a8064dbe89dea088b167a5be4a9cc275bbc4b6241799920f1db092b80b04cd32e101042b3a1e7f38ed847b5984b4540e7da25c0e1bb
 MISC metadata.xml 781 BLAKE2B 56d64535b539de398557b26f7705e6aa222d7073a0c31a38069d45deec697e488891c95850324a7610ee1faf8f4ce2e04d0d0a9fd29300afa5e5bf42804e6942 SHA512 156cd07700dfab61f78bbdd4c626a098ce111428cebbbc6ab541f60f12e347f62236ad21d2fd8031babfc0be87ad4b246ad2afb3e453005588f87bc500c78c72
diff --git a/app-admin/calamares/calamares-3.3.6.ebuild b/app-admin/calamares/calamares-3.3.6.ebuild
new file mode 100644
index 000000000000..add03ed16ed6
--- /dev/null
+++ b/app-admin/calamares/calamares-3.3.6.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager qt6 +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+QT5_MIN="5.15.0"
+KF_QT5_MIN="5.78"
+QT6_MIN="6.5.0"
+KF_QT6_MIN="5.240"
+
+BDEPEND="
+	qt6? (
+		>=dev-qt/qttools-${QT6_MIN}:6[linguist]
+		>=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN}
+	)
+	!qt6? (
+		>=dev-qt/linguist-tools-${QT5_MIN}:5
+		>=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN}
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/yaml-cpp:=
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}]
+		dev-libs/libpwquality[${PYTHON_USEDEP}]
+	')
+	qt6? (
+		>=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml]
+		>=dev-qt/qtdeclarative-${QT6_MIN}:6
+		>=dev-qt/qtsvg-${QT6_MIN}:6
+		>=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
+		dev-qt/kdsingleapplication[qt6]
+		>=kde-frameworks/kconfig-${KF_QT6_MIN}:6
+		>=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
+		>=kde-frameworks/kcrash-${KF_QT6_MIN}:6
+		>=kde-frameworks/ki18n-${KF_QT6_MIN}:6
+		>=kde-frameworks/kpackage-${KF_QT6_MIN}:6
+		>=kde-frameworks/kparts-${KF_QT6_MIN}:6
+		>=kde-frameworks/kservice-${KF_QT6_MIN}:6
+		>=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6
+		sys-auth/polkit-qt[qt6(-)]
+		>=sys-libs/kpmcore-24.01.75:6=
+	)
+	!qt6? (
+		>=dev-qt/qtconcurrent-${QT5_MIN}:5
+		>=dev-qt/qtdbus-${QT5_MIN}:5
+		>=dev-qt/qtdeclarative-${QT5_MIN}:5
+		>=dev-qt/qtgui-${QT5_MIN}:5
+		>=dev-qt/qtnetwork-${QT5_MIN}:5
+		>=dev-qt/qtsvg-${QT5_MIN}:5
+		>=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
+		>=dev-qt/qtwidgets-${QT5_MIN}:5
+		>=dev-qt/qtxml-${QT5_MIN}:5
+		dev-qt/kdsingleapplication[-qt6]
+		>=kde-frameworks/kconfig-${KF_QT5_MIN}:5
+		>=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
+		>=kde-frameworks/kcrash-${KF_QT5_MIN}:5
+		>=kde-frameworks/ki18n-${KF_QT5_MIN}:5
+		>=kde-frameworks/kpackage-${KF_QT5_MIN}:5
+		>=kde-frameworks/kparts-${KF_QT5_MIN}:5
+		>=kde-frameworks/kservice-${KF_QT5_MIN}:5
+		>=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5
+		sys-auth/polkit-qt[qt5(+)]
+		>=sys-libs/kpmcore-20.04.0:5=
+	)
+	sys-apps/dbus
+	sys-apps/dmidecode
+	virtual/libcrypt:=
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		!qt6? ( dev-qt/qttest:5 )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	|| (
+		sys-boot/grub:2
+		sys-apps/systemd[boot(-)]
+		sys-apps/systemd-utils[boot]
+	)
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	sys-libs/timezone-data
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+			PYTHON_LIBS="$(python_get_LIBS)"
+
+	cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CONFIG=ON
+		-DINSTALL_COMPLETION=ON
+		-DINSTALL_POLKIT=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+		-DWITH_PYTHON=ON
+		# Use system instead
+		-DWITH_PYBIND11=OFF
+		-DBUILD_APPDATA=ON
+		-DWITH_QT6="$(usex qt6)"
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Skipped tests:
+		# load-dracut: tries and fails to find Dracut config
+		# libcalamaresnetworktest: needs network
+		# libcalamaresutilstest: inspects /tmp (expects namespace?)
+		#
+		# Need investigation:
+		# test_libcalamaresuipaste
+		# validate-netinstall
+		# validate-services-systemd
+		# localetest
+		# machineidtest
+		# packagechoosertest
+		#
+		# Requires removed dev-python/toml
+		# lint-displaymanager
+		#
+		# E1101
+		# lint-dummypython
+		-E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)"
+	)
+
+	cmake_src_test
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 7e066d7675f9..a687b95b9280 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,17 +1,11 @@
 AUX puppet.initd2 749 BLAKE2B 4f92433e471467ca68bb3222e621bb78dc654f1bbefb51db81e96684d45b608cef7268a84d04e600d80b0b7b8941afe7413e863a114ea31f169f25fb6b9820b6 SHA512 2d538eac7eefbff2f8d5beddbfe86d33e9f7c427dd14544d296f35e1ff604e99d604874c02af7c68e8e1b030c35f0140d683146ad805c9351e643e88e4e9822d
 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.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
 DIST puppet-agent_8.5.1-1focal_amd64.deb 35945834 BLAKE2B 8c839eabf8abbc6cf87ab8a1c942b97be7fc08b9053695d07a7fc4bbf69886192063553c43f81e73521327cf8b89af18fe43d41ef3f71229d218fe123426f50c SHA512 324ea532d005a1bbb0f25fdd411f3f68a1c18371cb494f8934d73d87c19e3bbf46c653a9afbe767ed2ab6e788115f31ccef4bd084351ee6f73e4e656aab5d65a
 DIST puppet-agent_8.5.1-1focal_arm64.deb 35436770 BLAKE2B 16ead6317dab6f8b65b8ea5269eec5593697f4da6d1ec0323e074f4eab3c8518dab10af48853e591aecc62c63a5ff4e135cf02bb1d7f7d565c5200bfae98ff86 SHA512 f3acc097563d9a56cb677df72250ee25ab0e1e361eb40a2cd36b3d694854edc3850f08099b916aefbc16580f78a194e9f3bf33b1cb585836d55c6e8dcf03a379
 DIST puppet-agent_8.6.0-1focal_amd64.deb 35966100 BLAKE2B a27e5fd32c73dd798612cc78a2e4abc150b425215592e9c7a88c7d3b54a2f6dcaffd557575e7c6f64116228fdd50e15a503f8b4c8c496c0f970ee772d5a88e6c SHA512 10a89f73219da6b59e63e8d2aba63968ef2236e773077c54ef6001b010b20b3e384676880cc10b8be4fc16336bb123783de88b0fd1d5c5d91c2455f410458363
 DIST puppet-agent_8.6.0-1focal_arm64.deb 35459524 BLAKE2B 5c9bc90eb3b2857176988acb41ebf0eed173077adabe74a6570ada92f9c2c829a57b949ea0c1cb1cae2e7b562b52882da58fab1552934e18bd676163c10e1924 SHA512 f91d82dcb66667891c6155e171739f34a174529a09c376fc7e1a829cd6862e52d26dc39ab3b0d273e32b56e52c62193c8d574d5164f3152bab6e50b4872c5e52
 EBUILD puppet-agent-7.24.0-r1.ebuild 2593 BLAKE2B 08fcc0a7e5887d7767d6f740501b862957a9436ef9e5b0f7ad89077a273d22e3f9ba13f2ae5e557f0f5526889cf5f92489fdd5165e0608c655f94bed6e08a002 SHA512 98d999200a527076993b9c8bb45fcce2d980b081c19afa058d7129193861ab89b323b2ea73886190cde8a633dffc96bf459b29facad8e3cbeef46be9029fac39
-EBUILD puppet-agent-8.4.0-r1.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
-EBUILD puppet-agent-8.5.0.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 EBUILD puppet-agent-8.5.1.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 EBUILD puppet-agent-8.6.0.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-8.4.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-8.4.0-r1.ebuild
deleted file mode 100644
index 32089749d68e..000000000000
--- a/app-admin/puppet-agent/puppet-agent-8.4.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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-agent/puppet-agent-8.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild
deleted file mode 100644
index 32089749d68e..000000000000
--- a/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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 1b990827e9a9..97b388b26d0e 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,18 +1,10 @@
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 751 BLAKE2B b873fd1e51e2b5c148d31da4f861ee8cc60c71ef7950f10f1ba78c8ce740fcc67d8fbcd274667c383f2e7f83b2c6f76abc138348cc172f02f667b766ecf302fa SHA512 566912034aa2e1306a65d59fafdfaf3d660693331c4f5020611bc806e7e5aa14047122bc31e229fd5ab9eb48979c04c436fbb5aa765f598b7416839b67640655
 AUX tmpfiles.d-2 35 BLAKE2B 333994788552e5c52273752f4e3c2947666737d03f9d340e16ada790607efe77da1ba9bb4852bc8274174fbb96ce0c7ae81062f7197e63ea4701e539b2650b3b SHA512 fdf00147c497bd822a14f0e42bad825a43ce0977ec6c0265d267dedeef56295e3ce319f7972d0ec2ab9f04f2407856947f4261d6e62054a36c6e1672b45f86f0
-DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9
-DIST puppet-7.27.0.tar.gz 2825666 BLAKE2B dffc2329c28588a5b4a08996f5fbff95c092961aa68af6287c4216ffb3e5b6ab811df876b8efb0f6724d9990b21ad1c56d65bd9fd8d502008ba385f4460f0591 SHA512 a864357f5079c9fad53c2cff35f73f0bc25900359e25b5fb1130e3a3e6f77f63bc38ef59c0ce1b37913eb0acb1e42f39891ed7de0fe39ab138faa426ab2a9392
 DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3158cfede2ffda90ee23ebcfecfdabcf35459d1a048c3a204e13611f67852028233e4da4b9ed2ea08cad07a37c9 SHA512 d570452ceec764c657f4678f7179400d30f8513766edc6f020db35c3a4246c1d857615a647ca481920a7d1a40cf9a15057432468ccd4697e4335dca55e121faa
-DIST puppet-8.4.0.tar.gz 2882328 BLAKE2B de46a8fbdc7522f022d19953845c73e6872ed430a9380f157809bb95e7d7315063f136b5159468708dcb5dcb4353cc89eacffffbd4045458351c63261a6d9bd0 SHA512 23d5aede9ba55e4e63a7f815fd1d274e97d5d0c35aa1b5444c24b223a59d5d913ac5b4652acc2258b1721a213e4c24e1e8b4a146ca6a1b81a1536a51ed856270
-DIST puppet-8.5.0.tar.gz 1565122 BLAKE2B c787b981c64f2b52cc3c8998516599891980bb176cb3bce6596cb4b139fbae2f58e156fb007a3aa2bd2a5bb069dc63eb7fc36bde3f3533c27729fccfa19ee0e7 SHA512 1adf88f69b3b5a7071a2ee5dad66c3cd3fc1db57fdeaf7945f8cb167d1b76dcf12e85e17eefc418cda67952a4c75a6b43d320d0c0f1db610411d188304994cdc
 DIST puppet-8.5.1.tar.gz 1565085 BLAKE2B f352f9f70e090c4a32edd45ced5c01ed4eff891fb46c0f2d753ceeba43250960356ceb2d9047e7308732585ec114c5f728ec29a65b6a08348b74a9709ec92a89 SHA512 f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f
 DIST puppet-8.6.0.tar.gz 1567398 BLAKE2B 749cc055c6797e5715907fdb768264774efba62e4681733a59a457cfda9dd2682990a96331cc04d313a367e32b820ce351fb103e19891976e900d99c30ca7ba5 SHA512 b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d
-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 3459 BLAKE2B f083df765e3629172ad4aab5937e6b5e5afa637faaa274580b87eb2d0eba0bc0e27911fd801a6f93ff45ce6b994140c05630b64e4e8dd974d09b7a601d9e0c34 SHA512 b315f1a5ad8404440439c099cda0326c3bb2aef087f7a62dfea3e2a1c51b33b537a5ac838eeb62a40ccd261944e5630717e7d5a3f05ebf2250ab7157361d992a
-EBUILD puppet-8.4.0-r1.ebuild 3284 BLAKE2B 428c4b53e8f7cdb84473679c67b395f4381077c697d535b63fe610b2098a28ef9bd07d061f796c636da3713fcd815ab3543456f58e345eb4503a099720912cbb SHA512 a5edb63a61b4789e4b289ce7467334870cf36c6820b3f448bc0d66fb5a8ea99f2d8f58af54d86bc8f4d230993aba68cec97c288c5d29707b78fb961b5de8de39
-EBUILD puppet-8.5.0.ebuild 2886 BLAKE2B a808ca3839b275c44f4cfa7f5212cfe788ddcfd7572ce7e659f706140b85f33838d1a584ebf3ec8f7d9f58caf9f922224c038adfd4b050bed62f0df0b203ceb6 SHA512 f153d19dc2f918526bb13dcdd04499afd1ea390f7678f8513f9bdb06f8bf4713bd8f20b136a5acb195224a85f5cbed453091894b89e589673b6d139a040c4f58
 EBUILD puppet-8.5.1.ebuild 2886 BLAKE2B a808ca3839b275c44f4cfa7f5212cfe788ddcfd7572ce7e659f706140b85f33838d1a584ebf3ec8f7d9f58caf9f922224c038adfd4b050bed62f0df0b203ceb6 SHA512 f153d19dc2f918526bb13dcdd04499afd1ea390f7678f8513f9bdb06f8bf4713bd8f20b136a5acb195224a85f5cbed453091894b89e589673b6d139a040c4f58
 EBUILD puppet-8.6.0.ebuild 2886 BLAKE2B a808ca3839b275c44f4cfa7f5212cfe788ddcfd7572ce7e659f706140b85f33838d1a584ebf3ec8f7d9f58caf9f922224c038adfd4b050bed62f0df0b203ceb6 SHA512 f153d19dc2f918526bb13dcdd04499afd1ea390f7678f8513f9bdb06f8bf4713bd8f20b136a5acb195224a85f5cbed453091894b89e589673b6d139a040c4f58
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
diff --git a/app-admin/puppet/puppet-7.24.0-r1.ebuild b/app-admin/puppet/puppet-7.24.0-r1.ebuild
deleted file mode 100644
index e6415c71f2b2..000000000000
--- a/app-admin/puppet/puppet-7.24.0-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="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"
-
-# <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
-	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 )
-	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
-	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
-}
diff --git a/app-admin/puppet/puppet-7.27.0-r1.ebuild b/app-admin/puppet/puppet-7.27.0-r1.ebuild
deleted file mode 100644
index b23327410b34..000000000000
--- a/app-admin/puppet/puppet-7.27.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="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-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
-	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
-}
diff --git a/app-admin/puppet/puppet-8.4.0-r1.ebuild b/app-admin/puppet/puppet-8.4.0-r1.ebuild
deleted file mode 100644
index da3eb9487a0c..000000000000
--- a/app-admin/puppet/puppet-8.4.0-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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/puppet/puppet-8.5.0.ebuild b/app-admin/puppet/puppet-8.5.0.ebuild
deleted file mode 100644
index 6ee8a0e304c8..000000000000
--- a/app-admin/puppet/puppet-8.5.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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() {
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-}
-
-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 900e3dc5ac46..9d23efe8c6f0 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,11 +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.2.0.tar.gz 59250096 BLAKE2B ed1009e87cad366a1d3399eb55b51d8aaad325f1b2da9c2fc5f77a1ad43581009ebc23f5e6756cd86430eb300d389a9022b14c29bdd4ea392cf956627df0f1fe SHA512 59d894710c2591566f9900a7fc1a396f971152e66ae423b54d73b0b9d474eaf4f58926fb6dc4815865dac8bd2dc458161685876ffdc9db5a3d049d0ffeb9b601
-DIST puppetdb-8.4.1.tar.gz 60378645 BLAKE2B eb107fd2016335f814ce9de5431abb2573fd71e8b1a37faf3dad0079ca464f15785bde79eaa49f343a8dd146b9977dbb9ce4e23bce61ba39e5526e422995a497 SHA512 89f405e5364eff1ecf1482ff620de1a7fbb818b3a7ab2463f6ff47fcba0552ac440639c72f2875de956127ea3da9a5d59aa3bb220e59d0994ed3683cac22309c
 DIST puppetdb-8.5.0.tar.gz 60440356 BLAKE2B 8c3116b040c91a1b406e56b419ddd7e31a5ecc7aae97c73b03fcecebeedefb1b8eed44ce54b07881cbbb025b79bfa076618c6fd6df861a6dcf03c047e7c8f480 SHA512 92808758271c43eabbd508fcb321b3e52a92d0aa860f2c9b42d1df6dcffedb41110c8cc2e72c599fa1762404112f1fc76699f449858a627dd1ca5caa84a2d381
 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 2702 BLAKE2B 764c25b8a8071be7f67fce96a88d61f06e98a0a25c07fc154b39a41c6fbf624954f94596dc2625a9471f5a6571bfcc669aa2930548d42ceafd0b78747b0d1f26 SHA512 63c7bd0dacaa4b4be81f26da9d023235fa82b80376aaa6e32fd846b14752230325185cc707e4b0b1b0277713464de694aa5b6c3c10147ac15d1b89130ea45f2b
 EBUILD puppetdb-8.5.0.ebuild 2702 BLAKE2B 764c25b8a8071be7f67fce96a88d61f06e98a0a25c07fc154b39a41c6fbf624954f94596dc2625a9471f5a6571bfcc669aa2930548d42ceafd0b78747b0d1f26 SHA512 63c7bd0dacaa4b4be81f26da9d023235fa82b80376aaa6e32fd846b14752230325185cc707e4b0b1b0277713464de694aa5b6c3c10147ac15d1b89130ea45f2b
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
diff --git a/app-admin/puppetdb/puppetdb-8.2.0.ebuild b/app-admin/puppetdb/puppetdb-8.2.0.ebuild
deleted file mode 100644
index 44b569aab29c..000000000000
--- a/app-admin/puppetdb/puppetdb-8.2.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'"
-}
diff --git a/app-admin/puppetdb/puppetdb-8.4.1.ebuild b/app-admin/puppetdb/puppetdb-8.4.1.ebuild
deleted file mode 100644
index 4b5a495abffd..000000000000
--- a/app-admin/puppetdb/puppetdb-8.4.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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 f2ee684e3e35..5f58e3bfa931 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,11 +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.3.0.tar.gz 63318772 BLAKE2B 863337c364573b340b802b83f0593fdc510424bfbcf6c6b9f8a8e56729a4db689ce5d4c0d9e1a91399e123e05f42ed0547e6a2e86905d0166c189c79966cd9f3 SHA512 c9aa0f84f989dc544ee5d8d268f753b0961f6766531d832a2c99012701dd219d1c2abf4371835242b3445428a7518e86718552678b559b3bf9b027cbf72977fb
-DIST puppetserver-8.5.0.tar.gz 64463953 BLAKE2B 305f75165f919299301209c5a502237bf931342a9d0bf77d91f81f7801760faa421f1767eff283ac82e2cc49792b94126354b177e7b68bda9be61430d123621f SHA512 cb826e2450aa36380a93e95ee8055e6187944d2eecc6d5c339d4b183662d4a56d1e14847fd17b2bc50316f029dbe36791441947832686c9bfb6b0176edf7b22e
 DIST puppetserver-8.6.0.tar.gz 64667765 BLAKE2B bb367a2ed980a6335a6d1e2bc09ad10ccdcc636eee6b658cab5d4bc530f656c76d75545d17e11d7b58288867edcb39bd54af0ddfd5bde2f13cb5000ed33d0bd0 SHA512 e780c78371865e754a3a7fc5343b11f9a0319caf34dcf6ca998295243d1fa2137a617867782878d9bb735c96d5dd1f3e3174898eef240353d3af63eb87cdc4a2
 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 5352 BLAKE2B 4d688a0e03cc3b86f224fdb05a08534d85c99828e1eebc8356ec953bb184a57d2bb9ff8ac3c475034d7e5c6d754e32d3d373e5447827851ac258babe8add4eaa SHA512 9babc7d5023bbc6d864e38b99783bc86d662e89c2a9442ef390822c257cfdd6ae44c31887c88f793f9c795a28a9095907488422d167518a1168c0278fa8b74a4
 EBUILD puppetserver-8.6.0.ebuild 5352 BLAKE2B 4d688a0e03cc3b86f224fdb05a08534d85c99828e1eebc8356ec953bb184a57d2bb9ff8ac3c475034d7e5c6d754e32d3d373e5447827851ac258babe8add4eaa SHA512 9babc7d5023bbc6d864e38b99783bc86d662e89c2a9442ef390822c257cfdd6ae44c31887c88f793f9c795a28a9095907488422d167518a1168c0278fa8b74a4
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-8.3.0.ebuild b/app-admin/puppetserver/puppetserver-8.3.0.ebuild
deleted file mode 100644
index 34a4a96140ca..000000000000
--- a/app-admin/puppetserver/puppetserver-8.3.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"
-}
diff --git a/app-admin/puppetserver/puppetserver-8.5.0.ebuild b/app-admin/puppetserver/puppetserver-8.5.0.ebuild
deleted file mode 100644
index 198d1e787156..000000000000
--- a/app-admin/puppetserver/puppetserver-8.5.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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"
-}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 750dd10ce751..48f72600bf5a 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -3,5 +3,6 @@ AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3
 AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
 DIST supervisor-4.2.5.tar.gz 466073 BLAKE2B 54b45c824a1ad2960b04ca4ca9e54337f8c4da1a13008b559103f9efb9043588e72b3ee97c41218eb9252606d717575ad2615d12136047734f83d843d0a63bfa SHA512 ea80c8c91356646deccf20735e065fd9b341f3be6d56838d333989297a912b0a59142338925b2eb08690e038f0617814e03447673701a19093aa483432ce6d41
+EBUILD supervisor-4.2.5-r1.ebuild 1492 BLAKE2B 87ce2c3cef419460f593f467f6f45576449777c3f7308ddc1c1710a098a8921c0ac18e5daebfa725bd4fb3e18fa6ac60be15a55d789dea9893bc4f88980851a1 SHA512 c09acaafd2cc9305b97bf25e736ed51d808cc1e62763f9e150ca68e4df92e495cb1c93a5151afaa36a4a06e544f05ecd134ffa877a74011ab673e835644ac07c
 EBUILD supervisor-4.2.5.ebuild 1381 BLAKE2B a5f68817963dfca8b1db5680c2067afd6ab9ed1df2d7ac4fbe28edc365576d1978be108f76710d44a891d0e5f783e6c88c61f40b6dd263b171298288970d4879 SHA512 df46678f2e38677111a0a407a2c7f95379487235f885b2692652aae7e8b4497d16eaf88d279cb6b6e3fc6f97c5d975a331b989dc07fb404799a92c5ace8c91a8
 MISC metadata.xml 624 BLAKE2B 6cb179a9284e7898dcfc4423e12e04d7bd4e805930f8f4e79e3528153180146aeb606040d087e3c5d127e6d7e3b42cbbd6f4b7c1bb2ad7fa414bf90a40a76502 SHA512 dfe5b6abb493cb69a2a2b2d93fbf9c66b4f21ca5d83d76a2da5066f3625a945c1834e876ce8b8b4368cec3e34a81003f7be47898b5e2bdbe796714ea8291f63a
diff --git a/app-admin/supervisor/supervisor-4.2.5-r1.ebuild b/app-admin/supervisor/supervisor-4.2.5-r1.ebuild
new file mode 100644
index 000000000000..0ec69aee0dc9
--- /dev/null
+++ b/app-admin/supervisor/supervisor-4.2.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 systemd pypi
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# setuptools is required because the package uses pkg_resources
+RDEPEND="
+	acct-group/supervisor
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newinitd "${FILESDIR}/init.d-r2" supervisord
+	newconfd "${FILESDIR}/conf.d-r1" supervisord
+	dodoc supervisor/skel/sample.conf
+	keepdir /etc/supervisord.d
+	insinto /etc
+	doins "${FILESDIR}/supervisord.conf"
+	keepdir /var/log/supervisor
+	systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+	fowners :supervisor /var/log/supervisor
+	fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog ""
+		elog "By default, only members of the supervisor group can run supervisorctl."
+	fi
+}