Ebuild clean-up, and removal of unneeded dependency "sci-libs/netcdf" (fixes bug #96187).

(Portage version: 2.0.51.22-r2)

4 files changed, 84 insertions, 13 deletions

diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog
index 6e7ebdcb2779..b765a50179ad 100644
--- a/sci-libs/hdf/ChangeLog
+++ b/sci-libs/hdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/hdf
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.3 2005/01/25 22:05:47 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.4 2005/10/01 21:29:34 ribosome Exp $
+
+*hdf-4.2.0-r4 (01 Oct 2005)
+
+  01 Oct 2005; Olivier Fisette <ribosome@gentoo.org> +hdf-4.2.0-r4.ebuild:
+  Ebuild clean-up, and removal of unneeded dependency "sci-libs/netcdf" (fixes
+  bug #96187).
 
   25 Jan 2005; Danny van Dyk <kugelfang@gentoo.org>
   +files/hdf-4.2.0-shared-libs.patch, hdf-4.2.0-r3.ebuild:
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index eb762c59b4bb..922b77a4da9a 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 31ebffcb0bffbbbe7afc4b7715deb823 ChangeLog 1463
 MD5 5478f5a5007a144268b33dd61d9d8340 hdf-4.2.0-r3.ebuild 2137
+MD5 0da71739256b0e5313c42aab10982207 hdf-4.2.0-r4.ebuild 2200
+MD5 31ebffcb0bffbbbe7afc4b7715deb823 ChangeLog 1463
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 bdb6c3501721a0f1f6b81f2f9b052028 files/digest-hdf-4.2.0-r3 61
 MD5 f9fd921ea3f86b6fc072704cf5e064d5 files/hdf-4.2.0-shared-libs.patch 17794
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB9sQw5mJXAu5GbtIRAsGlAJwNMyS0wc+FZxarwU/7YbCyiy7M2ACfT4fd
-7cwkUXhnBSvaKctV/E056K8=
-=MjWC
------END PGP SIGNATURE-----
+MD5 bdb6c3501721a0f1f6b81f2f9b052028 files/digest-hdf-4.2.0-r3 61
+MD5 bdb6c3501721a0f1f6b81f2f9b052028 files/digest-hdf-4.2.0-r4 61
diff --git a/sci-libs/hdf/files/digest-hdf-4.2.0-r4 b/sci-libs/hdf/files/digest-hdf-4.2.0-r4
new file mode 100644
index 000000000000..7273e84b1456
--- /dev/null
+++ b/sci-libs/hdf/files/digest-hdf-4.2.0-r4
@@ -0,0 +1 @@
+MD5 9d3ee529a7f8464481c0cc241a92d076 hdf4.2r0.tar.gz 3738135
diff --git a/sci-libs/hdf/hdf-4.2.0-r4.ebuild b/sci-libs/hdf/hdf-4.2.0-r4.ebuild
new file mode 100644
index 000000000000..1ad39b5d7918
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.0-r4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.0-r4.ebuild,v 1.1 2005/10/01 21:29:34 ribosome Exp $
+
+inherit flag-o-matic fortran
+
+# 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 ~ppc"
+SLOT="0"
+IUSE="szip"
+
+DEPEND="sys-libs/zlib
+		media-libs/jpeg
+		>=sys-apps/sed-4
+		szip? ( sci-libs/szip )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-shared-libs.patch
+}
+
+src_compile() {
+	# We need shared libraries, see BUG #75415.
+	# To use libtool for shared libs, we need above patch and the following lines.
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/01/24
+	aclocal
+	libtoolize --copy --force
+	automake --add-missing
+	autoconf
+
+	# BUG #75415, the shipped config/linux-gnu settings are broken.
+	# -Wsign-compare does not work with g77, causing lack of -fPIC for shared
+	# objects.
+	sed -e 's|-Wsign-compare||g' -i "${S}"/config/linux-gnu || die
+
+	local myconf="--enable-production"
+
+	use szip && myconf="${myconf} --with-szlib=/usr"
+	use ppc && append-flags -DSUN
+
+	econf ${myconf} || die "configure failed"
+
+	make LDFLAGS="${LDFLAGS} -lm" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README release_notes/*.txt || die
+	cd "${D}"
+	einfo "Renaming included versions of ncdump and ncgen to hdfdump and hdfgen, respectively."
+	mv -v usr/bin/ncgen usr/bin/hdfgen || die
+	mv -v usr/bin/ncdump usr/bin/hdfdump || die
+	mv -v usr/share/man/man1/ncgen.1 usr/share/man/man1/hdfgen.1 || die
+	mv -v usr/share/man/man1/ncdump.1 usr/share/man/man1/hdfdump.1 || die
+	if has_version sci-libs/netcdf; then
+		einfo '"sci-libs/netcdf" is already installed - not installing netcdf related header files.'
+		rm -v usr/include/netcdf.inc || die
+		rm -v usr/include/netcdf.h || die
+	fi
+}