gentoo resync : 29.12.2022

3 files changed, 2 insertions, 152 deletions

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 7379cb88b45d..6b03d10a8490 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,8 +1,6 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
 AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
-DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
 DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
-EBUILD frr-8.1-r1.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee
-EBUILD frr-8.2.2.ebuild 3475 BLAKE2B e92fefd9d1326b742b21c96b47c18500736c7642ce745e07998ba17c48532bb97a48c47e6f3150cc65415c13995b86ef30e4382dbc165acf71e1dc56b931580c SHA512 a6e7eb0600f1d56df1446a2fbe988898c37397c61c02c5c3b13a98b5995664fd8f57c0fce2ba1ca91712f22cb0be84ce9864c0c214336d22dec57c3d7f04650f
+EBUILD frr-8.2.2.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee
 MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108
diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
deleted file mode 100644
index 930f7303dc8f..000000000000
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools pam python-single-r1 systemd
-
-DESCRIPTION="The FRRouting Protocol Suite"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	>=net-libs/libyang-2.0.0
-	sys-libs/libcap
-	sys-libs/readline:0=
-	virtual/libcrypt:=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
-	~dev-util/clippy-${PV}
-	sys-devel/flex
-	virtual/yacc
-	doc? ( dev-python/sphinx )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
-	!net-misc/quagga
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--with-pkg-extra-version="-gentoo"
-		--enable-configfile-mask=0640
-		--enable-logfile-mask=0640
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/lib/frr
-		--sbindir="${EPREFIX}"/usr/lib/frr
-		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
-		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
-		--with-clippy="${BROOT}"/usr/bin/clippy
-		--enable-user=frr
-		--enable-group=frr
-		--enable-vty-group=frr
-		--enable-multipath=64
-		$(use_enable doc)
-		$(use_enable fpm)
-		$(use_enable grpc)
-		$(use_enable ipv6 ospf6d)
-		$(use_enable ipv6 ripngd)
-		$(use_enable ipv6 rtadv)
-		$(use_enable kernel_linux realms)
-		$(use_enable nhrp nhrpd)
-		$(usex ospfapi '--enable-ospfclient' '' '' '')
-		$(use_enable rpki)
-		$(use_enable snmp)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install user documentation if asked
-	use doc && dodoc -r doc/user/_build/html
-
-	# Create configuration directory with correct permissions
-	keepdir /etc/frr
-	fowners frr:frr /etc/frr
-	fperms 775 /etc/frr
-
-	# Create logs directory with the correct permissions
-	keepdir /var/log/frr
-	fowners frr:frr /var/log/frr
-	fperms 775 /var/log/frr
-
-	# Install the default configuration files
-	insinto /etc/frr
-	doins tools/etc/frr/vtysh.conf
-	doins tools/etc/frr/frr.conf
-	doins tools/etc/frr/daemons
-
-	# Fix permissions/owners.
-	fowners frr:frr /etc/frr/vtysh.conf
-	fowners frr:frr /etc/frr/frr.conf
-	fowners frr:frr /etc/frr/daemons
-	fperms 640 /etc/frr/vtysh.conf
-	fperms 640 /etc/frr/frr.conf
-	fperms 640 /etc/frr/daemons
-
-	# Install logrotate configuration
-	insinto /etc/logrotate.d
-	newins redhat/frr.logrotate frr
-
-	# Install PAM configuration file
-	use pam && newpamd "${FILESDIR}"/frr.pam frr
-
-	# Install init scripts
-	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v1 frr
-
-	# Conflict files, installed by net-libs/libsmi, bug #758383
-	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-}
diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild
index 44fb6e2685fc..930f7303dc8f 100644
--- a/net-misc/frr/frr-8.2.2.ebuild
+++ b/net-misc/frr/frr-8.2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"