1 |
commit: eed745a9a297c67cbea166e5b32371017dc063eb |
2 |
Author: Michael Perlov <perlovka <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri May 22 01:01:43 2020 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 25 19:41:21 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed745a9 |
7 |
|
8 |
media-gfx/cura: version bump to 4.6.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/710930 |
11 |
Closes: https://bugs.gentoo.org/718960 |
12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
13 |
Signed-off-by: Michael Perlov <perlovka <AT> gmail.com> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/15908 |
15 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
16 |
|
17 |
media-gfx/cura/Manifest | 1 + |
18 |
media-gfx/cura/cura-4.6.1.ebuild | 56 ++++++++++++++++++++++ |
19 |
.../cura/files/cura-4.6.1-fix-install-paths.patch | 31 ++++++++++++ |
20 |
3 files changed, 88 insertions(+) |
21 |
|
22 |
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest |
23 |
index 698ecfb22ab..0a4d6b2e883 100644 |
24 |
--- a/media-gfx/cura/Manifest |
25 |
+++ b/media-gfx/cura/Manifest |
26 |
@@ -2,3 +2,4 @@ DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee |
27 |
DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279 |
28 |
DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52 |
29 |
DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815 |
30 |
+DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2 |
31 |
|
32 |
diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.6.1.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000000..4fd274514ca |
35 |
--- /dev/null |
36 |
+++ b/media-gfx/cura/cura-4.6.1.ebuild |
37 |
@@ -0,0 +1,56 @@ |
38 |
+# Copyright 1999-2020 Gentoo Authors |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=7 |
42 |
+ |
43 |
+PYTHON_COMPAT=( python3_{6,7} ) |
44 |
+inherit cmake desktop python-single-r1 xdg |
45 |
+ |
46 |
+MY_PN=Cura |
47 |
+ |
48 |
+DESCRIPTION="A 3D model slicing application for 3D printing" |
49 |
+HOMEPAGE="https://github.com/Ultimaker/Cura" |
50 |
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
51 |
+ |
52 |
+LICENSE="LGPL-3" |
53 |
+SLOT="0" |
54 |
+KEYWORDS="~amd64 ~x86" |
55 |
+IUSE="+usb zeroconf" |
56 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
57 |
+ |
58 |
+BDEPEND="sys-devel/gettext" |
59 |
+RDEPEND="${PYTHON_DEPS} |
60 |
+ >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
61 |
+ >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] |
62 |
+ >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] |
63 |
+ >=media-gfx/curaengine-${PV:0:3} |
64 |
+ >=media-gfx/fdm-materials-${PV:0:3} |
65 |
+ $(python_gen_cond_dep ' |
66 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
67 |
+ dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}] |
68 |
+ usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) |
69 |
+ zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) |
70 |
+ ')" |
71 |
+DEPEND="${RDEPEND}" |
72 |
+ |
73 |
+DOCS=( README.md ) |
74 |
+PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" ) |
75 |
+S="${WORKDIR}/${MY_PN}-${PV}" |
76 |
+ |
77 |
+src_prepare() { |
78 |
+ sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die |
79 |
+ cmake_src_prepare |
80 |
+} |
81 |
+ |
82 |
+src_configure() { |
83 |
+ local mycmakeargs=( |
84 |
+ -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" |
85 |
+ ) |
86 |
+ cmake_src_configure |
87 |
+} |
88 |
+ |
89 |
+src_install() { |
90 |
+ cmake_src_install |
91 |
+ doicon icons/*.png |
92 |
+ python_optimize "${D}${get_libdir}" |
93 |
+} |
94 |
|
95 |
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 |
96 |
new file mode 100644 |
97 |
index 00000000000..4d5f00ad47d |
98 |
--- /dev/null |
99 |
+++ b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch |
100 |
@@ -0,0 +1,31 @@ |
101 |
+--- Cura-4.5.0-orig/CMakeLists.txt 2020-03-01 16:32:23.380956083 +0200 |
102 |
++++ Cura-4.5.0/CMakeLists.txt 2020-02-25 17:16:45.000000000 +0200 |
103 |
+@@ -48,6 +48,15 @@ |
104 |
+ find_package(Python3 REQUIRED COMPONENTS Interpreter Development) |
105 |
+ endif() |
106 |
+ |
107 |
++if(NOT PYTHON_SITE_PACKAGES_DIR) |
108 |
++ if(APPLE OR WIN32) |
109 |
++ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages |
110 |
++ CACHE STRING "Directory to install Python bindings to") |
111 |
++ else() |
112 |
++ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages |
113 |
++ CACHE STRING "Directory to install Python bindings to") |
114 |
++ endif() |
115 |
++endif() |
116 |
+ |
117 |
+ if(NOT ${URANIUM_DIR} STREQUAL "") |
118 |
+ set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake") |
119 |
+@@ -80,10 +89,10 @@ |
120 |
+ DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura) |
121 |
+ else() |
122 |
+ install(DIRECTORY cura |
123 |
+- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages |
124 |
++ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} |
125 |
+ FILES_MATCHING PATTERN *.py) |
126 |
+ install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py |
127 |
+- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura) |
128 |
++ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) |
129 |
+ endif() |
130 |
+ install(FILES ${CMAKE_BINARY_DIR}/cura.desktop |
131 |
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) |