From 363b2956873c8bfe54e707390af7d664b2f25f7b Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 19 Feb 2013 16:30:03 +0000 Subject: sci-chemistry/psi: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; drop old patches (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) --- sci-chemistry/psi/ChangeLog | 12 +++++- sci-chemistry/psi/files/3.3.0-gcc-4.3.patch | 14 ------ .../psi/files/add-libint-error-message.patch | 24 ----------- sci-chemistry/psi/files/dont-build-libint.patch | 11 ----- .../psi/files/psi-3.3.0-parallel-make.patch | 17 -------- sci-chemistry/psi/files/try-more-compilers.patch | 15 ------- .../psi/files/try-pthread-for-blas-lapack.patch | 50 ---------------------- sci-chemistry/psi/metadata.xml | 2 +- sci-chemistry/psi/psi-3.4.0-r2.ebuild | 10 ++--- 9 files changed, 16 insertions(+), 139 deletions(-) delete mode 100644 sci-chemistry/psi/files/3.3.0-gcc-4.3.patch delete mode 100644 sci-chemistry/psi/files/add-libint-error-message.patch delete mode 100644 sci-chemistry/psi/files/dont-build-libint.patch delete mode 100644 sci-chemistry/psi/files/psi-3.3.0-parallel-make.patch delete mode 100644 sci-chemistry/psi/files/try-more-compilers.patch delete mode 100644 sci-chemistry/psi/files/try-pthread-for-blas-lapack.patch (limited to 'sci-chemistry') diff --git a/sci-chemistry/psi/ChangeLog b/sci-chemistry/psi/ChangeLog index a0f205074d1b..f75874261ea7 100644 --- a/sci-chemistry/psi/ChangeLog +++ b/sci-chemistry/psi/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-chemistry/psi -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.21 2012/10/19 10:21:22 jlec Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.22 2013/02/19 16:30:03 jlec Exp $ + + 19 Feb 2013; Justin Lecher + -files/psi-3.3.0-parallel-make.patch, psi-3.4.0-r2.ebuild, + -files/3.3.0-gcc-4.3.patch, -files/add-libint-error-message.patch, + -files/dont-build-libint.patch, -files/try-more-compilers.patch, + -files/try-pthread-for-blas-lapack.patch, metadata.xml: + Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; + drop old patches 19 Oct 2012; Justin Lecher psi-3.4.0-r2.ebuild, metadata.xml: diff --git a/sci-chemistry/psi/files/3.3.0-gcc-4.3.patch b/sci-chemistry/psi/files/3.3.0-gcc-4.3.patch deleted file mode 100644 index 1eed612978a1..000000000000 --- a/sci-chemistry/psi/files/3.3.0-gcc-4.3.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- psi3.orig/src/bin/intder/params.cc 2008-07-06 23:46:56.000000000 -0700 -+++ psi3/src/bin/intder/params.cc 2008-07-06 23:48:41.000000000 -0700 -@@ -1,3 +1,4 @@ -+#include - #include "params.h" - #include "displacements.h" - #include "intco.h" ---- psi3.orig/src/bin/intder/read_geom.cc 2008-07-06 23:46:56.000000000 -0700 -+++ psi3/src/bin/intder/read_geom.cc 2008-07-06 23:48:56.000000000 -0700 -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include "displacements.h" diff --git a/sci-chemistry/psi/files/add-libint-error-message.patch b/sci-chemistry/psi/files/add-libint-error-message.patch deleted file mode 100644 index 60fb12854455..000000000000 --- a/sci-chemistry/psi/files/add-libint-error-message.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- psi3.orig/src/lib/libint/Makefile.in 2003-11-23 11:07:51.000000000 -0800 -+++ psi3/src/lib/libint/Makefile.in 2006-02-10 22:38:37.000000000 -0800 -@@ -44,7 +44,10 @@ - $(MAKE) top_objdir=$(top_objdir_path); \ - rm -f Makefile; \ - if ! ./$(BUILD_BINARY); then \ -- cd ..; rm -fR $(TEMP_DIR); exit 1; \ -+ cd ..; \ -+ rm -fR $(TEMP_DIR); \ -+ echo "$(BUILD_BINARY) does not exist!"; \ -+ exit 1; \ - fi; \ - cp Makefile.libint Makefile; \ - ${MAKE} top_objdir=$(top_objdir_path); \ -@@ -65,7 +68,9 @@ - $(MKDIRS) $(libdir) - $(INSTALL_DATA) $< $(libdir) - $(RANLIB) $(libdir)/`basename $(TARGET)` -+ echo Finished ranlib - $(MKDIRS) $(incdir)/libint -+ echo Finished mkdirs - $(INSTALL_INCLUDE) $(TARGET_HEADERS) $(incdir)/libint - - # diff --git a/sci-chemistry/psi/files/dont-build-libint.patch b/sci-chemistry/psi/files/dont-build-libint.patch deleted file mode 100644 index 1ad5ce74244c..000000000000 --- a/sci-chemistry/psi/files/dont-build-libint.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- psi3.orig/src/lib/Makefile.in 2004-01-19 09:09:53.000000000 -0800 -+++ psi3/src/lib/Makefile.in 2006-02-10 21:35:20.000000000 -0800 -@@ -2,7 +2,7 @@ - .PHONY: default all install depend clean targetclean - - subdirs = libipv1 libciomr libchkpt libqt libpsio libiwl libdpd \ -- libint libderiv libr12 libbasis -+ libbasis - - all: default - diff --git a/sci-chemistry/psi/files/psi-3.3.0-parallel-make.patch b/sci-chemistry/psi/files/psi-3.3.0-parallel-make.patch deleted file mode 100644 index b4466b3514dc..000000000000 --- a/sci-chemistry/psi/files/psi-3.3.0-parallel-make.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- psi3.orig/src/lib/libipv1/Makefile.in 2004-09-17 16:49:58.000000000 +0200 -+++ psi3/src/lib/libipv1/Makefile.in 2010-02-15 15:30:23.846370463 +0100 -@@ -33,10 +33,12 @@ - - include ../MakeRules - --y.tab.c y.tab.h: parse.y -+y.tab.h: y.tab.c -+ -+y.tab.c: parse.y - $(YACC) -v -d $< - --scan.c: scan.l -+scan.c: scan.l y.tab.h - $(LEX) -t $^ > scan.c - - install_inc:: $(ALLINCLUDE) diff --git a/sci-chemistry/psi/files/try-more-compilers.patch b/sci-chemistry/psi/files/try-more-compilers.patch deleted file mode 100644 index 63d4618e38ea..000000000000 --- a/sci-chemistry/psi/files/try-more-compilers.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- psi3.orig/configure.in 2005-10-29 10:15:06.000000000 -0700 -+++ psi3/configure.in 2006-02-10 20:56:59.000000000 -0800 -@@ -104,9 +104,9 @@ - ###################### - - # potential names of compilers --FC_LIST="g77 f77 fc f2c" --CC_LIST="gcc cc" --CXX_LIST="g++ c++ cxx" -+FC_LIST="gfortran g77 f77 fc f2c ifc" -+CC_LIST="gcc cc icc" -+CXX_LIST="g++ c++ cxx icc" - - # set up os specific options - case $os in diff --git a/sci-chemistry/psi/files/try-pthread-for-blas-lapack.patch b/sci-chemistry/psi/files/try-pthread-for-blas-lapack.patch deleted file mode 100644 index d9b01edb60f0..000000000000 --- a/sci-chemistry/psi/files/try-pthread-for-blas-lapack.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- psi3.orig/configure.in 2005-10-29 10:15:06.000000000 -0700 -+++ psi3/configure.in 2006-02-10 20:56:59.000000000 -0800 -@@ -333,7 +333,7 @@ - AC_ARG_WITH(blas,[ --with-blas which blas library to use],[ - case $withval in - yes) -- BLAS='-lblas' -+ BLAS='-lblas -lpthread' - ;; - no) - BLAS='' -@@ -344,16 +344,16 @@ - esac - ]) - if test "X$BLAS" = X; then -- AC_CHECK_LIB(essl, DGEMM, BLAS="-lessl") -+ AC_CHECK_LIB(essl, DGEMM, BLAS="-lessl -lpthread",, [-lpthread]) - fi - if test "X$BLAS" = X; then -- AC_CHECK_LIB(scs, DGEMM, BLAS="-lscs") -+ AC_CHECK_LIB(scs, DGEMM, BLAS="-lscs -lpthread",, [-lpthread]) - fi - if test "X$BLAS" = X; then -- AC_CHECK_LIB(atlas, DGEMM, BLAS="-latlas") -+ AC_CHECK_LIB(atlas, DGEMM, BLAS="-latlas -lpthread",, [-lpthread]) - fi - if test "X$BLAS" = X; then -- AC_CHECK_LIB(blas, DGEMM, BLAS="-lblas") -+ AC_CHECK_LIB(blas, DGEMM, BLAS="-lblas -lpthread",, [-lpthread]) - fi - if test "X$BLAS" = X; then - AC_MSG_ERROR("Did not find a BLAS library") -@@ -363,7 +363,7 @@ - AC_ARG_WITH(lapack,[ --with-lapack which lapack library to use],[ - case $withval in - yes) -- LAPACK='-llapack' -+ LAPACK='-llapack -lpthread' - ;; - no) - LAPACK='' -@@ -382,7 +382,7 @@ - LIBS=$CURRENT_LIBS - fi - if test "X$LAPACK" = X; then -- AC_CHECK_LIB(lapack,DGEEV, LAPACK="-llapack",,$BLAS) -+ AC_CHECK_LIB(lapack,DGEEV, LAPACK="-llapack",,$BLAS -lpthread) - fi - if test "X$LAPACK" = X; then - AC_MSG_ERROR("Did not find a LAPACK library") diff --git a/sci-chemistry/psi/metadata.xml b/sci-chemistry/psi/metadata.xml index e42d0af60f42..51fdedab1b38 100644 --- a/sci-chemistry/psi/metadata.xml +++ b/sci-chemistry/psi/metadata.xml @@ -1,5 +1,5 @@ - sci-chemistry + sci-chemistry diff --git a/sci-chemistry/psi/psi-3.4.0-r2.ebuild b/sci-chemistry/psi/psi-3.4.0-r2.ebuild index e30dc3dd3f09..a8bb737076a5 100644 --- a/sci-chemistry/psi/psi-3.4.0-r2.ebuild +++ b/sci-chemistry/psi/psi-3.4.0-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.4.0-r2.ebuild,v 1.7 2012/10/19 10:21:22 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.4.0-r2.ebuild,v 1.8 2013/02/19 16:30:03 jlec Exp $ EAPI=4 -inherit autotools-utils fortran-2 multilib +inherit autotools-utils fortran-2 multilib toolchain-funcs DESCRIPTION="Suite of ab initio quantum chemistry programs to compute various molecular properties" HOMEPAGE="http://www.psicode.org/" @@ -58,8 +58,8 @@ src_configure() { local myeconfargs=( --with-opt="${CXXFLAGS}" --datadir="${EPREFIX}"/usr/share/${PN} - --with-blas="$(pkg-config blas --libs)" - --with-lapack="$(pkg-config --libs lapack)" + --with-blas="$($(tc-getPKG_CONFIG) blas --libs)" + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" ) autotools-utils_src_configure } -- cgit v1.2.3-65-gdbad