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

10 files changed, 57 insertions, 486 deletions

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 69329e4293f1..ba0380404850 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 fa9ddb4d2518..000000000000
--- 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 c35602d8d18b..000000000000
--- 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 db1610abbb6f..000000000000
--- 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.3.1.ebuild b/media-gfx/cura/cura-2.3.1.ebuild
deleted file mode 100644
index 9af78aaedc32..000000000000
--- a/media-gfx/cura/cura-2.3.1.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} )
-
-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.6.0.ebuild b/media-gfx/cura/cura-3.3.1.ebuild
index bf9f44699fb2..c8501394398e 100644
--- a/media-gfx/cura/cura-2.6.0.ebuild
+++ b/media-gfx/cura/cura-3.3.1.ebuild
@@ -3,43 +3,41 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-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 975d1c507b33..000000000000
--- 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 ec07c0014cce..000000000000
--- 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 8f503ce73488..000000000000
--- 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 000000000000..066f9148c4d9
--- /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)