gentoo resync : 14.12.2020

3 files changed, 22 insertions, 70 deletions

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 4e69e15b3e5b..cb33f920e242 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,7 +1,6 @@
 AUX cura-4.6.1-fix-install-paths.patch 1478 BLAKE2B 177cd0d14fdecd0da4da0cbc4d1ff86082adbc4182c3789dd9d4ec056ab76b43d6ce7b48e027c5fc5d7b1684a15e310101361e6896fa980cd3370b1d2f2860c5 SHA512 4ddf154f398b9d285fb51e9255a7dd5d10caef0a1980bcf3f37c231d1c3c91433cfa9d351b7c96404364db1924f1fed63a98e8f317eef6905fd14e96171af3b0
-DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
 DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
-EBUILD cura-4.6.1-r1.ebuild 1555 BLAKE2B e85dd7c3db1b31a5a00b59786cb34ad397c009317df00685d4b1bfbbe8807e1dbb63fc0143b34c37dcdb328bb4918cfca20f4bd56cbefc2e8a208091dfd6fade SHA512 085dcb0e2548540af6aa8389016ea80576ff95cbf69412efebceec675e4d58d40785fb552fbbd9e5a9e862129241b86da34d9e6a46eff42cc37ce92af4eae46e
+DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711
 EBUILD cura-4.7.0-r1.ebuild 1875 BLAKE2B 62d221c6fe448597843fedacc46ba5b9183f3afac3a56c12f890f8babf2a37b55617a8103236b696649d9f674cc332b7cfa1fdb4e360140d64e2ae693bf74418 SHA512 9e3b797621690107ecb38c5e1ab27fe2b8f5a904835d49e5712a3b6ea49f5f0d621913e8f9f857205499e185dfcbe85fdfbf3f7233cfb9e17e0427ee11a31000
-EBUILD cura-4.7.0.ebuild 1562 BLAKE2B 5013051eab23a054a73afda2d283a34ec352eaf5d7a738a1d851566fd95ab27d229b05613c4039598b42034ec5caa597356fc5b54e8fd62cb26d4155275d1e09 SHA512 76beb567cbff2cb0888b8c265c8f70856910600f4430b275f1ff5164da2150d559c72259ff177074a81190c7bdab3a15bc0bca8faf6d4daf7097d38bf47cae57
+EBUILD cura-4.8.0.ebuild 1966 BLAKE2B fb232dbe948e892b71ae184225b8c0a36feb34375dafd510332aa950bc0490512983a1ae15378f94beb863c3c4c012e7c5f6fd06c5f181558ad17c569c4ab73e SHA512 05d22e7c757079fa99eeeacd2f398526ff64373b450f46f058d627e85660a59b9d9ae8eb59222b07f364a381a0d9e8e16cbb16c112c69c7f4a46b2150332bcfe
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-4.6.1-r1.ebuild b/media-gfx/cura/cura-4.6.1-r1.ebuild
deleted file mode 100644
index 74ad049667a8..000000000000
--- a/media-gfx/cura/cura-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~media-gfx/curaengine-${PV}
-	~media-gfx/fdm-materials-${PV}
-	$(python_gen_cond_dep '
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/cura-4.7.0.ebuild b/media-gfx/cura/cura-4.8.0.ebuild
index 4264d19b6a62..615180db9eed 100644
--- a/media-gfx/cura/cura-4.7.0.ebuild
+++ b/media-gfx/cura/cura-4.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=(python3_{7..8})
 inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+usb zeroconf"
+IUSE="debug +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-devel/gettext"
@@ -23,29 +23,38 @@ RDEPEND="${PYTHON_DEPS}
 	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
 	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~media-gfx/curaengine-${PV}
 	~media-gfx/fdm-materials-${PV}
 	$(python_gen_cond_dep '
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
+			sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
+			usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+			zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
 	')"
 DEPEND="${RDEPEND}"
 
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
+DOCS=(README.md)
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+	sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
+	# trimesh not available in portage
 	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	  -DCURA_BUILDTYPE="ebuild"
+	  -DCURA_VERSION=${PV}
+		-DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
+		-DCURA_DEBUGMODE=$(usex debug)
 	)
 	cmake_src_configure
 }
@@ -53,5 +62,6 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	doicon icons/*.png
+	python_fix_shebang "${D}/usr/bin/cura"
 	python_optimize "${D}${get_libdir}"
 }