gentoo resync : 20.03.2022

3 files changed, 3 insertions, 54 deletions

diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 55410a315e33..b25ef9824b56 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,8 +1,6 @@
 AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac9815c6e20fcd0c32cbd3ee149746dccff2a89f9113243cfe56d5fee66417f07289450c43e089502c270572e5bd SHA512 d93456173c25a5858e71ededd30a6322d5a8cb2908053e1a47529774fad1e4ff0c7a9935501391f8b3dee95cda4620d1b2bd98ea67aa9a2618b22c45ce4c7026
 AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c
 AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51
-DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
 DIST mrtg-2.17.8.tar.gz 1102598 BLAKE2B d5d513de641087f6daa207f154bbcca0196ccc8cba79a03ad6916c9c0065980745be3746953063127fc017d57e235ff67252531380fc9f68c9e5c3332d5230ce SHA512 c1dbeb5ce065b2b071d18e1eec1100d56eb7c4c654562de530139acee27ad57614354b74e3d0777cb6d4470a58ed6acae0f1af9c6f7115bf329132a68b6e0aaa
-EBUILD mrtg-2.17.7.ebuild 1000 BLAKE2B eb96514a135aa3f18b71031ce515dfdfa940c0e0119fe85e6b270ea8eae246b1c6bed9ccd96fadc6109e08c57e1d51618291425a71fc7e0af8c264e49794cb42 SHA512 0d0b189cb3be46b6bbb849d9aa7708848f33f38b9a6ca51140313526a9d79334dbddd3f5d7b58faec726f317e615eade15fe3e59debc3e42b638b6d35468be07
-EBUILD mrtg-2.17.8.ebuild 1005 BLAKE2B 0d472a87f362a050258791fc1e6dc98ce20d1b7fd885d715b794dd89d58022d2867470e24bd38d1e51c1ad6ad8805324c62491d9e546117d1ab492941fe64d08 SHA512 bafa028092fb2b475805e7c87b92f97c5501f200331c8a775572ae7dfc94bc94df726bb378e5a6227755cdf31aeabeb4baee663127686db75d5e76576a0c37a5
+EBUILD mrtg-2.17.8.ebuild 1000 BLAKE2B 3dd5d520a2058399fac30ca9592501a4cdc6d3db10d13cbc456c1b55d4f50bdb02c49010d22fae63c65b53a285fedfb094bed7a618722ab5865e20c11670f75b SHA512 bd1386919c908037f4814f7727c5b7dbdef66aeb8711c9221eaca174a96b3918f67f058cac07d56a4414031d4d037c93f952bfb146a6a6ee0a2c071e818ad35a
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
deleted file mode 100644
index e63814c2ef96..000000000000
--- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-HOMEPAGE="https://oss.oetiker.ch/mrtg/"
-SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND="
-	>=dev-perl/SNMP_Session-1.13-r2
-	>=dev-perl/Socket6-0.23
-	dev-lang/perl
-	media-libs/gd[png]
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-mrtg )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17.4-socket6.patch
-)
-
-src_prepare() {
-	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
-
-	sed -i \
-		-e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \
-		$(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die
-
-	default
-}
-
-src_install() {
-	keepdir /var/lib/mrtg
-
-	default
-
-	mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die
-
-	newinitd "${FILESDIR}/mrtg.rc" ${PN}
-	newconfd "${FILESDIR}/mrtg.confd" ${PN}
-}
diff --git a/net-analyzer/mrtg/mrtg-2.17.8.ebuild b/net-analyzer/mrtg/mrtg-2.17.8.ebuild
index ad7a69595c27..83edb448022d 100644
--- a/net-analyzer/mrtg/mrtg-2.17.8.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
 IUSE="selinux"
 
 DEPEND="