gentoo resync : 02.09.2020

4 files changed, 2 insertions, 110 deletions

diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 5010c5e9f5f3..853e96eb2de2 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,11 +1,7 @@
-DIST sslscan-1.11.12-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
-DIST sslscan-1.11.12-rbsec.tar.gz 56346 BLAKE2B 0079a4be50c037c02bc716341315e0a2164742f270a54fa616ba223b5ecc56bdfa9cec3bc495cd57d4d20cdb4331c622bb78b705f2516fcff228306bb1e5c6ff SHA512 e667cc50f0ec71343b73ca11871a1a53aa9f255c671f16b7c5f33093125a1e60d6e7945e7bd7296f4a71aa6837c823dc939e18982f3e3f831acc061ead9e7ebb
 DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544
 DIST sslscan-2.0.0.tar.gz 109677 BLAKE2B 728ca5f59e7d46cf6bf4ac03fce8eb8b7183f9984da58985c3964a3d82c2b5ba6e1f90361cb7c504db3555ff0d6edb739a97aa2b6b4c90970ababd1bf2faa9cd SHA512 faebf7014738a991be4d1d78fe0e9523f24a00c4154c19862fb46c3cc1674d5f8c3ab03e58975401e3265c9e2ada0cab9898d17c0f089dd3a20ba44b4fbf78ab
 DIST sslscan-OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265a3789acd9ca65d0a1162a1808a089a92a234e88c951f2a3cdabd3b1908ac7fe6d5f2b5fe554f229a22c11ab185b SHA512 bc8d24d7fc93542a8d77e13a57768de242ef679ef4db93c1b6b981a15a60646a5c5d869d066248448f3eb1ab2012e3ddc80bf301f486c0574d469a3f7db7b8d4
-EBUILD sslscan-1.11.12.ebuild 1158 BLAKE2B 8e6eaf2230adcbd177ac5b6b5755afd110c6ffd1d63abfecd2bd52139a6697935e855b793ddb03eef404642b66fa0fe6a3a24e2a142781c8d148b9d0ecae9e4f SHA512 0436371a9d645dd0396844dc5ffcd5bb8d7180892760024bcc57344962c05e1019eda986a6e116b51b319712d9876a86786a0d6e89fc13ece85a1d45790e5222
-EBUILD sslscan-1.11.13-r1.ebuild 1030 BLAKE2B ada69407dd69f3a9ef9089b730b634afe445a0119bd3ec203deb8277718c4e1d5e37e9a0f70f2107ea258112e8e3dee0275e39b093134a45761831cd1a358508 SHA512 7b4057d34048d772c903294546b91629c1ad1a899489baec1416ec79fdd262088e2b5bc8aff1753e55833d57d1ec39bf1142aa0d101119dd828a0e283e6ae5e2
-EBUILD sslscan-1.11.13.ebuild 1160 BLAKE2B 132efea34f015b54ecd5e6c4e47aaca1c3a2f34b3dad1d95caded11b9a2261427d7c0177521a5676b38f315147e452aac56f9c9d3a68dec85d69ab4bcf3f6328 SHA512 e5f66a9aa033596ef033c87d31328d6a62969b7164143c0fd0629e1c497c5f7a16cd68b2bf1853a5d34ecb769d9d6c74bcdfbb222d864de85f59ed58806f90a3
+EBUILD sslscan-1.11.13-r1.ebuild 1029 BLAKE2B 3e0c3fa00d0a29907180b2307efe0e628305951d614613dead3fe4580d000f13151bbfa88070240048e5e2cb02e0699355312cca6947d19c1fcba3c0b3178ff7 SHA512 92032809178fcd9bbf769059afd3f31fbda24f9b8e6ace40acbca7c09a7de314ac94408ad2b8c00daf181fa89ddf376cc00ab7bf3662c38dae68d1a88a4fc63c
 EBUILD sslscan-2.0.0.ebuild 1306 BLAKE2B 1c680fed2c128a4869237ce577ca84750cc4f3abdfd5e77bca9337e54b9beb9c87f9f472b142364c5080bf75c81ce19823993e040f90a15baa19f8e271c98f7d SHA512 4b4efea689620533de521a25576e320f8d3e71d83439bbfe175f5ad7937743f7246bb5b0ed9ae6affd418160f3e834a96f9ad8bccaf8f469909bbb34f112958e
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.12.ebuild b/net-analyzer/sslscan/sslscan-1.11.12.ebuild
deleted file mode 100644
index 6d30e8c8c250..000000000000
--- a/net-analyzer/sslscan/sslscan-1.11.12.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Upstream now builds against the openssl 1.0.x fork by PeterMosmans
-MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-MY_FORK="rbsec"
-SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-	static? ( https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl +static"
-
-DEPEND="libressl? ( dev-libs/libressl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	if use static; then
-		ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die
-		touch .openssl_is_fresh || die
-
-		sed -i -e '/openssl\/.git/,/fi/d' \
-			-e '/openssl test/d' Makefile || die
-
-	fi
-
-	default
-}
-
-src_compile() {
-	if use static; then
-		emake static
-	else
-		emake
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild b/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild
index 512f14c5186a..1cf3cf65c006 100644
--- a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-analyzer/sslscan/sslscan-1.11.13.ebuild b/net-analyzer/sslscan/sslscan-1.11.13.ebuild
deleted file mode 100644
index 0a071a7e55af..000000000000
--- a/net-analyzer/sslscan/sslscan-1.11.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Upstream now builds against the openssl 1.0.x fork by PeterMosmans
-MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-MY_FORK="rbsec"
-SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-	static? ( https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +static"
-
-DEPEND="libressl? ( dev-libs/libressl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	if use static; then
-		ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die
-		touch .openssl_is_fresh || die
-
-		sed -i -e '/openssl\/.git/,/fi/d' \
-			-e '/openssl test/d' Makefile || die
-
-	fi
-
-	default
-}
-
-src_compile() {
-	if use static; then
-		emake static
-	else
-		emake
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}