gentoo resync : 13.05.2018

4 files changed, 106 insertions, 0 deletions

diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 93464d8decba..c3c9888c311b 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,4 +1,6 @@
 AUX curaengine-0.15.04.6-cflags.patch 750 BLAKE2B dfa1e1a0c855768387375ac3c0caa16de43a1b4009b68b4b54ca5cd5666818e863570ddebbeccf6a7c5f14dcabc1bd12c87738278cd78fa29b3409f7e85e11e6 SHA512 2109a1d1b07b97769347af7af58921b6d234c4a4bdc8ab8ab1aa0a0f3aac08b3f5e9f99fbb99001e1d505cee89fff30be40a20ba853ee6a3cdcdd98f5ad7058c
+AUX curaengine-2.3.1-fix-stringtest-int-types.patch 1440 BLAKE2B 1b82117e0d13bcd2c7f480bc2b8816cae8298faa3a026b955082a14adf795e41405adc88f8f08f990fc8fd2e04e072788718f9773ba3c9040bea1395c5896135 SHA512 88e5465a5dc04726c9646672d6781f2e78bdf3ab9786bad0fb7b9cb390b611aabc663328fd2724081587d3c0c568733295c22101e2f8224e7b4df332dd4f4e6c
+AUX curaengine-2.3.1-make-stringtest-64bit-safe.patch 645 BLAKE2B b36b556fb7d58ef771bbbf6f8314f61460e3bb436ec0178809992625cd96e71e006ec35995a209b46408d8c831e444f985f394fd2d90b99839509c28b79cb9de SHA512 364ae3575ff70bf6a1d2a12a3709b07b061e6c158ec3594d2ab8cb99dc059ef00036a79c2d6888ab91b001efc9004d3e26409cf7ea634561bbb4af84345f6fe3
 AUX curaengine-2.3.1-remove-gcodeplannertest.patch 370 BLAKE2B fbc5ed6858fe3e951a3eba93ecfef792d5f36e5e863793bff022a9591156c407ae4a1fff13042d9eee7dae3b4ab88b878d8a1904ad240bc7775114772d483b56 SHA512 f4a57be7e472b637635f035999d370c7bd09449f530d8f34d61c0a1fa353233b7f8c8578ebca582f5dbee8b714c7f67b09a8823da3d9360c6034acb1202c39f1
 DIST curaengine-0.15.04.6.tar.gz 107970 BLAKE2B cf72d74acbc5df4e46c066e27c36957380dee8a40301f0d489b23c0ab2f231bf4f3b7d953964fa7eb073c816a7f7aff755f25380d86bee37a61e1d0bd2ae3b68 SHA512 150e93dca08c57bc37af4c3232c0d18aed93347657d7261f89d7d8352d2774ac7a2a944c3b1efce432b507674f5e99981844823b792ec3fbe47799d2487e899d
 DIST curaengine-2.1.0_beta.tar.gz 33322580 BLAKE2B dac6b108caddb006348b184465727fba311ee6b35c992db44bef1a0a129c8b5daebc8315ac1654120404a30c4a4851ee37d0c12e17886539f8f57572a26fa520 SHA512 23b1e1116fad8e75354a92b8320a228a0b7acb03bcdffa175b8b6f47af0b8af099efdc3c75f840d172fc157d432a05c741a5028f3b8da1e7fc1dd8cf158115fb
@@ -7,6 +9,7 @@ DIST curaengine-2.6.0.tar.gz 828387 BLAKE2B db3db01a4c66d4a6ca7c6da1997c0a725087
 EBUILD curaengine-0.15.04.6.ebuild 1023 BLAKE2B a30c9939fecc1e1a58dd91f9e21137ccb9c9234da1b0bfc800698585806917cbc8cdf9e598e3dbf9be4c6d283c30b6f39849bc6821342d78ca4d20b0539892cb SHA512 21dcd8a630df89c8c89e70fc21b3509b1e7972985ba72afcc961d90990e382fe9d07d63c8013315b6afe14650e8e58134d74123e5920a019cfd0293a4192485e
 EBUILD curaengine-2.1.0_beta.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
 EBUILD curaengine-2.3.1-r1.ebuild 1015 BLAKE2B 146e167fe405ce0aa4dbb77bf52899bbde55113e5248b8f6654c663628c9e8f07ce89ede7b815b5bfcaa13f2279bb8f8e6c353ef8dd172ec209bb5658af95e73 SHA512 db7d3bb6818af0d9c6121348cb6bfbc256135cb42b1677893b891d3970e20e1b0729f382ef3d7f3c5965efb86193fa8eb18d5b5f73023ca6cb35912e70da9765
