gentoo resync : 25.08.2020

4 files changed, 16 insertions, 44 deletions

diff --git a/net-analyzer/angst/Manifest b/net-analyzer/angst/Manifest
index 06a0f67b17fa..e5d6f9586892 100644
--- a/net-analyzer/angst/Manifest
+++ b/net-analyzer/angst/Manifest
@@ -1,6 +1,6 @@
 AUX 0.4b-flags.patch 551 BLAKE2B f8abf1a56addf80157155dfdf1cad5f2fc49d9b554c1e65baf69a64ef90c5337522635878704fe867f51e9dcca4b46b45a9e2a6a16c36a6bf92709d32c4f3494 SHA512 4552e16344bfa8fab9952c55891ea1ecbaaeec38df4fa459959f7db54b7197282b8d6436f250002c05db5abcc75c640f87bdff66261812afa82ef8f2b6e96965
 AUX 0.4b-libnet-1.0.patch 372 BLAKE2B 56df2ea477503005c28c32bf852675fe428beb07334bce78d467fbe3977c1aec82fee34935157160fbb9563fb2a1b385e93b28e76a030496e07c86b052ef4d81 SHA512 aa135c5e1e0daf54a2ff72eff465f0f3f26e06bf7da76fca48ffb145ebfc10e09d29fa45ae0c84009ee2535a06d093e0fc0936993ab9034025e1c68136168b25
+AUX 0.4b-sysctl.h.patch 183 BLAKE2B a8eaa002d49b9072fb48f7fbea3738d94aacff831daab7f22163f8e7427d25521183123f512bc218508f63518f7ee0271520aa48b0ceb230214fc22abcb7cd96 SHA512 dbee5d362e55c8ef2cf5ec76c10bb2b305d7aeb733cd882cec9ea6ad7438a0c0fc6b025e4536e17d0962b3332e189c965c37c7df859553e476f6a77b805a0f10
 DIST angst-0.4b.tar.gz 13909 BLAKE2B f08b9e489eaec5e2006ad8d84dc7586c6fb57c3d8585fb5cd769591ed56f4e5a4c2e0bdaf0ba02b40370ea99146ebfa02611d64b043949b27f6dfcbbdd2b16e5 SHA512 5584b1dd01d781cd34b594fcc8970764874599a1f15b1185066ee21c11cde23af148270c178d6a0b3436d71955aaf1cd904703f9dfb0c75d0b70c04d394fb449
-EBUILD angst-0.4b-r2.ebuild 848 BLAKE2B bb06b8af7b4b33859d2d55012cce753da80bf776329e8b875ed30cdd878c19c4be78fdcad8f008d09ed405a360fe726bc2ea0553218e6ff99e8f0d7cefbf80a8 SHA512 7ddd27ba2be944a552127e8fb7f03a7e35a5a2e919d0b4c582eae4360fa9dfca3e2a8e8f65daa3bac5afc72a074e9fedca0ba39774a9f0c836a9ea0001fb4a3b
-EBUILD angst-0.4b-r3.ebuild 836 BLAKE2B 65636b593221b7d9e05b9842538b89122bf13ac87d0293bed20d3500b7db6cb48c19cf7b619ee325e7ff0467fe7929a6a98bc475183114c8e1d8841adf43b440 SHA512 40d259f2606c32d205c130c85df499ca36281c63684ef3d394d40fe7f19f7423f4922e2c2ffe99a93dc21e753f1367b217b0ce3f04134cc54eac96926664111b
+EBUILD angst-0.4b-r3.ebuild 871 BLAKE2B 430b694b8c5093eb52934193775cb46ec0e57f9939eb201220db2649ba9fee9541fd2b1c11176a5ba62b085e92a48a275dbf3d674777ad1a5360478d1b5ccb7b SHA512 f0a337e986c893e064a064818a2a6b1644135615fce53a0572fb23dd1fb10b067c19bec37a5913553c08079f315f208f68179455942f09b153a2a693ed45a7b2
 MISC metadata.xml 471 BLAKE2B 3d6f52d876f3d620414906524cc0f84a46b33ef28add51fdf4a45dbdba740862f175d742f8b6c8cf9daa1657c33c3a3d38aeb4c9586c5a2b0e52fd509e75ec08 SHA512 0632876623160e4192bdf280011de0006adec537ad7065da350fde0a0b338b264f60cd6acdaeb439316d28ac84bfe100527b532c20a65606d1bb91ba415a82b4
diff --git a/net-analyzer/angst/angst-0.4b-r2.ebuild b/net-analyzer/angst/angst-0.4b-r2.ebuild
deleted file mode 100644
index f06986f35421..000000000000
--- a/net-analyzer/angst/angst-0.4b-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="an active sniffer that provides methods for aggressive sniffing on switched LANs"
-HOMEPAGE="http://angst.sourceforge.net/"
-SRC_URI="http://angst.sourceforge.net/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-DEPEND="net-libs/libpcap
-	net-libs/libnet:1.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cp -av Makefile.linux{,.orig}
-	epatch "${FILESDIR}"/${PV}-libnet-1.0.patch
-	sed -i Makefile.linux \
-		-e 's|^CC =|CC ?=|g' \
-		-e '/ -o angst /s|$(OBJS)|$(LDFLAGS) &|g' \
-		|| die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		-f Makefile.linux
-}
-
-src_install() {
-	dosbin angst
-	doman angst.8
-	dodoc README TODO ChangeLog
-}
diff --git a/net-analyzer/angst/angst-0.4b-r3.ebuild b/net-analyzer/angst/angst-0.4b-r3.ebuild
index 8054d460f586..42a093440109 100644
--- a/net-analyzer/angst/angst-0.4b-r3.ebuild
+++ b/net-analyzer/angst/angst-0.4b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://angst.sourceforge.net/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug"
 
 DEPEND="
@@ -23,6 +23,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PV}-flags.patch
 	"${FILESDIR}"/${PV}-libnet-1.0.patch
+	"${FILESDIR}"/${PV}-sysctl.h.patch
 )
 
 src_configure() {
diff --git a/net-analyzer/angst/files/0.4b-sysctl.h.patch b/net-analyzer/angst/files/0.4b-sysctl.h.patch
new file mode 100644
index 000000000000..16d8b53b6a3f
--- /dev/null
+++ b/net-analyzer/angst/files/0.4b-sysctl.h.patch
@@ -0,0 +1,12 @@
+--- angst.h
++++ b/angst.h
+@@ -8,7 +8,9 @@
+ 
+ #include <stdarg.h>
+ #include <sys/param.h>
++#ifndef LINUX
+ #include <sys/sysctl.h>
++#endif
+ #include <libnet-1.0.h>
+ #include <pcap.h>
+