From 3128b145289c8bf64fd8e39df82d121cd0bfb8f2 Mon Sep 17 00:00:00 2001 From: Matthew Brewer Date: Sun, 5 Jun 2016 13:49:57 +0200 Subject: remove cura stuff from overlay --- media-gfx/cura/Manifest | 2 - media-gfx/cura/cura-0.15.04.4.ebuild | 70 ----------------- media-gfx/cura/cura-0.15.04.5_rc5.ebuild | 71 ----------------- media-gfx/cura/files/cura-0.15.04.4-nopower.patch | 90 ---------------------- .../files/cura-2.1.0_beta-fix-install-paths.patch | 38 --------- media-gfx/cura/metadata.xml | 23 ------ media-gfx/curaengine/curaengine-0.15.04.6.ebuild | 49 ------------ 7 files changed, 343 deletions(-) delete mode 100644 media-gfx/cura/Manifest delete mode 100644 media-gfx/cura/cura-0.15.04.4.ebuild delete mode 100644 media-gfx/cura/cura-0.15.04.5_rc5.ebuild delete mode 100644 media-gfx/cura/files/cura-0.15.04.4-nopower.patch delete mode 100644 media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch delete mode 100644 media-gfx/cura/metadata.xml delete mode 100644 media-gfx/curaengine/curaengine-0.15.04.6.ebuild diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest deleted file mode 100644 index a7f5142..0000000 --- a/media-gfx/cura/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cura-0.15.04.4.tar.gz 7265105 SHA256 9bce9cec7578792f7008a557930d16216ef97041a62071bb4e2b2a89638f1f54 SHA512 6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd WHIRLPOOL cafd4bc3589214c3fc792c770eaa3f3590018f83ae82444c4f495245ab900748edabccb5a6518d9bd5b26295d7a953e3e60295b3baa90baf6abfe8a75012fbf2 -DIST cura-0.15.04.5_rc5.tar.gz 7266640 SHA256 12d72b1ece64bfc00909866e725f39867c9d82abdd793892df210afd35014c89 SHA512 cafb2b6883838e3e427e3da0388a6cd93d666052d9029eeb98bafad7970c805c271a7599fbdc493164d790f101b92bbd511479d2fc9f91c64f73677c6cee0a2f WHIRLPOOL b6ed8e0f9e17ee4d2c1eae3a8f8a0293529f6a4b362445d9296b47247aab91d521c64541ea9110c8b169eb01661f3cae30583f8f959d4d7bc0a8c255455db58b diff --git a/media-gfx/cura/cura-0.15.04.4.ebuild b/media-gfx/cura/cura-0.15.04.4.ebuild deleted file mode 100644 index 5f3f1d1..0000000 --- a/media-gfx/cura/cura-0.15.04.4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils fdo-mime gnome2-utils python-single-r1 - -MY_PV=${PV#0.} -MY_PN=Cura - -SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers" -HOMEPAGE="https://github.com/daid/Cura" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="" - -RDEPEND="${PYTHON_DEPS} - dev-python/wxpython:3.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}] - >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}] - >=dev-python/pyserial-2.6[${PYTHON_USEDEP}] - >=media-gfx/curaengine-${PV} -" -DEPEND="${RDEPEND} - >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]" - -REQUIRED_USE="${PYTHON_REQ_USE}" -PATCHES=( "${FILESDIR}/${P}-nopower.patch" ) -S="${WORKDIR}/${MY_PN}-${MY_PV}" - -src_install() { - insinto /usr/share/cura - doins -r Cura resources plugins scripts/linux/cura.py - newicon "${S}/resources/images/c.png" "${PN}.png" - echo ${PV} > "${ED}"usr/share/cura/version || die - cat > "${T}"/cura <<- CURAEOF || die - #!/bin/sh - PYTHONPATH="\$PYTHONPATH:${EROOT}usr/share/cura/" /usr/bin/python2 ${EROOT}usr/share/cura/cura.py "\$@" - CURAEOF - dobin "${T}"/cura - - make_desktop_entry cura \ - Cura \ - /usr/share/pixmaps/cura.png \ - "Graphics;3DGraphics;Engineering;Development" - - python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u) -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild deleted file mode 100644 index 225d31b..0000000 --- a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils fdo-mime gnome2-utils python-single-r1 - -MY_PV=${PV#0.} -MY_PV=${MY_PV/_rc/-RC} -MY_PN=Cura - -SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers" -HOMEPAGE="https://github.com/daid/Cura" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="" - -RDEPEND="${PYTHON_DEPS} - dev-python/wxpython:3.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}] - >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}] - >=dev-python/pyserial-2.6[${PYTHON_USEDEP}] - >=media-gfx/curaengine-${PV} -" -DEPEND="${RDEPEND} - >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]" - -REQUIRED_USE="${PYTHON_REQ_USE}" -PATCHES=( "${FILESDIR}/${PN}-0.15.04.4-nopower.patch" ) -S="${WORKDIR}/${MY_PN}-${MY_PV}" - -src_install() { - insinto /usr/share/cura - doins -r Cura resources plugins scripts/linux/cura.py - newicon "${S}/resources/images/c.png" "${PN}.png" - echo ${PV} > "${ED}"usr/share/cura/version || die - cat > "${T}"/cura <<- CURAEOF || die - #!/bin/sh - PYTHONPATH="\$PYTHONPATH:${EROOT}usr/share/cura/" /usr/bin/python2 ${EROOT}usr/share/cura/cura.py "\$@" - CURAEOF - dobin "${T}"/cura - - make_desktop_entry cura \ - Cura \ - /usr/share/pixmaps/cura.png \ - "Graphics;3DGraphics;Engineering;Development" - - python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u) -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} 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 deleted file mode 100644 index 975d1c5..0000000 --- a/media-gfx/cura/files/cura-0.15.04.4-nopower.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Naur Cura-14.09/Cura/gui/printWindow.py Cura-14.09.new/Cura/gui/printWindow.py ---- Cura-14.09/Cura/gui/printWindow.py 2014-09-19 05:44:21.000000000 -0400 -+++ Cura-14.09.new/Cura/gui/printWindow.py 2014-12-08 16:36:18.410389600 -0500 -@@ -1,7 +1,6 @@ - __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" - - import wx --import power - import time - import sys - import os -@@ -319,18 +318,6 @@ - self.sizer = wx.GridBagSizer(2, 2) - self.panel.SetSizer(self.sizer) - -- self.powerWarningText = wx.StaticText(parent=self.panel, -- id=-1, -- label=_("Your computer is running on battery power.\nConnect your computer to AC power or your print might not finish."), -- style=wx.ALIGN_CENTER) -- self.powerWarningText.SetBackgroundColour('red') -- self.powerWarningText.SetForegroundColour('white') -- self.powerManagement = power.PowerManagement() -- self.powerWarningTimer = wx.Timer(self) -- self.Bind(wx.EVT_TIMER, self.OnPowerWarningChange, self.powerWarningTimer) -- self.OnPowerWarningChange(None) -- self.powerWarningTimer.Start(10000) -- - 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")) - - self.connectButton = wx.Button(self.panel, -1, _("Connect")) -@@ -341,7 +328,6 @@ - self.errorLogButton = wx.Button(self.panel, -1, _("Error log")) - self.progress = wx.Gauge(self.panel, -1, range=1000) - -- self.sizer.Add(self.powerWarningText, pos=(0, 0), span=(1, 5), flag=wx.EXPAND|wx.BOTTOM, border=5) - self.sizer.Add(self.statsText, pos=(1, 0), span=(1, 5), flag=wx.LEFT, border=5) - self.sizer.Add(self.connectButton, pos=(2, 0)) - #self.sizer.Add(self.loadButton, pos=(2,1)) -@@ -373,21 +359,6 @@ - self._printerConnection.openActiveConnection() - preventComputerFromSleeping(True) - -- def OnPowerWarningChange(self, e): -- type = self.powerManagement.get_providing_power_source_type() -- if type == power.POWER_TYPE_AC and self.powerWarningText.IsShown(): -- self.powerWarningText.Hide() -- self.panel.Layout() -- self.Layout() -- self.Fit() -- self.Refresh() -- elif type != power.POWER_TYPE_AC and not self.powerWarningText.IsShown(): -- self.powerWarningText.Show() -- self.panel.Layout() -- self.Layout() -- self.Fit() -- self.Refresh() -- - def OnClose(self, e): - if self._printerConnection.hasActiveConnection(): - if self._printerConnection.isPrinting(): -diff -Naur Cura-14.09/scripts/linux/cura.py Cura-14.09.new/scripts/linux/cura.py ---- Cura-14.09/scripts/linux/cura.py 2014-09-19 05:44:21.000000000 -0400 -+++ Cura-14.09.new/scripts/linux/cura.py 2014-12-08 16:37:44.840391177 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - import os, sys - -@@ -9,7 +9,6 @@ - import wx - import serial - import numpy -- import power - except ImportError as e: - if e.message[0:16] == 'No module named ': - module = e.message[16:] -@@ -20,12 +19,6 @@ - module = 'pyserial' - print 'Requires ' + module - -- if module == 'power': -- print "Install from: https://github.com/GreatFruitOmsk/Power" -- else: -- print "Try sudo easy_install " + module -- print e.message -- - exit(1) - - 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 deleted file mode 100644 index ec07c00..0000000 --- a/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2016-04-12 17:39:03.000000000 +0200 -+++ b/CMakeLists.txt 2016-04-16 13:30:27.339900905 +0200 -@@ -55,20 +55,31 @@ - - find_package(PythonInterp 3.4.0 REQUIRED) - -+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() -+ - install(DIRECTORY resources - DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - install(DIRECTORY plugins -- DESTINATION lib/cura) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) -+ - if(NOT APPLE AND NOT WIN32) - install(FILES cura_app.py - DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - RENAME cura) - install(DIRECTORY cura -- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} - FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py -- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) - install(FILES cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES cura.sharedmimeinfo diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml deleted file mode 100644 index df725bf..0000000 --- a/media-gfx/cura/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - tomboy64@sina.cn - Matthew Brewer - - - 3dprint@gentoo.org - Gentoo 3D Printer Project - - - proxy-maint@gentoo.org - Gentoo Proxy Maintainers Project - - - python@gentoo.org - Gentoo Python Project - - - Ultimaker/Cura - - diff --git a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild b/media-gfx/curaengine/curaengine-0.15.04.6.ebuild deleted file mode 100644 index dcfe1fd..0000000 --- a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit toolchain-funcs - -MY_PV=${PV#0.} -MY_PN=CuraEngine - -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="test" - -RDEPEND="" -DEPEND="" - -S="${WORKDIR}/${MY_PN}-${MY_PV}" -PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) - -src_prepare() { - tc-export CXX - default -} - -src_test() { - pushd tests 2>&- || die - einfo "Commencing test ..." - local testbin=( "${S}/build/CuraEngine" "-c" "supportAngle=60" "-c" "supportEverywhere=1" ) - local testmdl="${S}/tests/testModel.stl" - ${testbin[*]} "${testmdl}" - if [[ $? -eq 0 && -f "${testbin[0]}" && -f "${testmdl}" ]]; then - einfo "Test completed successfully." - else - ewarn "Test failed." - fi -} - -src_install() { - dobin build/CuraEngine - dodoc README.md -} -- cgit v1.2.3-18-g5258