Gentoo Archives: gentoo-commits

From: Dennis Lamm <expeditioneer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/curaengine/, media-gfx/curaengine/files/
Date: Sun, 07 Feb 2021 21:30:53
Message-Id: 1612733442.99cc07357a435b95ba665fa7e935111464bc64bf.expeditioneer@gentoo
1 commit: 99cc07357a435b95ba665fa7e935111464bc64bf
2 Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 7 18:51:30 2021 +0000
4 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 7 21:30:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99cc0735
7
8 media-gfx/curaengine: drop old
9
10 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
11
12 media-gfx/curaengine/Manifest | 1 -
13 media-gfx/curaengine/curaengine-4.7.0.ebuild | 86 ----------------------
14 .../files/curaengine-4.7.0-fix-tests.patch | 13 ----
15 3 files changed, 100 deletions(-)
16
17 diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
18 index 253c8d29ee4..ac812d6972c 100644
19 --- a/media-gfx/curaengine/Manifest
20 +++ b/media-gfx/curaengine/Manifest
21 @@ -1,2 +1 @@
22 -DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
23 DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670
24
25 diff --git a/media-gfx/curaengine/curaengine-4.7.0.ebuild b/media-gfx/curaengine/curaengine-4.7.0.ebuild
26 deleted file mode 100644
27 index 74a7ec34474..00000000000
28 --- a/media-gfx/curaengine/curaengine-4.7.0.ebuild
29 +++ /dev/null
30 @@ -1,86 +0,0 @@
31 -# Copyright 1999-2020 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -inherit cmake toolchain-funcs
37 -
38 -MY_PN="CuraEngine"
39 -
40 -DESCRIPTION="A 3D model slicing engine for 3D printing"
41 -HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
42 -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
43 -
44 -LICENSE="AGPL-3"
45 -SLOT="0"
46 -KEYWORDS="~amd64 ~arm64 ~x86"
47 -IUSE="+arcus doc openmp test"
48 -RESTRICT="!test? ( test )"
49 -
50 -RDEPEND="
51 - ${PYTHON_DEPS}
52 - arcus? (
53 - ~dev-libs/libarcus-${PV}:*
54 - dev-libs/protobuf:=
55 - )
56 - dev-libs/clipper
57 - dev-libs/rapidjson
58 - dev-libs/stb"
59 -
60 -DEPEND="${RDEPEND}
61 - test? ( dev-cpp/gtest )"
62 -BDEPEND="doc? ( app-doc/doxygen )"
63 -
64 -DOCS=( README.md )
65 -PATCHES=( "${FILESDIR}/${PN}-4.7.0-fix-tests.patch" )
66 -S="${WORKDIR}/${MY_PN}-${PV}"
67 -
68 -src_prepare() {
69 - rm -r "${S}"/libs || die
70 -
71 - # remove static linking
72 - # respect cflags
73 - sed -i \
74 - -e "s/-static-libstdc++//g" \
75 - -e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
76 - -e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
77 - CMakeLists.txt || die
78 -
79 - if use test; then
80 - find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
81 - -type f -name '*.cpp' | xargs sed -i \
82 - -e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
83 - -e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
84 - -e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
85 - -e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
86 - -e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
87 - -e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
88 - -e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
89 - -e 's#include "../src#include "../../src#g'|| die
90 - fi
91 -
92 - cmake_src_prepare
93 -}
94 -
95 -src_configure() {
96 - local mycmakeargs=(
97 - -DBUILD_TESTS=$(usex test ON OFF)
98 - -DENABLE_ARCUS=$(usex arcus ON OFF)
99 - -DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
100 - -DENABLE_OPENMP=$(usex openmp ON OFF)
101 - -DUSE_SYSTEM_LIBS=ON
102 - )
103 -
104 - cmake_src_configure
105 -}
106 -
107 -src_compile() {
108 - cmake_src_compile
109 -
110 - if use doc; then
111 - doxygen || die "generating docs failed"
112 - mv docs/html . || die
113 - find html -type f \(-name '*.md5' -o -name '*.map'\) -delete || die
114 - HTML_DOCS=( html/. )
115 - fi
116 -}
117
118 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
119 deleted file mode 100644
120 index 33feab3d394..00000000000
121 --- a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
122 +++ /dev/null
123 @@ -1,13 +0,0 @@
124 -Upstream issue: https://github.com/Ultimaker/CuraEngine/issues/1318
125 -
126 ---- a/tests/utils/SparseGridTest.cpp
127 -+++ b/tests/utils/SparseGridTest.cpp
128 -@@ -1,6 +1,7 @@
129 - //Copyright (c) 2019 Ultimaker B.V.
130 - //CuraEngine is released under the terms of the AGPLv3 or higher.
131 -
132 -+#include <algorithm>
133 - #include <gtest/gtest.h>
134 - #include <unordered_set>
135 - #include <vector>
136 -