gentoo resync : 28.11.2020

3 files changed, 2 insertions, 41 deletions

diff --git a/net-analyzer/nast/Manifest b/net-analyzer/nast/Manifest
index 2f301cb1406b..1c5b51ebeb78 100644
--- a/net-analyzer/nast/Manifest
+++ b/net-analyzer/nast/Manifest
@@ -1,5 +1,4 @@
 AUX nast-0.2.0-gentoo.patch 3056 BLAKE2B e64a4e76fb4c9b0bb4e325f5addae07d740f8b4d6dc76a4011e16a9dddcff137f5a3fba013f8d29db342cd08b37228e2daf7e78b18607e385e71b9eb7b84a4c4 SHA512 9ce75c031dde2a8460d187ee082d182d9aa60524475ca1a5972dce5e4b20c68275c90dfc7a7fec5ae2585a5815ca4dc2a9e059ba31de64ad4f890f811cfea4c3
 DIST nast-0.2.0.tar.gz 147568 BLAKE2B f51a0b3cebfac04cb3aa57f627099aecf893722ca8552c0e6f7f67266e13729e5c54c533cd7599c6d7cfa50c89ad5181439d4c1bc5bba883438213b45b4221ee SHA512 fbf29f9c2ae783e38d40054577a697f631c6590075ef80aa970002f1133c681a4cc1fcd715bc6140cc361c609dcebe8c6bf74544e8710363d30649398b3e388c
-EBUILD nast-0.2.0-r1.ebuild 746 BLAKE2B 1ce039f23876bf15ca06f509a6ecfaa8fa60337f818b33074e2426b9fb27aaf337f3f8e787cffe6c47b09c8c0e884d367adffb2999c1942097a802c32d140d18 SHA512 a28997e6077a1fc61467289fbbd584a01343fb2ff7561b3c09941175bc7a8a84ad5812f382cc8b62283dcde0374913954cf7b1901b13efaf8bc9cb49e408aca8
-EBUILD nast-0.2.0-r2.ebuild 818 BLAKE2B 4e09a57133a58359fcbd250f512f98164b4df85eda000b8d0eaa047784446f16b33a8c2adafc0b4c784564145b14e2df113ee57eadcd314a96fb7ce4d2ce9202 SHA512 0d79ebdc8d3ab3f7e42d28e2177c07006ff47f963ff5d22463deb551a4899cccd6bdae354b8d20856f9e18d3fe2126891bd6ed5fdea004ca3e2db55cf03263f5
+EBUILD nast-0.2.0-r2.ebuild 817 BLAKE2B ed86d93ac0c02e80bb873ba88585b763b3ea11f8f620da406a3dc83cbeffb9ab9b3fc31ff8f77cc8f78427c6f2edbb403c89758f33a5864a0273b40c9bf835af SHA512 7570dd2b8457c12c3b7a63d549c9629d91369e28dd857ff4a1311b60ea0fe8f5fbca1d8c4e7a471dec6c91a23d82803684fe23e960651682a427f9bb69ee1363
 MISC metadata.xml 362 BLAKE2B 71e940947887c3c558f6c84124909fef707dd02fd9fbaee18d58df8c0bcef64e01bb65731c64def6d619392b6ed35b2232054e31d63c3c3ab8a59e70c1a36276 SHA512 594d05be889c3a8d6019ee0762773f8abb71f4da276c3a546704ae4e073856fa404f5f9b466502b19423ac9e7f00ad8c2ef85d4adbfebf7fdd0184189e454148
diff --git a/net-analyzer/nast/nast-0.2.0-r1.ebuild b/net-analyzer/nast/nast-0.2.0-r1.ebuild
deleted file mode 100644
index 9eefa451cd9c..000000000000
--- a/net-analyzer/nast/nast-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
-HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
-SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
-IUSE="ncurses"
-
-RDEPEND="
-	>=net-libs/libnet-1.1.1
-	net-libs/libpcap
-	ncurses? ( >=sys-libs/ncurses-5.4:= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dosbin nast
-	doman nast.8
-	dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO
-}
diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild
index b2e8f7dd0342..bc1d6e76e220 100644
--- a/net-analyzer/nast/nast-0.2.0-r2.ebuild
+++ b/net-analyzer/nast/nast-0.2.0-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="ncurses"
 
 RDEPEND="