13 files changed, 667 insertions, 8 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a161cb1ea943..a8044844943f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index eda4f905660d..4eabc9173b6c 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -4,9 +4,9 @@ AUX apache-tools-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f4
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
 DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
 DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2
-DIST httpd-2.4.60.tar.bz2 7508704 BLAKE2B d1b4d2e05edfe8b88f541e6fa8b5db73f37cc349a4037b493e57ae2f2e0bb84f92aad3ad3bc0bdbc454d2677091bbca283ebe752a9335fae6931ec65cc687326 SHA512 c1591389f76699beaa5d32b019729e25f1ed5b828311c82b52f1a4edd5d28b73e697958df384d7628b314521a831dbb0af418bc37cdf031cfe133e53c195d8ad
+DIST httpd-2.4.61.tar.bz2 7512908 BLAKE2B 9299ef5843888829143732b3a60d1713aff688ed2f6c2b7f154be16bc075ec747a5b116716f188491ebc9947ff2dfe09dfc71f5245d98a4be3ba27ada28ec8a5 SHA512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff
 EBUILD apache-tools-2.4.57.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b
 EBUILD apache-tools-2.4.58.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b
 EBUILD apache-tools-2.4.59.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b
-EBUILD apache-tools-2.4.60.ebuild 2667 BLAKE2B 787d5cdfd21d93569358a3ff1c83df593f295946699a859d792b0c4eba384ccacda91f53ded8f8b4bf2fa88d02a245a93bc56e5e3f4f8aebb2405ff686df4d72 SHA512 26c44c4fdf9590fbb5a2672d8634674e91b1e7b2869c626351411112d067990e5d1bed06ae68d9c91331dc40c40f6b3a91afb2eba4b54c4e6306bbe824cefeb1
+EBUILD apache-tools-2.4.61.ebuild 2667 BLAKE2B 8becbcf721c217ebbed456d632443d7801d9def997a5495ab5d112a0549296b8bfef7471880a31b52c8f2760bce05e520359b9d47a3188564170499153d03ba8 SHA512 85fcdc522a88628bb8c6f82dc0d8350e98016c755a8d227f71fac4a9ce72140c1db59f9af4922d46481af04a1cddb21fd8d22df0c79eddf04d29ff3ebdb561f6
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.60.ebuild b/app-admin/apache-tools/apache-tools-2.4.61.ebuild
index ff67bbf7dac4..f25e9b88cde5 100644
--- a/app-admin/apache-tools/apache-tools-2.4.60.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.61.ebuild
@@ -8,12 +8,12 @@ inherit autotools toolchain-funcs
 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
 HOMEPAGE="https://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+S="${WORKDIR}/httpd-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
-RESTRICT="test"
 
 RDEPEND=">=dev-libs/apr-1.5.0:1=
 	dev-libs/apr-util:1=
@@ -28,7 +28,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/httpd-${PV}"
+RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 2a6304511595..fec44b4954d2 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,10 +2,12 @@ DIST aws-cli-1.33.13.gh.tar.gz 2751169 BLAKE2B b849f4c5c0eac5092c3f163c4344a7bee
 DIST aws-cli-1.33.18.gh.tar.gz 2752774 BLAKE2B 8f78ba78c3fac623f091344fb2710ac79440d3bf96e0c33168bdf5d6c6d705318c8ea82d769eef4fb82840e8e94998b65b81999831c75be9a1924fac7be37aa4 SHA512 e0444118ab02fcba91cc1f078db80176da97abee64d2cd38875281c8344930fa63b89d1b59f43ed7690c432fc0d36273e7f4d2e0c947ae56a13ec6f42dea6ec9
 DIST aws-cli-1.33.19.gh.tar.gz 2753605 BLAKE2B 5967d0cbc2afef08f28bbf9035d867d880f07c2962001611985d6c22b61f57265daa720bb410b1d2f3204a81c19415857069da668eba10bcaf9603ea9fc998fa SHA512 95eacc803d9011bcb80e5e09243b0274f17692a4a27b434de676d295c5090cc61382665226073b6ca9af7deb6701ea303f9cf1f7b6baba850eb1a828c92dec34
 DIST aws-cli-1.33.20.gh.tar.gz 2753730 BLAKE2B f72553e9a91802dd5fcaa6f2a4dd383fd13139bd9f624762310dee5d8a69f74bfebe7fb70d0a72cf73d95ee96c33ea4ea378888ec1de103fe670593423789c6f SHA512 546584f0839db3da095b5e3b8b90a5de21187a172d8b2a9bfdd8266f6a0f5c8d1a782d7d26599ce686b2a6a9f465f2bbbd9c3ef3fd691d8a1cef87a2566b6879
