commit: efe6b66e73ed6b1c177e93668757045860edc49e Author: Michael Perlov <perlovka <AT> gmail <DOT> com> AuthorDate: Sun Aug 4 16:14:25 2019 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Aug 25 17:59:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe6b66e
media-gfx/cura: version bump to 4.2.1 Closes: https://bugs.gentoo.org/680988 Closes: https://bugs.gentoo.org/687324 Closes: https://bugs.gentoo.org/691144 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Michael Perlov <perlovka <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12618 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-gfx/cura/Manifest | 1 + media-gfx/cura/cura-4.2.1.ebuild | 53 ++++++++++++++++++++++ .../cura/files/cura-4.2.1-fix-install-paths.patch | 41 +++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest index 1dad2dcaf9a..4816b7899c8 100644 --- a/media-gfx/cura/Manifest +++ b/media-gfx/cura/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild new file mode 100644 index 00000000000..aed51febac2 --- /dev/null +++ b/media-gfx/cura/cura-4.2.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6} ) +inherit cmake-utils 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-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] + >=media-gfx/curaengine-${PV:0:3} + >=media-gfx/fdm-materials-${PV:0:3} + >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] + >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] + usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_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-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doicon icons/*.png + python_optimize "${D}${get_libdir}" +} 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 new file mode 100644 index 00000000000..fc10d727d13 --- /dev/null +++ b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch @@ -0,0 +1,41 @@ +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)
