gentoo resync : 20.03.2021

9 files changed, 9 insertions, 141 deletions

diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index 7d81613d26e6..0b59610ae4d6 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -1,14 +1,7 @@
-AUX arpon-2.7.2-CFLAGS.patch 407 BLAKE2B 5cb747ba4f8153a1f1e13da49fc9cb8f55b75b8f80b17ea3c336d4feb863f23dfe08d93209a646b85301d8d0ba7d76a958e5d5468b47b08dcb6ec8be307d7b92 SHA512 9029ddc9b024e62f21a49faab5c39008bec22b88cd6fac5f31ebb7327357159d6ec36f0f750bb4d5e985115d553b95b8c1daf2794e9edb7c40dae06fd8872a07
-AUX arpon-2.7.2-etc.patch 356 BLAKE2B 5cbec9b24dfd2a75f1a743e7a08031945fbadb7f6f50d3b62c611fa797abf3f866fca7f4f2e8d880544effa5411c1fec408ef4e43d96af2859bcb16215ae4121 SHA512 2bafa030d87d9b216902246053d2521ed4395c89d12b2bddef4e38671442a5d1e54afc8bde3a77944e93f93b703f1f60b0f6f84535fefc8331ec59aecb69e492
 AUX arpon-3.0-CFLAGS.patch 1787 BLAKE2B 234bc1d6d991e17458c4abbdba64afcc4edde4cdd70f734fade44e50059545b453f2ce93b9f46b180db8e671287045aeafda9158f78541b699a888d81effe8c4 SHA512 032959619ac5a33aa52ef589661659d4ad3842a7778bb40dd1c8d45fa6f1edac02dc8b4078fbdb41b8af52d2f7423c1d54ac2246582aec563fab42ae8859295e
 AUX arpon-3.0-gentoo.patch 4736 BLAKE2B 854efd88ff29b13defdae4d57ca97f00066a9a21528d23df2014f031dfe6467fe60de06bf9f99f72eed8745a9c1df86bb6f9d362ce0e637a0d221c3ea59ce304 SHA512 63f9122d1cfb5e05bb32f7dbf9a9fde9e7f155b16d0f42fc890cbccaf8409773bbcd2907e08f69fdc3739d0683c7495d132a663f8f9f6ce83405b6380f02f807
-AUX arpon.confd 128 BLAKE2B 864417d8892d037f005123938b3ffd970c69f6ad06fdc6e031872250a126fb92a63ccb247e6f49a8e6e716a1138443df29d2838e5a1c73e44e04632977f78789 SHA512 1300ffd903366a5970c5c2b6b7a570ee6e1e696d18a5f16340c7f192c5ff4e41694a180e0d5ab86c1fb64bd015dab94eb52ef5ff429280b56f5ec4112abe3b11
 AUX arpon.confd-3 75 BLAKE2B 3a054d7d5392a9a877aafc25687f15ddf6a483122fc29ba34a4399e31be2ce009b42a5a8b69fd4a1486f1b37d917221a7c7121449006210b8a38213709c1a2e9 SHA512 c13b5fd267ac0e96a30d235917ba644035d05e13c4cd8121081fa7a0d97fc921a1f828727e462245e701ae84b75738fb39dbc95c133f11d53641412669d3c584
-AUX arpon.initd 406 BLAKE2B b519b05207a2cf54301493d85a5b50205d27bacc5c4eb2dedb18ccc450a01b74b9d159da0c66b6aed20a31ec454747e0ab533906633cd8dc7ab6bdaaa9d44ca0 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a
 AUX arpon.initd-3 472 BLAKE2B 159774908987a99ce884248d1a972d0c74395b29637f7adc638429925daa98bcd52b6393a73d7e81177c0b9c108ebbc251087587e866d484cd10d60a18af68b0 SHA512 22216841bd716052a25195e2ae693c13b9f1da503195b2a22a1fc0dcab3377c94a02c4e9c1115359b4e40eb63a56fe207767815edb11c42d01bdd75411b5a057
-DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4
 DIST ArpON-3.0-ng.tar.gz 8795979 BLAKE2B 81b1fe9a426b5b0960911cbbac984482aeea15a957fac72a10e7dd9a45a609da90ca14163957cc008541be4cfaf426f07fa9c64ac4dff933f568b20284c5211d SHA512 e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af
