commit: 663b10561af76c1fcbe754c6b594e5ec3f4fb259 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> AuthorDate: Mon Jan 2 16:22:32 2017 +0000 Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> CommitDate: Mon Jan 2 16:22:32 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=663b1056
removed packages in main tree dev-libs/beignet/beignet-1.2.0.ebuild | 96 --- .../beignet/files/llvm-empty-system-libs.patch | 11 - dev-libs/beignet/files/llvm-terminfo.patch | 20 - dev-libs/beignet/files/no-debian-multiarch.patch | 39 - dev-libs/beignet/files/no-hardcoded-cflags.patch | 13 - dev-libs/beignet/metadata.xml | 8 - .../files/superlu_mt-2.1-duplicate-symbols.patch | 900 --------------------- .../files/superlu_mt-2.1-missing-includes.patch | 44 - sci-libs/superlu_mt/metadata.xml | 26 - sci-libs/superlu_mt/superlu_mt-2.1.ebuild | 110 --- sci-misc/fitscut/fitscut-1.4.4.ebuild | 39 - sci-misc/fitscut/metadata.xml | 14 - .../herwig++/files/herwig++-2.6.3-looptools.patch | 64 -- sci-physics/herwig++/herwig++-2.7.0-r2.ebuild | 57 -- sci-physics/herwig++/metadata.xml | 23 - .../looptools/files/looptools-2.10-makefile.patch | 98 --- .../looptools/files/looptools-2.8-makefile.patch | 96 --- sci-physics/looptools/looptools-2.10.ebuild | 39 - sci-physics/looptools/looptools-2.11.ebuild | 39 - sci-physics/looptools/looptools-2.9.ebuild | 39 - sci-physics/looptools/metadata.xml | 15 - sci-physics/rivet/metadata.xml | 19 - sci-physics/rivet/rivet-2.1.1.ebuild | 62 -- sci-physics/rivet/rivet-2.1.2.ebuild | 62 -- sci-physics/yoda/metadata.xml | 18 - sci-physics/yoda/yoda-1.0.6.ebuild | 50 -- 26 files changed, 2001 deletions(-) diff --git a/dev-libs/beignet/beignet-1.2.0.ebuild b/dev-libs/beignet/beignet-1.2.0.ebuild deleted file mode 100644 index 8d42db8..0000000 --- a/dev-libs/beignet/beignet-1.2.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -CMAKE_BUILD_TYPE="Release" - -inherit python-any-r1 cmake-multilib toolchain-funcs - -DESCRIPTION="OpenCL implementation for Intel GPUs" -HOMEPAGE="https://01.org/beignet"; - -LICENSE="LGPL-2.1+" -SLOT="0" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="git://anongit.freedesktop.org/beignet" - KEYWORDS="" -else - KEYWORDS="~amd64" - SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"; - S=${WORKDIR}/Beignet-${PV}-Source -fi - -COMMON="${PYTHON_DEPS} - media-libs/mesa - sys-devel/clang - >=sys-devel/llvm-3.5 - x11-libs/libdrm[video_cards_intel] - x11-libs/libXext - x11-libs/libXfixes" -RDEPEND="${COMMON} - app-eselect/eselect-opencl" -DEPEND="${COMMON} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/no-debian-multiarch.patch - "${FILESDIR}"/no-hardcoded-cflags.patch - "${FILESDIR}"/llvm-terminfo.patch - "${FILESDIR}"/llvm-empty-system-libs.patch -) - -DOCS=( - docs/. -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]]; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - fi -} - -pkg_setup() { - python_setup -} - -src_prepare() { - cmake-utils_src_prepare - # We cannot run tests because they require permissions to access - # the hardware, and building them is very time-consuming. - cmake_comment_add_subdirectory utests -} - -multilib_src_configure() { - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" - - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" - ) - - cmake-utils_src_configure -} - -multilib_src_install() { - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" - - cmake-utils_src_install - - insinto /etc/OpenCL/vendors/ - echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" - doins "${PN}-${ABI}.icd" - - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so -} diff --git a/dev-libs/beignet/files/llvm-empty-system-libs.patch b/dev-libs/beignet/files/llvm-empty-system-libs.patch deleted file mode 100644 index d5e0cd7..0000000 --- a/dev-libs/beignet/files/llvm-empty-system-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMake/FindLLVM.cmake 2015-12-18 06:39:59.000000000 +0000 -+++ b/CMake/FindLLVM.cmake 2016-08-31 15:05:11.210679204 +0000 -@@ -99,7 +99,7 @@ - OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_ORIG - OUTPUT_STRIP_TRAILING_WHITESPACE - ) --string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS_ORIG}) -+string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_ORIG}") - endif (LLVM_VERSION_NODOT VERSION_GREATER 34) - - macro(add_one_lib name) diff --git a/dev-libs/beignet/files/llvm-terminfo.patch b/dev-libs/beignet/files/llvm-terminfo.patch deleted file mode 100644 index afbbc26..0000000 --- a/dev-libs/beignet/files/llvm-terminfo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/backend/src/CMakeLists.txt 2015-12-18 07:40:03.000000000 +0100 -+++ b/backend/src/CMakeLists.txt 2016-08-01 13:44:31.475875150 +0200 -@@ -153,7 +153,7 @@ - - add_library(gbeinterp SHARED gbe_bin_interpreter.cpp) - --if (LLVM_VERSION_NODOT VERSION_EQUAL 34) -+if (NOT (LLVM_VERSION_NODOT LESS 34)) - find_library(TERMINFO NAMES tinfo ncurses) - if (${TERMINFO} STREQUAL TERMINFO-NOTFOUND) - message(FATAL_ERROR "no libtinfo or libncurses is found in system") -@@ -161,7 +161,7 @@ - target_link_libraries(gbe ${TERMINFO}) - message(STATUS "use ${TERMINFO} as terminal control library") - endif (${TERMINFO} STREQUAL TERMINFO-NOTFOUND) --endif(LLVM_VERSION_NODOT VERSION_EQUAL 34) -+endif(NOT (LLVM_VERSION_NODOT LESS 34)) - - link_directories (${LLVM_LIBRARY_DIR} ${DRM_LIBDIR}) - diff --git a/dev-libs/beignet/files/no-debian-multiarch.patch b/dev-libs/beignet/files/no-debian-multiarch.patch deleted file mode 100644 index c9aef4d..0000000 --- a/dev-libs/beignet/files/no-debian-multiarch.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/CMakeLists.txt 2015-04-17 04:27:51.000000000 +0200 -+++ b/CMakeLists.txt 2015-05-20 20:59:17.895041760 +0200 -@@ -39,14 +39,9 @@ - - SET(CMAKE_VERBOSE_MAKEFILE "false") - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") --INCLUDE (GNUInstallDirs OPTIONAL) --# support old CMake without GNUInstallDirs --if (NOT CMAKE_INSTALL_FULL_LIBDIR) -- set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -- set (BEIGNET_LIBRARY_ARCHITECTURE "") --else (NOT CMAKE_INSTALL_FULL_LIBDIR) -- set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}") --endif (NOT CMAKE_INSTALL_FULL_LIBDIR) -+ -+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -+set (BEIGNET_LIBRARY_ARCHITECTURE "") - - if (NOT LIB_INSTALL_DIR) - set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") -@@ -55,17 +50,7 @@ - set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/") - endif (NOT BEIGNET_INSTALL_DIR) - --# allow co-installation of 32- and 64-bit versions: --# https://wiki.debian.org/Multiarch --if (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") -- set (ICD_FILE_NAME "intel-beignet.icd") --else (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") -- if (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") -- set (ICD_FILE_NAME "intel-beignet.icd") -- else (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") -- set (ICD_FILE_NAME "intel-beignet-${BEIGNET_LIBRARY_ARCHITECTURE}.icd") -- endif (BEIGNET_LIBRARY_ARCHITECTURE STREQUAL "") --endif (BEIGNET_INSTALL_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib/beignet/") -+set (ICD_FILE_NAME "intel-beignet.icd") - - # Force Release with debug info - if (NOT CMAKE_BUILD_TYPE) diff --git a/dev-libs/beignet/files/no-hardcoded-cflags.patch b/dev-libs/beignet/files/no-hardcoded-cflags.patch deleted file mode 100644 index 3dd67b7..0000000 --- a/dev-libs/beignet/files/no-hardcoded-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt 2016-08-31 17:13:26.000000000 +0000 -+++ b/CMakeLists.txt 2016-08-31 17:00:40.000000000 +0000 -@@ -70,8 +70,8 @@ - elseif (COMPILER STREQUAL "ICC") - set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -wd2928 -Wall -fPIC -fstrict-aliasing -fp-model fast -msse4.1 -Wl,-E") - endif () --set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof") --set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof") -+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") - set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DGBE_DEBUG=1") - set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1") - set (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0") diff --git a/dev-libs/beignet/metadata.xml b/dev-libs/beignet/metadata.xml deleted file mode 100644 index 3e5026e..0000000 --- a/dev-libs/beignet/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>mare...@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> -</pkgmetadata> 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 deleted file mode 100644 index 6b2c5d5..0000000 --- a/sci-libs/superlu_mt/files/superlu_mt-2.1-duplicate-symbols.patch +++ /dev/null @@ -1,900 +0,0 @@ -diff -Nur SRC.orig/cmatgen.c SRC/cmatgen.c ---- SRC.orig/cmatgen.c 2013-07-15 11:47:52.512735420 -0700 -+++ SRC/cmatgen.c 2013-07-15 11:49:05.149137948 -0700 -@@ -93,76 +93,4 @@ - xa[n] = lasta; - } - --double dlaran_(int *iseed) --{ --/* -- LAPACK auxiliary routine (version 2.0) -- -- Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., -- Courant Institute, Argonne National Lab, and Rice University -- February 29, 1992 -- -- Purpose -- ======= -- -- DLARAN returns a random real number from a uniform (0,1) -- distribution. -- -- Arguments -- ========= -- -- ISEED (input/output) INT array, dimension (4) -- On entry, the seed of the random number generator; the array -- -- elements must be between 0 and 4095, and ISEED(4) must be -- odd. -- On exit, the seed is updated. -- -- Further Details -- =============== -- -- This routine uses a multiplicative congruential method with modulus -- 2**48 and multiplier 33952834046453 (see G.S.Fishman, -- 'Multiplicative congruential random number generators with modulus -- 2**b: an exhaustive analysis for b = 32 and a partial analysis for -- b = 48', Math. Comp. 189, pp 331-344, 1990). -- -- 48-bit integers are stored in 4 integer array elements with 12 bits -- per element. Hence the routine is portable across machines with -- integers of 32 bits or more. -- -- ===================================================================== --*/ -- -- /* Local variables */ -- int it1, it2, it3, it4; -- -- --iseed; -- -- /* multiply the seed by the multiplier modulo 2**48 */ -- it4 = iseed[4] * 2549; -- it3 = it4 / 4096; -- it4 -= it3 << 12; -- it3 = it3 + iseed[3] * 2549 + iseed[4] * 2508; -- it2 = it3 / 4096; -- it3 -= it2 << 12; -- it2 = it2 + iseed[2] * 2549 + iseed[3] * 2508 + iseed[4] * 322; -- it1 = it2 / 4096; -- it2 -= it1 << 12; -- it1 = it1 + iseed[1] * 2549 + iseed[2] * 2508 + iseed[3] * 322 + iseed[4] -- * 494; -- it1 %= 4096; -- -- /* return updated seed */ -- -- iseed[1] = it1; -- iseed[2] = it2; -- iseed[3] = it3; -- iseed[4] = it4; -- -- /* convert 48-bit integer to a real number in the interval (0,1) */ -- -- return ((double) it1 + -- ((double) it2 + ((double) it3 + (double) it4 * 2.44140625e-4) * -- 2.44140625e-4) * 2.44140625e-4) * 2.44140625e-4; -- --} /* dlaran_ */ - -diff -Nur SRC.orig/cmyblas2.c SRC/cmyblas2.c ---- SRC.orig/cmyblas2.c 2013-07-15 11:47:52.509735400 -0700 -+++ SRC/cmyblas2.c 2013-07-15 11:49:05.149137948 -0700 -@@ -183,3 +183,127 @@ - - } - -+/* -+ * Performs dense matrix-vector multiply with 2 vectors: -+ * y0 = y0 + A * x0 -+ * y1 = y1 + A * x1 -+ */ -+void cmatvec2 ( -+ int lda, /* leading dimension of A */ -+ int m, -+ int n, -+ complex *A, /* in - size m-by-n */ -+ complex *x0, /* in - size n-by-1 */ -+ complex *x1, /* in - size n-by-1 */ -+ complex *y0, /* out - size n-by-1 */ -+ complex *y1 /* out - size n-by-1 */ -+ ) -+ -+{ -+ complex v00, v10, v20, v30, v40, v50, v60, v70, -+ v01, v11, v21, v31, v41, v51, v61, v71; -+ complex t0, t1, t2, t3, t4, t5, t6, t7; -+ complex f0, f1; -+ complex *Mki0, *Mki1, *Mki2, *Mki3, *Mki4, *Mki5, *Mki6, *Mki7; -+ register int firstcol = 0; -+ complex *M0, temp; -+ int k; -+ -+ M0 = &A[0]; -+ -+ while ( firstcol < n - 7 ) { /* Do 8 columns */ -+ -+ Mki0 = M0; -+ Mki1 = Mki0 + lda; -+ Mki2 = Mki1 + lda; -+ Mki3 = Mki2 + lda; -+ Mki4 = Mki3 + lda; -+ Mki5 = Mki4 + lda; -+ Mki6 = Mki5 + lda; -+ Mki7 = Mki6 + lda; -+ -+ v00 = x0[firstcol]; v01 = x1[firstcol++]; -+ v10 = x0[firstcol]; v11 = x1[firstcol++]; -+ v20 = x0[firstcol]; v21 = x1[firstcol++]; -+ v30 = x0[firstcol]; v31 = x1[firstcol++]; -+ v40 = x0[firstcol]; v41 = x1[firstcol++]; -+ v50 = x0[firstcol]; v51 = x1[firstcol++]; -+ v60 = x0[firstcol]; v61 = x1[firstcol++]; -+ v70 = x0[firstcol]; v71 = x1[firstcol++]; -+ -+ for (k = 0; k < m; k++) { -+ f0 = y0[k]; -+ f1 = y1[k]; -+ t0 = Mki0[k]; cc_mult(&temp, &v00, &t0);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v01,&t0);c_add(&f1,&f1,&temp); -+ t1 = Mki1[k]; cc_mult(&temp,&v10,&t1);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v11,&t1);c_add(&f1,&f1,&temp); -+ t2 = Mki2[k]; cc_mult(&temp,&v20,&t2);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v21,&t2);c_add(&f1,&f1,&temp); -+ t3 = Mki3[k]; cc_mult(&temp,&v30,&t3);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v31,&t3);c_add(&f1,&f1,&temp); -+ t4 = Mki4[k]; cc_mult(&temp,&v40,&t4);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v41,&t4);c_add(&f1,&f1,&temp); -+ t5 = Mki5[k]; cc_mult(&temp,&v50,&t5);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v51,&t5);c_add(&f1,&f1,&temp); -+ t6 = Mki6[k]; cc_mult(&temp,&v60,&t6);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v61,&t6);c_add(&f1,&f1,&temp); -+ t7 = Mki7[k]; cc_mult(&temp,&v70,&t7);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v71,&t7);c_add(&f1,&f1,&temp); -+ y0[k] = f0; -+ y1[k] = f1; -+ } -+ -+ M0 += 8 * lda; -+ } -+ -+ while ( firstcol < n - 3 ) { /* Do 4 columns */ -+ Mki0 = M0; -+ Mki1 = Mki0 + lda; -+ Mki2 = Mki1 + lda; -+ Mki3 = Mki2 + lda; -+ -+ v00 = x0[firstcol]; v01 = x1[firstcol++]; -+ v10 = x0[firstcol]; v11 = x1[firstcol++]; -+ v20 = x0[firstcol]; v21 = x1[firstcol++]; -+ v30 = x0[firstcol]; v31 = x1[firstcol++]; -+ -+ for (k = 0; k < m; k++) { -+ f0 = y0[k]; -+ f1 = y1[k]; -+ t0 = Mki0[k]; cc_mult(&temp,&v00,&t0);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v01,&t0);c_add(&f1,&f1,&temp); -+ t1 = Mki1[k]; cc_mult(&temp,&v10,&t1);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v11,&t1);c_add(&f1,&f1,&temp); -+ t2 = Mki2[k]; cc_mult(&temp,&v20,&t2);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v21,&t2);c_add(&f1,&f1,&temp); -+ t3 = Mki3[k]; cc_mult(&temp,&v30,&t3);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v31,&t3);c_add(&f1,&f1,&temp); -+ y0[k] = f0; -+ y1[k] = f1; -+ } -+ -+ M0 += 4 * lda; -+ -+ } -+ -+ while ( firstcol < n ) { /* Do 1 column */ -+ Mki0 = M0; -+ v00 = x0[firstcol]; v01 = x1[firstcol++]; -+ -+ for (k = 0; k < m; k++) { -+ f0 = y0[k]; -+ f1 = y1[k]; -+ t0 = Mki0[k]; -+ cc_mult(&temp,&v00,&t0);c_add(&f0,&f0,&temp); -+ cc_mult(&temp,&v01,&t0);c_add(&f1,&f1,&temp); -+ y0[k] = f0; -+ y1[k] = f1; -+ } -+ -+ M0 += lda; -+ } -+ -+} -+ -+ -diff -Nur SRC.orig/cmyblas2.c.orig SRC/cmyblas2.c.orig ---- SRC.orig/cmyblas2.c.orig 1969-12-31 16:00:00.000000000 -0800 -+++ SRC/cmyblas2.c.orig 2013-07-15 11:49:05.149137948 -0700 -@@ -0,0 +1,185 @@ -+ -+/* -+ * -- SuperLU routine (version 2.0) -- -+ * Lawrence Berkeley National Lab, Univ. of California Berkeley, -+ * and Xerox Palo Alto Research Center. -+ * September 10, 2007 -+ * -+ */ -+/* -+ * File name: cmyblas2.c -+ * Purpose: -+ * Level 2 BLAS operations: solves and matvec, written in C. -+ * Note: -+ * This is only used when the system lacks an efficient BLAS library. -+ */ -+#include "slu_scomplex.h" -+ -+ -+/* -+ * Solves a dense UNIT lower triangular system. The unit lower -+ * triangular matrix is stored in a 2D array M(1:nrow,1:ncol). -+ * The solution will be returned in the rhs vector. -+ */ -+void clsolve ( int ldm, int ncol, complex *M, complex *rhs ) -+{ -+ int k; -+ complex x0, x1, x2, x3, temp; -+ complex *M0; -+ complex *Mki0, *Mki1, *Mki2, *Mki3; -+ register int firstcol = 0; -+ -+ M0 = &M[0]; -+ -+ -+ while ( firstcol < ncol - 3 ) { /* Do 4 columns */ -+ Mki0 = M0 + 1; -+ Mki1 = Mki0 + ldm + 1; -+ Mki2 = Mki1 + ldm + 1; -+ Mki3 = Mki2 + ldm + 1; -+ -+ x0 = rhs[firstcol]; -+ cc_mult(&temp, &x0, Mki0); Mki0++; -+ c_sub(&x1, &rhs[firstcol+1], &temp); -+ cc_mult(&temp, &x0, Mki0); Mki0++; -+ c_sub(&x2, &rhs[firstcol+2], &temp); -+ cc_mult(&temp, &x1, Mki1); Mki1++; -+ c_sub(&x2, &x2, &temp); -+ cc_mult(&temp, &x0, Mki0); Mki0++; -+ c_sub(&x3, &rhs[firstcol+3], &temp); -+ cc_mult(&temp, &x1, Mki1); Mki1++; -+ c_sub(&x3, &x3, &temp); -+ cc_mult(&temp, &x2, Mki2); Mki2++; -+ c_sub(&x3, &x3, &temp); -+ -+ rhs[++firstcol] = x1; -+ rhs[++firstcol] = x2; -+ rhs[++firstcol] = x3; -+ ++firstcol; -+ -+ for (k = firstcol; k < ncol; k++) { -+ cc_mult(&temp, &x0, Mki0); Mki0++; -+ c_sub(&rhs[k], &rhs[k], &temp); -+ cc_mult(&temp, &x1, Mki1); Mki1++; -+ c_sub(&rhs[k], &rhs[k], &temp); -+ cc_mult(&temp, &x2, Mki2); Mki2++; -+ c_sub(&rhs[k], &rhs[k], &temp); -+ cc_mult(&temp, &x3, Mki3); Mki3++; -+ c_sub(&rhs[k], &rhs[k], &temp); -+ } -+ -+ M0 += 4 * ldm + 4; -+ } -+ -+ if ( firstcol < ncol - 1 ) { /* Do 2 columns */ -+ Mki0 = M0 + 1; -+ Mki1 = Mki0 + ldm + 1; -+ -+ x0 = rhs[firstcol]; -+ cc_mult(&temp, &x0, Mki0); Mki0++; -+ c_sub(&x1, &rhs[firstcol+1], &temp); -+ -+ rhs[++firstcol] = x1; -+ ++firstcol; -+ -+ for (k = firstcol; k < ncol; k++) { -+ cc_mult(&temp, &x0, Mki0); Mki0++; -+ c_sub(&rhs[k], &rhs[k], &temp); -+ cc_mult(&temp, &x1, Mki1); Mki1++; -+ c_sub(&rhs[k], &rhs[k], &temp); -+ } -+ } -+ -+} -+ -+/* -+ * Solves a dense upper triangular system. The upper triangular matrix is -+ * stored in a 2-dim array M(1:ldm,1:ncol). The solution will be returned -+ * in the rhs vector. -+ */ -+void -+cusolve ( -+int ldm, /* in */ -+int ncol, /* in */ -+complex *M, /* in */ -+complex *rhs /* modified */ -+) -+{ -+ complex xj, temp; -+ int jcol, j, irow; -+ -+ jcol = ncol - 1; -+ -+ for (j = 0; j < ncol; j++) { -+ -+ c_div(&xj, &rhs[jcol], &M[jcol + jcol*ldm]); /* M(jcol, jcol) */ -+ rhs[jcol] = xj; -+ -+ for (irow = 0; irow < jcol; irow++) { -+ cc_mult(&temp, &xj, &M[irow+jcol*ldm]); /* M(irow, jcol) */ -+ c_sub(&rhs[irow], &rhs[irow], &temp); -+ } -+ -+ jcol--; -+ -+ } -+} -+ -+ -+/* -+ * Performs a dense matrix-vector multiply: Mxvec = Mxvec + M * vec. -+ * The input matrix is M(1:nrow,1:ncol); The product is returned in Mxvec[]. -+ */ -+void cmatvec ( -+int ldm, /* in -- leading dimension of M */ -+int nrow, /* in */ -+int ncol, /* in */ -+complex *M, /* in */ -+complex *vec, /* in */ -+complex *Mxvec /* in/out */ -+) -+{ -+ complex vi0, vi1, vi2, vi3; -+ complex *M0, temp; -+ complex *Mki0, *Mki1, *Mki2, *Mki3; -+ register int firstcol = 0; -+ int k; -+ -+ M0 = &M[0]; -+ -+ while ( firstcol < ncol - 3 ) { /* Do 4 columns */ -+ Mki0 = M0; -+ Mki1 = Mki0 + ldm; -+ Mki2 = Mki1 + ldm; -+ Mki3 = Mki2 + ldm; -+ -+ vi0 = vec[firstcol++]; -+ vi1 = vec[firstcol++]; -+ vi2 = vec[firstcol++]; -+ vi3 = vec[firstcol++]; -+ for (k = 0; k < nrow; k++) { -+ cc_mult(&temp, &vi0, Mki0); Mki0++; -+ c_add(&Mxvec[k], &Mxvec[k], &temp); -+ cc_mult(&temp, &vi1, Mki1); Mki1++; -+ c_add(&Mxvec[k], &Mxvec[k], &temp); -+ cc_mult(&temp, &vi2, Mki2); Mki2++; -+ c_add(&Mxvec[k], &Mxvec[k], &temp); -+ cc_mult(&temp, &vi3, Mki3); Mki3++; -+ c_add(&Mxvec[k], &Mxvec[k], &temp); -+ } -+ -+ M0 += 4 * ldm; -+ } -+ -+ while ( firstcol < ncol ) { /* Do 1 column */ -+ Mki0 = M0; -+ vi0 = vec[firstcol++]; -+ for (k = 0; k < nrow; k++) { -+ cc_mult(&temp, &vi0, Mki0); Mki0++; -+ c_add(&Mxvec[k], &Mxvec[k], &temp); -+ } -+ M0 += ldm; -+ } -+ -+} -+ -diff -Nur SRC.orig/Makefile SRC/Makefile ---- SRC.orig/Makefile 2013-07-15 11:47:52.511735412 -0700 -+++ SRC/Makefile 2013-07-15 11:53:15.393528085 -0700 -@@ -31,7 +31,7 @@ - # - ####################################################################### - --ALLAUX = superlu_timer.o dclock.o sp_ienv.o lsame.o xerbla.o \ -+ALLAUX = superlu_timer.o sp_ienv.o lsame.o xerbla.o \ - util.o pmemory.o qrnzcnt.o await.o \ - get_perm_c.o mmd.o colamd.o sp_coletree.o \ - pxgstrf_scheduler.o sp_colorder.o \ -diff -Nur SRC.orig/smatgen.c SRC/smatgen.c ---- SRC.orig/smatgen.c 2013-07-15 11:47:52.512735420 -0700 -+++ SRC/smatgen.c 2013-07-15 11:49:05.149137948 -0700 -@@ -93,76 +93,3 @@ - xa[n] = lasta; - } - --double dlaran_(int *iseed) --{ --/* -- LAPACK auxiliary routine (version 2.0) -- -- Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., -- Courant Institute, Argonne National Lab, and Rice University -- February 29, 1992 -- -- Purpose -- ======= -- -- DLARAN returns a random real number from a uniform (0,1) -- distribution. -- -- Arguments -- ========= -- -- ISEED (input/output) INT array, dimension (4) -- On entry, the seed of the random number generator; the array -- -- elements must be between 0 and 4095, and ISEED(4) must be -- odd. -- On exit, the seed is updated. -- -- Further Details -- =============== -- -- This routine uses a multiplicative congruential method with modulus -- 2**48 and multiplier 33952834046453 (see G.S.Fishman, -- 'Multiplicative congruential random number generators with modulus -- 2**b: an exhaustive analysis for b = 32 and a partial analysis for -- b = 48', Math. Comp. 189, pp 331-344, 1990). -- -- 48-bit integers are stored in 4 integer array elements with 12 bits -- per element. Hence the routine is portable across machines with -- integers of 32 bits or more. -- -- ===================================================================== --*/ -- -- /* Local variables */ -- int it1, it2, it3, it4; -- -- --iseed; -- -- /* multiply the seed by the multiplier modulo 2**48 */ -- it4 = iseed[4] * 2549; -- it3 = it4 / 4096; -- it4 -= it3 << 12; -- it3 = it3 + iseed[3] * 2549 + iseed[4] * 2508; -- it2 = it3 / 4096; -- it3 -= it2 << 12; -- it2 = it2 + iseed[2] * 2549 + iseed[3] * 2508 + iseed[4] * 322; -- it1 = it2 / 4096; -- it2 -= it1 << 12; -- it1 = it1 + iseed[1] * 2549 + iseed[2] * 2508 + iseed[3] * 322 + iseed[4] -- * 494; -- it1 %= 4096; -- -- /* return updated seed */ -- -- iseed[1] = it1; -- iseed[2] = it2; -- iseed[3] = it3; -- iseed[4] = it4; -- -- /* convert 48-bit integer to a real number in the interval (0,1) */ -- -- return ((double) it1 + -- ((double) it2 + ((double) it3 + (double) it4 * 2.44140625e-4) * -- 2.44140625e-4) * 2.44140625e-4) * 2.44140625e-4; -- --} /* dlaran_ */ -- -diff -Nur SRC.orig/xerbla.c SRC/xerbla.c ---- SRC.orig/xerbla.c 2013-07-15 11:47:52.513735427 -0700 -+++ SRC/xerbla.c 2013-07-15 11:49:05.150137959 -0700 -@@ -1,3 +1,4 @@ -+#include <stdio.h> - /* Subroutine */ int xerbla_(char *srname, int *info) - { - /* -- LAPACK auxiliary routine (version 2.0) -- -diff -Nur SRC.orig/zmatgen.c SRC/zmatgen.c ---- SRC.orig/zmatgen.c 2013-07-15 11:47:52.513735427 -0700 -+++ SRC/zmatgen.c 2013-07-15 11:49:05.150137959 -0700 -@@ -93,76 +93,3 @@ - xa[n] = lasta; - } - --double dlaran_(int *iseed) --{ --/* -- LAPACK auxiliary routine (version 2.0) -- -- Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd., -- Courant Institute, Argonne National Lab, and Rice University -- February 29, 1992 -- -- Purpose -- ======= -- -- DLARAN returns a random real number from a uniform (0,1) -- distribution. -- -- Arguments -- ========= -- -- ISEED (input/output) INT array, dimension (4) -- On entry, the seed of the random number generator; the array -- -- elements must be between 0 and 4095, and ISEED(4) must be -- odd. -- On exit, the seed is updated. -- -- Further Details -- =============== -- -- This routine uses a multiplicative congruential method with modulus -- 2**48 and multiplier 33952834046453 (see G.S.Fishman, -- 'Multiplicative congruential random number generators with modulus -- 2**b: an exhaustive analysis for b = 32 and a partial analysis for -- b = 48', Math. Comp. 189, pp 331-344, 1990). -- -- 48-bit integers are stored in 4 integer array elements with 12 bits -- per element. Hence the routine is portable across machines with -- integers of 32 bits or more. -- -- ===================================================================== --*/ -- -- /* Local variables */ -- int it1, it2, it3, it4; -- -- --iseed; -- -- /* multiply the seed by the multiplier modulo 2**48 */ -- it4 = iseed[4] * 2549; -- it3 = it4 / 4096; -- it4 -= it3 << 12; -- it3 = it3 + iseed[3] * 2549 + iseed[4] * 2508; -- it2 = it3 / 4096; -- it3 -= it2 << 12; -- it2 = it2 + iseed[2] * 2549 + iseed[3] * 2508 + iseed[4] * 322; -- it1 = it2 / 4096; -- it2 -= it1 << 12; -- it1 = it1 + iseed[1] * 2549 + iseed[2] * 2508 + iseed[3] * 322 + iseed[4] -- * 494; -- it1 %= 4096; -- -- /* return updated seed */ -- -- iseed[1] = it1; -- iseed[2] = it2; -- iseed[3] = it3; -- iseed[4] = it4; -- -- /* convert 48-bit integer to a real number in the interval (0,1) */ -- -- return ((double) it1 + -- ((double) it2 + ((double) it3 + (double) it4 * 2.44140625e-4) * -- 2.44140625e-4) * 2.44140625e-4) * 2.44140625e-4; -- --} /* dlaran_ */ -- -diff -Nur SRC.orig/zmyblas2.c SRC/zmyblas2.c ---- SRC.orig/zmyblas2.c 2013-07-15 11:47:52.511735412 -0700 -+++ SRC/zmyblas2.c 2013-07-15 11:49:05.150137959 -0700 -@@ -183,3 +183,127 @@ - - } - -+/* -+ * Performs dense matrix-vector multiply with 2 vectors: -+ * y0 = y0 + A * x0 -+ * y1 = y1 + A * x1 -+ */ -+void zmatvec2 ( -+ int lda, /* leading dimension of A */ -+ int m, -+ int n, -+ doublecomplex *A, /* in - size m-by-n */ -+ doublecomplex *x0, /* in - size n-by-1 */ -+ doublecomplex *x1, /* in - size n-by-1 */ -+ doublecomplex *y0, /* out - size n-by-1 */ -+ doublecomplex *y1 /* out - size n-by-1 */ -+ ) -+ -+{ -+ doublecomplex v00, v10, v20, v30, v40, v50, v60, v70, -+ v01, v11, v21, v31, v41, v51, v61, v71; -+ doublecomplex t0, t1, t2, t3, t4, t5, t6, t7; -+ doublecomplex f0, f1; -+ doublecomplex *Mki0, *Mki1, *Mki2, *Mki3, *Mki4, *Mki5, *Mki6, *Mki7; -+ register int firstcol = 0; -+ doublecomplex *M0, temp; -+ int k; -+ -+ M0 = &A[0]; -+ -+ while ( firstcol < n - 7 ) { /* Do 8 columns */ -+ -+ Mki0 = M0; -+ Mki1 = Mki0 + lda; -+ Mki2 = Mki1 + lda; -+ Mki3 = Mki2 + lda; -+ Mki4 = Mki3 + lda; -+ Mki5 = Mki4 + lda; -+ Mki6 = Mki5 + lda; -+ Mki7 = Mki6 + lda; -+ -+ v00 = x0[firstcol]; v01 = x1[firstcol++]; -+ v10 = x0[firstcol]; v11 = x1[firstcol++]; -+ v20 = x0[firstcol]; v21 = x1[firstcol++]; -+ v30 = x0[firstcol]; v31 = x1[firstcol++]; -+ v40 = x0[firstcol]; v41 = x1[firstcol++]; -+ v50 = x0[firstcol]; v51 = x1[firstcol++]; -+ v60 = x0[firstcol]; v61 = x1[firstcol++]; -+ v70 = x0[firstcol]; v71 = x1[firstcol++]; -+ -+ for (k = 0; k < m; k++) { -+ f0 = y0[k]; -+ f1 = y1[k]; -+ t0 = Mki0[k]; zz_mult(&temp,&v00,&t0);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v01,&t0);z_add(&f1,&f1,&temp); -+ t1 = Mki1[k]; zz_mult(&temp,&v10,&t1);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v11,&t1);z_add(&f1,&f1,&temp); -+ t2 = Mki2[k]; zz_mult(&temp,&v20,&t2);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v21,&t2);z_add(&f1,&f1,&temp); -+ t3 = Mki3[k]; zz_mult(&temp,&v30,&t3);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v31,&t3);z_add(&f1,&f1,&temp); -+ t4 = Mki4[k]; zz_mult(&temp,&v40,&t4);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v41,&t4);z_add(&f1,&f1,&temp); -+ t5 = Mki5[k]; zz_mult(&temp,&v50,&t5);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v51,&t5);z_add(&f1,&f1,&temp); -+ t6 = Mki6[k]; zz_mult(&temp,&v60,&t6);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v61,&t6);z_add(&f1,&f1,&temp); -+ t7 = Mki7[k]; zz_mult(&temp,&v70,&t7);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v71,&t7);z_add(&f1,&f1,&temp); -+ y0[k] = f0; -+ y1[k] = f1; -+ } -+ -+ M0 += 8 * lda; -+ } -+ -+ while ( firstcol < n - 3 ) { /* Do 4 columns */ -+ Mki0 = M0; -+ Mki1 = Mki0 + lda; -+ Mki2 = Mki1 + lda; -+ Mki3 = Mki2 + lda; -+ -+ v00 = x0[firstcol]; v01 = x1[firstcol++]; -+ v10 = x0[firstcol]; v11 = x1[firstcol++]; -+ v20 = x0[firstcol]; v21 = x1[firstcol++]; -+ v30 = x0[firstcol]; v31 = x1[firstcol++]; -+ -+ for (k = 0; k < m; k++) { -+ f0 = y0[k]; -+ f1 = y1[k]; -+ t0 = Mki0[k]; zz_mult(&temp,&v00,&t0);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v01,&t0);z_add(&f1,&f1,&temp); -+ t1 = Mki1[k]; zz_mult(&temp,&v10,&t1);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v11,&t1);z_add(&f1,&f1,&temp); -+ t2 = Mki2[k]; zz_mult(&temp,&v20,&t2);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v21,&t2);z_add(&f1,&f1,&temp); -+ t3 = Mki3[k]; zz_mult(&temp,&v30,&t3);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v31,&t3);z_add(&f1,&f1,&temp); -+ y0[k] = f0; -+ y1[k] = f1; -+ } -+ -+ M0 += 4 * lda; -+ -+ } -+ -+ while ( firstcol < n ) { /* Do 1 column */ -+ Mki0 = M0; -+ v00 = x0[firstcol]; v01 = x1[firstcol++]; -+ -+ for (k = 0; k < m; k++) { -+ f0 = y0[k]; -+ f1 = y1[k]; -+ t0 = Mki0[k]; -+ zz_mult(&temp,&v00,&t0);z_add(&f0,&f0,&temp); -+ zz_mult(&temp,&v01,&t0);z_add(&f1,&f1,&temp); -+ y0[k] = f0; -+ y1[k] = f1; -+ } -+ -+ M0 += lda; -+ } -+ -+} -+ -+ -diff -Nur SRC.orig/zmyblas2.c.orig SRC/zmyblas2.c.orig ---- SRC.orig/zmyblas2.c.orig 1969-12-31 16:00:00.000000000 -0800 -+++ SRC/zmyblas2.c.orig 2013-07-15 11:49:05.150137959 -0700 -@@ -0,0 +1,185 @@ -+ -+/* -+ * -- SuperLU routine (version 2.0) -- -+ * Lawrence Berkeley National Lab, Univ. of California Berkeley, -+ * and Xerox Palo Alto Research Center. -+ * September 10, 2007 -+ * -+ */ -+/* -+ * File name: zmyblas2.c -+ * Purpose: -+ * Level 2 BLAS operations: solves and matvec, written in C. -+ * Note: -+ * This is only used when the system lacks an efficient BLAS library. -+ */ -+#include "slu_dcomplex.h" -+ -+ -+/* -+ * Solves a dense UNIT lower triangular system. The unit lower -+ * triangular matrix is stored in a 2D array M(1:nrow,1:ncol). -+ * The solution will be returned in the rhs vector. -+ */ -+void zlsolve ( int ldm, int ncol, doublecomplex *M, doublecomplex *rhs ) -+{ -+ int k; -+ doublecomplex x0, x1, x2, x3, temp; -+ doublecomplex *M0; -+ doublecomplex *Mki0, *Mki1, *Mki2, *Mki3; -+ register int firstcol = 0; -+ -+ M0 = &M[0]; -+ -+ -+ while ( firstcol < ncol - 3 ) { /* Do 4 columns */ -+ Mki0 = M0 + 1; -+ Mki1 = Mki0 + ldm + 1; -+ Mki2 = Mki1 + ldm + 1; -+ Mki3 = Mki2 + ldm + 1; -+ -+ x0 = rhs[firstcol]; -+ zz_mult(&temp, &x0, Mki0); Mki0++; -+ z_sub(&x1, &rhs[firstcol+1], &temp); -+ zz_mult(&temp, &x0, Mki0); Mki0++; -+ z_sub(&x2, &rhs[firstcol+2], &temp); -+ zz_mult(&temp, &x1, Mki1); Mki1++; -+ z_sub(&x2, &x2, &temp); -+ zz_mult(&temp, &x0, Mki0); Mki0++; -+ z_sub(&x3, &rhs[firstcol+3], &temp); -+ zz_mult(&temp, &x1, Mki1); Mki1++; -+ z_sub(&x3, &x3, &temp); -+ zz_mult(&temp, &x2, Mki2); Mki2++; -+ z_sub(&x3, &x3, &temp); -+ -+ rhs[++firstcol] = x1; -+ rhs[++firstcol] = x2; -+ rhs[++firstcol] = x3; -+ ++firstcol; -+ -+ for (k = firstcol; k < ncol; k++) { -+ zz_mult(&temp, &x0, Mki0); Mki0++; -+ z_sub(&rhs[k], &rhs[k], &temp); -+ zz_mult(&temp, &x1, Mki1); Mki1++; -+ z_sub(&rhs[k], &rhs[k], &temp); -+ zz_mult(&temp, &x2, Mki2); Mki2++; -+ z_sub(&rhs[k], &rhs[k], &temp); -+ zz_mult(&temp, &x3, Mki3); Mki3++; -+ z_sub(&rhs[k], &rhs[k], &temp); -+ } -+ -+ M0 += 4 * ldm + 4; -+ } -+ -+ if ( firstcol < ncol - 1 ) { /* Do 2 columns */ -+ Mki0 = M0 + 1; -+ Mki1 = Mki0 + ldm + 1; -+ -+ x0 = rhs[firstcol]; -+ zz_mult(&temp, &x0, Mki0); Mki0++; -+ z_sub(&x1, &rhs[firstcol+1], &temp); -+ -+ rhs[++firstcol] = x1; -+ ++firstcol; -+ -+ for (k = firstcol; k < ncol; k++) { -+ zz_mult(&temp, &x0, Mki0); Mki0++; -+ z_sub(&rhs[k], &rhs[k], &temp); -+ zz_mult(&temp, &x1, Mki1); Mki1++; -+ z_sub(&rhs[k], &rhs[k], &temp); -+ } -+ } -+ -+} -+ -+/* -+ * Solves a dense upper triangular system. The upper triangular matrix is -+ * stored in a 2-dim array M(1:ldm,1:ncol). The solution will be returned -+ * in the rhs vector. -+ */ -+void -+zusolve ( -+int ldm, /* in */ -+int ncol, /* in */ -+doublecomplex *M, /* in */ -+doublecomplex *rhs /* modified */ -+) -+{ -+ doublecomplex xj, temp; -+ int jcol, j, irow; -+ -+ jcol = ncol - 1; -+ -+ for (j = 0; j < ncol; j++) { -+ -+ z_div(&xj, &rhs[jcol], &M[jcol + jcol*ldm]); /* M(jcol, jcol) */ -+ rhs[jcol] = xj; -+ -+ for (irow = 0; irow < jcol; irow++) { -+ zz_mult(&temp, &xj, &M[irow+jcol*ldm]); /* M(irow, jcol) */ -+ z_sub(&rhs[irow], &rhs[irow], &temp); -+ } -+ -+ jcol--; -+ -+ } -+} -+ -+ -+/* -+ * Performs a dense matrix-vector multiply: Mxvec = Mxvec + M * vec. -+ * The input matrix is M(1:nrow,1:ncol); The product is returned in Mxvec[]. -+ */ -+void zmatvec ( -+int ldm, /* in -- leading dimension of M */ -+int nrow, /* in */ -+int ncol, /* in */ -+doublecomplex *M, /* in */ -+doublecomplex *vec, /* in */ -+doublecomplex *Mxvec /* in/out */ -+) -+{ -+ doublecomplex vi0, vi1, vi2, vi3; -+ doublecomplex *M0, temp; -+ doublecomplex *Mki0, *Mki1, *Mki2, *Mki3; -+ register int firstcol = 0; -+ int k; -+ -+ M0 = &M[0]; -+ -+ while ( firstcol < ncol - 3 ) { /* Do 4 columns */ -+ Mki0 = M0; -+ Mki1 = Mki0 + ldm; -+ Mki2 = Mki1 + ldm; -+ Mki3 = Mki2 + ldm; -+ -+ vi0 = vec[firstcol++]; -+ vi1 = vec[firstcol++]; -+ vi2 = vec[firstcol++]; -+ vi3 = vec[firstcol++]; -+ for (k = 0; k < nrow; k++) { -+ zz_mult(&temp, &vi0, Mki0); Mki0++; -+ z_add(&Mxvec[k], &Mxvec[k], &temp); -+ zz_mult(&temp, &vi1, Mki1); Mki1++; -+ z_add(&Mxvec[k], &Mxvec[k], &temp); -+ zz_mult(&temp, &vi2, Mki2); Mki2++; -+ z_add(&Mxvec[k], &Mxvec[k], &temp); -+ zz_mult(&temp, &vi3, Mki3); Mki3++; -+ z_add(&Mxvec[k], &Mxvec[k], &temp); -+ } -+ -+ M0 += 4 * ldm; -+ } -+ -+ while ( firstcol < ncol ) { /* Do 1 column */ -+ Mki0 = M0; -+ vi0 = vec[firstcol++]; -+ for (k = 0; k < nrow; k++) { -+ zz_mult(&temp, &vi0, Mki0); Mki0++; -+ z_add(&Mxvec[k], &Mxvec[k], &temp); -+ } -+ M0 += ldm; -+ } -+ -+} -+ 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 deleted file mode 100644 index afeca8f..0000000 --- a/sci-libs/superlu_mt/files/superlu_mt-2.1-missing-includes.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nur TESTING.orig/MATGEN/clatb4.c TESTING/MATGEN/clatb4.c ---- TESTING.orig/MATGEN/clatb4.c 2013-07-15 11:48:34.285967038 -0700 -+++ TESTING/MATGEN/clatb4.c 2013-07-15 11:49:05.150137959 -0700 -@@ -3,6 +3,7 @@ - -lf2c -lm (in that order) - */ - -+#include <string.h> - #include "f2c.h" - - /* Table of constant values */ -diff -Nur TESTING.orig/MATGEN/dlatb4.c TESTING/MATGEN/dlatb4.c ---- TESTING.orig/MATGEN/dlatb4.c 2013-07-15 11:48:34.288966998 -0700 -+++ TESTING/MATGEN/dlatb4.c 2013-07-15 11:49:05.150137959 -0700 -@@ -3,6 +3,7 @@ - -lf2c -lm (in that order) - */ - -+#include <string.h> - #include "f2c.h" - - /* Table of constant values */ -diff -Nur TESTING.orig/MATGEN/slatb4.c TESTING/MATGEN/slatb4.c ---- TESTING.orig/MATGEN/slatb4.c 2013-07-15 11:48:34.288966998 -0700 -+++ TESTING/MATGEN/slatb4.c 2013-07-15 11:49:05.150137959 -0700 -@@ -3,6 +3,7 @@ - -lf2c -lm (in that order) - */ - -+#include <string.h> - #include "f2c.h" - - /* Table of constant values */ -diff -Nur TESTING.orig/MATGEN/zlatb4.c TESTING/MATGEN/zlatb4.c ---- TESTING.orig/MATGEN/zlatb4.c 2013-07-15 11:48:34.288966998 -0700 -+++ TESTING/MATGEN/zlatb4.c 2013-07-15 11:49:05.150137959 -0700 -@@ -3,6 +3,7 @@ - -lf2c -lm (in that order) - */ - -+#include <string.h> - #include "f2c.h" - - /* Table of constant values */ diff --git a/sci-libs/superlu_mt/metadata.xml b/sci-libs/superlu_mt/metadata.xml deleted file mode 100644 index 2b1e34d..0000000 --- a/sci-libs/superlu_mt/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>s...@gentoo.org</email> - <name>Gentoo Science Project</name> -</maintainer> -<longdescription lang="en"> - SuperLU is a general purpose library for the direct solution of - large, sparse, nonsymmetric systems of linear equations on high - performance machines. The library is written in C and is callable - from either C or Fortran. The library routines will perform an LU - decomposition with partial pivoting and triangular system solves - through forward and back substitution. The LU factorization routines - can handle non-square matrices but the triangular solves are - performed only for square matrices. The matrix columns may be - preordered (before factorization) either through library or user - supplied routines. This preordering for sparsity is completely - separate from the factorization. Working precision iterative - refinement subroutines are provided for improved backward - stability. Routines are also provided to equilibrate the system, - estimate the condition number, calculate the relative backward - error, and estimate error bounds for the refined solutions. - This is the multi-threaded version (POSIX threads or OpenMP). -</longdescription> -</pkgmetadata> diff --git a/sci-libs/superlu_mt/superlu_mt-2.1.ebuild b/sci-libs/superlu_mt/superlu_mt-2.1.ebuild deleted file mode 100644 index 90ed576..0000000 --- a/sci-libs/superlu_mt/superlu_mt-2.1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils fortran-2 toolchain-funcs - -MYPN=SuperLU_MT - -DESCRIPTION="Multithreaded sparse LU factorization library" -HOMEPAGE="http://crd.lbl.gov/~xiaoye/SuperLU/"; -SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc openmp threads examples static-libs test" - -RDEPEND=" - virtual/blas" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( app-shells/tcsh )" - -S="${WORKDIR}/${MYPN}_${PV}" - -pkg_setup() { - if use threads; then - export CTHREADS="-D__PTHREAD" LDTHREADS="-pthread" - elif use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - export CTHREADS="-D__OPENMP" - [[ $(tc-getCC) == *gcc ]] && LDTHREADS="-fopenmp" - else - ewarn "Neither threads or openmp selected. Forcing threads" - export CTHREADS="-D__PTHREAD" LDTHREADS="-pthread" - fi - fortran-2_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-duplicate-symbols.patch \ - "${FILESDIR}"/${P}-missing-includes.patch -} - -src_configure() { - sed -i \ - -e 's/^\(PLAT\s*=\).*/\1/' \ - -e "s:^\(CC\s*=\).*:\1 $(tc-getCC):" \ - -e "/CFLAGS/s:-O3:${CFLAGS} \$(PIC):" \ - -e "s:^\(PREDEFS\s*=\).*:\1 ${CPPFLAGS} -DUSE_VENDOR_BLAS \$(CTHREADS)$:" \ - -e "s:^\(NOOPTS\s*=.*\):\1 \$(PIC):" \ - -e "s:^\(FORTRAN\s*=\).*:\1 $(tc-getFC):" \ - -e "s:^\(FFLAGS\s*=\).*:\1 ${FFLAGS} \$(PIC):" \ - -e "s:^\(ARCH\s*=\).*:\1 $(tc-getAR):" \ - -e "s:^\(RANLIB\s*=\).*:\1 $(tc-getRANLIB):" \ - -e "s:^\(LOADER\s*=\).*:\1 $(tc-getCC):" \ - -e "s:^\(LOADOPTS\s*=\).*:\1 ${LDFLAGS} \$(LDTHREADS):" \ - -e "/MPLIB/d" \ - -e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \ - make.inc || die - SONAME=libsuperlu_mt.so.0 - sed -i \ - -e 's|../make.inc|make.inc|' \ - -e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \ - -e '/:.*$(SUPERLULIB)/s|../lib/$(SUPERLULIB)||g' \ - -e 's|../lib/$(SUPERLULIB)|-lsuperlu_mt|g' \ - EXAMPLE/Makefile || die -} - -src_compile() { - emake superlulib \ - PIC="-fPIC" ARCH="echo" ARCHFLAGS="" RANLIB="echo" - $(tc-getCC) ${LDFLAGS} ${LDTHREADS} -shared -Wl,-soname=${SONAME} SRC/*.o \ - $($(tc-getPKG_CONFIG) --libs blas) -lm -o lib/${SONAME} || die - ln -s ${SONAME} lib/libsuperlu_mt.so || die - - use static-libs && rm -f SRC/*.o && emake superlulib \ - PIC="" ARCH="$(tc-getAR)" ARCHFLAGS="cr" RANLIB="$(tc-getRANLIB)" -} - -src_test() { - emake -j1 tmglib - LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \ - emake SUPERLULIB="${SONAME}" testing -} - -src_install() { - dolib.so lib/*so* - use static-libs && dolib.a lib/*.a - insinto /usr/include/${PN} - doins SRC/*h - dodoc README - use doc && dodoc DOC/ug.pdf - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r EXAMPLE/* make.inc - fi -} - -pkg_postinst() { - elog "${PN} has been designed to work with a single-threaded blas library" - elog "Make sure to eselect one (openblas/atlas) when using superlu_mt" -} diff --git a/sci-misc/fitscut/fitscut-1.4.4.ebuild b/sci-misc/fitscut/fitscut-1.4.4.ebuild deleted file mode 100644 index 677ec7e..0000000 --- a/sci-misc/fitscut/fitscut-1.4.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils - -DESCRIPTION="Extract cutouts from FITS image files" -HOMEPAGE="http://acs.pha.jhu.edu/general/software/fitscut/"; -SRC_URI="${HOMEPAGE}/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=sci-libs/cfitsio-3:0= - sci-astronomy/wcstools:0= - media-libs/libpng:0= - virtual/jpeg:0=" -DEPEND="${RDEPEND}" - -src_prepare() { - # gentoo wcs is called wcstools to avoid conflict with wcslib - sed -i \ - -e 's/libwcs/wcs/g' \ - wcs*.c fitscut.c || die - # cfitsio/fitsio.h might conflict with host on prefix - sed -i \ - -e 's/LIB(wcs,/LIB(wcstools,/' \ - -e 's/-lwcs/-lwcstools/' \ - -e '/cfitsio\/fitsio.h/d' \ - configure.in || die - autotools-utils_src_prepare -} diff --git a/sci-misc/fitscut/metadata.xml b/sci-misc/fitscut/metadata.xml deleted file mode 100644 index cc63d59..0000000 --- a/sci-misc/fitscut/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>sci-astron...@gentoo.org</email> - <name>Gentoo Astronomy Project</name> - </maintainer> - <longdescription lang="en"> - fitscut is designed to extract cutouts from FITS image format - files. FITS, PNG, and JPEG output types are supported. - When multiple input files are specified and the output type is PNG or - JPEG the resulting image is an RGB color image. -</longdescription> -</pkgmetadata> diff --git a/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch b/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch deleted file mode 100644 index 0c80297..0000000 --- a/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- Looptools/Makefile.am -+++ Looptools/Makefile.am -@@ -1,58 +1,12 @@ --noinst_LTLIBRARIES = libHwLooptoolsXFC.la libHwLooptoolsCFC.la --noinst_LTLIBRARIES += libHwLooptools.la -- --EXTRA_DIST = include/lt.h include/ftypes.h include/ff.h include/ffwarn.h \ -- include/fferr.h include/defs.h include/looptools.h include/ffperm5.h \ -- include/clooptools.h include/cexternals.h include/externals.h \ -- util/solve-LU.F util/solve-LU.h util/solve-Eigen.F -- --theXFCSOURCES = \ --A/A0.F A/A00.F A/ffxa0.F A/ffca0.F B/Bget.F \ --B/Bcoeff.F B/BcoeffC.F B/Bcoeffa.F B/Bcoeffb.F B/ffxb0.F \ --B/ffcb0.F B/ffxb1.F B/ffcb1.F B/ffxb2p.F B/ffcb2p.F \ --B/ffxdb0.F B/ffcdb0.F B/ffxdb1.F B/ffdel2.F B/ffcel2.F \ --C/C0.F C/C0C.F C/Cget.F C/ffxc0.F C/ffcc0.F \ --C/ffxc0i.F C/ffxc0p.F C/ffxc0p0.F C/ffcc0p.F C/ffdxc0.F \ --C/ffdel3.F C/ffcel3.F D/D0.F D/D0C.F D/Dget.F \ --D/ffxd0.F D/ffxd0h.F D/ffxd0i.F D/ffxd0p.F D/ffxd0m0.F \ --D/ffxd0tra.F D/ffxdbd.F D/ffdcc0.F D/ffdel4.F D/ffd0c.F \ --D/ffTn.F D/ffT13.F D/ffS2.F D/ffS3n.F D/ffRn.F \ --E/E0.F E/Eget.F E/Ecoeffa.F E/Ecoeffb.F E/ffxe0.F \ --E/ffdel5.F util/ini.F util/auxCD.F util/solve.F util/Dump.F \ --util/Li2.F util/ffinit.F util/ffxli2.F util/ffcli2.F util/ffxxyz.F \ --util/ffcxyz.F util/ffcrr.F util/ffcxr.F util/fftran.F util/ffabcd.F \ --util/ff2dl2.F util/ffcxs3.F util/ffcxs4.F util/ffdcxs.F util/ffbndc.F -- --## the following need -DCOMPLEXPARA --theCFCSOURCES = \ --A/A0.F A/A00.F B/Bget.F B/Bcoeffa.F C/Cget.F D/Dget.F E/E0.F \ --E/Eget.F E/Ecoeffa.F E/Ecoeffb.F util/solve.F util/Dump.F util/Li2.F -+noinst_LTLIBRARIES = libHwLooptools.la - - commonCPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include - --libHwLooptoolsXFC_la_SOURCES = $(theXFCSOURCES) --libHwLooptoolsXFC_la_CPPFLAGS = $(commonCPPFLAGS) --libHwLooptoolsXFC_la_FCFLAGS = $(AM_FCFLAGS) -ffixed-line-length-none --libHwLooptoolsXFC_la_FFLAGS = $(AM_FFLAGS) -ffixed-line-length-none -- --libHwLooptoolsCFC_la_SOURCES = $(theCFCSOURCES) --libHwLooptoolsCFC_la_CPPFLAGS = $(commonCPPFLAGS) -DCOMPLEXPARA --libHwLooptoolsCFC_la_FCFLAGS = $(AM_FCFLAGS) -ffixed-line-length-none --libHwLooptoolsCFC_la_FFLAGS = $(AM_FFLAGS) -ffixed-line-length-none -- --## installed already from "include/Makefile.am" --## noinst_HEADERS = include/clooptools.h -- --##if NEED_APPLE_FIXES --##libHwLooptoolsXFC_la_LDFLAGS = -Wl,-single_module --##libHwLooptoolsCFC_la_LDFLAGS = -Wl,-single_module --##endif -- --libHwLooptools_la_SOURCES = util/cache.c clooptools.cc -+libHwLooptools_la_SOURCES = clooptools.cc - libHwLooptools_la_CXXFLAGS = $(AM_CXXFLAGS) -Wno-strict-aliasing - libHwLooptools_la_CPPFLAGS = $(commonCPPFLAGS) - libHwLooptools_la_CFLAGS = $(AM_CFLAGS) -std=c99 --libHwLooptools_la_LIBADD = libHwLooptoolsXFC.la libHwLooptoolsCFC.la -+libHwLooptools_la_LIBADD = -looptools - - - ## libHwLooptoolsHelper2_la_SOURCES = clooptools.cc diff --git a/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild b/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild deleted file mode 100644 index 05ab0f2..0000000 --- a/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils eutils flag-o-matic multilib - -MYP=Herwig++-${PV} - -DESCRIPTION="High-Energy Physics event generator" -HOMEPAGE="http://herwig.hepforge.org/"; -SRC_URI="http://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"; - -LICENSE="GPL-2" - -SLOT="0/14" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="c++11 fastjet static-libs" - -RDEPEND=" - dev-libs/boost:0= - sci-libs/gsl:0= - <=sci-physics/looptools-2.8:0= - >=sci-physics/thepeg-1.9.1:0= - fastjet? ( sci-physics/fastjet:0= )" -DEPEND="${RDEPEND} - virtual/fortran" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.6.3-looptools.patch - find -name 'Makefile.am' -exec \ - sed -i -e '1ipkgdatadir=$(datadir)/herwig++' {} \; || die - autotools-utils_src_prepare -} - -src_configure() { - use prefix && \ - append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/ThePEG - local myeconfargs=( - --with-boost="${EPREFIX}"/usr - --with-thepeg="${EPREFIX}"/usr - $(use_enable c++11 stdcxx11) - $(use_with fastjet fastjet "${EPREFIX}"/usr) - ) - autotools-utils_src_configure -} - -pkg_preinst () { - sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die - sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die -} diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml deleted file mode 100644 index 8db6bd6..0000000 --- a/sci-physics/herwig++/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="person"> - <email>jauh...@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>sci-phys...@gentoo.org</email> - <name>Gentoo Physics Project</name> -</maintainer> -<longdescription> - Herwig++ is a completely new event generator, written in C++. - It is built on the experience gained with the well-known - event generator HERWIG. The aim is to provide a multi purpose - event generator with similar or improved capabilities (like angular - ordered parton evolution and the cluster hadronization model). -</longdescription> -<use> - <flag name="c++11">Build Herwig++ using the C++11 standard. - Experimental feature, not for production use.</flag> - <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag> -</use> -</pkgmetadata> diff --git a/sci-physics/looptools/files/looptools-2.10-makefile.patch b/sci-physics/looptools/files/looptools-2.10-makefile.patch deleted file mode 100644 index 8758244..0000000 --- a/sci-physics/looptools/files/looptools-2.10-makefile.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- makefile.in -+++ makefile.in -@@ -1,14 +1,17 @@ - BLD = build$(QUADSUFFIX) - --LIBDIR = $(PREFIX)/lib$(LIBDIRSUFFIX) --INCLUDEDIR = $(PREFIX)/include --BINDIR = $(PREFIX)/bin -+LIBDIR = $(DESTDIR)/$(PREFIX)/lib$(LIBDIRSUFFIX) -+INCLUDEDIR = $(DESTDIR)/$(PREFIX)/include -+BINDIR = $(DESTDIR)/$(PREFIX)/bin - - LIB = libooptools$(QUADSUFFIX).a - FE = lt$(QUADSUFFIX)$(EXE) - MFE = LoopTools$(QUADSUFFIX)$(EXE) - INCLUDE = $(BLD)/looptools.h $(BLD)/clooptools.h - -+LIBRARY=libooptools.so -+REALNAME=$(LIBRARY).$(VER) -+ - ARGS = $(PARALLEL) \ - LIB="$(LIB)" \ - FE="$(FE)" \ -@@ -16,12 +19,12 @@ - EXE="$(EXE)" \ - DEF="$(DEF)" \ - NOUNDERSCORE="$(NOUNDERSCORE)" \ -- XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I." \ -+ XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I. -fPIC" \ - F90="$(F90)" \ - CC="$(CC)" \ -- CFLAGS="$(CFLAGS) $(CFLAGS-quad)" \ -+ CFLAGS="$(CFLAGS) $(CFLAGS-quad) -fPIC" \ - CXX="$(CXX)" \ -- CXXFLAGS="$(CXXFLAGS)" \ -+ CXXFLAGS="$(CXXFLAGS) -fPIC" \ - ML="$(ML)" \ - MCC="$(MCC)" \ - MCFLAGS="$(MCFLAGS)" \ -@@ -32,22 +35,24 @@ - DLLTOOL="$(DLLTOOL)" \ - LDFLAGS="$(LDFLAGS)" \ - LIBPATH="$(LIBPATH)" \ -- OBJS-quad="$(OBJS-quad)" -+ OBJS-quad="$(OBJS-quad)" \ -+ REALNAME="$(REALNAME)" - - --default all lib frontend mma: force -+default all lib solib frontend mma: force - cd $(BLD) && $(MAKE) $(ARGS) $@ - --install: lib frontend -- -mkdir $(PREFIX) -+install: lib solib frontend -+ -mkdir $(DESTDIR)$(PREFIX) - -mkdir $(LIBDIR) $(BINDIR) $(INCLUDEDIR) - cp -p $(BLD)/$(LIB) $(LIBDIR) - cp -p $(INCLUDE$(QUADSUFFIX)) $(INCLUDEDIR) -- strip $(BLD)/$(FE) - cp -p $(BLD)/fcc $(BLD)/$(FE) $(BINDIR) - rm -f $(BINDIR)/f++ - ln -s fcc $(BINDIR)/f++ -- test ! -f $(BLD)/$(MFE) || { strip $(BLD)/$(MFE) ; cp -p $(BLD)/$(MFE) $(BINDIR); } -+ test ! -f $(BLD)/$(MFE) || { cp -p $(BLD)/$(MFE) $(BINDIR); } -+ cp -p $(BLD)/$(REALNAME) $(LIBDIR) -+ cd $(LIBDIR) && ln -s $(REALNAME) $(LIBRARY) - - force: $(BLD)/timestamp - ---- src/makefile -+++ src/makefile -@@ -1,6 +1,6 @@ --default: frontend mma$(ML) -+default: frontend mma$(ML) solib - --all: frontend mma1 -+all: frontend mma1 solib - - frontend: lib $(FE) - -@@ -8,6 +8,7 @@ - - mma0 lib: $(LIB) clooptools.h fcc - -+solib: $(REALNAME) fcc - - .SUFFIXES: - -@@ -243,6 +244,8 @@ - $(AR) cru $(LIB) $? - -$(RANLIB) $(LIB) - -+$(REALNAME): $(OBJS) -+ $(XFC) $(LDFLAGS) -shared -Wl,--soname,$(REALNAME) -o $@ $? - - $(FE): lt.F $(LTINC) $(LIB) - $(XFC) -o $(FE) lt.F $(LIB) -lpthread diff --git a/sci-physics/looptools/files/looptools-2.8-makefile.patch b/sci-physics/looptools/files/looptools-2.8-makefile.patch deleted file mode 100644 index 5252c1d..0000000 --- a/sci-physics/looptools/files/looptools-2.8-makefile.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- makefile.in -+++ makefile.in -@@ -1,14 +1,17 @@ - BLD = build$(QUADSUFFIX) - --LIBDIR = $(PREFIX)/lib$(LIBDIRSUFFIX) --INCLUDEDIR = $(PREFIX)/include --BINDIR = $(PREFIX)/bin -+LIBDIR = $(DESTDIR)/$(PREFIX)/lib$(LIBDIRSUFFIX) -+INCLUDEDIR = $(DESTDIR)/$(PREFIX)/include -+BINDIR = $(DESTDIR)/$(PREFIX)/bin - - LIB = libooptools$(QUADSUFFIX).a - FE = lt$(QUADSUFFIX)$(EXE) - MFE = LoopTools$(QUADSUFFIX)$(EXE) - INCLUDE = $(BLD)/looptools.h $(BLD)/clooptools.h - -+LIBRARY=libooptools.so -+REALNAME=$(LIBRARY).$(VER) -+ - ARGS = $(PARALLEL) \ - LIB="$(LIB)" \ - FE="$(FE)" \ -@@ -16,12 +19,12 @@ - EXE="$(EXE)" \ - DEF="$(DEF)" \ - NOUNDERSCORE="$(NOUNDERSCORE)" \ -- XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I." \ -+ XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I. -fPIC" \ - F90="$(F90)" \ - CC="$(CC)" \ -- CFLAGS="$(CFLAGS) $(CFLAGS-quad)" \ -+ CFLAGS="$(CFLAGS) $(CFLAGS-quad) -fPIC" \ - CXX="$(CXX)" \ -- CXXFLAGS="$(CXXFLAGS)" \ -+ CXXFLAGS="$(CXXFLAGS) -fPIC" \ - ML="$(ML)" \ - MCC="$(MCC)" \ - MCFLAGS="$(MCFLAGS)" \ -@@ -31,20 +34,22 @@ - DLLTOOL="$(DLLTOOL)" \ - LDFLAGS="$(LDFLAGS)" \ - LIBPATH="$(LIBPATH)" \ -- OBJS-quad="$(OBJS-quad)" -+ OBJS-quad="$(OBJS-quad)" \ -+ REALNAME="$(REALNAME)" - - --default all lib frontend mma: force -+default all lib solib frontend mma: force - cd $(BLD) && $(MAKE) $(ARGS) $@ - --install: lib frontend -- -mkdir $(PREFIX) -+install: lib solib frontend -+ -mkdir $(DESTDIR)$(PREFIX) - -mkdir $(LIBDIR) $(BINDIR) $(INCLUDEDIR) - cp -p $(BLD)/$(LIB) $(LIBDIR) - cp -p $(INCLUDE$(QUADSUFFIX)) $(INCLUDEDIR) -- strip $(BLD)/$(FE) - cp -p $(BLD)/fcc $(BLD)/$(FE) $(BINDIR) -- test ! -f $(BLD)/$(MFE) || { strip $(BLD)/$(MFE) ; cp -p $(BLD)/$(MFE) $(BINDIR); } -+ test ! -f $(BLD)/$(MFE) || { cp -p $(BLD)/$(MFE) $(BINDIR); } -+ cp -p $(BLD)/$(REALNAME) $(LIBDIR) -+ cd $(LIBDIR) && ln -s $(REALNAME) $(LIBRARY) - - force: $(BLD)/timestamp - ---- src/makefile -+++ src/makefile -@@ -1,6 +1,6 @@ --default: frontend mma$(ML) -+default: frontend mma$(ML) solib - --all: frontend mma1 -+all: frontend mma1 solib - - frontend: lib $(FE) - -@@ -8,6 +8,7 @@ - - mma0 lib: $(LIB) clooptools.h fcc - -+solib: $(REALNAME) fcc - - .SUFFIXES: - -@@ -247,6 +248,8 @@ - $(AR) cru $(LIB) $? - -$(RANLIB) $(LIB) - -+$(REALNAME): $(OBJS) -+ $(XFC) $(LDFLAGS) -shared -Wl,--soname,$(REALNAME) -o $@ $? - - $(FE): lt.F $(LTINC) $(LIB) - $(XFC) -o $(FE) lt.F $(LIB) diff --git a/sci-physics/looptools/looptools-2.10.ebuild b/sci-physics/looptools/looptools-2.10.ebuild deleted file mode 100644 index 008a5ca..0000000 --- a/sci-physics/looptools/looptools-2.10.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils fortran-2 multilib - -MYP=LoopTools-${PV} - -DESCRIPTION="Tools for evaluation of scalar and tensor one-loop integrals" -HOMEPAGE="http://www.feynarts.de/looptools"; -SRC_URI="http://www.feynarts.de/looptools/${MYP}.tar.gz"; - -LICENSE="LGPL-3" - -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -DEPEND="virtual/fortran" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch - export VER="${PV}" - # necessary fix for prefix - sed -i "s/lib\$(LIBDIRSUFFIX)/$(get_libdir)/" makefile.in || die -} - -src_install() { - default - # another one of these package building archive with pic - # no: ooptools is not a typo - use static-libs || rm "${ED}"/usr/$(get_libdir)/libooptools.a - use doc && dodoc manual/*.pdf -} diff --git a/sci-physics/looptools/looptools-2.11.ebuild b/sci-physics/looptools/looptools-2.11.ebuild deleted file mode 100644 index 04f017d..0000000 --- a/sci-physics/looptools/looptools-2.11.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils fortran-2 multilib - -MYP=LoopTools-${PV} - -DESCRIPTION="Tools for evaluation of scalar and tensor one-loop integrals" -HOMEPAGE="http://www.feynarts.de/looptools"; -SRC_URI="http://www.feynarts.de/looptools/${MYP}.tar.gz"; - -LICENSE="LGPL-3" - -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -DEPEND="virtual/fortran" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.10-makefile.patch - export VER="${PV}" - # necessary fix for prefix - sed -i "s/lib\$(LIBDIRSUFFIX)/$(get_libdir)/" makefile.in || die -} - -src_install() { - default - # another one of these package building archive with pic - # no: ooptools is not a typo - use static-libs || rm "${ED}"/usr/$(get_libdir)/libooptools.a - use doc && dodoc manual/*.pdf -} diff --git a/sci-physics/looptools/looptools-2.9.ebuild b/sci-physics/looptools/looptools-2.9.ebuild deleted file mode 100644 index 64a53bb..0000000 --- a/sci-physics/looptools/looptools-2.9.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils fortran-2 multilib - -MYP=LoopTools-${PV} - -DESCRIPTION="Tools for evaluation of scalar and tensor one-loop integrals" -HOMEPAGE="http://www.feynarts.de/looptools"; -SRC_URI="http://www.feynarts.de/looptools/${MYP}.tar.gz"; - -LICENSE="LGPL-3" - -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -DEPEND="virtual/fortran" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.8-makefile.patch - export VER="${PV}" - # necessary fix for prefix - sed -i "s/lib\$(LIBDIRSUFFIX)/$(get_libdir)/" makefile.in || die -} - -src_install() { - default - # another one of these package building archive with pic - # no: ooptools is not a typo - use static-libs || rm "${ED}"/usr/$(get_libdir)/libooptools.a - use doc && dodoc manual/*.pdf -} diff --git a/sci-physics/looptools/metadata.xml b/sci-physics/looptools/metadata.xml deleted file mode 100644 index 4333af5..0000000 --- a/sci-physics/looptools/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>sci-phys...@gentoo.org</email> - <name>Gentoo Physics Project</name> -</maintainer> -<longdescription> - A package for evaluation of scalar and tensor one-loop integrals - based on the FF package by G.J. van Oldenborgh. - It features an easy Fortran, C++, and Mathematica interface - to the scalar one-loop functions of FF and in addition provides - the 2-, 3-, and 4-point tensor coefficient functions. -</longdescription> -</pkgmetadata> diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml deleted file mode 100644 index 532272a..0000000 --- a/sci-physics/rivet/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>sci-phys...@gentoo.org</email> - <name>Gentoo Physics Project</name> -</maintainer> -<longdescription> - The Rivet project (Robust Independent Validation of Experiment and - Theory) is a toolkit for validation of Monte Carlo event - generators. It provides a large (and ever growing) set of - experimental analyses useful for MC generator development, - validation, and tuning, as well as a convenient infrastructure for - adding your own analyses. Rivet is the most widespread way by which - analysis code from the LHC and other high-energy collider - experiments is preserved for comparison to and development of future - theory models. -</longdescription> -</pkgmetadata> diff --git a/sci-physics/rivet/rivet-2.1.1.ebuild b/sci-physics/rivet/rivet-2.1.1.ebuild deleted file mode 100644 index 12f29d9..0000000 --- a/sci-physics/rivet/rivet-2.1.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_IN_SOURCE_BUILD=1 -AUTOTOOLS_AUTORECONF=1 -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 autotools-utils bash-completion-r1 - -MYP=Rivet-${PV} - -DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators" -HOMEPAGE="http://rivet.hepforge.org/"; - -SRC_URI="http://www.hepforge.org/archive/${PN}/${MYP}.tar.bz2"; -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc python static-libs" - -RDEPEND=" - dev-libs/boost:0= - sci-libs/gsl:0= - sci-physics/fastjet:0=[plugins] - sci-physics/hepmc:0= - sci-physics/yoda:0=[python] - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[latex,dot] ) - python? ( dev-python/cython[${PYTHON_USEDEP}] )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MYP}" - -#PATCHES=( "${FILESDIR}"/${P}-system-yaml-cpp.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myeconfargs=( - $(use_enable python pyext) - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - use doc && doxygen Doxyfile -} - -src_install() { - autotools-utils_src_install - newbashcomp "${ED}"/usr/share/Rivet/rivet-completion rivet - use doc && dohtml -r doxy/html/* && dodoc doc/rivet-manual.pdf -} diff --git a/sci-physics/rivet/rivet-2.1.2.ebuild b/sci-physics/rivet/rivet-2.1.2.ebuild deleted file mode 100644 index 12f29d9..0000000 --- a/sci-physics/rivet/rivet-2.1.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_IN_SOURCE_BUILD=1 -AUTOTOOLS_AUTORECONF=1 -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 autotools-utils bash-completion-r1 - -MYP=Rivet-${PV} - -DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators" -HOMEPAGE="http://rivet.hepforge.org/"; - -SRC_URI="http://www.hepforge.org/archive/${PN}/${MYP}.tar.bz2"; -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc python static-libs" - -RDEPEND=" - dev-libs/boost:0= - sci-libs/gsl:0= - sci-physics/fastjet:0=[plugins] - sci-physics/hepmc:0= - sci-physics/yoda:0=[python] - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[latex,dot] ) - python? ( dev-python/cython[${PYTHON_USEDEP}] )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MYP}" - -#PATCHES=( "${FILESDIR}"/${P}-system-yaml-cpp.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myeconfargs=( - $(use_enable python pyext) - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - use doc && doxygen Doxyfile -} - -src_install() { - autotools-utils_src_install - newbashcomp "${ED}"/usr/share/Rivet/rivet-completion rivet - use doc && dohtml -r doxy/html/* && dodoc doc/rivet-manual.pdf -} diff --git a/sci-physics/yoda/metadata.xml b/sci-physics/yoda/metadata.xml deleted file mode 100644 index 8075483..0000000 --- a/sci-physics/yoda/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>sci-phys...@gentoo.org</email> - <name>Gentoo Physics Project</name> -</maintainer> -<longdescription> - Yet more Objects for Data Analysis is a small set of data analysis - (specifically histogramming) classes being developed by MCnet - members as a lightweight common system for MC event generator - validation analyses, particularly as the core histogramming system - in Rivet. -</longdescription> -<use> - <flag name="root">Adds support for <pkg>sci-physics/root</pkg></flag> -</use> -</pkgmetadata> diff --git a/sci-physics/yoda/yoda-1.0.6.ebuild b/sci-physics/yoda/yoda-1.0.6.ebuild deleted file mode 100644 index ab1a835..0000000 --- a/sci-physics/yoda/yoda-1.0.6.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_IN_SOURCE_BUILD=1 -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 autotools-utils bash-completion-r1 - -MYP=YODA-${PV} - -DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis" -HOMEPAGE="http://yoda.hepforge.org/"; - -SRC_URI="http://www.hepforge.org/archive/${PN}/${MYP}.tar.bz2"; -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="python root static-libs" - -RDEPEND=" - dev-libs/boost:0= - python? ( ${PYTHON_DEPS} ) - root? ( sci-physics/root:0=[python=,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - python? ( dev-python/cython[${PYTHON_USEDEP}] )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MYP}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myeconfargs=( - $(use_enable python pyext) - $(use_enable root) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - newbashcomp "${ED}"/usr/share/YODA/yoda-completion yoda -}