+DIST aws-cli-1.33.21.gh.tar.gz 2753813 BLAKE2B 236bf4bf795e7142c38090d561ed1afc80235085d348fb7e8537588ec54c6cb745817a29f6e40b0a437a3e8c4c5546ffef1b9b7a117634057359410507af375a SHA512 834408174d7b0dd2b91b8bfcc9e628a6ab96f7883798f4bf548ba9f7acbfdd97e73aac64d6e82512cf99c9b35ffd1e19581ebfc53a7cfaebb242aa65501e431a
 DIST aws-cli-1.33.9.gh.tar.gz 2744062 BLAKE2B d888e111d93ec22c6bbabf083d612b15845883e2e56814a37173f79c108e4fe25745dbba83d46f99f54e7ddcc2f471c81e3b568de7233eb7e0bb51ed25a89f7a SHA512 5bdb9873487570c841b582ee466d989705c2fc5827386356819507caa8e105b76b0101555f8a6ee485f38aaa433881470fdde5cb21f6fdc88243c92ce7c31a81
 EBUILD awscli-1.33.13.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.18.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.19.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.20.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.21.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.9.ebuild 3048 BLAKE2B 12780280e20a5681960cbfeaea03d9f3fcc292c8f1c1b2f174652dd6a76e0aad304e84a5acc67687f5585781bee6ad8568cafc6b02bf69aee39d180b1dfa7154 SHA512 805bcb6a01036c600f8a9423eda8459177d5729e11c6c9c17c4197ce06f5a0126b06cb3b760fee8f11cd81e2f962a67e982e79798aa6590099465818c3d6fc06
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.21.ebuild b/app-admin/awscli/awscli-1.33.21.ebuild
new file mode 100644
index 000000000000..a7a293c4a8e8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.21.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+1).(z+118), sigh
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index 7265f42bb23a..7cb6c3ba6ca8 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -1,5 +1,8 @@
 AUX cpulimit-2.8-inline-func.patch 454 BLAKE2B 282733b42c9e1ec1e7d39e28b4830912be9b636734086e78a32e5c8490fb906f9e88ac4edec3891d926e7a8f8227f0384811f1849c228fab39a620cafaec3e8b SHA512 727d548964e4ce3d81131ed113067666c4c6dc21306e9698efb6d7b6f2aceb6079a09ddbe6c6f9c10b40593dc6f769850bf2d9df6aac0bd3b8a4a3fa6c42d873
 AUX cpulimit-2.8-makefile.patch 599 BLAKE2B 2b0f138ee0a30ce8a1e84b15c949c4c7176703968da326801672d98851b1ad4185ce5b6c9a6259a67e0de57b0b29b95fe96daf6e354b6c73cdf9b78fd5689ca2 SHA512 2d25fdbfa47f37d98592b1197f3877de6bbbbd40b975fa18163aa2d23ec32d13efe311736df0c68a8510219423d4673ef6e123a932300ae79d476efa119a0dca
+AUX cpulimit-3.1-makefile.patch 599 BLAKE2B 2b0f138ee0a30ce8a1e84b15c949c4c7176703968da326801672d98851b1ad4185ce5b6c9a6259a67e0de57b0b29b95fe96daf6e354b6c73cdf9b78fd5689ca2 SHA512 2d25fdbfa47f37d98592b1197f3877de6bbbbd40b975fa18163aa2d23ec32d13efe311736df0c68a8510219423d4673ef6e123a932300ae79d476efa119a0dca
 DIST cpulimit-2.8.tar.gz 24860 BLAKE2B 6d4002d2cbc46da9ce102da77b701e6a99c2e7d16e2e7989baa1e07ef335b126a8c717c4779d121aee1e580ebf057a16b4f83c1bc6a29c904a7532debc4c490a SHA512 aeb121739a5dc9f94c6ddb0905ed05eb7d146c9d0e71c34ba46aad798bda2c30b7ccc548338b4c468f9885f09d97a4565c00199c8df6af74dc9b6f23940c540e
+DIST cpulimit-3.1.tar.gz 25446 BLAKE2B 77a7ca7dfbcb49f1db481e937607bfa3e287b944d741409033e0a93d2ec788024c30e4de0dc9270645dbd91a66b88db3ddc8763b41f2117b4176bb0f9c2aed5d SHA512 d4c8a2598535ba1221e2089c21576062eff47fe7e842f021e1db83ebdf7ad98ba7d6b216d4f2a93697d4e0adc54c281d24eded7d67bb83134ce06510e1389cda
 EBUILD cpulimit-2.8.ebuild 592 BLAKE2B 4b05a800de3dc11ab5175d8171839047d65c6bdd2378cd5f346a932c1f368c86ae65a2bb3916a9993a4e0627f7df748944ed296d5f1fd10d7a6cab6371f3fdff SHA512 71567b23e1129c065889fc4b4e120368324bb755111e8df0884f9901e3031d84b9e718cff8991d49280aca5e22aba42eeecb1a96876f7fcce0a84e8ee118e60c
+EBUILD cpulimit-3.1.ebuild 542 BLAKE2B 1d2714103345d6b79da8d450daf83b428415b0d9ef1487c01e78efa6db972d8028ee9ad20e2846f7dd70223deaccd710247daf024627353fa23ea83fde4cd78d SHA512 0cfdd2257025bfd1c9ead363afcfb720cdba04b1076643343677eed74687c19a3c2496f61311bfed076dff050c2ece0502cee683419e74b7466fe298af18ac75
 MISC metadata.xml 246 BLAKE2B f8eaf18c2348bc96406ed9c74b65064db04104fda3d02be7c4263042d973d0cd5b4aa34f7fa71217ab29ce1759feaf015fcfa886add91fc26b372c9071afb6a7 SHA512 6895874d4b7df644a526fc2919b75ac1786e3efbba42127b05af21f8e1fa3fa496def26e4ccb461d669ff6fa539a92c618cba4f7acda1f7bed43dcb11a11ba56
diff --git a/app-admin/cpulimit/cpulimit-3.1.ebuild b/app-admin/cpulimit/cpulimit-3.1.ebuild
new file mode 100644
index 000000000000..8f369c8795a2
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="https://cpulimit.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc CHANGELOG README
+}
diff --git a/app-admin/cpulimit/files/cpulimit-3.1-makefile.patch b/app-admin/cpulimit/files/cpulimit-3.1-makefile.patch
new file mode 100644
index 000000000000..7daf8a7092ab
--- /dev/null
+++ b/app-admin/cpulimit/files/cpulimit-3.1-makefile.patch
@@ -0,0 +1,25 @@
+--- a/Makefile	2023-02-06 18:47:21.311693323 +0300
++++ b/Makefile	2023-02-06 18:48:23.392517904 +0300
+@@ -2,6 +2,7 @@
+ PREFIX?=/usr
+ CFLAGS?=-Wall -O2
+ CC?=clang
++DESTDIR=
+ 
+ all: cpulimit
+ 
+@@ -21,10 +22,10 @@
+ 	$(MAKE) -C test
+ 
+ install: cpulimit
+-	mkdir -p ${PREFIX}/bin
+-	mkdir -p ${PREFIX}/share/man/man1
+-	cp cpulimit ${PREFIX}/bin
+-	cp cpulimit.1 ${PREFIX}/share/man/man1
++	mkdir -p ${DESTDIR}/${PREFIX}/bin
++	mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
++	cp cpulimit ${DESTDIR}/${PREFIX}/bin
++	cp cpulimit.1 ${DESTDIR}/${PREFIX}/share/man/man1
+ 
+ deinstall:
+ 	rm -f ${PREFIX}/bin/cpulimit
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 6b231b984bdf..00daefb342d4 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -9,7 +9,10 @@ AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad1
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
 DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1
