cipherscan: 20190726 bump

net-analyzer/cipherscan/Manifest

@@ -1 +1 @@
-DIST cipherscan-20180519.tar.gz 13388922 BLAKE2B 7319d05dceba26a72ed8b0a8fdf4f5c89bd4ff86062410e5800a0dd24e5254ef34db7e20f9e994385bf6d20fab67c072e61e9376eb2df9cac2607ca7d5b393f8 SHA512 dc957cd46707b18344d0ef7bf85ee70916f8926f5b32b5dbacbf20205e8249155c03441c3781b02854105bfe0e79bbaf650450873dc30fdc58d7ff019d76b1ad
+DIST cipherscan-20190726.tar.gz 13388732 BLAKE2B 98370c242648b8e9aa8183dd354c380d7470b571dae0b6aad60fde849b86d0a1ec80dbb3b55bb0a9ef22481b5ba7056f956e1fe9f0db17bfb38e8e8006b2a53c SHA512 70e293b479cdd598b7628cc86bdc0b41f18db0cdffc923d063f5b093276a555d169e6531a0ae03dd08b83f98a6748a87f1f0a9da36e48e8d461393151b682dc0

net-analyzer/cipherscan/cipherscan-20190726.ebuild

@@ -1,12 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 EGO_PN=github.com/mozilla/${PN}
 
-inherit python-single-r1
+inherit eutils python-single-r1
+
+DESCRIPTION="A very simple way to find out which SSL ciphersuites are supported by a target"
+HOMEPAGE="https://github.com/mozilla/cipherscan"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -14,50 +17,58 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	EGIT_COMMIT="b0548dff8e5f9a098b7e14211f610ff63e3f63f7"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	HASH_COMMIT="ff8eac48c360cf9bd84d82e247ade1e52e8281ce"
+	SRC_URI="https://${EGO_PN}/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="A very simple way to find out which SSL ciphersuites are supported by a target."
-HOMEPAGE="https://github.com/mozilla/cipherscan"
-
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # cipherscan depends on dev-python/tlslite-ng, not dev-python/tlslite.
-RDEPEND="!dev-python/tlslite
-	dev-python/tlslite-ng
-	dev-python/ecdsa"
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		!dev-python/tlslite[${PYTHON_MULTI_USEDEP}]
+		dev-python/tlslite-ng[${PYTHON_MULTI_USEDEP}]
+		dev-python/ecdsa[${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+S="${WORKDIR}/${PN}-${HASH_COMMIT}"
+
+QA_PREBUILT="/usr/share/${PN}/openssl"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
 
 src_prepare() {
+	default
+
 	# Dirty hack to actually add a shebang to the file, so that we can then fix
 	# it using python_fix_shebang. Without a shebang, python_fix_shebang won't
 	# even work.
-	sed -i '1i#!/usr/bin/env python' cscan.py
-	python_fix_shebang cscan.py
+	sed -i '1i#!/usr/bin/env python' cscan.py || die
+	python_fix_shebang "${S}"
 
 	# We don't want cipherscan pulling in the latest and greatest
 	# dev-python/tlslite and dev-python/ecdsa using GitHub. We fixed its
-	# dependencies using RDEPENDs.
+	# dependencies in RDEPEND.
 	sed -e 's|\$DIRNAMEPATH/cscan.sh|$DIRNAMEPATH/cscan.py|' -i ${PN} || die "sed for ${PN} failed"
-	default
+
+	sed -e 's|import .messages|import cscan.messages|' -i cscan/*.py
 }
 
 src_install(){
-	dodir /usr/share/${PN}
 	insinto /usr/share/${PN}
 	doins -r *
 
-	fperms +x /usr/share/${PN}/${PN}
-	fperms +x /usr/share/${PN}/cscan.py
+	fperms 0755 "/usr/share/${PN}/${PN}"
+	fperms 0755 "/usr/share/${PN}/cscan.py"
+	python_optimize "${D}usr/share/${PN}"
 
 	# cipherscan needs to be run from its installation directory.
-	insinto /usr/bin
-	doins "${FILESDIR}/${PN}"
-	fperms +x /usr/bin/${PN}
+	make_wrapper $PN \
+        "/usr/share/${PN}/${PN}"
+
+	dodoc README.md
 }

net-analyzer/cipherscan/files/cipherscan

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/cipherscan
-exec ./cipherscan $@

net-analyzer/cipherscan/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>

profiles/pentoo/base/package.accept_keywords/dev-python

@@ -507,3 +507,6 @@ dev-python/IP2Location
 ~dev-python/humanfriendly-4.18
 ~dev-python/pytest-xdist-1.31.0
 ~dev-python/s3transfer-0.3.1
+
+# required by net-analyzer/cipherscan
+~dev-python/tlslite-ng-0.7.5