Gentoo Archives: gentoo-commits

From: Sebastien Fabbro <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-astronomy/casacore/files/, sci-astronomy/casacore/
Date: Mon, 28 Nov 2011 21:35:45
Message-Id: 778d408c72355d49e844ed0ffa09819e1470456e.bicatali@gentoo
1 commit: 778d408c72355d49e844ed0ffa09819e1470456e
2 Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
3 AuthorDate: Sat Nov 26 04:48:20 2011 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 04:48:20 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=778d408c
7
8 casacore now in main tree
9
10 ---
11 sci-astronomy/casacore/ChangeLog | 10 -
12 .../casacore/casacore-1.2.20110516.ebuild | 50 -----
13 .../casacore/files/1.2.20110516-headers.patch | 22 ---
14 .../casacore/files/1.2.20110516-implicits.patch | 166 -----------------
15 .../casacore/files/1.2.20110516-libdir.patch | 196 --------------------
16 sci-astronomy/casacore/metadata.xml | 10 -
17 6 files changed, 0 insertions(+), 454 deletions(-)
18
19 diff --git a/sci-astronomy/casacore/ChangeLog b/sci-astronomy/casacore/ChangeLog
20 deleted file mode 100644
21 index 6ee2a43..0000000
22 --- a/sci-astronomy/casacore/ChangeLog
23 +++ /dev/null
24 @@ -1,10 +0,0 @@
25 -# ChangeLog for sci-astronomy/casacore
26 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: $
28 -
29 - 04 Aug 2011; Sébastien Fabbro <bicatali@g.o> metadata.xml:
30 - Switched herd to sci-astronomy
31 -
32 - 24 Jun 2011; Justin Lecher <jlec@g.o> casacore-1.2.20110516.ebuild:
33 - Sort inherit and/or USE
34 -
35
36 diff --git a/sci-astronomy/casacore/casacore-1.2.20110516.ebuild b/sci-astronomy/casacore/casacore-1.2.20110516.ebuild
37 deleted file mode 100644
38 index c535e95..0000000
39 --- a/sci-astronomy/casacore/casacore-1.2.20110516.ebuild
40 +++ /dev/null
41 @@ -1,50 +0,0 @@
42 -# Copyright 1999-2011 Gentoo Foundation
43 -# Distributed under the terms of the GNU General Public License v2
44 -# $Header: $
45 -
46 -EAPI=4
47 -
48 -inherit cmake-utils eutils
49 -
50 -DESCRIPTION="Core libraries for the Common Astronomy Software Applications"
51 -HOMEPAGE="http://code.google.com/p/casacore/"
52 -SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
53 -
54 -LICENSE="GPL-2"
55 -KEYWORDS="~amd64 ~x86"
56 -SLOT="0"
57 -IUSE="doc fftw hdf5 test"
58 -
59 -RDEPEND="sci-libs/cfitsio
60 - sci-astronomy/wcslib
61 - virtual/blas
62 - virtual/lapack
63 - sys-libs/readline
64 - hdf5? ( sci-libs/hdf5 )
65 - fftw? ( >=sci-libs/fftw-3 )"
66 -DEPEND="${RDEPEND}
67 - dev-util/pkgconfig
68 - doc? ( app-doc/doxygen )"
69 -
70 -PATCHES=( "${FILESDIR}"/${PV}-{headers,implicits,libdir}.patch )
71 -
72 -src_configure() {
73 - has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
74 - mycmakeargs+=(
75 - -DENABLE_SHARED=YES
76 - $(cmake-utils_use_build test TESTING)
77 - $(cmake-utils_use_use hdf5 HDF5)
78 - $(cmake-utils_use_use fftw FFTW3)
79 - )
80 - cmake-utils_src_configure
81 -}
82 -
83 -src_compile() {
84 - cmake-utils_src_compile
85 - use doc && doxygen doxygen.cfg
86 -}
87 -
88 -src_install(){
89 - cmake-utils_src_compile
90 - use doc && dohtml -r doc/html
91 -}
92
93 diff --git a/sci-astronomy/casacore/files/1.2.20110516-headers.patch b/sci-astronomy/casacore/files/1.2.20110516-headers.patch
94 deleted file mode 100644
95 index 21cc86f..0000000
96 --- a/sci-astronomy/casacore/files/1.2.20110516-headers.patch
97 +++ /dev/null
98 @@ -1,22 +0,0 @@
99 -diff -Nur casacore-1.2.20110516.orig/casa/Arrays/IPosition.h casacore-1.2.20110516/casa/Arrays/IPosition.h
100 ---- casacore-1.2.20110516.orig/casa/Arrays/IPosition.h 2011-05-17 06:03:06.000000000 +0100
101 -+++ casacore-1.2.20110516/casa/Arrays/IPosition.h 2011-05-17 06:04:15.000000000 +0100
102 -@@ -33,6 +33,7 @@
103 - #include <casa/iosfwd.h>
104 - #include <casa/BasicSL/String.h>
105 - #include <vector>
106 -+#include <cstddef>
107 - #include <unistd.h>
108 -
109 - namespace casa { //# NAMESPACE CASA - BEGIN
110 -diff -Nur casacore-1.2.20110516.orig/casa/Containers/Block.h casacore-1.2.20110516/casa/Containers/Block.h
111 ---- casacore-1.2.20110516.orig/casa/Containers/Block.h 2011-05-17 06:03:05.000000000 +0100
112 -+++ casacore-1.2.20110516/casa/Containers/Block.h 2011-05-17 06:05:55.000000000 +0100
113 -@@ -28,6 +28,7 @@
114 - #ifndef CASA_BLOCK_H
115 - #define CASA_BLOCK_H
116 -
117 -+#include <cstddef>
118 - #include <casa/aips.h>
119 - ///#include <casa/Containers/BlockIO.h>
120 - #include <casa/Utilities/Copy.h>
121
122 diff --git a/sci-astronomy/casacore/files/1.2.20110516-implicits.patch b/sci-astronomy/casacore/files/1.2.20110516-implicits.patch
123 deleted file mode 100644
124 index 697b1ce..0000000
125 --- a/sci-astronomy/casacore/files/1.2.20110516-implicits.patch
126 +++ /dev/null
127 @@ -1,166 +0,0 @@
128 -diff -Nur casacore-1.2.20110516.orig/casa/HDF5/HDF5DataSet.cc casacore-1.2.20110516/casa/HDF5/HDF5DataSet.cc
129 ---- casacore-1.2.20110516.orig/casa/HDF5/HDF5DataSet.cc 2011-05-16 02:24:06.000000000 +0100
130 -+++ casacore-1.2.20110516/casa/HDF5/HDF5DataSet.cc 2011-05-16 17:29:12.000000000 +0100
131 -@@ -174,7 +174,7 @@
132 - H5Pset_chunk(itsPLid, rank, cs.storage());
133 - // Create the data set.
134 - setHid (H5Dcreate(parentHid, name.chars(), itsDataType.getHidFile(),
135 -- itsDSid, NULL, itsPLid, NULL));
136 -+ itsDSid, 0, itsPLid, 0));
137 - if (! isValid()) {
138 - throw HDF5Error("Data set array " + name + " could not be created");
139 - }
140 -@@ -185,7 +185,7 @@
141 - itsParent = &parentHid;
142 - setName (name);
143 - // Open the dataset.
144 -- setHid (H5Dopen(parentHid, name.chars(), NULL));
145 -+ setHid (H5Dopen(parentHid, name.chars(), 0));
146 - if (! isValid()) {
147 - throw HDF5Error("Data set array " + name + " does not exist");
148 - }
149 -@@ -271,7 +271,7 @@
150 -
151 - DataType HDF5DataSet::getDataType (hid_t parentHid, const String& name)
152 - {
153 -- hid_t id = H5Dopen(parentHid, name.chars(), NULL);
154 -+ hid_t id = H5Dopen(parentHid, name.chars(), 0);
155 - if (id < 0) {
156 - throw HDF5Error("Data set array " + name + " does not exist");
157 - }
158 -diff -Nur casacore-1.2.20110516.orig/casa/HDF5/test/tHDF5.cc casacore-1.2.20110516/casa/HDF5/test/tHDF5.cc
159 ---- casacore-1.2.20110516.orig/casa/HDF5/test/tHDF5.cc 2011-05-16 02:24:06.000000000 +0100
160 -+++ casacore-1.2.20110516/casa/HDF5/test/tHDF5.cc 2011-05-16 17:29:12.000000000 +0100
161 -@@ -126,7 +126,7 @@
162 - H5Pset_chunk (plId, rank, chunkShp);
163 - // Create the data set.
164 - setId = H5Dcreate (fileId, "dataset", typeIdFile,
165 -- dsId, NULL, plId, NULL);
166 -+ dsId, 0, plId, 0);
167 - check (setId, "Failed to create dataset");
168 - }
169 -
170 -@@ -136,7 +136,7 @@
171 - typeIdFile = H5Tcopy (H5T_NATIVE_FLOAT);
172 - typeIdMem = H5Tcopy (typeIdFile);
173 - // Open the dataset.
174 -- setId = H5Dopen (fileId, "dataset", NULL);
175 -+ setId = H5Dopen (fileId, "dataset", 0);
176 - check (setId, "Failed to open dataset");
177 - // Get the data space (for the shape).
178 - dsId = H5Dget_space(setId);
179 -diff -Nur casacore-1.2.20110516.orig/mirlib/bug.c casacore-1.2.20110516/mirlib/bug.c
180 ---- casacore-1.2.20110516.orig/mirlib/bug.c 2011-05-16 02:24:06.000000000 +0100
181 -+++ casacore-1.2.20110516/mirlib/bug.c 2011-05-16 17:29:12.000000000 +0100
182 -@@ -12,6 +12,7 @@
183 - #include <stdio.h>
184 - #include <stdlib.h>
185 - #include <string.h>
186 -+void habort_c();
187 -
188 - static char *errmsg_c();
189 - void bug_c();
190 -diff -Nur casacore-1.2.20110516.orig/mirlib/dio.c casacore-1.2.20110516/mirlib/dio.c
191 ---- casacore-1.2.20110516.orig/mirlib/dio.c 2011-05-16 02:24:06.000000000 +0100
192 -+++ casacore-1.2.20110516/mirlib/dio.c 2011-05-16 17:29:12.000000000 +0100
193 -@@ -45,6 +45,7 @@
194 - extern int errno;
195 - #endif
196 - #include <errno.h>
197 -+void bug_c();
198 -
199 - #define MAXPATH 128
200 -
201 -diff -Nur casacore-1.2.20110516.orig/mirlib/hio.c casacore-1.2.20110516/mirlib/hio.c
202 ---- casacore-1.2.20110516.orig/mirlib/hio.c 2011-05-16 02:24:06.000000000 +0100
203 -+++ casacore-1.2.20110516/mirlib/hio.c 2011-05-16 17:29:12.000000000 +0100
204 -@@ -36,7 +36,7 @@
205 -
206 - #include <stdlib.h>
207 - #include <string.h>
208 --
209 -+#include "sysdep.h"
210 - #include "hio.h"
211 -
212 - #define private static
213 -diff -Nur casacore-1.2.20110516.orig/mirlib/maskio.c casacore-1.2.20110516/mirlib/maskio.c
214 ---- casacore-1.2.20110516.orig/mirlib/maskio.c 2011-05-16 02:24:06.000000000 +0100
215 -+++ casacore-1.2.20110516/mirlib/maskio.c 2011-05-16 17:29:12.000000000 +0100
216 -@@ -25,7 +25,8 @@
217 - #include <stdio.h>
218 - #include <stdlib.h>
219 - #include <string.h>
220 --
221 -+void bug_c();
222 -+void bugno_c();
223 -
224 - private void mkfill();
225 - void mkflush_c();
226 -diff -Nur casacore-1.2.20110516.orig/mirlib/scrio.c casacore-1.2.20110516/mirlib/scrio.c
227 ---- casacore-1.2.20110516.orig/mirlib/scrio.c 2011-05-16 02:24:06.000000000 +0100
228 -+++ casacore-1.2.20110516/mirlib/scrio.c 2011-05-16 17:29:12.000000000 +0100
229 -@@ -9,6 +9,8 @@
230 - /************************************************************************/
231 -
232 - #include "io.h"
233 -+void bug_c();
234 -+void bugno_c();
235 -
236 - /* char *sprintf(); */
237 - #include <stdio.h>
238 -@@ -100,7 +102,7 @@
239 - /************************************************************************/
240 - void scrwrite_c(handle,buffer,offset,length)
241 - int handle,offset,length;
242 --float *buffer;
243 -+Const float *buffer;
244 - /**scrwrite -- Write real data to the scratch file. */
245 - /*:scratch-i/o */
246 - /*+ FORTRAN call sequence:
247 -diff -Nur casacore-1.2.20110516.orig/mirlib/sysdep.h casacore-1.2.20110516/mirlib/sysdep.h
248 ---- casacore-1.2.20110516.orig/mirlib/sysdep.h 2011-05-16 02:24:06.000000000 +0100
249 -+++ casacore-1.2.20110516/mirlib/sysdep.h 2011-05-16 17:41:07.000000000 +0100
250 -@@ -131,5 +131,13 @@
251 - # define unpackd_c(a,b,c) memcpy((char *)(b),(a),sizeof(double)*(c))
252 - # define pack32_c(a,b,c) memcpy((b),(char *)(a),sizeof(int)*(c))
253 - # define unpack32_c(a,b,c) memcpy((char *)(b),(a),sizeof(int)*(c))
254 -+#else
255 -+void pack32_c(int* in, char* out, int n);
256 -+void unpack32_c(char* in, int* out,int n);
257 -+void packr_c(float* in, char* out, int n);
258 -+void unpackr_c(char* in, float* out, int n);
259 -+void packd_c(double* in, char* out, int n);
260 -+void unpackd_c(char* in, double* out, int n);
261 - #endif
262 -+
263 - #endif
264 -diff -Nur casacore-1.2.20110516.orig/mirlib/xyio.c casacore-1.2.20110516/mirlib/xyio.c
265 ---- casacore-1.2.20110516.orig/mirlib/xyio.c 2011-05-16 02:24:06.000000000 +0100
266 -+++ casacore-1.2.20110516/mirlib/xyio.c 2011-05-16 17:29:12.000000000 +0100
267 -@@ -37,7 +37,7 @@
268 - #define Strcpy (void)strcpy
269 - void bug_c(),bugno_c();
270 - void rdhdi_c(),wrhdi_c();
271 --void mkclose_c(),mkwrite_c();
272 -+void mkclose_c(),mkwrite_c(),mkflush_c();
273 - char *mkopen_c();
274 - int mkread_c();
275 - static void xymkopen_c();
276 -diff -Nur casacore-1.2.20110516.orig/mirlib/xyzio.c casacore-1.2.20110516/mirlib/xyzio.c
277 ---- casacore-1.2.20110516.orig/mirlib/xyzio.c 2011-05-16 02:24:06.000000000 +0100
278 -+++ casacore-1.2.20110516/mirlib/xyzio.c 2011-05-16 17:29:12.000000000 +0100
279 -@@ -55,6 +55,14 @@
280 - #include <string.h>
281 - #include <stdlib.h>
282 - void bug_c();
283 -+void bugno_c();
284 -+char *mkopen_c(int tno, char* name, char* status);
285 -+void mkclose_c(char *handle);
286 -+int mkread_c(char* handle, int mode, int* flags, int offset, int n, int nsize);
287 -+void mkwrite_c(char* handle, int mode, int* flags, int offset, int n, int nsize);
288 -+void mkflush_c(char* handle);
289 -+int limprint(char *string, int lower[], int upper[]);
290 -+int ferr(char* string, char arg );
291 - #define check(x) if(x)bugno_c('f',x)
292 -
293 -
294
295 diff --git a/sci-astronomy/casacore/files/1.2.20110516-libdir.patch b/sci-astronomy/casacore/files/1.2.20110516-libdir.patch
296 deleted file mode 100644
297 index 1410aae..0000000
298 --- a/sci-astronomy/casacore/files/1.2.20110516-libdir.patch
299 +++ /dev/null
300 @@ -1,196 +0,0 @@
301 -diff -Nur casacore-1.2.20110516.orig/casa/CMakeLists.txt casacore-1.2.20110516/casa/CMakeLists.txt
302 ---- casacore-1.2.20110516.orig/casa/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
303 -+++ casacore-1.2.20110516/casa/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
304 -@@ -209,8 +209,8 @@
305 -
306 - install (
307 - TARGETS casa_casa
308 --LIBRARY DESTINATION lib
309 --ARCHIVE DESTINATION lib
310 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
311 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
312 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
313 - )
314 -
315 -diff -Nur casacore-1.2.20110516.orig/components/CMakeLists.txt casacore-1.2.20110516/components/CMakeLists.txt
316 ---- casacore-1.2.20110516.orig/components/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
317 -+++ casacore-1.2.20110516/components/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
318 -@@ -30,8 +30,8 @@
319 - install (
320 - TARGETS casa_components
321 - RUNTIME DESTINATION bin
322 --LIBRARY DESTINATION lib
323 --ARCHIVE DESTINATION lib
324 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
325 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
326 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
327 - )
328 -
329 -diff -Nur casacore-1.2.20110516.orig/coordinates/CMakeLists.txt casacore-1.2.20110516/coordinates/CMakeLists.txt
330 ---- casacore-1.2.20110516.orig/coordinates/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
331 -+++ casacore-1.2.20110516/coordinates/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
332 -@@ -25,8 +25,8 @@
333 -
334 - install (TARGETS casa_coordinates
335 - RUNTIME DESTINATION bin
336 --LIBRARY DESTINATION lib
337 --ARCHIVE DESTINATION lib
338 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
339 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
340 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
341 - )
342 -
343 -diff -Nur casacore-1.2.20110516.orig/derivedmscal/CMakeLists.txt casacore-1.2.20110516/derivedmscal/CMakeLists.txt
344 ---- casacore-1.2.20110516.orig/derivedmscal/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
345 -+++ casacore-1.2.20110516/derivedmscal/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
346 -@@ -14,8 +14,8 @@
347 -
348 - install (TARGETS casa_derivedmscal
349 - RUNTIME DESTINATION bin
350 --LIBRARY DESTINATION lib
351 --ARCHIVE DESTINATION lib
352 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
353 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
354 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
355 - )
356 -
357 -diff -Nur casacore-1.2.20110516.orig/fits/CMakeLists.txt casacore-1.2.20110516/fits/CMakeLists.txt
358 ---- casacore-1.2.20110516.orig/fits/CMakeLists.txt 2011-05-17 06:03:05.000000000 +0100
359 -+++ casacore-1.2.20110516/fits/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
360 -@@ -34,8 +34,8 @@
361 -
362 - install (TARGETS casa_fits
363 - RUNTIME DESTINATION bin
364 --LIBRARY DESTINATION lib
365 --ARCHIVE DESTINATION lib
366 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
367 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
368 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
369 - )
370 -
371 -diff -Nur casacore-1.2.20110516.orig/images/CMakeLists.txt casacore-1.2.20110516/images/CMakeLists.txt
372 ---- casacore-1.2.20110516.orig/images/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
373 -+++ casacore-1.2.20110516/images/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
374 -@@ -71,8 +71,8 @@
375 - install (
376 - TARGETS casa_images
377 - RUNTIME DESTINATION bin
378 --LIBRARY DESTINATION lib
379 --ARCHIVE DESTINATION lib
380 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
381 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
382 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
383 - )
384 -
385 -diff -Nur casacore-1.2.20110516.orig/lattices/CMakeLists.txt casacore-1.2.20110516/lattices/CMakeLists.txt
386 ---- casacore-1.2.20110516.orig/lattices/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
387 -+++ casacore-1.2.20110516/lattices/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
388 -@@ -67,8 +67,8 @@
389 -
390 - install (TARGETS casa_lattices
391 - RUNTIME DESTINATION bin
392 --LIBRARY DESTINATION lib
393 --ARCHIVE DESTINATION lib
394 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
395 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
396 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
397 - )
398 -
399 -diff -Nur casacore-1.2.20110516.orig/measures/CMakeLists.txt casacore-1.2.20110516/measures/CMakeLists.txt
400 ---- casacore-1.2.20110516.orig/measures/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
401 -+++ casacore-1.2.20110516/measures/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
402 -@@ -69,8 +69,8 @@
403 - install (
404 - TARGETS casa_measures
405 - RUNTIME DESTINATION bin
406 --LIBRARY DESTINATION lib
407 --ARCHIVE DESTINATION lib
408 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
409 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
410 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
411 - )
412 -
413 -diff -Nur casacore-1.2.20110516.orig/mirlib/CMakeLists.txt casacore-1.2.20110516/mirlib/CMakeLists.txt
414 ---- casacore-1.2.20110516.orig/mirlib/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
415 -+++ casacore-1.2.20110516/mirlib/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
416 -@@ -22,8 +22,8 @@
417 - install (
418 - TARGETS casa_mirlib
419 - RUNTIME DESTINATION bin
420 --LIBRARY DESTINATION lib
421 --ARCHIVE DESTINATION lib
422 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
423 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
424 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
425 - )
426 -
427 -diff -Nur casacore-1.2.20110516.orig/ms/CMakeLists.txt casacore-1.2.20110516/ms/CMakeLists.txt
428 ---- casacore-1.2.20110516.orig/ms/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
429 -+++ casacore-1.2.20110516/ms/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
430 -@@ -148,8 +148,8 @@
431 -
432 - install (TARGETS casa_ms
433 - RUNTIME DESTINATION bin
434 --LIBRARY DESTINATION lib
435 --ARCHIVE DESTINATION lib
436 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
437 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
438 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
439 - )
440 -
441 -diff -Nur casacore-1.2.20110516.orig/msfits/CMakeLists.txt casacore-1.2.20110516/msfits/CMakeLists.txt
442 ---- casacore-1.2.20110516.orig/msfits/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
443 -+++ casacore-1.2.20110516/msfits/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
444 -@@ -29,8 +29,8 @@
445 -
446 - install (
447 - TARGETS casa_msfits
448 --LIBRARY DESTINATION lib
449 --ARCHIVE DESTINATION lib
450 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
451 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
452 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
453 - )
454 -
455 -diff -Nur casacore-1.2.20110516.orig/scimath/CMakeLists.txt casacore-1.2.20110516/scimath/CMakeLists.txt
456 ---- casacore-1.2.20110516.orig/scimath/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
457 -+++ casacore-1.2.20110516/scimath/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
458 -@@ -38,8 +38,8 @@
459 -
460 - install (TARGETS casa_scimath
461 - RUNTIME DESTINATION bin
462 --LIBRARY DESTINATION lib
463 --ARCHIVE DESTINATION lib
464 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
465 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
466 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
467 - )
468 -
469 -diff -Nur casacore-1.2.20110516.orig/scimath_f/CMakeLists.txt casacore-1.2.20110516/scimath_f/CMakeLists.txt
470 ---- casacore-1.2.20110516.orig/scimath_f/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
471 -+++ casacore-1.2.20110516/scimath_f/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
472 -@@ -34,8 +34,8 @@
473 -
474 - install (
475 - TARGETS casa_scimath_f
476 --LIBRARY DESTINATION lib
477 --ARCHIVE DESTINATION lib
478 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
479 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
480 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
481 - )
482 -
483 -diff -Nur casacore-1.2.20110516.orig/tables/CMakeLists.txt casacore-1.2.20110516/tables/CMakeLists.txt
484 ---- casacore-1.2.20110516.orig/tables/CMakeLists.txt 2011-05-17 06:03:06.000000000 +0100
485 -+++ casacore-1.2.20110516/tables/CMakeLists.txt 2011-05-17 06:27:00.000000000 +0100
486 -@@ -181,8 +181,8 @@
487 -
488 - install (TARGETS casa_tables
489 - RUNTIME DESTINATION bin
490 --LIBRARY DESTINATION lib
491 --ARCHIVE DESTINATION lib
492 -+LIBRARY DESTINATION lib${LIB_SUFFIX}
493 -+ARCHIVE DESTINATION lib${LIB_SUFFIX}
494 - LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
495 - )
496 -
497
498 diff --git a/sci-astronomy/casacore/metadata.xml b/sci-astronomy/casacore/metadata.xml
499 deleted file mode 100644
500 index 0aaf75c..0000000
501 --- a/sci-astronomy/casacore/metadata.xml
502 +++ /dev/null
503 @@ -1,10 +0,0 @@
504 -<?xml version="1.0" encoding="UTF-8"?>
505 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
506 -<pkgmetadata>
507 -<herd>sci-astronomy</herd>
508 -<longdescription lang="en">
509 - A set of libraries for the the Common Astronomy Software
510 - Applications for radioastronomy. This project contains C++ libraries
511 - which were the code of the discontinued AIPS++ package.
512 -</longdescription>
513 -</pkgmetadata>