gentoo auto-resync : 14:09:2024 - 12:32:27next

16 files changed, 12 insertions, 498 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 7620bb5fd6d3..46674f59c5cc 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 98cdc862f5b3..1f6874c2b546 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,14 +1,4 @@
-AUX ipv6calc-2.2.0-gcc-10.patch 942 BLAKE2B 2732dca8ac3e593fb51bcc09777278044b6b37fe55007963728483595bfe93eb297ca95e9f79ba01755ed377bebb85cc3475c7289a4ca765d0a2301646d7de88 SHA512 ffef37d1944ed07ba6c4645f160e041c0423f4c5affeeb75f973386e658edb3cf8d5cd34d8462c63850c4ffdb6ad54bef782261925f7dde4f8a0d42fb3f09003
 AUX ipv6calc-4.0.1-underlinking.patch 3192 BLAKE2B 033b639239598b85e10ec3e1651f976c5ee6957be8abcf6df12c69bcd8d41ac9003097cd52e5f65da03ef160291a0376cc430fd8e4c005ca87b44ce198618689 SHA512 0fbf8994c51105d25159da1bf563a134e74639eefde8d5cccd2451a93f64133e1d31b49187e5b17479c68ddb14c393ccaee799739dc92d70bfd269a71ecf3441
-DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2f745213059ed2b0f36d7a9049a7a659d0419e6f684661247c7714d3e9886fe0a6782f5dd35895c46f2583310dcd SHA512 6e9acde56e245ffae0903305659881eb763524336da285d5048b655728c7d7b031ae7b4190f01f663e3d7134defbb8987c8f47ddd75bf8c8368ec1b918ee42e3
-DIST ipv6calc-3.1.1.tar.gz 1634300 BLAKE2B 941df0c0d649cf5879e1abfde1e4c0f41fcdbe4cb945552df42b9a39ec317dda7e25c85711f103e024bc3774e46f52d3754e6e0b004b098baeac3d863d3ec38e SHA512 0cf726fec47a592168bb0715dd96c16033fe85e1c462530ef6898236cf89199fede81a9ffc78b3210c9e007da03279c7d45aa00a7a9a7f00f5f9bc82b7cc1695
-DIST ipv6calc-3.2.0.tar.gz 1645414 BLAKE2B b74406a867b03e22244c1890133ce9553c40b5a737bd1711783e94b7f3afc43cfcff26e12583552a4c0fcc9ecd51174fb20844bddac22732d08e995de9e0f5ef SHA512 f7cd3d8820acd06c016e6f439129516d61300ba1660fe3acfec319f4dbd73de77f0a339bef31fd42bb0a4ab2e68d0e4771b1526f3217d3504cb4605d7b9b0195
-DIST ipv6calc-4.0.0.tar.gz 1682616 BLAKE2B 5a26f6c4c8a9a2ea49c8762690c18e523ebde370817e71ae56f1cda211324695f046e85bba56f0b19e17869d72adb0ee8739fdbd4e8c4503d4a286107212eda4 SHA512 939dfcbe68c6e110acfe23f6f221471bda03ad165f5785bbc9aabd03b3192ab3cdb99df458db79edfa3c3d2f3202f1f2f189b7a9fd9a5ae27a7084de2fbd907d
 DIST ipv6calc-4.0.1.tar.gz 1705407 BLAKE2B 599573570df946f3362e213e481b8016b037de6263ed53aa61fd39b69810b2cf05a9c76408904bac4b076a4061091be8adbd6d5648a1f5bdc5d021ebd5123acb SHA512 6e60f4808b2622235ea9c43c99868798e7014fbee7dc51349cfe2ba28badcc767d45f9e30dc14d3b78c4a88ef2ff80083b4b0be64e93ed17b17817995364b3ce
-EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed1a4c77d002e8f44d1984641b68cbbc4976b994659b4d6320de7afc244ad3e6a817550b341c3e12a73ab6abcf52 SHA512 a094719eee65deee5e3067fa2c348dfcaa2f7544191f292c94db7b75baaed2932422683bbd8a3b0d73f9bd27f444c226496d396f2b55e735da75e59cf74defd3
-EBUILD ipv6calc-3.1.1.ebuild 1531 BLAKE2B 6ec62ec4b7b14c5ac33672c35b2699f02d1c0d07e71c3718cbfdeb3b5c577bd8897c2803239c600edaa580c8b472bf932855b63c3af607de16fd7edb446a90dd SHA512 85189a0d6df24ae0c09369ea7a0a1fb567c77bee782443f633fff509fc874101fed583cb0991c59e55c4e5138449ba30874134a3ededb64264c60ad914e3809d
-EBUILD ipv6calc-3.2.0.ebuild 1535 BLAKE2B ba17e83c53f680a204cbc5467fa30323c07c5c009ebd33b7a820b70b371beab6359ced1f5f5ddc390ea09fba8896205d82d8dcefa96e4b800be78c3e78cfc18a SHA512 d6a0445fb3ef4eca4e0c57312f34d1d94289f7feb6d79d10e4589845b57f7d18401c91555f76757d76e0d970f902df3e907f65e6ee11dfc54fa9e605e4c8c42c
-EBUILD ipv6calc-4.0.0.ebuild 1613 BLAKE2B b6257c007601fe976a9ac89ea80d282b0425139490e6e3f426b0942a90a9e5c80e61017976ee6e97e2fbd5abb92a08b3be6d0966d04e01b949c5cf74f0bbfbe8 SHA512 302fbdce9435dbf1042d1561ef03738ed3b9a870280679e182c5308df99c13898825f7c83add111587551afe534e7e8f9431509b21a66314e2bd571c4cd59292
 EBUILD ipv6calc-4.0.1-r1.ebuild 1706 BLAKE2B 29569abb346336cde0695dade7d523133d74a8c0709d9312d804b0413a1fc463792461aa783b7e5b7d333a382baf5e1ab6633a413df4c26fa4eb9d6d03d52b9d SHA512 8ec686951e09e5604fce5450550c32791083b875994fad30b688ecdb7f9580dff16356582076788125c729da89e22e764622e83bc55c0a41783d2118ddd0f198
-EBUILD ipv6calc-4.0.1.ebuild 1651 BLAKE2B 5ba62fe0ff17a6fefb84c9e2b37251b9fd76a75a1cd42a9a5bd74223b1bdb641600a7ef2de11a440b0a219fd21a172e8fa8eb29224e99eeddedd81848cc4d696 SHA512 d850a4ee003e032c5b55d504c8ea155b10d1b76a2186e20b1c114295f3194578f9aa9fa1884e229971e1cf655c4b244575983e800650e2adb542cd9a4919fdd2
 MISC metadata.xml 250 BLAKE2B fb90e15ac18c8cd0f94506947ebd334e09b4ce8a83a2aa9ec16486b42f4b4458d42739993881bcaba9e4398dd70f3547c5eb1e3fbabdc786e69b7fa0e5522399 SHA512 b147ffef3b698ce8823a88bdedbde5ff96c71941874380fad7b9bda7f87b408218d5193e0a4bd61d87d2edfdf9af023db26f84d60cf7442b714fc538dba7f91b
