gentoo resync : 28.11.2020

4 files changed, 2 insertions, 88 deletions

diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
index eeb6a901bdfc..41988854dc4b 100644
--- a/net-analyzer/labrea/Manifest
+++ b/net-analyzer/labrea/Manifest
@@ -1,7 +1,5 @@
 AUX labrea-2.5-pcap_open.patch 1115 BLAKE2B ba279ea65a905df62a9886ba5db86fb7696d88bfee1309f01ab8b0515809ec88706325e7486bcc3d8b7b6c32d29a1b0270420eaacfe6c825a1e96f65f8780c78 SHA512 336d06bc3db06d19b48a1c5c6b5bc9da31aef6d0103de3c711563e6cb74c650480bf2bfb4606686bc0030140ced2ffd54ad36f24a9bce06bad43d94c33906335
 AUX labrea-2.5-stable-1-incdir.patch 218 BLAKE2B c0b795e5c2010b733522873c8e78ce12551fd8009a51b32af01dfca64202f7ecd22f13935ae84de3ee7ac3949ffafd060cba69503d19726aea51524cccc4984e SHA512 935a9e0a884d8b1c7ae30c24c59c3f30d0491bde45329fe00f0f64e854d9c686b22f002dce832d5dbb17a45e23a0a3e3aae64f1150edc349c8b3499bd8bcadd1
 DIST labrea-2.5-stable-1.tar.gz 210494 BLAKE2B 3db2f4c014c578446fd9d6303f8c17245d3d9a7e8e481bf64195693f21eb30b9e0e2d6cf59ae124982e358d4aad2d22654ee46544957ab783f33a13c951d6a3d SHA512 63523f59e9e6ca31d2a5ea781f7b7087e7e41835aec24cd8cbf1cf7b65893fb1cedb2b13aa5fcfab458375ef27f5521a9ab88a71734b7317edf8eda2746c566c
-EBUILD labrea-2.5-r2.ebuild 797 BLAKE2B e951f243097015fd039e03711f83346cd65b57b9d9b1ea799df0182093b34581c6c0f75eca3833eaa87826a59eb5330a18a924c6164e00515e07d53faef28062 SHA512 e2d5cdf2c81b941f62c54832a8f2b03774540474491694b243581693fa61391174c14ce2947d4cfa7d95e1450a8d7ab075ab26001f96f6b5d5518cd4db10afd1
-EBUILD labrea-2.5-r3.ebuild 845 BLAKE2B d4a799401c9aac57385191dfef319bf17a92dd836db1bd10266d0b902e41c7dbeb7f7781482f6885d84dd84998e9602d349a96017bfd77675f409e465cf3c2ab SHA512 9c0f79e5552afb66cf0900582f4cf0dbe2c61a331dc0a9e563628e0ebb415f6d03c4de285c3dfcdbba01fedb61cdd7837ce2d25bc06aa24bdecfbc4f2250413c
-EBUILD labrea-2.5_p1.ebuild 903 BLAKE2B ecadc9d77f4dc4e372a767268bf8e792a6495d8dc1f4d4d63800c7b61337ee05ee0632a767691e792d84f9e409fc9d08f86ab75ac1238ca2aa72fc079a90b0e4 SHA512 767b6eb21e1db806ce432ad98a218ae242ec3f536995f6d726d946ac0922947c3d84b47eb5f251a2118cb198d713d772454761e31ac34e08dd84f4eab9d704e3
+EBUILD labrea-2.5_p1.ebuild 901 BLAKE2B 70891ed7bf83635f59a2f9aa715ea1509e6cdd21e698245d7c454c55d8ad8c99dcdb93a99ed27b2bd1df9f1863e1cef3c833a716b9073ebcfa2a1bc9ecb8f4a3 SHA512 f679291c0d3bbe7ebe3c4e1d1fd0c64fca5be0c1c709fa9a48babdc3c2a9fe496ea5051cd7fbff58c9b6a320d13b62b988014da51c7e77005177ea57dd25fae1
 MISC metadata.xml 356 BLAKE2B c78b737ba6e150b7abd18c22da130c805177c64bcb197c2d7909b5a74a35484d87a5a45b4b968cbb0aea0bdc3af6499d9f8376f39dab4df33bdcf3cf82f28e2c SHA512 1b4738687beee35bb3fd628d1d5c1fa9e16b7d938f21644343b23a6c7aaa5b6e760c5342cf88485265ae11f6d00c073e8564b37fe1dde4543323de069f8115a3
diff --git a/net-analyzer/labrea/labrea-2.5-r2.ebuild b/net-analyzer/labrea/labrea-2.5-r2.ebuild
deleted file mode 100644
index cdbff85668a0..000000000000
--- a/net-analyzer/labrea/labrea-2.5-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="'Sticky' Honeypot and IDS"
-HOMEPAGE="http://labrea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="net-libs/libpcap
-	>=dev-libs/libdnet-1.7"
-RDEPEND="${DEPEND}"
-
-MY_P="${P}-stable-1"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog README TODO NEWS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stable-1-incdir.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	newdoc INSTALL README.first
-}
-
-pkg_postinst() {
-	ewarn "Before using this package READ the INSTALL and README"
-	ewarn "as the author states that it can cause serious problems on your network."
-
-}
diff --git a/net-analyzer/labrea/labrea-2.5-r3.ebuild b/net-analyzer/labrea/labrea-2.5-r3.ebuild
deleted file mode 100644
index 1d43736622c7..000000000000
--- a/net-analyzer/labrea/labrea-2.5-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="'Sticky' Honeypot and IDS"
-HOMEPAGE="http://labrea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	net-libs/libpcap
-	>=dev-libs/libdnet-1.7
-"
-RDEPEND="
-	${DEPEND}
-"
-
-MY_P="${P}-stable-1"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog README TODO NEWS )
-PATCHES=(
-	"${FILESDIR}"/${P}-stable-1-incdir.patch
-	"${FILESDIR}"/${P}-pcap_open.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	newdoc INSTALL README.first
-}
-
-pkg_postinst() {
-	ewarn "Before using this package READ the INSTALL and README"
-	ewarn "as the author states that it can cause serious problems on your network"
-}
diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild
index 5c375b86225b..5fc9881601f9 100644
--- a/net-analyzer/labrea/labrea-2.5_p1.ebuild
+++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="
 	net-libs/libpcap