-EBUILD arpon-2.7.2-r1.ebuild 727 BLAKE2B e401df619a1da645dad882e67b69451a01d2837475d39a755b453575698f90cf021bb7165016aff0805f4fa7d6fd2852ac6ecfeddb43deb7cd86b68d0aa94965 SHA512 a81ed2f8a530ffb3a9781ca5785c58d0adc01867f650eedda0511fc94376b3f077ef8fb99e221ce1e82b04c796a466c0c2c579203820f5ee8a400867f236b8b6
-EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
-EBUILD arpon-3.0.ebuild 834 BLAKE2B 7ceebb9368abdd8a5fdcb1acd0bb6db73c0eba5ff88e83f2d2cc787ea3462b27f45a3473d3c92aa7b3ab12dc745093c2f7b36a28fa81274dbc28203b92dc5bf9 SHA512 1d259119942237615a5a51286a73d4b90d37fe2c0ba4c8f11294e6f215b922f74a48bbae86b3a3e5909078a816ffbcb511cce7d4146a286ef35913a1cd291859
-MISC metadata.xml 285 BLAKE2B d232c837f5b78009aedc859ac2aa78da0775cb937b3742bec976767463c738db4054feb51e08725449432ef4c74add9697e2781938819d6e35cdccdfaaa2b590 SHA512 16762a0e8ae17a8f288d969f0f8d9dc15ce522c2c0e007007830dd3efe1ae96dc53f0d034f591fb6b6f7eb039fbde52f37f596bf9a34805900952391540bee4a
+EBUILD arpon-3.0.ebuild 835 BLAKE2B 458d57ce6eec80b95227aba083b12db3139a4fc20036ad887dcc9991dba269c68da9c1ece15a570a108c43a52a273284e1ac74efa6db1f45954dd8c5557c2a7d SHA512 714e729fc1a5daadcb20a10de3b1b526989ade6a6c0b279379a6c594027f5171a7f53bdab3362294c406d0f02a3192b2f48b8fd72fc232c5fe3ab589adb3aeba
+MISC metadata.xml 285 BLAKE2B bc100e6f3ecf9093f8f4c0011044820375e4f90c2758bd85831ae68f9f5c670326b48605532bc397973be9d725e65390f85b2fa51662ec031b75105fd62f02c2 SHA512 30275bd57675bbf1d25ac46ac6112fe553a25927a41254a8453448f3e578d6c00533c464ba3b680f922d90eb65b1360f7fbee39ccd8b4123f44df9d719159fbf
diff --git a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
deleted file mode 100644
index f2bc485b6fd2..000000000000
--- a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake
-
-DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
-
-MY_PN="ArpON"
-MY_P="${MY_PN}-${PV}"
-HOMEPAGE="http://arpon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/libdnet
-	net-libs/libnet:1.1
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.2-CFLAGS.patch
-	"${FILESDIR}"/${PN}-2.7.2-etc.patch
-)
-DOCS=( AUTHOR CHANGELOG )
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	cmake_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/arpon/arpon-2.7.2.ebuild b/net-analyzer/arpon/arpon-2.7.2.ebuild
deleted file mode 100644
index a79e9de5e0fa..000000000000
--- a/net-analyzer/arpon/arpon-2.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils readme.gentoo-r1
-
-DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
-
-MY_PN="ArpON"
-MY_P="${MY_PN}-${PV}"
-HOMEPAGE="http://arpon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libdnet
-	net-libs/libnet:1.1
-	net-libs/libpcap"
-
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -i -e "/set(CMAKE_C_FLAGS/d" CMakeLists.txt || die
-
-	DOC_CONTENTS="${PN} now installs an init script. Please edit
-		the /etc/conf.d/arpon file to match your needs"
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	readme.gentoo_create_doc
-}
diff --git a/net-analyzer/arpon/arpon-3.0.ebuild b/net-analyzer/arpon/arpon-3.0.ebuild
index f84ce3dfbc6d..c800c3568c29 100644
--- a/net-analyzer/arpon/arpon-3.0.ebuild
+++ b/net-analyzer/arpon/arpon-3.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake
 
 DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
@@ -10,6 +11,7 @@ MY_PN="ArpON"
 MY_P="${MY_PN}-${PV}"
 HOMEPAGE="http://arpon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}-ng.tar.gz"
+S="${WORKDIR}"/${MY_P}-ng
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -20,18 +22,18 @@ DEPEND="
 	net-libs/libnet:1.1
 	net-libs/libpcap
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0-CFLAGS.patch
 	"${FILESDIR}"/${PN}-3.0-gentoo.patch
 )
+
 DOCS=( AUTHOR CHANGELOG README THANKS )
-S="${WORKDIR}"/${MY_P}-ng
 
 src_install() {
 	cmake_src_install
+
 	newinitd "${FILESDIR}"/${PN}.initd-3 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd-3 ${PN}
 
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch b/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
deleted file mode 100644
index 525f03740dd9..000000000000
--- a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,11 +51,9 @@
- if(cmake_build_type_tolower STREQUAL "debug")
-   message(STATUS "Build Type: Debug")
-   set(CMAKE_BUILD_TYPE "Debug")
--  set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -O0 -g")
- else()
-   message(STATUS "Build Type: Release")
-   set(CMAKE_BUILD_TYPE "Release")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
- endif()
- 
- include_directories(
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch b/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
deleted file mode 100644
index 03e80f9d5955..000000000000
--- a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/CMakeLists.txt
-+++ b/etc/CMakeLists.txt
-@@ -14,7 +14,7 @@
-     COMPONENT Etcfile)
- else(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
-   install(FILES ${arpon_etc_src}
--    DESTINATION ${CMAKE_INSTALL_PREFIX}/etc
-+    DESTINATION /etc
-     PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
-     COMPONENT Etcfile)
- endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
diff --git a/net-analyzer/arpon/files/arpon.confd b/net-analyzer/arpon/files/arpon.confd
deleted file mode 100644
index d1ce050fa4cb..000000000000
--- a/net-analyzer/arpon/files/arpon.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-METHOD="--darpi"
-IFACE="eth0"
-LOGFILE="/var/log/arpon.log"
-
-ARPON_OPTS="${METHOD} --iface ${IFACE} --log-file ${LOGFILE} --log"
diff --git a/net-analyzer/arpon/files/arpon.initd b/net-analyzer/arpon/files/arpon.initd
deleted file mode 100644
index dc69135c26e3..000000000000
--- a/net-analyzer/arpon/files/arpon.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting arpon"
-	start-stop-daemon --start --background --make-pidfile --pidfile "/var/run/arpon.pid" \
-		--exec /usr/sbin/arpon -- ${ARPON_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping arpon"
-	start-stop-daemon --stop --pidfile "/var/run/arpon.pid"
-	eend $?
-}
diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml
index 68ff631bb172..6d6d1a8b6656 100644
--- a/net-analyzer/arpon/metadata.xml
+++ b/net-analyzer/arpon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
+<maintainer type="project">
 <email>netmon@gentoo.org</email>
 </maintainer>
 <upstream>