Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "M. B." <tomboy64@××××.cn>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/tbc:master commit in: media-gfx/cura/files/, media-gfx/cura/, media-gfx/curaengine/
Date: Sun, 05 Jun 2016 17:35:53
Message-Id: 1465127397.3128b145289c8bf64fd8e39df82d121cd0bfb8f2.tomboy64@gentoo
1 commit: 3128b145289c8bf64fd8e39df82d121cd0bfb8f2
2 Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
3 AuthorDate: Sun Jun 5 11:49:57 2016 +0000
4 Commit: M. B. <tomboy64 <AT> sina <DOT> cn>
5 CommitDate: Sun Jun 5 11:49:57 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=3128b145
7
8 remove cura stuff from overlay
9
10 media-gfx/cura/Manifest | 2 -
11 media-gfx/cura/cura-0.15.04.4.ebuild | 70 -----------------
12 media-gfx/cura/cura-0.15.04.5_rc5.ebuild | 71 -----------------
13 media-gfx/cura/files/cura-0.15.04.4-nopower.patch | 90 ----------------------
14 .../files/cura-2.1.0_beta-fix-install-paths.patch | 38 ---------
15 media-gfx/cura/metadata.xml | 23 ------
16 media-gfx/curaengine/curaengine-0.15.04.6.ebuild | 49 ------------
17 7 files changed, 343 deletions(-)
18
19 diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
20 deleted file mode 100644
21 index a7f5142..0000000
22 --- a/media-gfx/cura/Manifest
23 +++ /dev/null
24 @@ -1,2 +0,0 @@
25 -DIST cura-0.15.04.4.tar.gz 7265105 SHA256 9bce9cec7578792f7008a557930d16216ef97041a62071bb4e2b2a89638f1f54 SHA512 6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd WHIRLPOOL cafd4bc3589214c3fc792c770eaa3f3590018f83ae82444c4f495245ab900748edabccb5a6518d9bd5b26295d7a953e3e60295b3baa90baf6abfe8a75012fbf2
26 -DIST cura-0.15.04.5_rc5.tar.gz 7266640 SHA256 12d72b1ece64bfc00909866e725f39867c9d82abdd793892df210afd35014c89 SHA512 cafb2b6883838e3e427e3da0388a6cd93d666052d9029eeb98bafad7970c805c271a7599fbdc493164d790f101b92bbd511479d2fc9f91c64f73677c6cee0a2f WHIRLPOOL b6ed8e0f9e17ee4d2c1eae3a8f8a0293529f6a4b362445d9296b47247aab91d521c64541ea9110c8b169eb01661f3cae30583f8f959d4d7bc0a8c255455db58b
27
28 diff --git a/media-gfx/cura/cura-0.15.04.4.ebuild b/media-gfx/cura/cura-0.15.04.4.ebuild
29 deleted file mode 100644
30 index 5f3f1d1..0000000
31 --- a/media-gfx/cura/cura-0.15.04.4.ebuild
32 +++ /dev/null
33 @@ -1,70 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=6
39 -
40 -PYTHON_COMPAT=( python2_7 )
41 -inherit eutils fdo-mime gnome2-utils python-single-r1
42 -
43 -MY_PV=${PV#0.}
44 -MY_PN=Cura
45 -
46 -SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
47 -KEYWORDS="~amd64 ~x86"
48 -
49 -DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
50 -HOMEPAGE="https://github.com/daid/Cura"
51 -
52 -LICENSE="AGPL-3"
53 -SLOT="0"
54 -IUSE=""
55 -
56 -RDEPEND="${PYTHON_DEPS}
57 - dev-python/wxpython:3.0[${PYTHON_USEDEP}]
58 - >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
59 - >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}]
60 - >=dev-python/pyserial-2.6[${PYTHON_USEDEP}]
61 - >=media-gfx/curaengine-${PV}
62 -"
63 -DEPEND="${RDEPEND}
64 - >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
65 -
66 -REQUIRED_USE="${PYTHON_REQ_USE}"
67 -PATCHES=( "${FILESDIR}/${P}-nopower.patch" )
68 -S="${WORKDIR}/${MY_PN}-${MY_PV}"
69 -
70 -src_install() {
71 - insinto /usr/share/cura
72 - doins -r Cura resources plugins scripts/linux/cura.py
73 - newicon "${S}/resources/images/c.png" "${PN}.png"
74 - echo ${PV} > "${ED}"usr/share/cura/version || die
75 - cat > "${T}"/cura <<- CURAEOF || die
76 - #!/bin/sh
77 - PYTHONPATH="\$PYTHONPATH:${EROOT}usr/share/cura/" /usr/bin/python2 ${EROOT}usr/share/cura/cura.py "\$@"
78 - CURAEOF
79 - dobin "${T}"/cura
80 -
81 - make_desktop_entry cura \
82 - Cura \
83 - /usr/share/pixmaps/cura.png \
84 - "Graphics;3DGraphics;Engineering;Development"
85 -
86 - python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u)
87 -}
88 -
89 -pkg_preinst() {
90 - gnome2_icon_savelist
91 -}
92 -
93 -pkg_postinst() {
94 - fdo-mime_desktop_database_update
95 - fdo-mime_mime_database_update
96 - gnome2_icon_cache_update
97 -}
98 -
99 -pkg_postrm() {
100 - fdo-mime_desktop_database_update
101 - fdo-mime_mime_database_update
102 - gnome2_icon_cache_update
103 -}
104
105 diff --git a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
106 deleted file mode 100644
107 index 225d31b..0000000
108 --- a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
109 +++ /dev/null
110 @@ -1,71 +0,0 @@
111 -# Copyright 1999-2016 Gentoo Foundation
112 -# Distributed under the terms of the GNU General Public License v2
113 -# $Id$
114 -
115 -EAPI=6
116 -
117 -PYTHON_COMPAT=( python2_7 )
118 -inherit eutils fdo-mime gnome2-utils python-single-r1
119 -
120 -MY_PV=${PV#0.}
121 -MY_PV=${MY_PV/_rc/-RC}
122 -MY_PN=Cura
123 -
124 -SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
125 -KEYWORDS="~amd64 ~x86"
126 -
127 -DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
128 -HOMEPAGE="https://github.com/daid/Cura"
129 -
130 -LICENSE="AGPL-3"
131 -SLOT="0"
132 -IUSE=""
133 -
134 -RDEPEND="${PYTHON_DEPS}
135 - dev-python/wxpython:3.0[${PYTHON_USEDEP}]
136 - >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
137 - >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}]
138 - >=dev-python/pyserial-2.6[${PYTHON_USEDEP}]
139 - >=media-gfx/curaengine-${PV}
140 -"
141 -DEPEND="${RDEPEND}
142 - >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
143 -
144 -REQUIRED_USE="${PYTHON_REQ_USE}"
145 -PATCHES=( "${FILESDIR}/${PN}-0.15.04.4-nopower.patch" )
146 -S="${WORKDIR}/${MY_PN}-${MY_PV}"
147 -
148 -src_install() {
149 - insinto /usr/share/cura
150 - doins -r Cura resources plugins scripts/linux/cura.py
151 - newicon "${S}/resources/images/c.png" "${PN}.png"
152 - echo ${PV} > "${ED}"usr/share/cura/version || die
153 - cat > "${T}"/cura <<- CURAEOF || die
154 - #!/bin/sh
155 - PYTHONPATH="\$PYTHONPATH:${EROOT}usr/share/cura/" /usr/bin/python2 ${EROOT}usr/share/cura/cura.py "\$@"
156 - CURAEOF
157 - dobin "${T}"/cura
158 -
159 - make_desktop_entry cura \
160 - Cura \
161 - /usr/share/pixmaps/cura.png \
162 - "Graphics;3DGraphics;Engineering;Development"
163 -
164 - python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u)
165 -}
166 -
167 -pkg_preinst() {
168 - gnome2_icon_savelist
169 -}
170 -
171 -pkg_postinst() {
172 - fdo-mime_desktop_database_update
173 - fdo-mime_mime_database_update
174 - gnome2_icon_cache_update
175 -}
176 -
177 -pkg_postrm() {
178 - fdo-mime_desktop_database_update
179 - fdo-mime_mime_database_update
180 - gnome2_icon_cache_update
181 -}
182
183 diff --git a/media-gfx/cura/files/cura-0.15.04.4-nopower.patch b/media-gfx/cura/files/cura-0.15.04.4-nopower.patch
184 deleted file mode 100644
185 index 975d1c5..0000000
186 --- a/media-gfx/cura/files/cura-0.15.04.4-nopower.patch
187 +++ /dev/null
188 @@ -1,90 +0,0 @@
189 -diff -Naur Cura-14.09/Cura/gui/printWindow.py Cura-14.09.new/Cura/gui/printWindow.py
190 ---- Cura-14.09/Cura/gui/printWindow.py 2014-09-19 05:44:21.000000000 -0400
191 -+++ Cura-14.09.new/Cura/gui/printWindow.py 2014-12-08 16:36:18.410389600 -0500
192 -@@ -1,7 +1,6 @@
193 - __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
194 -
195 - import wx
196 --import power
197 - import time
198 - import sys
199 - import os
200 -@@ -319,18 +318,6 @@
201 - self.sizer = wx.GridBagSizer(2, 2)
202 - self.panel.SetSizer(self.sizer)
203 -
204 -- self.powerWarningText = wx.StaticText(parent=self.panel,
205 -- id=-1,
206 -- label=_("Your computer is running on battery power.\nConnect your computer to AC power or your print might not finish."),
207 -- style=wx.ALIGN_CENTER)
208 -- self.powerWarningText.SetBackgroundColour('red')
209 -- self.powerWarningText.SetForegroundColour('white')
210 -- self.powerManagement = power.PowerManagement()
211 -- self.powerWarningTimer = wx.Timer(self)
212 -- self.Bind(wx.EVT_TIMER, self.OnPowerWarningChange, self.powerWarningTimer)
213 -- self.OnPowerWarningChange(None)
214 -- self.powerWarningTimer.Start(10000)
215 --
216 - self.statsText = wx.StaticText(self.panel, -1, _("InfoLine from printer connection\nInfoLine from dialog\nExtra line\nMore lines for layout\nMore lines for layout\nMore lines for layout"))
217 -
218 - self.connectButton = wx.Button(self.panel, -1, _("Connect"))
219 -@@ -341,7 +328,6 @@
220 - self.errorLogButton = wx.Button(self.panel, -1, _("Error log"))
221 - self.progress = wx.Gauge(self.panel, -1, range=1000)
222 -
223 -- self.sizer.Add(self.powerWarningText, pos=(0, 0), span=(1, 5), flag=wx.EXPAND|wx.BOTTOM, border=5)
224 - self.sizer.Add(self.statsText, pos=(1, 0), span=(1, 5), flag=wx.LEFT, border=5)
225 - self.sizer.Add(self.connectButton, pos=(2, 0))
226 - #self.sizer.Add(self.loadButton, pos=(2,1))
227 -@@ -373,21 +359,6 @@
228 - self._printerConnection.openActiveConnection()
229 - preventComputerFromSleeping(True)
230 -
231 -- def OnPowerWarningChange(self, e):
232 -- type = self.powerManagement.get_providing_power_source_type()
233 -- if type == power.POWER_TYPE_AC and self.powerWarningText.IsShown():
234 -- self.powerWarningText.Hide()
235 -- self.panel.Layout()
236 -- self.Layout()
237 -- self.Fit()
238 -- self.Refresh()
239 -- elif type != power.POWER_TYPE_AC and not self.powerWarningText.IsShown():
240 -- self.powerWarningText.Show()
241 -- self.panel.Layout()
242 -- self.Layout()
243 -- self.Fit()
244 -- self.Refresh()
245 --
246 - def OnClose(self, e):
247 - if self._printerConnection.hasActiveConnection():
248 - if self._printerConnection.isPrinting():
249 -diff -Naur Cura-14.09/scripts/linux/cura.py Cura-14.09.new/scripts/linux/cura.py
250 ---- Cura-14.09/scripts/linux/cura.py 2014-09-19 05:44:21.000000000 -0400
251 -+++ Cura-14.09.new/scripts/linux/cura.py 2014-12-08 16:37:44.840391177 -0500
252 -@@ -1,4 +1,4 @@
253 --#!/usr/bin/python
254 -+#!/usr/bin/python2
255 -
256 - import os, sys
257 -
258 -@@ -9,7 +9,6 @@
259 - import wx
260 - import serial
261 - import numpy
262 -- import power
263 - except ImportError as e:
264 - if e.message[0:16] == 'No module named ':
265 - module = e.message[16:]
266 -@@ -20,12 +19,6 @@
267 - module = 'pyserial'
268 - print 'Requires ' + module
269 -
270 -- if module == 'power':
271 -- print "Install from: https://github.com/GreatFruitOmsk/Power"
272 -- else:
273 -- print "Try sudo easy_install " + module
274 -- print e.message
275 --
276 - exit(1)
277 -
278 -
279
280 diff --git a/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch b/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch
281 deleted file mode 100644
282 index ec07c00..0000000
283 --- a/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch
284 +++ /dev/null
285 @@ -1,38 +0,0 @@
286 -diff -Naur a/CMakeLists.txt b/CMakeLists.txt
287 ---- a/CMakeLists.txt 2016-04-12 17:39:03.000000000 +0200
288 -+++ b/CMakeLists.txt 2016-04-16 13:30:27.339900905 +0200
289 -@@ -55,20 +55,31 @@
290 -
291 - find_package(PythonInterp 3.4.0 REQUIRED)
292 -
293 -+if(NOT PYTHON_SITE_PACKAGES_DIR)
294 -+ if(APPLE OR WIN32)
295 -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE
296 -+STRING "Directory to install Python bindings to")
297 -+ else()
298 -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
299 -+STRING "Directory to install Python bindings to")
300 -+ endif()
301 -+endif()
302 -+
303 - install(DIRECTORY resources
304 - DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
305 - install(DIRECTORY plugins
306 -- DESTINATION lib/cura)
307 -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
308 -+
309 - if(NOT APPLE AND NOT WIN32)
310 - install(FILES cura_app.py
311 - DESTINATION ${CMAKE_INSTALL_BINDIR}
312 - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
313 - RENAME cura)
314 - install(DIRECTORY cura
315 -- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages
316 -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
317 - FILES_MATCHING PATTERN *.py)
318 - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
319 -- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
320 -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
321 - install(FILES cura.desktop
322 - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
323 - install(FILES cura.sharedmimeinfo
324
325 diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
326 deleted file mode 100644
327 index df725bf..0000000
328 --- a/media-gfx/cura/metadata.xml
329 +++ /dev/null
330 @@ -1,23 +0,0 @@
331 -<?xml version="1.0" encoding="UTF-8"?>
332 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
333 -<pkgmetadata>
334 - <maintainer type="person">
335 - <email>tomboy64@××××.cn</email>
336 - <name>Matthew Brewer</name>
337 - </maintainer>
338 - <maintainer type="project">
339 - <email>3dprint@g.o</email>
340 - <name>Gentoo 3D Printer Project</name>
341 - </maintainer>
342 - <maintainer type="project">
343 - <email>proxy-maint@g.o</email>
344 - <name>Gentoo Proxy Maintainers Project</name>
345 - </maintainer>
346 - <maintainer type="project">
347 - <email>python@g.o</email>
348 - <name>Gentoo Python Project</name>
349 - </maintainer>
350 - <upstream>
351 - <remote-id type="github">Ultimaker/Cura</remote-id>
352 - </upstream>
353 -</pkgmetadata>
354
355 diff --git a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild b/media-gfx/curaengine/curaengine-0.15.04.6.ebuild
356 deleted file mode 100644
357 index dcfe1fd..0000000
358 --- a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild
359 +++ /dev/null
360 @@ -1,49 +0,0 @@
361 -# Copyright 1999-2016 Gentoo Foundation
362 -# Distributed under the terms of the GNU General Public License v2
363 -# $Id$
364 -
365 -EAPI=6
366 -
367 -inherit toolchain-funcs
368 -
369 -MY_PV=${PV#0.}
370 -MY_PN=CuraEngine
371 -
372 -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
373 -KEYWORDS="~amd64 ~x86"
374 -
375 -DESCRIPTION="A 3D model slicing engine for 3D printing"
376 -HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
377 -
378 -LICENSE="AGPL-3"
379 -SLOT="0"
380 -IUSE="test"
381 -
382 -RDEPEND=""
383 -DEPEND=""
384 -
385 -S="${WORKDIR}/${MY_PN}-${MY_PV}"
386 -PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
387 -
388 -src_prepare() {
389 - tc-export CXX
390 - default
391 -}
392 -
393 -src_test() {
394 - pushd tests 2>&- || die
395 - einfo "Commencing test ..."
396 - local testbin=( "${S}/build/CuraEngine" "-c" "supportAngle=60" "-c" "supportEverywhere=1" )
397 - local testmdl="${S}/tests/testModel.stl"
398 - ${testbin[*]} "${testmdl}"
399 - if [[ $? -eq 0 && -f "${testbin[0]}" && -f "${testmdl}" ]]; then
400 - einfo "Test completed successfully."
401 - else
402 - ewarn "Test failed."
403 - fi
404 -}
405 -
406 -src_install() {
407 - dobin build/CuraEngine
408 - dodoc README.md
409 -}
Report Message
Find on MARC Find on Google Groups