1 |
commit: e7534ff5b94d7aed1595a2405b2216d35264afd4 |
2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 6 16:00:24 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 6 16:01:20 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7534ff5 |
7 |
|
8 |
sci-libs/cbflib & sci-chemistry/rasmol: remove last-rited packages |
9 |
|
10 |
Closes: https://bugs.gentoo.org/788508 |
11 |
Closes: https://bugs.gentoo.org/668568 |
12 |
Closes: https://bugs.gentoo.org/721998 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
profiles/package.mask | 9 - |
16 |
sci-chemistry/rasmol/Manifest | 1 - |
17 |
sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch | 80 --------- |
18 |
.../files/rasmol-2.7.5.2-format-security.patch | 39 ----- |
19 |
.../rasmol/files/rasmol-2.7.5.2-glib.h.patch | 31 ---- |
20 |
.../rasmol/files/rasmol-2.7.5.2-longlong.patch | 12 -- |
21 |
sci-chemistry/rasmol/metadata.xml | 11 -- |
22 |
sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild | 106 ------------ |
23 |
sci-libs/cbflib/Manifest | 1 - |
24 |
sci-libs/cbflib/cbflib-0.9.3.3.ebuild | 58 ------- |
25 |
.../cbflib/files/cbflib-0.9.3.3-unbundle.patch | 181 --------------------- |
26 |
sci-libs/cbflib/metadata.xml | 22 --- |
27 |
12 files changed, 551 deletions(-) |
28 |
|
29 |
diff --git a/profiles/package.mask b/profiles/package.mask |
30 |
index 3365a96e690..faac01b021d 100644 |
31 |
--- a/profiles/package.mask |
32 |
+++ b/profiles/package.mask |
33 |
@@ -382,15 +382,6 @@ app-portage/perl-info |
34 |
# bug #731266 |
35 |
>=net-mail/cyrus-imapd-3.4.0 |
36 |
|
37 |
-# Joonas Niilola <juippis@g.o> (2021-05-06) |
38 |
-# sci-libs/cbflib: Doesn't compile with GCC-10 or GCC-11. Was never |
39 |
-# ported to work with GCC-10+. sci-chemistry/rasmol depends on cbflib. |
40 |
-# Both packages have updates ignored in Gentoo, and their ebuilds |
41 |
-# pretty much untouched during git-era. Both had their latest upstream |
42 |
-# version release in 2018. Removal in ~30 days. Bug #788508 |
43 |
-sci-libs/cbflib |
44 |
-sci-chemistry/rasmol |
45 |
- |
46 |
# David Seifert <soap@g.o> (2021-05-05) |
47 |
# Causes unsolvable package conflicts, bug #788310 |
48 |
>=media-libs/openexr-3 |
49 |
|
50 |
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest |
51 |
deleted file mode 100644 |
52 |
index 7b5d0a12929..00000000000 |
53 |
--- a/sci-chemistry/rasmol/Manifest |
54 |
+++ /dev/null |
55 |
@@ -1 +0,0 @@ |
56 |
-DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 BLAKE2B dcc9bfe9381ebab6bbf5a12e233490f076ead2388a22e3186421e3489bedde987813b1f65ce7b17ef168389c33d03bd7d4a8162635c0a79b3dc704eade23715d SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f |
57 |
|
58 |
diff --git a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch b/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch |
59 |
deleted file mode 100644 |
60 |
index 10705165ad4..00000000000 |
61 |
--- a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch |
62 |
+++ /dev/null |
63 |
@@ -1,80 +0,0 @@ |
64 |
-diff --git a/src/Imakefile b/src/Imakefile |
65 |
-index 03be00e..a0c68f9 100755 |
66 |
---- a/src/Imakefile |
67 |
-+++ b/src/Imakefile |
68 |
-@@ -176,7 +176,7 @@ XFORMSLIB_DIR = /usr/local |
69 |
- #endif |
70 |
- endif |
71 |
- XFORMSLIB_INCLUDE_DIR = $(XFORMSLIB_DIR)/include |
72 |
--XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib -lforms |
73 |
-+XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib |
74 |
- #endif |
75 |
- #endif |
76 |
- #endif |
77 |
-@@ -281,17 +281,10 @@ RASMOLDIR = $(USRLIBDIR)/rasmol/ |
78 |
- |
79 |
- #ifndef USE_XFORMSLIB |
80 |
- DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \ |
81 |
-- -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \ |
82 |
-- -I$(CQRLIB_INCLUDE_DIR) \ |
83 |
-- -I$(CVECTOR_INCLUDE_DIR) \ |
84 |
-- -I$(NEARTREE_INCLUDE_DIR) |
85 |
-+ -D_USE_RASMOL_H_ $(GUIOPTION) -I@GENTOO_PORTAGE_EPREFIX@/usr/include -I@GENTOO_PORTAGE_EPREFIX@/usr/include/cbflib |
86 |
- #else |
87 |
- DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \ |
88 |
-- -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \ |
89 |
-- -I$(CQRLIB_INCLUDE_DIR) \ |
90 |
-- -I$(CVECTOR_INCLUDE_DIR) \ |
91 |
-- -I$(NEARTREE_INCLUDE_DIR) \ |
92 |
-- -I$(XFORMSLIB_INCLUDE_DIR) |
93 |
-+ -D_USE_RASMOL_H_ $(GUIOPTION) -I@GENTOO_PORTAGE_EPREFIX@/usr/include -I@GENTOO_PORTAGE_EPREFIX@/usr/include/cbflib |
94 |
- #endif |
95 |
- |
96 |
- |
97 |
-@@ -317,11 +310,11 @@ OBJS = rasmol.o molecule.o abstree.o cmndline.o command.o transfor.o \ |
98 |
- # Additional RS6000 AIX MITSHM Library |
99 |
- # LDLIBS = -lm -lXi -lXextSam $(XLIB) |
100 |
- |
101 |
--LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \ |
102 |
-- $(CBFLIB_LDLIB) \ |
103 |
-- $(CQRLIB_LDLIB) \ |
104 |
-- $(CVECTOR_LDLIB) \ |
105 |
-- $(NEARTREE_LDLIB) $(XFORMSLIB_LDLIB) |
106 |
-+LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(GTKLIBS) \ |
107 |
-+ -lcbf \ |
108 |
-+ -lCQRlib \ |
109 |
-+ -lCVector \ |
110 |
-+ -lCNearTree -lgfortran |
111 |
- |
112 |
- |
113 |
- # |
114 |
-@@ -425,11 +418,11 @@ $(NEARTREE_DIR): |
115 |
- $(NEARTREE_DIR)/CNearTree.c: $(NEARTREE_DIR) |
116 |
- #endif |
117 |
- |
118 |
--$(OBJS): $(EXTPKGDIR) $(CBFLIB_OBJDEP) \ |
119 |
-- $(CQRLIB_OBJDEP) \ |
120 |
-- $(CVECTOR_OBJDEP) \ |
121 |
-- $(NEARTREE_OBJDEP) \ |
122 |
-- $(XFORMSLIB_OBJDEP) |
123 |
-+# $(OBJS): $(EXTPKGDIR) $(CBFLIB_OBJDEP) \ |
124 |
-+# $(CQRLIB_OBJDEP) \ |
125 |
-+# $(CVECTOR_OBJDEP) \ |
126 |
-+# $(NEARTREE_OBJDEP) \ |
127 |
-+# $(XFORMSLIB_OBJDEP) |
128 |
- |
129 |
- |
130 |
- gtkwin.c: gtkui.h |
131 |
-diff --git a/src/Makefile.in b/src/Makefile.in |
132 |
-index fc6d0af..bad90fc 100755 |
133 |
---- a/src/Makefile.in |
134 |
-+++ b/src/Makefile.in |
135 |
-@@ -165,7 +165,7 @@ $(CBFLIBDIR)/lib/libcbf.a: $(CBFLIBDIR) |
136 |
- |
137 |
- all: postdownload rasmol rastxt |
138 |
- |
139 |
--rasmol: postdownload $(X11OBJS) $(CBFLIBDIR)/lib/libcbf.a |
140 |
-+rasmol: postdownload $(X11OBJS) |
141 |
- $(CC) -o rasmol $(LFLAGS) $(X11OBJS) $(X11LIBS) |
142 |
- chmod 755 rasmol |
143 |
- |
144 |
|
145 |
diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch |
146 |
deleted file mode 100644 |
147 |
index 22eb229d8a3..00000000000 |
148 |
--- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch |
149 |
+++ /dev/null |
150 |
@@ -1,39 +0,0 @@ |
151 |
-diff -urp RasMol-2.7.5.2/src/command.c RasMol-2.7.5.2_sprintf/src/command.c |
152 |
---- RasMol-2.7.5.2/src/command.c 2011-05-15 01:23:49.000000000 +0700 |
153 |
-+++ RasMol-2.7.5.2_sprintf/src/command.c 2014-02-12 18:02:24.633489549 +0700 |
154 |
-@@ -1286,7 +1286,7 @@ void ShowRecordCommand( void ) { |
155 |
- if (record_on[1]) WriteString("record appearance on\n"); |
156 |
- else WriteString("record apperance off\n"); |
157 |
- if (RecordMaxMS == 1.) { |
158 |
-- sprintf(param,RecordTemplate); |
159 |
-+ sprintf(param, "%s", RecordTemplate); |
160 |
- } else{ |
161 |
- sprintf(param,RecordTemplate,millisec<0?0:millisec); |
162 |
- } |
163 |
-@@ -1381,7 +1381,7 @@ void ShowPlayCommand( void ) { |
164 |
- WriteString(param); |
165 |
- } |
166 |
- if (PlayMaxMS == 1.) { |
167 |
-- sprintf(param,PlayTemplate); |
168 |
-+ sprintf(param, "%s", PlayTemplate); |
169 |
- } else{ |
170 |
- sprintf(param,PlayTemplate,millisec<0?0:millisec); |
171 |
- } |
172 |
-@@ -1469,7 +1469,7 @@ void WriteMovieFrame( void ) { |
173 |
- RecordPause = True; |
174 |
- } else { |
175 |
- if (RecordMaxMS == 1.) { |
176 |
-- sprintf(param,RecordTemplate); |
177 |
-+ sprintf(param, "%s", RecordTemplate); |
178 |
- } else{ |
179 |
- sprintf(param,RecordTemplate,millisec); |
180 |
- } |
181 |
-@@ -1505,7 +1505,7 @@ static int PlayMovieFrame( void ) { |
182 |
- for (play_frame[1] = 0;play_frame[1]<=millisec; play_frame[1]++) |
183 |
- { |
184 |
- if (RecordMaxMS == 1.) { |
185 |
-- sprintf(param,PlayTemplate); |
186 |
-+ sprintf(param, "%s", PlayTemplate); |
187 |
- } else{ |
188 |
- sprintf(param,PlayTemplate,millisec-play_frame[1]); |
189 |
- } |
190 |
|
191 |
diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch |
192 |
deleted file mode 100644 |
193 |
index 69c19dae5e8..00000000000 |
194 |
--- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch |
195 |
+++ /dev/null |
196 |
@@ -1,31 +0,0 @@ |
197 |
- src/egg-macros.h | 3 ++- |
198 |
- src/eggfileformatchooser.c | 2 ++ |
199 |
- 2 files changed, 4 insertions(+), 1 deletions(-) |
200 |
- |
201 |
-diff --git a/src/egg-macros.h b/src/egg-macros.h |
202 |
-index 9a7caad..1a6bce0 100644 |
203 |
---- a/src/egg-macros.h |
204 |
-+++ b/src/egg-macros.h |
205 |
-@@ -9,7 +9,8 @@ |
206 |
- #ifndef _EGG_MACROS_H_ |
207 |
- #define _EGG_MACROS_H_ |
208 |
- |
209 |
--#include <glib/gmacros.h> |
210 |
-+#include <glib.h> |
211 |
-+#include <glib/gprintf.h> |
212 |
- |
213 |
- G_BEGIN_DECLS |
214 |
- |
215 |
-diff --git a/src/eggfileformatchooser.c b/src/eggfileformatchooser.c |
216 |
-index 32ce2ab..febfc2e 100644 |
217 |
---- a/src/eggfileformatchooser.c |
218 |
-+++ b/src/eggfileformatchooser.c |
219 |
-@@ -19,6 +19,8 @@ |
220 |
- #include "eggfileformatchooser.h" |
221 |
- #include "egg-macros.h" |
222 |
- |
223 |
-+#include <glib.h> |
224 |
-+#include <glib/gprintf.h> |
225 |
- #include <glib/gi18n.h> |
226 |
- #include <gtk/gtk.h> |
227 |
- #include <string.h> |
228 |
|
229 |
diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch |
230 |
deleted file mode 100644 |
231 |
index 3cff0fa2f98..00000000000 |
232 |
--- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch |
233 |
+++ /dev/null |
234 |
@@ -1,12 +0,0 @@ |
235 |
-diff -urp rasmol-2.7.5-23Jul09/src/rasmol.h rasmol-2.7.5-23Jul09-64b/src/rasmol.h |
236 |
---- rasmol-2.7.5-23Jul09/src/rasmol.h 2009-07-20 21:08:43.000000000 +0700 |
237 |
-+++ rasmol-2.7.5-23Jul09-64b/src/rasmol.h 2013-02-22 14:40:00.378574163 +0700 |
238 |
-@@ -125,6 +125,8 @@ |
239 |
- #define VECTOR_FAR |
240 |
- #endif |
241 |
- |
242 |
-+#define _LONGLONG |
243 |
-+ |
244 |
- /*========================*/ |
245 |
- /* Default User Options! */ |
246 |
- /*========================*/ |
247 |
|
248 |
diff --git a/sci-chemistry/rasmol/metadata.xml b/sci-chemistry/rasmol/metadata.xml |
249 |
deleted file mode 100644 |
250 |
index 59ea086025a..00000000000 |
251 |
--- a/sci-chemistry/rasmol/metadata.xml |
252 |
+++ /dev/null |
253 |
@@ -1,11 +0,0 @@ |
254 |
-<?xml version="1.0" encoding="UTF-8"?> |
255 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
256 |
-<pkgmetadata> |
257 |
- <maintainer type="project"> |
258 |
- <email>sci-chemistry@g.o</email> |
259 |
- <name>Gentoo Chemistry Project</name> |
260 |
- </maintainer> |
261 |
- <upstream> |
262 |
- <remote-id type="sourceforge">openrasmol</remote-id> |
263 |
- </upstream> |
264 |
-</pkgmetadata> |
265 |
|
266 |
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild |
267 |
deleted file mode 100644 |
268 |
index 534cffb9bba..00000000000 |
269 |
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild |
270 |
+++ /dev/null |
271 |
@@ -1,106 +0,0 @@ |
272 |
-# Copyright 1999-2021 Gentoo Authors |
273 |
-# Distributed under the terms of the GNU General Public License v2 |
274 |
- |
275 |
-EAPI=5 |
276 |
- |
277 |
-inherit epatch fortran-2 multilib prefix toolchain-funcs |
278 |
- |
279 |
-MY_P="RasMol_${PV}" |
280 |
-VERS="13May11" |
281 |
- |
282 |
-DESCRIPTION="Molecular Graphics Visualisation Tool" |
283 |
-HOMEPAGE="http://www.openrasmol.org/" |
284 |
-#SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz" |
285 |
-SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${P}-${VERS}.tar.gz" |
286 |
-#SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/RasMol.tar.gz" |
287 |
- |
288 |
-LICENSE="|| ( GPL-2 RASLIC )" |
289 |
-SLOT="0" |
290 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
291 |
-IUSE="" |
292 |
- |
293 |
-RDEPEND=" |
294 |
- dev-libs/cvector |
295 |
- dev-util/gtk-builder-convert |
296 |
- >=sci-libs/cbflib-0.9.2 |
297 |
- >=sci-libs/cqrlib-1.1.2 |
298 |
- >=sci-libs/neartree-3.1.1 |
299 |
- x11-libs/cairo |
300 |
- x11-libs/gtk+:2 |
301 |
- x11-libs/libXext |
302 |
- x11-libs/libXi |
303 |
- x11-libs/vte:0" |
304 |
-DEPEND="${RDEPEND} |
305 |
- app-text/rman |
306 |
- x11-base/xorg-proto |
307 |
- >=x11-misc/imake-1.0.8-r1" |
308 |
- |
309 |
-#S="${WORKDIR}/${PN}-2.7.5-${VERS}" |
310 |
-S="${WORKDIR}/RasMol-${PV}" |
311 |
- |
312 |
-src_prepare() { |
313 |
- cd src || die |
314 |
- |
315 |
- epatch \ |
316 |
- "${FILESDIR}"/${P}-glib.h.patch \ |
317 |
- "${FILESDIR}"/${P}-format-security.patch \ |
318 |
- "${FILESDIR}"/${P}-longlong.patch |
319 |
- |
320 |
- if use amd64 || use amd64-linux; then |
321 |
- mv rasmol.h rasmol_amd64_save.h && \ |
322 |
- echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h |
323 |
- fi |
324 |
- |
325 |
- sed \ |
326 |
- -e 's:-traditional::g' \ |
327 |
- -i Makefile* || die |
328 |
- |
329 |
- cat > Imakefile <<- EOF |
330 |
- #define PIXELDEPTH 32 |
331 |
- #define GTKWIN |
332 |
- EOF |
333 |
- |
334 |
- cat Imakefile_base >> Imakefile || die |
335 |
- epatch "${FILESDIR}"/2.7.5-bundled-lib.patch |
336 |
- |
337 |
- eprefixify Imakefile |
338 |
- |
339 |
- sed \ |
340 |
- -e 's:vector.c:v_ector.c:g' \ |
341 |
- -e 's:vector.o:v_ector.o:g' \ |
342 |
- -e 's:vector.h:v_ector.h:g' \ |
343 |
- -i *akefile* || die |
344 |
- |
345 |
- sed \ |
346 |
- -e 's:vector.h:v_ector.h:g' \ |
347 |
- -i *.c *.h || die |
348 |
- |
349 |
- mv vector.c v_ector.c || die |
350 |
- mv vector.h v_ector.h || die |
351 |
- |
352 |
- CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ |
353 |
- IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -DGTKWIN || die |
354 |
-} |
355 |
- |
356 |
-src_compile() { |
357 |
- emake -C src clean |
358 |
- emake \ |
359 |
- -C src \ |
360 |
- DEPTHDEF=-DTHIRTYTWOBIT \ |
361 |
- CC="$(tc-getCC)" \ |
362 |
- CDEBUGFLAGS="${CFLAGS}" \ |
363 |
- EXTRA_LDOPTIONS="${LDFLAGS}" |
364 |
-} |
365 |
- |
366 |
-src_install() { |
367 |
- libdir=$(get_libdir) |
368 |
- insinto /usr/${libdir}/${PN} |
369 |
- doins doc/rasmol.hlp |
370 |
- dobin src/rasmol |
371 |
- dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz |
372 |
- doman doc/rasmol.1 |
373 |
- insinto /usr/${libdir}/${PN}/databases |
374 |
- doins data/* |
375 |
- |
376 |
- dohtml -r *html doc/*.html html_graphics |
377 |
-} |
378 |
|
379 |
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest |
380 |
deleted file mode 100644 |
381 |
index 83e5d601f29..00000000000 |
382 |
--- a/sci-libs/cbflib/Manifest |
383 |
+++ /dev/null |
384 |
@@ -1 +0,0 @@ |
385 |
-DIST CBFlib-0.9.3.3.tar.gz 5787633 BLAKE2B c07b73f037f84c84613dd33a7b403d9f934d58abe12016167a6d9ef7633827ad46bef0813b5040790d4da03980285527b43ec0a899e46d8e4823f68fdcbe0765 SHA512 e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff |
386 |
|
387 |
diff --git a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild b/sci-libs/cbflib/cbflib-0.9.3.3.ebuild |
388 |
deleted file mode 100644 |
389 |
index 4d53d2881cf..00000000000 |
390 |
--- a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild |
391 |
+++ /dev/null |
392 |
@@ -1,58 +0,0 @@ |
393 |
-# Copyright 1999-2021 Gentoo Authors |
394 |
-# Distributed under the terms of the GNU General Public License v2 |
395 |
- |
396 |
-EAPI=5 |
397 |
- |
398 |
-CMAKE_MAKEFILE_GENERATOR=emake |
399 |
- |
400 |
-inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs |
401 |
- |
402 |
-MY_P1="CBFlib-${PV}" |
403 |
-#MY_P2="CBFlib_${PV}" |
404 |
-MY_P2="CBFlib_0.9.3" |
405 |
- |
406 |
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files" |
407 |
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/" |
408 |
-BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/" |
409 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz" |
410 |
-# test? ( |
411 |
-# mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz |
412 |
-# mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz |
413 |
-# )" |
414 |
- |
415 |
-LICENSE="GPL-2" |
416 |
-SLOT="0" |
417 |
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" |
418 |
-IUSE="doc test" |
419 |
- |
420 |
-S=${WORKDIR}/${MY_P1} |
421 |
- |
422 |
-RDEPEND="sci-libs/hdf5:=" |
423 |
-DEPEND="${RDEPEND}" |
424 |
- |
425 |
-RESTRICT="test" |
426 |
- |
427 |
-PATCHES=( |
428 |
- "${FILESDIR}"/${P}-unbundle.patch |
429 |
-) |
430 |
- |
431 |
-src_prepare() { |
432 |
- rm -rf Py* drel* dRel* ply* || die |
433 |
- |
434 |
- append-fflags -fno-range-check |
435 |
- |
436 |
- tc-export CC CXX AR RANLIB FC F77 |
437 |
- cmake-utils_src_prepare |
438 |
-} |
439 |
- |
440 |
-src_configure() { |
441 |
- local mycmakeargs=( |
442 |
- -DUNPACKED_DIRECTORY="${S}" |
443 |
- ) |
444 |
- cmake-utils_src_configure |
445 |
-} |
446 |
- |
447 |
-src_install() { |
448 |
- cmake-utils_src_install |
449 |
- dosym ${PN} /usr/include/cbf |
450 |
-} |
451 |
|
452 |
diff --git a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch b/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch |
453 |
deleted file mode 100644 |
454 |
index ef24c4b94b2..00000000000 |
455 |
--- a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch |
456 |
+++ /dev/null |
457 |
@@ -1,181 +0,0 @@ |
458 |
- CMakeLists.txt | 118 +++------------------------------------------------------ |
459 |
- 1 file changed, 6 insertions(+), 112 deletions(-) |
460 |
- |
461 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
462 |
-index 75054d6..15bab99 100644 |
463 |
---- a/CMakeLists.txt |
464 |
-+++ b/CMakeLists.txt |
465 |
-@@ -279,7 +279,7 @@ project (CBFlib C CXX Fortran) |
466 |
- enable_testing() |
467 |
- set (CBF_CMAKE_DEBUG "ON") |
468 |
- |
469 |
--set(CMAKE_C_FLAGS "-Wall -fno-strict-aliasing") |
470 |
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing") |
471 |
- |
472 |
- # |
473 |
- # User setable parameters |
474 |
-@@ -530,42 +530,6 @@ find_package(ZLIB) |
475 |
- |
476 |
- |
477 |
- |
478 |
--#Load external packages in build directory at cmake time |
479 |
--add_subdirectory(${CBF__EXTERNAL_PACKAGES} "${CBF__EXT_PKG}") |
480 |
-- |
481 |
--find_file(CBF_EXT_PKG_BLD_RUNNING cbf_ext_pkg_build_running "${CBF__EXT_PKG}") |
482 |
--if (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND") |
483 |
-- file(WRITE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running" "cbf_ext_pkg_build_running") |
484 |
-- CBF_DEBUG_MESSAGE("CMAKE_COMMAND: ${CMAKE_COMMAND}") |
485 |
-- CBF_DEBUG_MESSAGE("CBFlib_SOURCE_DIR: ${CBFlib_SOURCE_DIR} ") |
486 |
-- execute_process( |
487 |
-- COMMAND ${CMAKE_COMMAND} ${CBFlib_SOURCE_DIR} |
488 |
-- RESULT_VARIABLE CBF_BUILD_RESULT) |
489 |
-- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}") |
490 |
-- execute_process( |
491 |
-- COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target HDF5 |
492 |
-- RESULT_VARIABLE CBF_BUILD_RESULT) |
493 |
-- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}") |
494 |
-- execute_process( |
495 |
-- COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target TIFF |
496 |
-- RESULT_VARIABLE CBF_BUILD_RESULT) |
497 |
-- CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}") |
498 |
-- file(REMOVE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running") |
499 |
--endif (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND") |
500 |
-- |
501 |
-- |
502 |
--file(GLOB CBF_HDF5_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*hdf5*") |
503 |
--CBF_DEBUG_MESSAGE( "CBF_HDF5_LIBRARY_PATH: ${CBF_HDF5_LIBRARY_PATH}") |
504 |
--file(GLOB CBF_TIFF_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*tif*") |
505 |
--CBF_DEBUG_MESSAGE( "CBF_TIFF_LIBRARY_PATH: ${CBF_TIFF_LIBRARY_PATH}") |
506 |
-- |
507 |
--if ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||") |
508 |
-- MESSAGE(STATUS "Must build external packages in ${CBF__EXT_PKG}") |
509 |
-- MESSAGE(STATUS "Then rerun cmake") |
510 |
-- MESSAGE(WARNING "Finishing run to make Makefiles") |
511 |
--endif ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||") |
512 |
-- |
513 |
-- |
514 |
- # |
515 |
- # Data Directories |
516 |
- # |
517 |
-@@ -579,35 +543,6 @@ set(CBF_DATAURLBASE "http://downloads.sf.net/cbflib") |
518 |
- set(CBF_DATAURLI "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Input.tar.gz") |
519 |
- set(CBF_DATAURLO "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output.tar.gz") |
520 |
- set(CBF_DATAURLS "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output_Sigs_Only.tar.gz") |
521 |
--# |
522 |
--# Load and unpack the Data Files |
523 |
--# |
524 |
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRI} ${CBF_DATAURLI}) |
525 |
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRO} ${CBF_DATAURLO}) |
526 |
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRS} ${CBF_DATAURLS}) |
527 |
--# |
528 |
--# Verify the checksums |
529 |
--# |
530 |
--file(GLOB CBF_DATADIRI_FILES "${CBF_DATADIRI}/*") |
531 |
--file(GLOB CBF_DATADIRO_FILES "${CBF_DATADIRO}/*") |
532 |
--foreach(loop_file ${CBF_DATADIRI_FILES} ) |
533 |
-- if (NOT "${loop_file}" MATCHES "[*.]md5") |
534 |
-- file(MD5 "${loop_file}" loop_file_md5) |
535 |
-- file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1) |
536 |
-- if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) |
537 |
-- message(WARNINH "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|") |
538 |
-- endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) |
539 |
-- endif (NOT "${loop_file}" MATCHES "[*.]md5") |
540 |
--endforeach(loop_file) |
541 |
--foreach(loop_file ${CBF_DATADIRO_FILES} ) |
542 |
-- if (NOT "${loop_file}" MATCHES "[*.]md5") |
543 |
-- file(MD5 "${loop_file}" loop_file_md5) |
544 |
-- file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1) |
545 |
-- if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) |
546 |
-- message(WARNING "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|") |
547 |
-- endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}")) |
548 |
-- endif (NOT "${loop_file}" MATCHES "[*.]md5") |
549 |
--endforeach(loop_file) |
550 |
- |
551 |
- |
552 |
- # |
553 |
-@@ -775,7 +710,7 @@ add_library(cbf_shared SHARED ${CBF_C_SOURCES}) |
554 |
- set_target_properties(cbf_shared PROPERTIES OUTPUT_NAME "cbf") |
555 |
- set_target_properties(cbf_shared PROPERTIES LINKER_LANGUAGE C) |
556 |
- set_target_properties(cbf_shared PROPERTIES SOVERSION "${CBF_APIVERSION}") |
557 |
--target_link_libraries(cbf_shared ${CBF_HDF5_LIBRARY_PATH}) |
558 |
-+target_link_libraries(cbf_shared hdf5) |
559 |
- |
560 |
- # |
561 |
- # Build the static and shared IMG libraries |
562 |
-@@ -791,7 +726,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib") |
563 |
- add_library(img_shared SHARED ${CBF__EXAMPLES}/img.c) |
564 |
- set_target_properties(img_shared PROPERTIES OUTPUT_NAME "img") |
565 |
- set_target_properties(img_shared PROPERTIES LINKER_LANGUAGE C) |
566 |
--target_link_libraries(img_shared ${CBF_HDF5_LIBRARY_PATH}) |
567 |
-+target_link_libraries(img_shared hdf5 m ) |
568 |
- |
569 |
- |
570 |
- # |
571 |
-@@ -829,26 +764,6 @@ target_link_libraries(fcb_shared ${CBF_HDF5_LIBRARY_PATH}) |
572 |
- # |
573 |
- # C and C++ examples |
574 |
- # |
575 |
--CBF_ADD_C_EXAMPLE(convert_image "${CBF__EXAMPLES}" "" "img_static") |
576 |
--CBF_ADD_C_EXAMPLE(convert_minicbf "${CBF__EXAMPLES}" "" "") |
577 |
--CBF_ADD_C_EXAMPLE(makecbf "${CBF__EXAMPLES}" "" "img_static") |
578 |
--CBF_ADD_C_EXAMPLE(adscimg2cbf "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/adscimg2cbf_sub.c" "") |
579 |
--CBF_ADD_C_EXAMPLE(cbf2adscimg "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/cbf2adscimg_sub.c" "") |
580 |
--CBF_ADD_C_EXAMPLE(cbf_tail "${CBF__EXAMPLES}" "" "") |
581 |
--CBF_ADD_C_EXAMPLE(changtestcompression "${CBF__EXAMPLES}" "" "") |
582 |
--CBF_ADD_C_EXAMPLE(img2cif "${CBF__EXAMPLES}" "" "img_static") |
583 |
--CBF_ADD_C_EXAMPLE(cif2cbf "${CBF__EXAMPLES}" "" "") |
584 |
--CBF_ADD_C_EXAMPLE(cbf2nexus "${CBF__EXAMPLES}" "" "") |
585 |
--CBF_ADD_C_EXAMPLE(minicbf2nexus "${CBF__EXAMPLES}" "" "") |
586 |
--CBF_ADD_C_EXAMPLE(cbf_template_t "${CBF__DECTRIS_EXAMPLES}" "" "") |
587 |
--CBF_ADD_CXX_EXAMPLE(testcell "${CBF__EXAMPLES}" "" "") |
588 |
--CBF_ADD_CXX_EXAMPLE(sauter_test "${CBF__EXAMPLES}" "" "") |
589 |
--CBF_ADD_C_EXAMPLE(sequence_match "${CBF__EXAMPLES}" "" "") |
590 |
--CBF_ADD_C_EXAMPLE(tiff2cbf "${CBF__EXAMPLES}" "${CBF__EXT_PKG}/${CBF_TIFF}/libtiff/tif_sprint.c" "${CBF_TIFF_LIBRARY_PATH}") |
591 |
--CBF_ADD_C_EXAMPLE(testulp "${CBF__EXAMPLES}" "" "") |
592 |
--CBF_ADD_C_EXAMPLE(testhdf5 "${CBF__EXAMPLES}" "" "") |
593 |
--CBF_ADD_C_EXAMPLE(testtree "${CBF__EXAMPLES}" "" "") |
594 |
--CBF_ADD_C_EXAMPLE(testalloc "${CBF__EXAMPLES}" "" "") |
595 |
- |
596 |
- |
597 |
- |
598 |
-@@ -876,26 +791,9 @@ target_link_libraries(test_xds_binary fcb_static) |
599 |
- # |
600 |
- # install |
601 |
- # |
602 |
--install (TARGETS makecbf DESTINATION bin) |
603 |
--install (TARGETS img2cif DESTINATION bin) |
604 |
--install (TARGETS cif2cbf DESTINATION bin) |
605 |
--install (TARGETS adscimg2cbf DESTINATION bin) |
606 |
--install (TARGETS cbf2adscimg DESTINATION bin) |
607 |
--install (TARGETS changtestcompression DESTINATION bin) |
608 |
--install (TARGETS convert_image DESTINATION bin) |
609 |
--install (TARGETS convert_minicbf DESTINATION bin) |
610 |
--install (TARGETS minicbf2nexus DESTINATION bin) |
611 |
--install (TARGETS cbf_template_t DESTINATION bin) |
612 |
--install (TARGETS testcell DESTINATION bin) |
613 |
--install (TARGETS sauter_test DESTINATION bin) |
614 |
--install (TARGETS sequence_match DESTINATION bin) |
615 |
--install (TARGETS tiff2cbf DESTINATION bin) |
616 |
--install (TARGETS cbf_static DESTINATION lib) |
617 |
--install (TARGETS cbf_shared DESTINATION lib) |
618 |
--install (TARGETS fcb_static DESTINATION lib) |
619 |
--install (TARGETS fcb_shared DESTINATION lib) |
620 |
--install (TARGETS img_static DESTINATION lib) |
621 |
--install (TARGETS img_shared DESTINATION lib) |
622 |
-+install (TARGETS cbf_shared DESTINATION lib${LIB_SUFFIX}) |
623 |
-+install (TARGETS fcb_shared DESTINATION lib${LIB_SUFFIX}) |
624 |
-+install (TARGETS img_shared DESTINATION lib${LIB_SUFFIX}) |
625 |
- install (DIRECTORY ${CBF__INCLUDE}/ DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h") |
626 |
- install (DIRECTORY ${CBF__BIN_INCLUDE}/* DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h") |
627 |
- |
628 |
-@@ -914,10 +812,6 @@ endif () |
629 |
- # |
630 |
- # tests -- to be extended |
631 |
- # |
632 |
--add_test(NAME cbftest_makecbf |
633 |
-- COMMAND ${CMAKE_COMMAND} |
634 |
-- -DCMD1=$<TARGET_FILE:makecbf> -DARG11=${CBF_DATADIRI}/example.mar2300 -DARG12=makecbf.cbf |
635 |
-- -P ${CMAKE_CURRENT_SOURCE_DIR}/runcommands.cmake) |
636 |
- add_test(cbftest_testalloc ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testalloc) |
637 |
- add_test(cbftest_testhdf5 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testhdf5) |
638 |
- add_test(cbftest_testtree ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testtree) |
639 |
|
640 |
diff --git a/sci-libs/cbflib/metadata.xml b/sci-libs/cbflib/metadata.xml |
641 |
deleted file mode 100644 |
642 |
index e0080f59068..00000000000 |
643 |
--- a/sci-libs/cbflib/metadata.xml |
644 |
+++ /dev/null |
645 |
@@ -1,22 +0,0 @@ |
646 |
-<?xml version="1.0" encoding="UTF-8"?> |
647 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
648 |
-<pkgmetadata> |
649 |
- <maintainer type="project"> |
650 |
- <email>sci@g.o</email> |
651 |
- <name>Gentoo Science Project</name> |
652 |
- </maintainer> |
653 |
- <longdescription> |
654 |
-CBFLIB is a library of ANSI-C functions providing a simple mechanism |
655 |
-for accessing Crystallographic Binary Files (CBF files) and Image-supporting |
656 |
-CIF (imgCIF) files. The CBFLIB API is loosely based on the CIFPARSE API for |
657 |
-mmCIF files. Starting with this release, CBFLIB performs validation checks |
658 |
-on reading of a CBF. If a dictionary is provided, values will be validated |
659 |
-against dictionary ranges and enumerations. Tags missing under parent-child |
660 |
-relationships or category key requirements will be reported. CBFlib provides |
661 |
-functions to create, read, modify and write CBF binary data files and imgCIF |
662 |
-ASCII data files. |
663 |
-</longdescription> |
664 |
- <upstream> |
665 |
- <remote-id type="sourceforge">cbflib</remote-id> |
666 |
- </upstream> |
667 |
-</pkgmetadata> |