1 |
commit: 663b10561af76c1fcbe754c6b594e5ec3f4fb259 |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 2 16:22:32 2017 +0000 |
4 |
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
5 |
CommitDate: Mon Jan 2 16:22:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=663b1056 |
7 |
|
8 |
removed packages in main tree |
9 |
|
10 |
dev-libs/beignet/beignet-1.2.0.ebuild | 96 --- |
11 |
.../beignet/files/llvm-empty-system-libs.patch | 11 - |
12 |
dev-libs/beignet/files/llvm-terminfo.patch | 20 - |
13 |
dev-libs/beignet/files/no-debian-multiarch.patch | 39 - |
14 |
dev-libs/beignet/files/no-hardcoded-cflags.patch | 13 - |
15 |
dev-libs/beignet/metadata.xml | 8 - |
16 |
.../files/superlu_mt-2.1-duplicate-symbols.patch | 900 --------------------- |
17 |
.../files/superlu_mt-2.1-missing-includes.patch | 44 - |
18 |
sci-libs/superlu_mt/metadata.xml | 26 - |
19 |
sci-libs/superlu_mt/superlu_mt-2.1.ebuild | 110 --- |
20 |
sci-misc/fitscut/fitscut-1.4.4.ebuild | 39 - |
21 |
sci-misc/fitscut/metadata.xml | 14 - |
22 |
.../herwig++/files/herwig++-2.6.3-looptools.patch | 64 -- |
23 |
sci-physics/herwig++/herwig++-2.7.0-r2.ebuild | 57 -- |
24 |
sci-physics/herwig++/metadata.xml | 23 - |
25 |
.../looptools/files/looptools-2.10-makefile.patch | 98 --- |
26 |
.../looptools/files/looptools-2.8-makefile.patch | 96 --- |
27 |
sci-physics/looptools/looptools-2.10.ebuild | 39 - |
28 |
sci-physics/looptools/looptools-2.11.ebuild | 39 - |
29 |
sci-physics/looptools/looptools-2.9.ebuild | 39 - |
30 |
sci-physics/looptools/metadata.xml | 15 - |
31 |
sci-physics/rivet/metadata.xml | 19 - |
32 |
sci-physics/rivet/rivet-2.1.1.ebuild | 62 -- |
33 |
sci-physics/rivet/rivet-2.1.2.ebuild | 62 -- |
34 |
sci-physics/yoda/metadata.xml | 18 - |
35 |
sci-physics/yoda/yoda-1.0.6.ebuild | 50 -- |
36 |
26 files changed, 2001 deletions(-) |
37 |
|
38 |
diff --git a/dev-libs/beignet/beignet-1.2.0.ebuild b/dev-libs/beignet/beignet-1.2.0.ebuild |
39 |
deleted file mode 100644 |
40 |
index 8d42db8..0000000 |
41 |
--- a/dev-libs/beignet/beignet-1.2.0.ebuild |
42 |
+++ /dev/null |
43 |
@@ -1,96 +0,0 @@ |
44 |
-# Copyright 1999-2016 Gentoo Foundation |
45 |
-# Distributed under the terms of the GNU General Public License v2 |
46 |
-# $Id$ |
47 |
- |
48 |
-EAPI=6 |
49 |
- |
50 |
-PYTHON_COMPAT=( python2_7 ) |
51 |
-CMAKE_BUILD_TYPE="Release" |
52 |
- |
53 |
-inherit python-any-r1 cmake-multilib toolchain-funcs |
54 |
- |
55 |
-DESCRIPTION="OpenCL implementation for Intel GPUs" |
56 |
-HOMEPAGE="https://01.org/beignet" |
57 |
- |
58 |
-LICENSE="LGPL-2.1+" |
59 |
-SLOT="0" |
60 |
- |
61 |
-if [[ "${PV}" == "9999" ]]; then |
62 |
- inherit git-r3 |
63 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/beignet" |
64 |
- KEYWORDS="" |
65 |
-else |
66 |
- KEYWORDS="~amd64" |
67 |
- SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" |
68 |
- S=${WORKDIR}/Beignet-${PV}-Source |
69 |
-fi |
70 |
- |
71 |
-COMMON="${PYTHON_DEPS} |
72 |
- media-libs/mesa |
73 |
- sys-devel/clang |
74 |
- >=sys-devel/llvm-3.5 |
75 |
- x11-libs/libdrm[video_cards_intel] |
76 |
- x11-libs/libXext |
77 |
- x11-libs/libXfixes" |
78 |
-RDEPEND="${COMMON} |
79 |
- app-eselect/eselect-opencl" |
80 |
-DEPEND="${COMMON} |
81 |
- virtual/pkgconfig" |
82 |
- |
83 |
-PATCHES=( |
84 |
- "${FILESDIR}"/no-debian-multiarch.patch |
85 |
- "${FILESDIR}"/no-hardcoded-cflags.patch |
86 |
- "${FILESDIR}"/llvm-terminfo.patch |
87 |
- "${FILESDIR}"/llvm-empty-system-libs.patch |
88 |
-) |
89 |
- |
90 |
-DOCS=( |
91 |
- docs/. |
92 |
-) |
93 |
- |
94 |
-pkg_pretend() { |
95 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
96 |
- if tc-is-gcc; then |
97 |
- if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then |
98 |
- eerror "Compilation with gcc older than 4.6 is not supported" |
99 |
- die "Too old gcc found." |
100 |
- fi |
101 |
- fi |
102 |
- fi |
103 |
-} |
104 |
- |
105 |
-pkg_setup() { |
106 |
- python_setup |
107 |
-} |
108 |
- |
109 |
-src_prepare() { |
110 |
- cmake-utils_src_prepare |
111 |
- # We cannot run tests because they require permissions to access |
112 |
- # the hardware, and building them is very time-consuming. |
113 |
- cmake_comment_add_subdirectory utests |
114 |
-} |
115 |
- |
116 |
-multilib_src_configure() { |
117 |
- VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" |
118 |
- |
119 |
- local mycmakeargs=( |
120 |
- -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" |
121 |
- ) |
122 |
- |
123 |
- cmake-utils_src_configure |
124 |
-} |
125 |
- |
126 |
-multilib_src_install() { |
127 |
- VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" |
128 |
- |
129 |
- cmake-utils_src_install |
130 |
- |
131 |
- insinto /etc/OpenCL/vendors/ |
132 |
- echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" |
133 |
- doins "${PN}-${ABI}.icd" |
134 |
- |
135 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 |
136 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so |
137 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 |
138 |
- dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so |
139 |
-} |
140 |
|
141 |
diff --git a/dev-libs/beignet/files/llvm-empty-system-libs.patch b/dev-libs/beignet/files/llvm-empty-system-libs.patch |
142 |
deleted file mode 100644 |
143 |
index d5e0cd7..0000000 |
144 |
--- a/dev-libs/beignet/files/llvm-empty-system-libs.patch |
145 |
+++ /dev/null |
146 |
@@ -1,11 +0,0 @@ |
147 |
---- a/CMake/FindLLVM.cmake 2015-12-18 06:39:59.000000000 +0000 |
148 |
-+++ b/CMake/FindLLVM.cmake 2016-08-31 15:05:11.210679204 +0000 |
149 |
-@@ -99,7 +99,7 @@ |
150 |
- OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_ORIG |
151 |
- OUTPUT_STRIP_TRAILING_WHITESPACE |
152 |
- ) |
153 |
--string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS_ORIG}) |
154 |
-+string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_ORIG}") |
155 |
- endif (LLVM_VERSION_NODOT VERSION_GREATER 34) |
156 |
- |
157 |
- macro(add_one_lib name) |
158 |
|
159 |
diff --git a/dev-libs/beignet/files/llvm-terminfo.patch b/dev-libs/beignet/files/llvm-terminfo.patch |
160 |
deleted file mode 100644 |
161 |
index afbbc26..0000000 |
162 |
--- a/dev-libs/beignet/files/llvm-terminfo.patch |
163 |
+++ /dev/null |
164 |
@@ -1,20 +0,0 @@ |
165 |
---- a/backend/src/CMakeLists.txt 2015-12-18 07:40:03.000000000 +0100 |
166 |
-+++ b/backend/src/CMakeLists.txt 2016-08-01 13:44:31.475875150 +0200 |
167 |
-@@ -153,7 +153,7 @@ |
168 |
- |
169 |
- add_library(gbeinterp SHARED gbe_bin_interpreter.cpp) |
170 |
- |
171 |
--if (LLVM_VERSION_NODOT VERSION_EQUAL 34) |
172 |
-+if (NOT (LLVM_VERSION_NODOT LESS 34)) |
173 |
- find_library(TERMINFO NAMES tinfo ncurses) |
174 |
- if (${TERMINFO} STREQUAL TERMINFO-NOTFOUND) |
175 |
- message(FATAL_ERROR "no libtinfo or libncurses is found in system") |
176 |
-@@ -161,7 +161,7 @@ |
177 |
- target_link_libraries(gbe ${TERMINFO}) |
178 |
- message(STATUS "use ${TERMINFO} as terminal control library") |
179 |
- endif (${TERMINFO} STREQUAL TERMINFO-NOTFOUND) |
180 |
--endif(LLVM_VERSION_NODOT VERSION_EQUAL 34) |
181 |
-+endif(NOT (LLVM_VERSION_NODOT LESS 34)) |
182 |
- |
183 |
- link_directories (${LLVM_LIBRARY_DIR} ${DRM_LIBDIR}) |
184 |
- |
185 |
|
186 |
diff --git a/dev-libs/beignet/files/no-debian-multiarch.patch b/dev-libs/beignet/files/no-debian-multiarch.patch |
187 |
deleted file mode 100644 |
188 |
index c9aef4d..0000000 |
189 |
--- a/dev-libs/beignet/files/no-debian-multiarch.patch |
190 |
+++ /dev/null |
191 |
@@ -1,39 +0,0 @@ |
192 |
---- a/CMakeLists.txt 2015-04-17 04:27:51.000000000 +0200 |
193 |
-+++ b/CMakeLists.txt 2015-05-20 20:59:17.895041760 +0200 |
194 |
-@@ -39,14 +39,9 @@ |
195 |
- |
196 |
- SET(CMAKE_VERBOSE_MAKEFILE "false") |
197 |
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") |
198 |
--INCLUDE (GNUInstallDirs OPTIONAL) |
199 |
--# support old CMake without GNUInstallDirs |
200 |
--if (NOT CMAKE_INSTALL_FULL_LIBDIR) |
201 |
-- set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") |
202 |
-- set (BEIGNET_LIBRARY_ARCHITECTURE "") |
203 |
--else (NOT CMAKE_INSTALL_FULL_LIBDIR) |
204 |
-- set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}") |
205 |
--endif (NOT CMAKE_INSTALL_FULL_LIBDIR) |
206 |
-+ |
207 |
-+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") |
208 |
-+set (BEIGNET_LIBRARY_ARCHITECTURE "") |
209 |
- |
210 |
- if (NOT LIB_INSTALL_DIR) |
211 |
- set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") |
212 |
-@@ -55,17 +50,7 @@ |
213 |
- set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/") |
214 |
- endif (NOT BEIGNET_INSTALL_DIR) |
215 |
- |
216 |
--# allow co-installation of 32- and 64-bit versions: |
217 |
--# https://wiki.debian.org/Multiarch |
218 |
--if (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") |
219 |
-- set (ICD_FILE_NAME "intel-beignet.icd") |
220 |
--else (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") |
221 |
-- if (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") |
222 |
-- set (ICD_FILE_NAME "intel-beignet.icd") |
223 |
-- else (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") |
224 |
-- set (ICD_FILE_NAME "intel-beignet-${BEIGNET_LIBRARY_ARCHITECTURE}.icd") |
225 |
-- endif (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") |
226 |
--endif (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") |
227 |
-+set (ICD_FILE_NAME "intel-beignet.icd") |
228 |
- |
229 |
- # Force Release with debug info |
230 |
- if (NOT CMAKE_BUILD_TYPE) |
231 |
|
232 |
diff --git a/dev-libs/beignet/files/no-hardcoded-cflags.patch b/dev-libs/beignet/files/no-hardcoded-cflags.patch |
233 |
deleted file mode 100644 |
234 |
index 3dd67b7..0000000 |
235 |
--- a/dev-libs/beignet/files/no-hardcoded-cflags.patch |
236 |
+++ /dev/null |
237 |
@@ -1,13 +0,0 @@ |
238 |
---- a/CMakeLists.txt 2016-08-31 17:13:26.000000000 +0000 |
239 |
-+++ b/CMakeLists.txt 2016-08-31 17:00:40.000000000 +0000 |
240 |
-@@ -70,8 +70,8 @@ |
241 |
- elseif (COMPILER STREQUAL "ICC") |
242 |
- set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -wd2928 -Wall -fPIC -fstrict-aliasing -fp-model fast -msse4.1 -Wl,-E") |
243 |
- endif () |
244 |
--set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof") |
245 |
--set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}") |
246 |
-+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof") |
247 |
-+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") |
248 |
- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DGBE_DEBUG=1") |
249 |
- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1") |
250 |
- set (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0") |
251 |
|
252 |
diff --git a/dev-libs/beignet/metadata.xml b/dev-libs/beignet/metadata.xml |
253 |
deleted file mode 100644 |
254 |
index 3e5026e..0000000 |
255 |
--- a/dev-libs/beignet/metadata.xml |
256 |
+++ /dev/null |
257 |
@@ -1,8 +0,0 @@ |
258 |
-<?xml version="1.0" encoding="UTF-8"?> |
259 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
260 |
-<pkgmetadata> |
261 |
- <maintainer type="person"> |
262 |
- <email>marecki@g.o</email> |
263 |
- <name>Marek Szuba</name> |
264 |
- </maintainer> |
265 |
-</pkgmetadata> |
266 |
|
267 |
diff --git a/sci-libs/superlu_mt/files/superlu_mt-2.1-duplicate-symbols.patch b/sci-libs/superlu_mt/files/superlu_mt-2.1-duplicate-symbols.patch |
268 |
deleted file mode 100644 |
269 |
index 6b2c5d5..0000000 |
270 |
--- a/sci-libs/superlu_mt/files/superlu_mt-2.1-duplicate-symbols.patch |
271 |
+++ /dev/null |
272 |
@@ -1,900 +0,0 @@ |
273 |
-diff -Nur SRC.orig/cmatgen.c SRC/cmatgen.c |
274 |
---- SRC.orig/cmatgen.c 2013-07-15 11:47:52.512735420 -0700 |
275 |
-+++ SRC/cmatgen.c 2013-07-15 11:49:05.149137948 -0700 |
276 |
-@@ -93,76 +93,4 @@ |
277 |
- xa[n] = lasta; |
278 |
- } |
279 |
- |
280 |
--double dlaran_(int *iseed) |
281 |
--{ |
282 |
--/* -- LAPACK auxiliary routine (version 2.0) -- |
283 |
-- Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., |
284 |
-- Courant Institute, Argonne National Lab, and Rice University |
285 |
-- February 29, 1992 |
286 |
-- |
287 |
-- Purpose |
288 |
-- ======= |
289 |
-- |
290 |
-- DLARAN returns a random real number from a uniform (0,1) |
291 |
-- distribution. |
292 |
-- |
293 |
-- Arguments |
294 |
-- ========= |
295 |
-- |
296 |
-- ISEED (input/output) INT array, dimension (4) |
297 |
-- On entry, the seed of the random number generator; the array |
298 |
-- |
299 |
-- elements must be between 0 and 4095, and ISEED(4) must be |
300 |
-- odd. |
301 |
-- On exit, the seed is updated. |
302 |
-- |
303 |
-- Further Details |
304 |
-- =============== |
305 |
-- |
306 |
-- This routine uses a multiplicative congruential method with modulus |
307 |
-- 2**48 and multiplier 33952834046453 (see G.S.Fishman, |
308 |
-- 'Multiplicative congruential random number generators with modulus |
309 |
-- 2**b: an exhaustive analysis for b = 32 and a partial analysis for |
310 |
-- b = 48', Math. Comp. 189, pp 331-344, 1990). |
311 |
-- |
312 |
-- 48-bit integers are stored in 4 integer array elements with 12 bits |
313 |
-- per element. Hence the routine is portable across machines with |
314 |
-- integers of 32 bits or more. |
315 |
-- |
316 |
-- ===================================================================== |
317 |
--*/ |
318 |
-- |
319 |
-- /* Local variables */ |
320 |
-- int it1, it2, it3, it4; |
321 |
-- |
322 |
-- --iseed; |
323 |
-- |
324 |
-- /* multiply the seed by the multiplier modulo 2**48 */ |
325 |
-- it4 = iseed[4] * 2549; |
326 |
-- it3 = it4 / 4096; |
327 |
-- it4 -= it3 << 12; |
328 |
-- it3 = it3 + iseed[3] * 2549 + iseed[4] * 2508; |
329 |
-- it2 = it3 / 4096; |
330 |
-- it3 -= it2 << 12; |
331 |
-- it2 = it2 + iseed[2] * 2549 + iseed[3] * 2508 + iseed[4] * 322; |
332 |
-- it1 = it2 / 4096; |
333 |
-- it2 -= it1 << 12; |
334 |
-- it1 = it1 + iseed[1] * 2549 + iseed[2] * 2508 + iseed[3] * 322 + iseed[4] |
335 |
-- * 494; |
336 |
-- it1 %= 4096; |
337 |
-- |
338 |
-- /* return updated seed */ |
339 |
-- |
340 |
-- iseed[1] = it1; |
341 |
-- iseed[2] = it2; |
342 |
-- iseed[3] = it3; |
343 |
-- iseed[4] = it4; |
344 |
-- |
345 |
-- /* convert 48-bit integer to a real number in the interval (0,1) */ |
346 |
-- |
347 |
-- return ((double) it1 + |
348 |
-- ((double) it2 + ((double) it3 + (double) it4 * 2.44140625e-4) * |
349 |
-- 2.44140625e-4) * 2.44140625e-4) * 2.44140625e-4; |
350 |
-- |
351 |
--} /* dlaran_ */ |
352 |
- |
353 |
-diff -Nur SRC.orig/cmyblas2.c SRC/cmyblas2.c |
354 |
---- SRC.orig/cmyblas2.c 2013-07-15 11:47:52.509735400 -0700 |
355 |
-+++ SRC/cmyblas2.c 2013-07-15 11:49:05.149137948 -0700 |
356 |
-@@ -183,3 +183,127 @@ |
357 |
- |
358 |
- } |
359 |
- |
360 |
-+/* |
361 |
-+ * Performs dense matrix-vector multiply with 2 vectors: |
362 |
-+ * y0 = y0 + A * x0 |
363 |
-+ * y1 = y1 + A * x1 |
364 |
-+ */ |
365 |
-+void cmatvec2 ( |
366 |
-+ int lda, /* leading dimension of A */ |
367 |
-+ int m, |
368 |
-+ int n, |
369 |
-+ complex *A, /* in - size m-by-n */ |
370 |
-+ complex *x0, /* in - size n-by-1 */ |
371 |
-+ complex *x1, /* in - size n-by-1 */ |
372 |
-+ complex *y0, /* out - size n-by-1 */ |
373 |
-+ complex *y1 /* out - size n-by-1 */ |
374 |
-+ ) |
375 |
-+ |
376 |
-+{ |
377 |
-+ complex v00, v10, v20, v30, v40, v50, v60, v70, |
378 |
-+ v01, v11, v21, v31, v41, v51, v61, v71; |
379 |
-+ complex t0, t1, t2, t3, t4, t5, t6, t7; |
380 |
-+ complex f0, f1; |
381 |
-+ complex *Mki0, *Mki1, *Mki2, *Mki3, *Mki4, *Mki5, *Mki6, *Mki7; |
382 |
-+ register int firstcol = 0; |
383 |
-+ complex *M0, temp; |
384 |
-+ int k; |
385 |
-+ |
386 |
-+ M0 = &A[0]; |
387 |
-+ |
388 |
-+ while ( firstcol < n - 7 ) { /* Do 8 columns */ |
389 |
-+ |
390 |
-+ Mki0 = M0; |
391 |
-+ Mki1 = Mki0 + lda; |
392 |
-+ Mki2 = Mki1 + lda; |
393 |
-+ Mki3 = Mki2 + lda; |
394 |
-+ Mki4 = Mki3 + lda; |
395 |
-+ Mki5 = Mki4 + lda; |
396 |
-+ Mki6 = Mki5 + lda; |
397 |
-+ Mki7 = Mki6 + lda; |
398 |
-+ |
399 |
-+ v00 = x0[firstcol]; v01 = x1[firstcol++]; |
400 |
-+ v10 = x0[firstcol]; v11 = x1[firstcol++]; |
401 |
-+ v20 = x0[firstcol]; v21 = x1[firstcol++]; |
402 |
-+ v30 = x0[firstcol]; v31 = x1[firstcol++]; |
403 |
-+ v40 = x0[firstcol]; v41 = x1[firstcol++]; |
404 |
-+ v50 = x0[firstcol]; v51 = x1[firstcol++]; |
405 |
-+ v60 = x0[firstcol]; v61 = x1[firstcol++]; |
406 |
-+ v70 = x0[firstcol]; v71 = x1[firstcol++]; |
407 |
-+ |
408 |
-+ for (k = 0; k < m; k++) { |
409 |
-+ f0 = y0[k]; |
410 |
-+ f1 = y1[k]; |
411 |
-+ t0 = Mki0[k]; cc_mult(&temp, &v00, &t0);c_add(&f0,&f0,&temp); |
412 |
-+ cc_mult(&temp,&v01,&t0);c_add(&f1,&f1,&temp); |
413 |
-+ t1 = Mki1[k]; cc_mult(&temp,&v10,&t1);c_add(&f0,&f0,&temp); |
414 |
-+ cc_mult(&temp,&v11,&t1);c_add(&f1,&f1,&temp); |
415 |
-+ t2 = Mki2[k]; cc_mult(&temp,&v20,&t2);c_add(&f0,&f0,&temp); |
416 |
-+ cc_mult(&temp,&v21,&t2);c_add(&f1,&f1,&temp); |
417 |
-+ t3 = Mki3[k]; cc_mult(&temp,&v30,&t3);c_add(&f0,&f0,&temp); |
418 |
-+ cc_mult(&temp,&v31,&t3);c_add(&f1,&f1,&temp); |
419 |
-+ t4 = Mki4[k]; cc_mult(&temp,&v40,&t4);c_add(&f0,&f0,&temp); |
420 |
-+ cc_mult(&temp,&v41,&t4);c_add(&f1,&f1,&temp); |
421 |
-+ t5 = Mki5[k]; cc_mult(&temp,&v50,&t5);c_add(&f0,&f0,&temp); |
422 |
-+ cc_mult(&temp,&v51,&t5);c_add(&f1,&f1,&temp); |
423 |
-+ t6 = Mki6[k]; cc_mult(&temp,&v60,&t6);c_add(&f0,&f0,&temp); |
424 |
-+ cc_mult(&temp,&v61,&t6);c_add(&f1,&f1,&temp); |
425 |
-+ t7 = Mki7[k]; cc_mult(&temp,&v70,&t7);c_add(&f0,&f0,&temp); |
426 |
-+ cc_mult(&temp,&v71,&t7);c_add(&f1,&f1,&temp); |
427 |
-+ y0[k] = f0; |
428 |
-+ y1[k] = f1; |
429 |
-+ } |
430 |
-+ |
431 |
-+ M0 += 8 * lda; |
432 |
-+ } |
433 |
-+ |
434 |
-+ while ( firstcol < n - 3 ) { /* Do 4 columns */ |
435 |
-+ Mki0 = M0; |
436 |
-+ Mki1 = Mki0 + lda; |
437 |
-+ Mki2 = Mki1 + lda; |
438 |
-+ Mki3 = Mki2 + lda; |
439 |
-+ |
440 |
-+ v00 = x0[firstcol]; v01 = x1[firstcol++]; |
441 |
-+ v10 = x0[firstcol]; v11 = x1[firstcol++]; |
442 |
-+ v20 = x0[firstcol]; v21 = x1[firstcol++]; |
443 |
-+ v30 = x0[firstcol]; v31 = x1[firstcol++]; |
444 |
-+ |
445 |
-+ for (k = 0; k < m; k++) { |
446 |
-+ f0 = y0[k]; |
447 |
-+ f1 = y1[k]; |
448 |
-+ t0 = Mki0[k]; cc_mult(&temp,&v00,&t0);c_add(&f0,&f0,&temp); |
449 |
-+ cc_mult(&temp,&v01,&t0);c_add(&f1,&f1,&temp); |
450 |
-+ t1 = Mki1[k]; cc_mult(&temp,&v10,&t1);c_add(&f0,&f0,&temp); |
451 |
-+ cc_mult(&temp,&v11,&t1);c_add(&f1,&f1,&temp); |
452 |
-+ t2 = Mki2[k]; cc_mult(&temp,&v20,&t2);c_add(&f0,&f0,&temp); |
453 |
-+ cc_mult(&temp,&v21,&t2);c_add(&f1,&f1,&temp); |
454 |
-+ t3 = Mki3[k]; cc_mult(&temp,&v30,&t3);c_add(&f0,&f0,&temp); |
455 |
-+ cc_mult(&temp,&v31,&t3);c_add(&f1,&f1,&temp); |
456 |
-+ y0[k] = f0; |
457 |
-+ y1[k] = f1; |
458 |
-+ } |
459 |
-+ |
460 |
-+ M0 += 4 * lda; |
461 |
-+ |
462 |
-+ } |
463 |
-+ |
464 |
-+ while ( firstcol < n ) { /* Do 1 column */ |
465 |
-+ Mki0 = M0; |
466 |
-+ v00 = x0[firstcol]; v01 = x1[firstcol++]; |
467 |
-+ |
468 |
-+ for (k = 0; k < m; k++) { |
469 |
-+ f0 = y0[k]; |
470 |
-+ f1 = y1[k]; |
471 |
-+ t0 = Mki0[k]; |
472 |
-+ cc_mult(&temp,&v00,&t0);c_add(&f0,&f0,&temp); |
473 |
-+ cc_mult(&temp,&v01,&t0);c_add(&f1,&f1,&temp); |
474 |
-+ y0[k] = f0; |
475 |
-+ y1[k] = f1; |
476 |
-+ } |
477 |
-+ |
478 |
-+ M0 += lda; |
479 |
-+ } |
480 |
-+ |
481 |
-+} |
482 |
-+ |
483 |
-+ |
484 |
-diff -Nur SRC.orig/cmyblas2.c.orig SRC/cmyblas2.c.orig |
485 |
---- SRC.orig/cmyblas2.c.orig 1969-12-31 16:00:00.000000000 -0800 |
486 |
-+++ SRC/cmyblas2.c.orig 2013-07-15 11:49:05.149137948 -0700 |
487 |
-@@ -0,0 +1,185 @@ |
488 |
-+ |
489 |
-+/* |
490 |
-+ * -- SuperLU routine (version 2.0) -- |
491 |
-+ * Lawrence Berkeley National Lab, Univ. of California Berkeley, |
492 |
-+ * and Xerox Palo Alto Research Center. |
493 |
-+ * September 10, 2007 |
494 |
-+ * |
495 |
-+ */ |
496 |
-+/* |
497 |
-+ * File name: cmyblas2.c |
498 |
-+ * Purpose: |
499 |
-+ * Level 2 BLAS operations: solves and matvec, written in C. |
500 |
-+ * Note: |
501 |
-+ * This is only used when the system lacks an efficient BLAS library. |
502 |
-+ */ |
503 |
-+#include "slu_scomplex.h" |
504 |
-+ |
505 |
-+ |
506 |
-+/* |
507 |
-+ * Solves a dense UNIT lower triangular system. The unit lower |
508 |
-+ * triangular matrix is stored in a 2D array M(1:nrow,1:ncol). |
509 |
-+ * The solution will be returned in the rhs vector. |
510 |
-+ */ |
511 |
-+void clsolve ( int ldm, int ncol, complex *M, complex *rhs ) |
512 |
-+{ |
513 |
-+ int k; |
514 |
-+ complex x0, x1, x2, x3, temp; |
515 |
-+ complex *M0; |
516 |
-+ complex *Mki0, *Mki1, *Mki2, *Mki3; |
517 |
-+ register int firstcol = 0; |
518 |
-+ |
519 |
-+ M0 = &M[0]; |
520 |
-+ |
521 |
-+ |
522 |
-+ while ( firstcol < ncol - 3 ) { /* Do 4 columns */ |
523 |
-+ Mki0 = M0 + 1; |
524 |
-+ Mki1 = Mki0 + ldm + 1; |
525 |
-+ Mki2 = Mki1 + ldm + 1; |
526 |
-+ Mki3 = Mki2 + ldm + 1; |
527 |
-+ |
528 |
-+ x0 = rhs[firstcol]; |
529 |
-+ cc_mult(&temp, &x0, Mki0); Mki0++; |
530 |
-+ c_sub(&x1, &rhs[firstcol+1], &temp); |
531 |
-+ cc_mult(&temp, &x0, Mki0); Mki0++; |
532 |
-+ c_sub(&x2, &rhs[firstcol+2], &temp); |
533 |
-+ cc_mult(&temp, &x1, Mki1); Mki1++; |
534 |
-+ c_sub(&x2, &x2, &temp); |
535 |
-+ cc_mult(&temp, &x0, Mki0); Mki0++; |
536 |
-+ c_sub(&x3, &rhs[firstcol+3], &temp); |
537 |
-+ cc_mult(&temp, &x1, Mki1); Mki1++; |
538 |
-+ c_sub(&x3, &x3, &temp); |
539 |
-+ cc_mult(&temp, &x2, Mki2); Mki2++; |
540 |
-+ c_sub(&x3, &x3, &temp); |
541 |
-+ |
542 |
-+ rhs[++firstcol] = x1; |
543 |
-+ rhs[++firstcol] = x2; |
544 |
-+ rhs[++firstcol] = x3; |
545 |
-+ ++firstcol; |
546 |
-+ |
547 |
-+ for (k = firstcol; k < ncol; k++) { |
548 |
-+ cc_mult(&temp, &x0, Mki0); Mki0++; |
549 |
-+ c_sub(&rhs[k], &rhs[k], &temp); |
550 |
-+ cc_mult(&temp, &x1, Mki1); Mki1++; |
551 |
-+ c_sub(&rhs[k], &rhs[k], &temp); |
552 |
-+ cc_mult(&temp, &x2, Mki2); Mki2++; |
553 |
-+ c_sub(&rhs[k], &rhs[k], &temp); |
554 |
-+ cc_mult(&temp, &x3, Mki3); Mki3++; |
555 |
-+ c_sub(&rhs[k], &rhs[k], &temp); |
556 |
-+ } |
557 |
-+ |
558 |
-+ M0 += 4 * ldm + 4; |
559 |
-+ } |
560 |
-+ |
561 |
-+ if ( firstcol < ncol - 1 ) { /* Do 2 columns */ |
562 |
-+ Mki0 = M0 + 1; |
563 |
-+ Mki1 = Mki0 + ldm + 1; |
564 |
-+ |
565 |
-+ x0 = rhs[firstcol]; |
566 |
-+ cc_mult(&temp, &x0, Mki0); Mki0++; |
567 |
-+ c_sub(&x1, &rhs[firstcol+1], &temp); |
568 |
-+ |
569 |
-+ rhs[++firstcol] = x1; |
570 |
-+ ++firstcol; |
571 |
-+ |
572 |
-+ for (k = firstcol; k < ncol; k++) { |
573 |
-+ cc_mult(&temp, &x0, Mki0); Mki0++; |
574 |
-+ c_sub(&rhs[k], &rhs[k], &temp); |
575 |
-+ cc_mult(&temp, &x1, Mki1); Mki1++; |
576 |
-+ c_sub(&rhs[k], &rhs[k], &temp); |
577 |
-+ } |
578 |
-+ } |
579 |
-+ |
580 |
-+} |
581 |
-+ |
582 |
-+/* |
583 |
-+ * Solves a dense upper triangular system. The upper triangular matrix is |
584 |
-+ * stored in a 2-dim array M(1:ldm,1:ncol). The solution will be returned |
585 |
-+ * in the rhs vector. |
586 |
-+ */ |
587 |
-+void |
588 |
-+cusolve ( |
589 |
-+int ldm, /* in */ |
590 |
-+int ncol, /* in */ |
591 |
-+complex *M, /* in */ |
592 |
-+complex *rhs /* modified */ |
593 |
-+) |
594 |
-+{ |
595 |
-+ complex xj, temp; |
596 |
-+ int jcol, j, irow; |
597 |
-+ |
598 |
-+ jcol = ncol - 1; |
599 |
-+ |
600 |
-+ for (j = 0; j < ncol; j++) { |
601 |
-+ |
602 |
-+ c_div(&xj, &rhs[jcol], &M[jcol + jcol*ldm]); /* M(jcol, jcol) */ |
603 |
-+ rhs[jcol] = xj; |
604 |
-+ |
605 |
-+ for (irow = 0; irow < jcol; irow++) { |
606 |
-+ cc_mult(&temp, &xj, &M[irow+jcol*ldm]); /* M(irow, jcol) */ |
607 |
-+ c_sub(&rhs[irow], &rhs[irow], &temp); |
608 |
-+ } |
609 |
-+ |
610 |
-+ jcol--; |
611 |
-+ |
612 |
-+ } |
613 |
-+} |
614 |
-+ |
615 |
-+ |
616 |
-+/* |
617 |
-+ * Performs a dense matrix-vector multiply: Mxvec = Mxvec + M * vec. |
618 |
-+ * The input matrix is M(1:nrow,1:ncol); The product is returned in Mxvec[]. |
619 |
-+ */ |
620 |
-+void cmatvec ( |
621 |
-+int ldm, /* in -- leading dimension of M */ |
622 |
-+int nrow, /* in */ |
623 |
-+int ncol, /* in */ |
624 |
-+complex *M, /* in */ |
625 |
-+complex *vec, /* in */ |
626 |
-+complex *Mxvec /* in/out */ |
627 |
-+) |
628 |
-+{ |
629 |
-+ complex vi0, vi1, vi2, vi3; |
630 |
-+ complex *M0, temp; |
631 |
-+ complex *Mki0, *Mki1, *Mki2, *Mki3; |
632 |
-+ register int firstcol = 0; |
633 |
-+ int k; |
634 |
-+ |
635 |
-+ M0 = &M[0]; |
636 |
-+ |
637 |
-+ while ( firstcol < ncol - 3 ) { /* Do 4 columns */ |
638 |
-+ Mki0 = M0; |
639 |
-+ Mki1 = Mki0 + ldm; |
640 |
-+ Mki2 = Mki1 + ldm; |
641 |
-+ Mki3 = Mki2 + ldm; |
642 |
-+ |
643 |
-+ vi0 = vec[firstcol++]; |
644 |
-+ vi1 = vec[firstcol++]; |
645 |
-+ vi2 = vec[firstcol++]; |
646 |
-+ vi3 = vec[firstcol++]; |
647 |
-+ for (k = 0; k < nrow; k++) { |
648 |
-+ cc_mult(&temp, &vi0, Mki0); Mki0++; |
649 |
-+ c_add(&Mxvec[k], &Mxvec[k], &temp); |
650 |
-+ cc_mult(&temp, &vi1, Mki1); Mki1++; |
651 |
-+ c_add(&Mxvec[k], &Mxvec[k], &temp); |
652 |
-+ cc_mult(&temp, &vi2, Mki2); Mki2++; |
653 |
-+ c_add(&Mxvec[k], &Mxvec[k], &temp); |
654 |
-+ cc_mult(&temp, &vi3, Mki3); Mki3++; |
655 |
-+ c_add(&Mxvec[k], &Mxvec[k], &temp); |
656 |
-+ } |
657 |
-+ |
658 |
-+ M0 += 4 * ldm; |
659 |
-+ } |
660 |
-+ |
661 |
-+ while ( firstcol < ncol ) { /* Do 1 column */ |
662 |
-+ Mki0 = M0; |
663 |
-+ vi0 = vec[firstcol++]; |
664 |
-+ for (k = 0; k < nrow; k++) { |
665 |
-+ cc_mult(&temp, &vi0, Mki0); Mki0++; |
666 |
-+ c_add(&Mxvec[k], &Mxvec[k], &temp); |
667 |
-+ } |
668 |
-+ M0 += ldm; |
669 |
-+ } |
670 |
-+ |
671 |
-+} |
672 |
-+ |
673 |
-diff -Nur SRC.orig/Makefile SRC/Makefile |
674 |
---- SRC.orig/Makefile 2013-07-15 11:47:52.511735412 -0700 |
675 |
-+++ SRC/Makefile 2013-07-15 11:53:15.393528085 -0700 |
676 |
-@@ -31,7 +31,7 @@ |
677 |
- # |
678 |
- ####################################################################### |
679 |
- |
680 |
--ALLAUX = superlu_timer.o dclock.o sp_ienv.o lsame.o xerbla.o \ |
681 |
-+ALLAUX = superlu_timer.o sp_ienv.o lsame.o xerbla.o \ |
682 |
- util.o pmemory.o qrnzcnt.o await.o \ |
683 |
- get_perm_c.o mmd.o colamd.o sp_coletree.o \ |
684 |
- pxgstrf_scheduler.o sp_colorder.o \ |
685 |
-diff -Nur SRC.orig/smatgen.c SRC/smatgen.c |
686 |
---- SRC.orig/smatgen.c 2013-07-15 11:47:52.512735420 -0700 |
687 |
-+++ SRC/smatgen.c 2013-07-15 11:49:05.149137948 -0700 |
688 |
-@@ -93,76 +93,3 @@ |
689 |
- xa[n] = lasta; |
690 |
- } |
691 |
- |
692 |
--double dlaran_(int *iseed) |
693 |
--{ |
694 |
--/* -- LAPACK auxiliary routine (version 2.0) -- |
695 |
-- Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., |
696 |
-- Courant Institute, Argonne National Lab, and Rice University |
697 |
-- February 29, 1992 |
698 |
-- |
699 |
-- Purpose |
700 |
-- ======= |
701 |
-- |
702 |
-- DLARAN returns a random real number from a uniform (0,1) |
703 |
-- distribution. |
704 |
-- |
705 |
-- Arguments |
706 |
-- ========= |
707 |
-- |
708 |
-- ISEED (input/output) INT array, dimension (4) |
709 |
-- On entry, the seed of the random number generator; the array |
710 |
-- |
711 |
-- elements must be between 0 and 4095, and ISEED(4) must be |
712 |
-- odd. |
713 |
-- On exit, the seed is updated. |
714 |
-- |
715 |
-- Further Details |
716 |
-- =============== |
717 |
-- |
718 |
-- This routine uses a multiplicative congruential method with modulus |
719 |
-- 2**48 and multiplier 33952834046453 (see G.S.Fishman, |
720 |
-- 'Multiplicative congruential random number generators with modulus |
721 |
-- 2**b: an exhaustive analysis for b = 32 and a partial analysis for |
722 |
-- b = 48', Math. Comp. 189, pp 331-344, 1990). |
723 |
-- |
724 |
-- 48-bit integers are stored in 4 integer array elements with 12 bits |
725 |
-- per element. Hence the routine is portable across machines with |
726 |
-- integers of 32 bits or more. |
727 |
-- |
728 |
-- ===================================================================== |
729 |
--*/ |
730 |
-- |
731 |
-- /* Local variables */ |
732 |
-- int it1, it2, it3, it4; |
733 |
-- |
734 |
-- --iseed; |
735 |
-- |
736 |
-- /* multiply the seed by the multiplier modulo 2**48 */ |
737 |
-- it4 = iseed[4] * 2549; |
738 |
-- it3 = it4 / 4096; |
739 |
-- it4 -= it3 << 12; |
740 |
-- it3 = it3 + iseed[3] * 2549 + iseed[4] * 2508; |
741 |
-- it2 = it3 / 4096; |
742 |
-- it3 -= it2 << 12; |
743 |
-- it2 = it2 + iseed[2] * 2549 + iseed[3] * 2508 + iseed[4] * 322; |
744 |
-- it1 = it2 / 4096; |
745 |
-- it2 -= it1 << 12; |
746 |
-- it1 = it1 + iseed[1] * 2549 + iseed[2] * 2508 + iseed[3] * 322 + iseed[4] |
747 |
-- * 494; |
748 |
-- it1 %= 4096; |
749 |
-- |
750 |
-- /* return updated seed */ |
751 |
-- |
752 |
-- iseed[1] = it1; |
753 |
-- iseed[2] = it2; |
754 |
-- iseed[3] = it3; |
755 |
-- iseed[4] = it4; |
756 |
-- |
757 |
-- /* convert 48-bit integer to a real number in the interval (0,1) */ |
758 |
-- |
759 |
-- return ((double) it1 + |
760 |
-- ((double) it2 + ((double) it3 + (double) it4 * 2.44140625e-4) * |
761 |
-- 2.44140625e-4) * 2.44140625e-4) * 2.44140625e-4; |
762 |
-- |
763 |
--} /* dlaran_ */ |
764 |
-- |
765 |
-diff -Nur SRC.orig/xerbla.c SRC/xerbla.c |
766 |
---- SRC.orig/xerbla.c 2013-07-15 11:47:52.513735427 -0700 |
767 |
-+++ SRC/xerbla.c 2013-07-15 11:49:05.150137959 -0700 |
768 |
-@@ -1,3 +1,4 @@ |
769 |
-+#include <stdio.h> |
770 |
- /* Subroutine */ int xerbla_(char *srname, int *info) |
771 |
- { |
772 |
- /* -- LAPACK auxiliary routine (version 2.0) -- |
773 |
-diff -Nur SRC.orig/zmatgen.c SRC/zmatgen.c |
774 |
---- SRC.orig/zmatgen.c 2013-07-15 11:47:52.513735427 -0700 |
775 |
-+++ SRC/zmatgen.c 2013-07-15 11:49:05.150137959 -0700 |
776 |
-@@ -93,76 +93,3 @@ |
777 |
- xa[n] = lasta; |
778 |
- } |
779 |
- |
780 |
--double dlaran_(int *iseed) |
781 |
--{ |
782 |
--/* -- LAPACK auxiliary routine (version 2.0) -- |
783 |
-- Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., |
784 |
-- Courant Institute, Argonne National Lab, and Rice University |
785 |
-- February 29, 1992 |
786 |
-- |
787 |
-- Purpose |
788 |
-- ======= |
789 |
-- |
790 |
-- DLARAN returns a random real number from a uniform (0,1) |
791 |
-- distribution. |
792 |
-- |
793 |
-- Arguments |
794 |
-- ========= |
795 |
-- |
796 |
-- ISEED (input/output) INT array, dimension (4) |
797 |
-- On entry, the seed of the random number generator; the array |
798 |
-- |
799 |
-- elements must be between 0 and 4095, and ISEED(4) must be |
800 |
-- odd. |
801 |
-- On exit, the seed is updated. |
802 |
-- |
803 |
-- Further Details |
804 |
-- =============== |
805 |
-- |
806 |
-- This routine uses a multiplicative congruential method with modulus |
807 |
-- 2**48 and multiplier 33952834046453 (see G.S.Fishman, |
808 |
-- 'Multiplicative congruential random number generators with modulus |
809 |
-- 2**b: an exhaustive analysis for b = 32 and a partial analysis for |
810 |
-- b = 48', Math. Comp. 189, pp 331-344, 1990). |
811 |
-- |
812 |
-- 48-bit integers are stored in 4 integer array elements with 12 bits |
813 |
-- per element. Hence the routine is portable across machines with |
814 |
-- integers of 32 bits or more. |
815 |
-- |
816 |
-- ===================================================================== |
817 |
--*/ |
818 |
-- |
819 |
-- /* Local variables */ |
820 |
-- int it1, it2, it3, it4; |
821 |
-- |
822 |
-- --iseed; |
823 |
-- |
824 |
-- /* multiply the seed by the multiplier modulo 2**48 */ |
825 |
-- it4 = iseed[4] * 2549; |
826 |
-- it3 = it4 / 4096; |
827 |
-- it4 -= it3 << 12; |
828 |
-- it3 = it3 + iseed[3] * 2549 + iseed[4] * 2508; |
829 |
-- it2 = it3 / 4096; |
830 |
-- it3 -= it2 << 12; |
831 |
-- it2 = it2 + iseed[2] * 2549 + iseed[3] * 2508 + iseed[4] * 322; |
832 |
-- it1 = it2 / 4096; |
833 |
-- it2 -= it1 << 12; |
834 |
-- it1 = it1 + iseed[1] * 2549 + iseed[2] * 2508 + iseed[3] * 322 + iseed[4] |
835 |
-- * 494; |
836 |
-- it1 %= 4096; |
837 |
-- |
838 |
-- /* return updated seed */ |
839 |
-- |
840 |
-- iseed[1] = it1; |
841 |
-- iseed[2] = it2; |
842 |
-- iseed[3] = it3; |
843 |
-- iseed[4] = it4; |
844 |
-- |
845 |
-- /* convert 48-bit integer to a real number in the interval (0,1) */ |
846 |
-- |
847 |
-- return ((double) it1 + |
848 |
-- ((double) it2 + ((double) it3 + (double) it4 * 2.44140625e-4) * |
849 |
-- 2.44140625e-4) * 2.44140625e-4) * 2.44140625e-4; |
850 |
-- |
851 |
--} /* dlaran_ */ |
852 |
-- |
853 |
-diff -Nur SRC.orig/zmyblas2.c SRC/zmyblas2.c |
854 |
---- SRC.orig/zmyblas2.c 2013-07-15 11:47:52.511735412 -0700 |
855 |
-+++ SRC/zmyblas2.c 2013-07-15 11:49:05.150137959 -0700 |
856 |
-@@ -183,3 +183,127 @@ |
857 |
- |
858 |
- } |
859 |
- |
860 |
-+/* |
861 |
-+ * Performs dense matrix-vector multiply with 2 vectors: |
862 |
-+ * y0 = y0 + A * x0 |
863 |
-+ * y1 = y1 + A * x1 |
864 |
-+ */ |
865 |
-+void zmatvec2 ( |
866 |
-+ int lda, /* leading dimension of A */ |
867 |
-+ int m, |
868 |
-+ int n, |
869 |
-+ doublecomplex *A, /* in - size m-by-n */ |
870 |
-+ doublecomplex *x0, /* in - size n-by-1 */ |
871 |
-+ doublecomplex *x1, /* in - size n-by-1 */ |
872 |
-+ doublecomplex *y0, /* out - size n-by-1 */ |
873 |
-+ doublecomplex *y1 /* out - size n-by-1 */ |
874 |
-+ ) |
875 |
-+ |
876 |
-+{ |
877 |
-+ doublecomplex v00, v10, v20, v30, v40, v50, v60, v70, |
878 |
-+ v01, v11, v21, v31, v41, v51, v61, v71; |
879 |
-+ doublecomplex t0, t1, t2, t3, t4, t5, t6, t7; |
880 |
-+ doublecomplex f0, f1; |
881 |
-+ doublecomplex *Mki0, *Mki1, *Mki2, *Mki3, *Mki4, *Mki5, *Mki6, *Mki7; |
882 |
-+ register int firstcol = 0; |
883 |
-+ doublecomplex *M0, temp; |
884 |
-+ int k; |
885 |
-+ |
886 |
-+ M0 = &A[0]; |
887 |
-+ |
888 |
-+ while ( firstcol < n - 7 ) { /* Do 8 columns */ |
889 |
-+ |
890 |
-+ Mki0 = M0; |
891 |
-+ Mki1 = Mki0 + lda; |
892 |
-+ Mki2 = Mki1 + lda; |
893 |
-+ Mki3 = Mki2 + lda; |
894 |
-+ Mki4 = Mki3 + lda; |
895 |
-+ Mki5 = Mki4 + lda; |
896 |
-+ Mki6 = Mki5 + lda; |
897 |
-+ Mki7 = Mki6 + lda; |
898 |
-+ |
899 |
-+ v00 = x0[firstcol]; v01 = x1[firstcol++]; |
900 |
-+ v10 = x0[firstcol]; v11 = x1[firstcol++]; |
901 |
-+ v20 = x0[firstcol]; v21 = x1[firstcol++]; |
902 |
-+ v30 = x0[firstcol]; v31 = x1[firstcol++]; |
903 |
-+ v40 = x0[firstcol]; v41 = x1[firstcol++]; |
904 |
-+ v50 = x0[firstcol]; v51 = x1[firstcol++]; |
905 |
-+ v60 = x0[firstcol]; v61 = x1[firstcol++]; |
906 |
-+ v70 = x0[firstcol]; v71 = x1[firstcol++]; |
907 |
-+ |
908 |
-+ for (k = 0; k < m; k++) { |
909 |
-+ f0 = y0[k]; |
910 |
-+ f1 = y1[k]; |
911 |
-+ t0 = Mki0[k]; zz_mult(&temp,&v00,&t0);z_add(&f0,&f0,&temp); |
912 |
-+ zz_mult(&temp,&v01,&t0);z_add(&f1,&f1,&temp); |
913 |
-+ t1 = Mki1[k]; zz_mult(&temp,&v10,&t1);z_add(&f0,&f0,&temp); |
914 |
-+ zz_mult(&temp,&v11,&t1);z_add(&f1,&f1,&temp); |
915 |
-+ t2 = Mki2[k]; zz_mult(&temp,&v20,&t2);z_add(&f0,&f0,&temp); |
916 |
-+ zz_mult(&temp,&v21,&t2);z_add(&f1,&f1,&temp); |
917 |
-+ t3 = Mki3[k]; zz_mult(&temp,&v30,&t3);z_add(&f0,&f0,&temp); |
918 |
-+ zz_mult(&temp,&v31,&t3);z_add(&f1,&f1,&temp); |
919 |
-+ t4 = Mki4[k]; zz_mult(&temp,&v40,&t4);z_add(&f0,&f0,&temp); |
920 |
-+ zz_mult(&temp,&v41,&t4);z_add(&f1,&f1,&temp); |
921 |
-+ t5 = Mki5[k]; zz_mult(&temp,&v50,&t5);z_add(&f0,&f0,&temp); |
922 |
-+ zz_mult(&temp,&v51,&t5);z_add(&f1,&f1,&temp); |
923 |
-+ t6 = Mki6[k]; zz_mult(&temp,&v60,&t6);z_add(&f0,&f0,&temp); |
924 |
-+ zz_mult(&temp,&v61,&t6);z_add(&f1,&f1,&temp); |
925 |
-+ t7 = Mki7[k]; zz_mult(&temp,&v70,&t7);z_add(&f0,&f0,&temp); |
926 |
-+ zz_mult(&temp,&v71,&t7);z_add(&f1,&f1,&temp); |
927 |
-+ y0[k] = f0; |
928 |
-+ y1[k] = f1; |
929 |
-+ } |
930 |
-+ |
931 |
-+ M0 += 8 * lda; |
932 |
-+ } |
933 |
-+ |
934 |
-+ while ( firstcol < n - 3 ) { /* Do 4 columns */ |
935 |
-+ Mki0 = M0; |
936 |
-+ Mki1 = Mki0 + lda; |
937 |
-+ Mki2 = Mki1 + lda; |
938 |
-+ Mki3 = Mki2 + lda; |
939 |
-+ |
940 |
-+ v00 = x0[firstcol]; v01 = x1[firstcol++]; |
941 |
-+ v10 = x0[firstcol]; v11 = x1[firstcol++]; |
942 |
-+ v20 = x0[firstcol]; v21 = x1[firstcol++]; |
943 |
-+ v30 = x0[firstcol]; v31 = x1[firstcol++]; |
944 |
-+ |
945 |
-+ for (k = 0; k < m; k++) { |
946 |
-+ f0 = y0[k]; |
947 |
-+ f1 = y1[k]; |
948 |
-+ t0 = Mki0[k]; zz_mult(&temp,&v00,&t0);z_add(&f0,&f0,&temp); |
949 |
-+ zz_mult(&temp,&v01,&t0);z_add(&f1,&f1,&temp); |
950 |
-+ t1 = Mki1[k]; zz_mult(&temp,&v10,&t1);z_add(&f0,&f0,&temp); |
951 |
-+ zz_mult(&temp,&v11,&t1);z_add(&f1,&f1,&temp); |
952 |
-+ t2 = Mki2[k]; zz_mult(&temp,&v20,&t2);z_add(&f0,&f0,&temp); |
953 |
-+ zz_mult(&temp,&v21,&t2);z_add(&f1,&f1,&temp); |
954 |
-+ t3 = Mki3[k]; zz_mult(&temp,&v30,&t3);z_add(&f0,&f0,&temp); |
955 |
-+ zz_mult(&temp,&v31,&t3);z_add(&f1,&f1,&temp); |
956 |
-+ y0[k] = f0; |
957 |
-+ y1[k] = f1; |
958 |
-+ } |
959 |
-+ |
960 |
-+ M0 += 4 * lda; |
961 |
-+ |
962 |
-+ } |
963 |
-+ |
964 |
-+ while ( firstcol < n ) { /* Do 1 column */ |
965 |
-+ Mki0 = M0; |
966 |
-+ v00 = x0[firstcol]; v01 = x1[firstcol++]; |
967 |
-+ |
968 |
-+ for (k = 0; k < m; k++) { |
969 |
-+ f0 = y0[k]; |
970 |
-+ f1 = y1[k]; |
971 |
-+ t0 = Mki0[k]; |
972 |
-+ zz_mult(&temp,&v00,&t0);z_add(&f0,&f0,&temp); |
973 |
-+ zz_mult(&temp,&v01,&t0);z_add(&f1,&f1,&temp); |
974 |
-+ y0[k] = f0; |
975 |
-+ y1[k] = f1; |
976 |
-+ } |
977 |
-+ |
978 |
-+ M0 += lda; |
979 |
-+ } |
980 |
-+ |
981 |
-+} |
982 |
-+ |
983 |
-+ |
984 |
-diff -Nur SRC.orig/zmyblas2.c.orig SRC/zmyblas2.c.orig |
985 |
---- SRC.orig/zmyblas2.c.orig 1969-12-31 16:00:00.000000000 -0800 |
986 |
-+++ SRC/zmyblas2.c.orig 2013-07-15 11:49:05.150137959 -0700 |
987 |
-@@ -0,0 +1,185 @@ |
988 |
-+ |
989 |
-+/* |
990 |
-+ * -- SuperLU routine (version 2.0) -- |
991 |
-+ * Lawrence Berkeley National Lab, Univ. of California Berkeley, |
992 |
-+ * and Xerox Palo Alto Research Center. |
993 |
-+ * September 10, 2007 |
994 |
-+ * |
995 |
-+ */ |
996 |
-+/* |
997 |
-+ * File name: zmyblas2.c |
998 |
-+ * Purpose: |
999 |
-+ * Level 2 BLAS operations: solves and matvec, written in C. |
1000 |
-+ * Note: |
1001 |
-+ * This is only used when the system lacks an efficient BLAS library. |
1002 |
-+ */ |
1003 |
-+#include "slu_dcomplex.h" |
1004 |
-+ |
1005 |
-+ |
1006 |
-+/* |
1007 |
-+ * Solves a dense UNIT lower triangular system. The unit lower |
1008 |
-+ * triangular matrix is stored in a 2D array M(1:nrow,1:ncol). |
1009 |
-+ * The solution will be returned in the rhs vector. |
1010 |
-+ */ |
1011 |
-+void zlsolve ( int ldm, int ncol, doublecomplex *M, doublecomplex *rhs ) |
1012 |
-+{ |
1013 |
-+ int k; |
1014 |
-+ doublecomplex x0, x1, x2, x3, temp; |
1015 |
-+ doublecomplex *M0; |
1016 |
-+ doublecomplex *Mki0, *Mki1, *Mki2, *Mki3; |
1017 |
-+ register int firstcol = 0; |
1018 |
-+ |
1019 |
-+ M0 = &M[0]; |
1020 |
-+ |
1021 |
-+ |
1022 |
-+ while ( firstcol < ncol - 3 ) { /* Do 4 columns */ |
1023 |
-+ Mki0 = M0 + 1; |
1024 |
-+ Mki1 = Mki0 + ldm + 1; |
1025 |
-+ Mki2 = Mki1 + ldm + 1; |
1026 |
-+ Mki3 = Mki2 + ldm + 1; |
1027 |
-+ |
1028 |
-+ x0 = rhs[firstcol]; |
1029 |
-+ zz_mult(&temp, &x0, Mki0); Mki0++; |
1030 |
-+ z_sub(&x1, &rhs[firstcol+1], &temp); |
1031 |
-+ zz_mult(&temp, &x0, Mki0); Mki0++; |
1032 |
-+ z_sub(&x2, &rhs[firstcol+2], &temp); |
1033 |
-+ zz_mult(&temp, &x1, Mki1); Mki1++; |
1034 |
-+ z_sub(&x2, &x2, &temp); |
1035 |
-+ zz_mult(&temp, &x0, Mki0); Mki0++; |
1036 |
-+ z_sub(&x3, &rhs[firstcol+3], &temp); |
1037 |
-+ zz_mult(&temp, &x1, Mki1); Mki1++; |
1038 |
-+ z_sub(&x3, &x3, &temp); |
1039 |
-+ zz_mult(&temp, &x2, Mki2); Mki2++; |
1040 |
-+ z_sub(&x3, &x3, &temp); |
1041 |
-+ |
1042 |
-+ rhs[++firstcol] = x1; |
1043 |
-+ rhs[++firstcol] = x2; |
1044 |
-+ rhs[++firstcol] = x3; |
1045 |
-+ ++firstcol; |
1046 |
-+ |
1047 |
-+ for (k = firstcol; k < ncol; k++) { |
1048 |
-+ zz_mult(&temp, &x0, Mki0); Mki0++; |
1049 |
-+ z_sub(&rhs[k], &rhs[k], &temp); |
1050 |
-+ zz_mult(&temp, &x1, Mki1); Mki1++; |
1051 |
-+ z_sub(&rhs[k], &rhs[k], &temp); |
1052 |
-+ zz_mult(&temp, &x2, Mki2); Mki2++; |
1053 |
-+ z_sub(&rhs[k], &rhs[k], &temp); |
1054 |
-+ zz_mult(&temp, &x3, Mki3); Mki3++; |
1055 |
-+ z_sub(&rhs[k], &rhs[k], &temp); |
1056 |
-+ } |
1057 |
-+ |
1058 |
-+ M0 += 4 * ldm + 4; |
1059 |
-+ } |
1060 |
-+ |
1061 |
-+ if ( firstcol < ncol - 1 ) { /* Do 2 columns */ |
1062 |
-+ Mki0 = M0 + 1; |
1063 |
-+ Mki1 = Mki0 + ldm + 1; |
1064 |
-+ |
1065 |
-+ x0 = rhs[firstcol]; |
1066 |
-+ zz_mult(&temp, &x0, Mki0); Mki0++; |
1067 |
-+ z_sub(&x1, &rhs[firstcol+1], &temp); |
1068 |
-+ |
1069 |
-+ rhs[++firstcol] = x1; |
1070 |
-+ ++firstcol; |
1071 |
-+ |
1072 |
-+ for (k = firstcol; k < ncol; k++) { |
1073 |
-+ zz_mult(&temp, &x0, Mki0); Mki0++; |
1074 |
-+ z_sub(&rhs[k], &rhs[k], &temp); |
1075 |
-+ zz_mult(&temp, &x1, Mki1); Mki1++; |
1076 |
-+ z_sub(&rhs[k], &rhs[k], &temp); |
1077 |
-+ } |
1078 |
-+ } |
1079 |
-+ |
1080 |
-+} |
1081 |
-+ |
1082 |
-+/* |
1083 |
-+ * Solves a dense upper triangular system. The upper triangular matrix is |
1084 |
-+ * stored in a 2-dim array M(1:ldm,1:ncol). The solution will be returned |
1085 |
-+ * in the rhs vector. |
1086 |
-+ */ |
1087 |
-+void |
1088 |
-+zusolve ( |
1089 |
-+int ldm, /* in */ |
1090 |
-+int ncol, /* in */ |
1091 |
-+doublecomplex *M, /* in */ |
1092 |
-+doublecomplex *rhs /* modified */ |
1093 |
-+) |
1094 |
-+{ |
1095 |
-+ doublecomplex xj, temp; |
1096 |
-+ int jcol, j, irow; |
1097 |
-+ |
1098 |
-+ jcol = ncol - 1; |
1099 |
-+ |
1100 |
-+ for (j = 0; j < ncol; j++) { |
1101 |
-+ |
1102 |
-+ z_div(&xj, &rhs[jcol], &M[jcol + jcol*ldm]); /* M(jcol, jcol) */ |
1103 |
-+ rhs[jcol] = xj; |
1104 |
-+ |
1105 |
-+ for (irow = 0; irow < jcol; irow++) { |
1106 |
-+ zz_mult(&temp, &xj, &M[irow+jcol*ldm]); /* M(irow, jcol) */ |
1107 |
-+ z_sub(&rhs[irow], &rhs[irow], &temp); |
1108 |
-+ } |
1109 |
-+ |
1110 |
-+ jcol--; |
1111 |
-+ |
1112 |
-+ } |
1113 |
-+} |
1114 |
-+ |
1115 |
-+ |
1116 |
-+/* |
1117 |
-+ * Performs a dense matrix-vector multiply: Mxvec = Mxvec + M * vec. |
1118 |
-+ * The input matrix is M(1:nrow,1:ncol); The product is returned in Mxvec[]. |
1119 |
-+ */ |
1120 |
-+void zmatvec ( |
1121 |
-+int ldm, /* in -- leading dimension of M */ |
1122 |
-+int nrow, /* in */ |
1123 |
-+int ncol, /* in */ |
1124 |
-+doublecomplex *M, /* in */ |
1125 |
-+doublecomplex *vec, /* in */ |
1126 |
-+doublecomplex *Mxvec /* in/out */ |
1127 |
-+) |
1128 |
-+{ |
1129 |
-+ doublecomplex vi0, vi1, vi2, vi3; |
1130 |
-+ doublecomplex *M0, temp; |
1131 |
-+ doublecomplex *Mki0, *Mki1, *Mki2, *Mki3; |
1132 |
-+ register int firstcol = 0; |
1133 |
-+ int k; |
1134 |
-+ |
1135 |
-+ M0 = &M[0]; |
1136 |
-+ |
1137 |
-+ while ( firstcol < ncol - 3 ) { /* Do 4 columns */ |
1138 |
-+ Mki0 = M0; |
1139 |
-+ Mki1 = Mki0 + ldm; |
1140 |
-+ Mki2 = Mki1 + ldm; |
1141 |
-+ Mki3 = Mki2 + ldm; |
1142 |
-+ |
1143 |
-+ vi0 = vec[firstcol++]; |
1144 |
-+ vi1 = vec[firstcol++]; |
1145 |
-+ vi2 = vec[firstcol++]; |
1146 |
-+ vi3 = vec[firstcol++]; |
1147 |
-+ for (k = 0; k < nrow; k++) { |
1148 |
-+ zz_mult(&temp, &vi0, Mki0); Mki0++; |
1149 |
-+ z_add(&Mxvec[k], &Mxvec[k], &temp); |
1150 |
-+ zz_mult(&temp, &vi1, Mki1); Mki1++; |
1151 |
-+ z_add(&Mxvec[k], &Mxvec[k], &temp); |
1152 |
-+ zz_mult(&temp, &vi2, Mki2); Mki2++; |
1153 |
-+ z_add(&Mxvec[k], &Mxvec[k], &temp); |
1154 |
-+ zz_mult(&temp, &vi3, Mki3); Mki3++; |
1155 |
-+ z_add(&Mxvec[k], &Mxvec[k], &temp); |
1156 |
-+ } |
1157 |
-+ |
1158 |
-+ M0 += 4 * ldm; |
1159 |
-+ } |
1160 |
-+ |
1161 |
-+ while ( firstcol < ncol ) { /* Do 1 column */ |
1162 |
-+ Mki0 = M0; |
1163 |
-+ vi0 = vec[firstcol++]; |
1164 |
-+ for (k = 0; k < nrow; k++) { |
1165 |
-+ zz_mult(&temp, &vi0, Mki0); Mki0++; |
1166 |
-+ z_add(&Mxvec[k], &Mxvec[k], &temp); |
1167 |
-+ } |
1168 |
-+ M0 += ldm; |
1169 |
-+ } |
1170 |
-+ |
1171 |
-+} |
1172 |
-+ |
1173 |
|
1174 |
diff --git a/sci-libs/superlu_mt/files/superlu_mt-2.1-missing-includes.patch b/sci-libs/superlu_mt/files/superlu_mt-2.1-missing-includes.patch |
1175 |
deleted file mode 100644 |
1176 |
index afeca8f..0000000 |
1177 |
--- a/sci-libs/superlu_mt/files/superlu_mt-2.1-missing-includes.patch |
1178 |
+++ /dev/null |
1179 |
@@ -1,44 +0,0 @@ |
1180 |
-diff -Nur TESTING.orig/MATGEN/clatb4.c TESTING/MATGEN/clatb4.c |
1181 |
---- TESTING.orig/MATGEN/clatb4.c 2013-07-15 11:48:34.285967038 -0700 |
1182 |
-+++ TESTING/MATGEN/clatb4.c 2013-07-15 11:49:05.150137959 -0700 |
1183 |
-@@ -3,6 +3,7 @@ |
1184 |
- -lf2c -lm (in that order) |
1185 |
- */ |
1186 |
- |
1187 |
-+#include <string.h> |
1188 |
- #include "f2c.h" |
1189 |
- |
1190 |
- /* Table of constant values */ |
1191 |
-diff -Nur TESTING.orig/MATGEN/dlatb4.c TESTING/MATGEN/dlatb4.c |
1192 |
---- TESTING.orig/MATGEN/dlatb4.c 2013-07-15 11:48:34.288966998 -0700 |
1193 |
-+++ TESTING/MATGEN/dlatb4.c 2013-07-15 11:49:05.150137959 -0700 |
1194 |
-@@ -3,6 +3,7 @@ |
1195 |
- -lf2c -lm (in that order) |
1196 |
- */ |
1197 |
- |
1198 |
-+#include <string.h> |
1199 |
- #include "f2c.h" |
1200 |
- |
1201 |
- /* Table of constant values */ |
1202 |
-diff -Nur TESTING.orig/MATGEN/slatb4.c TESTING/MATGEN/slatb4.c |
1203 |
---- TESTING.orig/MATGEN/slatb4.c 2013-07-15 11:48:34.288966998 -0700 |
1204 |
-+++ TESTING/MATGEN/slatb4.c 2013-07-15 11:49:05.150137959 -0700 |
1205 |
-@@ -3,6 +3,7 @@ |
1206 |
- -lf2c -lm (in that order) |
1207 |
- */ |
1208 |
- |
1209 |
-+#include <string.h> |
1210 |
- #include "f2c.h" |
1211 |
- |
1212 |
- /* Table of constant values */ |
1213 |
-diff -Nur TESTING.orig/MATGEN/zlatb4.c TESTING/MATGEN/zlatb4.c |
1214 |
---- TESTING.orig/MATGEN/zlatb4.c 2013-07-15 11:48:34.288966998 -0700 |
1215 |
-+++ TESTING/MATGEN/zlatb4.c 2013-07-15 11:49:05.150137959 -0700 |
1216 |
-@@ -3,6 +3,7 @@ |
1217 |
- -lf2c -lm (in that order) |
1218 |
- */ |
1219 |
- |
1220 |
-+#include <string.h> |
1221 |
- #include "f2c.h" |
1222 |
- |
1223 |
- /* Table of constant values */ |
1224 |
|
1225 |
diff --git a/sci-libs/superlu_mt/metadata.xml b/sci-libs/superlu_mt/metadata.xml |
1226 |
deleted file mode 100644 |
1227 |
index 2b1e34d..0000000 |
1228 |
--- a/sci-libs/superlu_mt/metadata.xml |
1229 |
+++ /dev/null |
1230 |
@@ -1,26 +0,0 @@ |
1231 |
-<?xml version="1.0" encoding="UTF-8"?> |
1232 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1233 |
-<pkgmetadata> |
1234 |
-<maintainer type="project"> |
1235 |
- <email>sci@g.o</email> |
1236 |
- <name>Gentoo Science Project</name> |
1237 |
-</maintainer> |
1238 |
-<longdescription lang="en"> |
1239 |
- SuperLU is a general purpose library for the direct solution of |
1240 |
- large, sparse, nonsymmetric systems of linear equations on high |
1241 |
- performance machines. The library is written in C and is callable |
1242 |
- from either C or Fortran. The library routines will perform an LU |
1243 |
- decomposition with partial pivoting and triangular system solves |
1244 |
- through forward and back substitution. The LU factorization routines |
1245 |
- can handle non-square matrices but the triangular solves are |
1246 |
- performed only for square matrices. The matrix columns may be |
1247 |
- preordered (before factorization) either through library or user |
1248 |
- supplied routines. This preordering for sparsity is completely |
1249 |
- separate from the factorization. Working precision iterative |
1250 |
- refinement subroutines are provided for improved backward |
1251 |
- stability. Routines are also provided to equilibrate the system, |
1252 |
- estimate the condition number, calculate the relative backward |
1253 |
- error, and estimate error bounds for the refined solutions. |
1254 |
- This is the multi-threaded version (POSIX threads or OpenMP). |
1255 |
-</longdescription> |
1256 |
-</pkgmetadata> |
1257 |
|
1258 |
diff --git a/sci-libs/superlu_mt/superlu_mt-2.1.ebuild b/sci-libs/superlu_mt/superlu_mt-2.1.ebuild |
1259 |
deleted file mode 100644 |
1260 |
index 90ed576..0000000 |
1261 |
--- a/sci-libs/superlu_mt/superlu_mt-2.1.ebuild |
1262 |
+++ /dev/null |
1263 |
@@ -1,110 +0,0 @@ |
1264 |
-# Copyright 1999-2014 Gentoo Foundation |
1265 |
-# Distributed under the terms of the GNU General Public License v2 |
1266 |
-# $Id$ |
1267 |
- |
1268 |
-EAPI=5 |
1269 |
- |
1270 |
-inherit eutils fortran-2 toolchain-funcs |
1271 |
- |
1272 |
-MYPN=SuperLU_MT |
1273 |
- |
1274 |
-DESCRIPTION="Multithreaded sparse LU factorization library" |
1275 |
-HOMEPAGE="http://crd.lbl.gov/~xiaoye/SuperLU/" |
1276 |
-SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz" |
1277 |
- |
1278 |
-LICENSE="BSD" |
1279 |
-SLOT="0" |
1280 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
1281 |
-IUSE="doc openmp threads examples static-libs test" |
1282 |
- |
1283 |
-RDEPEND=" |
1284 |
- virtual/blas" |
1285 |
-DEPEND="${RDEPEND} |
1286 |
- virtual/pkgconfig |
1287 |
- test? ( app-shells/tcsh )" |
1288 |
- |
1289 |
-S="${WORKDIR}/${MYPN}_${PV}" |
1290 |
- |
1291 |
-pkg_setup() { |
1292 |
- if use threads; then |
1293 |
- export CTHREADS="-D__PTHREAD" LDTHREADS="-pthread" |
1294 |
- elif use openmp; then |
1295 |
- if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then |
1296 |
- ewarn "OpenMP is not available in your current selected gcc" |
1297 |
- die "need openmp capable gcc" |
1298 |
- fi |
1299 |
- FORTRAN_NEED_OPENMP=1 |
1300 |
- export CTHREADS="-D__OPENMP" |
1301 |
- [[ $(tc-getCC) == *gcc ]] && LDTHREADS="-fopenmp" |
1302 |
- else |
1303 |
- ewarn "Neither threads or openmp selected. Forcing threads" |
1304 |
- export CTHREADS="-D__PTHREAD" LDTHREADS="-pthread" |
1305 |
- fi |
1306 |
- fortran-2_pkg_setup |
1307 |
-} |
1308 |
- |
1309 |
-src_prepare() { |
1310 |
- epatch \ |
1311 |
- "${FILESDIR}"/${P}-duplicate-symbols.patch \ |
1312 |
- "${FILESDIR}"/${P}-missing-includes.patch |
1313 |
-} |
1314 |
- |
1315 |
-src_configure() { |
1316 |
- sed -i \ |
1317 |
- -e 's/^\(PLAT\s*=\).*/\1/' \ |
1318 |
- -e "s:^\(CC\s*=\).*:\1 $(tc-getCC):" \ |
1319 |
- -e "/CFLAGS/s:-O3:${CFLAGS} \$(PIC):" \ |
1320 |
- -e "s:^\(PREDEFS\s*=\).*:\1 ${CPPFLAGS} -DUSE_VENDOR_BLAS \$(CTHREADS)$:" \ |
1321 |
- -e "s:^\(NOOPTS\s*=.*\):\1 \$(PIC):" \ |
1322 |
- -e "s:^\(FORTRAN\s*=\).*:\1 $(tc-getFC):" \ |
1323 |
- -e "s:^\(FFLAGS\s*=\).*:\1 ${FFLAGS} \$(PIC):" \ |
1324 |
- -e "s:^\(ARCH\s*=\).*:\1 $(tc-getAR):" \ |
1325 |
- -e "s:^\(RANLIB\s*=\).*:\1 $(tc-getRANLIB):" \ |
1326 |
- -e "s:^\(LOADER\s*=\).*:\1 $(tc-getCC):" \ |
1327 |
- -e "s:^\(LOADOPTS\s*=\).*:\1 ${LDFLAGS} \$(LDTHREADS):" \ |
1328 |
- -e "/MPLIB/d" \ |
1329 |
- -e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \ |
1330 |
- make.inc || die |
1331 |
- SONAME=libsuperlu_mt.so.0 |
1332 |
- sed -i \ |
1333 |
- -e 's|../make.inc|make.inc|' \ |
1334 |
- -e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \ |
1335 |
- -e '/:.*$(SUPERLULIB)/s|../lib/$(SUPERLULIB)||g' \ |
1336 |
- -e 's|../lib/$(SUPERLULIB)|-lsuperlu_mt|g' \ |
1337 |
- EXAMPLE/Makefile || die |
1338 |
-} |
1339 |
- |
1340 |
-src_compile() { |
1341 |
- emake superlulib \ |
1342 |
- PIC="-fPIC" ARCH="echo" ARCHFLAGS="" RANLIB="echo" |
1343 |
- $(tc-getCC) ${LDFLAGS} ${LDTHREADS} -shared -Wl,-soname=${SONAME} SRC/*.o \ |
1344 |
- $($(tc-getPKG_CONFIG) --libs blas) -lm -o lib/${SONAME} || die |
1345 |
- ln -s ${SONAME} lib/libsuperlu_mt.so || die |
1346 |
- |
1347 |
- use static-libs && rm -f SRC/*.o && emake superlulib \ |
1348 |
- PIC="" ARCH="$(tc-getAR)" ARCHFLAGS="cr" RANLIB="$(tc-getRANLIB)" |
1349 |
-} |
1350 |
- |
1351 |
-src_test() { |
1352 |
- emake -j1 tmglib |
1353 |
- LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \ |
1354 |
- emake SUPERLULIB="${SONAME}" testing |
1355 |
-} |
1356 |
- |
1357 |
-src_install() { |
1358 |
- dolib.so lib/*so* |
1359 |
- use static-libs && dolib.a lib/*.a |
1360 |
- insinto /usr/include/${PN} |
1361 |
- doins SRC/*h |
1362 |
- dodoc README |
1363 |
- use doc && dodoc DOC/ug.pdf |
1364 |
- if use examples; then |
1365 |
- insinto /usr/share/doc/${PF}/examples |
1366 |
- doins -r EXAMPLE/* make.inc |
1367 |
- fi |
1368 |
-} |
1369 |
- |
1370 |
-pkg_postinst() { |
1371 |
- elog "${PN} has been designed to work with a single-threaded blas library" |
1372 |
- elog "Make sure to eselect one (openblas/atlas) when using superlu_mt" |
1373 |
-} |
1374 |
|
1375 |
diff --git a/sci-misc/fitscut/fitscut-1.4.4.ebuild b/sci-misc/fitscut/fitscut-1.4.4.ebuild |
1376 |
deleted file mode 100644 |
1377 |
index 677ec7e..0000000 |
1378 |
--- a/sci-misc/fitscut/fitscut-1.4.4.ebuild |
1379 |
+++ /dev/null |
1380 |
@@ -1,39 +0,0 @@ |
1381 |
-# Copyright 1999-2015 Gentoo Foundation |
1382 |
-# Distributed under the terms of the GNU General Public License v2 |
1383 |
-# $Id$ |
1384 |
- |
1385 |
-EAPI=5 |
1386 |
- |
1387 |
-AUTOTOOLS_AUTORECONF=1 |
1388 |
- |
1389 |
-inherit autotools-utils |
1390 |
- |
1391 |
-DESCRIPTION="Extract cutouts from FITS image files" |
1392 |
-HOMEPAGE="http://acs.pha.jhu.edu/general/software/fitscut/" |
1393 |
-SRC_URI="${HOMEPAGE}/download/${P}.tar.gz" |
1394 |
- |
1395 |
-LICENSE="GPL-2" |
1396 |
-SLOT="0" |
1397 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
1398 |
-IUSE="" |
1399 |
- |
1400 |
-RDEPEND=" |
1401 |
- >=sci-libs/cfitsio-3:0= |
1402 |
- sci-astronomy/wcstools:0= |
1403 |
- media-libs/libpng:0= |
1404 |
- virtual/jpeg:0=" |
1405 |
-DEPEND="${RDEPEND}" |
1406 |
- |
1407 |
-src_prepare() { |
1408 |
- # gentoo wcs is called wcstools to avoid conflict with wcslib |
1409 |
- sed -i \ |
1410 |
- -e 's/libwcs/wcs/g' \ |
1411 |
- wcs*.c fitscut.c || die |
1412 |
- # cfitsio/fitsio.h might conflict with host on prefix |
1413 |
- sed -i \ |
1414 |
- -e 's/LIB(wcs,/LIB(wcstools,/' \ |
1415 |
- -e 's/-lwcs/-lwcstools/' \ |
1416 |
- -e '/cfitsio\/fitsio.h/d' \ |
1417 |
- configure.in || die |
1418 |
- autotools-utils_src_prepare |
1419 |
-} |
1420 |
|
1421 |
diff --git a/sci-misc/fitscut/metadata.xml b/sci-misc/fitscut/metadata.xml |
1422 |
deleted file mode 100644 |
1423 |
index cc63d59..0000000 |
1424 |
--- a/sci-misc/fitscut/metadata.xml |
1425 |
+++ /dev/null |
1426 |
@@ -1,14 +0,0 @@ |
1427 |
-<?xml version="1.0" encoding="UTF-8"?> |
1428 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1429 |
-<pkgmetadata> |
1430 |
- <maintainer type="project"> |
1431 |
- <email>sci-astronomy@g.o</email> |
1432 |
- <name>Gentoo Astronomy Project</name> |
1433 |
- </maintainer> |
1434 |
- <longdescription lang="en"> |
1435 |
- fitscut is designed to extract cutouts from FITS image format |
1436 |
- files. FITS, PNG, and JPEG output types are supported. |
1437 |
- When multiple input files are specified and the output type is PNG or |
1438 |
- JPEG the resulting image is an RGB color image. |
1439 |
-</longdescription> |
1440 |
-</pkgmetadata> |
1441 |
|
1442 |
diff --git a/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch b/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch |
1443 |
deleted file mode 100644 |
1444 |
index 0c80297..0000000 |
1445 |
--- a/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch |
1446 |
+++ /dev/null |
1447 |
@@ -1,64 +0,0 @@ |
1448 |
---- Looptools/Makefile.am |
1449 |
-+++ Looptools/Makefile.am |
1450 |
-@@ -1,58 +1,12 @@ |
1451 |
--noinst_LTLIBRARIES = libHwLooptoolsXFC.la libHwLooptoolsCFC.la |
1452 |
--noinst_LTLIBRARIES += libHwLooptools.la |
1453 |
-- |
1454 |
--EXTRA_DIST = include/lt.h include/ftypes.h include/ff.h include/ffwarn.h \ |
1455 |
-- include/fferr.h include/defs.h include/looptools.h include/ffperm5.h \ |
1456 |
-- include/clooptools.h include/cexternals.h include/externals.h \ |
1457 |
-- util/solve-LU.F util/solve-LU.h util/solve-Eigen.F |
1458 |
-- |
1459 |
--theXFCSOURCES = \ |
1460 |
--A/A0.F A/A00.F A/ffxa0.F A/ffca0.F B/Bget.F \ |
1461 |
--B/Bcoeff.F B/BcoeffC.F B/Bcoeffa.F B/Bcoeffb.F B/ffxb0.F \ |
1462 |
--B/ffcb0.F B/ffxb1.F B/ffcb1.F B/ffxb2p.F B/ffcb2p.F \ |
1463 |
--B/ffxdb0.F B/ffcdb0.F B/ffxdb1.F B/ffdel2.F B/ffcel2.F \ |
1464 |
--C/C0.F C/C0C.F C/Cget.F C/ffxc0.F C/ffcc0.F \ |
1465 |
--C/ffxc0i.F C/ffxc0p.F C/ffxc0p0.F C/ffcc0p.F C/ffdxc0.F \ |
1466 |
--C/ffdel3.F C/ffcel3.F D/D0.F D/D0C.F D/Dget.F \ |
1467 |
--D/ffxd0.F D/ffxd0h.F D/ffxd0i.F D/ffxd0p.F D/ffxd0m0.F \ |
1468 |
--D/ffxd0tra.F D/ffxdbd.F D/ffdcc0.F D/ffdel4.F D/ffd0c.F \ |
1469 |
--D/ffTn.F D/ffT13.F D/ffS2.F D/ffS3n.F D/ffRn.F \ |
1470 |
--E/E0.F E/Eget.F E/Ecoeffa.F E/Ecoeffb.F E/ffxe0.F \ |
1471 |
--E/ffdel5.F util/ini.F util/auxCD.F util/solve.F util/Dump.F \ |
1472 |
--util/Li2.F util/ffinit.F util/ffxli2.F util/ffcli2.F util/ffxxyz.F \ |
1473 |
--util/ffcxyz.F util/ffcrr.F util/ffcxr.F util/fftran.F util/ffabcd.F \ |
1474 |
--util/ff2dl2.F util/ffcxs3.F util/ffcxs4.F util/ffdcxs.F util/ffbndc.F |
1475 |
-- |
1476 |
--## the following need -DCOMPLEXPARA |
1477 |
--theCFCSOURCES = \ |
1478 |
--A/A0.F A/A00.F B/Bget.F B/Bcoeffa.F C/Cget.F D/Dget.F E/E0.F \ |
1479 |
--E/Eget.F E/Ecoeffa.F E/Ecoeffb.F util/solve.F util/Dump.F util/Li2.F |
1480 |
-+noinst_LTLIBRARIES = libHwLooptools.la |
1481 |
- |
1482 |
- commonCPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include |
1483 |
- |
1484 |
--libHwLooptoolsXFC_la_SOURCES = $(theXFCSOURCES) |
1485 |
--libHwLooptoolsXFC_la_CPPFLAGS = $(commonCPPFLAGS) |
1486 |
--libHwLooptoolsXFC_la_FCFLAGS = $(AM_FCFLAGS) -ffixed-line-length-none |
1487 |
--libHwLooptoolsXFC_la_FFLAGS = $(AM_FFLAGS) -ffixed-line-length-none |
1488 |
-- |
1489 |
--libHwLooptoolsCFC_la_SOURCES = $(theCFCSOURCES) |
1490 |
--libHwLooptoolsCFC_la_CPPFLAGS = $(commonCPPFLAGS) -DCOMPLEXPARA |
1491 |
--libHwLooptoolsCFC_la_FCFLAGS = $(AM_FCFLAGS) -ffixed-line-length-none |
1492 |
--libHwLooptoolsCFC_la_FFLAGS = $(AM_FFLAGS) -ffixed-line-length-none |
1493 |
-- |
1494 |
--## installed already from "include/Makefile.am" |
1495 |
--## noinst_HEADERS = include/clooptools.h |
1496 |
-- |
1497 |
--##if NEED_APPLE_FIXES |
1498 |
--##libHwLooptoolsXFC_la_LDFLAGS = -Wl,-single_module |
1499 |
--##libHwLooptoolsCFC_la_LDFLAGS = -Wl,-single_module |
1500 |
--##endif |
1501 |
-- |
1502 |
--libHwLooptools_la_SOURCES = util/cache.c clooptools.cc |
1503 |
-+libHwLooptools_la_SOURCES = clooptools.cc |
1504 |
- libHwLooptools_la_CXXFLAGS = $(AM_CXXFLAGS) -Wno-strict-aliasing |
1505 |
- libHwLooptools_la_CPPFLAGS = $(commonCPPFLAGS) |
1506 |
- libHwLooptools_la_CFLAGS = $(AM_CFLAGS) -std=c99 |
1507 |
--libHwLooptools_la_LIBADD = libHwLooptoolsXFC.la libHwLooptoolsCFC.la |
1508 |
-+libHwLooptools_la_LIBADD = -looptools |
1509 |
- |
1510 |
- |
1511 |
- ## libHwLooptoolsHelper2_la_SOURCES = clooptools.cc |
1512 |
|
1513 |
diff --git a/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild b/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild |
1514 |
deleted file mode 100644 |
1515 |
index 05ab0f2..0000000 |
1516 |
--- a/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild |
1517 |
+++ /dev/null |
1518 |
@@ -1,57 +0,0 @@ |
1519 |
-# Copyright 1999-2015 Gentoo Foundation |
1520 |
-# Distributed under the terms of the GNU General Public License v2 |
1521 |
-# $Id$ |
1522 |
- |
1523 |
-EAPI=5 |
1524 |
- |
1525 |
-AUTOTOOLS_AUTORECONF=1 |
1526 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
1527 |
- |
1528 |
-inherit autotools-utils eutils flag-o-matic multilib |
1529 |
- |
1530 |
-MYP=Herwig++-${PV} |
1531 |
- |
1532 |
-DESCRIPTION="High-Energy Physics event generator" |
1533 |
-HOMEPAGE="http://herwig.hepforge.org/" |
1534 |
-SRC_URI="http://www.hepforge.org/archive/herwig/${MYP}.tar.bz2" |
1535 |
- |
1536 |
-LICENSE="GPL-2" |
1537 |
- |
1538 |
-SLOT="0/14" |
1539 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
1540 |
-IUSE="c++11 fastjet static-libs" |
1541 |
- |
1542 |
-RDEPEND=" |
1543 |
- dev-libs/boost:0= |
1544 |
- sci-libs/gsl:0= |
1545 |
- <=sci-physics/looptools-2.8:0= |
1546 |
- >=sci-physics/thepeg-1.9.1:0= |
1547 |
- fastjet? ( sci-physics/fastjet:0= )" |
1548 |
-DEPEND="${RDEPEND} |
1549 |
- virtual/fortran" |
1550 |
- |
1551 |
-S="${WORKDIR}/${MYP}" |
1552 |
- |
1553 |
-src_prepare() { |
1554 |
- epatch "${FILESDIR}"/${PN}-2.6.3-looptools.patch |
1555 |
- find -name 'Makefile.am' -exec \ |
1556 |
- sed -i -e '1ipkgdatadir=$(datadir)/herwig++' {} \; || die |
1557 |
- autotools-utils_src_prepare |
1558 |
-} |
1559 |
- |
1560 |
-src_configure() { |
1561 |
- use prefix && \ |
1562 |
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/ThePEG |
1563 |
- local myeconfargs=( |
1564 |
- --with-boost="${EPREFIX}"/usr |
1565 |
- --with-thepeg="${EPREFIX}"/usr |
1566 |
- $(use_enable c++11 stdcxx11) |
1567 |
- $(use_with fastjet fastjet "${EPREFIX}"/usr) |
1568 |
- ) |
1569 |
- autotools-utils_src_configure |
1570 |
-} |
1571 |
- |
1572 |
-pkg_preinst () { |
1573 |
- sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die |
1574 |
- sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die |
1575 |
-} |
1576 |
|
1577 |
diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml |
1578 |
deleted file mode 100644 |
1579 |
index 8db6bd6..0000000 |
1580 |
--- a/sci-physics/herwig++/metadata.xml |
1581 |
+++ /dev/null |
1582 |
@@ -1,23 +0,0 @@ |
1583 |
-<?xml version="1.0" encoding="UTF-8"?> |
1584 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1585 |
-<pkgmetadata> |
1586 |
-<maintainer type="person"> |
1587 |
- <email>jauhien@g.o</email> |
1588 |
-</maintainer> |
1589 |
-<maintainer type="project"> |
1590 |
- <email>sci-physics@g.o</email> |
1591 |
- <name>Gentoo Physics Project</name> |
1592 |
-</maintainer> |
1593 |
-<longdescription> |
1594 |
- Herwig++ is a completely new event generator, written in C++. |
1595 |
- It is built on the experience gained with the well-known |
1596 |
- event generator HERWIG. The aim is to provide a multi purpose |
1597 |
- event generator with similar or improved capabilities (like angular |
1598 |
- ordered parton evolution and the cluster hadronization model). |
1599 |
-</longdescription> |
1600 |
-<use> |
1601 |
- <flag name="c++11">Build Herwig++ using the C++11 standard. |
1602 |
- Experimental feature, not for production use.</flag> |
1603 |
- <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag> |
1604 |
-</use> |
1605 |
-</pkgmetadata> |
1606 |
|
1607 |
diff --git a/sci-physics/looptools/files/looptools-2.10-makefile.patch b/sci-physics/looptools/files/looptools-2.10-makefile.patch |
1608 |
deleted file mode 100644 |
1609 |
index 8758244..0000000 |
1610 |
--- a/sci-physics/looptools/files/looptools-2.10-makefile.patch |
1611 |
+++ /dev/null |
1612 |
@@ -1,98 +0,0 @@ |
1613 |
---- makefile.in |
1614 |
-+++ makefile.in |
1615 |
-@@ -1,14 +1,17 @@ |
1616 |
- BLD = build$(QUADSUFFIX) |
1617 |
- |
1618 |
--LIBDIR = $(PREFIX)/lib$(LIBDIRSUFFIX) |
1619 |
--INCLUDEDIR = $(PREFIX)/include |
1620 |
--BINDIR = $(PREFIX)/bin |
1621 |
-+LIBDIR = $(DESTDIR)/$(PREFIX)/lib$(LIBDIRSUFFIX) |
1622 |
-+INCLUDEDIR = $(DESTDIR)/$(PREFIX)/include |
1623 |
-+BINDIR = $(DESTDIR)/$(PREFIX)/bin |
1624 |
- |
1625 |
- LIB = libooptools$(QUADSUFFIX).a |
1626 |
- FE = lt$(QUADSUFFIX)$(EXE) |
1627 |
- MFE = LoopTools$(QUADSUFFIX)$(EXE) |
1628 |
- INCLUDE = $(BLD)/looptools.h $(BLD)/clooptools.h |
1629 |
- |
1630 |
-+LIBRARY=libooptools.so |
1631 |
-+REALNAME=$(LIBRARY).$(VER) |
1632 |
-+ |
1633 |
- ARGS = $(PARALLEL) \ |
1634 |
- LIB="$(LIB)" \ |
1635 |
- FE="$(FE)" \ |
1636 |
-@@ -16,12 +19,12 @@ |
1637 |
- EXE="$(EXE)" \ |
1638 |
- DEF="$(DEF)" \ |
1639 |
- NOUNDERSCORE="$(NOUNDERSCORE)" \ |
1640 |
-- XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I." \ |
1641 |
-+ XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I. -fPIC" \ |
1642 |
- F90="$(F90)" \ |
1643 |
- CC="$(CC)" \ |
1644 |
-- CFLAGS="$(CFLAGS) $(CFLAGS-quad)" \ |
1645 |
-+ CFLAGS="$(CFLAGS) $(CFLAGS-quad) -fPIC" \ |
1646 |
- CXX="$(CXX)" \ |
1647 |
-- CXXFLAGS="$(CXXFLAGS)" \ |
1648 |
-+ CXXFLAGS="$(CXXFLAGS) -fPIC" \ |
1649 |
- ML="$(ML)" \ |
1650 |
- MCC="$(MCC)" \ |
1651 |
- MCFLAGS="$(MCFLAGS)" \ |
1652 |
-@@ -32,22 +35,24 @@ |
1653 |
- DLLTOOL="$(DLLTOOL)" \ |
1654 |
- LDFLAGS="$(LDFLAGS)" \ |
1655 |
- LIBPATH="$(LIBPATH)" \ |
1656 |
-- OBJS-quad="$(OBJS-quad)" |
1657 |
-+ OBJS-quad="$(OBJS-quad)" \ |
1658 |
-+ REALNAME="$(REALNAME)" |
1659 |
- |
1660 |
- |
1661 |
--default all lib frontend mma: force |
1662 |
-+default all lib solib frontend mma: force |
1663 |
- cd $(BLD) && $(MAKE) $(ARGS) $@ |
1664 |
- |
1665 |
--install: lib frontend |
1666 |
-- -mkdir $(PREFIX) |
1667 |
-+install: lib solib frontend |
1668 |
-+ -mkdir $(DESTDIR)$(PREFIX) |
1669 |
- -mkdir $(LIBDIR) $(BINDIR) $(INCLUDEDIR) |
1670 |
- cp -p $(BLD)/$(LIB) $(LIBDIR) |
1671 |
- cp -p $(INCLUDE$(QUADSUFFIX)) $(INCLUDEDIR) |
1672 |
-- strip $(BLD)/$(FE) |
1673 |
- cp -p $(BLD)/fcc $(BLD)/$(FE) $(BINDIR) |
1674 |
- rm -f $(BINDIR)/f++ |
1675 |
- ln -s fcc $(BINDIR)/f++ |
1676 |
-- test ! -f $(BLD)/$(MFE) || { strip $(BLD)/$(MFE) ; cp -p $(BLD)/$(MFE) $(BINDIR); } |
1677 |
-+ test ! -f $(BLD)/$(MFE) || { cp -p $(BLD)/$(MFE) $(BINDIR); } |
1678 |
-+ cp -p $(BLD)/$(REALNAME) $(LIBDIR) |
1679 |
-+ cd $(LIBDIR) && ln -s $(REALNAME) $(LIBRARY) |
1680 |
- |
1681 |
- force: $(BLD)/timestamp |
1682 |
- |
1683 |
---- src/makefile |
1684 |
-+++ src/makefile |
1685 |
-@@ -1,6 +1,6 @@ |
1686 |
--default: frontend mma$(ML) |
1687 |
-+default: frontend mma$(ML) solib |
1688 |
- |
1689 |
--all: frontend mma1 |
1690 |
-+all: frontend mma1 solib |
1691 |
- |
1692 |
- frontend: lib $(FE) |
1693 |
- |
1694 |
-@@ -8,6 +8,7 @@ |
1695 |
- |
1696 |
- mma0 lib: $(LIB) clooptools.h fcc |
1697 |
- |
1698 |
-+solib: $(REALNAME) fcc |
1699 |
- |
1700 |
- .SUFFIXES: |
1701 |
- |
1702 |
-@@ -243,6 +244,8 @@ |
1703 |
- $(AR) cru $(LIB) $? |
1704 |
- -$(RANLIB) $(LIB) |
1705 |
- |
1706 |
-+$(REALNAME): $(OBJS) |
1707 |
-+ $(XFC) $(LDFLAGS) -shared -Wl,--soname,$(REALNAME) -o $@ $? |
1708 |
- |
1709 |
- $(FE): lt.F $(LTINC) $(LIB) |
1710 |
- $(XFC) -o $(FE) lt.F $(LIB) -lpthread |
1711 |
|
1712 |
diff --git a/sci-physics/looptools/files/looptools-2.8-makefile.patch b/sci-physics/looptools/files/looptools-2.8-makefile.patch |
1713 |
deleted file mode 100644 |
1714 |
index 5252c1d..0000000 |
1715 |
--- a/sci-physics/looptools/files/looptools-2.8-makefile.patch |
1716 |
+++ /dev/null |
1717 |
@@ -1,96 +0,0 @@ |
1718 |
---- makefile.in |
1719 |
-+++ makefile.in |
1720 |
-@@ -1,14 +1,17 @@ |
1721 |
- BLD = build$(QUADSUFFIX) |
1722 |
- |
1723 |
--LIBDIR = $(PREFIX)/lib$(LIBDIRSUFFIX) |
1724 |
--INCLUDEDIR = $(PREFIX)/include |
1725 |
--BINDIR = $(PREFIX)/bin |
1726 |
-+LIBDIR = $(DESTDIR)/$(PREFIX)/lib$(LIBDIRSUFFIX) |
1727 |
-+INCLUDEDIR = $(DESTDIR)/$(PREFIX)/include |
1728 |
-+BINDIR = $(DESTDIR)/$(PREFIX)/bin |
1729 |
- |
1730 |
- LIB = libooptools$(QUADSUFFIX).a |
1731 |
- FE = lt$(QUADSUFFIX)$(EXE) |
1732 |
- MFE = LoopTools$(QUADSUFFIX)$(EXE) |
1733 |
- INCLUDE = $(BLD)/looptools.h $(BLD)/clooptools.h |
1734 |
- |
1735 |
-+LIBRARY=libooptools.so |
1736 |
-+REALNAME=$(LIBRARY).$(VER) |
1737 |
-+ |
1738 |
- ARGS = $(PARALLEL) \ |
1739 |
- LIB="$(LIB)" \ |
1740 |
- FE="$(FE)" \ |
1741 |
-@@ -16,12 +19,12 @@ |
1742 |
- EXE="$(EXE)" \ |
1743 |
- DEF="$(DEF)" \ |
1744 |
- NOUNDERSCORE="$(NOUNDERSCORE)" \ |
1745 |
-- XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I." \ |
1746 |
-+ XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I. -fPIC" \ |
1747 |
- F90="$(F90)" \ |
1748 |
- CC="$(CC)" \ |
1749 |
-- CFLAGS="$(CFLAGS) $(CFLAGS-quad)" \ |
1750 |
-+ CFLAGS="$(CFLAGS) $(CFLAGS-quad) -fPIC" \ |
1751 |
- CXX="$(CXX)" \ |
1752 |
-- CXXFLAGS="$(CXXFLAGS)" \ |
1753 |
-+ CXXFLAGS="$(CXXFLAGS) -fPIC" \ |
1754 |
- ML="$(ML)" \ |
1755 |
- MCC="$(MCC)" \ |
1756 |
- MCFLAGS="$(MCFLAGS)" \ |
1757 |
-@@ -31,20 +34,22 @@ |
1758 |
- DLLTOOL="$(DLLTOOL)" \ |
1759 |
- LDFLAGS="$(LDFLAGS)" \ |
1760 |
- LIBPATH="$(LIBPATH)" \ |
1761 |
-- OBJS-quad="$(OBJS-quad)" |
1762 |
-+ OBJS-quad="$(OBJS-quad)" \ |
1763 |
-+ REALNAME="$(REALNAME)" |
1764 |
- |
1765 |
- |
1766 |
--default all lib frontend mma: force |
1767 |
-+default all lib solib frontend mma: force |
1768 |
- cd $(BLD) && $(MAKE) $(ARGS) $@ |
1769 |
- |
1770 |
--install: lib frontend |
1771 |
-- -mkdir $(PREFIX) |
1772 |
-+install: lib solib frontend |
1773 |
-+ -mkdir $(DESTDIR)$(PREFIX) |
1774 |
- -mkdir $(LIBDIR) $(BINDIR) $(INCLUDEDIR) |
1775 |
- cp -p $(BLD)/$(LIB) $(LIBDIR) |
1776 |
- cp -p $(INCLUDE$(QUADSUFFIX)) $(INCLUDEDIR) |
1777 |
-- strip $(BLD)/$(FE) |
1778 |
- cp -p $(BLD)/fcc $(BLD)/$(FE) $(BINDIR) |
1779 |
-- test ! -f $(BLD)/$(MFE) || { strip $(BLD)/$(MFE) ; cp -p $(BLD)/$(MFE) $(BINDIR); } |
1780 |
-+ test ! -f $(BLD)/$(MFE) || { cp -p $(BLD)/$(MFE) $(BINDIR); } |
1781 |
-+ cp -p $(BLD)/$(REALNAME) $(LIBDIR) |
1782 |
-+ cd $(LIBDIR) && ln -s $(REALNAME) $(LIBRARY) |
1783 |
- |
1784 |
- force: $(BLD)/timestamp |
1785 |
- |
1786 |
---- src/makefile |
1787 |
-+++ src/makefile |
1788 |
-@@ -1,6 +1,6 @@ |
1789 |
--default: frontend mma$(ML) |
1790 |
-+default: frontend mma$(ML) solib |
1791 |
- |
1792 |
--all: frontend mma1 |
1793 |
-+all: frontend mma1 solib |
1794 |
- |
1795 |
- frontend: lib $(FE) |
1796 |
- |
1797 |
-@@ -8,6 +8,7 @@ |
1798 |
- |
1799 |
- mma0 lib: $(LIB) clooptools.h fcc |
1800 |
- |
1801 |
-+solib: $(REALNAME) fcc |
1802 |
- |
1803 |
- .SUFFIXES: |
1804 |
- |
1805 |
-@@ -247,6 +248,8 @@ |
1806 |
- $(AR) cru $(LIB) $? |
1807 |
- -$(RANLIB) $(LIB) |
1808 |
- |
1809 |
-+$(REALNAME): $(OBJS) |
1810 |
-+ $(XFC) $(LDFLAGS) -shared -Wl,--soname,$(REALNAME) -o $@ $? |
1811 |
- |
1812 |
- $(FE): lt.F $(LTINC) $(LIB) |
1813 |
- $(XFC) -o $(FE) lt.F $(LIB) |
1814 |
|
1815 |
diff --git a/sci-physics/looptools/looptools-2.10.ebuild b/sci-physics/looptools/looptools-2.10.ebuild |
1816 |
deleted file mode 100644 |
1817 |
index 008a5ca..0000000 |
1818 |
--- a/sci-physics/looptools/looptools-2.10.ebuild |
1819 |
+++ /dev/null |
1820 |
@@ -1,39 +0,0 @@ |
1821 |
-# Copyright 1999-2014 Gentoo Foundation |
1822 |
-# Distributed under the terms of the GNU General Public License v2 |
1823 |
-# $Id$ |
1824 |
- |
1825 |
-EAPI=5 |
1826 |
- |
1827 |
-inherit eutils fortran-2 multilib |
1828 |
- |
1829 |
-MYP=LoopTools-${PV} |
1830 |
- |
1831 |
-DESCRIPTION="Tools for evaluation of scalar and tensor one-loop integrals" |
1832 |
-HOMEPAGE="http://www.feynarts.de/looptools" |
1833 |
-SRC_URI="http://www.feynarts.de/looptools/${MYP}.tar.gz" |
1834 |
- |
1835 |
-LICENSE="LGPL-3" |
1836 |
- |
1837 |
-SLOT="0/${PV}" |
1838 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
1839 |
-IUSE="doc static-libs" |
1840 |
- |
1841 |
-DEPEND="virtual/fortran" |
1842 |
-RDEPEND="${DEPEND}" |
1843 |
- |
1844 |
-S="${WORKDIR}/${MYP}" |
1845 |
- |
1846 |
-src_prepare() { |
1847 |
- epatch "${FILESDIR}"/${P}-makefile.patch |
1848 |
- export VER="${PV}" |
1849 |
- # necessary fix for prefix |
1850 |
- sed -i "s/lib\$(LIBDIRSUFFIX)/$(get_libdir)/" makefile.in || die |
1851 |
-} |
1852 |
- |
1853 |
-src_install() { |
1854 |
- default |
1855 |
- # another one of these package building archive with pic |
1856 |
- # no: ooptools is not a typo |
1857 |
- use static-libs || rm "${ED}"/usr/$(get_libdir)/libooptools.a |
1858 |
- use doc && dodoc manual/*.pdf |
1859 |
-} |
1860 |
|
1861 |
diff --git a/sci-physics/looptools/looptools-2.11.ebuild b/sci-physics/looptools/looptools-2.11.ebuild |
1862 |
deleted file mode 100644 |
1863 |
index 04f017d..0000000 |
1864 |
--- a/sci-physics/looptools/looptools-2.11.ebuild |
1865 |
+++ /dev/null |
1866 |
@@ -1,39 +0,0 @@ |
1867 |
-# Copyright 1999-2014 Gentoo Foundation |
1868 |
-# Distributed under the terms of the GNU General Public License v2 |
1869 |
-# $Id$ |
1870 |
- |
1871 |
-EAPI=5 |
1872 |
- |
1873 |
-inherit eutils fortran-2 multilib |
1874 |
- |
1875 |
-MYP=LoopTools-${PV} |
1876 |
- |
1877 |
-DESCRIPTION="Tools for evaluation of scalar and tensor one-loop integrals" |
1878 |
-HOMEPAGE="http://www.feynarts.de/looptools" |
1879 |
-SRC_URI="http://www.feynarts.de/looptools/${MYP}.tar.gz" |
1880 |
- |
1881 |
-LICENSE="LGPL-3" |
1882 |
- |
1883 |
-SLOT="0/${PV}" |
1884 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
1885 |
-IUSE="doc static-libs" |
1886 |
- |
1887 |
-DEPEND="virtual/fortran" |
1888 |
-RDEPEND="${DEPEND}" |
1889 |
- |
1890 |
-S="${WORKDIR}/${MYP}" |
1891 |
- |
1892 |
-src_prepare() { |
1893 |
- epatch "${FILESDIR}"/${PN}-2.10-makefile.patch |
1894 |
- export VER="${PV}" |
1895 |
- # necessary fix for prefix |
1896 |
- sed -i "s/lib\$(LIBDIRSUFFIX)/$(get_libdir)/" makefile.in || die |
1897 |
-} |
1898 |
- |
1899 |
-src_install() { |
1900 |
- default |
1901 |
- # another one of these package building archive with pic |
1902 |
- # no: ooptools is not a typo |
1903 |
- use static-libs || rm "${ED}"/usr/$(get_libdir)/libooptools.a |
1904 |
- use doc && dodoc manual/*.pdf |
1905 |
-} |
1906 |
|
1907 |
diff --git a/sci-physics/looptools/looptools-2.9.ebuild b/sci-physics/looptools/looptools-2.9.ebuild |
1908 |
deleted file mode 100644 |
1909 |
index 64a53bb..0000000 |
1910 |
--- a/sci-physics/looptools/looptools-2.9.ebuild |
1911 |
+++ /dev/null |
1912 |
@@ -1,39 +0,0 @@ |
1913 |
-# Copyright 1999-2014 Gentoo Foundation |
1914 |
-# Distributed under the terms of the GNU General Public License v2 |
1915 |
-# $Id$ |
1916 |
- |
1917 |
-EAPI=5 |
1918 |
- |
1919 |
-inherit eutils fortran-2 multilib |
1920 |
- |
1921 |
-MYP=LoopTools-${PV} |
1922 |
- |
1923 |
-DESCRIPTION="Tools for evaluation of scalar and tensor one-loop integrals" |
1924 |
-HOMEPAGE="http://www.feynarts.de/looptools" |
1925 |
-SRC_URI="http://www.feynarts.de/looptools/${MYP}.tar.gz" |
1926 |
- |
1927 |
-LICENSE="LGPL-3" |
1928 |
- |
1929 |
-SLOT="0/${PV}" |
1930 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
1931 |
-IUSE="doc static-libs" |
1932 |
- |
1933 |
-DEPEND="virtual/fortran" |
1934 |
-RDEPEND="${DEPEND}" |
1935 |
- |
1936 |
-S="${WORKDIR}/${MYP}" |
1937 |
- |
1938 |
-src_prepare() { |
1939 |
- epatch "${FILESDIR}"/${PN}-2.8-makefile.patch |
1940 |
- export VER="${PV}" |
1941 |
- # necessary fix for prefix |
1942 |
- sed -i "s/lib\$(LIBDIRSUFFIX)/$(get_libdir)/" makefile.in || die |
1943 |
-} |
1944 |
- |
1945 |
-src_install() { |
1946 |
- default |
1947 |
- # another one of these package building archive with pic |
1948 |
- # no: ooptools is not a typo |
1949 |
- use static-libs || rm "${ED}"/usr/$(get_libdir)/libooptools.a |
1950 |
- use doc && dodoc manual/*.pdf |
1951 |
-} |
1952 |
|
1953 |
diff --git a/sci-physics/looptools/metadata.xml b/sci-physics/looptools/metadata.xml |
1954 |
deleted file mode 100644 |
1955 |
index 4333af5..0000000 |
1956 |
--- a/sci-physics/looptools/metadata.xml |
1957 |
+++ /dev/null |
1958 |
@@ -1,15 +0,0 @@ |
1959 |
-<?xml version="1.0" encoding="UTF-8"?> |
1960 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1961 |
-<pkgmetadata> |
1962 |
-<maintainer type="project"> |
1963 |
- <email>sci-physics@g.o</email> |
1964 |
- <name>Gentoo Physics Project</name> |
1965 |
-</maintainer> |
1966 |
-<longdescription> |
1967 |
- A package for evaluation of scalar and tensor one-loop integrals |
1968 |
- based on the FF package by G.J. van Oldenborgh. |
1969 |
- It features an easy Fortran, C++, and Mathematica interface |
1970 |
- to the scalar one-loop functions of FF and in addition provides |
1971 |
- the 2-, 3-, and 4-point tensor coefficient functions. |
1972 |
-</longdescription> |
1973 |
-</pkgmetadata> |
1974 |
|
1975 |
diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml |
1976 |
deleted file mode 100644 |
1977 |
index 532272a..0000000 |
1978 |
--- a/sci-physics/rivet/metadata.xml |
1979 |
+++ /dev/null |
1980 |
@@ -1,19 +0,0 @@ |
1981 |
-<?xml version="1.0" encoding="UTF-8"?> |
1982 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1983 |
-<pkgmetadata> |
1984 |
-<maintainer type="project"> |
1985 |
- <email>sci-physics@g.o</email> |
1986 |
- <name>Gentoo Physics Project</name> |
1987 |
-</maintainer> |
1988 |
-<longdescription> |
1989 |
- The Rivet project (Robust Independent Validation of Experiment and |
1990 |
- Theory) is a toolkit for validation of Monte Carlo event |
1991 |
- generators. It provides a large (and ever growing) set of |
1992 |
- experimental analyses useful for MC generator development, |
1993 |
- validation, and tuning, as well as a convenient infrastructure for |
1994 |
- adding your own analyses. Rivet is the most widespread way by which |
1995 |
- analysis code from the LHC and other high-energy collider |
1996 |
- experiments is preserved for comparison to and development of future |
1997 |
- theory models. |
1998 |
-</longdescription> |
1999 |
-</pkgmetadata> |
2000 |
|
2001 |
diff --git a/sci-physics/rivet/rivet-2.1.1.ebuild b/sci-physics/rivet/rivet-2.1.1.ebuild |
2002 |
deleted file mode 100644 |
2003 |
index 12f29d9..0000000 |
2004 |
--- a/sci-physics/rivet/rivet-2.1.1.ebuild |
2005 |
+++ /dev/null |
2006 |
@@ -1,62 +0,0 @@ |
2007 |
-# Copyright 1999-2014 Gentoo Foundation |
2008 |
-# Distributed under the terms of the GNU General Public License v2 |
2009 |
-# $Id$ |
2010 |
- |
2011 |
-EAPI=5 |
2012 |
- |
2013 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
2014 |
-AUTOTOOLS_AUTORECONF=1 |
2015 |
-PYTHON_COMPAT=( python2_7 ) |
2016 |
- |
2017 |
-inherit python-single-r1 autotools-utils bash-completion-r1 |
2018 |
- |
2019 |
-MYP=Rivet-${PV} |
2020 |
- |
2021 |
-DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators" |
2022 |
-HOMEPAGE="http://rivet.hepforge.org/" |
2023 |
- |
2024 |
-SRC_URI="http://www.hepforge.org/archive/${PN}/${MYP}.tar.bz2" |
2025 |
-LICENSE="GPL-2" |
2026 |
- |
2027 |
-SLOT="0" |
2028 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
2029 |
-IUSE="doc python static-libs" |
2030 |
- |
2031 |
-RDEPEND=" |
2032 |
- dev-libs/boost:0= |
2033 |
- sci-libs/gsl:0= |
2034 |
- sci-physics/fastjet:0=[plugins] |
2035 |
- sci-physics/hepmc:0= |
2036 |
- sci-physics/yoda:0=[python] |
2037 |
- python? ( ${PYTHON_DEPS} )" |
2038 |
-DEPEND="${RDEPEND} |
2039 |
- doc? ( app-doc/doxygen[latex,dot] ) |
2040 |
- python? ( dev-python/cython[${PYTHON_USEDEP}] )" |
2041 |
- |
2042 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
2043 |
- |
2044 |
-S="${WORKDIR}/${MYP}" |
2045 |
- |
2046 |
-#PATCHES=( "${FILESDIR}"/${P}-system-yaml-cpp.patch ) |
2047 |
- |
2048 |
-pkg_setup() { |
2049 |
- use python && python-single-r1_pkg_setup |
2050 |
-} |
2051 |
- |
2052 |
-src_configure() { |
2053 |
- local myeconfargs=( |
2054 |
- $(use_enable python pyext) |
2055 |
- ) |
2056 |
- autotools-utils_src_configure |
2057 |
-} |
2058 |
- |
2059 |
-src_compile() { |
2060 |
- autotools-utils_src_compile |
2061 |
- use doc && doxygen Doxyfile |
2062 |
-} |
2063 |
- |
2064 |
-src_install() { |
2065 |
- autotools-utils_src_install |
2066 |
- newbashcomp "${ED}"/usr/share/Rivet/rivet-completion rivet |
2067 |
- use doc && dohtml -r doxy/html/* && dodoc doc/rivet-manual.pdf |
2068 |
-} |
2069 |
|
2070 |
diff --git a/sci-physics/rivet/rivet-2.1.2.ebuild b/sci-physics/rivet/rivet-2.1.2.ebuild |
2071 |
deleted file mode 100644 |
2072 |
index 12f29d9..0000000 |
2073 |
--- a/sci-physics/rivet/rivet-2.1.2.ebuild |
2074 |
+++ /dev/null |
2075 |
@@ -1,62 +0,0 @@ |
2076 |
-# Copyright 1999-2014 Gentoo Foundation |
2077 |
-# Distributed under the terms of the GNU General Public License v2 |
2078 |
-# $Id$ |
2079 |
- |
2080 |
-EAPI=5 |
2081 |
- |
2082 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
2083 |
-AUTOTOOLS_AUTORECONF=1 |
2084 |
-PYTHON_COMPAT=( python2_7 ) |
2085 |
- |
2086 |
-inherit python-single-r1 autotools-utils bash-completion-r1 |
2087 |
- |
2088 |
-MYP=Rivet-${PV} |
2089 |
- |
2090 |
-DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators" |
2091 |
-HOMEPAGE="http://rivet.hepforge.org/" |
2092 |
- |
2093 |
-SRC_URI="http://www.hepforge.org/archive/${PN}/${MYP}.tar.bz2" |
2094 |
-LICENSE="GPL-2" |
2095 |
- |
2096 |
-SLOT="0" |
2097 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
2098 |
-IUSE="doc python static-libs" |
2099 |
- |
2100 |
-RDEPEND=" |
2101 |
- dev-libs/boost:0= |
2102 |
- sci-libs/gsl:0= |
2103 |
- sci-physics/fastjet:0=[plugins] |
2104 |
- sci-physics/hepmc:0= |
2105 |
- sci-physics/yoda:0=[python] |
2106 |
- python? ( ${PYTHON_DEPS} )" |
2107 |
-DEPEND="${RDEPEND} |
2108 |
- doc? ( app-doc/doxygen[latex,dot] ) |
2109 |
- python? ( dev-python/cython[${PYTHON_USEDEP}] )" |
2110 |
- |
2111 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
2112 |
- |
2113 |
-S="${WORKDIR}/${MYP}" |
2114 |
- |
2115 |
-#PATCHES=( "${FILESDIR}"/${P}-system-yaml-cpp.patch ) |
2116 |
- |
2117 |
-pkg_setup() { |
2118 |
- use python && python-single-r1_pkg_setup |
2119 |
-} |
2120 |
- |
2121 |
-src_configure() { |
2122 |
- local myeconfargs=( |
2123 |
- $(use_enable python pyext) |
2124 |
- ) |
2125 |
- autotools-utils_src_configure |
2126 |
-} |
2127 |
- |
2128 |
-src_compile() { |
2129 |
- autotools-utils_src_compile |
2130 |
- use doc && doxygen Doxyfile |
2131 |
-} |
2132 |
- |
2133 |
-src_install() { |
2134 |
- autotools-utils_src_install |
2135 |
- newbashcomp "${ED}"/usr/share/Rivet/rivet-completion rivet |
2136 |
- use doc && dohtml -r doxy/html/* && dodoc doc/rivet-manual.pdf |
2137 |
-} |
2138 |
|
2139 |
diff --git a/sci-physics/yoda/metadata.xml b/sci-physics/yoda/metadata.xml |
2140 |
deleted file mode 100644 |
2141 |
index 8075483..0000000 |
2142 |
--- a/sci-physics/yoda/metadata.xml |
2143 |
+++ /dev/null |
2144 |
@@ -1,18 +0,0 @@ |
2145 |
-<?xml version="1.0" encoding="UTF-8"?> |
2146 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
2147 |
-<pkgmetadata> |
2148 |
-<maintainer type="project"> |
2149 |
- <email>sci-physics@g.o</email> |
2150 |
- <name>Gentoo Physics Project</name> |
2151 |
-</maintainer> |
2152 |
-<longdescription> |
2153 |
- Yet more Objects for Data Analysis is a small set of data analysis |
2154 |
- (specifically histogramming) classes being developed by MCnet |
2155 |
- members as a lightweight common system for MC event generator |
2156 |
- validation analyses, particularly as the core histogramming system |
2157 |
- in Rivet. |
2158 |
-</longdescription> |
2159 |
-<use> |
2160 |
- <flag name="root">Adds support for <pkg>sci-physics/root</pkg></flag> |
2161 |
-</use> |
2162 |
-</pkgmetadata> |
2163 |
|
2164 |
diff --git a/sci-physics/yoda/yoda-1.0.6.ebuild b/sci-physics/yoda/yoda-1.0.6.ebuild |
2165 |
deleted file mode 100644 |
2166 |
index ab1a835..0000000 |
2167 |
--- a/sci-physics/yoda/yoda-1.0.6.ebuild |
2168 |
+++ /dev/null |
2169 |
@@ -1,50 +0,0 @@ |
2170 |
-# Copyright 1999-2014 Gentoo Foundation |
2171 |
-# Distributed under the terms of the GNU General Public License v2 |
2172 |
-# $Id$ |
2173 |
- |
2174 |
-EAPI=5 |
2175 |
- |
2176 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
2177 |
-PYTHON_COMPAT=( python2_7 ) |
2178 |
- |
2179 |
-inherit python-single-r1 autotools-utils bash-completion-r1 |
2180 |
- |
2181 |
-MYP=YODA-${PV} |
2182 |
- |
2183 |
-DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis" |
2184 |
-HOMEPAGE="http://yoda.hepforge.org/" |
2185 |
- |
2186 |
-SRC_URI="http://www.hepforge.org/archive/${PN}/${MYP}.tar.bz2" |
2187 |
-LICENSE="GPL-2" |
2188 |
- |
2189 |
-SLOT="0" |
2190 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
2191 |
-IUSE="python root static-libs" |
2192 |
- |
2193 |
-RDEPEND=" |
2194 |
- dev-libs/boost:0= |
2195 |
- python? ( ${PYTHON_DEPS} ) |
2196 |
- root? ( sci-physics/root:0=[python=,${PYTHON_USEDEP}] )" |
2197 |
-DEPEND="${RDEPEND} |
2198 |
- python? ( dev-python/cython[${PYTHON_USEDEP}] )" |
2199 |
- |
2200 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
2201 |
- |
2202 |
-S="${WORKDIR}/${MYP}" |
2203 |
- |
2204 |
-pkg_setup() { |
2205 |
- use python && python-single-r1_pkg_setup |
2206 |
-} |
2207 |
- |
2208 |
-src_configure() { |
2209 |
- local myeconfargs=( |
2210 |
- $(use_enable python pyext) |
2211 |
- $(use_enable root) |
2212 |
- ) |
2213 |
- autotools-utils_src_configure |
2214 |
-} |
2215 |
- |
2216 |
-src_install() { |
2217 |
- autotools-utils_src_install |
2218 |
- newbashcomp "${ED}"/usr/share/YODA/yoda-completion yoda |
2219 |
-} |