+EBUILD curaengine-2.3.1-r2.ebuild 1123 BLAKE2B a63ee7dcea38d7b22009d4d27f0b9e119ea3c85fe1ab4468ba5436fba1d731866351b142d3e04174f00e165a8c64fb4ec419f5d086eb6a746d2b05e2398fd2bb SHA512 d8de8a03fa3b1b0281b5bcc40d6d37237cbe01a00348df44ea98dec7fda288085a53940c1ba8ab990e6dc3274ad26766343a7d328716c05e7291c6cdc8898f9e
 EBUILD curaengine-2.3.1.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
 EBUILD curaengine-2.6.0-r1.ebuild 954 BLAKE2B a7f9f5739a50032a9f4f3aad2cf891cc2d5ac0076d1df49f72e94c354587b82690b7d6b57584990aafa54ba84ff14d75b3f02614cf61794a273412016fb2da3b SHA512 c7daaee08dc5db670f02c8fdf104f8c331ee0ec1d7db11a57ebae52e7626abd6f8ece20c6510b2a43509229dd5cd18979e80478516ce53169064bfe42eb2be70
 EBUILD curaengine-2.6.0.ebuild 883 BLAKE2B fc00d7c53904e98a422867a41a5864205d66ff7ef423564226be2eb7bd8f111c41bf8bc8e31b0e937b97305141e4e12b2e4d2bcd51b3b7ee127127d053830660 SHA512 8e29ef18e30c7c3383aabe2bfc98c3eaf2299d83a5824150baacad8a48257873705ce850a9a7cecb5f6669a9fcd15986e1411ad060137713d5253d8df670b623
diff --git a/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..caa04ad6c138
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+MY_PN=CuraEngine
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libarcus:=
+	>=dev-libs/protobuf-3"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen
+	       media-gfx/graphviz )
+	test? ( dev-util/cppunit )"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+DOCS=( "README.md" )
+PATCHES=( "${FILESDIR}/${P}-remove-gcodeplannertest.patch"
+	  "${FILESDIR}/${P}-make-stringtest-64bit-safe.patch"
+	  "${FILESDIR}/${P}-fix-stringtest-int-types.patch" )
+
+src_configure() {
+	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_make
+	if use doc; then
+		doxygen || die
+		mv docs/html . || die
+		find html -name '*.md5' -or -name '*.map' -delete || die
+		HTML_DOCS=( html/. )
+	fi
+}
diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch b/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch
new file mode 100644
index 000000000000..e30bde4de451
--- /dev/null
+++ b/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch
@@ -0,0 +1,43 @@
+From fe45e504ace024d920fe18b4f55d6aa07b2f929b Mon Sep 17 00:00:00 2001
+From: Ghostkeeper <rubend@tutanota.com>
+Date: Mon, 20 Nov 2017 10:46:09 +0100
+Subject: [PATCH] Use ints instead of int64_t to test writing ints
+
+Because sprintf doesn't accept anything more.
+---
+ tests/utils/StringTest.cpp | 4 ++--
+ tests/utils/StringTest.h   | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/utils/StringTest.cpp b/tests/utils/StringTest.cpp
+index 5bd16c5d3..980d2145f 100644
+--- a/tests/utils/StringTest.cpp
++++ b/tests/utils/StringTest.cpp
+@@ -71,12 +71,12 @@ void StringTest::writeInt2mmTestMax()
+ }
+ 
+ 
+-void StringTest::writeInt2mmAssert(int64_t in)
++void StringTest::writeInt2mmAssert(int in)
+ {
+     std::ostringstream ss;
+     writeInt2mm(in, ss);
+     std::string str = ss.str();
+-    int64_t out = MM2INT(strtod(str.c_str(), nullptr));
++    int out = MM2INT(strtod(str.c_str(), nullptr));
+ 
+     char buffer[200];
+     sprintf(buffer, "The integer %d was printed as '%s' which was interpreted as %d rather than %d!", in, str.c_str(), out, in);
+diff --git a/tests/utils/StringTest.h b/tests/utils/StringTest.h
+index 58be00642..da1da793a 100644
+--- a/tests/utils/StringTest.h
++++ b/tests/utils/StringTest.h
+@@ -68,7 +68,7 @@ class StringTest : public CppUnit::TestFixture
+      * 
+      * \param in the integer to check
+      */
+-    void writeInt2mmAssert(int64_t in);
++    void writeInt2mmAssert(int in);
+ };
+ 
+ }
diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch b/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch
new file mode 100644
index 000000000000..a9b447fe8528
--- /dev/null
+++ b/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/utils/StringTest.cpp b/tests/utils/StringTest.cpp
+index aa369f3da..b1a084587 100644
+--- a/tests/utils/StringTest.cpp
++++ b/tests/utils/StringTest.cpp
+@@ -79,7 +79,7 @@ void StringTest::writeInt2mmAssert(int64_t in)
+     int64_t out = MM2INT(strtod(str.c_str(), nullptr));
+ 
+     char buffer[200];
+-    sprintf(buffer, "The integer %ld was printed as '%s' which was interpreted as %ld rather than %ld!", in, str.c_str(), out, in);
++    sprintf(buffer, "The integer %d was printed as '%s' which was interpreted as %d rather than %d!", in, str.c_str(), out, in);
+     CPPUNIT_ASSERT_MESSAGE(std::string(buffer), in == out);
+ }
+