gentoo resync : 06.08.2019

3 files changed, 97 insertions, 0 deletions

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index ba29bdaa050c..9c7e0a740320 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,6 +1,9 @@
 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
 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
 EBUILD cura-3.4.1.ebuild 1678 BLAKE2B 5c05b4777d95bf1427f4314e7cd6790a0879ce55da89a8b04cc2a7a991f55cdd1b6fd61f454a59986e743ff7209cb8437382b92ac689245687b82da155c71ea9 SHA512 25c727be6b867f5af5baadc1718ea3492aa80679a0bb5331794fb8ea19af10af6e2da5d6a7908d9e8e0ba4aca2d9cda46baf2c2abd5c5bbe5fef95933ac2ecdb
 EBUILD cura-3.6.0.ebuild 1675 BLAKE2B 2ba6d31604abc1bd1a6e9f128b0d892c7dc12b0ad65210a8d504104fff2662d28a2f0df5d4825826e53b7b88ce78ef9c690fe64cd866f7db2741e4d7432c11e1 SHA512 43e21fbf81985e482fbccab4d679bc5d3e2539f7b6b2cf585ad4cb7b207246efa3fdca59a0ef2d2a999c6491c071deafe418a0c9de372a9df9a9e15791c5f840
+EBUILD cura-4.2.1.ebuild 1385 BLAKE2B c1f6c35fac146da9338befb41a4d7cd71b3ff20df9a1a18f742671393b782384639612997c84167ef3b8327b08dd06fe83be7eb3e880d57396cb375787db0f78 SHA512 8dfb2a1fcb402f797aa760453b25cec10d4fe6fc0e9b6295c57248f0f61949d9a56e3b2aacdeaff4a4cef8e02f432baf519a7130088d2c9f1b3b194d69d1fdc6
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
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 000000000000..aed51febac2c
--- /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 000000000000..fc10d727d130
--- /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)