diff --git a/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch b/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch
deleted file mode 100644
index 4639fa7406f1..000000000000
--- a/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/708056
-
-From 8c7eea58f2034113ae91ff7adc2bda72465b7d1a Mon Sep 17 00:00:00 2001
-From: Peter Bieringer <pb@bieringer.de>
-Date: Fri, 24 Jan 2020 07:15:55 +0100
-Subject: [PATCH] ipv6logconv/ipv6logconv.{h,c}: fix multiple definition of
- 'cache_lru_limit'
-
---- a/ipv6logconv/ipv6logconv.c
-+++ b/ipv6logconv/ipv6logconv.c
-@@ -58,7 +58,7 @@ static void lineparser(const long int outputtype);
- /* LRU cache */
- 
- #define CACHE_LRU_SIZE 200
--
-+int cache_lru_limit;
- static int      cache_lru_max = 0;
- static int      cache_lru_last = 0;
- static char     cache_lru_key_token[CACHE_LRU_SIZE][NI_MAXHOST];
---- a/ipv6logconv/ipv6logconv.h
-+++ b/ipv6logconv/ipv6logconv.h
-@@ -20,8 +20,7 @@
- #define DEBUG_ipv6logconv_general      0x00000001l
- #define DEBUG_ipv6logconv_processing   0x00000002l
- 
--/* prototyping */
--int cache_lru_limit;
-+extern int cache_lru_limit;
- 
- extern int feature_reg;
- extern int feature_ieee;
--- 
-2.27.0
-
diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
deleted file mode 100644
index 498fe326ea83..000000000000
--- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-dbip2 \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	emake distclean
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
deleted file mode 100644
index 811fa957aae5..000000000000
--- a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-dbip2 \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	emake distclean
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild
deleted file mode 100644
index 42eca99cbb18..000000000000
--- a/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-dbip2 \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	emake distclean
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild
deleted file mode 100644
index 3aa11efa4dd8..000000000000
--- a/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cgi geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	cgi? (
-		dev-perl/URI
-		dev-perl/Digest-SHA1
-	)
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	local myeconfargs=(
-		--disable-bundled-getopt
-		--disable-bundled-md5
-		--enable-shared
-		--enable-dynamic-load
-		--enable-db-ieee
-		--enable-db-ipv4
-		--enable-db-ipv6
-		--disable-dbip
-		--disable-dbip2
-		--disable-external
-		--disable-ip2location
-		--enable-openssl-evp-md5
-		--enable-openssl-md5
-		$(use_enable geoip)
-		$(use_enable cgi mod_ipv6calc )
-	)
-
-	if use geoip; then
-		myeconfargs+=( "--with-geoip-db=${EPREFIX}/usr/share/GeoIP" )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake distclean
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
deleted file mode 100644
index 084598853945..000000000000
--- a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cgi geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	cgi? (
-		dev-perl/URI
-		dev-perl/Digest-SHA1
-	)
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	local myeconfargs=(
-		--disable-compiler-warning-to-error
-		--disable-bundled-getopt
-		--disable-bundled-md5
-		--enable-shared
-		--enable-dynamic-load
-		--enable-db-ieee
-		--enable-db-ipv4
-		--enable-db-ipv6
-		--disable-dbip
-		--disable-dbip2
-		--disable-external
-		--disable-ip2location
-		--enable-openssl-evp-md5
-		--enable-openssl-md5
-		$(use_enable geoip)
-		$(use_enable cgi mod_ipv6calc )
-	)
-
-	if use geoip; then
-		myeconfargs+=( "--with-geoip-db=${EPREFIX}/usr/share/GeoIP" )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake distclean
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index 3ddc7886f6cb..a5db760643c6 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,8 +1,4 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
-DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131
-DIST mrouted-4.4.tar.gz 316949 BLAKE2B c768f78588ef5a321b33a6444627db0eae36dfd1798f58672392729e0ce45392fbcaad074e55eccef43dcda5d29cfee24f30aa85eded130ad8d1a6a006e62411 SHA512 cadd4cb15674c04bd976daad36ac38ec93eb9d6d0e2888cb7b4b73d2802f58beb11c122de34c1c5214a58f74dc832f35bff0820265370f4636036813ff283c09
 DIST mrouted-4.5.tar.gz 322493 BLAKE2B 1c4702d41f7bb9b6bd39cf718f28714555987b5837a858c6bb7697ad85f7a8b090bcee87d6997eecce728f3f645ac6ed41edd6bcd762b07ef92c52551ea11fba SHA512 145decbd1fba826196f719a7712bb9568080b2b5757eb80f79185537cd045ca1def36e34e93804ecaaa815607f43b58fc768b307098d90ac808ed5717a0c58d7
-EBUILD mrouted-4.2.ebuild 745 BLAKE2B 17a9ff78fb2924f4f2a9551629ac9d1a963b814f34f2c1230f155c3e3c46af83a51f1c8fa51348c9a7b0b9cc3dec9612cba09f5f3029ec42c919db3294fe80e7 SHA512 c06c2a46cb37c7a382b3400ebd609026cde29a3643bbd4e3a0d464057ca37ab23fab7bccab383a39586b906865fb175be062f328d799e332e5b59698ebf020f8
-EBUILD mrouted-4.4.ebuild 800 BLAKE2B af8d86d770fa747ba7166300bee1bcca9975037faa0745a7325499c7008e23473e56bf941c53573b499ded828ac17d6f8a6598e411f6a9166ea42830c19f41a3 SHA512 4a05d2c8691ceca556c5bf498d69a5ec36d9dc61822b42cb66bbe4e030adadac57d850fc8b652bdf9d16560f7867b840a7500589f77d5387e0c429c682bfb739
-EBUILD mrouted-4.5.ebuild 803 BLAKE2B fb1f15d2189334808696d44944c05ebd76f53ca608066036a2277a2e6b3b42d9e9ae23e9e003b41e7506bacdb17595bd7f6cca478056fa974b91cee30f39771a SHA512 4460712efbd662913f9979d4910136135f6257a33c7faf4f83ffb490cefb9ed785f7e8753ad044b6075693f2a70b86dc28ac89a1b492bf2d4fa6007ea3d1cfc5
-MISC metadata.xml 351 BLAKE2B 2cc58048ba632fa6ae2147b949a5ac8441b4e10c5cab17527369a1100a5d95cca3746d82c43a7d99b564f07ed68cd95114aa5a13bfd73b07befd1203a423cb3b SHA512 1ccf9c0699efed649eff70b1b2eaf588b9bad3838c1530609e8bb912ace18bd21f35571f7d731727e886cbd7027aae5b234cf3e4959da5d81991724679a815d0
+EBUILD mrouted-4.5.ebuild 767 BLAKE2B c5e61d3a803246edb441e41b9dee0749d06c7d101b92a61825b8f8f22fc85b23f94a720bef062ec88930fe3677c41da2dcb64b625977e17cef2a94dd07492b04 SHA512 bc09a5be81651d860448cc55d7464220ae5607655b6ee046e21cd4891c83a1fa54f2ae28a5b6ecf4f9ff90680d63cc1cd583c51aa4b48531dd4499cda3c7b42a
+MISC metadata.xml 250 BLAKE2B 513b71a6819852781d10412d9540d69e161922f952fad8121e75b2303d5621eea795fac8261a3236306a32c5cb5eab946e4bc0dc0e48db71108f0c23e713f701 SHA512 5a22e0bc38c2b87c3dc4c911240b1938b3cd8e11663b3bd31b94b0202ecd3ee0dd9ee3f6fc7e4f3fc3f8a1f3608fe693c4fe0d74a2a8d6c5aa88009e701c29df
diff --git a/net-misc/mrouted/metadata.xml b/net-misc/mrouted/metadata.xml
index 49e44a47135d..cae4749bf1c9 100644
--- a/net-misc/mrouted/metadata.xml
+++ b/net-misc/mrouted/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="rsrr">Enable Routing Support for Resource Reservations, for RSVP</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">troglobit/mrouted</remote-id>
 	</upstream>
diff --git a/net-misc/mrouted/mrouted-4.2.ebuild b/net-misc/mrouted/mrouted-4.2.ebuild
deleted file mode 100644
index 06524f6c9e2a..000000000000
--- a/net-misc/mrouted/mrouted-4.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs systemd
-
-DESCRIPTION="IP multicast routing daemon"
-HOMEPAGE="https://troglobit.com/projects/mrouted/"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
-LICENSE="Stanford GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="rsrr"
-
-BDEPEND="
-	|| ( dev-util/yacc app-alternatives/yacc )
-	virtual/pkgconfig
-"
-
-src_configure() {
-	tc-export CC CXX
-	econf $(usex rsrr --enable-rsrr '')
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins mrouted.conf
-
-	newinitd "${FILESDIR}"/mrouted.rc mrouted
-	systemd_dounit mrouted.service
-}
diff --git a/net-misc/mrouted/mrouted-4.4.ebuild b/net-misc/mrouted/mrouted-4.4.ebuild
deleted file mode 100644
index a791712320b0..000000000000
--- a/net-misc/mrouted/mrouted-4.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs systemd
-
-DESCRIPTION="IP multicast routing daemon"
-HOMEPAGE="https://troglobit.com/projects/mrouted/"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Stanford GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="rsrr test"
-
-# Needs unshare
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="virtual/pkgconfig
-	app-alternatives/yacc"
-
-src_configure() {
-	tc-export CC CXX
-
-	econf \
-		$(usev rsrr --enable-rsrr) \
-		$(use_enable test)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins mrouted.conf
-
-	newinitd "${FILESDIR}"/mrouted.rc mrouted
-	systemd_dounit mrouted.service
-}
diff --git a/net-misc/mrouted/mrouted-4.5.ebuild b/net-misc/mrouted/mrouted-4.5.ebuild
index 82e719972457..dd6d1e4f2e8b 100644
--- a/net-misc/mrouted/mrouted-4.5.ebuild
+++ b/net-misc/mrouted/mrouted-4.5.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="Stanford GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="rsrr test"
+IUSE="test"
 
 # Needs unshare
 RESTRICT="!test? ( test ) test"
