gentoo (valentine's day) resync : 14.02.2021

4 files changed, 2 insertions, 103 deletions

diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 5e051ac42189..c6fa039d313c 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,6 +1,3 @@
-AUX curaengine-4.7.0-fix-tests.patch 359 BLAKE2B a84af3a8b47f2bca74f8aa3bc774a55719fc642048edca310dea0568fddff6cc90269f1711006c26dcca2b64d997a34858442fd674bc99b03aeffcafb93820bd SHA512 9ef48243ada474e2639cbf804be381ac1dabfd656ac58a2a296265b3d16bf416a867147a2f7415256bb0af14ff994e5eeb2e42e61a6f36afa29f7a96bc7ad0e0
-DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
 DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670
-EBUILD curaengine-4.7.0.ebuild 2287 BLAKE2B edf6a643b44302269a589d8040ed39d54d26ef5a602f9d8d2e6a196e754f78b0e3e0f3439781f6b29afa39424642b57914b34538ccfc510f2de1a8291394a5c7 SHA512 5b83c30d7ace834f57ea23f3a963bfbbf407a46d87175181df73d1e367725eb0d1fed080204f90a352965ba83ce45c70ae81b7f6852bfd7cb70af525049893ed
 EBUILD curaengine-4.8.0.ebuild 2233 BLAKE2B a4454674fbfc4c81334a21090a10fa324a1a594db66302105ba2fb8d448154dfdc6334ccf27984b210ed93ac9ccf67f7d846cab36b4c0af147603ab63ba6b724 SHA512 dbb6cb64ab13d53deff7f34d9acf9d7ceb0ea847ff0870255cb956fa3f5c7adf02009da850d404f3cdfb69ea9e5b8664d6cf561cbf62e1eab3aa90c1fb34b604
-MISC metadata.xml 1468 BLAKE2B 7aec44b3b8d90adfa9c95365a7e299907fb0879c2358d5770b96b41f175d0d916e6786b25cc7a3b39f599d2a3e61a00cd4b3a0d039c95cd6e0fd122d2be54e4e SHA512 3ab874f2117073a17297234b29e95b70fe73ab90fbddcfe024586dc2b0b47af23998e0cc5ae271614be95f4c41fc2a9485f097ba3eefea0345d8d592d5e0f390
+MISC metadata.xml 1536 BLAKE2B c2dc9d4c9e4027fac86acdeed68d620bcb97c5d5e458c2e11b03ac78cb1f7dcf7946d8ba3b84a071b8bb6f5fbcfac4e736ac25dd73f63d28e7f13abe9e3a6597 SHA512 b47c97c4ab56a5274f0308d7e4e168cd426f2c2c801a156e0eb8b5a12ed06f4b33fe7eedfd7f8c7f9e0c377be40655fc30b0dcb98f4ddebc4ecedabb47aafb74
diff --git a/media-gfx/curaengine/curaengine-4.7.0.ebuild b/media-gfx/curaengine/curaengine-4.7.0.ebuild
deleted file mode 100644
index 74a7ec34474b..000000000000
--- a/media-gfx/curaengine/curaengine-4.7.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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 ~arm64 ~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
deleted file mode 100644
index 33feab3d3949..000000000000
--- a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 45587a19e8cd..9bb6b008a456 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -37,6 +37,7 @@
 		<subslots>soname major version number</subslots>
 	</slots>
 	<upstream>
+		<bugs-to>https://github.com/Ultimaker/CuraEngine/issues</bugs-to>
 		<remote-id type="github">Ultimaker/CuraEngine</remote-id>
 	</upstream>
 </pkgmetadata>