From eed745a9a297c67cbea166e5b32371017dc063eb Mon Sep 17 00:00:00 2001 From: Michael Perlov Date: Fri, 22 May 2020 04:01:43 +0300 Subject: [PATCH] media-gfx/cura: version bump to 4.6.1 Closes: https://bugs.gentoo.org/710930 Closes: https://bugs.gentoo.org/718960 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Perlov Closes: https://github.com/gentoo/gentoo/pull/15908 Signed-off-by: Alexey Shvetsov --- media-gfx/cura/Manifest | 1 + media-gfx/cura/cura-4.6.1.ebuild | 56 +++++++++++++++++++ .../files/cura-4.6.1-fix-install-paths.patch | 31 ++++++++++ 3 files changed, 88 insertions(+) create mode 100644 media-gfx/cura/cura-4.6.1.ebuild create mode 100644 media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest index 698ecfb22ab4..0a4d6b2e883b 100644 --- a/media-gfx/cura/Manifest +++ b/media-gfx/cura/Manifest @@ -2,3 +2,4 @@ DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee 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 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..4fd274514caa --- /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} ) +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) -- 2.26.2