public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs: ChangeLog apbs-1.3-r1.ebuild
@ 2010-11-04  9:40 Justin Lecher (jlec)
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2010-11-04  9:40 UTC (permalink / raw
  To: gentoo-commits

jlec        10/11/04 09:40:09

  Modified:             ChangeLog
  Added:                apbs-1.3-r1.ebuild
  Log:
  Fix compilation of python module, fix support for zlib
  
  (Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

Revision  Changes    Path
1.44                 sci-chemistry/apbs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	1 Nov 2010 17:25:22 -0000	1.43
+++ ChangeLog	4 Nov 2010 09:40:09 -0000	1.44
@@ -1,6 +1,14 @@
 # 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.43 2010/11/01 17:25:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.44 2010/11/04 09:40:09 jlec Exp $
+
+*apbs-1.3-r1 (04 Nov 2010)
+
+  04 Nov 2010; Justin Lecher <jlec@gentoo.org>
+  files/apbs-1.2.1b-multilib.patch, +apbs-1.3-r1.ebuild,
+  +files/apbs-1.3-python.patch, files/apbs-1.3-shared.patch,
+  +files/apbs-1.3-zlib.patch:
+  Fix compilation of python module, fix support for zlib
 
   01 Nov 2010; Justin Lecher <jlec@gentoo.org> apbs-1.3.ebuild,
   +files/apbs-1.3-mainroutines.patch, files/apbs-1.3-shared.patch,



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

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

Index: apbs-1.3-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.3-r1.ebuild,v 1.1 2010/11/04 09:40:09 jlec Exp $

EAPI="3"

PYTHON_DEPEND="python? 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 doc fetk mpi openmp python tools"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"

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}"

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

pkg_setup() {
	use python && python_set_active_version 2
	fortran_pkg_setup
	if use mpi && use python; then
		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() {
	rm -rf contrib/{blas,maloc,opal,zlib} || die
	find . -name "._*" -exec rm -f '{}' \;
	epatch \
		"${FILESDIR}"/${P}-openmp.patch \
		"${FILESDIR}"/${PN}-1.2.1b-install-fix.patch \
		"${FILESDIR}"/${P}-contrib.patch \
		"${FILESDIR}"/${P}-link.patch \
		"${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}"/${P}-mainroutines.patch \
		"${FILESDIR}"/${P}-zlib.patch \
		"${FILESDIR}"/${P}-python.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
}

src_configure() {
	local myconf="--docdir=${EPREFIX}/usr/share/doc/${PF}"
	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/openmpi; then
			myconf="${myconf} --with-openmpi=${EPREFIX}/usr"
		fi
	fi || die "Failed to select proper mpi implementation"

	# we need the tools target for python
	if use python && ! use tools; then
		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 \
		--with-blas=-lblas \
		$(use_enable openmp) \
		$(use_enable python) \
		$(use_enable tools) \
		${myconf}
}

src_test() {
	export LC_NUMERIC=C
	cd examples && make test \
		|| die "Tests failed"
	grep -q 'FAILED' "${S}"/examples/TESTRESULTS.log && 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 $(python_get_sitedir)/${PN}
	doins tools/manip/*.py || die

	if use python && ! use mpi; then
		insinto $(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 ${PN}
}

pkg_postrm() {
	python_mod_cleanup ${PN}
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs: ChangeLog apbs-1.3-r1.ebuild
@ 2011-07-04  9:27 Justin Lecher (jlec)
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2011-07-04  9:27 UTC (permalink / raw
  To: gentoo-commits

jlec        11/07/04 09:27:37

  Modified:             ChangeLog apbs-1.3-r1.ebuild
  Log:
  Fix for blas detection
  
  (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

Revision  Changes    Path
1.50                 sci-chemistry/apbs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	2 Jul 2011 08:56:56 -0000	1.49
+++ ChangeLog	4 Jul 2011 09:27:37 -0000	1.50
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/apbs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.49 2011/07/02 08:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.50 2011/07/04 09:27:37 jlec Exp $
+
+  04 Jul 2011; Justin Lecher <jlec@gentoo.org> apbs-1.3-r1.ebuild,
+  +files/apbs-1.3-blas.patch:
+  Fix for blas detection
 
   02 Jul 2011; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r4.ebuild,
   apbs-1.3.ebuild, apbs-1.3-r1.ebuild, metadata.xml:



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

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

Index: apbs-1.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apbs-1.3-r1.ebuild	2 Jul 2011 08:56:56 -0000	1.6
+++ apbs-1.3-r1.ebuild	4 Jul 2011 09:27:37 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.6 2011/07/02 08:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.7 2011/07/04 09:27:37 jlec Exp $
 
 EAPI="3"
 
@@ -65,7 +65,8 @@
 		"${FILESDIR}"/${PN}-1.2.1b-parallelbuild.patch \
 		"${FILESDIR}"/${P}-mainroutines.patch \
 		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-python.patch
+		"${FILESDIR}"/${P}-python.patch \
+		"${FILESDIR}"/${P}-blas.patch
 	sed "s:GENTOO_PKG_NAME:${PN}:g" \
 		-i Makefile.am || die "Cannot correct package name"
 	# this test is broken






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs: ChangeLog apbs-1.3-r1.ebuild
@ 2011-07-07  9:29 Justin Lecher (jlec)
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2011-07-07  9:29 UTC (permalink / raw
  To: gentoo-commits

jlec        11/07/07 09:29:52

  Modified:             ChangeLog apbs-1.3-r1.ebuild
  Log:
  Fix for atlas detection as blas implementation
  
  (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

Revision  Changes    Path
1.51                 sci-chemistry/apbs/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog	4 Jul 2011 09:27:37 -0000	1.50
+++ ChangeLog	7 Jul 2011 09:29:52 -0000	1.51
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/apbs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.50 2011/07/04 09:27:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.51 2011/07/07 09:29:52 jlec Exp $
+
+  07 Jul 2011; Justin Lecher <jlec@gentoo.org> apbs-1.3-r1.ebuild:
+  Fix for atlas detection as blas implementation
 
   04 Jul 2011; Justin Lecher <jlec@gentoo.org> apbs-1.3-r1.ebuild,
   +files/apbs-1.3-blas.patch:



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

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

Index: apbs-1.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apbs-1.3-r1.ebuild	4 Jul 2011 09:27:37 -0000	1.7
+++ apbs-1.3-r1.ebuild	7 Jul 2011 09:29:52 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.7 2011/07/04 09:27:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.3-r1.ebuild,v 1.8 2011/07/07 09:29:52 jlec Exp $
 
 EAPI="3"
 
@@ -71,7 +71,10 @@
 		-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
+	sed \
+		-e 's:libmaloc.a:libmaloc.so:g' \
+		-e 's:-lblas::g' \
+		-i configure.ac || die
 	eautoreconf
 }
 






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-07-07  9:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-04  9:27 [gentoo-commits] gentoo-x86 commit in sci-chemistry/apbs: ChangeLog apbs-1.3-r1.ebuild Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2011-07-07  9:29 Justin Lecher (jlec)
2010-11-04  9:40 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox