gentoo auto-resync : 20:09:2024 - 12:12:03

13 files changed, 103 insertions, 272 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 332f020ca117..a5dcc07253ed 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 4f9d862bd40a..6b44da01b2f7 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.34.19.gh.tar.gz 2795240 BLAKE2B ede95bb83dffdef1cbc6896f35e6926e3
 DIST aws-cli-1.34.20.gh.tar.gz 2795708 BLAKE2B 733b5fd765dcfdb04a6717efcdb78988f915bd4efbe90c862b2c08e26b3a79e4ccc075d3dfcb6ad475ecb10bb1c14f4f98ca459774a6ca58febb33b4d3d751fd SHA512 03b2a368940777aed9e12f1168de953144dad40f33f05ec506630df7145dcd9a51565b1e91d5561c20ec18705fdeb0360959a6c9d6ac5803a59da7a989279709
 DIST aws-cli-1.34.21.gh.tar.gz 2796251 BLAKE2B c72399ae535ceaff6986be3d94956683a9cec868b7e0125b2c4f81f20a418a2dd926af3770caf5af70d915f76a4a1c367135075c9810a1274667a66f8dfaee6a SHA512 39d54dd1da183bf21fb2e22aa250bb05965c2dc04597eab7372a5af0de497bbd7c0d7084b38d12df8457fb22c74a2bd47bd32944f7269830a3dc34547f74af81
 DIST aws-cli-1.34.22.gh.tar.gz 2797222 BLAKE2B e9575e6f450daed3d45f9523cec74f8cd4a124a9cdb90e6abac1281efbc5df86463ccd47cf763891665765af67f22da6195bf4eadb77deb785ae759ad71f5563 SHA512 06f338559627035c24a029020dbbb58879c9101e3eb6b601b3783458135a0f86ae70ceaa4f3026c9a1b5e6af5d559b41f2eccc19895138374eb79c884fcf4cf1
+DIST aws-cli-1.34.23.gh.tar.gz 2797702 BLAKE2B b578a1aa463792fe313bda42f19a66e1a6d5fa797a02125986e3b6db807b74ac7fefa59920360d7be9586241aae979848b557e32d26bf3e03315463d235d3d7d SHA512 0c0646aa313b6e0d48169dbb123e2eb98d9566b8ce3f12e56829e7eeeaacd05bd7823db27c581bef0b6ebe9f15f5e3b84ac532df5bbc099354a7d6a9a536b745
 EBUILD awscli-1.34.10.ebuild 3023 BLAKE2B d02d93dd9b37902da1a0555b84ef0fab8f1179c2983d783717f9e2f3cd55d72b07ed1164c263aec3706f6a69d1265ecf439ae95ff273c215416ba73a117ae0a6 SHA512 d9e7f35c8346a432ea2b6067908620b0cc6527fa21e5c8c5bfef2878fe656603a0cd8fbc7479e3ff4dbad655eb8d19622097409de3f80a55986104932103f1e1
 EBUILD awscli-1.34.14.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.19.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.20.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.21.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.22.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
+EBUILD awscli-1.34.23.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.34.23.ebuild b/app-admin/awscli/awscli-1.34.23.ebuild
new file mode 100644
index 000000000000..599b9bd389b9
--- /dev/null
+++ b/app-admin/awscli/awscli-1.34.23.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..13} )
+
+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
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
+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/salt/Manifest b/app-admin/salt/Manifest
index b7a99b21154c..edc3917264fa 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -28,8 +28,8 @@ DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1
 DIST salt-3007.1.tar.gz 19401831 BLAKE2B ea8c89a24991467367dc0c50e3d2f864e2f6211ba9a71195d6308a86df16229fc77baa2ec837f043ebad36d9d7a6673fefa3a1a826472d900925e657e2152718 SHA512 732820bae98ce2eb74175a2c37c986076572e0e60d04a270861fd3b0b6871cd2cc703683a8c0d97ffc43b2f7fffb76ae709a1aea839d10abc9f5d0837eaade4b
 EBUILD salt-3005.5-r1.ebuild 12562 BLAKE2B 353e88ebd0c8992826ed030f2cd89bba882e1ea74239276d7f81d904ba27b91e1c4e5b5586bfbc1b16c6446de5f22610e14992b72fa7c5a6d56d3a002e4455c4 SHA512 86392b47a9e0d52a4186416550b75f7ea701355e970efcd1af4cbf27d0cf6f4025de0b6364998e712daca357761e8cd5e65a604ad605d29395231b6193943ea4
 EBUILD salt-3006.5-r1.ebuild 15196 BLAKE2B beb3924f91cf050c2a57414e0121d08c54991c2aa1b5c89a1c67afa644c1ef030415dc588b36e6aa11adf651d851f82365b4d5ccfa27e043c707756ddfe4c6c8 SHA512 c4b1d4a50546196f75c9d1327aa13bb649a61349b52f60b91cc958ad5bfcb1c438042c29d513a94aebb9f92d4d5acc47438d4e34468701e840ca0a0e52f7805e
