gentoo resync : 16.09.2020

4 files changed, 115 insertions, 1 deletions

diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 4fad1dece6ab..46f064b026e5 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,11 +1,14 @@
+AUX curaengine-4.7.0-fix-tests.patch 359 BLAKE2B a84af3a8b47f2bca74f8aa3bc774a55719fc642048edca310dea0568fddff6cc90269f1711006c26dcca2b64d997a34858442fd674bc99b03aeffcafb93820bd SHA512 9ef48243ada474e2639cbf804be381ac1dabfd656ac58a2a296265b3d16bf416a867147a2f7415256bb0af14ff994e5eeb2e42e61a6f36afa29f7a96bc7ad0e0
 DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975ff62e58012dc48744e2d27e9d1767e8f7768250179a374ed24da5a5e2085e9c194068ad6ffb98fff0595a314f7b0 SHA512 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
 DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
 DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab647d2575de0f11e64cb2188e7c565a54f3613e296c3f19e8534a7a758162fe29cdd62e8d62d691a7d9c9e6430545ce SHA512 6c3edac5a21068b50a31d3ab37dac58b986e18be2d24711d77cf210da62b521d62dc92a1b4e8865a26e5c394119349f03b3816d19d67ebee670424cc4a7b2500
 DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
 DIST curaengine-4.6.1.tar.gz 1685119 BLAKE2B 352c5b4b98866ebe6f90dc095960d2417ccf9c023334b4006b604da45aed1e3b6066700b08be3727214433fd505de87cad4da8e17d9067571d91dd0ec7660ebe SHA512 8b3a65fb00bebc37acd24a6d4277c1f09849c0318fca00867479d62c0f64b8628064a898128e1ffc5fb99eed2c1d45a310df2f97fde9c37a9ccc311f5ba4d057
+DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
 EBUILD curaengine-3.4.1.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
 EBUILD curaengine-3.6.0.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
 EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 51f109e8db08e5e3d0caccc1016628e6570dfab14f30a5b061bc25cf2edff0516bc50409271f26e592f9223d775d4fbce66d8b48b6cdbb914e3115208d7b2a09 SHA512 78ca9ad1b1d59f3274021d57fe3e2d14b7225315e8eaea2179c656bfecb58e59384dcf520d4c5fe1d05af5dec21973cd8020af116eadd75969d1331d08d82d00
 EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 477593726cb519294f189d8175f04168582dd756de4c0a86cb254f750cf1c0736b9913365e81eb48fe821e5b2c771d1468e5a7cf3e36bae7339d0aa5310affcb SHA512 f5974e877bd0c885f2aa5856ad410b05a16029039ed87913ccb03adedd804b1cf474addb526a8f961902f45b231199b32db852bc8b78aace2b559342715a0686
 EBUILD curaengine-4.6.1.ebuild 955 BLAKE2B 733f85ddaec6e24923289023a83bba47c0f9fbd29be348ff0a338d39bdf8655255cddc54afe14d53600195c178169d3c1a83b26f25739884fee166498280596b SHA512 92d6924c086f4e8b022105d235467dce86d7f65466a9df97026f625eed054a6ec45f2901202c5cd70f5d11ddb9093de0632530e64e04957b1a86dea7eec3f569
-MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
+EBUILD curaengine-4.7.0.ebuild 2280 BLAKE2B 512648356a1f9155dff7d720ed14de5c76133fe87c8a17799d7eeb4b9610c12d34928a1448800351d8e7183186333ac2005ba99c151e6641b5ad70fac666f089 SHA512 e83fd950243da16b6974694c691fab84f6c4e3cb855c13abd88d402f3913da19df0391dacc073c00a37242b638eba11b0c628006fe843bb6ad15e8d17b5bf589
+MISC metadata.xml 1468 BLAKE2B 7aec44b3b8d90adfa9c95365a7e299907fb0879c2358d5770b96b41f175d0d916e6786b25cc7a3b39f599d2a3e61a00cd4b3a0d039c95cd6e0fd122d2be54e4e SHA512 3ab874f2117073a17297234b29e95b70fe73ab90fbddcfe024586dc2b0b47af23998e0cc5ae271614be95f4c41fc2a9485f097ba3eefea0345d8d592d5e0f390
diff --git a/media-gfx/curaengine/curaengine-4.7.0.ebuild b/media-gfx/curaengine/curaengine-4.7.0.ebuild
new file mode 100644
index 000000000000..a644aeef81b8
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-4.7.0.ebuild
@@ -0,0 +1,86 @@
+# 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="+arcus doc openmp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	arcus? (
+		~dev-libs/libarcus-${PV}:*
+		dev-libs/protobuf:=
+	)
+	dev-libs/clipper
+	dev-libs/rapidjson
+	dev-libs/stb"
+
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-fix-tests.patch" )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	rm -r "${S}"/libs || die
+
+	# remove static linking
+	# respect cflags
+	sed -i \
+		-e "s/-static-libstdc++//g" \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
+		CMakeLists.txt || die
+
+	if use test; then
+		find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
+		 -type f -name '*.cpp' | xargs sed -i \
+			-e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
+			-e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
+			-e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
+			-e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
+			-e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
+			-e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
+			-e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
+			-e 's#include "../src#include "../../src#g'|| die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DENABLE_ARCUS=$(usex arcus ON OFF)
+		-DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
+		-DENABLE_OPENMP=$(usex openmp ON OFF)
+		-DUSE_SYSTEM_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		doxygen || die "generating docs failed"
+		mv docs/html . || die
+		find html -type f \(-name '*.md5' -o -name '*.map'\) -delete || die
+		HTML_DOCS=( html/. )
+	fi
+}
diff --git a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch b/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
new file mode 100644
index 000000000000..33feab3d3949
--- /dev/null
+++ b/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
@@ -0,0 +1,13 @@
+Upstream issue: https://github.com/Ultimaker/CuraEngine/issues/1318
+
+--- a/tests/utils/SparseGridTest.cpp
++++ b/tests/utils/SparseGridTest.cpp
+@@ -1,6 +1,7 @@
+ //Copyright (c) 2019 Ultimaker B.V.
+ //CuraEngine is released under the terms of the AGPLv3 or higher.
+ 
++#include <algorithm>
+ #include <gtest/gtest.h>
+ #include <unordered_set>
+ #include <vector>
+
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index 58e8297dc744..45587a19e8cd 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -21,6 +21,18 @@
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
+	<longdescription>
+		The CuraEngine is a C++ console application for 3D printing GCode generation.
+		It has been made as a better and faster alternative to the old Skeinforge engine.
+
+		This is just a console application for GCode generation.
+		For a full graphical application look at Cura which is the graphical frontend for CuraEngine.
+
+		The CuraEngine can be used seperately or in other applications. Feel free to add it to your application.
+	</longdescription>
+	<use>
+		<flag name="arcus">Build with support for communication library between internal components for Ultimaker software</flag>
+	</use>
 	<slots>
 		<subslots>soname major version number</subslots>
 	</slots>