commit: fff03732e39bdd6b5f471108de3078ad0e781990
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 20:35:51 2020 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 18:37:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff03732
media-gfx/cura: drop old with dependencies
Signed-off-by: Dennis Lamm <expeditoneer <AT> gentoo.org>
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
dev-libs/libarcus/Manifest | 1 -
dev-libs/libarcus/libarcus-4.6.1.ebuild | 56 ----------------
dev-libs/libcharon/Manifest | 1 -
dev-libs/libcharon/libcharon-4.6.1.ebuild | 36 ----------
dev-libs/libsavitar/Manifest | 1 -
.../libsavitar-4.6.1-remove-packaged-pugixml.patch | 60 -----------------
dev-libs/libsavitar/libsavitar-4.6.1.ebuild | 53 ---------------
dev-python/uranium/Manifest | 1 -
.../files/uranium-4.6.1-fix-install-paths.patch | 32 ---------
dev-python/uranium/uranium-4.6.1.ebuild | 76 ----------------------
media-gfx/cura/Manifest | 1 -
media-gfx/cura/cura-4.6.1-r1.ebuild | 57 ----------------
media-gfx/cura/cura-4.7.0.ebuild | 57 ----------------
media-gfx/curaengine/Manifest | 1 -
media-gfx/curaengine/curaengine-4.6.1.ebuild | 45 -------------
media-gfx/fdm-materials/Manifest | 1 -
.../fdm-materials/fdm-materials-4.6.1-r1.ebuild | 26 --------
17 files changed, 505 deletions(-)
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 9bba1d63eee..0034e25089c 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,3 +1,2 @@
-DIST libarcus-4.6.1.tar.gz 31938 BLAKE2B
c1da0181e07f297549df92ed23848343f0dadf94af7ce64ff2661e5c09c68768d47180aff505f2a225af2d49e493b8511ac9560a9b51a4eef98d6da82566b093
SHA512
3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250
DIST libarcus-4.7.0.tar.gz 31944 BLAKE2B
93cd7e8dab674b1e145c0fd15bcc8901982e9c26f82fa5b6b9582568701b70edeb1a589e1e1c94f9e14100d08b12580e58aa1724917b88f9c099f12ca47e4e57
SHA512
5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374
DIST libarcus-4.8.0.tar.gz 31906 BLAKE2B
677fafa3875834c7602bc85b7246f50ed0dc49e886814c4562ce41a1a7baecfb4fb0bac42aada5339fe73cbd3fc5ac3b28076bf72a1e24591a947d747c6eb794
SHA512
44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689
diff --git a/dev-libs/libarcus/libarcus-4.6.1.ebuild
b/dev-libs/libarcus/libarcus-4.6.1.ebuild
deleted file mode 100644
index a1481fb098b..00000000000
--- a/dev-libs/libarcus/libarcus-4.6.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its
backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus";
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/protobuf:=
- $(python_gen_cond_dep '
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
- ')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Find SIP for current python version, not the latest installed
- sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3
${EPYTHON##python} EXACT REQUIRED/g" \
- CMakeLists.txt || die
- sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3
${EPYTHON##python} EXACT REQUIRED/g" \
- cmake/FindSIP.cmake || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_EXAMPLES=$(usex examples ON OFF)
- -DBUILD_PYTHON=$(usex python ON OFF)
- -DBUILD_STATIC=$(usex static-libs ON OFF)
- )
-
- cmake_src_configure
-}
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 4a508101123..d3b41bfd4d5 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,2 @@
-DIST libcharon-4.6.1.tar.gz 145486 BLAKE2B
43a3bcddf128da9305711757b707394b5b0c23da27e27c3615d521e0af79683b2a525fefa7ae877581b56dae4c1dd7036c3189c17f8f86c92492b46e129a22b3
SHA512
43f7606529a933067bcb82a16e95d76f713a7847535887968c2933131d3197ec6127376e10c7d5f1debd218fc902962329fe22d4f9229b434a804daff94122cc
DIST libcharon-4.7.0.tar.gz 151221 BLAKE2B
af9fe83e07303e1ff296b878c9745a329531a9957ad16a9b39b36e53f3f2275f850806b6d1a51638013c7148f3ee68b92489a67629a6026056a8c4ed3f2338b1
SHA512
690ce086bf8bba3eee2ce087d02ce00c23a7ac4079b0a2961c05cf75d461b0d5dee0c1f86ed769b50f1cd9ef83d8570a54f4fac628e0c19a5a593138292bc64c
DIST libcharon-4.8.0.tar.gz 151223 BLAKE2B
fe4d2901908367569b45c466d31ac6e290979a8bd39c84f9c3ceb3ed91e9d9f1a789703fa5006706e21d77bd46b3185571df3f6157c7722e3e35244d27e0231c
SHA512
33d3e9aa4e356fbf1d41555cfe2a5470d8f02b1d4f59d83e1ba89236b5e4489a93bdf24fad6f9bd2b0f843c053c485a082f5ee57437862ac40522aa61280b19c
diff --git a/dev-libs/libcharon/libcharon-4.6.1.ebuild
b/dev-libs/libcharon/libcharon-4.6.1.ebuild
deleted file mode 100644
index 9ff0c625233..00000000000
--- a/dev-libs/libcharon/libcharon-4.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its
backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon";
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- # Use current python version, not the latest installed
- sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3
${EPYTHON##python} EXACT REQUIRED/g" \
- CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_install() {
- cmake_src_install
- python_optimize "${D}/usr/$(get_libdir)"
-}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 393650d2b34..bae2e51e170 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,3 +1,2 @@
-DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B
8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b
SHA512
49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2
DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B
3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc
SHA512
bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d
DIST libsavitar-4.8.0.tar.gz 99030 BLAKE2B
a1c1e252aa942114a1d7112d2e661b5e63403502642826c6b92c408c8eabd3d9fb12b44dc286f9a0dce3d42f473adae2441d357f237c903c8a0df936c41f9f37
SHA512
65d31986b120c9e717b10d0bac420f2582d9f1b44051d88f89475408d1f7997e144001c61f180eac554de33f1f8c1ec9555a6c23bdd797315624f57030f7ec8c
diff --git
a/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch
b/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch
deleted file mode 100644
index b1b77469d74..00000000000
--- a/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urN libSavitar-4.2.0_old/CMakeLists.txt libSavitar-4.2.0/CMakeLists.txt
---- libSavitar-4.2.0_old/CMakeLists.txt 2019-07-30 09:03:53.000000000
+0300
-+++ libSavitar-4.2.0/CMakeLists.txt 2019-08-04 17:23:27.099395645 +0300
-@@ -15,7 +15,7 @@
- find_package(Threads QUIET)
- endif()
-
--add_subdirectory(pugixml)
-+find_package(pugixml REQUIRED)
-
- if(BUILD_PYTHON)
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-diff -urN libSavitar-4.2.0_old/src/MeshData.cpp
libSavitar-4.2.0/src/MeshData.cpp
---- libSavitar-4.2.0_old/src/MeshData.cpp 2019-07-30 09:03:53.000000000
+0300
-+++ libSavitar-4.2.0/src/MeshData.cpp 2019-08-04 17:23:59.891051757 +0300
-@@ -17,7 +17,7 @@
- */
-
- #include "MeshData.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <cstring>
- #include <iostream>
- #include <stdexcept> //For std::runtime_error.
-diff -urN libSavitar-4.2.0_old/src/Scene.cpp libSavitar-4.2.0/src/Scene.cpp
---- libSavitar-4.2.0_old/src/Scene.cpp 2019-07-30 09:03:53.000000000 +0300
-+++ libSavitar-4.2.0/src/Scene.cpp 2019-08-04 17:24:10.425265944 +0300
-@@ -17,7 +17,7 @@
- */
-
- #include "Scene.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- #include <string>
- using namespace Savitar;
-diff -urN libSavitar-4.2.0_old/src/SceneNode.cpp
libSavitar-4.2.0/src/SceneNode.cpp
---- libSavitar-4.2.0_old/src/SceneNode.cpp 2019-07-30 09:03:53.000000000
+0300
-+++ libSavitar-4.2.0/src/SceneNode.cpp 2019-08-04 17:24:31.617696840 +0300
-@@ -18,7 +18,7 @@
-
- #include "SceneNode.h"
- #include "Namespace.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- using namespace Savitar;
-
-diff -urN libSavitar-4.2.0_old/src/ThreeMFParser.h
libSavitar-4.2.0/src/ThreeMFParser.h
---- libSavitar-4.2.0_old/src/ThreeMFParser.h 2019-07-30 09:03:53.000000000
+0300
-+++ libSavitar-4.2.0/src/ThreeMFParser.h 2019-08-04 17:24:53.996151843
+0300
-@@ -21,7 +21,7 @@
-
- #include "SavitarExport.h"
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
-
- #include <string>
- namespace Savitar
diff --git a/dev-libs/libsavitar/libsavitar-4.6.1.ebuild
b/dev-libs/libsavitar/libsavitar-4.6.1.ebuild
deleted file mode 100644
index 8c07045e9b5..00000000000
--- a/dev-libs/libsavitar/libsavitar-4.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar";
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/pugixml
- $(python_gen_cond_dep '
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- ')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.6.1-remove-packaged-pugixml.patch )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Find SIP for current python version, not the latest installed
- sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3
${EPYTHON##python} EXACT REQUIRED/g" \
- CMakeLists.txt || die
- sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3
${EPYTHON##python} EXACT REQUIRED/g" \
- cmake/FindSIP.cmake || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_PYTHON=$(usex python ON OFF)
- -DBUILD_STATIC=$(usex static-libs ON OFF)
- )
-
- cmake_src_configure
-}
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 3a1277f6a40..595cdd2692d 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,3 +1,2 @@
-DIST uranium-4.6.1.tar.gz 1013314 BLAKE2B
2a89eb1c4ffab35879eea9a681ea20e9cc5f78736d9c8bda5bf33baf5ef6d3f6418fd1f4b779738d644afd2d553d500c4892559ae402eeab0c38a4d95b295cf5
SHA512
ba7ed12d507fb1bd08fc0e77285933802a31b63d09f2dd0c7329e5644f82e6372fa11a1bbc28f3f1928ae0acfb3cb0afdeedf8e90e619c484fd5f623f8af722a
DIST uranium-4.7.0.tar.gz 1021541 BLAKE2B
2a2e354def88764801f275751aaf7643c9f4ca6329c2c302d87b3d617d0e93921d0aef20b0c25c9b0a082a836f7d0cca962dfedaa0298fcf943b1a0b683e0e28
SHA512
e049fff57823107785b418a368d6c6c399775c35ffad90831c77643dee060be2ab13ad8871b11f8d59d2a090a1d26786f4cf39a5a731b616a1b08a8ae5dea996
DIST uranium-4.8.0.tar.gz 1027286 BLAKE2B
5e068255918ca3a6125c308a64d47fab30260aa475505edad2abda664d2c2db7d821d4219ff682d4de90e16de2e36d257410a44f2752c733994739ca160e55b0
SHA512
a2cb923d703e626760c885ceb657566abfa5662f63729fef0b5cdf408da2ed3c23fefcd173b8af529ee79c2384505b2558379b82ba2cfd7a2d2291fe723ddbbd
diff --git a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
b/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
deleted file mode 100644
index 5777065e9da..00000000000
--- a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- Uranium-4.5.0-orig/CMakeLists.txt 2020-03-01 16:26:44.736355687 +0200
-+++ Uranium-4.5.0/CMakeLists.txt 2020-02-24 17:02:05.000000000 +0200
-@@ -12,6 +12,16 @@
-
- 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()
-+
- # # Checks using pylint
- # Note that we use exit 0 here to not mark the build as a failure on check
failure
- # In addition, the specified pylint configuration uses the spellchecker
plugin. This required python-enchant to be installed.
-@@ -48,10 +58,10 @@
- if(EXISTS /etc/debian_version)
- install(DIRECTORY UM DESTINATION
lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages)
- else()
-- install(DIRECTORY UM DESTINATION
lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-+ install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
- endif()
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
-- DESTINATION
${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/
)
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
-
- # Detect plugins to install
diff --git a/dev-python/uranium/uranium-4.6.1.ebuild
b/dev-python/uranium/uranium-4.6.1.ebuild
deleted file mode 100644
index b5a2f4ad587..00000000000
--- a/dev-python/uranium/uranium-4.6.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium";
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="${PYTHON_DEPS}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
- test? (
- $(python_gen_cond_dep '
- dev-python/pytest[${PYTHON_MULTI_USEDEP}]
- dev-python/mypy[${PYTHON_MULTI_USEDEP}]
- ')
- )"
-
-DEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- >=dev-python/scipy-1.1[${PYTHON_MULTI_USEDEP}]
- sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
- ')"
-
-RDEPEND="${DEPEND}
- dev-qt/qtquickcontrols:5
- dev-qt/qtquickcontrols2:5"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
- )
- cmake_src_configure
-
- if ! use debug; then
- sed -i 's/logging.DEBUG/logging.ERROR/'
plugins/ConsoleLogger/ConsoleLogger.py || die
- sed -i 's/logging.DEBUG/logging.ERROR/'
plugins/FileLogger/FileLogger.py || die
- fi
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- cmake_src_compile doc
- HTML_DOCS=( html )
- fi
-}
-
-src_install() {
- cmake_src_install
- python_optimize
- python_optimize "${D}/usr/$(get_libdir)"
-}
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 96afac35472..f4ccb95c398 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,2 @@
-DIST cura-4.6.1.tar.gz 36080329 BLAKE2B
5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750
SHA512
8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
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.6.1-r1.ebuild
b/media-gfx/cura/cura-4.6.1-r1.ebuild
deleted file mode 100644
index 74ad049667a..00000000000
--- a/media-gfx/cura/cura-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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 ~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/requests[${PYTHON_MULTI_USEDEP}]
- dev-python/sentry-sdk[${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 "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.7.0.ebuild b/media-gfx/cura/cura-4.7.0.ebuild
deleted file mode 100644
index 4264d19b6a6..00000000000
--- a/media-gfx/cura/cura-4.7.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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/requests[${PYTHON_MULTI_USEDEP}]
- dev-python/sentry-sdk[${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 "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/curaengine/Manifest b/media-gfx/curaengine/Manifest
index ecbad4b97b1..253c8d29ee4 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,3 +1,2 @@
-DIST curaengine-4.6.1.tar.gz 1685119 BLAKE2B
352c5b4b98866ebe6f90dc095960d2417ccf9c023334b4006b604da45aed1e3b6066700b08be3727214433fd505de87cad4da8e17d9067571d91dd0ec7660ebe
SHA512
8b3a65fb00bebc37acd24a6d4277c1f09849c0318fca00867479d62c0f64b8628064a898128e1ffc5fb99eed2c1d45a310df2f97fde9c37a9ccc311f5ba4d057
DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B
da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116
SHA512
4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B
7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273
SHA512
be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670
diff --git a/media-gfx/curaengine/curaengine-4.6.1.ebuild
b/media-gfx/curaengine/curaengine-4.6.1.ebuild
deleted file mode 100644
index 9a634cff090..00000000000
--- a/media-gfx/curaengine/curaengine-4.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine";
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="|| ( sys-devel/gcc sys-devel/clang )
- doc? ( app-doc/doxygen )"
-RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:*
- dev-libs/protobuf
- dev-libs/stb"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
- local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_build
- if use doc; then
- doxygen || die
- mv docs/html . || die
- find html -name '*.md5' -or -name '*.map' -delete || die
- HTML_DOCS=( html )
- fi
-}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 04943f917e9..eefeef060ca 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,3 +1,2 @@
-DIST fdm-materials-4.6.1.tar.gz 36321 BLAKE2B
bbdc28bf9d05b14f4b0545c4c50c67c31668f97aa9b6fcb8d51c5c958523ebe3307deb07587239df6a73e47c523db6c15f0ea4eb3c2560931a055c784d2b30cc
SHA512
784b89acfb2a5bdc6a0e8ce864326ab21f4785887baa215ffcfe472853cc8386d32ed237199df3744c25d12abbef89605445e74b104770f0f3f8363944008c6e
DIST fdm-materials-4.7.0.tar.gz 41139 BLAKE2B
a372d8273809a7d1a14e0b6e35a9c7266d626f26013f53a5d6c8462e2b1054bd65c72745ed1afdf96b17d6573f74b8555c946ef76c94acb8d860efa459d9955e
SHA512
cbc42e2777d1332b5187cf1f826f73bf5c1c5a1106d851dc08d8082f41bde6846f349ed2339ae60ad00b2005b0983f01850931adc765d545de0a700f1d9cccaf
DIST fdm-materials-4.8.0.tar.gz 43850 BLAKE2B
d9fa025eeb4f11c027fd64a2615d214a47024df62d53ee6b43391ac5383812581ae2ca075804277b6f7094639238646211cb5b978580edf91d004e83ef7ce405
SHA512
6e2812dc61ad00437d4c7943c3746cd915e1e49edef49f89ea2c4ca4cf023d67c400d1ae1e3c40923928d20ac09b184fc0632b828900b6236f9dfd346f19036d
diff --git a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
b/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
deleted file mode 100644
index 99506a67b86..00000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials";
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="embedded"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DEMBEDDED=$(usex embedded on off)
- )
- cmake_src_configure
-}
