early stable bump for gdal (required), plus new testing version

Package-Manager: portage-2.1_rc1-r3

5 files changed, 103 insertions, 12 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 8b3e4c125a99..7edbf53f384a 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.11 2006/05/21 21:44:41 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.12 2006/05/25 23:22:32 nerdboy Exp $
+
+*hdf5-1.6.5 (25 May 2006)
+
+  25 May 2006; Steve Arnold <nerdboy@gentoo.org> hdf5-1.6.4.ebuild,
+  +hdf5-1.6.5.ebuild:
+  Early stable bump for gdal (required), plus new testing version
+  (since the only real issue besides the sparc bug was the mpi thing).
+  To do: 1) resolve virtual/mpi issues for ppc64 and others
+	 2) need fix for buss error on sparc
+         3) get szip support working for other arches
 
   21 May 2006; Steve Arnold <nerdboy@gentoo.org> hdf5-1.6.2.ebuild,
   hdf5-1.6.4.ebuild:
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index e9acc2ccd8b0..e33e4aff4e64 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,17 +1,22 @@
 DIST hdf5-1.6.2.tar.gz 3879147 RMD160 75678e8859e783dbb274cdabee3d916724c46780 SHA256 aabc23cb2c744c25b71416e25bdca3b9ca8dadb9248f22314330a33d91c599ba size 3879147
 DIST hdf5-1.6.4.tar.gz 4862437 RMD160 8175af3153bb0a5a1278c01af2d3940f4fd5084f SHA256 11ab0d81575f333067ae091d39c28fbf446c8ecafdfe70cf92b3c35ceffbfc97 size 4862437
+DIST hdf5-1.6.5.tar.gz 4930666 RMD160 70db16a832f77aa6d0c97da517353665304b7b27 SHA256 85b7cfc1e34db544fa93f5bf7effe189a5e1eb97f0cfa7b212adc11915a756b2 size 4930666
 EBUILD hdf5-1.6.2.ebuild 1845 RMD160 8e662160e1b42c5a58fbac00a0d95f7a507c7628 SHA1 1baade1e508ad95430addb3bbca07b3dbd71c0f5 SHA256 1a2a03a07b42dad381c56585d203fd64a9a10f7170687b9cad97725b4db3ee9a size 1845
 MD5 d9aef462922aeb7e41fb4025f683083a hdf5-1.6.2.ebuild 1845
 RMD160 8e662160e1b42c5a58fbac00a0d95f7a507c7628 hdf5-1.6.2.ebuild 1845
 SHA256 1a2a03a07b42dad381c56585d203fd64a9a10f7170687b9cad97725b4db3ee9a hdf5-1.6.2.ebuild 1845
-EBUILD hdf5-1.6.4.ebuild 2060 RMD160 e3e44ed42cc0f539735299ebe1992856c601bdc0 SHA1 054ba6f33a6d468408914d11b569d3ca2835cbe8 SHA256 fbe974ff609dfc60118ebcb3d0436429772b6543ce0b1daee03f1d21965297e1 size 2060
-MD5 611bdca6893aad5b354b4cc0e44d274b hdf5-1.6.4.ebuild 2060
-RMD160 e3e44ed42cc0f539735299ebe1992856c601bdc0 hdf5-1.6.4.ebuild 2060
-SHA256 fbe974ff609dfc60118ebcb3d0436429772b6543ce0b1daee03f1d21965297e1 hdf5-1.6.4.ebuild 2060
-MISC ChangeLog 3890 RMD160 d7e27d13a9b03fca518cbe3a1d267ddb9aa55287 SHA1 893d14b369ae80d26ae5f079c188e26f1ccb4cc1 SHA256 b17a0bece763951a300edcf6b9eb2bcd8fc80ba394338cc81d3ae9f6319ac334 size 3890
-MD5 9d146c97bdc1a56220f0d0c946ad63d6 ChangeLog 3890
-RMD160 d7e27d13a9b03fca518cbe3a1d267ddb9aa55287 ChangeLog 3890
-SHA256 b17a0bece763951a300edcf6b9eb2bcd8fc80ba394338cc81d3ae9f6319ac334 ChangeLog 3890
+EBUILD hdf5-1.6.4.ebuild 2107 RMD160 b563d55acd098d4aae60bb9ae92d72c9c9d87b16 SHA1 2d14768c69bbe8458a72a7b4754347f9d6519dff SHA256 26cd2c352ef2ff1586bbdbcd74eaf02b25b0828d1f57dccf209ab83acaaed14b size 2107
+MD5 a6909692f068dc005572cfa342757ab0 hdf5-1.6.4.ebuild 2107
+RMD160 b563d55acd098d4aae60bb9ae92d72c9c9d87b16 hdf5-1.6.4.ebuild 2107
+SHA256 26cd2c352ef2ff1586bbdbcd74eaf02b25b0828d1f57dccf209ab83acaaed14b hdf5-1.6.4.ebuild 2107
+EBUILD hdf5-1.6.5.ebuild 2102 RMD160 1f9de24db65ca2dc2986c6371c29251bad32a9e2 SHA1 391d6245f67617cc5d621d22952d47b2395e2b5c SHA256 f49ed991f2e912939e82c8d5daaf6471ad0e8e26ea7438b0da383257d00ef5c0 size 2102
+MD5 0592f7daf36b1c98be4d4a32835fe0fe hdf5-1.6.5.ebuild 2102
+RMD160 1f9de24db65ca2dc2986c6371c29251bad32a9e2 hdf5-1.6.5.ebuild 2102
+SHA256 f49ed991f2e912939e82c8d5daaf6471ad0e8e26ea7438b0da383257d00ef5c0 hdf5-1.6.5.ebuild 2102
+MISC ChangeLog 4297 RMD160 9174fc28cb7141466323115113c9444f06102313 SHA1 48b5e5159cc8128923d8884892b26e9495c78ef1 SHA256 31592a70b51923bbbe8c4335818cce2a5199678f7747c795c9a639fa5a811c47 size 4297
+MD5 7278ef0801ddb2faf7e00b5ff13bfe8c ChangeLog 4297
+RMD160 9174fc28cb7141466323115113c9444f06102313 ChangeLog 4297
+SHA256 31592a70b51923bbbe8c4335818cce2a5199678f7747c795c9a639fa5a811c47 ChangeLog 4297
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 size 156
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -22,3 +27,6 @@ SHA256 cfc680ea64dea14347d7a82cc7018aecde17ba902840156af5dcc41df62a8100 files/di
 MD5 8051502f3edd616979503110708f4b23 files/digest-hdf5-1.6.4 235
 RMD160 2076cc8bacc1360f0ff42c7fd5a9be1dca1dcf66 files/digest-hdf5-1.6.4 235
 SHA256 97e83c5bb167cb453d738a1b0b5162bd8e42ab2e3b5a9bdd4cb75beaaeed202d files/digest-hdf5-1.6.4 235
