Updated flatcam and dependency galore / minor updates to other ebuilds

sci-electronics/flatcam/Manifest

@@ -1 +1 @@
-EBUILD flatcam-9999.ebuild 1408 BLAKE2B e64bade93f2fce002d7732268b38ee7a8230da784318a235713bf12ba15f51977f6bfab0a86f46ff54a284d1a139f1df3dd6fee4f0ac459b5f00a77a3a669242 SHA512 88d287c97d43e4211c537e6bcbaa94a540c8f72ce68fc47ab6efb0e24b60ffa1fea20dec141e2e9c6dde0e31fc1d6ad8d70dd4ebc44732e22810910551b82bc0
+EBUILD flatcam-9999.ebuild 3281 BLAKE2B e10fd5b64c171463a7bf779a4dcd8e6f4d901519a16071982ceb73b9f9ad38aedab0b9e38893f2d55fd89d28338d2cd79bcda8467e19b0bb277c9fa61b40e087 SHA512 9cf96918be83f4e92f1b8824174a62d991f0fdac310aa502eeb5d9f7b89d3b50719ebb7aa08df3a5710f89fc061abce22c63841daf17278150ea9aff5b96dc4a

sci-electronics/flatcam/flatcam-9999.ebuild

@@ -3,9 +3,10 @@
 # $Id$
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit distutils-r1 git-r3 gnome2-utils
+inherit python-single-r1 gnome2
 
 DESCRIPTION="Free and Open-source PCB CAM.."
 HOMEPAGE="http://flatcam.org"
@@ -13,6 +14,7 @@ HOMEPAGE="http://flatcam.org"
 if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://bitbucket.org/jpcgt/${PN}.git"
+	EGIT_BRANCH="Beta"
 	KEYWORDS=""
 	SRC_URI=""
 else
@@ -24,21 +26,73 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="+doc"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="
+	dev-libs/or-tools[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+	dev-python/cycler[${PYTHON_USEDEP}]
+	dev-python/dill[${PYTHON_USEDEP}]
+	dev-python/ezdxf[${PYTHON_USEDEP}]
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	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/PyQt5[${PYTHON_USEDEP}]
-	dev-python/scipy
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},opengl,testlib]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	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/simplejson[${PYTHON_USEDEP}]
 	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/svglib[${PYTHON_USEDEP}]
+	dev-python/testresources[${PYTHON_USEDEP}]
+	dev-python/vispy[${PYTHON_USEDEP},pyqt5]
+	')
+	media-libs/freetype
+	media-libs/libpng
+	sci-libs/gdal
+	sci-libs/geos
+	sci-libs/libspatialindex
 	sci-libs/rtree
-	>=sci-libs/shapely-1.3
 	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+
+DEPEND="$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
 	${RDEPEND}"
 
+PREFIX="${EPREFIX}/usr"
+
+src_prepare() {
+	default
+
+	sed -i -e '/markers\._marker_dict/d' \
+		"${S}"/appGUI/VisPyPatches.py \
+		|| die "sed failed"
+}
+
+src_configure() {
+	einfo "Nothing to configure"
+}
+
 src_compile() {
-	distutils-r1_src_install
+	sed -i -e "s|\./bin/flatcam-beta|${PREFIX}/bin/flatcam|" \
+		-e "s|\./assets/icon\.png|flatcam|" \
+		"${S}"/assets/linux/flatcam-beta.desktop \
+		|| die "sed failed"
+
+	sed -i -e "/readlink -f/d" \
+		-e "0,/python_script_path/ s@python_script_path.*@python_script_path=${PREFIX}/share/${PN}@" \
+		-e "s|python3 |${EPYTHON} |" \
+		"${S}"/assets/linux/flatcam-beta \
+		|| die "sed failed"
 
 	if use doc ; then
 		cd "${S}"/doc
@@ -47,18 +101,26 @@ src_compile() {
 }
 
 src_install() {
-	distutils-r1_src_install
+	insinto ${PREFIX}/share/${PN}
+	doins *.py
+	doins -r app{Common,Editors,GUI,Objects,Parsers,Tools}
+	doins -r assets config descartes locale preprocessors tclCommands Utils
 
-	insinto /usr/share/applications
-	doins "${S}"/flatcam.desktop
+	insinto ${PREFIX}/share/applications
+	newins "${S}"/assets/linux/flatcam-beta.desktop flatcam.desktop
+
+	newbin "${S}"/assets/linux/flatcam-beta flatcam
 
 	local size
 	for size in 16 24 32 48 128 256; do
-		dosym ../../../../${PN}/${PN}_icon${size}.png \
-			/usr/share/icons/hicolor/${size}x${size}/apps/flatcam.png
+		dosym ${PREFIX}/share/${PN}/assets/linux/icon.png \
+			${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PN}.png
 	done
 
+	dodoc "${S}"/CHANGELOG.md "${S}"/LICENSE "${S}"/README.md
 	use doc && dodoc -r "${S}"/doc/build/html
+
+	python_optimize "${ED}"/usr/share/${PN}
 }
 
 pkg_postrm() {