[gentoo-commits] proj/sci:master commit in: sci-libs/hdf5/

[gentoo-commits] proj/sci:master commit in: sci-libs/hdf5/

[Justin Lecher]

commit:     277f769f1a7626d062a27bdc2abe2c45595e934a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 12:27:13 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 12:27:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=277f769f

Streamlined fortran-2 eclass usage

(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

---
 sci-libs/hdf5/ChangeLog            |    3 +++
 sci-libs/hdf5/hdf5-1.8.4-r2.ebuild |   31 +++++++++++++++++--------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index b47951d..0c0ffd4 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2011; Justin Lecher <jlec@gentoo.org> hdf5-1.8.4-r2.ebuild:
+  Streamlined fortran-2 eclass usage
+
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> hdf5-1.8.4-r2.ebuild:
   Added fortran-2.eclass support
 

diff --git a/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild b/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild
index f67daae..71fc58e 100644
--- a/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=3
 
 MPI_PKG_USE_ROMIO=1
 
-inherit eutils fortran-2 autotools mpi
+inherit autotools eutils fortran-2 mpi
 
 DESCRIPTION="General purpose library and file format for storing scientific data"
 HOMEPAGE="http://www.hdfgroup.org/HDF5/"
@@ -18,15 +18,18 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="cxx examples fortran mpi szip threads zlib"
 
-RDEPEND="mpi? ( $(mpi_pkg_deplist) )
+RDEPEND="
+	fortran? ( virtual/fortran )
+	mpi? ( $(mpi_pkg_deplist) )
 	szip? ( >=sci-libs/szip-2.1 )
 	zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
+	sys-devel/libtool:2
 	sys-process/time"
 
 pkg_setup() {
+	fortran && fortran-2_pkg_setup
 	if use mpi; then
 		if use cxx; then
 			ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
@@ -34,26 +37,26 @@ pkg_setup() {
 		fi
 		export CC=$(mpi_pkg_cc)
 		if use fortran; then
-			fortran-2_pkg_setup
 			export FC=$(mpi_pkg_fc)
 		fi
 	fi
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.3-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-1.8.3-includes.patch
-	epatch "${FILESDIR}"/${PN}-1.8.3-noreturn.patch
-	epatch "${FILESDIR}"/${P}-gnutools.patch
-	epatch "${FILESDIR}"/${P}-scaleoffset.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.8.3-as-needed.patch \
+		"${FILESDIR}"/${PN}-1.8.3-includes.patch \
+		"${FILESDIR}"/${PN}-1.8.3-noreturn.patch \
+		"${FILESDIR}"/${P}-gnutools.patch \
+		"${FILESDIR}"/${P}-scaleoffset.patch
 
 	# respect gentoo examples directory
-	sed -i \
+	sed \
 		-e 's:$(docdir)/hdf5:$(DESTDIR)/$(docdir):' \
-		$(find . -name Makefile.am) || die
-	sed -i \
+		-i $(find . -name Makefile.am) || die
+	sed \
 		-e '/docdir/d' \
-		config/commence.am || die
+		-i config/commence.am || die
 	eautoreconf
 	# enable shared libs by default for h5cc config utility
 	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in \

[gentoo-commits] proj/sci:master commit in: sci-libs/hdf5/

[Kacper Kowalik]

commit:     4002cf2caeb62108aa0825aad99666a6f874a07a
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 08:35:46 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 08:35:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4002cf2c

[sci-libs/hdf5] snapshot bump

---
 ...-1.8.9_pre13.ebuild => hdf5-1.8.9_pre14.ebuild} |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-libs/hdf5/hdf5-1.8.9_pre13.ebuild b/sci-libs/hdf5/hdf5-1.8.9_pre14.ebuild
similarity index 98%
rename from sci-libs/hdf5/hdf5-1.8.9_pre13.ebuild
rename to sci-libs/hdf5/hdf5-1.8.9_pre14.ebuild
index 698acd5..702301a 100644
--- a/sci-libs/hdf5/hdf5-1.8.9_pre13.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.9_pre14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.8.ebuild,v 1.4 2011/12/05 16:56:26 xarthisius Exp $
 

[gentoo-commits] proj/sci:master commit in: sci-libs/hdf5/

[Justin Lecher]

commit:     2bb95a4d1c25d23fbc6991d70c5beaaee639f81e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:05:29 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:05:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2bb95a4d

Added fortran-2.eclass support

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-libs/hdf5/ChangeLog            |    5 ++++-
 sci-libs/hdf5/hdf5-1.8.4-r2.ebuild |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 3f7eb78..b47951d 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/hdf5
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> hdf5-1.8.4-r2.ebuild:
+  Added fortran-2.eclass support
+
 *hdf5-1.8.4-r2 (19 Jan 2010)
 
   19 Jan 2010; Justin Bronder <jsbronder@gentoo.org> -hdf5-1.8.4-r1.ebuild,

diff --git a/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild b/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild
index be24acc..f67daae 100644
--- a/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI=2
 
 MPI_PKG_USE_ROMIO=1
 
-inherit eutils autotools mpi
+inherit eutils fortran-2 autotools mpi
 
 DESCRIPTION="General purpose library and file format for storing scientific data"
 HOMEPAGE="http://www.hdfgroup.org/HDF5/"
@@ -34,6 +34,7 @@ pkg_setup() {
 		fi
 		export CC=$(mpi_pkg_cc)
 		if use fortran; then
+			fortran-2_pkg_setup
 			export FC=$(mpi_pkg_fc)
 		fi
 	fi