-EBUILD salt-3006.7-r1.ebuild 15501 BLAKE2B 0de15bea8e2c92b5fe242137604e7bf09555cd054b4a0ef04026b388830ac2b797a51e3c541f43dc40723c0790c9f414f165d6ec950cc247e01c07d594a835e8 SHA512 85bb4881135999701972f2105ed185475c50a62ffe50361bd9842f2603582d9cb0eb2c2b6044ae2227b2f8430662b6e84a7b5a1890cb3c1427e709fedd428b63
+EBUILD salt-3006.7-r1.ebuild 15500 BLAKE2B f0b8004823c96eadb2d20065d63407815d38b6e6397e66aa5c4cddc1011bd684d5f3964a5ff29d98481501ae53a6467499be3f86fcd4eeddee970f062827b57c SHA512 60ae789ca8cfea4e5b4a0a6ab8d2d5c34f528aff7e2b0b43877a8e189bd893cde833229d27b86c081c5c9b0508e6bde371f9abed57926620bbf4f1abedc9e277
 EBUILD salt-3006.9-r2.ebuild 19255 BLAKE2B 303a0b3de340db2efca419618f23989201706ef4e7b1d551d47f759adbb3a1fbedf24918073bcaefbd22f7404cda82ffe13d0eac75c8231646d0d2ab5e4601d3 SHA512 3f147a05d1f43f67b89314558794fd33d5a704128aa8a76357af45cb7611caee0272ac622f6f85ad3f608655cd46c664a0de560bc51ad0edbe1014c032fb0412
-EBUILD salt-3007.0-r1.ebuild 30876 BLAKE2B 2816e84e757e2076c2c81aa9de3b6984e3567de44a1219dae131c110b5b9b54b9f3c41ac54f0a99e0813bc8347c412948affba56b8e38917b393b81878247034 SHA512 0fdb640a921418059800c9f86d29d4495ef489e607dfcb54baffc7071e22898b9ed5ffbd823641fd0459b1c355bf87aff64f0f65635047a8b1d90c5b5f4e0ae2
+EBUILD salt-3007.0-r1.ebuild 30875 BLAKE2B fdc6681f3e9d9265e531a8b159cd7156eb253bdf21bfcb4fec322c7c07b863fb01b1aa9461a9d2670891dc6bfe03ce8aafac12d97dadfa43e47fb296376ef505 SHA512 bac0a810133ad7e7d1a644227163f3ce24ece15bade9921823a5e46e92e31db571d9590a2c1fea25259605d4f23b7a3e96bfc3649951c0e6cf8eb635b9595a84
 EBUILD salt-3007.1-r1.ebuild 30973 BLAKE2B dd6ffb0a671b10da0f5303f8e23be6ce33731370ea3ab29d1210268a92d18774b38a0669c8a3765a35966fb4e6f19d96e45579e1c44210a735d789966669a2af SHA512 a038b37f7f8f46ffa6138ac143605d1825832143fc827a639c8d10d0c18052d528cab16dab5fb52b400b0296d7b00279bd71fa9f60ec78cb51be016b033da700
 MISC metadata.xml 2244 BLAKE2B 2c67e0828b71051c1c542b1e2142d93d623c28f30e36b59442dda3966f18ef2ae1111a263f1faf56c288c927c7db13736cfa68111248e84378fab23043d49e02 SHA512 89e46a1379b2cf95aff0af082f989cb50a1a769240407fbe6a43de1a3f312be5b690f30d1349aa659268fcf3818a2d829fcff18fd11988b161038cb19e13bde5
diff --git a/app-admin/salt/salt-3006.7-r1.ebuild b/app-admin/salt/salt-3006.7-r1.ebuild
index 6536ba08a015..328f98c641fa 100644
--- a/app-admin/salt/salt-3006.7-r1.ebuild
+++ b/app-admin/salt/salt-3006.7-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_BRANCH="develop"
 else
 	inherit pypi
