gentoo resync : 28.04.2021

4 files changed, 45 insertions, 200 deletions

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index b1ce793ea894..549bb9981847 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -2,7 +2,5 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285eb
 AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
-DIST frr-7.5.tar.gz 6730659 BLAKE2B 12c915e7564b8f0157b20b0714b1efd8c2ad0c51dbaeb1eb3ef2d5ea50406c297d7f4bd854d9246b515d42f3fa326b2b3c7a30d83f35b64c374947b26709f6fe SHA512 d0d3c0bc0d30e2ebb93e20906768a996d21db23b23118c8e3c50d238e7bfdee7a789b4a90c9d7dbdc842d857f60bd44f0922b01b0c2c8b289ac860f008a430a9
-EBUILD frr-7.5.1-r1.ebuild 3463 BLAKE2B 9d673b775da6f15b9557a771a05f118d2756bf8cd885d3d4865a702310fab07a0f1d784e2b7004c79b3788c3c5c031361357b475bc39b0f26502eb6e116714e5 SHA512 6aff90a4fa99f636d4cd9e1d6d8651a69f0e30070a076f1d2626ee72002594efdf48ae5aad856cfab633ad02eabb9330adfceed24f8b2efc5c11764249273ecc
-EBUILD frr-7.5.ebuild 3371 BLAKE2B 4540d279f5b9816cd9abfe404928d335e6792df572e154a10302d53fb661892ea068c04ab160c841d7d6b8a3faa2de3bf39e6acfac50816c9d787a1f7dddd83c SHA512 fbe577b9cacd4e29ced2c035c3d26d627c2cd969c110717577cec59371fcd3f4de84879a49b45f84b422c28c7bf150fd1cfb1ded85580f1f8cc6ce7195128dde
-MISC metadata.xml 701 BLAKE2B 69812cc3ccd29487acd06afe28dbc936c671ee20741790045e39546720c1745311cae6dbba2bf612311e7ae27a708039006f0f92f04f512b724d291ebb33398a SHA512 4979d8ec46e7a874f9cff76f5b06b98692db749764d649bcbd8a06a51265cacdd466004ca4b7c5f7cabc7a4969908eb4840da2b85fd1dde3ee19815819b4a66a
+EBUILD frr-7.5.1-r2.ebuild 3501 BLAKE2B 905bbdc0b7fa1b1a2d846a89e9f097651d2ddf26088b8efe0de5bd8a8088ff958cca0df92f7b5f0410d757e36f9e509da234937ed6f315e13631ca04d76a1708 SHA512 e489f106056487f2bb2d866889946033383877e791d0f7ac461d62be9805a6542da2179b789f8325a3b4f9f8e0256b7664722f930aae1ce0925095b32f6af46a
+MISC metadata.xml 770 BLAKE2B 13813d2c2fc611a87a9d2e516b0fd8fb5f9539339f99837ec08c9ed0ac276f9ee80b0e1afa84d6e52adfde8135b3b6950172faed307ae0dbec423bf1a4acd4bf SHA512 e4989acf1cfaabf52030284acff11ae6408dc8d958286ca1cf68d183526dd6a8379ed7ace5d5348f4e298e792387f3ba0a06dea402d125597aa9032222ff1dcb
diff --git a/net-misc/frr/frr-7.5.1-r1.ebuild b/net-misc/frr/frr-7.5.1-r2.ebuild
index 899edf8f2bda..9e16c18b16dc 100644
--- a/net-misc/frr/frr-7.5.1-r1.ebuild
+++ b/net-misc/frr/frr-7.5.1-r2.ebuild
@@ -33,6 +33,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )"
 
 BDEPEND="
+	dev-util/clippy
 	sys-devel/flex
 	virtual/yacc
 	doc? ( dev-python/sphinx )"
@@ -56,35 +57,39 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--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 \
-		--enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples \
-		--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) \
+	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-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
+		--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)
 		$(use_enable systemd)
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_compile() {
diff --git a/net-misc/frr/frr-7.5.ebuild b/net-misc/frr/frr-7.5.ebuild
deleted file mode 100644
index 425a59944037..000000000000
--- a/net-misc/frr/frr-7.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	>=net-libs/libyang-1.0.184
-	sys-libs/libcap
-	sys-libs/readline:0=
-	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="
-	doc? ( dev-python/sphinx )
-	sys-devel/flex
-	virtual/yacc
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	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"
-)
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-pkg-extra-version="-gentoo" \
-		--enable-configfile-mask=0640 \
-		--enable-logfile-mask=0640 \
-		--prefix=/usr \
-		--libdir=/usr/lib/frr \
-		--sbindir=/usr/lib/frr \
-		--libexecdir=/usr/lib/frr \
-		--sysconfdir=/etc/frr \
-		--localstatedir=/run/frr \
-		--with-moduledir=/usr/lib/frr/modules \
-		--enable-exampledir=/usr/share/doc/${PF}/samples \
-		--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) \
-		$(use_enable systemd)
-}
-
-src_compile() {
-	default
-
-	use doc && (cd doc; make html)
-}
-
-src_install() {
-	default
-	find "${D}" -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 "${D}/usr/share/yang/ietf-interfaces.yang" || die
-}
diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index 043dceace198..dc5cd64d6f4e 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -5,24 +5,16 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
 	<use>
-		<flag name="grpc">
-			Enable gRPC plugin
-		</flag>
-		<flag name="nhrp">
-			Build Next Hop Resolution Protocol daemon
-		</flag>
-		<flag name="fpm">
-			Enable Forwarding Plane Manager support
-		</flag>
-		<flag name="rpki">
-			Enable RPKI
-		</flag>
-		<flag name="pam">
-			Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Virtual Terminal Interface Shell (vtysh);
-		</flag>
-		<flag name="ospfapi">
-			Build OSPFAPI support
-		</flag>
+		<flag name="grpc">Enable gRPC plugin</flag>
+		<flag name="nhrp">Build Next Hop Resolution Protocol daemon</flag>
+		<flag name="fpm">Enable Forwarding Plane Manager support</flag>
+		<flag name="rpki">Enable RPKI</flag>
+		<flag name="pam">Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Virtual Terminal Interface Shell (vtysh)</flag>
+		<flag name="ospfapi">Build OSPFAPI support</flag>
 	</use>
 </pkgmetadata>