gentoo resync : 08.01.2021

3 files changed, 3 insertions, 45 deletions

diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index 7204b3a44923..843e9da8fdc2 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,6 +1,4 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
-DIST mrouted-3.9.5.tar.bz2 112746 BLAKE2B 146d088b0fe3691c48b86a5bb4fb191c6a138fcef065c2afb549e068181953bb5ec46a6d710b2f158ba9290f8b7cc8dd3314cafeb0d681a43419a69d2cda58e4 SHA512 6ab7335fd18bcb971eb0f9af26e8fd566b1bf2e53abdfcdea847c4bd719d282496c443914678c6fcbcf754e276663ed48ac9f0ae9e940e60eff71ceb1f4622fd
 DIST mrouted-3.9.8.tar.bz2 112863 BLAKE2B 4a7defbb1b97be8e452881a689d99742df2878dc9c2613c79e1bdc33af398c2be1b2d21de94e90592877ee5b6aa6b2f0c64948193eda9005c828a6cc84e492c0 SHA512 50abf2271c76b604d1e356ca5c0b62a7f07487f364991502326bbee169c451b43b3dbf01b88340d6b406f16d86a6d6fd9e7bb03c6e76d6af463b46d8423a41f4
-EBUILD mrouted-3.9.5-r1.ebuild 841 BLAKE2B 4f26bdc8cb8fe714e058c15144ce651b09bd2f16cb4b3c9200c327b7e55e6c9b411b440df1511d3cbe156fcebafcaf92047124506e9b130f456457de1a5563dd SHA512 e45dd94d7e7ea511e7798c0a9f75b5fdff669d98b9cc00f272c153d2ce2ab37296c5605390bb9df115928de99f654b3ed17242619e8b5c1ce4f8c25d790ec725
-EBUILD mrouted-3.9.8.ebuild 1084 BLAKE2B cebd4e2a3f6709311c52158bf979f332e93b0c2ac6ee28af9955fcb0408129cb14d8060acb8dacebf29f17f52269fd38eda094c3d2ab77d1f61da76c2cc7d3ae SHA512 7b82b462480a3264d59c53cc2cb7988500982aca9738496bccec077a4c20a17063aa1d4f833b9681b2305e56afb04a0084658b5dc4acc1e05126c92ddebe1250
+EBUILD mrouted-3.9.8.ebuild 1081 BLAKE2B f6f973db6a7eb7e1a93998b58c2b8d9948a14682f9f6435fb25efe3f2dbcf44d3bfeb0e48332d3d9d66475f566dde4eaf27b4a5fe6395813a56cf2729a830798 SHA512 cdba5ee8434981a69ffe2b586b6f99febaf5f5ab948e995a458ac828f906e0af41ca5fc9e81268c2a5c312289c579152cf6799da673b73abd477692cd01b5865
 MISC metadata.xml 263 BLAKE2B cb359879b778e3cab54eb78f0d469b2acafd5dae71b337927dc91c871bc0b3477948813a77830721f9370c7c4e83f8aa0157eb29cb6a6548166028fe7564bbff SHA512 a671dd27602ae33831b300d8d25ee33335d220722d9004e5db3ef1d3f2bcf8646b4281f28a7a7baee9913e30a4f9699e5ae53233ddb8fcc11090162ab5945000
diff --git a/net-misc/mrouted/mrouted-3.9.5-r1.ebuild b/net-misc/mrouted/mrouted-3.9.5-r1.ebuild
deleted file mode 100644
index 68ce93661989..000000000000
--- a/net-misc/mrouted/mrouted-3.9.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="IP multicast routing daemon"
-HOMEPAGE="http://troglobit.com/mrouted.shtml"
-SRC_URI="ftp://ftp.vmlinux.org/pub/People/jocke/${PN}/${P}.tar.bz2"
-LICENSE="Stanford GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="|| ( dev-util/yacc sys-devel/bison )"
-RDEPEND=""
-
-src_prepare() {
-	# Respect user CFLAGS, remove upstream optimisation and -Werror
-	sed -i Makefile \
-		-e '/^CFLAGS/{s|[[:space:]]=| +=|g;s|-O2||g;s|-Werror||g}' \
-		|| die
-	default
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin mrouted
-	dosbin mtrace mrinfo map-mbone
-	doman mrouted.8 mtrace.8 mrinfo.8 map-mbone.8
-
-	insinto /etc
-	doins mrouted.conf
-	newinitd "${FILESDIR}"/mrouted.rc mrouted
-}
diff --git a/net-misc/mrouted/mrouted-3.9.8.ebuild b/net-misc/mrouted/mrouted-3.9.8.ebuild
index 74cff54b4c32..0e9bfcd0649a 100644
--- a/net-misc/mrouted/mrouted-3.9.8.ebuild
+++ b/net-misc/mrouted/mrouted-3.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.bz2
 LICENSE="Stanford GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="rsrr"
 RESTRICT="test"