@@ -26,7 +26,6 @@ src_configure() {
 	tc-export CC CXX
 
 	econf \
-		$(usev rsrr --enable-rsrr) \
 		$(use_enable test)
 }
 
diff --git a/net-misc/redir/Manifest b/net-misc/redir/Manifest
index 195e14bc05b7..16b06b67232f 100644
--- a/net-misc/redir/Manifest
+++ b/net-misc/redir/Manifest
@@ -1,5 +1,4 @@
-DIST redir-3.2.tar.xz 84240 BLAKE2B d1b48a14ea83cdcd58b7b2449e340e5cc110e212f17ec2f56cb8a914bc2c880d009d102dcb2cb1ee723ec4e3ceb48cd396731863fdc9ae864fe4fbf15ed90eec SHA512 b379047e94f377847b15c4e4c94fa34be996fbf6b26a83670061d705791902b184e89270887a967b2aed993f9ca46c3d0a41cde6b162ff9b32dbb689c1384c6f
 DIST redir-3.3.tar.xz 84980 BLAKE2B 3275e8315dbcd4666adc5064af80848f3c41378c46880ef825bae4d5a6d5a4246b959596a6810f5484db033d3f27a1b1860e40c250b29c75defa600cdf48a5d1 SHA512 89d9b45bc62538751cc0d8baf8dc3dc5ed84888faf18125c4044bb813ca415607b4906e9f5ccd60484eb737ad44d5c3bd22458444dee58d6e3be31446a71c3f3
-EBUILD redir-3.2.ebuild 406 BLAKE2B f56fd6a4978b60bdee782f132345c2d1968a12edf922e88053341f2c9066887214b849b95f1341c9fcfe0aba2562c9e639d31a4cb7bfff43b66928bdab827152 SHA512 7b5e7f4a20b890d2ed80b4e74ff9ad099ca428b1b5f3a0edce1f579768cdb023e060553462c50a7171bbc63f366417e2cd0b2f9e7de41b95dab02d2359d58119
+EBUILD redir-3.3-r1.ebuild 405 BLAKE2B 6a5712899cb083b0542113b042336c8fcd6be5eaa5d30a256cc00db4c7f70694645d4f8e84668722b9b005967618d5c36aac8b3cea9d711194d8d9c4c7eda221 SHA512 fa891c43dc965d0345a6245e3faf438f7d58171fff8277c5326d3491cc201eafc5fdddcfed38d4bdbcf7891214a21160a41edfe450a4c2f7f4b1f004c226e476
 EBUILD redir-3.3.ebuild 403 BLAKE2B cfc0509da5ba427e91c6f7638fde6a39de552f472822707bf4508a4420c48b780925c728947754d4c55b1ddcbb57b0838ed7453a14958e5623aa18e3a3a34b0d SHA512 66b3f557fea2c507503c4b178541300d90fe85fbfc14a7efffafbdc71aa4b0ae67a1b64c174a7d99ce284fd4bb4c225c6a1c17129c2ef876d83c54de3070edba
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 248 BLAKE2B 3950c91ff5bc0702011863df9c975ffce0b778d0b6b5a61199a1fba3ba5b81f503fcdadc160a8567efd9acb946e0e935f7c76c4ff7de23d2d653bffa62a6a216 SHA512 9e2a2d4e051742fb5e7e11a6dd2fa8dd31f5dec67e68552f60aa9f7f623832ff60e3e0213ad9a94241dd5acccb4e1cdba8fca6c5d7a9c6e4e50827b71d9aeb61
diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml
index 115e9d64a669..d5f9c37c521e 100644
--- a/net-misc/redir/metadata.xml
+++ b/net-misc/redir/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">troglobit/redir</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/redir/redir-3.2.ebuild b/net-misc/redir/redir-3.3-r1.ebuild
index 7259b3b6f425..adff06afc486 100644
--- a/net-misc/redir/redir-3.2.ebuild
+++ b/net-misc/redir/redir-3.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Redir is a port redirector"
 HOMEPAGE="https://github.com/troglobit/redir"
@@ -9,6 +9,6 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
 
 DOCS=( ChangeLog.md README.md transproxy.txt )