Include support for FETK

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

6 files changed, 60 insertions, 16 deletions

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index 0f2562e57856..410f44e06637 100644
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/apbs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.42 2010/10/31 09:43:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.43 2010/11/01 17:25:22 jlec Exp $
+
+  01 Nov 2010; Justin Lecher <jlec@gentoo.org> apbs-1.3.ebuild,
+  +files/apbs-1.3-mainroutines.patch, files/apbs-1.3-shared.patch,
+  metadata.xml:
+  Include support for FETK
 
   31 Oct 2010; Justin Lecher <jlec@gentoo.org> apbs-1.3.ebuild:
   Make einfo on parallel python and mpi support
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 73b349cce880..c2f76c5be1ca 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -11,18 +11,19 @@ AUX apbs-1.2.1b-parallelbuild.patch 371 RMD160 22369e3923307f5cc17602a4cab032613
 AUX apbs-1.2.1b-shared.patch 2508 RMD160 e122f33b7a64a70ebb17631e93085f982ff48074 SHA1 84d835d823e8fa82bc9aa7e274d63c59a4998a12 SHA256 9d35a22be4ea3cd1a0c821b25fbcaf0c44212a2004581e14a8245af4338d73f8
 AUX apbs-1.3-contrib.patch 402 RMD160 18bdf5ef5940e8cb3b610acbc3c855105cb2dca7 SHA1 956fdaebbd0f1b3c1b15f8d3c139ab532109bcf0 SHA256 fdddd8da9a333ae1b96942f3bd4ca0fd6d1be5a888369144d43e836dfdf0b280
 AUX apbs-1.3-link.patch 1578 RMD160 e103808470dd500d2077a27906ed4cc1f9ec3aee SHA1 1ea909005bb0ce6976978a93864e976146df381a SHA256 7261cb286599681669ce67b8c4cf376515db177ebece2aa555d730e1dd981284
+AUX apbs-1.3-mainroutines.patch 408 RMD160 00493750cfd8fe278fff4389e642277ca2566dd7 SHA1 3f80728313609d8cb12d582d842cd38cd9eeec79 SHA256 967a6682a71643e4a638e389dba188173a50f9efc1b9091d37dab4c676e5bfa1
 AUX apbs-1.3-openmp.patch 1843 RMD160 58030d378e217752c56b925e7e17ec4b4eb43e52 SHA1 d73cb3d1e061fd03b3785b29c093d8e0aabefc8a SHA256 e9810790f0ed06ce6948bc5b1eea496c23117139277fb04d8830bb064b370164
-AUX apbs-1.3-shared.patch 2871 RMD160 040ae70e0d7f9151efca275432ef92208c5d3ef4 SHA1 64a43ed1a7bacc96a848df5bb533013ee5aa9e3b SHA256 955bf488c5638f351c4c91766036ef7a2c3fac2e5c99a556b76d73be34d7d845
+AUX apbs-1.3-shared.patch 2880 RMD160 d517c11da5fe9f8c7df3f96199209eb9c3a0f11a SHA1 018012647d8722e1e3bd845b57efcf78f7e73ef2 SHA256 2faa9010d63c52a9cea73730220aca546748ceab2d16b0c273d142fd19990163
 DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143025b398 SHA1 dc3e6933a987ff9fdf88db510db79b3dacb100d6 SHA256 7d088def1ed7689127eb64014ea44069b9d7bfc995941fe5800ff753d48c87be
 DIST apbs-1.3-source.tar.gz 48625351 RMD160 c075a747dc28f382f3a383a0944a1b20e0c8a9f1 SHA1 1494f36e35f2e4b1a18d4b22516fad4948c6391f SHA256 5fa5b597f7d5a3d9bb55429ec4fefc69e7d0f918d568c3c4a288088c0fde9ef2
 EBUILD apbs-1.2.1b-r4.ebuild 3541 RMD160 c45fce9c4a847495d0f77d15c5aa5867cbad8bc3 SHA1 53635842194acf3c9dc1eac5281bf92894c74635 SHA256 2d449cb42235431190e9ea848291c361ea4280fa7efbde2b06c34be90d043fe3
