[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, media-gfx/cura/files/
commit: 7ad2d8743788c51998183a3d4d12674c27010739
Author: Marek Szuba gentoo org>
AuthorDate: Fri Feb 11 10:34:44 2022 +
Commit: Marek Szuba gentoo org>
CommitDate: Fri Feb 11 10:43:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad2d874
media-gfx/cura: add 4.12.1
Featuring py3.10 support along with the three previously disabled
plug-ins.
Invoking maintainer time-out on both this and all the ~-${PV}
dependencies, it has been months.
Note that the latest version upstream is now 4.13.1, however that
version would diverge quite far from ~-${PV} for Ultimaker dependencies
- the latest tag for libarcus, libsavitar and fdm-materials is 4.13.0
and pynest2d has got NO non-beta 4.13 tags. Will leave it to the
maintainers to decide what to do with this.
Closes: https://bugs.gentoo.org/812935
Closes: https://bugs.gentoo.org/815406
Closes: https://bugs.gentoo.org/822714
Signed-off-by: Marek Szuba gentoo.org>
media-gfx/cura/Manifest| 1 +
media-gfx/cura/cura-4.12.1.ebuild | 77 ++
.../cura/files/cura-4.12.1-code-style-test.patch | 18 +
3 files changed, 96 insertions(+)
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 165ec2a1e2b6..66fb25368e66 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1 +1,2 @@
+DIST cura-4.12.1.tar.gz 50021408 BLAKE2B
114bbe0cc022e33125486228db2eeaeacd9f4abeac8e65f3ed70231e05f4429062ce1cd49e1649959beb827b7a2d245f61c106529a18bd0cebbd0e8b9b8f883f
SHA512
397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
DIST cura-4.9.1.tar.gz 47870392 BLAKE2B
2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463
SHA512
436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf
diff --git a/media-gfx/cura/cura-4.12.1.ebuild
b/media-gfx/cura/cura-4.12.1.ebuild
new file mode 100644
index ..7c12eee664b8
--- /dev/null
+++ b/media-gfx/cura/cura-4.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake desktop python-single-r1 xdg
+
+MY_PN=Cura
+# No fdm-materials-4.12.1 upstream, 4.12.0 is followed by 4.13.0
+FDM_PV="4.12.0"
+
+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"
+IUSE="debug +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/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
+ ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+ ~media-gfx/curaengine-${PV}
+ ~media-gfx/fdm-materials-${FDM_PV}
+ dev-qt/qtquickcontrols[widgets]
+ $(python_gen_cond_dep '
+ dev-python/importlib_metadata[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/mypy[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
+ dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/sentry-sdk[${PYTHON_USEDEP}]
+ dev-python/trimesh[${PYTHON_USEDEP}]
+ sci-libs/shapely[${PYTHON_USEDEP}]
+ usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+ zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+ ')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
+)
+
+DOCS=(README.md)
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+ 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() {
+ local mycmakeargs=(
+ -DCURA_BUILDTYPE="ebuild"
+ -DCURA_VERSION=${PV}
+ -DCURA_DEBUGMODE=$(usex debug)
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ doicon icons/*.png
+ python_fix_shebang "${D}/usr/bin/cura"
+ python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/cura/files/cura-4.12.1-code-style-test.patch
b/media-gfx/cura/files/cura-4.12.1-code-style-test.patch
new file
[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, media-gfx/cura/files/
commit: eed745a9a297c67cbea166e5b32371017dc063eb
Author: Michael Perlov gmail com>
AuthorDate: Fri May 22 01:01:43 2020 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Mon May 25 19:41:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed745a9
media-gfx/cura: version bump to 4.6.1
Closes: https://bugs.gentoo.org/710930
Closes: https://bugs.gentoo.org/718960
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Perlov gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15908
Signed-off-by: Alexey Shvetsov gentoo.org>
media-gfx/cura/Manifest| 1 +
media-gfx/cura/cura-4.6.1.ebuild | 56 ++
.../cura/files/cura-4.6.1-fix-install-paths.patch | 31
3 files changed, 88 insertions(+)
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 698ecfb22ab..0a4d6b2e883 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -2,3 +2,4 @@ DIST cura-3.4.1.tar.gz 21720836 BLAKE2B
228ad51d189f83d2a34c2af7a6edcbe468bc32ee
DIST cura-3.6.0.tar.gz 23388945 BLAKE2B
bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86
SHA512
b56e5575cb0eb15d75dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
DIST cura-4.2.1.tar.gz 29288696 BLAKE2B
1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1
SHA512
4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
DIST cura-4.3.0.tar.gz 30433646 BLAKE2B
8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc
SHA512
3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815
+DIST cura-4.6.1.tar.gz 36080329 BLAKE2B
5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f80441daf44866ffc93ebcf1295c750
SHA512
8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.6.1.ebuild
new file mode 100644
index 000..4fd274514ca
--- /dev/null
+++ b/media-gfx/cura/cura-4.6.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+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/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+ >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+ >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+ >=media-gfx/curaengine-${PV:0:3}
+ >=media-gfx/fdm-materials-${PV:0:3}
+ $(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/files/cura-4.6.1-fix-install-paths.patch
b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
new file mode 100644
index 000..4d5f00ad47d
--- /dev/null
+++ b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
@@ -0,0 +1,31 @@
+--- Cura-4.5.0-orig/CMakeLists.txt 2020-03-01 16:32:23.380956083 +0200
Cura-4.5.0/CMakeLists.txt 2020-02-25 17:16:45.0 +0200
+@@ -48,6 +48,15 @@
+ find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+ endif()
+
++if(NOT PYTHON_SITE_PACKAGES_DIR)
++ if(APPLE OR WIN32)
++ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++ CACHE STRING
[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, media-gfx/cura/files/
commit: efe6b66e73ed6b1c177e93668757045860edc49e
Author: Michael Perlov gmail com>
AuthorDate: Sun Aug 4 16:14:25 2019 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Aug 25 17:59:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe6b66e
media-gfx/cura: version bump to 4.2.1
Closes: https://bugs.gentoo.org/680988
Closes: https://bugs.gentoo.org/687324
Closes: https://bugs.gentoo.org/691144
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Michael Perlov gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12618
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/cura/Manifest| 1 +
media-gfx/cura/cura-4.2.1.ebuild | 53 ++
.../cura/files/cura-4.2.1-fix-install-paths.patch | 41 +
3 files changed, 95 insertions(+)
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 1dad2dcaf9a..4816b7899c8 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1,3 @@
DIST cura-3.4.1.tar.gz 21720836 BLAKE2B
228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728
SHA512
5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
DIST cura-3.6.0.tar.gz 23388945 BLAKE2B
bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86
SHA512
b56e5575cb0eb15d75dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
+DIST cura-4.2.1.tar.gz 29288696 BLAKE2B
1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1
SHA512
4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild
new file mode 100644
index 000..aed51febac2
--- /dev/null
+++ b/media-gfx/cura/cura-4.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils 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-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
+ >=media-gfx/curaengine-${PV:0:3}
+ >=media-gfx/fdm-materials-${PV:0:3}
+ >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
+ >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
+ usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+ zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${PN}-4.2.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-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ doicon icons/*.png
+ python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
new file mode 100644
index 000..fc10d727d13
--- /dev/null
+++ b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
@@ -0,0 +1,41 @@
+diff -urN Cura-4.2.1-orig/CMakeLists.txt Cura-4.2.1/CMakeLists.txt
+--- Cura-4.2.1-orig/CMakeLists.txt 2019-07-31 15:34:07.0 +0300
Cura-4.2.1/CMakeLists.txt 2019-08-04 18:39:24.106917187 +0300
+@@ -47,6 +47,15 @@
+ find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+ endif()
+
++if(NOT PYTHON_SITE_PACKAGES_DIR)
++ if(APPLE OR WIN32)
++ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++ CACHE STRING "Directory to install Python bindings to")
++ else()
++ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}/dist-packages
++ CACHE STRING "Directory to install Python bindings to")
++ endif()
++endif()
+
+ if(NOT ${URANIUM_DIR} STREQUAL "")
+ set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake")
+@@ -64,7 +73,7 @@
+ install(DIRECTORY resources
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
+ install(DIRECTORY plugins
+-
