Reverted last change into a new revision

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 124 insertions, 20 deletions

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index 773de2dd5839..832f53684647 100644
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -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@gentoo.org> 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@gentoo.org> apbs-1.2.1b.ebuild:
   EAPI=3, keyworded for {amd64,x86}-linux, made it EPREFIX aware
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 18aa04ddda57..831c773a7c0d 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -14,13 +14,14 @@ DIST apbs-1.2-source.tar.gz 10593537 RMD160 62cb82da9ca5276c3d7127a4d1f9737747da
 DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143025b398 SHA1 dc3e6933a987ff9fdf88db510db79b3dacb100d6 SHA256 7d088def1ed7689127eb64014ea44069b9d7bfc995941fe5800ff753d48c87be
 EBUILD apbs-1.0.0-r1.ebuild 1995 RMD160 0efbe531fe27749a65a23d17958c411bcd15ad74 SHA1 9ff5761e0d8d01cdb49518cdf5d3372977c0f9ad SHA256 34b2bd026da29cec1224c91d9b4c86bdac3bec95747e167b2127aa329de2f4b2
 EBUILD apbs-1.2.0.ebuild 2514 RMD160 860994d50bc8a5d1657a5f3f6fa0dfef3c1e76e4 SHA1 d917e489ecc0e245e02796097a6aef07617e73ff SHA256 4f4229963c163b60012c091e84cf456a1215680358e3852174f2a972554546bf
-EBUILD apbs-1.2.1b.ebuild 2663 RMD160 cf6dae22e4cffc008c726accede7bb141113bf8a SHA1 f299fbb8d9af112f8c74ad8e103454211d090938 SHA256 f0b02665ddb8257cebb17ab907e015533869c7e35e0ee844b062144fa5bf0411
-MISC ChangeLog 4230 RMD160 e257ee5f9aff96234e321ba8d7eba9a1d8b69ebb SHA1 e46876cac02c887acba4c8f4622496937b530d88 SHA256 c57d7356b0e43c3ba0725a880ba63a755abb11cc03f94dde39478c7f8d32d326
+EBUILD apbs-1.2.1b-r1.ebuild 2666 RMD160 147ace2cedc979ae431e0e2e83ace236c320c7a0 SHA1 7889ebff83224c531315123dae972d3e503270bf SHA256 c9b404e8870a7461b38139785f62a05db8227464fc6b6bd918467655ed959b8e
+EBUILD apbs-1.2.1b.ebuild 2583 RMD160 03d49d8d7d7a5a7ab71164e40bdde4a0c3e8632e SHA1 7712bc2d3faed84eb914d7466769be38076d11ed SHA256 9fa004e87205630e756762a82e6f6ffa969d77970aab2210b9688a8a295ef2a7
+MISC ChangeLog 4405 RMD160 1c4c2df9e925161088e226e613bcebcc51cca777 SHA1 1005881f7c02a5367af3ded357379332819a6cb2 SHA256 87545af36d57b0575b88867a4c16483474e9980edf56229d5e3d6a8d9a06a41e
 MISC metadata.xml 358 RMD160 b98e2ce84589bbc6b62f9fb91007bae907f019bc SHA1 c15f33b50d731bda2c2f58a1fe601e0b23f7288c SHA256 9f33e69a8a217ad31fcad567e0d0889693c680631d9245c7bd9774caac95a74e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt9u0cACgkQgAnW8HDreRa7UQCdFp2v1bAXOU+3cXOa0hVAxSQz
-scAAoJ4QXbtJ/IhOx+SbkVQgL1PjWTXi
-=1F+I
+iEYEARECAAYFAkt/rIwACgkQgAnW8HDreRYTvQCfU49kDoPWrpt0Spx2+D23QyEP
+2PgAoMq5vXOTAF9ksmonLI9DgbrKwsA1
+=mFQE
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild b/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild
new file mode 100644
index 000000000000..6d7a0849f8fd
--- /dev/null
+++ b/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild
@@ -0,0 +1,97 @@
+# 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
+}
diff --git a/sci-chemistry/apbs/apbs-1.2.1b.ebuild b/sci-chemistry/apbs/apbs-1.2.1b.ebuild
index a0cf6d93c17f..5941a7f8d10c 100644
--- a/sci-chemistry/apbs/apbs-1.2.1b.ebuild
+++ b/sci-chemistry/apbs/apbs-1.2.1b.ebuild
@@ -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 @@ 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"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND="dev-libs/maloc[mpi=]
 	blas? ( virtual/blas )
@@ -32,6 +30,8 @@ RDEPEND="${DEPEND}"
 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_prepare() {
 }
 
 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 @@ src_configure() {
 
 	econf $(use_enable python) \
 		--disable-maloc-rebuild \
-		${myconf}
+		${myconf} || die "configure failed"
 }
 
 src_compile() {