Gentoo Archives: gentoo-commits

From: Dennis Lamm <expeditioneer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/
Date: Sun, 07 Feb 2021 21:30:53
Message-Id: 1612733442.34625d641e9b7620465d84bb662e62f26fccfb6f.expeditioneer@gentoo
1 commit: 34625d641e9b7620465d84bb662e62f26fccfb6f
2 Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 7 18:48:20 2021 +0000
4 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 7 21:30:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34625d64
7
8 media-gfx/cura: drop old
9
10 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
11
12 media-gfx/cura/Manifest | 1 -
13 media-gfx/cura/cura-4.7.0-r1.ebuild | 64 ----------------------
14 .../cura/files/cura-4.6.1-fix-install-paths.patch | 31 -----------
15 3 files changed, 96 deletions(-)
16
17 diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
18 index f4ccb95c398..5dfea09d774 100644
19 --- a/media-gfx/cura/Manifest
20 +++ b/media-gfx/cura/Manifest
21 @@ -1,2 +1 @@
22 -DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
23 DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711
24
25 diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild b/media-gfx/cura/cura-4.7.0-r1.ebuild
26 deleted file mode 100644
27 index e6ec0adefd3..00000000000
28 --- a/media-gfx/cura/cura-4.7.0-r1.ebuild
29 +++ /dev/null
30 @@ -1,64 +0,0 @@
31 -# Copyright 1999-2020 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -PYTHON_COMPAT=(python3_{7..8})
37 -inherit cmake desktop python-single-r1 xdg
38 -
39 -MY_PN=Cura
40 -
41 -DESCRIPTION="A 3D model slicing application for 3D printing"
42 -HOMEPAGE="https://github.com/Ultimaker/Cura"
43 -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
44 -
45 -LICENSE="LGPL-3"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~arm64 ~x86"
48 -IUSE="+usb zeroconf"
49 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
50 -
51 -BDEPEND="sys-devel/gettext"
52 -RDEPEND="${PYTHON_DEPS}
53 - ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
54 - ~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
55 - ~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
56 - ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
57 - ~media-gfx/curaengine-${PV}
58 - ~media-gfx/fdm-materials-${PV}
59 - $(python_gen_cond_dep '
60 - dev-python/mypy[${PYTHON_MULTI_USEDEP}]
61 - dev-python/numpy[${PYTHON_MULTI_USEDEP}]
62 - dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
63 - dev-python/requests[${PYTHON_MULTI_USEDEP}]
64 - dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
65 - sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
66 - usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
67 - zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
68 - ')"
69 -DEPEND="${RDEPEND}"
70 -
71 -DOCS=(README.md)
72 -PATCHES=("${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch")
73 -S="${WORKDIR}/${MY_PN}-${PV}"
74 -
75 -src_prepare() {
76 - sed -i -e "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
77 - cmake_src_prepare
78 -}
79 -
80 -src_configure() {
81 - # trimesh not available in portage
82 - local mycmakeargs=(
83 - -DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
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_fix_shebang "${D}/usr/bin/cura"
93 - python_optimize "${D}${get_libdir}"
94 -}
95
96 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
97 deleted file mode 100644
98 index 4d5f00ad47d..00000000000
99 --- a/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
100 +++ /dev/null
101 @@ -1,31 +0,0 @@
102 ---- Cura-4.5.0-orig/CMakeLists.txt 2020-03-01 16:32:23.380956083 +0200
103 -+++ Cura-4.5.0/CMakeLists.txt 2020-02-25 17:16:45.000000000 +0200
104 -@@ -48,6 +48,15 @@
105 - find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
106 - endif()
107 -
108 -+if(NOT PYTHON_SITE_PACKAGES_DIR)
109 -+ if(APPLE OR WIN32)
110 -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
111 -+ CACHE STRING "Directory to install Python bindings to")
112 -+ else()
113 -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
114 -+ CACHE STRING "Directory to install Python bindings to")
115 -+ endif()
116 -+endif()
117 -
118 - if(NOT ${URANIUM_DIR} STREQUAL "")
119 - set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake")
120 -@@ -80,10 +89,10 @@
121 - DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura)
122 - else()
123 - install(DIRECTORY cura
124 -- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
125 -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
126 - FILES_MATCHING PATTERN *.py)
127 - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
128 -- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
129 -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
130 - endif()
131 - install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
132 - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)