[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/

[Dennis Lamm]

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)