-EBUILD apbs-1.3.ebuild 3677 RMD160 10d02aa07b8fad8a3d3ee69d9600506b54bffe6f SHA1 6060f2d2453637bcf0bf8784c7d204d30ae02af4 SHA256 5f60062e6c71e8c5fdb373338bcf6ba8d0ecca32884f576678580fd5819e07d7
-MISC ChangeLog 7251 RMD160 5f1e63151744833326dbe05e1abd2bd28c0af75c SHA1 7081c9ce1f4ce01f5ab78b7a03e8f79fef1cf9b6 SHA256 0c25c1d5751175fadea5330a5c6646e85b5341f4fad66231e63771fd42e06a2a
-MISC metadata.xml 936 RMD160 b572dae2e9f991d90dd9f8f97328e8400c035974 SHA1 93f5ba5bbbf34e013123ce62a1059cf914550179 SHA256 c38d67acd9e7bd186a58f7562c2f53c45e5b8322b9259888e30b47b2a7241eaa
+EBUILD apbs-1.3.ebuild 4348 RMD160 0eff2ee05c338b5e13922f173f217a2141bd55b8 SHA1 1b289ca30b5d002a310a7a07d5686a8d116e193c SHA256 f11c1f948d4af526eb110ba9ab027c608ccf4af07899e51e7ae4479a572f0be7
+MISC ChangeLog 7426 RMD160 f4bd004063e8711ecac32df22cf84281a0170bad SHA1 5b097131bd37fa96d7048a4ea3911f1f3e3b9c8e SHA256 0ead744fbf3222c22e53668fc8a3b8ce0f8a606f8ff8a93211bfc327eeca5e50
+MISC metadata.xml 988 RMD160 5f6563d920eeb90db740cba47956926ab837ceb7 SHA1 228ebe33a325ee98da4b692a43e64ccf3ae84495 SHA256 8c6a731f821905e3ae8fce77b651d07d1a7b35db129091938e5b01df6004764a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzNOloACgkQgAnW8HDreRbk9wCfbISpc1vGyOu9y9jDcIB0CJCS
-HJoAoIoGpnpH6HlleoDdt4COExU7fApM
-=QoJV
+iEYEARECAAYFAkzO+AoACgkQgAnW8HDreRZgqQCfS1KIEEO+P5N0tyEJdrtw8uJ/
+v/EAoLg8zz5ofKOMjmNermtdgcWQ3UTQ
+=mScw
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/apbs/apbs-1.3.ebuild b/sci-chemistry/apbs/apbs-1.3.ebuild
index 761c8d910bfe..803d60cdc66f 100644
--- a/sci-chemistry/apbs/apbs-1.3.ebuild
+++ b/sci-chemistry/apbs/apbs-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3.ebuild,v 1.2 2010/10/31 09:43:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3.ebuild,v 1.3 2010/11/01 17:25:22 jlec Exp $
 
 EAPI="3"
 
@@ -18,13 +18,22 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-IUSE="arpack doc mpi openmp python tools"
+IUSE="arpack doc fetk mpi openmp python tools"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="dev-libs/maloc[mpi=]
+DEPEND="
+	dev-libs/maloc[mpi=]
 	virtual/blas
 	sys-libs/readline
 	arpack? ( sci-libs/arpack )
+	fetk? (
+		media-libs/sg
+		sci-libs/amd
+		sci-libs/punc
+		sci-libs/mc
+		sci-libs/gamer
+		sci-libs/umfpack
+		sci-libs/superlu )
 	mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
@@ -37,6 +46,12 @@ pkg_setup() {
 		einfo "mpi and python support are incompatible"
 		einfo "Disabling USE=python"
 	fi
+	if [[ -z ${MAXMEM} ]]; then
+		einfo "You can specify the max amount of RAM used"
+		einfo "by setting MAXMEM=\"your size in MB\""
+	else
+		einfo "Settings max memory usage to ${MAXMEM} MB"
+	fi
 }
 
 src_prepare() {
@@ -48,11 +63,13 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.2.1b-autoconf-2.64.patch \
 		"${FILESDIR}"/${P}-shared.patch \
 		"${FILESDIR}"/${PN}-1.2.1b-multilib.patch \
-		"${FILESDIR}"/${PN}-1.2.1b-parallelbuild.patch
+		"${FILESDIR}"/${PN}-1.2.1b-parallelbuild.patch \
+		"${FILESDIR}"/${P}-mainroutines.patch
 	sed "s:GENTOO_PKG_NAME:${PN}:g" \
 		-i Makefile.am || die "Cannot correct package name"
 	# this test is broken
 	sed '/ion-pmf/d' -i examples/Makefile.am || die
+	sed 's:libmaloc.a:libmaloc.so:g' -i configure.ac || die
 	eautoreconf
 	find . -name "._*" -exec rm -f '{}' \;
 }