-	KEYWORDS="amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-3007.0-r1.ebuild b/app-admin/salt/salt-3007.0-r1.ebuild
index 13e5222fc45f..9ceb079e260a 100644
--- a/app-admin/salt/salt-3007.0-r1.ebuild
+++ b/app-admin/salt/salt-3007.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_BRANCH="develop"
 else
 	inherit pypi
-	KEYWORDS="amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 0c8ca5084927..768af8de2836 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,15 +1,9 @@
 AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62a354470448f91950a5ffe76104e80307543922bbb5777b9e3d096af8740d66a4dd637f4aa3adac5 SHA512 80a2159d24b343a5b14da054bd073015ffc8f81c6e5b47114429b6c069b81a3331392c88baafd9a5ac1e0d778119fa7ca10def17eeb9b88c7f5cca1c0d31c6b2
 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
-DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 218d9487440ab3fa395f596e5e4a9fa95df9dfa416470da658a9ac742437050c81a6e62b42763b038b8dc5d8cfab2ba30d049e269b08a66882f6d3f99863ee7b SHA512 434609dd11951b37d62b5371a2aef66424bb15ae4c98cba44762e8338ac135b37a453e5a4f40492ab80bce9b72faefc9a0ad065753f4cc5f7595911477b26e4a
-DIST sysklogd-2.5.0.tar.gz 459695 BLAKE2B ab8185e114f7da2c35b6ba3e3b42e13f3697155b43ccfa923229d95150e3734f74db6f732bcbc999068d8a2f8124a404ee893d2e6ce4c154f89301b3b523df39 SHA512 4599f153b046317977de990455b1eea195967da81f68451f1bda4fadba6fe685d7fe533aba3b39f4daa456d6c4931743162a021067e0a16f072a7c77908286f9
-DIST sysklogd-2.5.1.tar.gz 461179 BLAKE2B efb1e1ef6456644935b0c5341bf844fe87ed910aec3fd0725da2cc2d6b3f0e1f8d4667e45525b61fa3a249387a23757291daa33aac2a72d4fcd89d325e12ab89 SHA512 24d8a76cab4c25b646d879676b46f98bb56c2079badab4f351bf983015479134e4a3e4d64fb50faade26fea8dd7e31c2c45610c17420c147c36bbbe054634983
 DIST sysklogd-2.5.2.tar.gz 459292 BLAKE2B c61a89e80d6fde10f5955cf3a7a563fbe9e00799eb1199bc9a2995585c074e7ab2b4fe6a30ae8bc224876448a521c3be9031853ae4710db2555279789aeda95d SHA512 0c160236d0f5ec31d0c5679c04b6f0f40a35af2b5b159af8b2b9dd2d37f5959efbe550dfc50c0b0419bea702b91a6594f2e141c2fbb78fdb20715ee8b2d27805
 DIST sysklogd-2.6.2.tar.gz 462950 BLAKE2B 591bf168cd9249af888feefd45ed10b8f90e7bdb71c75fbc8a95867dba0abfd20c08b0bbc13f80de2eb9ccf69ab9f77690978963ce96bf17472d2c036f96bb15 SHA512 4fb5ccba9e94c273e92ca4a55c6a7234a3dd6bbfd4568c8227b515c0ac5eeb6fdca452c82c989432e86a667dcf13df87f96aef302141e6023d630dc90466224d
