Latest stable for x86

diff --git a/dev-libs/hdf/Manifest b/dev-libs/hdf/Manifest
index 41d8bfc9eb02c34dd5cef96f1a58e44bfcd3217d..7be540f52595cbfe7ddb9dcb305515cb7c2822e7 100644 (file)
--- a/dev-libs/hdf/Manifest
+++ b/dev-libs/hdf/Manifest
@@ -1,6 +1,4 @@
+MD5 5daa35a924978aad74ebce61a23b4147 hdf-4.2.0-r3.ebuild 1712
 MD5 1b34783073eb8dc69d1ae6797150c763 ChangeLog 1094
-MD5 62e68d9c2222e914a7ed7babaa9532b6 hdf-4.2.0-r2.ebuild 1459
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 08c41c112c61d6e345c509da1d856dfe hdf-4.2.0-r3.ebuild 1702
-MD5 bdb6c3501721a0f1f6b81f2f9b052028 files/digest-hdf-4.2.0-r2 61
 MD5 bdb6c3501721a0f1f6b81f2f9b052028 files/digest-hdf-4.2.0-r3 61

diff --git a/dev-libs/hdf/files/digest-hdf-4.2.0-r2 b/dev-libs/hdf/files/digest-hdf-4.2.0-r2
deleted file mode 100644 (file)
index 7273e84..0000000
--- a/dev-libs/hdf/files/digest-hdf-4.2.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d3ee529a7f8464481c0cc241a92d076 hdf4.2r0.tar.gz 3738135

diff --git a/dev-libs/hdf/hdf-4.2.0-r2.ebuild b/dev-libs/hdf/hdf-4.2.0-r2.ebuild
deleted file mode 100644 (file)
index 306536a..0000000
--- a/dev-libs/hdf/hdf-4.2.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/hdf/hdf-4.2.0-r2.ebuild,v 1.2 2004/06/24 23:12:11 agriffis Exp $
-
-# substitute second dot by "r"
-MY_PV=${PV/./X}
-TMP_PV=${MY_PV/./r}
-MY_PV=${TMP_PV/X/.}
-
-S="${WORKDIR}/${PN}${MY_PV}"
-
-DESCRIPTION="HDF4 is a general purpose library and file format for storing scientific data."
-SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/pub/outgoing/hdf4/hdf${MY_PV}/hdf${MY_PV}.tar.gz"
-HOMEPAGE="http://hdf.ncsa.uiuc.edu/hdf4.html"
-
-LICENSE="NCSA-HDF"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-               media-libs/jpeg
-               dev-libs/szip
-               app-sci/netcdf
-               >=sys-apps/sed-4"
-
-src_compile() {
-       local myconf="--enable-production --with-szlib=/usr"
-       econf ${myconf} || die "configure failed"
-       make || die "emake failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
-       dodoc README release_notes/*.txt
-       cd ${D}
-       einfo Renaming included versions of ncdump and ncgen to hdfdump and hdfgen, respectively
-       mv -v usr/bin/ncgen usr/bin/hdfgen
-       mv -v usr/bin/ncdump usr/bin/hdfdump
-       mv -v usr/share/man/man1/ncgen.1 usr/share/man/man1/hdfgen.1
-       mv -v usr/share/man/man1/ncdump.1 usr/share/man/man1/hdfdump.1
-       if has_version app-sci/netcdf; then
-               einfo app-sci/netcdf is already installed - not installing netcdf related header files
-               rm -v usr/include/netcdf.inc
-               rm -v usr/include/netcdf.h
-       fi
-}

diff --git a/dev-libs/hdf/hdf-4.2.0-r3.ebuild b/dev-libs/hdf/hdf-4.2.0-r3.ebuild
index f7a9106150510d6819239a79e57fba32df27ea6a..b3e7d6e1c3553fc893a897dce86ee702f1d298fb 100644 (file)
--- a/dev-libs/hdf/hdf-4.2.0-r3.ebuild
+++ b/dev-libs/hdf/hdf-4.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/hdf/hdf-4.2.0-r3.ebuild,v 1.4 2004/09/25 11:35:40 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hdf/hdf-4.2.0-r3.ebuild,v 1.5 2004/11/04 13:32:40 phosphan Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.ncsa.uiuc.edu/HDF/pub/outgoing/hdf4/hdf${MY_PV}/hdf${MY_PV}.t
 HOMEPAGE="http://hdf.ncsa.uiuc.edu/hdf4.html"
 
 LICENSE="NCSA-HDF"
-KEYWORDS="~x86 ~amd64 ppc"
+KEYWORDS="x86 ~amd64 ppc"
 SLOT="0"
 IUSE="szip"
 
@@ -37,7 +37,7 @@ src_compile() {
        use szip && myconf="${myconf} --with-szlib=/usr"
        use ppc && append-flags -DSUN
        econf ${myconf} || die "configure failed"
-       make LDFLAGS="-lm" || die "make failed"
+       make LDFLAGS="${LDFLAGS} -lm" || die "make failed"
 }
 
 src_install() {