gentoo auto-resync : 24:02:2025 - 19:24:56

4 files changed, 37 insertions, 1049 deletions

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index aca376581c75..f8717f7a97c3 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -10,19 +10,15 @@ AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b
 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
 AUX signal_header.patch 343 BLAKE2B 75e6e9713caf127180e07a8ab89aff180bf037c1533b2f2ea1fb3ce48965aa39891b703dbf20b54885405ecdda88d624320e7b575ef52d5bb34735c51810eeaa SHA512 1a990c4bdffa6940efed5303d68cbb12a17462e5c3dc5e8822428860fa85a89c9d5b44d6cf3d352e6622090c3ca5d7a78cfe816bb2c16e251ed68bc8e3c2ae8c
 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-8.2408.0.tar.gz 3436647 BLAKE2B b19b25bb9a3e97038b51c049dc7ba52ccd68ec552bf12369fb16d0ec030b8335848ca7ecfe925af4873bc1390264c9b6a05b25ec3ed011389beaa2844ef7a786 SHA512 86901f76290aa451dfc8dc3d2c7eb2ea82bdbf39875fe2872169a3aa44933aff064dd5ea9b80964881fd07c34c17da25ec6a0efc1c5b7f4d6884435639fa0338
 DIST rsyslog-8.2410.0.tar.gz 3438540 BLAKE2B 5a1f2966983c9a84b0662b0f778893dc20223f0bb78f197002eda2dbcea777002294383251f7ada5fd5343a8497e0cb8517142693a04841a816479303c4f96f8 SHA512 afc7e47fc65e01527f7cccf1e4cad58a8ad0c0a98e713e0f5b9e61f808bf334308b56b300744e6f134d98e4234494070beee219f47a240b0c1708f12fb9fa382
 DIST rsyslog-8.2412.0.tar.gz 3462370 BLAKE2B 7960f281e9887dc43ad7b90e15f9d57322d7e6bfd08200796bac878e821d316aaec8a823b5e70595f7853b35835ec4c254b43c068914133b9aa782318d81aa1e SHA512 fdd8bb096c9578fe2c4ed8cdb13179d7b3333d0f9be1b2c921b5b040f1e1414c3f9f8106e44444aaefba22f235a44d17c0c5b80cd114fe540a2aebb30e3eba72
+DIST rsyslog-8.2502.0.tar.gz 3470593 BLAKE2B 699782425f5c66b519f7d0801f6894b3dfb321e38a165d7cb55b5e29bc4e630864c22b88ed0b717bd226a35409e540379537b6a1885352a0e071c44dc6906d39 SHA512 dd8d6307488695c839e3c00acc89812b75bb1043dc0c986b8f0c1c18619aec25013825088a252e0778ff300cb00152cf941ef279fc1d85cd148134f4fbdf782f
 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
-DIST rsyslog-doc-8.2408.0.tar.gz 6573562 BLAKE2B 85be04a48c6be5dce477f89227908df8695d7be844968c3d232202dc6907874058f0fa9ef07d16d9b66272b34849917f2b79b8f7ca35d5912156c90df5b0a73a SHA512 9982688880b8362ca2ecd5f076f12aaf31b966144bd9b291761e660307e4c31e8c3ccc17b6b2b0cb2ccf2e30ba81927126991f9539562c2f02966a59fd1624aa
 DIST rsyslog-doc-8.2410.0.tar.gz 6588955 BLAKE2B 1c74db5fded09410741530105f9a0e8322cc3554b022a559b02bbda92475f3cd22dd02f8b00a99bbf8de17547dba0576f12fec5bddeec4a22a7af154b5bc3311 SHA512 da21a15418060d186b20356aa690b06b0aefa1fb4195556b15aacae634b6621fe83eb38dd750c15237f19e4f46d7cdb25691fc451b40826ba37541982c15f02c
 DIST rsyslog-doc-8.2412.0.tar.gz 8776066 BLAKE2B c5b0065e700dc37b7a8dff744b7fd242dff0bcf2b5c6f32c85cf7c43d959c669c897548a8608fcc77c5a107900fe48d3a429803f2f6548cca1a0804d036f3c0f SHA512 9b5d453b5774b027a6a4ba232133953d8a8058df4bfff31f835504656d7b01008cec5c0d28667bed0052799cf7389c0bafea7c76c3190bdcdf3d8a2eedf19b4e
