Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-misc/repsnapper/files/, profiles/, sci-misc/repsnapper/
Date: Tue, 11 Feb 2020 14:19:36
Message-Id: 1581430701.a21ffc68b96c51c49c0d6f4299f2d5efd69bfacf.asturm@gentoo
1 commit: a21ffc68b96c51c49c0d6f4299f2d5efd69bfacf
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 11 14:14:25 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 11 14:18:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21ffc68
7
8 sci-misc/repsnapper: Remove last-rited package
9
10 Closes: https://bugs.gentoo.org/649066
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sci-misc/repsnapper/Manifest | 3 --
15 .../repsnapper/files/repsnapper-2.4a_p0-gcc6.patch | 54 ----------------------
16 sci-misc/repsnapper/files/std-c11.patch | 31 -------------
17 sci-misc/repsnapper/metadata.xml | 8 ----
18 sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild | 33 -------------
19 sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild | 36 ---------------
20 sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild | 34 --------------
21 sci-misc/repsnapper/repsnapper-9999.ebuild | 29 ------------
22 9 files changed, 229 deletions(-)
23
24 diff --git a/profiles/package.mask b/profiles/package.mask
25 index cdf1ec207ef..90c729aa57f 100644
26 --- a/profiles/package.mask
27 +++ b/profiles/package.mask
28 @@ -596,7 +596,6 @@ media-libs/qimageblitz
29 # Ancient, blocks x11-libs/gtkglext cleanup, open bug #649066
30 # Masked for removal in 30 days.
31 dev-cpp/gtkglextmm
32 -sci-misc/repsnapper
33
34 # Michał Górny <mgorny@g.o> (2020-01-12)
35 # Python 2 only, depends on OpenStack which is Py3 now. No release
36
37 diff --git a/sci-misc/repsnapper/Manifest b/sci-misc/repsnapper/Manifest
38 deleted file mode 100644
39 index 748c922283e..00000000000
40 --- a/sci-misc/repsnapper/Manifest
41 +++ /dev/null
42 @@ -1,3 +0,0 @@
43 -DIST repsnapper-2.3.2a3.tar.gz 1344447 BLAKE2B 31fdfe0cb6c7b6c9358ecef1a8fc82cbfa82c337b6120e605bd103e5f5236780add8aa40308695adfd65c619b7174a4e7bcf35442950aaaac2eb2bda9a993c58 SHA512 f68510baefb898954f58aa5e35909b8215edcd8ee74028e717ad97293091f4b323628ca0ba80ff685d1aef0db4785a2887986b89a95769a70f8f23ab031dafa4
44 -DIST repsnapper-2.4a0.tar.gz 888457 BLAKE2B 5c554c6dae2a3d6fede6c0fa86bd9b4ddac00530c466f1b8b0f20b3ac5e129677a18d9020cf0c1e80eb930040319a3e28609b43d282971fdbb937cc601fe2374 SHA512 b79c51f53ae29d09f5a328366c10b9e775d396f6da0ef24aa71b522fbd718af2f658700838f64ba01ce9c5cab90e39960b0ca5ed2554f802ff37ef258ae89031
45 -DIST repsnapper-2.4a3.tar.gz 888546 BLAKE2B c9934c337ea2f46a74342f1ce935b00d34a6242304bb6779dc1ae4bdb959c39c3e0162f1fce8aad73681fd937eb43145fbfc4c5de404e290ee77e1f6874734af SHA512 ebe586a9212edbf699444a9c89b25702facd1018751658b831e9e662cd1bc2c54e6827802c0d89055c2882cef7db343bf036c08a9a1fc28bc66acee895bca6aa
46
47 diff --git a/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch b/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch
48 deleted file mode 100644
49 index 80a3c56eb86..00000000000
50 --- a/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch
51 +++ /dev/null
52 @@ -1,54 +0,0 @@
53 -From f6a411fa829f144800d123c1256d7d7648736437 Mon Sep 17 00:00:00 2001
54 -From: =?UTF-8?q?Tiago=20St=C3=BCrmer=20Daitx?= <tdaitx@×××××.com>
55 -Date: Thu, 1 Sep 2016 00:02:48 -0300
56 -Subject: [PATCH 1/2] replace abs() with std::abs() for gcc6 compatibility
57 -MIME-Version: 1.0
58 -Content-Type: text/plain; charset=UTF-8
59 -Content-Transfer-Encoding: 8bit
60 -
61 -Building with GCC 6 fails with "call of overloaded ‘abs(double)’ is
62 -ambiguous" - for some reason only on PowerPC and PPC64.
63 ----
64 - libraries/amf/amftools-code/include/STL_File.h | 2 +-
65 - 1 file changed, 1 insertion(+), 1 deletion(-)
66 -
67 -diff --git a/libraries/amf/amftools-code/include/STL_File.h b/libraries/amf/amftools-code/include/STL_File.h
68 -index 0bc01bed..2d9d656f 100644
69 ---- a/libraries/amf/amftools-code/include/STL_File.h
70 -+++ b/libraries/amf/amftools-code/include/STL_File.h
71 -@@ -89,7 +89,7 @@ class aWeldVertex {
72 - Vec3D v;
73 - int OrigIndex;
74 -
75 -- static inline bool IsSoftLessThan(const aWeldVertex& v1, const aWeldVertex& v2){if(abs(v1.v.z - v2.v.z) <= WeldThresh){ if(abs(v1.v.y - v2.v.y) <= WeldThresh){ return v1.v.x < v2.v.x-WeldThresh;}else return (v1.v.y < v2.v.y-WeldThresh);} else return (v1.v.z < v2.v.z-WeldThresh); } //Is less then (generates a "hash" for sorting vertices by z for set
76 -+ static inline bool IsSoftLessThan(const aWeldVertex& v1, const aWeldVertex& v2){if(std::abs(v1.v.z - v2.v.z) <= WeldThresh){ if(std::abs(v1.v.y - v2.v.y) <= WeldThresh){ return v1.v.x < v2.v.x-WeldThresh;}else return (v1.v.y < v2.v.y-WeldThresh);} else return (v1.v.z < v2.v.z-WeldThresh); } //Is less then (generates a "hash" for sorting vertices by z for set
77 - static double WeldThresh; //weld threshold for importing from STL
78 - };
79 -
80 -
81 -From 93c81e3794a3eb7c2b7c7611803a3107fb25027b Mon Sep 17 00:00:00 2001
82 -From: "Ying-Chun Liu (PaulLiu)" <paulliu@××××××.org>
83 -Date: Wed, 4 Jan 2017 13:50:56 +0800
84 -Subject: [PATCH 2/2] Fix FTBFS for glibmm Glib::RefPtr
85 -
86 -Now we can use operator RefPtr::operator bool() to test if it is NULL.
87 -RefPtr::operator== can not work on int.
88 -
89 -Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@××××××.org>
90 ----
91 - src/model.cpp | 2 +-
92 - 1 file changed, 1 insertion(+), 1 deletion(-)
93 -
94 -diff --git a/src/model.cpp b/src/model.cpp
95 -index ee559c47..22f0bb39 100644
96 ---- a/src/model.cpp
97 -+++ b/src/model.cpp
98 -@@ -181,7 +181,7 @@ vector<Shape*> Model::ReadShapes(Glib::RefPtr<Gio::File> file,
99 - uint max_triangles)
100 - {
101 - vector<Shape*> shapes;
102 -- if (file==0) return shapes;
103 -+ if (!file) return shapes;
104 - File sfile(file);
105 - vector< vector<Triangle> > triangles;
106 - vector<ustring> shapenames;
107
108 diff --git a/sci-misc/repsnapper/files/std-c11.patch b/sci-misc/repsnapper/files/std-c11.patch
109 deleted file mode 100644
110 index a8ff67ae387..00000000000
111 --- a/sci-misc/repsnapper/files/std-c11.patch
112 +++ /dev/null
113 @@ -1,31 +0,0 @@
114 ---- src/slicer/poly.cpp.orig 2015-12-28 07:54:32.774722105 +0100
115 -+++ src/slicer/poly.cpp 2015-12-28 07:54:41.188055896 +0100
116 -@@ -225,7 +225,7 @@
117 - // Start with first vertex as closest
118 - uint nindex = 0;
119 - mindist = (vertices[0]-p).squared_length();
120 -- if (isnan(mindist)) { // for infinity point p return point 0 and distance 0
121 -+ if (std::isnan(mindist)) { // for infinity point p return point 0 and distance 0
122 - mindist = 0.;
123 - return 0;
124 - }
125 ---- src/slicer/printlines.cpp.orig 2015-12-28 07:54:05.814720635 +0100
126 -+++ src/slicer/printlines.cpp 2015-12-28 07:54:19.821388065 +0100
127 -@@ -240,7 +240,7 @@
128 - if (abs(absolute_extrusion) < 0.00001)
129 - travel_speed = max(minspeed, speed); // in case speed is too low
130 -
131 -- if (!isnan(absolute_extrusion))
132 -+ if (!std::isnan(absolute_extrusion))
133 - // allowed to push/pull at arbitrary speed
134 - extrudedMaterial += absolute_extrusion;
135 - else
136 -@@ -335,7 +335,7 @@
137 - else
138 - factor = 1./newlines.size();
139 - newlines[i].absolute_extrusion *= factor;
140 -- assert(!isnan(newlines[i].absolute_extrusion));
141 -+ assert(!std::isnan(newlines[i].absolute_extrusion));
142 -
143 - }
144 - return newlines;
145
146 diff --git a/sci-misc/repsnapper/metadata.xml b/sci-misc/repsnapper/metadata.xml
147 deleted file mode 100644
148 index 8d7cc1dec49..00000000000
149 --- a/sci-misc/repsnapper/metadata.xml
150 +++ /dev/null
151 @@ -1,8 +0,0 @@
152 -<?xml version="1.0" encoding="UTF-8"?>
153 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
154 -<pkgmetadata>
155 - <!-- maintainer-needed -->
156 - <upstream>
157 - <remote-id type="github">timschmidt/repsnapper</remote-id>
158 - </upstream>
159 -</pkgmetadata>
160
161 diff --git a/sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild b/sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild
162 deleted file mode 100644
163 index 4f043bd5b3b..00000000000
164 --- a/sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild
165 +++ /dev/null
166 @@ -1,33 +0,0 @@
167 -# Copyright 1999-2013 Gentoo Foundation
168 -# Distributed under the terms of the GNU General Public License v2
169 -
170 -EAPI=5
171 -
172 -inherit autotools versionator
173 -
174 -MY_PV="$(get_version_component_range 1-4)$(get_version_component_range 5)"
175 -MY_PV=${MY_PV/p/}
176 -
177 -DESCRIPTION="Host software for controlling the RepRap open source 3D printer"
178 -HOMEPAGE="https://github.com/timschmidt/repsnapper"
179 -SRC_URI="https://github.com/timschmidt/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
180 -
181 -S="${WORKDIR}/${PN}-${MY_PV}"
182 -
183 -LICENSE="GPL-2"
184 -SLOT="0"
185 -KEYWORDS="~amd64 ~x86"
186 -IUSE=""
187 -
188 -DEPEND="
189 - >=dev-cpp/gtkglextmm-1.2
190 - dev-cpp/gtkmm:2.4
191 - dev-cpp/libxmlpp
192 - dev-libs/libzip
193 - virtual/opengl
194 -"
195 -RDEPEND=${DEPEND}
196 -
197 -src_prepare() {
198 - eautoreconf
199 -}
200
201 diff --git a/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
202 deleted file mode 100644
203 index 26bbc8eb54b..00000000000
204 --- a/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
205 +++ /dev/null
206 @@ -1,36 +0,0 @@
207 -# Copyright 1999-2017 Gentoo Foundation
208 -# Distributed under the terms of the GNU General Public License v2
209 -
210 -EAPI=5
211 -
212 -inherit autotools flag-o-matic versionator
213 -
214 -MY_PV="$(get_version_component_range 1-3)$(get_version_component_range 4)"
215 -MY_PV=${MY_PV/p/}
216 -
217 -DESCRIPTION="Host software for controlling the RepRap open source 3D printer"
218 -HOMEPAGE="https://github.com/timschmidt/repsnapper"
219 -SRC_URI="https://github.com/timschmidt/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
220 -
221 -S="${WORKDIR}/${PN}-${MY_PV}"
222 -
223 -LICENSE="GPL-2"
224 -SLOT="0"
225 -KEYWORDS="~amd64 ~x86"
226 -IUSE=""
227 -
228 -DEPEND="
229 - >=dev-cpp/gtkglextmm-1.2
230 - dev-cpp/gtkmm:2.4
231 - dev-cpp/libxmlpp:2.6
232 - dev-libs/libzip
233 - virtual/opengl
234 -"
235 -RDEPEND=${DEPEND}
236 -
237 -src_prepare() {
238 - epatch "${FILESDIR}/std-c11.patch"
239 - epatch "${FILESDIR}/${P}-gcc6.patch"
240 - eautoreconf
241 - append-cxxflags -std=c++11
242 -}
243
244 diff --git a/sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild b/sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild
245 deleted file mode 100644
246 index 860571030c5..00000000000
247 --- a/sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild
248 +++ /dev/null
249 @@ -1,34 +0,0 @@
250 -# Copyright 1999-2017 Gentoo Foundation
251 -# Distributed under the terms of the GNU General Public License v2
252 -
253 -EAPI=5
254 -
255 -inherit autotools flag-o-matic versionator
256 -
257 -MY_PV="$(get_version_component_range 1-3)$(get_version_component_range 4)"
258 -MY_PV=${MY_PV/p/}
259 -
260 -DESCRIPTION="Host software for controlling the RepRap open source 3D printer"
261 -HOMEPAGE="https://github.com/timschmidt/repsnapper"
262 -SRC_URI="https://github.com/timschmidt/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
263 -
264 -S="${WORKDIR}/${PN}-${MY_PV}"
265 -
266 -LICENSE="GPL-2"
267 -SLOT="0"
268 -KEYWORDS="~amd64 ~x86"
269 -IUSE=""
270 -
271 -DEPEND="
272 - >=dev-cpp/gtkglextmm-1.2
273 - dev-cpp/gtkmm:2.4
274 - dev-cpp/libxmlpp:2.6
275 - dev-libs/libzip
276 - virtual/opengl
277 -"
278 -RDEPEND="${DEPEND}"
279 -
280 -src_prepare() {
281 - eautoreconf
282 - append-cxxflags -std=c++11
283 -}
284
285 diff --git a/sci-misc/repsnapper/repsnapper-9999.ebuild b/sci-misc/repsnapper/repsnapper-9999.ebuild
286 deleted file mode 100644
287 index e52ec41c78d..00000000000
288 --- a/sci-misc/repsnapper/repsnapper-9999.ebuild
289 +++ /dev/null
290 @@ -1,29 +0,0 @@
291 -# Copyright 1999-2019 Gentoo Authors
292 -# Distributed under the terms of the GNU General Public License v2
293 -
294 -EAPI=5
295 -
296 -inherit autotools git-r3
297 -
298 -DESCRIPTION="Host software for controlling the RepRap open source 3D printer"
299 -HOMEPAGE="https://github.com/timschmidt/repsnapper"
300 -EGIT_REPO_URI="https://github.com/timschmidt/${PN}.git"
301 -
302 -LICENSE="GPL-2"
303 -SLOT="0"
304 -KEYWORDS=""
305 -IUSE=""
306 -
307 -DEPEND="
308 - >=dev-cpp/gtkglextmm-1.2
309 - dev-cpp/gtkmm:2.4
310 - dev-cpp/libxmlpp:2.6
311 - dev-libs/libzip
312 - virtual/opengl
313 -"
314 -RDEPEND=${DEPEND}
315 -
316 -src_prepare() {
317 - eautoreconf
318 - append-cxxflags -std=c++11
319 -}