Add static-libs switch, punt overshadowed version.

(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)

3 files changed, 10 insertions, 113 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index bc91d18f5c70..e5d9dcc8c8c8 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.74 2011/07/13 15:49:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.75 2011/10/23 11:40:12 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> -hdf5-1.8.6.ebuild,
+  hdf5-1.8.7.ebuild:
+  Add static-libs switch, punt overshadowed version.
 
   13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> hdf5-1.8.7.ebuild:
   Add ~amd64-linux ~x86-linux
diff --git a/sci-libs/hdf5/hdf5-1.8.6.ebuild b/sci-libs/hdf5/hdf5-1.8.6.ebuild
deleted file mode 100644
index 98512250e4a3..000000000000
--- a/sci-libs/hdf5/hdf5-1.8.6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.6.ebuild,v 1.7 2011/07/06 15:00:48 xarthisius Exp $
-
-EAPI=3
-
-inherit autotools eutils fortran-2
-
-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/${P}.tar.bz2"
-
-LICENSE="NCSA-HDF"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cxx debug examples fortran mpi szip threads zlib"
-
-RDEPEND="
-	fortran? ( virtual/fortran )
-	mpi? ( virtual/mpi[romio] )
-	szip? ( >=sci-libs/szip-2.1 )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool:2
-	sys-process/time"
-
-pkg_setup() {
-	use fortran && fortran-2_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 \
-		"${FILESDIR}"/${PN}-1.8.5-implicits.patch \
-		"${FILESDIR}"/${PN}-1.8.5-noreturn.patch \
-		"${FILESDIR}"/${PN}-1.8.4-scaleoffset.patch \
-
-	# respect gentoo examples directory
-	sed \
-		-e "s:hdf5_examples:doc/${PF}/examples:g" \
-		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
-	sed \
-		-e '/docdir/d' \
-		-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 \
-		|| die "sed h5cc.in failed"
-}
-
-src_configure() {
-	# threadsafe incompatible with many options
-	local myconf="--disable-threadsafe"
-	use debug && myconf="${myconf} --enable-codestack"
-	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 \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-deprecated-symbols \
-		--enable-shared \
-		$(use_enable debug debug all) \
-		$(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
-}
diff --git a/sci-libs/hdf5/hdf5-1.8.7.ebuild b/sci-libs/hdf5/hdf5-1.8.7.ebuild
index 7e16468da0bd..f0d98fc15512 100644
--- a/sci-libs/hdf5/hdf5-1.8.7.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.7.ebuild,v 1.9 2011/07/13 15:49:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.7.ebuild,v 1.10 2011/10/23 11:40:12 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF5/current/src/${P}.tar.bz2"
 LICENSE="NCSA-HDF"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran mpi szip threads zlib"
+IUSE="cxx debug examples fortran mpi static-libs szip threads zlib"
 
 RDEPEND="
 	fortran? ( virtual/fortran )
@@ -90,6 +90,7 @@ src_configure() {
 		--enable-deprecated-symbols \
 		--enable-shared \
 		--disable-silent-rules \
+		$(use_enable static-libs static) \
 		$(use_enable debug debug all) \
 		$(use_enable fortran) \
 		$(use_enable mpi parallel) \
@@ -101,6 +102,8 @@ src_configure() {
 
 src_install() {
 	default
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
 	if use examples; then
 		emake DESTDIR="${D}" install-examples
 	fi