Removing old ebuild and obsolete patches

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 20 insertions, 472 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index d71c68058c51..f4f8a06aa726 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.58 2010/06/20 11:19:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.59 2010/06/20 11:45:05 xarthisius Exp $
+
+  20 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/hdf5-1.6.6-gcc4.3.patch, -hdf5-1.6.7.ebuild,
+  -files/hdf5-gcc4.3.3-fix.patch, -hdf5-1.8.4_p1.ebuild,
+  -files/hdf5-mpich2.patch, -hdf5-1.6.2.ebuild:
+  Removing old ebuild and obsolete patches
 
   20 Jun 2010; Raúl Porcel <armin76@gentoo.org> hdf5-1.8.4-r1.ebuild:
   alpha/ia64/sparc stable wrt #299710
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 2644d4de9159..d697b2a9054f 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,4 +1,6 @@
-AUX hdf5-1.6.6-gcc4.3.patch 355 RMD160 109811c4e4d434bfa09ea156e67623e50b0f89a5 SHA1 c0fe43c262723e117572b687d9f3c94910e4fddc SHA256 ca1a16f1df4c58410001ca4b06886f9df47b475100078c5e9208ff7a21ca22c1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hdf5-1.8.3-as-needed.patch 1821 RMD160 a20e65447625134132cb3e8e19917eb499a463e8 SHA1 b295f26b8d39fae21201449441a8ac3c0c699048 SHA256 6f03f955186e2e2870517580bd14a637e2cf0206e7547184948653e04c464bb3
 AUX hdf5-1.8.3-destdir.patch 1475 RMD160 78bc020b5b8aaef070bafd4a99a2e57f41e5e06b SHA1 7ddfa5d47759d1f7637d0c558cead7a7af63f23d SHA256 866a431b36a5998c1930af6384ff8cd11241af1f488ac5910d247b724eedd309
 AUX hdf5-1.8.3-gnutools.patch 1352 RMD160 a0a51a484f1ab926f13618093c809b6582da8e7f SHA1 e4121383f2876dea4ba09356ca7d233fe6ac5b2e SHA256 0e6720e736d7103f39edcf8d3fb4a14f40bbee67363e8f167d9b594ef348f197
@@ -9,20 +11,21 @@ AUX hdf5-1.8.4-gnutools.patch 4607 RMD160 a27fcd676bc3a04ac535dd55c48a72a5317b08
 AUX hdf5-1.8.4-scaleoffset.patch 1098 RMD160 4983755ff2d284c73f8479cbf11a19b1bf4ef7c2 SHA1 29be6d6cb7de5db5e10429879f9d6673b6af1519 SHA256 596568d5cf56eba73de4e88a3e7aa0c8c13f3660279ffda783e2074e846a9b2d
 AUX hdf5-1.8.4-sigbus.patch 779 RMD160 ba4c92e0ba5ef95b1459d4b570d9113acbc65613 SHA1 3fc4c90ac42b9a59f26a459e6faf6f7410b87a9a SHA256 69c0ef464d99b6c2bd3a959b8210e7772a662054b481bed7775ec21c731bf106
 AUX hdf5-1.8.5-noreturn.patch 1477 RMD160 52c0e72b78b00effe3337f6016f716b425d29f03 SHA1 88eee2a0bb02512795a61f0ceb9d54f8df454e31 SHA256 7278c504b0e252ea5d0a9d7de5b332f0f1c0981a441efb286864b9599790c0b2
-AUX hdf5-gcc4.3.3-fix.patch 412 RMD160 ee46bae5cb81382cc8d04f6d0f31bec37d88987d SHA1 a9ad925bd4107809e45faf44cd6ee88b13ca2b8a SHA256 1583e143c57181608cd34c9accc8830d665aaf01124994ef6642aead5e22bff5
-AUX hdf5-mpich2.patch 488 RMD160 f8ab476eed88267c4b79cc56ae683dc485255921 SHA1 a3f7ee6a2f682982d8a562bcc117c7fc09b69224 SHA256 a154a32a7b6dbc8edac7c72f1a6100b9f0532d2f9591681f505e949b0db6a1e5
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
-DIST hdf5-1.6.2.tar.gz 3879147 RMD160 75678e8859e783dbb274cdabee3d916724c46780 SHA1 1afa977b371c01e53dd6e0bd3a0d879a3f2ae5a2 SHA256 aabc23cb2c744c25b71416e25bdca3b9ca8dadb9248f22314330a33d91c599ba
 DIST hdf5-1.6.4.tar.gz 4862437 RMD160 8175af3153bb0a5a1278c01af2d3940f4fd5084f SHA1 e419e81097b8093d16d96708b764bd85db053e86 SHA256 11ab0d81575f333067ae091d39c28fbf446c8ecafdfe70cf92b3c35ceffbfc97