-EBUILD sysklogd-2.4.4.ebuild 2094 BLAKE2B 2922d8f502adc6e8fc69d829e4262bc12e621b78eb769412daa2c6955e83a2a3a0f45d32f0a53e119421e8a534202df2d8b3f66badfb57e18693bae34940b94e SHA512 3fefb062a7b9e98112ad73f9b88ed819d50b41f5caca435701524fe160f1d137dd7c3863707bbdb22c21e79ee3cc9be5b2fdfadc98778d2225ac9f4e23fc75af
-EBUILD sysklogd-2.5.0.ebuild 2058 BLAKE2B 4620722b7c97e9768c694096d30a25fce4886bbdfc264d4d1bed67dc69df7baa63195758afb2f9a83c10a42f3fe2691500e86c565acfee85bbd592e9dad42e00 SHA512 42ab3b896282a6d4da6e1c649f90d3f9d80b5f85ccbdca9e8e0975a1ce4c945bb0ede719a638e2b610e598036bc44dcf6edb5d5a112e41280bfd721e39142f34
-EBUILD sysklogd-2.5.1.ebuild 2052 BLAKE2B 09f45503ee22122af9d444409e82aa9bfffe205eb37110e62b2e123d5336c0e868bb75839859c93557269e77976b726f28a197f61b3490073269159950aeaeb4 SHA512 85d7d0b8cb2345ea7edcf5b3fc11e3b24c133593b107ac2d6ba779c8abe1b853ad6662e0bcb8684fda361fc11084ca8fa1b4d2a44a582b01ac5aaace590dc183
-EBUILD sysklogd-2.5.2.ebuild 2051 BLAKE2B cde2b7385317f9f67ec1a8aacade6ca46414b7dd5f6328f314e81845c4707e0af68ab7cf45b2722f83e716993e4cfdcb674b5e90422f7e35bbaac6f3df4bf7cc SHA512 e303309f2c871741a1d327c617c80ff08b08ef98288c02e083912ae56a17e059d88f8ff9a977c83ae8af8b9b06d6fea9a138139041e49103c6024666360ef772
-EBUILD sysklogd-2.6.2.ebuild 2058 BLAKE2B 8cd19ef3290f8b50d4bb7a175c5eed04a78331977e6b610d09c9e42b19d5662bd3afa653b0ef9c83a8ddf29da6ee96d88223bdea15830269bbd649c0e35e6a7b SHA512 ae4c7801d2585a2360eadfa1db11f220534c75a060c0be30571580c010d4c3c5af20a46b50aa396a4cea3c26d48640c7ac57ecafea4f694b0124d332c94f71d1
-EBUILD sysklogd-9999.ebuild 2058 BLAKE2B 4620722b7c97e9768c694096d30a25fce4886bbdfc264d4d1bed67dc69df7baa63195758afb2f9a83c10a42f3fe2691500e86c565acfee85bbd592e9dad42e00 SHA512 42ab3b896282a6d4da6e1c649f90d3f9d80b5f85ccbdca9e8e0975a1ce4c945bb0ede719a638e2b610e598036bc44dcf6edb5d5a112e41280bfd721e39142f34
+EBUILD sysklogd-2.5.2-r1.ebuild 2081 BLAKE2B d195730424a0c8a3164734e6302302d14b1a5bee7d0d605a4d6c1bcd5415658da70436d4aabbf48aa8827f95ded5852b4e693589ad27c6aa977461abfb4cd16b SHA512 5d8143bf24ea059ee74396f8c5c16a5d5576b6c2ef74509f442f5a5a6a01d47340746f94baddb4f7cdb0e828c27c320657c147701a1121c0502693981717534b
+EBUILD sysklogd-2.6.2-r1.ebuild 2088 BLAKE2B 75100f7070c0244a9449a1f164d5866cc09cdb97ecb00e604748dd0c7306163434226b8716a56d7c8af3845527f2f48bed376195e522514174006fb54feb6e3e SHA512 9448681727487c6ea8eeaabb30fe6ac90ff0cfdd4a3d04f61a74d3a3838a66d95faa14c01a778967dafbdb4b9475c9b45d0499fab8027ff7d66751a13b561917
+EBUILD sysklogd-9999.ebuild 2088 BLAKE2B 75100f7070c0244a9449a1f164d5866cc09cdb97ecb00e604748dd0c7306163434226b8716a56d7c8af3845527f2f48bed376195e522514174006fb54feb6e3e SHA512 9448681727487c6ea8eeaabb30fe6ac90ff0cfdd4a3d04f61a74d3a3838a66d95faa14c01a778967dafbdb4b9475c9b45d0499fab8027ff7d66751a13b561917
 MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27