+DIST rsyslog-8.2406.0.tar.gz 3412827 BLAKE2B c75bfba02cd9d28effb2dd64b6b665b71b46fe6e47a9e12dbe5a6735fdb59373585d655334da64e89c11cbeb0f36a1563562a9c65ead3c2747f876fd0664d800 SHA512 e7c930f9b35b73591c1655afa25408c325c967114550996caa5840331c8f089563536c8efe52588c1b727db7f27bdae9b5ba619222e050d618a3f067de1bcbd0
 DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264
+DIST rsyslog-doc-8.2406.0.tar.gz 6568856 BLAKE2B c8e1dc2bf9eac465dfebd73539b4b81ec57a5a25723673f2b00477b2e60203f10614206d39a496981adcd348c44c6f455f83e56455902892719617ff136038ff SHA512 8c48bf109e105b2e92e076436e8771f55a1c6a595e525c7fce8720fc675aba4a8897eda076ff9b9369eacc8583e76ea05d056899dee1b6d97f918ff2fd55aced
 EBUILD rsyslog-8.2404.0-r1.ebuild 13415 BLAKE2B 72523091059833a8f14c5574577c87692488cc2c28c20b9fd8cec4439e78f477b6badc0c03f565fb81ec412b23ba13fcf8ba4f12eba00818f4233b9dd5dd8d31 SHA512 5347083948f15b4deb38af5946eb752488e82ec64001fafc1c3448c7d17124528fe9da5325582eed51cef2ee50cbb3cdb72150d51cb2c5f4c0d44a4ec16e679e
 EBUILD rsyslog-8.2404.0.ebuild 13432 BLAKE2B 50e26c6a1f7e88906704427e906a7b21eff19c6d59ac3e8ff9892045f5f10dcf126a7b76dbf333facd64eccf18b93702bc751f492a754daecfa49d70cd59f48e SHA512 f7c4945c5e756c474f3f6e60f3bd30f29b825c739e1ba6aeed470948fe929cccbe8b75c7ab17191e0bf6120a2a69e1fc166de8a43958ea74eaaa7313da9ab38e
