gentoo auto-resync : 06:02:2024 - 05:42:43

4 files changed, 25 insertions, 380 deletions

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 0e12d830fa7f..a8878daf850d 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -8,16 +8,13 @@ AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530
 AUX syslog-ng.logrotate.hardened.in 1662 BLAKE2B 488ab7e26b081267bdeecd91013ce5118e79dca89567789be9b85f8712a0f8f11005c2459eb334ab5bdfab08c780063e7025a242330367f710717a79352e0d96 SHA512 1c19837570da6c77d49252303abe0ac91280c500bd82c1eab45c4c1534b83d758782dd576b12006bdd738508892d4b898ba29c0969aba536b333ab9b99e6bd83
 AUX syslog-ng.logrotate.in 237 BLAKE2B dd2851749f3f56b2099442610fcd85cbfd50a52a8c1ae60726b312ea845f3f0b20e436a4e11a377b9faecb1fa3f0febc008ae262e56018775b82d923ba5f2340 SHA512 4e59f8537579caa249ebe12c53946266633972ac6805b7ccd684a5749deeb897783a4e74570ceec15311edb3531aa4278bba468058227ab4c664a697cc604376
 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df
-DIST syslog-ng-4.0.1.tar.gz 5452824 BLAKE2B a5c0328f3c88a38dbc07bb7af2a74c0037a6679525a29fca58620a8ef6b05ec13f3942d26767aded0049376ed30ce6a525686501914648a509997c5de2b48eb4 SHA512 5f83ee3cc4935218feb19f3f5065a68099e3ee291d806ad8810499ded9f9ef3b326b4b22841cd736354ed6a2ebc1ce8ae73f6abe981aa6f64c42da9ee3b1e22f
-DIST syslog-ng-4.1.1.tar.gz 5556174 BLAKE2B 3e1a9c394b8a88cc7b39a026950760cbc7796d67b62bb3c0f2970fd80c296e9bd75d1057fe81a0d22ac8488789d13607f19abc6aa38b3a38a30ff450ee66e3a0 SHA512 89abb7a53570b6f7c0dc76905c97d207447117f1db1aa0c0da97c17366ea833b6404f9c7fc318436fd01be2bab032eccca9712063a7c683780026e7e52493dc8
 DIST syslog-ng-4.2.0.tar.gz 5763000 BLAKE2B 7dfa6a1aff896072cc742c6dba5dc1680955e06ce4400fde5b0ddecedd984c039a687f35286685d66e7a5580c7da94f00a14b10f6eb8c162233683bf170e37fb SHA512 85442b57b7934e8afbb4e7d8285ed1fd16aaad2a8d853e3765db4f885d88bee4910a3b5d271f1cbd100c2d3a3f81f1a4fe845bc948fe68c22d32bc9b730af04b
 DIST syslog-ng-4.3.1.tar.gz 6091641 BLAKE2B 7cd6b9831d7ad917ee3c7048d3944e9c9f8a100a51a08e4a9e93b117b7ed3725f91097c2e6e9a377c33ab28d92cdb1b3e6ac301d3cf75d84552dcd93e0fe7aa8 SHA512 571f6080765983326ee912f2a7e87cdc8527296ef555a0b16589c04ed332c0db58e24c70251dc39b1c79151ca7d463e6409835df99aa45c19734d7003a69ce61
 DIST syslog-ng-4.4.0.tar.gz 6208437 BLAKE2B 4d719c980f40437661014aa607b01952039694cc1a7e3173efdf1ae682af0e5956098f23009bbbba941c12e26fef515fba0664b170810e654f82f4ae2ac2afc8 SHA512 1cf18c43321e523d0f49b25a4839fd10ec301b207da1b2c407df5167dba557ac0a7781b07f1c1e5d18241376966b8099d9e41dffa55030f6a8052388139c4107