-EBUILD rsyslog-8.2404.0-r2.ebuild 13429 BLAKE2B 0232dbcf84d072a1965da00eb6c1c45c86398c63ff7c22e6cc4f342f55e1a4b125a00e212b79f6a3816aa7ba0d35c34d8ed982acd132a9370663f9ad09fd1ece SHA512 a2c1a771076c47ecd937178b81aff3d3bdddd6d4c81b66e679a8a4ec795dfde20504e6387b6efa43a072b05615352eaca9195068bb156b892cb4dfbd4c34db88
+DIST rsyslog-doc-8.2502.0.tar.gz 8783963 BLAKE2B f7530c9bdd4b9f4a24a5206cc2cdf4ba075acc86e083f64eb5b9975061e0903ce93b3fc7de6ed23ce8f8bbf6712fbd671ea8b9ad186f8f9855a4d1353c735807 SHA512 ed6a80abea505b15a7f2a653f6edfb69b981aeb01d59a0ffb795bd224c3b2fde404b56b7bf84b46e3e6de12487c675ea1ff056f1c06da5262187b7dbfaebe8ce
 EBUILD rsyslog-8.2404.0-r3.ebuild 13409 BLAKE2B cea8fc4910d249603b02dab91f4f05bf2451ecc8ab964de612f5b5a0e586fe324d2911fa1f17a3229466236185236cd7bb0ca007317787ca0b8194829c7c4c26 SHA512 f7e26bf15553e6f566426469438d2793ad94cb1b262be65425cade9b4bbaf424a062b275972d6c8c8a69f305760bb9fced354e57d5cfe72b07fa70884e1dd2aa
-EBUILD rsyslog-8.2406.0-r1.ebuild 13412 BLAKE2B 4c1c66954037705e0f46ce4d5fecd5dd60886d1a53f9271cf11c1157aa50f841eb67edd624dc58019493e2ad4a36d326d64fb64eeaa6c68997d09572d8f502a3 SHA512 9e1aa591cad361b6a0e54d5b60ad6d638263aafbb87293c94b29186e0995515e5eca8c41a0ec52ec355f5d4557543d1e3476426b238686765dc70e7ffd8e707b
-EBUILD rsyslog-8.2408.0-r1.ebuild 13412 BLAKE2B 4c1c66954037705e0f46ce4d5fecd5dd60886d1a53f9271cf11c1157aa50f841eb67edd624dc58019493e2ad4a36d326d64fb64eeaa6c68997d09572d8f502a3 SHA512 9e1aa591cad361b6a0e54d5b60ad6d638263aafbb87293c94b29186e0995515e5eca8c41a0ec52ec355f5d4557543d1e3476426b238686765dc70e7ffd8e707b
 EBUILD rsyslog-8.2410.0-r3.ebuild 13637 BLAKE2B 3af511308d9d2e4f33f4817404f4567aa736c242a48fc78a5afacc3cbb69957000cadb6b0a6bfc09988d3b69013014f608358ab146c3cae48c7d476a1e87fed1 SHA512 2046b68a3ca403504cf906cb90057030d204ddcdeabe2b4e081126269188051957021180621ad7400f4e93061a987d711d1862d7c9c728d293a68007d1476c0b
 EBUILD rsyslog-8.2412.0.ebuild 13640 BLAKE2B 26dca8467a7df648bad4fe6528d188eb725b2af602c7b5e2fdc592966337dbfbbf8d124ce5159f6d58c26a9dbf47bbe106ee0308222263d54d8e3203e2cf8a2d SHA512 69c621fd8c5577fbb96bd3830d233c8e7951107ec3d977bf8e62e4f91729d5c101cf8d53f1460f0c4d44cceda987183e47c93210fb44893b383740b95de48fae
