gentoo resync : 13.10.2019

3 files changed, 3 insertions, 37 deletions

diff --git a/net-analyzer/fprobe/Manifest b/net-analyzer/fprobe/Manifest
index b96a667a2774..6ff2b6246e1a 100644
--- a/net-analyzer/fprobe/Manifest
+++ b/net-analyzer/fprobe/Manifest
@@ -3,6 +3,5 @@ AUX fprobe-1.1-pidfile-sanity.patch 1319 BLAKE2B 911a4ec1f48f602c750a659c478380a
 AUX fprobe-1.1-setgroups.patch 454 BLAKE2B cec2168dbe296dea2e38d87398fd9d44543f1a0e679f8f02e0161363b4e436e07eb2c4ffc1242aeebb7db26f00d01c5360b2dc5dde60676d8f07ca609ccf8ba8 SHA512 a5248f5962f2ccb9e9235ae772d72b74db40504894e2ce40644af740849a98cfdaaa74beb151ca0e852f2df1419ee2366ed5850a15a23a54ebd3aab7569060fc
 AUX init.d-fprobe 1099 BLAKE2B 0c20d0b476298b05fd88841f40acd241897210edbbf35041f87e86f9a512e1f8da7e0b4e59425dbb364555690608ca8f950a63fd4c9b96c67301eecdfac98338 SHA512 60823b35f809ada8de94f6427e2371681f646545b227974c4d5c94ae5153d48ad3815c848702606dc2ee18622787f1d04c499a241d60475c00303c6b652b9e51
 DIST fprobe-1.1.tar.bz2 104358 BLAKE2B 960fd8941ec2a7656b9eb02a0b6ae091b6ab564b4f97aa8147ce1bc3785964008168a1ac43a3fbe2e342987ee68fff711648edb910a059222017fe1282205e8e SHA512 35fa4bedf2c615093b6637630322115e12f005bc43186b86c55c6bdc76ae5308dd31e1d05632e26e07a30fba88d76b9acc98632bee4f372edcf9df5da3e32210
-EBUILD fprobe-1.1-r3.ebuild 805 BLAKE2B 875105b66b27a36de952fd0abf6617c1ebd72c57778bcd31c70c667ada5b2950630f93ea519980ac131ed21f85ff59667a320564f21464c801b07859465752a3 SHA512 0e04cd9b9d0691c1a5c3bf36c6e66cf48ffcf0ee7f798f569f6ad090db2fdf7a56af3dd9d1a5d81007677dc343cc45f04c956160817f0ab39e2f3310fa246ee3
-EBUILD fprobe-1.1.ebuild 710 BLAKE2B 31fb2cc98cf7e134bd5388a94d7f2e3b389010ff1d5a7c75ed7365ba96e2426781f7041f3d2a8f6fda5d24540d5f2d33243e0dbb6c72af0fecdcf5398b74643b SHA512 727c45c7d4667dc532c46bf21b4655fb841303bbedab0a0c293716f5553b43426e3196d083fd05018c253c11a82e59cbd83fcd5d56bb186b804d8c5420490884
+EBUILD fprobe-1.1-r3.ebuild 801 BLAKE2B db254f316f6e3dc634b5e145322ebcc515c8baeec598fa91419a7522d0efb39e0162ad285a22c3f18583e72427b721e2ffbfebaa352d0becce9c68cd477e3ee0 SHA512 6af18b0521b9c8fcdfc0abf0c3a9163adf65869c3181b16a2574b0c3a9c42442ef911dc8fe7420fbc3d3668e32b5076987f25502153b4ee80c6be331f05f496b
 MISC metadata.xml 426 BLAKE2B 3ed8a67ede1c9d27d291645589c3eed9fb13ec009974dd9a113bdc3f5548deea784ccfef968501f282e9161f319bca59b835e5e822852537df93e8b75406fa5b SHA512 2b9247d129021a3e25d3d4196a48ec2d204d2e91307231d372cc1bde255553785c9e413ba3dcd6a62ad28e54ba46e732212aeff4bcb03e796f2ba87325dd80bc
diff --git a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
index c9f12cb15c7d..d86d043a9c3f 100644
--- a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 
 SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE="debug messages"
 
diff --git a/net-analyzer/fprobe/fprobe-1.1.ebuild b/net-analyzer/fprobe/fprobe-1.1.ebuild
deleted file mode 100644
index b187de05373b..000000000000
--- a/net-analyzer/fprobe/fprobe-1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
-HOMEPAGE="http://fprobe.sourceforge.net"
-LICENSE="GPL-2"
-
-SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-IUSE="debug messages"
-
-DEPEND="net-libs/libpcap"
-
-src_compile() {
-	local myconf
-	myconf="`use_enable debug`
-		`use_enable messages`"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS NEWS README TODO
-	docinto contrib ; dodoc contrib/tg.sh
-}