Numerous updates

dev-python/kikit/kikit-9999.ebuild

@@ -1,29 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+## Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_SINGLE_IMPL=1
 
-MY_PN="KiKit"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1
 
-inherit python-single-r1
+PYPI_PN="KiKit"
+MY_P="${PYPI_PN}-${PV}"
 
 DESCRIPTION="KiKit is a Python library and CLI tool to automate several tasks in a standard KiCAD workflow"
 HOMEPAGE="https://github.com/yaqwsx/KiKit"
 if [[ ${PV} == "9999" ]] ; then
-        EGIT_REPO_URI="https://github.com/yaqwsx/${MY_PN}.git"
+        EGIT_REPO_URI="https://github.com/yaqwsx/${PYPI_PN}.git"
         KEYWORDS=""
         inherit git-r3
 else
         KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	inherit pypi
+	SRC_URI="$(pypi_sdist_url --no-normalize)"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
+RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -57,7 +61,10 @@ src_install() {
 
 	insinto /usr/share/kicad/scripting
 	doins ${FILESDIR}/kikit_plugin.py
-        dodoc -r doc
-        dodoc -r scripts
-        dodoc LICENCE README.md
+	dodoc LICENCE README.md
+	
+	#if [[ ${PV} == "9999" ]] ; then
+	#	dodoc -r doc
+	#	dodoc -r scripts
+	#fi
 }