From 6f6fba42c809527cadbc92abc729c4e4e8dc82cf Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Wed, 6 Sep 2017 10:07:28 +0800
Subject: [PATCH] python/*: fix issue #237 completely

---
 dev-python/PTP/PTP-0.3.0.ebuild               |  2 +-
 dev-python/PyVirtualDisplay/Manifest          |  1 +
 .../PyVirtualDisplay-0.2.1.ebuild             | 21 ++++++++++++++
 .../PyVirtualDisplay-0.2.ebuild               |  2 +-
 dev-python/clamd/Manifest                     |  2 +-
 ...{clamd-1.0.1.ebuild => clamd-1.0.2.ebuild} |  2 +-
 dev-python/cxoracle/cxoracle-5.3.ebuild       |  2 +-
 .../editorconfig/editorconfig-0.12.1.ebuild   |  2 +-
 dev-python/esmre/esmre-0.3.1.ebuild           |  2 +-
 dev-python/esmre/metadata.xml                 |  5 ----
 .../guess-language/guess-language-0.2.ebuild  |  2 +-
 dev-python/halberd/halberd-0.2.4-r1.ebuild    |  2 +-
 .../isc_dhcp_leases-0.8.1.ebuild              |  2 +-
 dev-python/netfilterqueue/Manifest            |  1 -
 .../netfilterqueue-0.8.1.ebuild               |  2 +-
 .../netfilterqueue/netfilterqueue-0.8.ebuild  | 26 -----------------
 dev-python/phply/phply-0.9.1-r1.ebuild        |  2 +-
 dev-python/pygtail/pygtail-0.7.0.ebuild       |  2 +-
 .../pynetfilter_conntrack-0.4.2.ebuild        |  2 +-
 dev-python/python-ntlm/Manifest               |  1 -
 .../python-ntlm/python-ntlm-1.0.1.ebuild      | 29 -------------------
 .../python-ntlm/python-ntlm-1.1.0.ebuild      |  2 +-
 .../python-owasp-zap-v2-0.0.9.ebuild          |  2 +-
 .../python-registry-1.0.4.ebuild              |  2 +-
 dev-python/scapy-http/scapy-http-1.8.ebuild   |  2 +-
 dev-python/service_identity/Manifest          |  1 +
 .../service_identity-16.0.0.ebuild            |  2 +-
 .../service_identity-17.0.0.ebuild            | 27 +++++++++++++++++
 .../sortedcontainers-1.5.7.ebuild             |  2 +-
 .../symmetricjsonrpc-0.1.0.ebuild             |  2 +-
 dev-python/vulndb/vulndb-0.0.19-r1.ebuild     |  2 +-
 dev-python/yaswfp/yaswfp-0.9.3.ebuild         |  2 +-
 32 files changed, 73 insertions(+), 85 deletions(-)
 create mode 100644 dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.1.ebuild
 rename dev-python/clamd/{clamd-1.0.1.ebuild => clamd-1.0.2.ebuild} (91%)
 delete mode 100644 dev-python/esmre/metadata.xml
 delete mode 100644 dev-python/netfilterqueue/netfilterqueue-0.8.ebuild
 delete mode 100644 dev-python/python-ntlm/python-ntlm-1.0.1.ebuild
 create mode 100644 dev-python/service_identity/service_identity-17.0.0.ebuild

diff --git a/dev-python/PTP/PTP-0.3.0.ebuild b/dev-python/PTP/PTP-0.3.0.ebuild
index 725c737db..5f5d8e237 100644
--- a/dev-python/PTP/PTP-0.3.0.ebuild
+++ b/dev-python/PTP/PTP-0.3.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Pentester's Tools Parser"
 HOMEPAGE="https://pypi.python.org/pypi/PTP"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/PyVirtualDisplay/Manifest b/dev-python/PyVirtualDisplay/Manifest
index f219f42f1..a38d5237f 100644
--- a/dev-python/PyVirtualDisplay/Manifest
+++ b/dev-python/PyVirtualDisplay/Manifest
@@ -1 +1,2 @@
+DIST PyVirtualDisplay-0.2.1.tar.gz 30785 SHA256 012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982 SHA512 2ffb290a975e5520b44f9710ed5767a36b5e793c4e6c642e053c11fa8942b44bac1c2c9ef27ccb1a67bc50b73bb27a9ac77f001c699c3ce48ebe0dbdd6d44e52 WHIRLPOOL f962aef55fa2fcf245b2b581adc12ac0905f699de7abee78583e9304d5b873379200d2cce7951e5338f160dbddbb6f24c911ad4690f72d1605d81c48acd1996d
 DIST PyVirtualDisplay-0.2.tar.gz 29649 SHA256 8bf0827b04487b6b9ad8490b03254c03948ca7f23bb1de420637b2c09e59ed84 SHA512 f41f0acbb80b2901b1466ca1cf1098d6cfd6751d3f383a2484874c7a0a987736cb6b6d601be343df9f3f31594b491ba47bd2092677af10d15a3a4052c3094272 WHIRLPOOL 7a735f103f07bb6b341c065d2bb21e7415d2383addbf00559a850a0cf2001c9ecda1a9f95d950458309701f1f9d0fce188098eee65ec35e189efc677134a72ef
diff --git a/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.1.ebuild b/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.1.ebuild
new file mode 100644
index 000000000..213c2706e
--- /dev/null
+++ b/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="python wrapper for Xvfb, Xephyr and Xvnc"
+HOMEPAGE="https://github.com/ponty/pyvirtualdisplay"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.ebuild b/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.ebuild
index 60f536c4a..213c2706e 100644
--- a/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.ebuild
+++ b/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="python wrapper for Xvfb, Xephyr and Xvnc"
 HOMEPAGE="https://github.com/ponty/pyvirtualdisplay"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/clamd/Manifest b/dev-python/clamd/Manifest
index 237a99af5..e0aabf724 100644
--- a/dev-python/clamd/Manifest
+++ b/dev-python/clamd/Manifest
@@ -1 +1 @@
-DIST clamd-1.0.1.zip 8117 SHA256 7a7b8f6bdfa2cda92959cc2abd4e525fdc7075de8e51583100c7607474404eb2 SHA512 4a6be240f66fe5938277e0b34457e154be86f889e6a537a364955218779e84dc18940e7f31cb80749dcc327ea6ca92a9442f373e0395aede47d3de7015001aed WHIRLPOOL 3a13c8a4fb52a44c148709eae8652fa7aef4a8bdaf4d4d31a38f13abf8f44beb952ddd5787cbb0068d27e00c485dd03aa5dd100a560f5e2284eb92659f09a9cf
+DIST clamd-1.0.2.tar.gz 8218 SHA256 d82a2fd814684a35a1b31feadafb2e69c8ebde9403613f6bdaa5d877c0f29560 SHA512 b025d502cacff138e8a4f8d8bab2105e0f7cba2e95b410e40010842c6614fbee0dce84acb996f91fd7eeb9aac838b5f84f8831ee1ff92c9cfb5aabe9414baf83 WHIRLPOOL 1f676c431fb7b2e76b2a42a4df77b97d97ecf5b12e82acb60bc9b0466216a7dbeb90e5465bee384dce722c7fe3b7d1f02ac3df684451d4e07a52de7b2e61f4af
diff --git a/dev-python/clamd/clamd-1.0.1.ebuild b/dev-python/clamd/clamd-1.0.2.ebuild
similarity index 91%
rename from dev-python/clamd/clamd-1.0.1.ebuild
rename to dev-python/clamd/clamd-1.0.2.ebuild
index cd3d0e2cc..83ffc4650 100644
--- a/dev-python/clamd/clamd-1.0.1.ebuild
+++ b/dev-python/clamd/clamd-1.0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Clamd is a python interface to Clamd (Clamav daemon)"
 HOMEPAGE="https://github.com/graingert/python-clamd"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.zip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
diff --git a/dev-python/cxoracle/cxoracle-5.3.ebuild b/dev-python/cxoracle/cxoracle-5.3.ebuild
index c323aaf36..386d6ef2c 100644
--- a/dev-python/cxoracle/cxoracle-5.3.ebuild
+++ b/dev-python/cxoracle/cxoracle-5.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_PN="cx_Oracle"
 DESCRIPTION="Python extension module that allows access to Oracle Databases"
 HOMEPAGE="http://www.python.net/crew/atuining/cx_Oracle/"
-SRC_URI="mirror://pypi/$(echo ${MY_PN} | cut -c 1)/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/editorconfig/editorconfig-0.12.1.ebuild b/dev-python/editorconfig/editorconfig-0.12.1.ebuild
index fd402c5c0..3d7338dd6 100644
--- a/dev-python/editorconfig/editorconfig-0.12.1.ebuild
+++ b/dev-python/editorconfig/editorconfig-0.12.1.ebuild
@@ -13,7 +13,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="EditorConfig File Locator and Interpreter for Python"
 HOMEPAGE="https://pypi.python.org/pypi/EditorConfig"
-SRC_URI="mirror://pypi/$(echo ${MY_PN} | cut -c 1)/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2.4"
 SLOT="0"
diff --git a/dev-python/esmre/esmre-0.3.1.ebuild b/dev-python/esmre/esmre-0.3.1.ebuild
index c35958a3e..9b726dc67 100644
--- a/dev-python/esmre/esmre-0.3.1.ebuild
+++ b/dev-python/esmre/esmre-0.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Regular expression accelerator"
 HOMEPAGE="https://code.google.com/p/esmre/"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-python/esmre/metadata.xml b/dev-python/esmre/metadata.xml
deleted file mode 100644
index 301d2207c..000000000
--- a/dev-python/esmre/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>python</herd>
-</pkgmetadata>
diff --git a/dev-python/guess-language/guess-language-0.2.ebuild b/dev-python/guess-language/guess-language-0.2.ebuild
index c33279276..29b3106ae 100644
--- a/dev-python/guess-language/guess-language-0.2.ebuild
+++ b/dev-python/guess-language/guess-language-0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Guess the natural language of a text"
 HOMEPAGE="https://code.google.com/p/guess-language/"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/halberd/halberd-0.2.4-r1.ebuild b/dev-python/halberd/halberd-0.2.4-r1.ebuild
index cfd31a9e7..65d46e1e9 100644
--- a/dev-python/halberd/halberd-0.2.4-r1.ebuild
+++ b/dev-python/halberd/halberd-0.2.4-r1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 
 DESCRIPTION="HTTP load balancer detector"
 HOMEPAGE="https://github.com/jmbr/halberd"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/isc_dhcp_leases/isc_dhcp_leases-0.8.1.ebuild b/dev-python/isc_dhcp_leases/isc_dhcp_leases-0.8.1.ebuild
index 1c42491c6..b7ecb01e8 100644
--- a/dev-python/isc_dhcp_leases/isc_dhcp_leases-0.8.1.ebuild
+++ b/dev-python/isc_dhcp_leases/isc_dhcp_leases-0.8.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Small python module for reading /var/lib/dhcp/dhcpd.leases from isc-dhcp-server"
 HOMEPAGE="https://github.com/MartijnBraam/python-isc-dhcp-leases"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64"
diff --git a/dev-python/netfilterqueue/Manifest b/dev-python/netfilterqueue/Manifest
index 82f25b3f8..30d1c6ada 100644
--- a/dev-python/netfilterqueue/Manifest
+++ b/dev-python/netfilterqueue/Manifest
@@ -1,2 +1 @@
 DIST NetfilterQueue-0.8.1.tar.gz 58616 SHA256 beda851dfb8f3199f716e246c4cfd2c8492f7cdce32a03613c7eeab152e0a4a6 SHA512 03104d7a1a841e85d75d6e8e20fa217bd5e8e883d417721121ea1feb0ca2487e8d970313a2b0dd1a57849b44457ef81d5a177aaec74bc46797201c143282b438 WHIRLPOOL b653c91151109d99b15463af3045c55a43aa1af246fa4979f981bd4d59a1aa2826e6ec97019678457edc555693eeb441e18afd8f7a382aa9cd976b48710b8c88
-DIST NetfilterQueue-0.8.tar.gz 58503 SHA256 1c0316d062dd18678473d2cd661d89fbc5d708354a9e5ce03dcec14829a86560 SHA512 32e20d6f890b30169a7ec2c3a35f632d50260be82e1be343d41a66a8f0931b21aac7806b1b15b50c9aaa173cf32467ff3f51a625e089d03432171b9d950d25a5 WHIRLPOOL ec5f4f456b49acd06d6ac6636d46baf654f0df2d135c291030b73833c6f74daee1f93a1d261c4bf3467f7c7ee04a5434786e229ea627669f32a08a889356f8f7
diff --git a/dev-python/netfilterqueue/netfilterqueue-0.8.1.ebuild b/dev-python/netfilterqueue/netfilterqueue-0.8.1.ebuild
index 716666bab..6c26bd533 100644
--- a/dev-python/netfilterqueue/netfilterqueue-0.8.1.ebuild
+++ b/dev-python/netfilterqueue/netfilterqueue-0.8.1.ebuild
@@ -12,7 +12,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python bindings for libnetfilter_queue"
 HOMEPAGE="https://pypi.python.org/pypi/NetfilterQueue"
-SRC_URI="mirror://pypi/$(echo ${MY_PN} | cut -c 1)/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/netfilterqueue/netfilterqueue-0.8.ebuild b/dev-python/netfilterqueue/netfilterqueue-0.8.ebuild
deleted file mode 100644
index 06770436a..000000000
--- a/dev-python/netfilterqueue/netfilterqueue-0.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-MY_PN=NetfilterQueue
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings for libnetfilter_queue"
-HOMEPAGE="https://pypi.python.org/pypi/NetfilterQueue"
-SRC_URI="mirror://pypi/$(echo ${MY_PN} | cut -c 1)/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libnetfilter_queue"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/phply/phply-0.9.1-r1.ebuild b/dev-python/phply/phply-0.9.1-r1.ebuild
index 3b369897d..b264294d5 100644
--- a/dev-python/phply/phply-0.9.1-r1.ebuild
+++ b/dev-python/phply/phply-0.9.1-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Parser for PHP written using PLY"
 HOMEPAGE="https://github.com/ramen/phply"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/pygtail/pygtail-0.7.0.ebuild b/dev-python/pygtail/pygtail-0.7.0.ebuild
index f432d8a1f..e80a49c77 100644
--- a/dev-python/pygtail/pygtail-0.7.0.ebuild
+++ b/dev-python/pygtail/pygtail-0.7.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Reads log file lines that have not been read"
 HOMEPAGE="http://github.com/bgreenlee/pygtail"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/pynetfilter_conntrack/pynetfilter_conntrack-0.4.2.ebuild b/dev-python/pynetfilter_conntrack/pynetfilter_conntrack-0.4.2.ebuild
index 8a231f209..435d9350a 100644
--- a/dev-python/pynetfilter_conntrack/pynetfilter_conntrack-0.4.2.ebuild
+++ b/dev-python/pynetfilter_conntrack/pynetfilter_conntrack-0.4.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python binding of libnetfilter_conntrack"
 HOMEPAGE="https://pypi.python.org/pypi/pynetfilter_conntrack"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/python-ntlm/Manifest b/dev-python/python-ntlm/Manifest
index 5890339f9..e871ef329 100644
--- a/dev-python/python-ntlm/Manifest
+++ b/dev-python/python-ntlm/Manifest
@@ -1,2 +1 @@
-DIST python-ntlm-1.0.1.tar.gz 14784 SHA256 2424a51823deb001aa8d35766b38b4d03abb662f3e93f7c11c2f4215334c0a8d SHA512 cfc13daba074f4650f83e390c44eab5f5033534fb2a352ae43d76b1f03742baeda8ba33a57266b2dcd3a241891b54c25beb2028dbb8aa3166a2250fa2b578e18 WHIRLPOOL 54e63a944983c5efdadf49b5670518a3ee8842153c764f05b59fc32b174fbdb298d6b3395148803232a0f7956d19774988e9c9d9c4d2e06e064af58b051db18c
 DIST python-ntlm-1.1.0.tar.gz 15311 SHA256 35ffa68216a3622860f34b7dd49df77dde22136ae37ffcd57e3f8dd26b218c61 SHA512 6d8d8bfe3912bf863cdffb7f62633235cbacc9711cae643d0492450e610b02e6fbfaed11da6e0dff5e0ca20df32d241844354b122b14a57658c76321dc0f0742 WHIRLPOOL 9648739c001e406d56a586d607144fd1a2d89b26b7940b3b51d270b15732002ac2654cf7c3645bb1f0a19e37b0ab0bfba05dcd52f39648d5206bc54494d0724b
diff --git a/dev-python/python-ntlm/python-ntlm-1.0.1.ebuild b/dev-python/python-ntlm/python-ntlm-1.0.1.ebuild
deleted file mode 100644
index 2a7613be9..000000000
--- a/dev-python/python-ntlm/python-ntlm-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Clamd is a python interface to Clamd (Clamav daemon)"
-HOMEPAGE="https://github.com/mullender/python-ntlm"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="example"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	python_foreach_impl distutils-r1_python_install || die
-	if ! use example ; then
-		rm -r "${D}"/usr/bin/ || die
-		rm -r "${D}"/usr/lib/python-exec || die
-	fi
-}
diff --git a/dev-python/python-ntlm/python-ntlm-1.1.0.ebuild b/dev-python/python-ntlm/python-ntlm-1.1.0.ebuild
index 2a7613be9..d68960fdb 100644
--- a/dev-python/python-ntlm/python-ntlm-1.1.0.ebuild
+++ b/dev-python/python-ntlm/python-ntlm-1.1.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Clamd is a python interface to Clamd (Clamav daemon)"
 HOMEPAGE="https://github.com/mullender/python-ntlm"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/python-owasp-zap-v2/python-owasp-zap-v2-0.0.9.ebuild b/dev-python/python-owasp-zap-v2/python-owasp-zap-v2-0.0.9.ebuild
index 57a013218..82ecd2167 100644
--- a/dev-python/python-owasp-zap-v2/python-owasp-zap-v2-0.0.9.ebuild
+++ b/dev-python/python-owasp-zap-v2/python-owasp-zap-v2-0.0.9.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="OWASP ZAP Python API"
 HOMEPAGE="https://github.com/zaproxy/zap-api-python"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/python-registry/python-registry-1.0.4.ebuild b/dev-python/python-registry/python-registry-1.0.4.ebuild
index 8a02390ab..4d672c709 100644
--- a/dev-python/python-registry/python-registry-1.0.4.ebuild
+++ b/dev-python/python-registry/python-registry-1.0.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="A pure Python module that provides read access to Windows Registry files"
 HOMEPAGE="http://www.williballenthin.com/registry/"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/scapy-http/scapy-http-1.8.ebuild b/dev-python/scapy-http/scapy-http-1.8.ebuild
index 344c7a5d6..ec436ebe4 100644
--- a/dev-python/scapy-http/scapy-http-1.8.ebuild
+++ b/dev-python/scapy-http/scapy-http-1.8.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="HTTP-layer support for Scapy"
 HOMEPAGE="https://github.com/invernizzi/scapy-http"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 8777db4dd..1fda6322b 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1 +1,2 @@
 DIST service_identity-16.0.0.tar.gz 30270 SHA256 0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036 SHA512 0ffa28b3dece2415a058ec159e4f85f3e86c0de520ed5d6933ec49edca91ccc79a57893ace40d5441455791433828ab55a939e90335dfdee8582627e33a896ae WHIRLPOOL 598c046bf0e7428d5d3c34e8315bc67a857377af105bddc7d07fde01eaaffb4be62026fdffab6c81eaaff897290ab735c5f3ad3f7f9c4a1bd9f932a39cef9aaf
+DIST service_identity-17.0.0.tar.gz 23502 SHA256 4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec WHIRLPOOL efe2d369ff50834e3d63ca11c67cc6a654fd6b9d1e4dde403cf1ed7f0e05e530d34beba383eaf888ea3977ddbdeacec9d26ad1f00374333023eaaabede5910dd
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
index 08313ab94..419bd156b 100644
--- a/dev-python/service_identity/service_identity-16.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-16.0.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Service identity verification for pyOpenSSL."
 HOMEPAGE="https://service-identity.readthedocs.org/"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/service_identity/service_identity-17.0.0.ebuild b/dev-python/service_identity/service_identity-17.0.0.ebuild
new file mode 100644
index 000000000..419bd156b
--- /dev/null
+++ b/dev-python/service_identity/service_identity-17.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL."
+HOMEPAGE="https://service-identity.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]"
+
+#idna; extra == 'idna'
+
+RDEPEND="${DEPEND}"
diff --git a/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild b/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
index 8963df3c4..22365f6f0 100644
--- a/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python Sorted Container Types: SortedList, SortedDict, and SortedSet"
 HOMEPAGE="https://github.com/grantjenks/sorted_containers"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/symmetricjsonrpc/symmetricjsonrpc-0.1.0.ebuild b/dev-python/symmetricjsonrpc/symmetricjsonrpc-0.1.0.ebuild
index 4d3dcc734..b789b8ac2 100644
--- a/dev-python/symmetricjsonrpc/symmetricjsonrpc-0.1.0.ebuild
+++ b/dev-python/symmetricjsonrpc/symmetricjsonrpc-0.1.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A more beautiful JSON-RPC implemenation in python"
 HOMEPAGE="https://github.com/niligulmohar/python-symmetric-jsonrpc"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-python/vulndb/vulndb-0.0.19-r1.ebuild b/dev-python/vulndb/vulndb-0.0.19-r1.ebuild
index 0eb841b35..a39c3b762 100644
--- a/dev-python/vulndb/vulndb-0.0.19-r1.ebuild
+++ b/dev-python/vulndb/vulndb-0.0.19-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python SDK to access the vulnerability database"
 HOMEPAGE="https://github.com/vulndb/python-sdk/"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-3"
 SLOT="0"
diff --git a/dev-python/yaswfp/yaswfp-0.9.3.ebuild b/dev-python/yaswfp/yaswfp-0.9.3.ebuild
index f7d5daa7a..e52c75a7e 100644
--- a/dev-python/yaswfp/yaswfp-0.9.3.ebuild
+++ b/dev-python/yaswfp/yaswfp-0.9.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Yet Another SWF Parser."
 HOMEPAGE="https://pypi.python.org/pypi/yaswfp"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"