gentoo resync : 27.03.2021

5 files changed, 2 insertions, 137 deletions

diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 35da1fd37921..4a23ef8ae685 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,13 +1,8 @@
 AUX arpwatch.conf 416 BLAKE2B fd74ff5df7a18dab34246d2a643b88353651aaa21825a0824d9adf54b252bc328da54efe5f4acc0054c27c66bd2e966719c22be4fceebac3da9584f3967a00d1 SHA512 c209a8184ac1b447035eaad083e74fe278093dcd7ac28ec2aabe806c6ee1d1ed6072153f27537a7755639ad3e7d95b4b02a9e0c31dae8f940f3128b4532dc371
-AUX arpwatch.confd-r1 559 BLAKE2B 291acbd1ebf7ab4f9f6ca19dfe1b445fc610c1b0961c895f5ccee3fe25e0536ef81e2530ff2151dceb52d113d1e13ab9185a0d83577d9258d57613112bb616d7 SHA512 d1fc4993db4b9a1e11fee0629b92b6372266085551e6e89f5f33a9dd092ee70087f2766c46cb983040917c47e478c0c8206efd1b9fde8d030a3e249c28970c9c
 AUX arpwatch.confd-r2 577 BLAKE2B 5876819ee028fe4a77ffca0e359d73492bc6ff82ad89f7ad24e38b9167c6d7858ae186115ac3fe0d594a93e0197fd2eea0daea5c0d49674b0770836d7cb2fb68 SHA512 9d6086f9e1bd27976117b408e1a604b9544a5acf80cf69cbac00516fe36f93dd600a2876039dbfa023b12a35d01439fe25845304474add1bfa059c97383aae7c
-AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9345b0d9b983aeb299e51849eb04b0df0627252ab65db1adf706f181aee61f471a1af87a3c1b3653e80 SHA512 735e284132aaa2125d7b248c81a27be2208963d84b7b434f251ee3f7a350e81c9e3cff58bc812bebd26450b711322c188876e96d6638a4ba3dbde4e8fc040c04
 AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bba1a5a8aea227c30b2fbb4425cf4d6fbaff1fe23493b58b211d4f6a6328bfe9a20e1020709db1cacb57 SHA512 b3518e24c839bda3292ff9f8dfb7c9bf12f4483637590875f281116cc1a453266ffb22507383fb71cf28b889141b355f077df8e7937ac571ab72924f5f2014f7
 AUX arpwatch.service 362 BLAKE2B 45e527e7b5261a8009acdca0665077422235d5b21ebbb6818d878e21e4869fdf69317306bc4ef02617b8989a38f50a9467d69d904ada80fde1be61f77b806e2c SHA512 06424dea166eac23d4686fb96b1f14bdd46965bf400028f870ea2260e7d54a54663987c62e34e93730e6dea42e0e662578268252b31f29c26c0975bb4cb6873f
-DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
-DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
-EBUILD arpwatch-2.1.15-r11.ebuild 2230 BLAKE2B 889e3e63758098ba0f118865f8eb79d9ef90918bad7bd4489c51ecb542c755b2e39b97ab53aa82a221b4c49ec4448382e4f879ed1af1eb0357880db9d7d57f93 SHA512 c5e42b41147f62ae73a5dd659a69c1605c3298bd5d2f36153b706e940284a074532fa4ebb0349ed665aca208c85e7819444ab57888dfd1bc79cdf7d385e4f0ac
-EBUILD arpwatch-3.1-r2.ebuild 2105 BLAKE2B fd08a9f1e0e520c2585772e3c73cad82a183083369cbaff0b7bd54f773318330568203157081763ee58308be6733b5fb71cca66229d4c65e16459b0d4019fa6c SHA512 55136ed09a11254c51813dfa10ba65484d99ad14a5c9a36dec6f0078cd3b759a8de57fbad9c23a72bbbef095ccc09c9db306e7ae98c37ce911127c035b6e3464
+EBUILD arpwatch-3.1-r2.ebuild 2104 BLAKE2B 33e535e8c9bb9aa9a1920bafeca58707f49e8bd7466324b98afe3ef6bec9eb47897ef1f37a994271871df39e0e412140933a2141fbd74d3b57062f2723e6bfa4 SHA512 599b71098108eb7d1ac0069b73dc0c49429a344041fb3872d70f55f162186674f3ffa6b1f2662837db4071238109efa33451194e0258871ee34796249874d7df
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
deleted file mode 100644
index b11099a93145..000000000000
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user versionator
-
-PATCH_VER="0.8"
-MY_P="${PN}-$(replace_version_separator 2 'a')"
-
-DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
-HOMEPAGE="https://ee.lbl.gov/"
-SRC_URI="
-	https://ee.lbl.gov/downloads/arpwatch/${MY_P}.tar.gz
-	https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc sparc x86"
-IUSE="selinux"
-
-DEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:*
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-arpwatch )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# We need to create /var/lib/arpwatch with this group, so it must
-	# exist during src_install.
-	enewgroup arpwatch
-}
-
-pkg_postinst() {
-	# The user, however, is not needed until runtime.
-	enewuser arpwatch -1 -1 -1 arpwatch
-}
-
-src_prepare() {
-	local patchdir="${WORKDIR}/arpwatch-patchset"
-
-	eapply "${patchdir}"/*.patch
-	eapply_user
-
-	cp "${patchdir}"/*.8 ./ || die "failed to copy man pages from ${patchdir}"
-}
-
-src_install() {
-	dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
-	doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
-
-	insinto /usr/share/arpwatch
-	doins ethercodes.dat
-
-	insinto /usr/share/arpwatch/awk
-	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
-
-	diropts --group=arpwatch --mode=770
-	keepdir /var/lib/arpwatch
-	dodoc README CHANGES
-
-	newinitd "${FILESDIR}"/arpwatch.initd-r1 arpwatch
-	newconfd "${FILESDIR}"/arpwatch.confd-r1 arpwatch
-}
-
-pkg_postinst() {
-	# Previous revisions installed /var/lib/arpwatch with the wrong
-	# ownership. Instead of the intended arpwatch:root, it was left as
-	# root:root. If we find any such mis-owned directories, we fix them,
-	# and then set the permission bits how we want them in *this*
-	# revision.
-	#
-	# The "--from" flag ensures that we only fix directories that need
-	# fixing, and the "&& chmod" ensures that we only adjust the
-	# permissions if the owner also needed fixing.
-	chown --from=root:root \
-		  --no-dereference \
-		  :arpwatch \
-		  "${ROOT}"/var/lib/arpwatch && \
-		chmod 770 "${ROOT}"/var/lib/arpwatch
-}
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
index 74a75dcce777..6dde8e28cecd 100644
--- a/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
 "
 
-KEYWORDS="amd64 ~hppa ~ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd-r1 b/net-analyzer/arpwatch/files/arpwatch.confd-r1
deleted file mode 100644
index a4da503406a2..000000000000
--- a/net-analyzer/arpwatch/files/arpwatch.confd-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-# See arpwatch.8 for more information
-
-# Specify the interface for arpwatch to listen on here (default: lo).
-# If you need to listen on more than one interface, you should
-# run multiple arpwatch services; for example "arpwatch" and
-# "arpwatch.eth1". These additional services can be configured by
-# symlinking to the "arpwatch" service script, and by creating a new
-# conf.d file whose name matches the new service (symlink) name.
-#
-# Example:
-#
-# ARPWATCH_IFACE="eth0"
-#
-ARPWATCH_IFACE="lo"
-
-# Additional options to pass to arpwatch.
-ARPWATCH_OPTS="-N -p"
diff --git a/net-analyzer/arpwatch/files/arpwatch.initd-r1 b/net-analyzer/arpwatch/files/arpwatch.initd-r1
deleted file mode 100644
index ffe165205c6a..000000000000
--- a/net-analyzer/arpwatch/files/arpwatch.initd-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Default to "lo" for the interface, so that the init script will work
-# out-of-the-box.
-: ${ARPWATCH_IFACE:=lo}
-
-ARPWATCH_DATAFILE="/var/lib/arpwatch/${RC_SVCNAME}.dat"
-
-command="/usr/sbin/arpwatch"
-pidfile="/run/${RC_SVCNAME}.pid"
-command_args="-i ${ARPWATCH_IFACE}
-              -u arpwatch
-              -f ${ARPWATCH_DATAFILE}
-              -P ${pidfile}
-              ${ARPWATCH_OPTS}"
-
-depend() {
-    need "net.${ARPWATCH_IFACE}"
-}
-
-start_pre() {
-    # The "arpwatch" user must be a member of the "arpwatch" group for
-    # this to work.
-    checkpath --file --owner root:arpwatch --mode 0660 "${ARPWATCH_DATAFILE}"
-}