-EBUILD syslog-ng-4.0.1.ebuild 5117 BLAKE2B 81d204acf8d9e293c945e5db1b5244b255747a6f0dd39f7d1d1aaaa5d5ec16a9b83f98f5551ec09a7baa6c02fc7332120712a56d9467dd4207bc780c05ae3dc3 SHA512 58ed1e0486007250d99f5acf18179bae63458a47e36c3cd38b554e80f053407db823660bdbcebf4a2637425a64f18fdfd0fdca679690836fa21d80b17c63899c
-EBUILD syslog-ng-4.1.1-r1.ebuild 5202 BLAKE2B a2aea3b6b5c4a10ebb8025ad156f9dfb9e164c3b497450a481cdac5cb60b4aeafb108bf3acc1250cc5918eb046c527cfb4b1648d3cc1624b8605d46b86c77081 SHA512 2dd12b4e17a476b19eb2f204db9b07eca607f45894f082617375b3f602ba0c8915588c6a0a14391ca3045bed2e9af3544f1848345a148c861fe5c9fa5711562b
-EBUILD syslog-ng-4.1.1-r2.ebuild 5211 BLAKE2B e8b037e00114ecfc1121e32716aa7450385df7b9721f8ed359e695450af3c65f80737fc055a6f840017963b1f8987b3288ddcb5af077bc02ecdde1a7ef0c75df SHA512 b51ad273bb05d4fcef24baf220139ed0f24040bb507c7db698c3dccc3b1024228e96adf24cab5aa73b41bde3a12c5dc4eb35e7ef13103077083d0119b4a0acac
+DIST syslog-ng-4.6.0.tar.gz 6671746 BLAKE2B 44efa3efa4e65744318a314adbefc11e7faa68876bca7be7d053262d8effecb80ecd1efc21af653db8e8f2c16496b5a64ea245a8adaa16e845954a13dedfd5c5 SHA512 7c4fbf1ac5377240afa7a1db8d72772399d2c62657fffc3c59e82b2dea6f12031f02320c4f567f981311bd1d8bbfd98962aeb59720ca857867a51b6bf83afb4b
 EBUILD syslog-ng-4.2.0.ebuild 5232 BLAKE2B e4be494ccff26536097e959fdfd152702195e7a6f13c5e27446fe4c5887bd0dbe16e16398cc34cbf8d36755641a70347c8a3ddf3793fc252e1fd4f7028ac088e SHA512 9bfb872a459cc2ba47d6dcd2789125ed4d2b0ddb4120ccd9a2bdcbd89e7568ebaa3a87ca748d626e16e2aa376ea8f20316f7a55a01a25421f135daa00443fe4c
 EBUILD syslog-ng-4.3.1-r1.ebuild 5211 BLAKE2B 9ff2cf23a2f077ec5c8a2bd0f80774d48dbba4d00f2bf4a7c07a29f827dfea22868c9a0c82f5aebfb8a37267b98d82b44bfa45075c4f364f1b887f4ebb281662 SHA512 fdcd181d5cca4d502cce674f4eb7ccd476589f5d3d28c7f87aa296b04c169a20616b59f510640bd735100dc89f5628e6eb0cc766041177da4341f3fbf9be6f4a
 EBUILD syslog-ng-4.4.0-r1.ebuild 5209 BLAKE2B 0c175a7afb19a271b13ab69c91e53359b7ca8a64430ce194f9d322d68ecd4d48ea42fbfc0f02dffead2fc99b9f198f0250822ba0bf9a7b0016d50811da3c819a SHA512 f411d7132a1882870e1887767e2dd298c908b40c5b785293380b085e97aafe11175e55ef864d06c077152d2d5197c773fbf800336f06f8946057372726cb7e91
 EBUILD syslog-ng-4.4.0-r2.ebuild 5313 BLAKE2B efdf8d5fdd7c4bb87b00515c7982ac21d7050a0b468e71032f0073580eca196ce84cd7c5a9aefac179ad4ca37cbb88b8bbe6e12ca11bd738a86c28b9add81d32 SHA512 81bc309312d5b9a5264cba2333af6e287f7d47b01f83fe637e1f76274f727214d38e99b1c1e4ef9b08c22bf7ead85ab883475c89003a58c6da568603c0f73835