+EBUILD rsyslog-8.2502.0.ebuild 13647 BLAKE2B e969253cf6a7ac65ae38bbe5ba46cbf401a34484461ff4cbcf842c1613493bb07251616983515f0a22893d8b0dcc17aede0e0de08fe65ae2248692f99457fb93 SHA512 3e6f766507bffe6b729bed88508ebaa669654f75e46f96a1f76dd7c18f06e59d17b5446d0e602671a6139fee1e5b547ddc3a64b67bcbf4e7bb25c141f878d723
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2404.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0-r2.ebuild
deleted file mode 100644
index a86256e4647f..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2404.0-r2.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# 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 ~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
-	)
-
-	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/empty/dev
-	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-r1.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/rsyslog/rsyslog-8.2408.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2408.0-r1.ebuild
deleted file mode 100644
index ecd6a15b5608..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2408.0-r1.ebuild
+++ /dev/null
@@ -1,509 +0,0 @@
-# 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 ~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/rsyslog/rsyslog-8.2406.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2502.0.ebuild
index ecd6a15b5608..42a9710ebb3e 100644
--- a/app-admin/rsyslog/rsyslog-8.2406.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2502.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
-inherit autotools linux-info python-any-r1 systemd
+inherit autotools flag-o-matic 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
+if [[ "${PV}" == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
 	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
 
@@ -43,15 +43,16 @@ REQUIRED_USE="
 	ssl? ( || ( gnutls openssl ) )
 "
 
-BDEPEND=">=dev-build/autoconf-archive-2015.02.24
+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
@@ -102,8 +103,8 @@ RDEPEND="
 	xxhash? ( dev-libs/xxhash:= )
 	zeromq? (
 		>=net-libs/czmq-4:=[drafts]
-	)"
-
+	)
+"
 DEPEND="
 	${RDEPEND}
 	elibc_musl? ( sys-libs/queue-standalone )
@@ -119,7 +120,9 @@ 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" )
+PATCHES=(
+	"${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch"
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -169,20 +172,25 @@ src_prepare() {
 		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"
+	local -a bad_tests=(
+		omfwd-lb-1target-retry-1_byte_buf-TargetFail
+		omprog-close-unresponsive
+		omprog-restart-terminated
+		omprog-restart-terminated-outfile
+		uxsock_simple
+	)
+	local bad_test=""
+	for bad_test in "${bad_tests[@]}" ; do
+		sed -i -e '\|^#!/bin/bash$|a exit 0' tests/${bad_test}*.sh || die
+	done
 
 	eautoreconf
 }
 
 src_configure() {
+	# https://github.com/rsyslog/rsyslog/issues/5507 (bug #943899)
+	append-cflags -std=gnu17
+
 	# Maintainer notes:
 	# * Guardtime support is missing because libgt isn't yet available
 	#   in portage.
@@ -256,11 +264,16 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable debug diagtools)
 		$(use_enable debug valgrind)
+		# Transport security
+		$(use_enable openssl imdtls)
+		$(use_enable openssl omdtls)
+		$(use_enable openssl)
 		# Misc
 		$(use_enable clickhouse)
 		$(use_enable curl fmhttp)
 		$(use_enable elasticsearch)
 		$(use_enable gcrypt libgcrypt)
+		$(use_enable gnutls)
 		$(use_enable imhttp)
 		$(use_enable impcap)
 		$(use_enable jemalloc)
@@ -268,8 +281,8 @@ src_configure() {
 		$(use_enable kafka omkafka)
 		$(use_enable kerberos gssapi-krb5)
 		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
+		$(use_enable normalize mmnormalize)
 		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
@@ -277,10 +290,8 @@ src_configure() {
 		$(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 snmp)
 		$(use_enable systemd imjournal)
 		$(use_enable systemd omjournal)
 		$(use_enable usertools)