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

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

[Justin Lecher (jlec)]

jlec        10/03/29 19:00:29

  Modified:             metadata.xml ChangeLog
  Added:                apbs-1.2.1b-r2.ebuild
  Log:
  Configure fixes, removed unnecessary installed files. Make tools optional
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

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

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml	3 Nov 2009 05:30:06 -0000	1.4
+++ metadata.xml	29 Mar 2010 19:00:29 -0000	1.5
@@ -8,5 +8,6 @@
 	<herd>sci-chemistry</herd>
 	<use>
 		<flag name='arpack'>Include support for arpack libs</flag>
+		<flag name='tools'>Install optional tools</flag>
 	</use>
 </pkgmetadata>



1.26                 sci-chemistry/apbs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	20 Feb 2010 09:33:57 -0000	1.25
+++ ChangeLog	29 Mar 2010 19:00:29 -0000	1.26
@@ -1,6 +1,13 @@
 # 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.25 2010/02/20 09:33:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.26 2010/03/29 19:00:29 jlec Exp $
+
+*apbs-1.2.1b-r2 (28 Mar 2010)
+
+  28 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +apbs-1.2.1b-r2.ebuild, +files/apbs-1.2.1b-install-fix.patch,
+  +files/apbs-1.2.1b-openmp.patch:
+  Configure fixes, removed unnecessary installed files. Make tools optional
 
 *apbs-1.2.1b-r1 (20 Feb 2010)
 



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

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

Index: apbs-1.2.1b-r2.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-r2.ebuild,v 1.1 2010/03/29 19:00:29 jlec Exp $

EAPI="3"

PYTHON_DEPEND="2"
FORTRAN="g77 gfortran ifc"

inherit autotools eutils flag-o-matic fortran python versionator

MY_PV=$(get_version_component_range 1-3)
MY_P="${PN}-${MY_PV}"

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

SLOT="0"
LICENSE="BSD"
IUSE="arpack blas doc mpi openmp python tools"
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}"

S="${WORKDIR}"/"${MY_P}-source"

src_prepare() {
	epatch "${FILESDIR}"/${P}-openmp.patch
	epatch "${FILESDIR}"/${P}-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
	find . -name "._*" -exec rm -f '{}' \;
}

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"

	econf $(use_enable python) \
		--disable-maloc-rebuild \
		$(use_enable openmp) \
		$(use_enable tools) \
		${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"

	if use tools; then
		mv tools/mesh/{,mesh-}analysis || die
		dobin tools/mesh/* || die

		if use arpack; then
			dobin tools/arpack/* || die
		fi

		insinto /usr/share/${PN}
		doins -r tools/conversion || die
		doins -r tools/visualization/opendx || die

		dobin tools/manip/{born,coulomb} || die

		doins -r tools/matlab || die
	fi

	insinto /usr/$(python_get_sitedir)/${PN}
	doins tools/manip/*.py || die

	if use python && ! use mpi; then
		insinto /usr/$(python_get_sitedir)/${PN}
		doins tools/python/{*.py,*.pqr,*.so} || die
		doins tools/python/*/{*.py,*.so} || die
	fi

	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
}

pkg_postinst() {
	python_mod_optimize /usr/$(python_get_sitedir)/${PN}
}

pkg_postrm() {
	python_mod_cleanup /usr/$(python_get_sitedir)/${PN}
}

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

[Justin Lecher (jlec)]

jlec        10/03/30 07:02:46

  Modified:             metadata.xml ChangeLog apbs-1.2.1b-r2.ebuild
  Log:
  Fix for USE="python -tool" situation, #311995
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

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

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	29 Mar 2010 19:00:29 -0000	1.5
+++ metadata.xml	30 Mar 2010 07:02:46 -0000	1.6
@@ -5,6 +5,11 @@
         <email>markusle@gentoo.org</email>
         <name>Markus Dittrich</name>
     </maintainer>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+		<description>Ebuild Crasher</description>
+	</maintainer>			
 	<herd>sci-chemistry</herd>
 	<use>
 		<flag name='arpack'>Include support for arpack libs</flag>



1.27                 sci-chemistry/apbs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	29 Mar 2010 19:00:29 -0000	1.26
+++ ChangeLog	30 Mar 2010 07:02:46 -0000	1.27
@@ -1,6 +1,10 @@
 # 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.26 2010/03/29 19:00:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.27 2010/03/30 07:02:46 jlec Exp $
+
+  30 Mar 2010; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r2.ebuild,
+  metadata.xml:
+  Fix for USE="python -tool" situation, #311995
 
 *apbs-1.2.1b-r2 (28 Mar 2010)
 



1.2                  sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild

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

Index: apbs-1.2.1b-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apbs-1.2.1b-r2.ebuild	29 Mar 2010 19:00:29 -0000	1.1
+++ apbs-1.2.1b-r2.ebuild	30 Mar 2010 07:02:46 -0000	1.2
@@ -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.2.1b-r2.ebuild,v 1.1 2010/03/29 19:00:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v 1.2 2010/03/30 07:02:46 jlec Exp $
 
 EAPI="3"
 
@@ -65,9 +65,15 @@
 		fi
 	fi || die "Failed to select proper mpi implementation"
 
-	econf $(use_enable python) \
+	# we need the tools target for python
+	if use python && ! use tools; then
+		myconf="${myconf} --enable-tools"
+	fi
+
+	econf \
 		--disable-maloc-rebuild \
 		$(use_enable openmp) \
+		$(use_enable python) \
 		$(use_enable tools) \
 		${myconf}
 }