Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/curaengine/files/, media-gfx/curaengine/
Date: Sun, 01 Apr 2018 11:54:18
Message-Id: 1522583643.8621ceccf75e62382b2921228551c788ff2b2910.mgorny@gentoo
1 commit: 8621ceccf75e62382b2921228551c788ff2b2910
2 Author: M. J. Everitt <m.j.everitt <AT> iee <DOT> org>
3 AuthorDate: Fri Mar 9 07:30:35 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 1 11:54:03 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8621cecc
7
8 media-gfx/curaengine: Add missing DEPs, remove broken test
9
10 Tests require missing dev-util/cppinit.
11 Docs require missing media-gfx/graphviz to provide 'dot'.
12 GCodePlannerTest broken per https://github.com/Ultimaker/CuraEngine/issues/404
13
14 Bug: https://bugs.gentoo.org/640838
15 Closes: https://github.com/gentoo/gentoo/pull/7401
16 Package-Manager: Portage-2.3.13, Repoman-2.3.3
17
18 media-gfx/curaengine/curaengine-2.3.1-r1.ebuild | 45 ++++++++++++++++++++++
19 media-gfx/curaengine/curaengine-2.6.0-r1.ebuild | 44 +++++++++++++++++++++
20 .../curaengine-2.3.1-remove-gcodeplannertest.patch | 14 +++++++
21 3 files changed, 103 insertions(+)
22
23 diff --git a/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild
24 new file mode 100644
25 index 00000000000..ee9efe32b82
26 --- /dev/null
27 +++ b/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild
28 @@ -0,0 +1,45 @@
29 +# Copyright 1999-2018 Gentoo Foundation
30 +# Distributed under the terms of the GNU General Public License v2
31 +
32 +EAPI="6"
33 +
34 +inherit cmake-utils
35 +
36 +MY_PN=CuraEngine
37 +MY_PV=${PV/_beta}
38 +
39 +DESCRIPTION="A 3D model slicing engine for 3D printing"
40 +HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
41 +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
42 +KEYWORDS="~amd64 ~x86"
43 +
44 +LICENSE="AGPL-3"
45 +SLOT="0"
46 +IUSE="doc test"
47 +
48 +RDEPEND="${PYTHON_DEPS}
49 + dev-libs/libarcus:=
50 + >=dev-libs/protobuf-3"
51 +DEPEND="${RDEPEND}
52 + doc? ( app-doc/doxygen
53 + media-gfx/graphviz )
54 + test? ( dev-util/cppunit )"
55 +
56 +S="${WORKDIR}/${MY_PN}-${MY_PV}"
57 +DOCS=( "README.md" )
58 +PATCHES=( "${FILESDIR}/${P}-remove-gcodeplannertest.patch" )
59 +
60 +src_configure() {
61 + local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
62 + cmake-utils_src_configure
63 +}
64 +
65 +src_compile() {
66 + cmake-utils_src_make
67 + if use doc; then
68 + doxygen || die
69 + mv docs/html . || die
70 + find html -name '*.md5' -or -name '*.map' -delete || die
71 + HTML_DOCS=( html/. )
72 + fi
73 +}
74
75 diff --git a/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild b/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild
76 new file mode 100644
77 index 00000000000..b6dbce74a56
78 --- /dev/null
79 +++ b/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild
80 @@ -0,0 +1,44 @@
81 +# Copyright 1999-2018 Gentoo Foundation
82 +# Distributed under the terms of the GNU General Public License v2
83 +
84 +EAPI="6"
85 +
86 +inherit cmake-utils
87 +
88 +MY_PN=CuraEngine
89 +MY_PV=${PV/_beta}
90 +
91 +DESCRIPTION="A 3D model slicing engine for 3D printing"
92 +HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
93 +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
94 +KEYWORDS="~amd64 ~x86"
95 +
96 +LICENSE="AGPL-3"
97 +SLOT="0"
98 +IUSE="doc test"
99 +
100 +RDEPEND="${PYTHON_DEPS}
101 + dev-libs/libarcus:=
102 + >=dev-libs/protobuf-3"
103 +DEPEND="${RDEPEND}
104 + doc? ( app-doc/doxygen
105 + media-gfx/graphviz )
106 + test? ( dev-util/cppunit )"
107 +
108 +S="${WORKDIR}/${MY_PN}-${MY_PV}"
109 +DOCS=( "README.md" )
110 +
111 +src_configure() {
112 + local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
113 + cmake-utils_src_configure
114 +}
115 +
116 +src_compile() {
117 + cmake-utils_src_make
118 + if use doc; then
119 + doxygen || die
120 + mv docs/html . || die
121 + find html -name '*.md5' -or -name '*.map' -delete || die
122 + HTML_DOCS=( html/. )
123 + fi
124 +}
125
126 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
127 new file mode 100644
128 index 00000000000..351cebde493
129 --- /dev/null
130 +++ b/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch
131 @@ -0,0 +1,14 @@
132 +diff --git a/CMakeLists.txt b/CMakeLists.txt
133 +index 47dcd2d1..c2316d68 100644
134 +--- a/CMakeLists.txt
135 ++++ b/CMakeLists.txt
136 +@@ -110,9 +125,6 @@ set(engine_SRCS # Except main.cpp.
137 + )
138 +
139 + # List of tests. For each test there must be a file tests/${NAME}.cpp and a file tests/${NAME}.h.
140 +-set(engine_TEST
141 +- GCodePlannerTest
142 +-)
143 + set(engine_TEST_INFILL
144 + )
145 + set(engine_TEST_UTILS