-DIST hdf5-1.6.7.tar.gz 5299219 RMD160 2dbbcccd32986dcd66ce804c5e90ac6c949b71f6 SHA1 9c26fe09cdad269c9a6757933f70ca164a47b8e8 SHA256 9d9a98204f8c7d82f767f27f84db2520c04f5c73a4a6348c781a0d91a296e9a2
-DIST hdf5-1.8.4-patch1.tar.gz 7180426 RMD160 69fbb9d58890abe36a19167b1511bd1073cc1935 SHA1 dd2f815d5145216fac93d0e5bf22316a2a7cc558 SHA256 8893a6e773e9140230ca638d592408a61bd1726c13784e4bdf048e8ed3591bd9
 DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
 DIST hdf5-1.8.5.tar.gz 7352196 RMD160 9afdb3f28ed5e6bee024995ce0a349398fc2a869 SHA1 24382b27aefcc36d8b753a11002930d7e6086e64 SHA256 4a2f38e0d8b57744433cf6647df75a7ecb79969acea86dee9b8a94f0fa5dd35b
-EBUILD hdf5-1.6.2.ebuild 1837 RMD160 2c7e527ade607fd3d98222787db400bc86c28d37 SHA1 a1b5e54d886d09074665512428c7a1ea23f28437 SHA256 612db1a50d632dd5b0d1c63d557888c4e5765a0debf774552443cdb1dde3a49c
 EBUILD hdf5-1.6.4.ebuild 2098 RMD160 348a6f05d7677e372688ca5ecdcdea36c90df7c9 SHA1 aaeed445389bad0630f518e0778f900af9614fb1 SHA256 469176113ea60bc95a7efa63ca24e6d53baeab71660a44eaa23088fedfd911af
-EBUILD hdf5-1.6.7.ebuild 7799 RMD160 992a00257e2e94d2933d61950b1a85155ce995f3 SHA1 1d51c88dc85b13f658bbfde4676de013b23da2d5 SHA256 a3cacbfed63bd26c0f9346d3e0e424b0444ce1dc6e38e2fd4fa5a87f2c9f403b
 EBUILD hdf5-1.8.4-r1.ebuild 3079 RMD160 476e0aa3d651b6045690d0ef7ad1ff6060ac11ba SHA1 1915f0c7bed9a3153abaf2c4dfbcf6d5c7879b6d SHA256 4d671aa9455e3324e04d1c619e4e5c9b1876fede06314ba6b1bbae55c8a2904c
-EBUILD hdf5-1.8.4_p1.ebuild 3101 RMD160 2770fb98edcf6986af4d3ef5cd47c7f4c028d297 SHA1 c0390a6a7c814211d75b2172d5b37cc925b1d060 SHA256 da11216f31d31e2910156810dd9248960a2e0a56994557217099676c2eabafc2
 EBUILD hdf5-1.8.5.ebuild 2969 RMD160 832a0fe260abccc9b9952fbc69a997998b6d96b7 SHA1 56e87f9eb66e046f98e2096d84ac0d94481f47c3 SHA256 4bf6e1117166a249e57204c903ce523f955ff4b1807afaa5368bfc7eca7c5482
-MISC ChangeLog 12426 RMD160 8f59a3a2f02421d870458e7b66a0b27dca9d09b2 SHA1 d9208a94ed01cb54d53b0cdc098e123ffcbd43b7 SHA256 83d1abde24df6658db5ea554cafd4368fb96fe77e8cf6ead2acb48c501fe2cb2
+MISC ChangeLog 12686 RMD160 70e4498f53b5a1d8c10885ab1f98d0477758c964 SHA1 e5a3ba5cf6c03d9a986f591c3600cad4ac777228 SHA256 92e2a24e0168ec45407ff082dc5a7ccd29583d0b5ad9c5713fcfa838fb6efaae
 MISC metadata.xml 583 RMD160 e788b64c56d7bff3948e246537fb293d1fc37227 SHA1 dca2df5f45e7c16c2e8ef047bf234cf96574c754 SHA256 9163a208b1b1373520a455480f75033298df06031249220fd23b5443fa3e92ed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwd/0oACgkQIiMqcbOVdxQl2QP+PQiMbpYgRGlQ1rnC+CmMAzUz
