gentoo resync : 31.10.2017

3 files changed, 2 insertions, 65 deletions

diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 9c70ce453038..2afd2c801306 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,6 +1,4 @@
-DIST testssl-2.8.tar.gz 8529038 SHA256 2e4588bfcd5f4e6b30b2e250d51b39e4209131a5366f1e75354aaa4a5ee6a22d SHA512 9c30a0640c4c516bb6fd776d6d7d76af4f86be51ec2c282fad01b8ac14161d29732caf08ed64a0a93ad53c3afabe6641f423bc73f0323bd9526a4283fccad584 WHIRLPOOL 04564912e3e0ed3afac283da994edc032bc3b23c2c003ea02f531da25555dbb758f76e8ab04be38c6af8df340f7400545072f33dbb074586144bc2258d0de5e0
 DIST testssl-2.9.5.tar.gz 8955393 SHA256 3cd2d14b9b324545ff91d63e4261113f6ff0c6e32232cf49438b9fd2f3c8de3e SHA512 9b9cc9f4e5d85cb2bd3767f10d0342b65cd9662df2df4d21b838c8f6a904e8e91f0242e7be1a9e0d9532d13d210beacd1b9f189ba6f955f9c4d3a6bde675677c WHIRLPOOL faa158a05c8523df1e4142bf1838f4049d7ed9c9a2afbe2a97e190f19c5ab2efce878fb92e50665657e8cbf6a1abdfb2958b0ad142e2bc86e30a8bb672146968
-EBUILD testssl-2.8.ebuild 1396 SHA256 567ab64b38a034acd0bdb5c026e23f92f12fd5f1b96f04190c190866265be982 SHA512 51b485f25fb9448a510455b4aa8172b7f046fd3f15c9494d019d3f1e14816a9c9a996d7c9c7de3a7464288fabb532a642f1c8c846d380eb2b6e7f27c2906c8e0 WHIRLPOOL 97cadbbf78c63151e6014011784e4969199e527d17c5a20390ee0343f72b1bfe2a11144caf041680ba911567fde99b6aeadbbbcf609026a8950ef0e137a940f3
-EBUILD testssl-2.9.5.ebuild 1427 SHA256 53ea4c0958e7eb2730f7bcea9ee0d7af44ec617c31923bd56f322c7099c22b9c SHA512 5f41a1393afa10fafb1960006ed963953dbe90697d3044dd1e3a1e072f8df42b318820782b12fa720b1e6e00d4f0b0977194e17451ac88f7fcc1656a4ed3a49a WHIRLPOOL 6148fb2224537f215a24bb528f4612cd71f9cca15ba582a32e03165954a0476e99d2db860306362733f4725bfd283f22ddccac72238adc4c08b23d47cc37df24
+EBUILD testssl-2.9.5.ebuild 1426 SHA256 891c4820a9dc5525fd0d53b0fc38b900948338b4f8e746c779f7f43e2088fb89 SHA512 b1ecb8479877f7b92c6b008c5b0bfda6a554a0f22c5806b9b3c1022f058d4ff584570a9dfebe78f790820543ae8d659efa2ad679ae7671d14d62ea7b72c5b22a WHIRLPOOL 6cbd8c154a15afc892b487863c57f52279c2635ef9d787e9118810b8bb45ce1d20e95b60cbe48576af7fcb90273b980a2a7e7525338b7a795973716b018c3cae
 MISC ChangeLog 1148 SHA256 7387784a88de13fdaa0b09fff1f8d255729ccf8f1ddb121cca07067456366794 SHA512 ed6bdfab18a0d4898c7e6afde0842f3b635695dba2f6f0846534f64427fc52418b8b6d27e8fb0b5ed2f448e77e7cd4e4c21a2bd50a2c43319a011800df7a715b WHIRLPOOL 862e19b7e63c9976375077622e2bedaa06937dd7c66504ad6c7b19ebb2a438eb7d0da2c213ebd3a3cb7109943e2dff7ac0f46f19387fd5856ca59c2a04c0a7d6
 MISC metadata.xml 427 SHA256 f9e642a1c5ece37509373afb6e8152c0d516d8fa0802872dcd50a9cdf1870aa9 SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab WHIRLPOOL fdff73ccb431fb2fabad3186df41206a875de7d98c518bcee26bb16a141e4f4f9dec343dfef484d2f1649542755defc40096ef632116826642d06d90c388f743
diff --git a/net-analyzer/testssl/testssl-2.8.ebuild b/net-analyzer/testssl/testssl-2.8.ebuild
deleted file mode 100644
index 20712e46f347..000000000000
--- a/net-analyzer/testssl/testssl-2.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN}.sh"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="bundled-openssl"
-
-RDEPEND="
-	dev-libs/openssl:0
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|MAPPING_FILE_RFC=\"\"|MAPPING_FILE_RFC=\"/usr/share/${PN}/mapping-rfc.txt\"|" ${PN}.sh || die
-}
-
-src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
-
-	dobin ${PN}.sh
-
-	insinto /usr/share/${PN}
-	doins etc/mapping-rfc.txt
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
-
-pkg_postinst() {
-	if use bundled-openssl; then
-		einfo "A precompiled version of OpenSSL has been installed into /opt/${PN},"
-		einfo "configured to enable a wider range of features to allow better testing."
-		einfo ""
-		einfo "To use it, call ${PN} appropriately:"
-		einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com"
-	fi
-}
diff --git a/net-analyzer/testssl/testssl-2.9.5.ebuild b/net-analyzer/testssl/testssl-2.9.5.ebuild
index c6ac1f8ddd28..e5a5559d687f 100644
--- a/net-analyzer/testssl/testssl-2.9.5.ebuild
+++ b/net-analyzer/testssl/testssl-2.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bundled-openssl"
 
 RDEPEND="