+EBUILD syslog-ng-4.6.0.ebuild 5315 BLAKE2B f067b33d45e9fc09fb7ce761bd4c1e367c6b304b397fdeccce6f22083a2c50583377dae6906c48598bdcb71ad6290beff74727113c967666bacf98a5d29bc830 SHA512 f9ee9f41cb54f974767561e85f11e6e75eb3ceb33483cb45db528550fe69ad31ae980f34d096103eeaae80a23e96ade42eb4ed8856f3f0b1cd79e1c9cfd65e3e
 MISC metadata.xml 1390 BLAKE2B 24e690acd76a0b95ecab14a1d2a651e098a588aa3279762f955fa132460417a74404cca6b8fcac20c63d2330f20e78e791b32c8093d56a6c30f8f112ebea3e3e SHA512 5d39799ba1b867f94bd74aba743ae79c511d3258e13156f869c5bdf1a5aa2c0780cfaba9f5e3e995a710a26b2ceaa3e80859d58eebdc35692d8a7f82ecb08fe9
diff --git a/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild b/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild
deleted file mode 100644
index 4ba1fa54003f..000000000000
--- a/app-admin/syslog-ng/syslog-ng-4.0.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( python )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.42.4
-	>=dev-libs/libpcre-6.1:=
-	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip2? ( dev-libs/libmaxminddb:= )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp:= )
-	snmp? ( net-analyzer/net-snmp:0= )
-	spoof-source? ( net-libs/libnet:1.1= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	test? ( dev-libs/criterion )"
-BDEPEND="
-	>=sys-devel/bison-3.7.6
-	app-alternatives/lex
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	# disable python-modules test as it requires additional python modules not
-	# packaged in Gentoo
-	sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
-	fi
-
-	# drop scl modules requiring http
-	if use !http; then
-		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
-		sed \
-			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
-				"/etc/init.d/syslog-ng reload")#g" \
-			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	for f in syslog-ng.conf.gentoo.hardened.in \
-			syslog-ng.conf.gentoo.in; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-docs
-		--disable-java
-		--disable-java-modules
-		--disable-riemann
-		--enable-manpages
-		--localstatedir=/var/lib/syslog-ng
-		--sysconfdir=/etc/syslog-ng
-		--with-embedded-crypto
-		--with-ivykis=system
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng
-		--with-pidfile-dir=/var/run
-		--with-python-packages=none
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
-		$(use_enable caps linux-caps)
-		$(use_enable dbi sql)
-		$(use_enable geoip2)
-		$(use_enable http)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_enable kafka)
-		$(use_enable mongodb)
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
-		$(use_enable pacct)
-		$(use_enable python)
-		$(use_enable redis)
-		$(use_enable smtp)
-		$(use_enable snmp afsnmp)
-		$(use_enable spoof-source)
-		$(use_enable systemd)
-		$(use_enable tcpd tcp-wrapper)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	find "${D}" -name '*.la' -delete || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-	fi
-
-	if use systemd; then
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild
deleted file mode 100644
index e92f8f960cff..000000000000
--- a/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( python )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.42.4
-	>=dev-libs/libpcre-6.1:=
-	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip2? ( dev-libs/libmaxminddb:= )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp:= )
-	snmp? ( net-analyzer/net-snmp:0= )
-	spoof-source? ( net-libs/libnet:1.1= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	test? ( dev-libs/criterion )"
-BDEPEND="
-	>=sys-devel/bison-3.7.6
-	app-alternatives/lex
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	# disable python-modules test as it requires additional python modules not
-	# packaged in Gentoo
-	sed -i '/MAKE/s/.*/exit 0/g' modules/python-modules/test_pymodules.sh || die
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
-	fi
-
-	# drop scl modules requiring http
-	if use !http; then
-		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
-		sed \
-			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
-				"/etc/init.d/syslog-ng reload")#g" \
-			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	for f in syslog-ng.conf.gentoo.hardened.in \
-			syslog-ng.conf.gentoo.in; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-docs
-		--disable-java
-		--disable-java-modules
-		--disable-riemann
-		--enable-manpages
-		--localstatedir=/var/lib/syslog-ng
-		--sysconfdir=/etc/syslog-ng
-		--with-embedded-crypto
-		--with-ivykis=system
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng
-		--with-pidfile-dir=/var/run
-		--with-python-packages=none
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
-		$(use_enable caps linux-caps)
-		$(use_enable dbi sql)
-		$(use_enable geoip2)
-		$(use_enable http)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_enable kafka)
-		$(use_enable mongodb)
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
-		$(use_enable pacct)
-		$(use_enable python)
-		$(use_enable redis)
-		$(use_enable smtp)
-		$(use_enable snmp afsnmp)
-		$(use_enable spoof-source)
-		$(use_enable systemd)
-		$(use_enable tcpd tcp-wrapper)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	find "${D}" -name '*.la' -delete || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-	fi
-
-	if use systemd; then
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild
index 48fa3d466610..29c8bf7440b7 100644
--- a/app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild
@@ -3,18 +3,17 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools python-single-r1 systemd
 
-MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
 HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
 RESTRICT="!test? ( test )"
@@ -22,12 +21,17 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.10.1:2
 	>=dev-libs/ivykis-0.42.4
-	>=dev-libs/libpcre-6.1:=
+	>=dev-libs/libpcre2-10.0
+	dev-libs/openssl:0=
 	!dev-libs/eventlog
 	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
 	caps? ( sys-libs/libcap )
 	dbi? ( >=dev-db/libdbi-0.9.0 )
 	geoip2? ( dev-libs/libmaxminddb:= )
+	grpc? (
+		dev-libs/protobuf:=
+		net-libs/grpc:=
+	)
 	http? ( net-misc/curl )
 	json? ( >=dev-libs/json-c-0.9:= )
 	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
@@ -41,16 +45,16 @@ RDEPEND="
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
 	smtp? ( net-libs/libesmtp:= )
 	snmp? ( net-analyzer/net-snmp:0= )
-	spoof-source? ( net-libs/libnet:1.1= )
+	spoof-source? ( net-libs/libnet:1.1 )
 	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	dev-libs/openssl:0="
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/criterion )"
 BDEPEND="
 	>=sys-devel/bison-3.7.6
-	app-alternatives/lex
-	virtual/pkgconfig"
+	sys-devel/flex
+	virtual/pkgconfig
+	grpc? ( dev-libs/protobuf:= )"
 
 DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
@@ -100,7 +104,7 @@ src_prepare() {
 
 	for f in syslog-ng.conf.gentoo.hardened.in-r1 \
 			syslog-ng.conf.gentoo.in-r1; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die
+		sed -e "s/@SYSLOGNG_VERSION@/$(ver_cut 1-2)/g" "${FILESDIR}/${f}" > "${T}/${f/.in-r1/}" || die
 	done
 
 	default
@@ -108,11 +112,15 @@ src_prepare() {
 }
 
 src_configure() {
+	# Needs bison/flex.
+	unset YACC LEX
+
 	local myconf=(
 		--disable-docs
 		--disable-java
 		--disable-java-modules
 		--disable-riemann
+		--enable-ipv6
 		--enable-manpages
 		--localstatedir=/var/lib/syslog-ng
 		--sysconfdir=/etc/syslog-ng
@@ -123,12 +131,13 @@ src_configure() {
 		--with-python-packages=none
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_with amqp librabbitmq-client system)
 		$(use_enable caps linux-caps)
 		$(use_enable dbi sql)
 		$(use_enable geoip2)
+		$(use_enable grpc)
+		$(use_enable grpc cpp)
 		$(use_enable http)
-		$(use_enable ipv6)
 		$(use_enable json)
 		$(use_enable kafka)
 		$(use_enable mongodb)
@@ -171,7 +180,7 @@ pkg_postinst() {
 	# bug #355257
 	if ! has_version app-admin/logrotate ; then
 		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
 		elog "for logrotate to use."
 	fi