1 |
commit: c0587fa6588c986ef73d1bc1cf444eaaa47f97bb |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 5 18:03:16 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 5 18:40:21 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0587fa6 |
7 |
|
8 |
dev-cpp/libcult: Remove old |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3022 |
11 |
|
12 |
dev-cpp/libcult/Manifest | 1 - |
13 |
.../files/1.4.6-fix-compilation-with-gcc-4.7.patch | 57 ------- |
14 |
dev-cpp/libcult/files/libcult-1.4.6-cpp14.patch | 163 --------------------- |
15 |
dev-cpp/libcult/libcult-1.4.6-r1.ebuild | 87 ----------- |
16 |
dev-cpp/libcult/metadata.xml | 8 - |
17 |
profiles/package.mask | 1 - |
18 |
6 files changed, 317 deletions(-) |
19 |
|
20 |
diff --git a/dev-cpp/libcult/Manifest b/dev-cpp/libcult/Manifest |
21 |
deleted file mode 100644 |
22 |
index 2be1c50..00000000 |
23 |
--- a/dev-cpp/libcult/Manifest |
24 |
+++ /dev/null |
25 |
@@ -1 +0,0 @@ |
26 |
-DIST libcult-1.4.6.tar.bz2 51036 SHA256 f1b51023880440d3e673bf9c3d2b034f1e16511b33ab006cd9f7d937246e48ac SHA512 4a3a3a2967bf8c8eaf47b028bbd475245d89ba746352b62a0e8fdc80ba912e90a928e2f4c863812b86e4c3881294d816a822c0f63a0aea2edc3f08d80365b3fd WHIRLPOOL 4bbf5e4ff7bef4c0c086b2c0be318c733b545f5910e72876ccf967d138df0d3de3b3c1f368147d64fd42828a7eecf1c3a5884c397f964df23dc0308ed8e13b43 |
27 |
|
28 |
diff --git a/dev-cpp/libcult/files/1.4.6-fix-compilation-with-gcc-4.7.patch b/dev-cpp/libcult/files/1.4.6-fix-compilation-with-gcc-4.7.patch |
29 |
deleted file mode 100644 |
30 |
index f7b169a..00000000 |
31 |
--- a/dev-cpp/libcult/files/1.4.6-fix-compilation-with-gcc-4.7.patch |
32 |
+++ /dev/null |
33 |
@@ -1,57 +0,0 @@ |
34 |
-From 2ef8e0426baad35a3438f9497005c3e3391e23f0 Mon Sep 17 00:00:00 2001 |
35 |
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@××××××××.ch> |
36 |
-Date: Fri, 1 Jun 2012 10:12:33 +0200 |
37 |
-Subject: [PATCH 2/2] fix compilation with gcc-4.7 |
38 |
- |
39 |
---- |
40 |
- cult/mm/evptr.hxx | 4 ++-- |
41 |
- cult/mm/shptr.hxx | 4 ++-- |
42 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
43 |
- |
44 |
-diff --git a/cult/mm/evptr.hxx b/cult/mm/evptr.hxx |
45 |
-index 18f232c..ed0bd93 100644 |
46 |
---- a/cult/mm/evptr.hxx |
47 |
-+++ b/cult/mm/evptr.hxx |
48 |
-@@ -70,7 +70,7 @@ namespace Cult |
49 |
- Evptr& |
50 |
- operator= (Evptr const& ep) |
51 |
- { |
52 |
-- assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_); |
53 |
-+ this->assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_); |
54 |
- |
55 |
- return *this; |
56 |
- } |
57 |
-@@ -79,7 +79,7 @@ namespace Cult |
58 |
- Evptr& |
59 |
- operator= (Evptr<Y> const& ep) |
60 |
- { |
61 |
-- assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_); |
62 |
-+ this->assign (ep.cp_ ? ep.cp_ : ep.p_, ep.c_); |
63 |
- |
64 |
- return *this; |
65 |
- } |
66 |
-diff --git a/cult/mm/shptr.hxx b/cult/mm/shptr.hxx |
67 |
-index a5e1257..6630b1c 100644 |
68 |
---- a/cult/mm/shptr.hxx |
69 |
-+++ b/cult/mm/shptr.hxx |
70 |
-@@ -45,7 +45,7 @@ namespace Cult |
71 |
- Shptr& |
72 |
- operator= (Shptr const& ap) |
73 |
- { |
74 |
-- assign (ap); |
75 |
-+ this->assign (ap); |
76 |
- return *this; |
77 |
- } |
78 |
- |
79 |
-@@ -53,7 +53,7 @@ namespace Cult |
80 |
- Shptr& |
81 |
- operator= (Shptr<Y> const& ap) |
82 |
- { |
83 |
-- assign (ap); |
84 |
-+ this->assign (ap); |
85 |
- return *this; |
86 |
- } |
87 |
- |
88 |
--- |
89 |
-1.7.8.5 |
90 |
- |
91 |
|
92 |
diff --git a/dev-cpp/libcult/files/libcult-1.4.6-cpp14.patch b/dev-cpp/libcult/files/libcult-1.4.6-cpp14.patch |
93 |
deleted file mode 100644 |
94 |
index b357122..00000000 |
95 |
--- a/dev-cpp/libcult/files/libcult-1.4.6-cpp14.patch |
96 |
+++ /dev/null |
97 |
@@ -1,163 +0,0 @@ |
98 |
-Fix compilation with GCC 6.x (C++14 as default standard). Remove throw |
99 |
-specificator from function declaration when compilation is performed with |
100 |
-standard >= C++11. Adds one cast to argument in C++11, C++14. |
101 |
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=593928 |
102 |
- |
103 |
---- a/cult/cli/file-arguments.hxx |
104 |
-+++ b/cult/cli/file-arguments.hxx |
105 |
-@@ -46,8 +46,12 @@ |
106 |
- { |
107 |
- if (i >= size ()) |
108 |
- throw Bounds (); |
109 |
-- |
110 |
-- args_.erase (args_.begin () + i); |
111 |
-+ |
112 |
-+#if __cplusplus < 201103L |
113 |
-+ args_.erase (args_.begin() + i); |
114 |
-+#else |
115 |
-+ args_.erase ((Containers::Vector<String>::ConstIterator)(args_.begin () + i)); |
116 |
-+#endif |
117 |
- } |
118 |
- |
119 |
- private: |
120 |
---- a/cult/mm/new.cxx |
121 |
-+++ b/cult/mm/new.cxx |
122 |
-@@ -140,7 +140,12 @@ |
123 |
- using namespace Cult; |
124 |
- |
125 |
- Void* |
126 |
--operator new (Size s) throw (MM::StdBadAlloc) |
127 |
-+operator new (Size s) |
128 |
-+#if __cplusplus < 201103L |
129 |
-+throw (MM::StdBadAlloc) |
130 |
-+#else |
131 |
-+noexcept(false) |
132 |
-+#endif |
133 |
- { |
134 |
- return MM::allocate (s, *MM::counted); |
135 |
- } |
136 |
---- a/cult/mm/new.hxx |
137 |
-+++ b/cult/mm/new.hxx |
138 |
-@@ -255,7 +255,13 @@ |
139 |
- } |
140 |
- |
141 |
- Cult::Void* |
142 |
--operator new (Cult::Size) throw (Cult::MM::StdBadAlloc); |
143 |
-+operator new (Cult::Size) |
144 |
-+#if __cplusplus < 201103L |
145 |
-+throw (Cult::MM::StdBadAlloc) |
146 |
-+#else |
147 |
-+noexcept(false) |
148 |
-+#endif |
149 |
-+; |
150 |
- |
151 |
- Cult::Void* |
152 |
- operator new (Cult::Size, |
153 |
---- a/cult/sched/condition.cxx |
154 |
-+++ b/cult/sched/condition.cxx |
155 |
-@@ -12,6 +12,9 @@ |
156 |
- { |
157 |
- Condition:: |
158 |
- ~Condition () |
159 |
-+#if __cplusplus >= 201103L |
160 |
-+ noexcept(false) |
161 |
-+#endif |
162 |
- { |
163 |
- if (Int e = pthread_cond_destroy (&cond_)) |
164 |
- throw Implementation (e); |
165 |
---- a/cult/sched/condition.hxx |
166 |
-+++ b/cult/sched/condition.hxx |
167 |
-@@ -19,7 +19,11 @@ |
168 |
- class Condition: public NonCopyable |
169 |
- { |
170 |
- public: |
171 |
-- ~Condition (); |
172 |
-+ ~Condition () |
173 |
-+#if __cplusplus >= 201103L |
174 |
-+ noexcept(false) |
175 |
-+#endif |
176 |
-+ ; |
177 |
- |
178 |
- Condition (Mutex& mutex); |
179 |
- |
180 |
---- a/cult/sched/mutex.cxx |
181 |
-+++ b/cult/sched/mutex.cxx |
182 |
-@@ -12,6 +12,9 @@ |
183 |
- { |
184 |
- Mutex:: |
185 |
- ~Mutex () |
186 |
-+#if __cplusplus >= 201103L |
187 |
-+ noexcept(false) |
188 |
-+#endif |
189 |
- { |
190 |
- if (Int e = pthread_mutex_destroy (&mutex_)) |
191 |
- throw Implementation (e); |
192 |
---- a/cult/sched/mutex.hxx |
193 |
-+++ b/cult/sched/mutex.hxx |
194 |
-@@ -17,7 +17,11 @@ |
195 |
- class Mutex: public NonCopyable |
196 |
- { |
197 |
- public: |
198 |
-- ~Mutex (); |
199 |
-+ ~Mutex () |
200 |
-+#if __cplusplus >= 201103L |
201 |
-+ noexcept(false) |
202 |
-+#endif |
203 |
-+ ; |
204 |
- |
205 |
- Mutex (); |
206 |
- |
207 |
---- a/cult/sched/spin.cxx |
208 |
-+++ b/cult/sched/spin.cxx |
209 |
-@@ -12,6 +12,9 @@ |
210 |
- { |
211 |
- Spin:: |
212 |
- ~Spin () |
213 |
-+#if __cplusplus >= 201103L |
214 |
-+ noexcept(false) |
215 |
-+#endif |
216 |
- { |
217 |
- if (Int e = pthread_spin_destroy (&spin_)) |
218 |
- throw Implementation (e); |
219 |
---- a/cult/sched/spin.hxx |
220 |
-+++ b/cult/sched/spin.hxx |
221 |
-@@ -17,7 +17,11 @@ |
222 |
- class Spin: public NonCopyable |
223 |
- { |
224 |
- public: |
225 |
-- ~Spin (); |
226 |
-+ ~Spin () |
227 |
-+#if __cplusplus >= 201103L |
228 |
-+ noexcept(false) |
229 |
-+#endif |
230 |
-+ ; |
231 |
- |
232 |
- Spin (); |
233 |
- |
234 |
---- a/cult/sched/thread.cxx |
235 |
-+++ b/cult/sched/thread.cxx |
236 |
-@@ -196,6 +196,9 @@ |
237 |
- |
238 |
- Thread:: |
239 |
- ~Thread () |
240 |
-+#if __cplusplus >= 201103L |
241 |
-+ noexcept(false) |
242 |
-+#endif |
243 |
- { |
244 |
- tout << "thread is being destroyed."; |
245 |
- |
246 |
---- a/cult/sched/thread.hxx |
247 |
-+++ b/cult/sched/thread.hxx |
248 |
-@@ -30,7 +30,11 @@ |
249 |
- |
250 |
- public: |
251 |
- virtual |
252 |
-- ~Thread (); |
253 |
-+ ~Thread () |
254 |
-+#if __cplusplus >= 201103L |
255 |
-+ noexcept(false) |
256 |
-+#endif |
257 |
-+ ; |
258 |
- |
259 |
- Thread (Void* (*StartRoutine) (Void*), Void* arg = 0); |
260 |
- |
261 |
|
262 |
diff --git a/dev-cpp/libcult/libcult-1.4.6-r1.ebuild b/dev-cpp/libcult/libcult-1.4.6-r1.ebuild |
263 |
deleted file mode 100644 |
264 |
index 51d7f8f..00000000 |
265 |
--- a/dev-cpp/libcult/libcult-1.4.6-r1.ebuild |
266 |
+++ /dev/null |
267 |
@@ -1,87 +0,0 @@ |
268 |
-# Copyright 1999-2016 Gentoo Foundation |
269 |
-# Distributed under the terms of the GNU General Public License v2 |
270 |
-# $Id$ |
271 |
- |
272 |
-EAPI="4" |
273 |
- |
274 |
-inherit eutils toolchain-funcs versionator |
275 |
- |
276 |
-DESCRIPTION="A collection of C++ libraries" |
277 |
-HOMEPAGE="http://kolpackov.net/projects/libcult/" |
278 |
-SRC_URI="ftp://kolpackov.net/pub/projects/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2" |
279 |
-LICENSE="GPL-2" |
280 |
-SLOT="0" |
281 |
-KEYWORDS="amd64 ~arm ppc ppc64 x86" |
282 |
-IUSE="examples" |
283 |
- |
284 |
-DEPEND="dev-util/build |
285 |
- sys-devel/m4" |
286 |
-RDEPEND="" |
287 |
- |
288 |
-src_prepare() { |
289 |
- # never build the examples |
290 |
- sed -i \ |
291 |
- -e 's| $(out_base)/examples/[[:alnum:]\.]*||' \ |
292 |
- -e '/examples\/makefile/d' \ |
293 |
- makefile || die "sed failed" |
294 |
- |
295 |
- epatch "${FILESDIR}/${PV}-fix-compilation-with-gcc-4.7.patch" |
296 |
- epatch "${FILESDIR}/${P}-cpp14.patch" # bug #593928 |
297 |
-} |
298 |
- |
299 |
-src_configure() { |
300 |
- mkdir -p build/{cxx/gnu,ld} |
301 |
- |
302 |
- cat >> build/configuration-dynamic.make <<- EOF |
303 |
-cult_dr := y |
304 |
-cult_threads := y |
305 |
-cult_network := y |
306 |
- EOF |
307 |
- |
308 |
- cat >> build/cxx/configuration-dynamic.make <<- EOF |
309 |
-cxx_id := gnu |
310 |
-cxx_optimize := n |
311 |
-cxx_debug := n |
312 |
-cxx_rpath := n |
313 |
-cxx_pp_extra_options := |
314 |
-cxx_extra_options := ${CXXFLAGS} |
315 |
-cxx_ld_extra_options := ${LDFLAGS} |
316 |
-cxx_extra_libs := |
317 |
-cxx_extra_lib_paths := |
318 |
- EOF |
319 |
- |
320 |
- cat >> build/cxx/gnu/configuration-dynamic.make <<- EOF |
321 |
-cxx_gnu := $(tc-getCXX) |
322 |
-cxx_gnu_libraries := |
323 |
-cxx_gnu_optimization_options := |
324 |
- EOF |
325 |
- |
326 |
- cat >> build/ld/configuration-lib-dynamic.make <<- EOF |
327 |
-ld_lib_type := shared |
328 |
- EOF |
329 |
- |
330 |
- MAKEOPTS+=" verbose=1" |
331 |
-} |
332 |
- |
333 |
-src_install() { |
334 |
- dolib.so cult/libcult.so |
335 |
- |
336 |
- find cult -iname "*.cxx" \ |
337 |
- -o -iname "makefile" \ |
338 |
- -o -iname "*.o" -o -iname "*.d" \ |
339 |
- -o -iname "*.m4" -o -iname "*.l" \ |
340 |
- -o -iname "*.cpp-options" -o -iname "*.so" | xargs rm -f |
341 |
- rm -rf cult/arch |
342 |
- |
343 |
- insinto /usr/include |
344 |
- doins -r cult |
345 |
- |
346 |
- dodoc NEWS README documentation/[[:upper:]]* |
347 |
- dohtml -A xhtml -r documentation/* |
348 |
- |
349 |
- if use examples ; then |
350 |
- find examples -name makefile -delete |
351 |
- # preserving symlinks in the examples |
352 |
- cp -dpR examples "${D}/usr/share/doc/${PF}" |
353 |
- fi |
354 |
-} |
355 |
|
356 |
diff --git a/dev-cpp/libcult/metadata.xml b/dev-cpp/libcult/metadata.xml |
357 |
deleted file mode 100644 |
358 |
index acd00be..00000000 |
359 |
--- a/dev-cpp/libcult/metadata.xml |
360 |
+++ /dev/null |
361 |
@@ -1,8 +0,0 @@ |
362 |
-<?xml version="1.0" encoding="UTF-8"?> |
363 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
364 |
-<pkgmetadata> |
365 |
- <maintainer type="person"> |
366 |
- <email>dev-zero@g.o</email> |
367 |
- <name>Tiziano Müller</name> |
368 |
- </maintainer> |
369 |
-</pkgmetadata> |
370 |
|
371 |
diff --git a/profiles/package.mask b/profiles/package.mask |
372 |
index 8d19dee..0c8941c 100644 |
373 |
--- a/profiles/package.mask |
374 |
+++ b/profiles/package.mask |
375 |
@@ -366,7 +366,6 @@ dev-java/jaffl |
376 |
# David Seifert <soap@g.o> (29 Oct 2016) |
377 |
# Unmaintained, broken, do not work with GCC 6 |
378 |
# Bugs #594506, #597780, removal in 30 days. |
379 |
-dev-cpp/libcult |
380 |
<dev-util/build-0.3.10 |
381 |
|
382 |
# David Seifert <soap@g.o> (29 Oct 2016) |