From 70dd4866a07bb8ce6b220b7789371bcec8929536 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Tue, 11 Feb 2014 18:51:02 +0000 Subject: Fixed pkg-config patch, removed old (Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) --- sci-libs/arpack/ChangeLog | 10 ++- sci-libs/arpack/arpack-3.1.2-r1.ebuild | 91 ---------------------- sci-libs/arpack/arpack-3.1.2.ebuild | 87 --------------------- .../arpack/files/arpack-3.1.2-pkg-config.patch | 55 ------------- sci-libs/arpack/files/arpack-3.1.2-test.patch | 36 --------- sci-libs/arpack/files/arpack-3.1.3-pkgconfig.patch | 2 +- sci-libs/arpack/metadata.xml | 4 +- 7 files changed, 11 insertions(+), 274 deletions(-) delete mode 100644 sci-libs/arpack/arpack-3.1.2-r1.ebuild delete mode 100644 sci-libs/arpack/arpack-3.1.2.ebuild delete mode 100644 sci-libs/arpack/files/arpack-3.1.2-pkg-config.patch delete mode 100644 sci-libs/arpack/files/arpack-3.1.2-test.patch (limited to 'sci-libs') diff --git a/sci-libs/arpack/ChangeLog b/sci-libs/arpack/ChangeLog index 14c4780c0eec..4602fefaee55 100644 --- a/sci-libs/arpack/ChangeLog +++ b/sci-libs/arpack/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/arpack -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.54 2013/11/13 08:20:30 jlec Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.55 2014/02/11 18:51:02 bicatali Exp $ + + 11 Feb 2014; Sébastien Fabbro -arpack-3.1.2-r1.ebuild, + -arpack-3.1.2.ebuild, -files/arpack-3.1.2-pkg-config.patch, + -files/arpack-3.1.2-test.patch, files/arpack-3.1.3-pkgconfig.patch, + metadata.xml: + Fixed pkg-config patch, removed old *arpack-3.1.3-r1 (13 Nov 2013) diff --git a/sci-libs/arpack/arpack-3.1.2-r1.ebuild b/sci-libs/arpack/arpack-3.1.2-r1.ebuild deleted file mode 100644 index c337723cd235..000000000000 --- a/sci-libs/arpack/arpack-3.1.2-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.2-r1.ebuild,v 1.3 2013/07/18 12:50:22 chithanh Exp $ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs - -DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems" -HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/" -SRC_URI=" - http://forge.scilab.org/upload/arpack-ng/files/${PN}-ng_${PV}.tar.gz - doc? ( - http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz - http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc examples mpi static-libs" - -RDEPEND=" - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[fortran] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-ng_${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-pkg-config.patch - "${FILESDIR}"/${P}-test.patch - ) - -src_configure() { - tc-export PKG_CONFIG - local myeconfargs=( - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - $(use_enable mpi) - ) - autotools-utils_src_configure -} - -src_test() { - autotools-utils_src_test - pushd "${S}"/EXAMPLES/SIMPLE - touch ../../ARmake.inc - emake simple FC=$(tc-getFC) LDFLAGS="${LDFLAGS} -L${AUTOTOOLS_BUILD_DIR}/.libs" - local prog= - for p in ss ds sn dn cn zn; do - prog=${p}simp - LD_LIBRARY_PATH="${AUTOTOOLS_BUILD_DIR}/.libs" ./${prog} \ - || die "${prog} test failed" - rm -f ${prog} *.o || die - done - popd - - if use mpi; then - pushd "${AUTOTOOLS_BUILD_DIR}"/PARPACK/EXAMPLES/MPI - emake \ - FC=mpif77 \ - LDFLAGS="${LDFLAGS} -L${AUTOTOOLS_BUILD_DIR}/.libs -L${AUTOTOOLS_BUILD_DIR}/PARPACK/.libs ${LIBS}" - for p in 1 3; do - prog=pdndrv${p} - LD_LIBRARY_PATH="${AUTOTOOLS_BUILD_DIR}/.libs:${AUTOTOOLS_BUILD_DIR}/PARPACK/.libs" \ - ./${prog} || die "${prog} test failed" - rm -f ${prog} *.o || die - done - popd - fi -} - -src_install() { - autotools-utils_src_install - - dodoc DOCUMENTS/*.doc - newdoc DOCUMENTS/README README.doc - use doc && dodoc "${WORKDIR}"/*.ps - if use examples; then - insinto /usr/share/doc/${PF} - doins -r EXAMPLES - if use mpi; then - insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK - doins -r PARPACK/EXAMPLES/MPI - fi - fi -} diff --git a/sci-libs/arpack/arpack-3.1.2.ebuild b/sci-libs/arpack/arpack-3.1.2.ebuild deleted file mode 100644 index b915ea507032..000000000000 --- a/sci-libs/arpack/arpack-3.1.2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.2.ebuild,v 1.5 2013/01/08 02:50:20 calchan Exp $ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs - -DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems" -HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/" -SRC_URI=" - http://forge.scilab.org/upload/arpack-ng/files/${PN}-ng_${PV}.tar.gz - doc? ( - http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz - http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc examples mpi static-libs" - -RDEPEND=" - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[fortran] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-ng_${PV}" - -PATCHES=( "${FILESDIR}"/${P}-test.patch ) - -src_configure() { - local myeconfargs=( - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - $(use_enable mpi) - ) - autotools-utils_src_configure -} - -src_test() { - default - pushd EXAMPLES/SIMPLE - touch ../../ARmake.inc - emake simple FC=$(tc-getFC) LDFLAGS="${LDFLAGS} -L${AUTOTOOLS_BUILD_DIR}/.libs" - local prog= - for p in ss ds sn dn cn zn; do - prog=${p}simp - LD_LIBRARY_PATH="${AUTOTOOLS_BUILD_DIR}/.libs" ./${prog} \ - || die "${prog} test failed" - rm -f ${prog} *.o || die - done - popd - - if use mpi; then - pushd "${AUTOTOOLS_BUILD_DIR}"/PARPACK/EXAMPLES/MPI - emake \ - FC=mpif77 \ - LDFLAGS="${LDFLAGS} -L${AUTOTOOLS_BUILD_DIR}/.libs -L${AUTOTOOLS_BUILD_DIR}/PARPACK/.libs ${LIBS}" - for p in 1 3; do - prog=pdndrv${p} - LD_LIBRARY_PATH="${AUTOTOOLS_BUILD_DIR}/.libs:${AUTOTOOLS_BUILD_DIR}/PARPACK/.libs" \ - ./${prog} || die "${prog} test failed" - rm -f ${prog} *.o || die - done - popd - fi -} - -src_install() { - autotools-utils_src_install - - dodoc DOCUMENTS/*.doc - newdoc DOCUMENTS/README README.doc - use doc && dodoc "${WORKDIR}"/*.ps - if use examples; then - insinto /usr/share/doc/${PF} - doins -r EXAMPLES - if use mpi; then - insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK - doins -r PARPACK/EXAMPLES/MPI - fi - fi -} diff --git a/sci-libs/arpack/files/arpack-3.1.2-pkg-config.patch b/sci-libs/arpack/files/arpack-3.1.2-pkg-config.patch deleted file mode 100644 index 92399140a424..000000000000 --- a/sci-libs/arpack/files/arpack-3.1.2-pkg-config.patch +++ /dev/null @@ -1,55 +0,0 @@ - arpack.pc | 9 --------- - arpack.pc.in | 10 ++++++++++ - configure.ac | 3 ++- - 3 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/arpack.pc b/arpack.pc -deleted file mode 100644 -index b630b77..0000000 ---- a/arpack.pc -+++ /dev/null -@@ -1,9 +0,0 @@ --prefix=/usr --exec_prefix=${prefix} --libdir=${exec_prefix}/lib -- --Name: arpack --Description: ARPACK-NG --Version: 3.0.2 --Libs: -L${libdir} -larpack -lblas --Cflags: -diff --git a/arpack.pc.in b/arpack.pc.in -new file mode 100644 -index 0000000..36fa4ff ---- /dev/null -+++ b/arpack.pc.in -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=${prefix} -+libdir=@libdir@ -+ -+Name: arpack -+Description: ARPACK-NG -+Version: @VERSION@ -+Libs: -L${libdir} -larpack -+Libs.private: @BLAS_LIBS@ -+Cflags: -diff --git a/configure.ac b/configure.ac -index 95c65b8..fe94be9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,5 @@ - AC_PREREQ(2.59) --AC_INIT([arpack-ng], [3.1.0], [http://forge.scilab.org/index.php/p/arpack-ng/issues/]) -+AC_INIT([arpack-ng], [3.1.2], [http://forge.scilab.org/index.php/p/arpack-ng/issues/]) - AM_INIT_AUTOMAKE([foreign]) - AM_MAINTAINER_MODE - -@@ -42,6 +42,7 @@ AM_CONDITIONAL(MPI, test x"$enable_mpi" = x"yes") - # LAPACK/Makefile - - AC_CONFIG_FILES([ -+ arpack.pc - Makefile - SRC/Makefile - UTIL/Makefile diff --git a/sci-libs/arpack/files/arpack-3.1.2-test.patch b/sci-libs/arpack/files/arpack-3.1.2-test.patch deleted file mode 100644 index 831862405762..000000000000 --- a/sci-libs/arpack/files/arpack-3.1.2-test.patch +++ /dev/null @@ -1,36 +0,0 @@ - EXAMPLES/SIMPLE/makefile | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/EXAMPLES/SIMPLE/makefile b/EXAMPLES/SIMPLE/makefile -index 9eb51db..0764b44 100644 ---- a/EXAMPLES/SIMPLE/makefile -+++ b/EXAMPLES/SIMPLE/makefile -@@ -7,21 +7,21 @@ - #\SCCS Information: @(#) - # FILE: makefile SID: 2.2 DATE OF SID: 9/24/96 RELEASE: 2 - # --include ../../ARmake.inc -+#include ../../ARmake.inc - # - # simple drivers - # - simple: sssimp dssimp snsimp dnsimp cnsimp znsimp - # - sssimp: sssimp.o -- $(FC) $(FFLAGS) sssimp.o $(ALIBS) -o sssimp -+ $(FC) $(FFLAGS) $(LDFLAGS) sssimp.o $(ALIBS) -o sssimp `$(PKG_CONFIG) --libs blas lapack` -larpack - dssimp: dssimp.o -- $(FC) $(FFLAGS) dssimp.o $(ALIBS) -o dssimp -+ $(FC) $(FFLAGS) $(LDFLAGS) dssimp.o $(ALIBS) -o dssimp `$(PKG_CONFIG) --libs blas lapack` -larpack - snsimp: snsimp.o -- $(FC) $(FFLAGS) snsimp.o $(ALIBS) -o snsimp -+ $(FC) $(FFLAGS) $(LDFLAGS) snsimp.o $(ALIBS) -o snsimp `$(PKG_CONFIG) --libs blas lapack` -larpack - dnsimp: dnsimp.o -- $(FC) $(FFLAGS) dnsimp.o $(ALIBS) -o dnsimp -+ $(FC) $(FFLAGS) $(LDFLAGS) dnsimp.o $(ALIBS) -o dnsimp `$(PKG_CONFIG) --libs blas lapack` -larpack - cnsimp: cnsimp.o -- $(FC) $(FFLAGS) cnsimp.o $(ALIBS) -o cnsimp -+ $(FC) $(FFLAGS) $(LDFLAGS) cnsimp.o $(ALIBS) -o cnsimp `$(PKG_CONFIG) --libs blas lapack` -larpack - znsimp: znsimp.o -- $(FC) $(FFLAGS) znsimp.o $(ALIBS) -o znsimp -+ $(FC) $(FFLAGS) $(LDFLAGS) znsimp.o $(ALIBS) -o znsimp `$(PKG_CONFIG) --libs blas lapack` -larpack diff --git a/sci-libs/arpack/files/arpack-3.1.3-pkgconfig.patch b/sci-libs/arpack/files/arpack-3.1.3-pkgconfig.patch index 9afe5de6f6ca..437d9034b856 100644 --- a/sci-libs/arpack/files/arpack-3.1.3-pkgconfig.patch +++ b/sci-libs/arpack/files/arpack-3.1.3-pkgconfig.patch @@ -10,5 +10,5 @@ index 83739bd..996275e 100644 Description: ARPACK-NG Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -larpack -lblas -latlas -+Libs: -L${libdir} @LAPACK_LIBS@ @BLAS_LIBS@ ++Libs: -L${libdir} -larpack @LAPACK_LIBS@ @BLAS_LIBS@ Cflags: diff --git a/sci-libs/arpack/metadata.xml b/sci-libs/arpack/metadata.xml index c598daff90b3..b177f1085672 100644 --- a/sci-libs/arpack/metadata.xml +++ b/sci-libs/arpack/metadata.xml @@ -1,8 +1,8 @@ - sci - +sci + The ARnoldi PACKage is a library of routines capable of solving large scale symmetric, nonsymmetric, and generalized eigenproblems. The software is designed to compute a few eigenvalues with user specified features such as those of largest real -- cgit v1.2.3-65-gdbad