Numerous updates

sci-electronics/flatcam/flatcam-9999.ebuild

@@ -2,21 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit python-single-r1 gnome2
+inherit distutils-r1 gnome2
 
 DESCRIPTION="Free and Open-source PCB CAM.."
 HOMEPAGE="http://flatcam.org"
 
 if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
+	SRC_URI=""
 	EGIT_REPO_URI="https://bitbucket.org/jpcgt/${PN}.git"
 	EGIT_BRANCH="Beta"
-	KEYWORDS=""
-	SRC_URI=""
+	inherit git-r3
 else
 	SRC_URI="https://bitbucket.org/jpcgt/flatcam/downloads/FlatCAM-${PV}.zip -> ${P}.zip"
 	KEYWORDS="amd64 x86"
@@ -29,7 +29,8 @@ IUSE="+doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	dev-libs/or-tools[${PYTHON_SINGLE_USEDEP}]
+	dev-lang/tk
+	sci-libs/or-tools[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 	dev-python/cycler[${PYTHON_USEDEP}]
 	dev-python/dill[${PYTHON_USEDEP}]
@@ -38,8 +39,8 @@ RDEPEND="
 	dev-python/freetype-py[${PYTHON_USEDEP}]
 	dev-python/kiwisolver[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-1.3.1[${PYTHON_USEDEP},qt5]
-	>=dev-python/numpy-1.8[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP},qt5]
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/PyQt5[${PYTHON_USEDEP},opengl,testlib]
 	dev-python/pyserial[${PYTHON_USEDEP}]
@@ -47,8 +48,7 @@ RDEPEND="
 	dev-python/qrcode[${PYTHON_USEDEP}]
 	dev-python/rasterio[${PYTHON_USEDEP}]
 	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.3[${PYTHON_USEDEP}]
+	dev-python/shapely[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	dev-python/svg-path[${PYTHON_USEDEP}]
 	dev-python/svglib[${PYTHON_USEDEP}]