+0aL2/L3S22q5d8uo3qlxkWLTvEmgQbKm4yUHRZQ97qt1D9hb2LyYcd0DwdeAynCx
+iaXrGVnjA6Cpg+zI32QYG08rdIWnW0aRKAfOTPCrzCdNL7jyPn2twxtabXT8TRjN
+uin9/p9JXgP7JmafdRc=
+=pv0A
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/files/hdf5-1.6.6-gcc4.3.patch b/sci-libs/hdf5/files/hdf5-1.6.6-gcc4.3.patch
deleted file mode 100644
index f7a55898eedc..000000000000
--- a/sci-libs/hdf5/files/hdf5-1.6.6-gcc4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur hdf5-1.6.6/c++/src/H5PropList.cpp hdf5-1.6.6.new/c++/src/H5PropList.cpp
---- hdf5-1.6.6/c++/src/H5PropList.cpp	2007-08-16 12:12:26.000000000 -0400
-+++ hdf5-1.6.6.new/c++/src/H5PropList.cpp	2008-06-22 06:32:28.000000000 -0400
-@@ -18,6 +18,7 @@
- #else
- #include <iostream>
- #endif
-+#include <stdlib.h>
- #include <string>
- 
- #include "H5Include.h"
diff --git a/sci-libs/hdf5/files/hdf5-gcc4.3.3-fix.patch b/sci-libs/hdf5/files/hdf5-gcc4.3.3-fix.patch
deleted file mode 100644
index 5c5de019aaaf..000000000000
--- a/sci-libs/hdf5/files/hdf5-gcc4.3.3-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdf5-1.6.7/perform/zip_perf.c	2008-01-31 21:04:10.000000000 -0600
-+++ hdf5-1.6.7.new/perform/zip_perf.c	2009-02-01 22:08:48.532069100 -0600
-@@ -546,7 +546,7 @@
-         unlink(filename);
- 
-         /* do compressed data write */
--        output = open(filename, O_RDWR | O_CREAT);
-+        output = open(filename, O_RDWR | O_CREAT, S_IRWXU);
- 
-         if (output == -1)
-             error(strerror(errno));
diff --git a/sci-libs/hdf5/files/hdf5-mpich2.patch b/sci-libs/hdf5/files/hdf5-mpich2.patch
deleted file mode 100644
index 3ed60bf264b0..000000000000
--- a/sci-libs/hdf5/files/hdf5-mpich2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/mpich.orig	2005-10-26 13:31:41.000000000 -0700
-+++ config/mpich	2007-11-04 15:46:53.000000000 -0800
-@@ -31,11 +31,13 @@
- 	# $CC is an MPICH compiler. Grab the version numbers.
-         ccversion=`echo $ccversion | cut -f3 -d' '`
- 	case "$ccversion" in
--	    1.2.[0-5]*)
-+	    # modified for mpich2 versioning
-+	    1.0.[0-5]*)
- 		hdf5_mpi_complex_derived_datatype_works='no'
- 		;;
- 	    *)
- 		# assume okay
-+		hdf5_mpi_complex_derived_datatype_works='yes'
- 		;;
- 	esac
-     fi
diff --git a/sci-libs/hdf5/hdf5-1.6.2.ebuild b/sci-libs/hdf5/hdf5-1.6.2.ebuild
deleted file mode 100644
index f65f6619122d..000000000000
--- a/sci-libs/hdf5/hdf5-1.6.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.2.ebuild,v 1.7 2008/02/04 07:58: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="alpha amd64 ia64 ppc sparc x86"
-IUSE="static zlib ssl threads debug"
-
-DEPEND="zlib? ( sys-libs/zlib )"
-
-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
-	#use fortran && myconf="${myconf} --enable-fortran"
-	use threads && myconf="${myconf} --with-pthread"
-	use debug && myconf="${myconf} --enable-debug=all"
-
-	# 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
-
-	./configure --prefix=/usr ${myconf} \
-		$(use_enable zlib) \
-		$(use_with ssl) \
-		--enable-linux-lfs  \
-		--libdir=/usr/$(get_libdir) \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "configure failed"
-
-	# restore the ARCH environment variable
-	ARCH=${EBUILD_ARCH}
-
-	make || die "emake failed"
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		libdir=${D}/usr/$(get_libdir) \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		infodir=${D}/usr/share/info \
-		install || die "make install failed"
-
-	dodoc README.txt MANIFEST
-	dohtml doc/html/*
-}
diff --git a/sci-libs/hdf5/hdf5-1.6.7.ebuild b/sci-libs/hdf5/hdf5-1.6.7.ebuild
deleted file mode 100644
index 2d72d3b9d257..000000000000
--- a/sci-libs/hdf5/hdf5-1.6.7.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.6.7.ebuild,v 1.5 2009/11/24 04:41:44 markusle Exp $
-
-inherit eutils fixheadtails flag-o-matic fortran toolchain-funcs
-
-DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://hdf.ncsa.uiuc.edu/HDF5/"
-SRC_URI="ftp://ftp.hdfgroup.org/HDF5/current/src/${P}.tar.gz"
-
-LICENSE="NCSA-HDF"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~sparc"
-# need to update szip to get alpha, ia64, etc back in here,
-IUSE="cxx debug fortran mpi ssl szip threads tools zlib "
-
-DEPEND="mpi? ( >=sys-cluster/mpich2-1.0.6
-		net-fs/nfs-utils )
-	ssl? ( dev-libs/openssl )
-	szip? ( sci-libs/szip )
-	zlib? ( sys-libs/zlib )
-	sys-apps/coreutils
-	sys-process/time"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-pkg_setup() {
-	if has test ${FEATURES} && use mpi ; then
-	    elog ""
-	    elog "Parallel tests will launch 3 mpd processes on this box,"
-	    elog "so it may take some time on a slow machine (only a few"
-	    elog "minutes on a reasonably fast machine).  Hit Ctl-C now"
-	    elog "and emerge with FEATURES=-test if you'd rather not..."
-	    elog ""
-	    epause 9
-	fi
-
-	# The above gcc dep is a hack to insure at least one Fortran 90
-	# compiler is installed if the user enables fortran support.  Feel
-	# free to improve it...
-	if use fortran ; then
-	    fortran_pkg_setup
-	    case "${FORTRANC}" in
-		gfortran|ifc|ifort|f95|pgf90)
-		    export F9X="${FORTRANC}"
-		    ;;
-		g77|f77|f2c)
-		    export F9X=""
-		    ;;
-	    esac
-	fi
-
-	# if anyone knows of a better way to do this...
-	if use mpi && ! built_with_use sys-cluster/mpich2 pvfs2 ; then
-	    ewarn "Your MPI library needs parallel IO support for HDF5. You"
-	    ewarn "must re-emerge mpich2 with USE=pvfs2."
-	    die "requires parallel IO support"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-gcc4.3.3-fix.patch
-	epatch "${FILESDIR}"/${PN}-1.6.6-gcc4.3.patch
-	if use mpi; then
-	    # this is required for mpich2, and should be safe otherwise
-	    epatch "${FILESDIR}/${PN}-mpich2.patch"
-	fi
-
-	# fix test script stuff
-	ht_fix_file "${S}"/bin/release "${S}"/tools/h5dump/testh5dump.sh.in
-	sed -i -e "s:+4l:+4:g" tools/h5dump/testh5dump.sh.in || die "oops"
-
-	# fix sort key
-	sed -i -e "s:sort +2:sort -k 2:g" bin/ltmain.sh || die "sed failed"
-
-	# change the SHLIB default for C
-	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in || die "sed h5cc failed"
-}
-
-src_compile() {
-	local myconf
-
-	# a better way to do this would also be nice, but i can't think of one
-	if use cxx && ! use mpi ; then
-	    myconf="${myconf} --enable-cxx"
-	elif use cxx && use mpi ; then
-	    ewarn "C++ support is not compatible with the mpi interface."
-	    die "Please disable either cxx or mpi."
-	else
-	    myconf="${myconf} --disable-cxx"
-	fi
-
-	if use fortran && use mpi ; then
-	    ewarn "Parallel HDF5 requires Fortran 90 support in your mpi library..."
-	    myconf="${myconf} --enable-fortran --enable-parallel"
-	fi
-
-	use threads && myconf="${myconf} --with-pthread --enable-threadsafe"
-
-	if use debug ; then
-	    myconf="${myconf} --enable-debug=all"
-	else
-	    myconf="${myconf} --enable-production"
-	fi
-
-	# 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
-
-	if use mpi ; then
-	    EBUILD_CC="${CC}"
-	    # set NPROCS explicitly if needed
-	    export NPROCS=${NPROCS:=2}
-	    export CC="$(type -p mpicc)"
-	    if [[ ${FORTRANC} == gfortran ]] ; then
-		export F9X="$(type -p mpif90)"
-	    fi
-	    if built_with_use sys-cluster/mpich2 pvfs2 ; then
-		export LIBS="${LIBS} $(sh pvfs2-config --libs) -lmpich"
-	    else
-		export LIBS="${LIBS} -lmpich"
-	    fi
-	    append-ldflags "${LIBS}"
-	fi
-
-	econf --prefix=/usr \
-		$(use_enable zlib) \
-		$(use_enable fortran) \
-		$(use_enable mpi parallel) \
-		$(use_with ssl) \
-		--enable-linux-lfs  \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--libdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--enable-shared --with-pic \
-		${myconf} || die "configure failed"
-
-	# restore the ARCH environment variable
-	ARCH="${EBUILD_ARCH}"
-
-	# emake has occasional segfaults
-	make || die "make failed"
-	use mpi && CC="${EBUILD_CC}"
-}
-
-src_test() {
-	# all tests pass; a few are skipped, and MPI skips parts if it sees
-	# only one process on the build host.
-	export HDF5_Make_Ignore=yes
-	if use mpi ; then
-	    EBUILD_CC="${CC}"
-	    export HDF5_PARAPREFIX="${S}/testpar"
-	    export CC="$(type -p mpicc)"
-	    export MPI_UNIVERSE="localhost 4"
-	    export NPROCS=3
-	    install -g portage -o portage -m 0600 "${FILESDIR}"/mpd.conf "${HOME}"/.mpd.conf
-	    mpd --daemon --listenport=4268
-	    mpd --daemon -h localhost -p 4268 -n
-	    mpd --daemon -h localhost -p 4268 -n
-	    elog "NPROCS = ${NPROCS}"
-	    elog "mpdtrace output:"
-	    mpdtrace
-	fi
-	make check || die "make test failed"
-	use mpi && mpdallexit
-	use mpi && CC="${EBUILD_CC}"
-	export HDF5_Make_Ignore=no
-}
-
-src_install() {
-	# emake install and einstall cause sandbox violations here
-	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"
-
-	if use tools ; then
-	    dolib.a "${S}"/tools/lib/.libs/libh5tools.a \
-		"${S}"/test/.libs/libh5test.a || die "dolib.a failed"
-	    insinto /usr/$(get_libdir)
-	    doins "${S}"/tools/lib/libh5tools.la \
-		"${S}"/test/libh5test.la || die "doins failed"
-	    dolib.so "${S}"/test/.libs/libh5test.so.0.0.0 \
-			"${S}"/test/.libs/libh5test.so.0 \
-			"${S}"/test/.libs/libh5test.so \
-		|| die "dolib.so failed"
-
-	    exeinto /usr/bin
-	    newexe "${S}"/bin/iostats iostats.pl || die "newexe failed"
-
-	    exeinto /usr/share/"${PN}/test-tools"
-	    cd "${S}"/test
-	    doexe big bittests fillval lheap file_handle istore set_extent \
-		srb_append cache flush1 srb_read cmpd_dset flush2 srb_write \
-		dangle gass_append links stab dsets dtypes enum extend external \
-		gass_read mount gass_write getname gheap hyperslab mtime ntypes \
-		ohdr reserved testhdf5 ttsafe unlink
-	    cd "${S}"
-	    use mpi && doexe testpar/testphdf5 testpar/t_mpi
-	fi
-
-	dodoc README.txt
-	dohtml -r doc/html/*
-
-	if use mpi ; then
-	    mv "${D}"usr/bin/h5pcc "${D}"usr/bin/h5cc \
-			|| die "failed to move h5pcc"
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "Use the fortran flag for gfortran or ifc, and add the f90"
-	elog "flag to override the fortran flag if you have a different"
-	elog "f90 compiler installed (gfortran requires gcc 4.x). Note that"
-	elog "gfortran only works as mpif90 and is not detected properly by"
-	elog "configure without the mpi wrapper."
-	echo
-	elog "There should not be any more test errors in the mpi tests,"
-	elog "and all C++, Fortran, and other tests pass successfully."
-	elog "Suggested USE flags for fortran and mpi support using"
-	elog "gfortran:  USE=\"fortran mpi -cxx\""
-	echo
-	ewarn "Note 1: Needs more SMP and cluster testing, as well as"
-	ewarn "more testing on a virtual (parallel) filesystem."
-	echo
-	ewarn "Note 2: currently testing pvfs2 support (with mpi).  Please"
-	ewarn "report any problems in the usual way."
-	elog
-	ewarn "Note 3: you'll need rawio support enabled in your kernel or"
-	ewarn "certain asynchronous IO operations may fail.  Either enable"
-	ewarn "the RAW driver (under Character Devices) or patch your kernel"
-	ewarn "with the new PAIO drivers and use libposix-aio.  See both:"
-	ewarn "http://sourceforge.net/projects/paiol  and"
-	ewarn "http://www.bullopensource.org/posix  for more info."
-	elog
-}
diff --git a/sci-libs/hdf5/hdf5-1.8.4_p1.ebuild b/sci-libs/hdf5/hdf5-1.8.4_p1.ebuild
deleted file mode 100644
index ee936ec1b56d..000000000000
--- a/sci-libs/hdf5/hdf5-1.8.4_p1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4_p1.ebuild,v 1.1 2010/05/04 18:38:13 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-MYP=${PN}-${PV/_p/-patch}
-
-DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/current/src/${MYP}.tar.gz"
-
-LICENSE="NCSA-HDF"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="cxx examples fortran mpi szip threads zlib"
-
-RDEPEND="mpi? ( virtual/mpi[romio] )
-	szip? ( >=sci-libs/szip-2.1 )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	sys-process/time"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
-	if use mpi; then
-		if has_version 'sci-libs/hdf5[-mpi]'; then
-			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
-			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
-		fi
-		if use cxx; then
-			ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
-			ewarn "Will disable cxx interface"
-		fi
-		export CC=mpicc
-		if use fortran; then
-			export FC=mpif90
-		fi
-	elif has_version 'sci-libs/hdf5[mpi]'; then
-		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
-		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
-	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}"/${PN}-1.8.4-gnutools.patch
-	epatch "${FILESDIR}"/${PN}-1.8.4-scaleoffset.patch
-	epatch "${FILESDIR}"/${PN}-1.8.4-sigbus.patch
-
-	# respect gentoo examples directory
-	sed -i \
-		-e 's:$(docdir)/hdf5:$(DESTDIR)/$(docdir):' \
-		$(find . -name Makefile.am) || die
-	sed -i \
-		-e '/docdir/d' \
-		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 \
-		|| die "sed h5cc.in failed"
-}
-
-src_configure() {
-	# threadsafe incompatible with many options
-	local myconf="--disable-threadsafe"
-	use threads && ! use fortran && ! use cxx && ! use mpi \
-		&& myconf="--enable-threadsafe"
-
-	if use mpi; then
-		myconf="${myconf} --disable-cxx"
-	else
-	# workaround for bug 285148
-		if use cxx; then
-			myconf="${myconf} $(use_enable cxx) CXX=$(tc-getCXX)"
-		fi
-		if use fortran; then
-			myconf="${myconf} FC=$(tc-getFC)"
-		fi
-	fi
-
-	econf \
-		--disable-sharedlib-rpath \
-		--enable-production \
-		--enable-strict-format-checks \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-deprecated-symbols \
-		--enable-shared \
-		$(use_enable fortran) \
-		$(use_enable mpi parallel) \
-		$(use_with szip szlib) \
-		$(use_with threads pthread) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt
-	if use examples; then
-		emake DESTDIR="${D}" install-examples \
-			|| die "emake install examples failed"
-	fi
-}