gentoo resync : 30.05.2020

3 files changed, 90 insertions, 0 deletions

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index bbfc90e67348..c84a916e2413 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,11 +1,14 @@
 AUX cura-3.3.0-fix-install-paths.patch 1663 BLAKE2B 293bdecb0e6ef130e80bc078f89470908bdc74f9ede901405e8b99953dc5927986d51db3f3494004c44ea543621328c24860ff3ab0c1ff4452d2347f082a53fb SHA512 0c42638c0f0f0cc108c0aec19b0319037c4a17ac4fc6d05920191a927ee32ea4901ca4cb2ae5473c3ded2afbcabd2cad55b6cbaf3ad986ad205fc22936c31fa2
 AUX cura-4.2.1-fix-install-paths.patch 1824 BLAKE2B 423ee2da55c69fa7fda2d93931f00460f16f5539dcf22e0db93210a90be533a1dfa7dabc4ae787bb404ff7ca38c7b4fdb0113cdfdf0f20a2f7907bfcb827dbcf SHA512 d88923ae9baef2889b952f6fe85e312890390228afb8ab27edab5e0abac48eba57b5a78ae0a913c96bf420fcc9f98a5281ede19c0d23d784104c85715d6bb7aa
+AUX cura-4.6.1-fix-install-paths.patch 1478 BLAKE2B 177cd0d14fdecd0da4da0cbc4d1ff86082adbc4182c3789dd9d4ec056ab76b43d6ce7b48e027c5fc5d7b1684a15e310101361e6896fa980cd3370b1d2f2860c5 SHA512 4ddf154f398b9d285fb51e9255a7dd5d10caef0a1980bcf3f37c231d1c3c91433cfa9d351b7c96404364db1924f1fed63a98e8f317eef6905fd14e96171af3b0
 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
 EBUILD cura-3.4.1.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
 EBUILD cura-3.6.0.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
 EBUILD cura-4.2.1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
 EBUILD cura-4.3.0-r1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
+EBUILD cura-4.6.1.ebuild 1520 BLAKE2B 31561d987bc6ce44068facd07cb9a7e2e6b2b0526238143cab7a89b3310a0149ece8c222fe56c5bc4f9b48029dda1ae51f5d3cc48cdc709deb20e280205bfc3a SHA512 12bf615a68c0e7b57ce8ec3bfe71fbdc65565668b746c0f8a59d4c8d6bce3e2cdb4f0705a85ab2bc744abe42cfe45776daca50fb06aa0b3fa405973fe4b0a123
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.6.1.ebuild
new file mode 100644
index 000000000000..c2d57876b251
--- /dev/null
+++ b/media-gfx/cura/cura-4.6.1.ebuild
@@ -0,0 +1,56 @@
+# 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/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=media-gfx/curaengine-${PV:0:3}
+	>=media-gfx/fdm-materials-${PV:0:3}
+	$(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/files/cura-4.6.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
new file mode 100644
index 000000000000..4d5f00ad47d7
--- /dev/null
+++ b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
@@ -0,0 +1,31 @@
+--- 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)