media-gfx/curaengine: Version bump and clean up

Closes: https://bugs.gentoo.org/630620
Closes: https://bugs.gentoo.org/648130
Closes: https://github.com/gentoo/gentoo/pull/8258
Package-Manager: Portage-2.3.40, Repoman-2.3.9

12 files changed, 11 insertions, 377 deletions

diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 005ef75a0aa2..0b919c3dc9ce 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,4 +1 @@
-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
-DIST curaengine-2.3.1.tar.gz 712429 BLAKE2B 9971468b9eb8aac12426a1483adf904825bc142e25010ba6ba989b94095ac92b10ad91a7fe5a486b823f9238813e986b58bb744e71209542c965cbd43486f56e SHA512 3d247048e51c7aca33b71d7d2382d673e7b4d547cb9fcbf639c9bbc801db067ea010c04a6fd4e88b87e00d9069f7a70019612148ae2b50095514b85078e71220
-DIST curaengine-2.6.0.tar.gz 828387 BLAKE2B db3db01a4c66d4a6ca7c6da1997c0a7250877568a4e93bb86393c777c368d22b73e85ad918b65d502670d2d483cb909b5fdae75b17081b04e2091d1498d9a6c8 SHA512 3991127ba3005b93f02ab72fd6c9208b153d5419145edb84f187e1fa32d03220001d8be958847360f7eaa75336ed44f3f7158cedea82d33450992145dfd0a0d9
+DIST curaengine-3.3.0.tar.gz 935367 BLAKE2B c02fa8ac5d79f6506dad91967f46add0b22b585cfb9931d67e34a033a59ba828722782f7fcf590ef45aa645b3c5dcb92416dbb5ef321fd5bf19935b2b5f1d4e7 SHA512 14b1961c90ec8ecad6fadfb992b72a4e05f3fa6c9a7b580812f90410c655db9d5798d46aa17311c216631daae1c21f6255c6fc4a0d903a91091e0a7a63642f70
diff --git a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild b/media-gfx/curaengine/curaengine-0.15.04.6.ebuild
deleted file mode 100644
index b375b1bffa2e..000000000000
--- a/media-gfx/curaengine/curaengine-0.15.04.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_PV=${PV#0.}
-MY_PN=CuraEngine
-
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_prepare() {
-	tc-export CXX
-	default
-}
-
-src_test() {
-	pushd tests 2>&- || die
-	einfo "Commencing test ..."
-	local testbin=( "${S}/build/CuraEngine" "-c" "supportAngle=60" "-c" "supportEverywhere=1" )
-	local testmdl="${S}/tests/testModel.stl"
-	${testbin[*]} "${testmdl}"
-	if [[ $? -eq 0 && -f "${testbin[0]}" && -f "${testmdl}" ]]; then
-		einfo "Test completed successfully."
-	else
-		ewarn "Test failed."
-	fi
-	popd 2>&- || die
-}
-
-src_install() {
-	dobin build/CuraEngine
-	dodoc README.md
-}
diff --git a/media-gfx/curaengine/curaengine-2.1.0_beta.ebuild b/media-gfx/curaengine/curaengine-2.1.0_beta.ebuild
deleted file mode 100644
index 10de130c3a96..000000000000
--- a/media-gfx/curaengine/curaengine-2.1.0_beta.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 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 )"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-DOCS=( README.md )
-
-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
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild
deleted file mode 100644
index ee9efe32b82a..000000000000
--- a/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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" )
-
-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/curaengine-2.3.1-r2.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild
deleted file mode 100644
index caa04ad6c138..000000000000
--- a/media-gfx/curaengine/curaengine-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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/curaengine-2.6.0-r1.ebuild b/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild
deleted file mode 100644
index b6dbce74a56f..000000000000
--- a/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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" )
-
-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/curaengine-2.6.0.ebuild b/media-gfx/curaengine/curaengine-2.6.0.ebuild
deleted file mode 100644
index 814f01f58f9f..000000000000
--- a/media-gfx/curaengine/curaengine-2.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 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 )"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-DOCS=( README.md )
-
-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
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-2.3.1.ebuild b/media-gfx/curaengine/curaengine-3.3.0.ebuild
index 10de130c3a96..2f945665c4a1 100644
--- a/media-gfx/curaengine/curaengine-2.3.1.ebuild
+++ b/media-gfx/curaengine/curaengine-3.3.0.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit cmake-utils
 
-MY_PN=CuraEngine
-MY_PV=${PV/_beta}
+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/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/libarcus:=
-	>=dev-libs/protobuf-3"
+	~dev-libs/libarcus-${PV}:*
+	dev-libs/protobuf"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
 DOCS=( README.md )
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_configure() {
 	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
 	cmake-utils_src_configure
diff --git a/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch b/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch
deleted file mode 100644
index 9807301e462c..000000000000
--- a/media-gfx/curaengine/files/curaengine-0.15.04.6-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 32fa704..c426ef8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -18,9 +18,9 @@ endif
- ifeq ($(BUILD_TYPE),PROFILE)
- 	CFLAGS+= -pg
- endif
--ifeq ($(BUILD_TYPE),RELEASE)
--	CFLAGS+= -O3 -fomit-frame-pointer
--endif
-+#ifeq ($(BUILD_TYPE),RELEASE)
-+#	CFLAGS+= -O3 -fomit-frame-pointer
-+#endif
- 
- LDFLAGS += -Lbuild/ -lclipper
- 
-# By courtesy of Whissi: this enforces use of our CXXFLAGS
-@@ -70,7 +70,7 @@ $(BUILD_DIR)/libclipper.a: $(LIBS_DIR)/clipper/clipper.cpp
- 	$(CXX) $(CFLAGS) -o $(BUILD_DIR)/libclipper.a $(LIBS_DIR)/clipper/clipper.cpp
- 
- $(EXECUTABLE): $(OBJECTS) $(BUILD_DIR)/libclipper.a
--	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) -o $@
- 
- $(DIRS):
- 	-@$(MKDIR_PREFIX) $(DIRS)
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
deleted file mode 100644
index e30bde4de451..000000000000
--- a/media-gfx/curaengine/files/curaengine-2.3.1-fix-stringtest-int-types.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index a9b447fe8528..000000000000
--- a/media-gfx/curaengine/files/curaengine-2.3.1-make-stringtest-64bit-safe.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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);
- }
- 
diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch b/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch
deleted file mode 100644
index 351cebde493f..000000000000
--- a/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 47dcd2d1..c2316d68 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,9 +125,6 @@ set(engine_SRCS # Except main.cpp.
- )
- 
- # List of tests. For each test there must be a file tests/${NAME}.cpp and a file tests/${NAME}.h.
--set(engine_TEST
--    GCodePlannerTest
--)
- set(engine_TEST_INFILL
- )
- set(engine_TEST_UTILS