gentoo resync : 16.09.2021

4 files changed, 2 insertions, 174 deletions

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 8efb9f7c1524..384859b38580 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,9 +1,6 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
-AUX frr-8.0-c-ares.patch 482 BLAKE2B e7a29e165a40737624e234932ca80b07c1ed7c6db2d6972f5e27e727b81e95c39ac7f54e3b1ba19dd0944cbda495ce12c2f884a2fce169f851126e6c88200944 SHA512 d5f2de9c548664668e5bcc9d9a6e2c4b0d2f0e41d73f61c1a09881cec53854de983dea1585d00b0a29be7282925c1e456cf6c2e0b338241c609fa561022d5a63
 AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
-DIST frr-8.0.tar.gz 8195258 BLAKE2B 75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97 SHA512 fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a
 EBUILD frr-8.0.1.ebuild 3540 BLAKE2B 1c4726be6328f9591129ec0cae9af25cd81c9e5cc64d460163eff0d8bd3a07d45e1ffd14e6e222142ee528bb28f72f1629b7669a595d2985397289fd5b2ff391 SHA512 9e872c47d9fe753d2dc8880e91ba2381e179a386ad0a27746be77bbb055ad252741097b248e7a17ca5dc1d3caec983661caa011e5c271d53671153dbb72d478f
-EBUILD frr-8.0.ebuild 3574 BLAKE2B d936f13e01512991d4bb22e5d3101a23c08b569edd4a4ccaa4cfb9501b28cb3afd886c750311a364da51c564f3b9c878e5f4574cf954e4d661c8d1c9c325bf15 SHA512 dc3f46abfc7bdff106ea19f9a1d56d05aebefcf7fbbf0c3ef53cd0f65b4768d90e19d0393a08a9da5c31eaa8ff2e7ccfdf8f274ce299901314bcd2710b6ec72a
-MISC metadata.xml 766 BLAKE2B 5180b547d024deffc965d384c3f4b8075832e1146106dd9fd2434d08669199db439053bb8fa5ede82b5fa848a21812c6d808778c656c02b6aeb80238caf13f0f SHA512 9d2a818c93693ef3f079a70ec243655489edaf4eacac3fba8890eec0d59e7711053d773aba2ccc10c772f400959a7bd6e42faa413d1100a1f12445d42215769d
+MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108
diff --git a/net-misc/frr/files/frr-8.0-c-ares.patch b/net-misc/frr/files/frr-8.0-c-ares.patch
deleted file mode 100644
index c313006e8630..000000000000
--- a/net-misc/frr/files/frr-8.0-c-ares.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/809728
---- a/lib/subdir.am
-+++ b/lib/subdir.am
-@@ -144,7 +144,6 @@ vtysh_scan += \
- 	lib/log_vty.c \
- 	lib/nexthop_group.c \
- 	lib/plist.c \
--	lib/resolver.c \
- 	lib/routemap.c \
- 	lib/routemap_cli.c \
- 	lib/spf_backoff.c \
-@@ -333,6 +332,7 @@ lib_libfrrsnmp_la_SOURCES = \
- if CARES
- lib_LTLIBRARIES += lib/libfrrcares.la
- pkginclude_HEADERS += lib/resolver.h
-+vtysh_scan += lib/resolver.c
- endif
- 
- lib_libfrrcares_la_CFLAGS = $(AM_CFLAGS) $(CARES_CFLAGS)
diff --git a/net-misc/frr/frr-8.0.ebuild b/net-misc/frr/frr-8.0.ebuild
deleted file mode 100644
index 6343f0f45e38..000000000000
--- a/net-misc/frr/frr-8.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2021 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 kernel_linux nhrp ospfapi pam rpki snmp systemd 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}
-	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
-	"${FILESDIR}"/${P}-c-ares.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-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() {
-	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/metadata.xml b/net-misc/frr/metadata.xml
index 775a1ad73731..69bd9b16f701 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>pinkbyte@gentoo.org</email>