gentoo resync : 28.11.2020

3 files changed, 3 insertions, 37 deletions

diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index 0572fda1ebab..9ce56c5c36d4 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -1,6 +1,4 @@
 AUX iptstate-2.2.5-gentoo.patch 675 BLAKE2B e24ec3afa9c75a097d0a1d27c4e63e125b909590db52e49a8789ac66e00ea308f5e63b2f7d55a09fbc6de728db5812563ea3e31b9908386cd5ad76330b4e862b SHA512 e78debad0e63c8cb6c41b84a058b597a29366c73bbf06766271179b2b7570e5770c5fe82d239a2d3ddf7bd8d42856ecfaf01fd020e66acbc5842dc598e63a90c
-DIST iptstate-2.2.5.tar.bz2 28270 BLAKE2B dd9369462b689a2e4fe7059666d384c34a265f03c7f6133d1f27e61eea7f8db4d3e96633b1b273584b6097c452da502d88b417d4fe23f83f494c767e377799e4 SHA512 044bbcf96225cc52b82428792d685d19f964520f7f20a9d3fa7e53430c1f552c0f09338a5d347b08e2500206cd7634a6b4a3acffbfd9e59e4657afb6df461795
 DIST iptstate-2.2.6.tar.bz2 28700 BLAKE2B 66e18425a4fed423a5a03c8f9ecbc87f4553a64475ab77144f3f37969eb6a399d52d7166bb68d9c9e80753163b841c71b42bfc13796e4a9d2c23db084740f3f5 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999
-EBUILD iptstate-2.2.5.ebuild 734 BLAKE2B 16b20401bb0ce96455bcf5453504700dda4b38af21fc54bb9d6aa99fe37a197c7a601fb771682d1f7b2118da126142de9b260cd52ec879e463ae880b9efa9027 SHA512 1631187026134fde778974dfa8368c00fec587c32292738e82b32dc70f5e214c5e7b25c5b8d65f8ee8f47f0c48d43376ed4698338acda8188321a6df61c3d784
-EBUILD iptstate-2.2.6.ebuild 783 BLAKE2B f31fbfb0580d7bf0a71b49764e9cba33c873f5654395b1f18b234c56278811a102982053c9117ddf90d1ed80d6c215b1c860ea61389aa746e9fc380b194958ed SHA512 69400711cf96bfcb0bc7c07af93db76d7da28a8c031454b2a3e443e15a7acc5946b527d78278845c9658e82723e8d69e888b60f811ac64df4b5ece1f31ba56c8
+EBUILD iptstate-2.2.6.ebuild 778 BLAKE2B 253e3316bf2dba271b93c401b40588a70049a4aa4e758557e86fe22d4528cebbb9f06717e6fc6143ebd99fef296f9dd0ab111870aff7e38112cab583a7e1606b SHA512 9b13e2253bc7cfd1adf7e95c19064c73f933b683245f32e0cba10148ee827d5fefbb96ee5c898cecb7a5d4c51da36f724938a1087823f13c13f979674b81b5c6
 MISC metadata.xml 413 BLAKE2B 4290cd85dc47c36f7f77914c9efb8031d0ebe9324112318fa4529daeff17c4df442aac7b97978fa399c6dc17ad65307f19ca7de70f9c3c21d07a9c96de69bac0 SHA512 d2bc802f6220c831ecf4c13c95d24e71032aea4b81e54a359eba2c6212df5cbb0c2ae00d2687bbc94d917b863917905b862bedd3f27a3eb7dc9239c06315bf7e
diff --git a/net-analyzer/iptstate/iptstate-2.2.5.ebuild b/net-analyzer/iptstate/iptstate-2.2.5.ebuild
deleted file mode 100644
index 0731ad67040b..000000000000
--- a/net-analyzer/iptstate/iptstate-2.2.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
-HOMEPAGE="https://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r7:0=
-	>=net-libs/libnetfilter_conntrack-0.0.50
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	tc-export CXX PKG_CONFIG
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr install
-	dodoc BUGS Changelog CONTRIB README WISHLIST
-}
diff --git a/net-analyzer/iptstate/iptstate-2.2.6.ebuild b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
index 7a073736f1e6..0f85670270ce 100644
--- a/net-analyzer/iptstate/iptstate-2.2.6.ebuild
+++ b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.7-r7:0=