diff --git a/app-admin/sysklogd/sysklogd-2.4.4.ebuild b/app-admin/sysklogd/sysklogd-2.4.4.ebuild
deleted file mode 100644
index f0192ff1d1e3..000000000000
--- a/app-admin/sysklogd/sysklogd-2.4.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
-else
-	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate"
-# Needs network access
-RESTRICT="test"
-
-DEPEND="
-	logger? (
-		!<sys-apps/util-linux-2.34-r3
-		!>=sys-apps/util-linux-2.34-r3[logger]
-	)
-"
-RDEPEND="
-	${DEPEND}
-	logrotate? ( app-admin/logrotate )
-"
-
-DOCS=( ChangeLog.md README.md )
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-	tc-export CC
-
-	local myeconfargs=(
-		--disable-static
-		--runstatedir="${EPREFIX}"/run
-		--with-systemd=$(systemd_get_systemunitdir)
-		$(use_with logger)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins syslog.conf
-	keepdir /etc/syslog.d
-
-	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
-		elog "Starting with version 2.0 syslogd has built in log rotation"
-		elog "functionality that does no longer require a running cron daemon."
-		elog "So we no longer install any log rotation cron files for sysklogd."
-	fi
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
-		elog "Starting with version 2.1 sysklogd no longer provides klogd."
-		elog "syslogd now also logs kernel messages."
-	fi
-}
diff --git a/app-admin/sysklogd/sysklogd-2.5.0.ebuild b/app-admin/sysklogd/sysklogd-2.5.0.ebuild
deleted file mode 100644
index 268c09362cb3..000000000000
--- a/app-admin/sysklogd/sysklogd-2.5.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
-else
-	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate"
-# Needs network access
-RESTRICT="test"
-
-DEPEND="
-	logger? ( sys-apps/util-linux[-logger(+)] )
-"
-RDEPEND="
-	${DEPEND}
-	logrotate? ( app-admin/logrotate )
-"
-
-DOCS=( ChangeLog.md README.md )
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-	tc-export CC
-
-	local myeconfargs=(
-		--disable-static
-		--runstatedir="${EPREFIX}"/run
-		--with-systemd=$(systemd_get_systemunitdir)
-		$(use_with logger)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins syslog.conf
-	keepdir /etc/syslog.d
-
-	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
-		elog "Starting with version 2.0 syslogd has built in log rotation"
-		elog "functionality that does no longer require a running cron daemon."
-		elog "So we no longer install any log rotation cron files for sysklogd."
-	fi
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
-		elog "Starting with version 2.1 sysklogd no longer provides klogd."
-		elog "syslogd now also logs kernel messages."
-	fi
-}
diff --git a/app-admin/sysklogd/sysklogd-2.5.1.ebuild b/app-admin/sysklogd/sysklogd-2.5.1.ebuild
deleted file mode 100644
index e640e29c2b3b..000000000000
--- a/app-admin/sysklogd/sysklogd-2.5.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
-else
-	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate"
-# Needs network access
-RESTRICT="test"
-
-DEPEND="
-	logger? ( sys-apps/util-linux[-logger(+)] )
-"
-RDEPEND="
-	${DEPEND}
-	logrotate? ( app-admin/logrotate )
-"
-
-DOCS=( ChangeLog.md README.md )
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-	tc-export CC
-
-	local myeconfargs=(
-		--disable-static
-		--runstatedir="${EPREFIX}"/run
-		--with-systemd=$(systemd_get_systemunitdir)
-		$(use_with logger)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins syslog.conf
-	keepdir /etc/syslog.d
-
-	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
-		elog "Starting with version 2.0 syslogd has built in log rotation"
-		elog "functionality that does no longer require a running cron daemon."
-		elog "So we no longer install any log rotation cron files for sysklogd."
-	fi
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
-		elog "Starting with version 2.1 sysklogd no longer provides klogd."
-		elog "syslogd now also logs kernel messages."
-	fi
-}
diff --git a/app-admin/sysklogd/sysklogd-2.5.2.ebuild b/app-admin/sysklogd/sysklogd-2.5.2-r1.ebuild
index 348f7da8ddc7..56b5bae68e17 100644
--- a/app-admin/sysklogd/sysklogd-2.5.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.5.2-r1.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	logrotate? ( app-admin/logrotate )
+	!net-misc/inetutils[syslogd]
 "
 
 DOCS=( ChangeLog.md README.md )
diff --git a/app-admin/sysklogd/sysklogd-2.6.2.ebuild b/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild
index 7a72c587b181..47b85d4229cc 100644
--- a/app-admin/sysklogd/sysklogd-2.6.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	logrotate? ( app-admin/logrotate )
+	!net-misc/inetutils[syslogd]
 "
 
 DOCS=( ChangeLog.md README.md )
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index 268c09362cb3..47b85d4229cc 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,6 +28,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	logrotate? ( app-admin/logrotate )
+	!net-misc/inetutils[syslogd]
 "
 
 DOCS=( ChangeLog.md README.md )