@@ -80,6 +97,14 @@ src_configure() {
 		myconf="${myconf} --enable-tools"
 	fi
 
+	if use fetk; then
+		myconf="${myconf} --with-fetk-include=${EPREFIX}/usr/include --with-fetk-library=${EPREFIX}/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --disable-fetk"
+	fi
+
+	[[ -n ${MAXMEM} ]] && myconf="${myconf} --with-maxmem=${MAXMEM}"
+
 	econf \
 		--disable-maloc-rebuild \
 		--enable-shared \
diff --git a/sci-chemistry/apbs/files/apbs-1.3-mainroutines.patch b/sci-chemistry/apbs/files/apbs-1.3-mainroutines.patch
new file mode 100644
index 000000000000..fa8678a971fd
--- /dev/null
+++ b/sci-chemistry/apbs/files/apbs-1.3-mainroutines.patch
@@ -0,0 +1,12 @@
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 15158ca..f73d276 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -29,6 +29,7 @@ rm.apbs: Makefile
+ 
+ lib_LTLIBRARIES = libapbsmainroutines.la
+ libapbsmainroutines_la_SOURCES = routines.c
++libapbsmainroutines_la_LIBADD = -L../src/aaa_lib/.libs/ -lapbs @mc_lib@
+ libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION}
+ 
+ INCLUDES = @inc_list@
diff --git a/sci-chemistry/apbs/files/apbs-1.3-shared.patch b/sci-chemistry/apbs/files/apbs-1.3-shared.patch
index 1a237b066345..f7eb4dfc1d1f 100644
--- a/sci-chemistry/apbs/files/apbs-1.3-shared.patch
+++ b/sci-chemistry/apbs/files/apbs-1.3-shared.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile.am b/Makefile.am
-index b400095..9e6d698 100644
+index b400095..af3a3a3 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -16,6 +16,9 @@ SUFFIXES = .H .h .C .cc .c .f .o
@@ -81,16 +81,16 @@ index 73fbe21..31a0053 100644
  AC_OUTPUT
  
 diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
-index 2c5026b..d8d0650 100644
+index 0064aaa..8b33f70 100644
 --- a/src/aaa_lib/Makefile.am
 +++ b/src/aaa_lib/Makefile.am
-@@ -22,7 +22,8 @@ libdir = ${prefix}/lib
+@@ -21,7 +21,8 @@ BLAS_LIBS = @blas_lib@
  lib_LTLIBRARIES = libapbs.la
  
  libapbs_la_SOURCES = apbs_link.c
 -libapbs_la_LIBADD  = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS}
 +libapbs_la_LIBADD  = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS} \
-+		     @OPENMP_LIBS@ @maloc_lib@
++		     @OPENMP_LIBS@ @maloc_lib@ @mc_lib@
  libapbs_la_LDFLAGS = -version-info ${APBS_VERSION}
  
  INCLUDES         = -I${top_srcdir}/src/generic -I${top_srcdir}/src/mg -I${top_srcdir}/src/fem @inc_list@
diff --git a/sci-chemistry/apbs/metadata.xml b/sci-chemistry/apbs/metadata.xml
index ae94882003a0..8a1c32e03b3d 100644
--- a/sci-chemistry/apbs/metadata.xml
+++ b/sci-chemistry/apbs/metadata.xml
@@ -13,6 +13,7 @@
 	</maintainer>			
 	<use>
 		<flag name='arpack'>Include support for arpack libs</flag>
+		<flag name='fetk'>Include support for FeTK</flag>
 		<flag name='tools'>Install optional tools</flag>
 	</use>
 <longdescription>