gentoo resync : 28.11.2020

3 files changed, 3 insertions, 49 deletions

diff --git a/net-analyzer/ndsad/Manifest b/net-analyzer/ndsad/Manifest
index 5cf6d60ba204..10ba975fa1da 100644
--- a/net-analyzer/ndsad/Manifest
+++ b/net-analyzer/ndsad/Manifest
@@ -6,6 +6,5 @@ AUX ndsad-1.33-strncpy-overflow.patch 351 BLAKE2B cfc16b4b85620a1e20acf228779226
 AUX ndsad.conf.d 286 BLAKE2B 1cb53d5a324ef0aa5e4535299815427d74177d911f517b9d51a201af821623d8990f4e5a57be2a3e8d23065f4ce323dcb97f82ed6d22440208692e3bd6276baf SHA512 2b2718d6cb638ac6b2a75a7b041d0eaf3629bc4698e4d978cdd196866cbbf5f3965ef3e6052d7af1dcc22ca5046558b36393275ec0c2d025dd1cfca8e2dd6f62
 AUX ndsad.init 675 BLAKE2B 3b6eff620021d8be3ab938c8e17adda4488214657e0d80884285cddd702167ad2817ae2df46014962aec6556f2f67af0ed4442c6cf29492ad94bad760833e595 SHA512 f08c02ea457e2067e170cea8c2860ac12ccbbc4dd50a27f308e7b6884afa7e2ca8a7cf2f2d627002c43c13c4bc710727579fd22e043105d1c3f135de9cfdb500
 DIST ndsad-1.33.tgz 214614 BLAKE2B ca8e0f983d14cb43148411cead699dc140ca0cce60266b0aae6cb1836c643bd5c5d7aae6c34ae372af83a20e0e9ab39f92fcc46f2e2edbc70cf3968ee9b824dd SHA512 38ebca91f28d763ce334d92361779f100ee6b98d6d17485bf096f913f777e8525add63bd73aeea43321cee622e10cb88020aca7af492fbafdd50cf740510bd51
-EBUILD ndsad-1.33-r1.ebuild 905 BLAKE2B 540ba5fb53cab1fc45a88831eca7e222882049904c08dd77743c7ccb54065a75ac628b15be67f6376bb9f76f83b7682067776445ccb2b1b6659bbe394094d3d4 SHA512 4fd73c4234e8e08284e2c21501315203feb814d6ce73c4140a9e5f71772f3a2fcdd119f682bce8917ec048876c205db1a6a91c2e56d7794ffb8c09680078adcc
-EBUILD ndsad-1.33-r2.ebuild 854 BLAKE2B 06458be1e1c5665868c257766cdad06a1feca486ceeb3e40f6deb0a53ca01cfdfea99583adac0b122800fcbb76959b644d52817dcc1120bc49837dbc93a04283 SHA512 20be2483348444283a262667b7dce91298af0009e426fbf256c91b6489caf11215ecf6f4f500ad5ccc33311c7d7492c6c7a40874731bce19cd2690e3ac3d9562
+EBUILD ndsad-1.33-r2.ebuild 853 BLAKE2B 411c352c05115ed37fa951dfac997dc21cf3d2051cdcfefeb8c0e633735587b3b3dcc1ec0e61fdf847c4de7db45a6f355acd4fd6aed8d1de622a56fa69813ba9 SHA512 84c0f719a41d87acf65c7a6e670e853794557b982eb9db02f8db2085e3ee9b0312fd517e0e9e937c3ffce3dc77b4be176840338899c5578ef6001696d88c59e7
 MISC metadata.xml 1271 BLAKE2B ae2d1adc298d9987342838550ed7fe1081b88198b7a6f24825a78356db0833013429acdeb6836c4e7f90cf1bb9e2961cc52dded5d2857d6baac2a3f00f5ab0bd SHA512 9db4f4368820e30e5b48f1ad9c49e245348c57a37829aec25b699d863e5e56f565f52c948cb6a2b63efd4c54c4feff204234e2d98bb8525f767d55701d14ce3f
diff --git a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild b/net-analyzer/ndsad/ndsad-1.33-r1.ebuild
deleted file mode 100644
index 5ccdff9433d7..000000000000
--- a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Cisco netflow probe from libpcap, ULOG, tee/divert sources"
-HOMEPAGE="https://sourceforge.net/projects/ndsad"
-SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=net-libs/libpcap-0.8"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-conf_path.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-getpid.patch \
-		"${FILESDIR}"/${P}-log-path.patch \
-		"${FILESDIR}"/${P}-strncpy-overflow.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-ulog=yes
-}
-
-DOCS=( ChangeLog AUTHORS README )
-
-src_install() {
-	default
-
-	doman ndsad.conf.5
-
-	insinto /etc
-	newins ndsad.conf ndsad.conf
-
-	newinitd "${FILESDIR}"/ndsad.init ndsad
-	newconfd "${FILESDIR}"/ndsad.conf.d ndsad
-}
diff --git a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild
index e7f9a919a4a4..2b5139cf5689 100644
--- a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild
+++ b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="
 	>=net-libs/libpcap-0.8