[gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs: metadata.xml ChangeLog apbs-1.3.ebuild

[Justin Lecher (jlec)]

jlec        10/11/01 17:25:23

  Modified:             metadata.xml ChangeLog apbs-1.3.ebuild
  Log:
  Include support for FETK
  
  (Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 sci-chemistry/apbs/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml	29 Oct 2010 16:53:32 -0000	1.9
+++ metadata.xml	1 Nov 2010 17:25:22 -0000	1.10
@@ -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>



1.43                 sci-chemistry/apbs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	31 Oct 2010 09:43:48 -0000	1.42
+++ ChangeLog	1 Nov 2010 17:25:22 -0000	1.43
@@ -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@g.o> 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@g.o> apbs-1.3.ebuild:
   Make einfo on parallel python and mpi support



1.3                  sci-chemistry/apbs/apbs-1.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/apbs-1.3.ebuild?r1=1.2&r2=1.3

Index: apbs-1.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apbs-1.3.ebuild	31 Oct 2010 09:43:48 -0000	1.2
+++ apbs-1.3.ebuild	1 Nov 2010 17:25:22 -0000	1.3
@@ -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 @@
 
 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 @@
 		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 @@
 		"${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 @@
 		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 \