+MD5 11ef5245b9dbcdeb35123a3e68005b55 files/digest-hdf5-1.6.5 235
+RMD160 ca1a1b4fcb1908440dc0a52bba81d1e9abd5918a files/digest-hdf5-1.6.5 235
+SHA256 071675af191269049c93a5e66d02b04d567c97f01f0748896b156d6ea0a56097 files/digest-hdf5-1.6.5 235
diff --git a/sci-libs/hdf5/files/digest-hdf5-1.6.5 b/sci-libs/hdf5/files/digest-hdf5-1.6.5
new file mode 100644
index 000000000000..0e151bfe2241
--- /dev/null
+++ b/sci-libs/hdf5/files/digest-hdf5-1.6.5
@@ -0,0 +1,3 @@
+MD5 67187b3253b89f1f41756b7fd4396ecf hdf5-1.6.5.tar.gz 4930666
+RMD160 70db16a832f77aa6d0c97da517353665304b7b27 hdf5-1.6.5.tar.gz 4930666
+SHA256 85b7cfc1e34db544fa93f5bf7effe189a5e1eb97f0cfa7b212adc11915a756b2 hdf5-1.6.5.tar.gz 4930666
diff --git a/sci-libs/hdf5/hdf5-1.6.4.ebuild b/sci-libs/hdf5/hdf5-1.6.4.ebuild
index 472c2a794580..5e3a063e5ded 100644
--- a/sci-libs/hdf5/hdf5-1.6.4.ebuild
+++ b/sci-libs/hdf5/hdf5-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v 1.5 2006/05/21 21:44:41 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.4.ebuild,v 1.6 2006/05/25 23:22:32 nerdboy Exp $
 
 inherit eutils
 
@@ -10,8 +10,9 @@ SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/${P}.tar.gz"
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# should try to get alpha ia64 and sparc back in here
+KEYWORDS="amd64 ppc ~ppc64 x86"
+# need to update szip to get sparc, alpha, and ia64 back in here, 
+# as well as work out the mpi issues
 IUSE="static zlib ssl mpi hlapi szip threads debug"
 
 DEPEND="zlib? ( sys-libs/zlib )
diff --git a/sci-libs/hdf5/hdf5-1.6.5.ebuild b/sci-libs/hdf5/hdf5-1.6.5.ebuild
new file mode 100644
index 000000000000..78141a5e06c6
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.6.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.5.ebuild,v 1.1 2006/05/25 23:22:32 nerdboy Exp $
+
+inherit eutils
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="http://hdf.ncsa.uiuc.edu/HDF5/"
+SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/${P}.tar.gz"
+
+LICENSE="NCSA-HDF"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# need to update szip to get sparc, alpha, and ia64 back in here,
+# as well as work out the mpi issues
+IUSE="static zlib ssl mpi hlapi szip threads debug"
+
+DEPEND="zlib? ( sys-libs/zlib )
+		szip? ( sci-libs/szip )
+		mpi? ( virtual/mpi )"
+
+src_compile() {
+	local myconf="--with-pic"
+
+	#--disable-static conflicts with --enable-cxx, so we have to do either or
+	use static && myconf="${myconf} --enable-cxx" || \
+	    myconf="${myconf} --disable-static"
+	# fortran needs f90 support
+	#myconf="${myconf} $(use_enable fortran)"
+	use threads && myconf="${myconf} --with-pthread"
+	use debug && myconf="${myconf} --enable-debug=all"
+	use mpi && myconf="${myconf} --enable-parallel"
+	use hlapi || myconf="${myconf} --disable-hl"
+
+	# NOTE: the hdf5 configure script has its own interpretation of
+	# the ARCH environment variable which conflicts with that of
+	# ebuild/emerge. As a work around, we save the ARCH variable as
+	# EBUILD_ARCH and restore it when we are done.
+	EBUILD_ARCH=${ARCH}
+	unset ARCH
+
+	use mpi && \
+	export CC="/usr/bin/mpicc"
+	./configure --prefix=/usr ${myconf} \
+		$(use_enable zlib) \
+		$(use_with ssl) \
+		--enable-linux-lfs  \
+		--sysconfdir=/etc \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "configure failed"
+
+	# restore the ARCH environment variable
+	ARCH=${EBUILD_ARCH}
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		docdir=${D}/usr/share/doc/${PF} \
+		libdir=${D}/usr/$(get_libdir)/ \
+		infodir=${D}/usr/share/info \
+		install || die "make install failed"
+
+	dodoc README.txt COPYING MANIFEST
+	dohtml doc/html/*
+}