+EBUILD rsyslog-8.2406.0.ebuild 13415 BLAKE2B 72523091059833a8f14c5574577c87692488cc2c28c20b9fd8cec4439e78f477b6badc0c03f565fb81ec412b23ba13fcf8ba4f12eba00818f4233b9dd5dd8d31 SHA512 5347083948f15b4deb38af5946eb752488e82ec64001fafc1c3448c7d17124528fe9da5325582eed51cef2ee50cbb3cdb72150d51cb2c5f4c0d44a4ec16e679e
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2406.0.ebuild b/app-admin/rsyslog/rsyslog-8.2406.0.ebuild
new file mode 100644
index 000000000000..514cb65782b2
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2406.0.ebuild
@@ -0,0 +1,509 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/
+	https://github.com/rsyslog/rsyslog/"
+
+if [[ "${PV}" == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? (
+			https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz
+		)
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=dev-build/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? (
+		>=dev-libs/hiredis-0.11.0:=
+		dev-libs/libevent[threads(+)]
+	)
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+if [[ "${PV}" == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=app-alternatives/lex-2.5.39-r1"
+	BDEPEND+=" >=app-alternatives/yacc-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack "${P}.tar.gz"
+	fi
+
+	if use doc; then
+		if [[ "${PV}" == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH="${EGIT_BRANCH}"
+
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+
+			unpack "${PN}-doc-${PV}.tar.gz"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Bug: https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disable known test failure mmkubernetes-cache-expir*.sh"
+
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 0' \
+		tests/omprog-close-unresponsive*.sh \
+		|| die "Failed to disable test omprog-close-unresponsive*.sh"
+
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 0' \
+		tests/uxsock_simple.sh \
+		|| die "Failed to disable test uxsock_simple.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis ; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local -a myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imdocker
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local -a DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo-r1
+	)
+
+	use doc && local -a HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r2.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 4a2c344ddbc4..2ecb5a9cafec 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,6 +1,6 @@
 AUX ulogd.init 949 BLAKE2B bebbf58aab0957017980d46762743f366d9f2daeca35bbed53c1ae7ab2645a6de84eddf25e82a48c4185a6a9a991b4e3562e7d06579ba8a9b2fb36a9f5b0b7de SHA512 87331bc32592fc9153274a8716a5206392af99087f89d8ba51539c477805a1932706ad2fbb8f71947ef3534a368cb2559fd2f54ae0038ab49eccda85763e7a99
-AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd035cd714f8c3e6f90860ce47e27dccdf66feed68258f9bbbe2ef16fa103000f0166927a8cf9fc6969c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a
+AUX ulogd.logrotate 199 BLAKE2B bda9b0863ef0698eaa78065532a6b0487e4e2e05d9a1a6169c20a4f8bd829eb3edd73689b80ec2ef696ad9666661a2798f74533a42ccc8cda47cb88a68ed8beb SHA512 ba5ebb3216b6a9423924af549261db49ac5bb1fff5fbb93585b26ff0fbf8f985bb69a62bad21671378ec3a9deb43afd1506cebba6145e541ff824c11e1d5e3fe
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
 DIST ulogd-2.0.8.tar.bz2 435434 BLAKE2B 8922a722d635b24dd8bed9bff9e96cbbdf1ac790defd3b205b6867f32d7abcd6dff1c37097305ed3ed627d66da1bdb1f7aa2a9fe7e29a2b2104959a986207478 SHA512 9f99f6f35bad5da4559d788dc3ba3dae17d4ae972737cae3313ecf68f08eaf5f55514fce6f30503437e4158fd30a06438b9249d5d20f6343964cbf690f87309d
-EBUILD ulogd-2.0.8.ebuild 3164 BLAKE2B 2a2305cb2e1ab975d2879cb2592b3ffa7977bd4dd1a73e434b3bf455325e3cfea4faba144376f7024a623e147c0dc0bbff61fb1c6e6a4b6472e90c1e2bfcad5c SHA512 5549c5096483c1c00d9daf3e32ce801d0cbc7f6abf52dab4b376bc0e45a64d7b035d51db476c231025c720a6aa4b784750b9852ab6a8e92b8e83a40d7c446463
+EBUILD ulogd-2.0.8-r1.ebuild 3164 BLAKE2B 89fc5d2d8e3e696bf07b35c68074300960703d41f0f8ba6c18669a25ee98331760d14fc9fe74e3d69768c0171911a63041a98e988892d6f5fde37e0892b3097b SHA512 65776463b06b0527bc0e57399a264e4a986765fb4933521647104939051afb8a87b93097a5bd40c00046971afe9a5824361315ff472e9af2c19333c407dd519c
 MISC metadata.xml 908 BLAKE2B a03a79c9a3d2a9b6f0b59bd9593f7b506c2f95656bd0130e0282088b7b7822eeff98136675af356939f17f0e8f2cd32ec59836c7afe3278390e46b1e695f60aa SHA512 9b9ef498ad464f3e3cfc2c86f2fb3f7ec39f2cbf6134af63d6cff28fd523d977c8c154849ff1a10f574e9df346c06cf9fd3fdfa86be27e11e0d40352a7a8f170
diff --git a/app-admin/ulogd/files/ulogd.logrotate b/app-admin/ulogd/files/ulogd.logrotate
index 777e40097a5e..b5a48a78674d 100644
--- a/app-admin/ulogd/files/ulogd.logrotate
+++ b/app-admin/ulogd/files/ulogd.logrotate
@@ -2,7 +2,7 @@
     sharedscripts
     missingok
     notifempty
-    create 0640 ulogd
+    create 0640 ulogd ulogd
     postrotate
         [ -f /run/ulogd.pid ] && /bin/kill -HUP $(cat /run/ulogd.pid)
     endscript
diff --git a/app-admin/ulogd/ulogd-2.0.8.ebuild b/app-admin/ulogd/ulogd-2.0.8-r1.ebuild
index 3768bedeb734..df0c534c008a 100644
--- a/app-admin/ulogd/ulogd-2.0.8.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8