public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/
@ 2016-04-28 14:12 Ian Delaney
  0 siblings, 0 replies; 6+ messages in thread
From: Ian Delaney @ 2016-04-28 14:12 UTC (permalink / raw
  To: gentoo-commits

commit:     2b1dfc2fc7c4c6dbe9d2f48e831918d2cb50c629
Author:     Marshall Brewer (Gentoo Key) <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri Apr 15 22:14:07 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 14:12:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1dfc2f

media-gfx/cura: initial ebuild, 2.1.0_beta

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
Closes: https://github.com/gentoo/gentoo/pull/1298

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 media-gfx/cura/Manifest                            |  1 +
 media-gfx/cura/cura-2.1.0_beta.ebuild              | 65 ++++++++++++++++++++++
 .../files/cura-2.1.0_beta-fix-install-paths.patch  | 38 +++++++++++++
 media-gfx/cura/metadata.xml                        | 26 +++++++++
 4 files changed, 130 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
new file mode 100644
index 0000000..7541caa
--- /dev/null
+++ b/media-gfx/cura/Manifest
@@ -0,0 +1 @@
+DIST cura-2.1.0_beta.tar.gz 19784684 SHA256 b81f09307968475e33b03199aaf968e25d2b37fc7db9777b95c03053b1836f83 SHA512 9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2 WHIRLPOOL 19ae138fa4b7c840ffc2d61779a08d48624bc6078fa83a6bec280d1a725e93bad6682d9f21a0cbe3ee4a4343a47a7e6f58d3fd559804f278241c7a5bb7d3cf89

diff --git a/media-gfx/cura/cura-2.1.0_beta.ebuild b/media-gfx/cura/cura-2.1.0_beta.ebuild
new file mode 100644
index 0000000..5b991fa
--- /dev/null
+++ b/media-gfx/cura/cura-2.1.0_beta.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
+
+MY_PN=Cura
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="+usb"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libarcus:=[${PYTHON_USEDEP}]
+	dev-python/uranium[${PYTHON_USEDEP}]
+	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	~media-gfx/curaengine-${PV}"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}/${P}-fix-install-paths.patch" )
+DOCS=( README.md )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon icons/*.png
+	python_optimize "${D}${get_libdir}"
+}
+
+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-2.1.0_beta-fix-install-paths.patch b/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch
new file mode 100644
index 0000000..ec07c00
--- /dev/null
+++ b/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 0000000..aafd66f
--- /dev/null
+++ b/media-gfx/cura/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>tomboy64@sina.cn</email>
+        <name>Matthew Brewer</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>3dprint@gentoo.org</email>
+        <name>Gentoo 3D Printer Project</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Gentoo Proxy Maintainers Project</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>python@gentoo.org</email>
+        <name>Gentoo Python Project</name>
+    </maintainer>
+	<use>
+		<flag name="usb">Access 3D printers via USB</flag>
+	</use>
+    <upstream>
+		<remote-id type="github">Ultimaker/Cura</remote-id>
+    </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/
@ 2016-08-08  1:49 Göktürk Yüksek
  0 siblings, 0 replies; 6+ messages in thread
From: Göktürk Yüksek @ 2016-08-08  1:49 UTC (permalink / raw
  To: gentoo-commits

commit:     9cc213d3b81d523910f5cb7f63653ed7100ed17f
Author:     Marshall Brewer (Gentoo Key) <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sat Apr 30 08:17:47 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 01:32:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc213d3

media-gfx/cura: new version 0.15.04.4 (legacy)

based on the original ebuild by _AxS_

EROOT are replaced with EPREFIX by the committer

Package-Manager: portage-2.2.28

 media-gfx/cura/Manifest                           |  1 +
 media-gfx/cura/cura-0.15.04.4.ebuild              | 73 ++++++++++++++++++
 media-gfx/cura/files/cura-0.15.04.4-nopower.patch | 90 +++++++++++++++++++++++
 3 files changed, 164 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 7541caa..e3e56ce 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1 +1,2 @@
+DIST cura-0.15.04.4.tar.gz 7265105 SHA256 9bce9cec7578792f7008a557930d16216ef97041a62071bb4e2b2a89638f1f54 SHA512 6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd WHIRLPOOL cafd4bc3589214c3fc792c770eaa3f3590018f83ae82444c4f495245ab900748edabccb5a6518d9bd5b26295d7a953e3e60295b3baa90baf6abfe8a75012fbf2
 DIST cura-2.1.0_beta.tar.gz 19784684 SHA256 b81f09307968475e33b03199aaf968e25d2b37fc7db9777b95c03053b1836f83 SHA512 9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2 WHIRLPOOL 19ae138fa4b7c840ffc2d61779a08d48624bc6078fa83a6bec280d1a725e93bad6682d9f21a0cbe3ee4a4343a47a7e6f58d3fd559804f278241c7a5bb7d3cf89

diff --git a/media-gfx/cura/cura-0.15.04.4.ebuild b/media-gfx/cura/cura-0.15.04.4.ebuild
new file mode 100644
index 0000000..b6bcbf2
--- /dev/null
+++ b/media-gfx/cura/cura-0.15.04.4.ebuild
@@ -0,0 +1,73 @@
+# 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[opengl,${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_prepare() {
+	cat > "${T}"/cura <<- CURAEOF || die
+		#!/bin/sh
+		PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" "${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
+	CURAEOF
+
+	eapply "${PATCHES[@]}"
+	eapply_user
+}
+
+src_install() {
+	insinto /usr/share/cura
+	doins -r Cura resources plugins scripts/linux/cura.py
+	newicon "${S}/resources/images/c.png" "cura.png"
+	echo ${PV} > "${ED}"usr/share/cura/version || die
+	dobin "${T}"/cura
+
+	python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u)
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	make_desktop_entry cura \
+		Cura \
+		"${EPREFIX}/usr/share/pixmaps/cura.png" \
+		"Graphics;3DGraphics;Engineering;Development"
+}
+
+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
new file mode 100644
index 0000000..975d1c5
--- /dev/null
+++ b/media-gfx/cura/files/cura-0.15.04.4-nopower.patch
@@ -0,0 +1,90 @@
+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)
+ 
+ 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/
@ 2016-12-05  9:48 Alexey Shvetsov
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov @ 2016-12-05  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ffd11e19963dba37faa4ed735ed4c286234089d9
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 09:47:27 2016 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 09:47:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd11e19

media-gfx/cura: Version bump to 2.3.1

Package-Manager: portage-2.3.2

 media-gfx/cura/Manifest                            |  1 +
 media-gfx/cura/cura-2.3.1.ebuild                   | 66 ++++++++++++++++++++++
 .../cura/files/cura-2.3.1-fix-install-paths.patch  | 38 +++++++++++++
 3 files changed, 105 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 113bc53..0a377e4 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,4 @@
 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
 DIST cura-2.1.0_beta.tar.gz 19784684 SHA256 b81f09307968475e33b03199aaf968e25d2b37fc7db9777b95c03053b1836f83 SHA512 9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2 WHIRLPOOL 19ae138fa4b7c840ffc2d61779a08d48624bc6078fa83a6bec280d1a725e93bad6682d9f21a0cbe3ee4a4343a47a7e6f58d3fd559804f278241c7a5bb7d3cf89
+DIST cura-2.3.1.tar.gz 8216743 SHA256 4542a5925b503f5416ebb8541fccb65d5c08164febafefdacb05b528c4cf73a8 SHA512 875c55a1b75f9e8c5bc6faac8f865a17ee371e973e3acf2528c09ee18bd517acbdde066f292c506ed67654119fdfeac86e28b41887807b767225e0ee6054301f WHIRLPOOL dfa7d3dac9f53d8682a4761900665598b7b75b08afd283a77f43351709eb2639c44b6694d626c17be98544acdceec50b8f6409fdb69efd1bb7d4a5f945e16cba

diff --git a/media-gfx/cura/cura-2.3.1.ebuild b/media-gfx/cura/cura-2.3.1.ebuild
new file mode 100644
index 00000000..808733d
--- /dev/null
+++ b/media-gfx/cura/cura-2.3.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
+
+MY_PN=Cura
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+IUSE="+usb"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
+	dev-python/uranium[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	~media-gfx/curaengine-${PV}"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}/${P}-fix-install-paths.patch" )
+DOCS=( README.md )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon icons/*.png
+	python_optimize "${D}${get_libdir}"
+}
+
+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-2.3.1-fix-install-paths.patch b/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch
new file mode 100644
index 00000000..8f503ce
--- /dev/null
+++ b/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch
@@ -0,0 +1,38 @@
+diff -urN Cura-2.3.1.orig/CMakeLists.txt Cura-2.3.1/CMakeLists.txt
+--- Cura-2.3.1.orig/CMakeLists.txt	2016-11-04 16:24:43.000000000 +0300
++++ Cura-2.3.1/CMakeLists.txt	2016-12-05 12:20:23.126904644 +0300
+@@ -27,20 +27,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 ${CMAKE_BINARY_DIR}/cura.desktop
+             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+     install(FILES cura.sharedmimeinfo


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/
@ 2018-06-14 13:11 Alexey Shvetsov
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov @ 2018-06-14 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     80e62b6c736134c9ad0cedf85c677feda3b98ad5
Author:     Alexey Shvetsov <alexxy <AT> omrb <DOT> pnpi <DOT> spb <DOT> ru>
AuthorDate: Thu Jun 14 13:11:02 2018 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 13:11:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e62b6c

media-gfx/cura: Version bump and clean up

Closes: https://bugs.gentoo.org/630620
Closes: https://bugs.gentoo.org/648130
Closes: https://github.com/gentoo/gentoo/pull/8258
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/cura/Manifest                            |  6 +-
 media-gfx/cura/cura-0.15.04.4.ebuild               | 77 ------------------
 media-gfx/cura/cura-0.15.04.5_rc5.ebuild           | 78 -------------------
 media-gfx/cura/cura-2.1.0_beta.ebuild              | 69 -----------------
 media-gfx/cura/cura-2.6.0.ebuild                   | 70 -----------------
 .../cura/{cura-2.3.1.ebuild => cura-3.3.1.ebuild}  | 40 +++++-----
 media-gfx/cura/files/cura-0.15.04.4-nopower.patch  | 90 ----------------------
 .../files/cura-2.1.0_beta-fix-install-paths.patch  | 38 ---------
 .../cura/files/cura-2.3.1-fix-install-paths.patch  | 38 ---------
 .../cura/files/cura-3.3.0-fix-install-paths.patch  | 37 +++++++++
 10 files changed, 57 insertions(+), 486 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 69329e4293f..ba038040485 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,5 +1 @@
-DIST cura-0.15.04.4.tar.gz 7265105 BLAKE2B 8ea4979819180f3f8fec8900215c11db49dafbae71ff023aeb16b760ae5f88d271c0ad2628ab7f06f2a4962cc792573ac56cc63368ebb69e37a83ec092cd5d44 SHA512 6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd
-DIST cura-0.15.04.5_rc5.tar.gz 7266640 BLAKE2B 3900d9c8b1627933b1f6432a75674396c79de993982afa93e6d435d0ebf20df25184eda3760ded566a6fa7c93b0e3b16d76b1bb47f093d281245fee8f799bcb1 SHA512 cafb2b6883838e3e427e3da0388a6cd93d666052d9029eeb98bafad7970c805c271a7599fbdc493164d790f101b92bbd511479d2fc9f91c64f73677c6cee0a2f
-DIST cura-2.1.0_beta.tar.gz 19784684 BLAKE2B 30f908b8792fdbe512d1e9fbc98a8f90018db38fa92c286a209f4dfaded9af8c8c45f5ffca38d9c79ff82a18c9e906fc6141085368bf26cffb2ec15931869cc1 SHA512 9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2
-DIST cura-2.3.1.tar.gz 8216743 BLAKE2B 33241eb825a2fde8c1932642dc20c24c50c744068dc2bd7c32d97c9e6b1cfa062ebe110670d9d2828093043ff6c147a1dfbcb5daf0e6ec2447bb9bed4a51c4bc SHA512 875c55a1b75f9e8c5bc6faac8f865a17ee371e973e3acf2528c09ee18bd517acbdde066f292c506ed67654119fdfeac86e28b41887807b767225e0ee6054301f
-DIST cura-2.6.0.tar.gz 10007980 BLAKE2B 7ed59c28402c2c99dcf8db4506d575159ce25d6e8c58bb2bef302cd662a28f124046e677fba754cc41dc087d94b30183e0896d935cd3ae7e896ba9736ec0a511 SHA512 c437b284292682821d3e7c6fe67dfbf9e397588a604d0608fcc89019d02529720a929881d1ad0531fedba2f4b3efc98c1890624a4261dcccacbcfa24246d6e54
+DIST cura-3.3.1.tar.gz 21045888 BLAKE2B 6298a291498fb7930970fdb15827e5698011e69c69326e07ecaf5440994b099aa3ce9ee2540b968ffaff1ad47a58ef76bc7c5c003e92b710d81fc649e4fc825a SHA512 7b05885213828f0c297c7798b4bf7ea5967902893b5743b424d65d3a0c88804ed208c3d0361b92cade8ad31a42d1aff3a07eb4d2effa15597f942603a2d2bf63

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 fa9ddb4d251..00000000000
--- a/media-gfx/cura/cura-0.15.04.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop gnome2-utils python-single-r1 xdg-utils
-
-MY_PV=${PV#0.}
-MY_PN=Cura
-
-DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
-HOMEPAGE="https://github.com/daid/Cura"
-SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython:3.0[opengl,${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}]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.15.04.4-nopower.patch"
-)
-
-src_prepare() {
-	cat > "${T}"/cura <<- CURAEOF || die
-		#!/bin/sh
-		PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" "${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
-	CURAEOF
-
-	default
-}
-
-src_install() {
-	insinto /usr/share/cura
-	doins -r Cura resources plugins scripts/linux/cura.py
-	newicon "${S}/resources/images/c.png" "cura.png"
-	echo ${PV} > "${ED}"usr/share/cura/version || die
-	dobin "${T}"/cura
-
-	python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u)
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	make_desktop_entry cura \
-		Cura \
-		"${EPREFIX}/usr/share/pixmaps/cura.png" \
-		"Graphics;3DGraphics;Engineering;Development"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_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 c35602d8d18..00000000000
--- a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop gnome2-utils python-single-r1 xdg-utils
-
-MY_PV=${PV#0.}
-MY_PV=${MY_PV/_rc/-RC}
-MY_PN=Cura
-
-DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
-HOMEPAGE="https://github.com/daid/Cura"
-SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython:3.0[opengl,${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}]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.15.04.4-nopower.patch"
-)
-
-src_prepare() {
-	cat > "${T}"/cura <<- CURAEOF || die
-		#!/bin/sh
-		PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" "${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
-	CURAEOF
-
-	default
-}
-
-src_install() {
-	insinto /usr/share/cura
-	doins -r Cura resources plugins scripts/linux/cura.py
-	newicon "${S}/resources/images/c.png" "cura.png"
-	echo ${PV} > "${ED}"usr/share/cura/version || die
-	dobin "${T}"/cura
-
-	python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort -u)
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	make_desktop_entry cura \
-		Cura \
-		"${EPREFIX}/usr/share/pixmaps/cura.png" \
-		"Graphics;3DGraphics;Engineering;Development"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}

diff --git a/media-gfx/cura/cura-2.1.0_beta.ebuild b/media-gfx/cura/cura-2.1.0_beta.ebuild
deleted file mode 100644
index db1610abbb6..00000000000
--- a/media-gfx/cura/cura-2.1.0_beta.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-MY_PN=Cura
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
-	dev-python/uranium[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	~media-gfx/curaengine-${PV}"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0_beta-fix-install-paths.patch"
-)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}

diff --git a/media-gfx/cura/cura-2.6.0.ebuild b/media-gfx/cura/cura-2.6.0.ebuild
deleted file mode 100644
index bf9f44699fb..00000000000
--- a/media-gfx/cura/cura-2.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-MY_PN=Cura
-MY_PV=${PV/_beta}
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
-	dev-python/uranium[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	~media-gfx/curaengine-${PV}"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1-fix-install-paths.patch"
-)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}

diff --git a/media-gfx/cura/cura-2.3.1.ebuild b/media-gfx/cura/cura-3.3.1.ebuild
similarity index 54%
rename from media-gfx/cura/cura-2.3.1.ebuild
rename to media-gfx/cura/cura-3.3.1.ebuild
index 9af78aaedc3..c8501394398 100644
--- a/media-gfx/cura/cura-2.3.1.ebuild
+++ b/media-gfx/cura/cura-3.3.1.ebuild
@@ -3,43 +3,41 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
 
 MY_PN=Cura
-MY_PV=${PV/_beta}
 
 DESCRIPTION="A 3D model slicing application for 3D printing"
 HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="AGPL-3+"
+LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+usb"
+IUSE="+usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
 	dev-python/uranium[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	media-gfx/curaengine
+	media-gfx/fdm-materials
+	dev-libs/libsavitar:=[python,${PYTHON_USEDEP}]
+	dev-libs/libcharon[${PYTHON_USEDEP}]
 	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	~media-gfx/curaengine-${PV}"
+	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1-fix-install-paths.patch"
-)
-
+S="${WORKDIR}/${MY_PN}-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
 DOCS=( README.md )
 
 src_configure() {
 	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
 	cmake-utils_src_configure
 }
 
@@ -58,13 +56,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	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 975d1c507b3..00000000000
--- 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 ec07c0014cc..00000000000
--- 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/files/cura-2.3.1-fix-install-paths.patch b/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch
deleted file mode 100644
index 8f503ce7348..00000000000
--- a/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN Cura-2.3.1.orig/CMakeLists.txt Cura-2.3.1/CMakeLists.txt
---- Cura-2.3.1.orig/CMakeLists.txt	2016-11-04 16:24:43.000000000 +0300
-+++ Cura-2.3.1/CMakeLists.txt	2016-12-05 12:20:23.126904644 +0300
-@@ -27,20 +27,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 ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-     install(FILES cura.sharedmimeinfo

diff --git a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
new file mode 100644
index 00000000000..066f9148c4d
--- /dev/null
+++ b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
@@ -0,0 +1,37 @@
+--- Cura-3.1.0-orig/CMakeLists.txt  2017-12-04 18:05:38.000000000 +0200
++++ Cura-3.1.0/CMakeLists.txt   2017-12-29 18:11:19.508034087 +0200
+@@ -36,10 +36,20 @@
+ 
+ find_package(PythonInterp 3.5.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${LIB_SUFFIX}/cura)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
+ if(NOT APPLE AND NOT WIN32)
+     install(FILES cura_app.py
+             DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -53,10 +63,10 @@
+             DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
+     else()
+         install(DIRECTORY cura
+-            DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
+             FILES_MATCHING PATTERN *.py)
+         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
+-            DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura)
++            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
+     endif()
+     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
+             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/
@ 2020-10-11 11:25 Dennis Lamm
  0 siblings, 0 replies; 6+ messages in thread
From: Dennis Lamm @ 2020-10-11 11:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d194a2eafb2c7c272ccd88565992c0be9727ef8b
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 10:20:35 2020 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 11:25:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d194a2ea

media-gfx/cura: drop old

Signed-off-by: Dennis Lamm <expeditoneer <AT> gentoo.org>
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 media-gfx/cura/Manifest                            |  4 --
 media-gfx/cura/cura-3.4.1.ebuild                   | 75 ----------------------
 media-gfx/cura/cura-3.6.0.ebuild                   | 75 ----------------------
 media-gfx/cura/cura-4.2.1.ebuild                   | 55 ----------------
 media-gfx/cura/cura-4.3.0-r1.ebuild                | 55 ----------------
 .../cura/files/cura-3.3.0-fix-install-paths.patch  | 37 -----------
 .../cura/files/cura-4.2.1-fix-install-paths.patch  | 41 ------------
 7 files changed, 342 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index aadc097a34d..8e2e7103861 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,6 +1,2 @@
-DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728 SHA512 5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
-DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
-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 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
 DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d

diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild
deleted file mode 100644
index f1b275618c6..00000000000
--- a/media-gfx/cura/cura-3.4.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1
-
-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}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-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-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild
deleted file mode 100644
index f1b275618c6..00000000000
--- a/media-gfx/cura/cura-3.6.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1
-
-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}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-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-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild
deleted file mode 100644
index d72614d316d..00000000000
--- a/media-gfx/cura/cura-4.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-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}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_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_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/cura-4.3.0-r1.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild
deleted file mode 100644
index d72614d316d..00000000000
--- a/media-gfx/cura/cura-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-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}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_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_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-3.3.0-fix-install-paths.patch b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
deleted file mode 100644
index 066f9148c4d..00000000000
--- a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Cura-3.1.0-orig/CMakeLists.txt  2017-12-04 18:05:38.000000000 +0200
-+++ Cura-3.1.0/CMakeLists.txt   2017-12-29 18:11:19.508034087 +0200
-@@ -36,10 +36,20 @@
- 
- find_package(PythonInterp 3.5.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${LIB_SUFFIX}/cura)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
- if(NOT APPLE AND NOT WIN32)
-     install(FILES cura_app.py
-             DESTINATION ${CMAKE_INSTALL_BINDIR}
-@@ -53,10 +63,10 @@
-             DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
-     else()
-         install(DIRECTORY cura
--            DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
-             FILES_MATCHING PATTERN *.py)
-         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura)
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-     endif()
-     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)

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
deleted file mode 100644
index fc10d727d13..00000000000
--- a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.000000000 +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
--        DESTINATION lib${LIB_SUFFIX}/cura)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
- 
- if(NOT APPLE AND NOT WIN32)
-     install(FILES cura_app.py
-@@ -79,10 +88,10 @@
-             DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura)
-     else()
-         install(DIRECTORY cura
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
-             FILES_MATCHING PATTERN *.py)
-         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-     endif()
-     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/
@ 2021-02-07 21:30 Dennis Lamm
  0 siblings, 0 replies; 6+ messages in thread
From: Dennis Lamm @ 2021-02-07 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     34625d641e9b7620465d84bb662e62f26fccfb6f
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 18:48:20 2021 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 21:30:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34625d64

media-gfx/cura: drop old

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 media-gfx/cura/Manifest                            |  1 -
 media-gfx/cura/cura-4.7.0-r1.ebuild                | 64 ----------------------
 .../cura/files/cura-4.6.1-fix-install-paths.patch  | 31 -----------
 3 files changed, 96 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index f4ccb95c398..5dfea09d774 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1 @@
-DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
 DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711

diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild b/media-gfx/cura/cura-4.7.0-r1.ebuild
deleted file mode 100644
index e6ec0adefd3..00000000000
--- a/media-gfx/cura/cura-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..8})
-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 ~arm64 ~x86"
-IUSE="+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/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~media-gfx/curaengine-${PV}
-	~media-gfx/fdm-materials-${PV}
-	$(python_gen_cond_dep '
-			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
-			sci-libs/shapely[${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 -e "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# trimesh not available in portage
-	local mycmakeargs=(
-		-DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	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.6.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
deleted file mode 100644
index 4d5f00ad47d..00000000000
--- a/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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.000000000 +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 "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")
-@@ -80,10 +89,10 @@
-             DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura)
-     else()
-         install(DIRECTORY cura
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
-             FILES_MATCHING PATTERN *.py)
-         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-     endif()
-     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-07 21:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-14 13:11 [gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/ Alexey Shvetsov
  -- strict thread matches above, loose matches on Subject: below --
2021-02-07 21:30 Dennis Lamm
2020-10-11 11:25 Dennis Lamm
2016-12-05  9:48 Alexey Shvetsov
2016-08-08  1:49 Göktürk Yüksek
2016-04-28 14:12 Ian Delaney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox