Version Bump

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 279 insertions, 2 deletions

diff --git a/sci-libs/punc/ChangeLog b/sci-libs/punc/ChangeLog
index 037c232bd1dc..9878d80a70d5 100644
--- a/sci-libs/punc/ChangeLog
+++ b/sci-libs/punc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/punc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.9 2010/11/13 13:43:21 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.10 2011/04/16 07:32:52 jlec Exp $
+
+*punc-1.5 (16 Apr 2011)
+
+  16 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/1.5-linking.patch,
+  +punc-1.5.ebuild:
+  Version Bump
 
   13 Nov 2010; Justin Lecher <jlec@gentoo.org> punc-1.4-r1.ebuild:
   Added missing DEP on virtual/lapack
diff --git a/sci-libs/punc/files/1.5-linking.patch b/sci-libs/punc/files/1.5-linking.patch
new file mode 100644
index 000000000000..dd52760ae52f
--- /dev/null
+++ b/sci-libs/punc/files/1.5-linking.patch
@@ -0,0 +1,189 @@
+From 0096d62870e715272dd9d3dc390f274e6b22d4c6 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Sat, 16 Apr 2011 09:03:28 +0200
+Subject: [PATCH 1/3] linking patch
+
+---
+ configure.ac            |   21 ++++++++-------------
+ src/aaa_lib/Makefile.am |    7 +++----
+ src/pmg/Makefile.am     |    1 +
+ 3 files changed, 12 insertions(+), 17 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1295a9f..c9b63cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,6 +49,8 @@ AC_LANG_C
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_DISABLE_STATIC
++AC_PROG_F77
++AC_F77_LIBRARY_LDFLAGS
+ AM_PROG_LIBTOOL
+ 
+ dnl 3. checks for libraries
+@@ -469,7 +471,7 @@ else
+     AC_CHECK_LIB(amd,AMD_order,
+         [amd_use="yes";amd_lib="${amd_lib_path}-lamd"],
+         [amd_use="";amd_lib=""],
+-        [${amd_lib_path}-lamd ${blas_lib} -lvf2c])
++        [${amd_lib_path}-lamd ${blas_lib}])
+     if test -z "${amd_use}"; then
+         AC_MSG_RESULT([** AMD library missing ...will BUILD **])
+         amd="amd";
+@@ -524,7 +526,7 @@ else
+     AC_CHECK_LIB(umfpack,UMFPACK_numeric,
+         [umfpack_use="yes";umfpack_lib="${umfpack_lib_path}-lumfpack"],
+         [umfpack_use="";umfpack_lib=""],
+-        [${umfpack_lib_path}-lumfpack ${blas_lib} -lvf2c])
++        [${umfpack_lib_path}-lumfpack ${blas_lib}])
+     if test -z "${umfpack_use}"; then
+         AC_MSG_RESULT([** UMFPACK library missing ...will BUILD **])
+         umfpack="umfpack";
+@@ -579,7 +581,7 @@ else
+     AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store,
+         [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"],
+         [superlu_use="";superlu_lib=""],
+-        [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib} -lvf2c])
++        [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib}])
+     if test -z "${superlu_use}"; then
+         AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **])
+         superlu="superlu";
+@@ -635,7 +637,7 @@ dnl arpack_use="";
+ dnl AC_CHECK_LIB(arpack,dsgets_,
+ dnl     [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"],
+ dnl     [arpack_use="";arpack_lib=""],
+-dnl     [${arpack_lib_path}-larpack ${blas_lib} -lvf2c])
++dnl     [${arpack_lib_path}-larpack ${blas_lib}])
+ dnl if test -z "${arpack_use}"; then
+ dnl     AC_MSG_RESULT([** ARPACK library missing ...will BUILD **])
+ dnl     arpack="arpack";
+@@ -691,7 +693,7 @@ dnl cgcode_use="";
+ dnl AC_CHECK_LIB(cgcode,scgdrv_,
+ dnl     [cgcode_use="yes";cgcode_lib="${cgcode_lib_path}-lcgcode"],
+ dnl     [cgcode_use="";cgcode_lib=""],
+-dnl     [${cgcode_lib_path}-lcgcode ${blas_lib} -lvf2c])
++dnl     [${cgcode_lib_path}-lcgcode ${blas_lib}])
+ dnl if test -z "${cgcode_use}"; then
+ dnl     AC_MSG_RESULT([** CGCODE library missing ...will BUILD **])
+ dnl     cgcode="cgcode";
+@@ -747,7 +749,7 @@ dnl pmg_use="";
+ dnl AC_CHECK_LIB(pmg,buildg_,
+ dnl     [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"],
+ dnl     [pmg_use="";pmg_lib=""],
+-dnl     [${pmg_lib_path}-lpmg ${blas_lib} -lvf2c])
++dnl     [${pmg_lib_path}-lpmg ${blas_lib}])
+ dnl if test -z "${pmg_use}"; then
+ dnl     AC_MSG_RESULT([** PMG library missing ...will BUILD **])
+ dnl     pmg="pmg";
+@@ -986,13 +988,6 @@ AC_OUTPUT([
+     src/base/Makefile
+ 
+     src/vf2c/Makefile
+-    src/blas/Makefile
+-    src/lapack/Makefile
+-    src/amd/Makefile
+-    src/umfpack/Makefile
+-    src/superlu/Makefile
+-    src/arpack/Makefile
+-    src/cgcode/Makefile
+     src/pmg/Makefile
+ 
+     src/aaa_inc/Makefile
+diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
+index 2e17d41..3cbb9b5 100644
+--- a/src/aaa_lib/Makefile.am
++++ b/src/aaa_lib/Makefile.am
+@@ -102,15 +102,14 @@ else
+ LIBPMG    = 
+ endif
+ 
+-libdir = ${prefix}/lib
+ lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBAMD} ${LIBUMFPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG}
+ 
+ libpunc_la_SOURCES =
+-libpunc_la_LIBADD  = ${BASE_LIBS}
++libpunc_la_LIBADD  = ${BASE_LIBS} -lm
+ libpunc_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
+ libvf2c_la_SOURCES =
+-libvf2c_la_LIBADD  = ${VF2C_LIBS}
++libvf2c_la_LIBADD  = ${VF2C_LIBS} -lgfortran -lf2c -lm
+ libvf2c_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
+ libblas_la_SOURCES =
+@@ -142,6 +141,6 @@ libcgcode_la_LIBADD  = ${CGCODE_LIBS}
+ libcgcode_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
+ libpmg_la_SOURCES =
+-libpmg_la_LIBADD  = ${PMG_LIBS}
++libpmg_la_LIBADD  = ${PMG_LIBS} ${BASE_LIBS} -lgfortran -lf2c -lmaloc -lm
+ libpmg_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
+diff --git a/src/pmg/Makefile.am b/src/pmg/Makefile.am
+index cae9324..b34ace9 100644
+--- a/src/pmg/Makefile.am
++++ b/src/pmg/Makefile.am
+@@ -45,6 +45,7 @@ SRC = buildAd.c buildBd.c buildGd.c buildPd.c cgd.c cgmgd.c cgmgdrvd.c gsd.c mat
+ libpmg_la_SOURCES = ${SRC}
+ INCLUDES  = @maloc_inc@
+ AM_CFLAGS = @profile@ @pedantic_ansi@
++libpmg_la_LIBADD = -lf2c
+ 
+ all-local:
+ #	-cp -p ${top_srcdir}/src/${THISLIB}/punc/*.h ../aaa_inc/punc/.
+-- 
+1.7.3.4
+
+
+From 6ff94c749755b7d3d08d39f8f6ad7fb0044662b9 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Sat, 16 Apr 2011 09:27:38 +0200
+Subject: [PATCH 2/3] linking patch
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c9b63cd..b506c6b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -468,7 +468,7 @@ else
+     LDFLAGS_SAVE=${LDFLAGS};
+     LDFLAGS=${amd_lib_path};
+     amd_use="";
+-    AC_CHECK_LIB(amd,AMD_order,
++    AC_CHECK_LIB(amd,amd_order,
+         [amd_use="yes";amd_lib="${amd_lib_path}-lamd"],
+         [amd_use="";amd_lib=""],
+         [${amd_lib_path}-lamd ${blas_lib}])
+-- 
+1.7.3.4
+
+
+From 57724266b8e55979ecd49d2d8cf6de25bb80ea96 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Sat, 16 Apr 2011 09:31:00 +0200
+Subject: [PATCH 3/3] linking patch
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b506c6b..9ce379c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -523,7 +523,7 @@ else
+     LDFLAGS_SAVE=${LDFLAGS};
+     LDFLAGS=${umfpack_lib_path};
+     umfpack_use="";
+-    AC_CHECK_LIB(umfpack,UMFPACK_numeric,
++    AC_CHECK_LIB(umfpack,umfpack_di_numeric,
+         [umfpack_use="yes";umfpack_lib="${umfpack_lib_path}-lumfpack"],
+         [umfpack_use="";umfpack_lib=""],
+         [${umfpack_lib_path}-lumfpack ${blas_lib}])
+-- 
+1.7.3.4
+
diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild
new file mode 100644
index 000000000000..10e7e91850df
--- /dev/null
+++ b/sci-libs/punc/punc-1.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v 1.1 2011/04/16 07:32:52 jlec Exp $
+
+EAPI="3"
+
+inherit autotools multilib
+
+DESCRIPTION="Portable Understructure for Numerical Computing"
+HOMEPAGE="http://fetk.org/codes/punc/index.html"
+SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc mpi static-libs"
+
+RDEPEND="
+	dev-libs/maloc[mpi=]
+	dev-libs/libf2c
+	sci-libs/amd
+	sci-libs/cgcode
+	sci-libs/arpack[mpi=]
+	sci-libs/superlu
+	sci-libs/umfpack
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack}
+	epatch \
+		"${FILESDIR}"/${PV}-linking.patch \
+		"${FILESDIR}"/1.4-doc.patch
+
+	cp tools/tests/pmg/*.f src/pmg/ -f
+	cp tools/tests/pmg/*.c src/pmg/ -f
+	cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h
+
+	eautoreconf
+}
+
+src_configure() {
+	local fetk_include
+	local fetk_lib
+	local myconf
+
+	use doc || myconf="${myconf} --with-doxygen= --with-dot="
+
+	fetk_include="${EPREFIX}"/usr/include
+	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
+	export FETK_INCLUDE="${fetk_include}"
+	export FETK_LIBRARY="${fetk_lib}"
+	export FETK_LAPACK_LIBRARY="$(pkg-config --libs lapack)"
+	export FETK_BLAS_LIBRARY="${fetk_lib}"
+	export FETK_SUPERLU_LIBRARY="-lsuperlu"
+	export FETK_ARPACK_LIBRARY="${fetk_lib}"
+	export FETK_UMFPACK_LIBRARY="${fetk_lib}"
+	export FETK_CGCODE_LIBRARY="${fetk_lib}"
+	export FETK_AMD_LIBRARY="${fetk_lib}"
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug vdebug) \
+		--enable-shared \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-triplet \
+		${myconf}
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dohtml doc/index.html || die "failed to install html docs"
+}