[gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs: apbs-1.2.1b-r1.ebuild apbs-1.2.1b.ebuild ChangeLog

[Justin Lecher (jlec)]

jlec        10/02/20 09:33:58

  Modified:             apbs-1.2.1b.ebuild ChangeLog
  Added:                apbs-1.2.1b-r1.ebuild
  Log:
  Reverted last change into a new revision
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sci-chemistry/apbs/apbs-1.2.1b.ebuild

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

Index: apbs-1.2.1b.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apbs-1.2.1b.ebuild	18 Feb 2010 22:12:17 -0000	1.2
+++ apbs-1.2.1b.ebuild	20 Feb 2010 09:33:57 -0000	1.3
@@ -1,10 +1,8 @@
 # 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.2.1b.ebuild,v 1.2 2010/02/18 22:12:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b.ebuild,v 1.3 2010/02/20 09:33:57 jlec Exp $
 
-EAPI="3"
-
-PYTHON_DEPEND="2"
+EAPI="2"
 
 inherit eutils fortran autotools python versionator flag-o-matic
 
@@ -19,7 +17,7 @@
 
 SLOT="0"
 IUSE="arpack blas doc mpi python openmp"
-KEYWORDS="~x86 ~amd64 ~ppc ~amd64-linux ~x86-linux"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND="dev-libs/maloc[mpi=]
 	blas? ( virtual/blas )
@@ -32,6 +30,8 @@
 FORTRAN="g77 gfortran ifc"
 
 src_prepare() {
+	python_version
+
 	epatch "${FILESDIR}"/${PN}-1.2.0-install-fix.patch
 	epatch "${FILESDIR}"/${PN}-1.2.0-contrib.patch
 	epatch "${FILESDIR}"/${PN}-1.2.0-link.patch
@@ -42,23 +42,23 @@
 }
 
 src_configure() {
-	local myconf="--docdir=${EPREFIX}/usr/share/doc/${PF}"
+	local myconf="--docdir=/usr/share/doc/${PF}"
 	use blas && myconf="${myconf} --with-blas=-lblas"
-	use arpack && myconf="${myconf} --with-arpack=${EPREFIX}/usr/$(get_libdir)"
+	use arpack && myconf="${myconf} --with-arpack=/usr/$(get_libdir)"
 
 	# check which mpi version is installed and tell configure
 	if use mpi; then
-		export CC="${EPREFIX}/usr/bin/mpicc"
-		export F77="${EPREFIX}/usr/bin/mpif77"
+		export CC="/usr/bin/mpicc"
+		export F77="/usr/bin/mpif77"
 
 		if has_version sys-cluster/mpich; then
-	 		myconf="${myconf} --with-mpich=${EPREFIX}/usr"
+	 		myconf="${myconf} --with-mpich=/usr"
 		elif has_version sys-cluster/mpich2; then
-			myconf="${myconf} --with-mpich2=${EPREFIX}/usr"
+			myconf="${myconf} --with-mpich2=/usr"
 		elif has_version sys-cluster/lam-mpi; then
-			myconf="${myconf} --with-lam=${EPREFIX}/usr"
+			myconf="${myconf} --with-lam=/usr"
 		elif has_version sys-cluster/openmpi; then
-			myconf="${myconf} --with-openmpi=${EPREFIX}/usr"
+			myconf="${myconf} --with-openmpi=/usr"
 		fi
 	fi || die "Failed to select proper mpi implementation"
 
@@ -72,7 +72,7 @@
 
 	econf $(use_enable python) \
 		--disable-maloc-rebuild \
-		${myconf}
+		${myconf} || die "configure failed"
 }
 
 src_compile() {



1.25                 sci-chemistry/apbs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/ChangeLog?r1=1.24&r2=1.25

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog	18 Feb 2010 22:12:17 -0000	1.24
+++ ChangeLog	20 Feb 2010 09:33:57 -0000	1.25
@@ -1,6 +1,12 @@
 # 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.24 2010/02/18 22:12:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.25 2010/02/20 09:33:57 jlec Exp $
+
+*apbs-1.2.1b-r1 (20 Feb 2010)
+
+  20 Feb 2010; Justin Lecher (jlec) <jlec@g.o> apbs-1.2.1b.ebuild,
+  +apbs-1.2.1b-r1.ebuild:
+  Reverted last change into a new revision
 
   18 Feb 2010; Justin Lecher (jlec) <jlec@g.o> apbs-1.2.1b.ebuild:
   EAPI=3, keyworded for {amd64,x86}-linux, made it EPREFIX aware



1.1                  sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild?rev=1.1&content-type=text/plain

Index: apbs-1.2.1b-r1.ebuild
===================================================================
# 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.2.1b-r1.ebuild,v 1.1 2010/02/20 09:33:57 jlec Exp $

EAPI="3"

PYTHON_DEPEND="2"

inherit eutils fortran autotools python versionator flag-o-matic

MY_PV=$(get_version_component_range 1-3)
MY_P="${PN}-${MY_PV}"
S="${WORKDIR}"/"${MY_P}-source"

DESCRIPTION=" Software for evaluating the electrostatic properties of nanoscale biomolecular systems"
LICENSE="BSD"
HOMEPAGE="http://apbs.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"

SLOT="0"
IUSE="arpack blas doc mpi python openmp"
KEYWORDS="~x86 ~amd64 ~ppc ~amd64-linux ~x86-linux"

DEPEND="dev-libs/maloc[mpi=]
	blas? ( virtual/blas )
	python? ( dev-lang/python )
	sys-libs/readline
	arpack? ( sci-libs/arpack )
	mpi? ( virtual/mpi )"
RDEPEND="${DEPEND}"

FORTRAN="g77 gfortran ifc"

src_prepare() {
	epatch "${FILESDIR}"/${PN}-1.2.0-install-fix.patch
	epatch "${FILESDIR}"/${PN}-1.2.0-contrib.patch
	epatch "${FILESDIR}"/${PN}-1.2.0-link.patch
	epatch "${FILESDIR}"/${P}-autoconf-2.64.patch
	sed "s:GENTOO_PKG_NAME:${PN}:g" \
	-i Makefile.am || die "Cannot correct package name"
	eautoreconf
}

src_configure() {
	local myconf="--docdir=${EPREFIX}/usr/share/doc/${PF}"
	use blas && myconf="${myconf} --with-blas=-lblas"
	use arpack && myconf="${myconf} --with-arpack=${EPREFIX}/usr/$(get_libdir)"

	# check which mpi version is installed and tell configure
	if use mpi; then
		export CC="${EPREFIX}/usr/bin/mpicc"
		export F77="${EPREFIX}/usr/bin/mpif77"

		if has_version sys-cluster/mpich; then
	 		myconf="${myconf} --with-mpich=${EPREFIX}/usr"
		elif has_version sys-cluster/mpich2; then
			myconf="${myconf} --with-mpich2=${EPREFIX}/usr"
		elif has_version sys-cluster/lam-mpi; then
			myconf="${myconf} --with-lam=${EPREFIX}/usr"
		elif has_version sys-cluster/openmpi; then
			myconf="${myconf} --with-openmpi=${EPREFIX}/usr"
		fi
	fi || die "Failed to select proper mpi implementation"

	# apbs' configure's openmp detection is broken; we'll
	# work around this until it is fixed
	if use openmp; then
		append-flags -fopenmp
	else
		myconf="${myconf} --disable-openmp"
	fi

	econf $(use_enable python) \
		--disable-maloc-rebuild \
		${myconf}
}

src_compile() {
	emake -j1 || die "make failed"
}

src_test() {
	cd examples && make test \
		|| die "Tests failed"
}

src_install() {
	emake -j1 DESTDIR="${D}" install \
		|| die "make install failed"

	dodoc AUTHORS INSTALL README NEWS ChangeLog \
		|| die "Failed to install docs"

	if use doc; then
		dohtml -r doc/* || die "Failed to install html docs"
	fi
}