gentoo resync : 12.08.2018

3 files changed, 2 insertions, 67 deletions

diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index af06eb2719a8..e9ef68f49455 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,3 @@
-DIST testssl-2.9.5.tar.gz 8955393 BLAKE2B 32518ace02f410ca7b407b51dcdab8a53218e572bec5d9a3ba380152546aaf63d8068f60d6468fbcba84e948e15c5c5769ef1da8ce53aae32978373de098d4e6 SHA512 9b9cc9f4e5d85cb2bd3767f10d0342b65cd9662df2df4d21b838c8f6a904e8e91f0242e7be1a9e0d9532d13d210beacd1b9f189ba6f955f9c4d3a6bde675677c
 DIST testssl-2.9.5_p5.tar.gz 8955523 BLAKE2B dcafb0931ddfb9d653acf79f72d2e30b2acc4a80246ecb3f26eaa35d4a69d5af65123005de34d09c563978593450895bf451b866182fd3ea38bdb121fb8e9385 SHA512 8a26989e1b8f45a2ac25efab500c89eeec2dbdbb9c0af715a61433ce0737ed69221df09a9554b6ae4415081a66ef4f6afd44c92405afefe4a810cb4375988700
-EBUILD testssl-2.9.5.ebuild 1426 BLAKE2B 30cc93e1c03ee6bc48df4fe81e765349af6c94c794e8e6291d2b3580a96a5b55919034ede2cfe5ff8ab8c6b02aa3afec6087ff3d70932f5c099d25ea54f21d80 SHA512 b1ecb8479877f7b92c6b008c5b0bfda6a554a0f22c5806b9b3c1022f058d4ff584570a9dfebe78f790820543ae8d659efa2ad679ae7671d14d62ea7b72c5b22a
-EBUILD testssl-2.9.5_p5.ebuild 1474 BLAKE2B a74f9ade90da190db9ae541cfa712b18311f915af277dffad45ce50a7b6f5989996543243dedb775afd9035296e0cf9397e219b38bccebc3d272b005b8111f57 SHA512 ef436d78eea58571ffb52ae722fe02beb649ccc78150034528adf736eb7e37387e8f97ad87ff5599a0b9a426fdd6397c3b96f1f4af44156163dc86a1f4ee6025
+EBUILD testssl-2.9.5_p5.ebuild 1473 BLAKE2B 326690236316459714585744468d9c8a33b6ca21410a6cdd2b23374b389d1b42fd811cc485d0f6a18a52160bd3ead39cf157b447a3578bdaab15a1602fe0b3e7 SHA512 cee8411954f0d26a94c7e96c07c2de6f65d65720305e288ca9d1acb03ac478aad0479eb9d103d5b90911570cdc269a19a37d780efe29bf8b8e353da813d87271
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5.ebuild b/net-analyzer/testssl/testssl-2.9.5.ebuild
deleted file mode 100644
index e5a5559d687f..000000000000
--- a/net-analyzer/testssl/testssl-2.9.5.ebuild
+++ /dev/null
@@ -1,63 +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 ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-}
-
-src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	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_p5.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
index cdd8f511f518..91bc8e35c780 100644
--- a/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
+++ b/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bundled-openssl"
 
 RDEPEND="