gentoo resync : 28.11.2020

3 files changed, 2 insertions, 41 deletions

diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
index 2471322dfa2c..b32f8f349378 100644
--- a/net-analyzer/ike-scan/Manifest
+++ b/net-analyzer/ike-scan/Manifest
@@ -1,6 +1,4 @@
 DIST ike-scan-1.9.4.tar.gz 1360202 BLAKE2B abe206b22a23a6d4eaa2218204657d6c47f22ac8009df1f1e7918fbb55575033f237462ed57ba89aee8bed28e47a4dacf69e443dac5cd3b506842e26e71f97e9 SHA512 d7dde6d3d76a2e3ddeb9ed1f0dee3e2c3a13d4afa57ebb8ff19f6af094f7334b464509cee6ffc385d2703bcf9bc1c503bc604506279518f692f82c8f12f146be
-DIST ike-scan-1.9.tar.gz 1412689 BLAKE2B 97a18ca35a80b66859e2ab99de916041eb9c9d869f96bbd799be88079b84022dcc2ecb5df2cecefff793192333da915957adc6b0c3d4bb376397941d4a731323 SHA512 c586ad4d485f04398c2800af5ced1392eee0f7f7d7d117602be45134a47442b38c4fa23fbbf137af5a37298b471a6bcdd6e94559dde695d06e96dd39f0681906
-EBUILD ike-scan-1.9-r2.ebuild 854 BLAKE2B 0c43f0e6fd898b87dd661ed1ba724abf70c5c7643868ef5beedcba5d1def1099c7e9a8940dc095d195c4ce31fe120e44623c96cd12d200c45954d6ae34427566 SHA512 25548c44a017fdfa1d8cf891046b9f978c4b6e592c204a1148d5321e2891da374e0e7763a4de8f85c18a6998b3d68e16203f5eabae1606daa067602b40f75958
-EBUILD ike-scan-1.9.4.ebuild 800 BLAKE2B 60f3c73677ffcee8c43580ebbede9e175a2925bfc9f9048b6ee40a515ea4a833d6f1b7f20a3ec198536626cd25886e47e73e05583a703f905b01237568620694 SHA512 ca6824eaf9e7692dabf7058c7bfb80a01e3e8336c4bdfc9c356cb9a1cef58e5b9c3273ef56cad6a20f094f27b25f2a0a67a3a9e400c6562d577aed553457ad46
+EBUILD ike-scan-1.9.4.ebuild 799 BLAKE2B 60b375af9cc66b4a08e63c50b96122c9462ecd4b1496bf5664c8065710bf8aa22d95f14bfd94edb35ae11b30ef881f7451e2b802fe14e2c41956cb0439c6c5ce SHA512 a30d6ed9efcd5e1856aeb5fe5a1338737250a737b802cc6c665256c8790eaa4e127fc7f69639cee45a8e59ab86f7f91193b001486782a61ea808b5e0cd0ab618
 EBUILD ike-scan-99999.ebuild 761 BLAKE2B d1f557c9c7ae94406351c2cfde784b333dc73d960e49614b697589c5c36c7edc07f4de92f25f7561717caebbfe220e30a28306d34ed1796fe1d4407474fa5fe4 SHA512 c9946c1673cef61a6589e800eb343397742511659da254b2f2ad0927bd94e71de91ab283d60f148c4da0c717ddea2d20481ebfddf7e1e878df9c512d6a909056
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild b/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
deleted file mode 100644
index 8792715b52a2..000000000000
--- a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
-HOMEPAGE="http://www.nta-monitor.com/ike-scan/"
-SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="libressl ssl"
-
-DEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Fix buffer overflow, bug #277556
-	sed \
-		-e "/MAXLINE/s:255:511:g" \
-		-i ike-scan.h || die
-}
-
-src_configure() {
-	# --disable-lookup prevents ike-scan from phoning home
-	# for more information, please see bug 157507
-	econf $(use_with ssl openssl) --disable-lookup
-}
-
-src_install() {
-	default
-	dodoc udp-backoff-fingerprinting-paper.txt
-}
diff --git a/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild
index 8fbaa0ed31e5..9237de4dda56 100644
--- a/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="libressl ssl"
 
 DEPEND="