Install examples only if proper use flag is set. Fixes #409091 by Nikoli <nikoli@lavabit.com>. Drop old

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 31 insertions, 136 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 78a71ac4d51f..6f6abefbed25 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,13 @@
 # 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.79 2011/12/05 16:56:26 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.80 2012/05/14 15:23:24 xarthisius Exp $
+
+*hdf5-1.8.8-r1 (14 May 2012)
+
+  14 May 2012; Kacper Kowalik <xarthisius@gentoo.org> +hdf5-1.8.8-r1.ebuild,
+  -hdf5-1.8.7.ebuild, -hdf5-1.8.8.ebuild:
+  Install examples only if proper use flag is set. Fixes #409091 by Nikoli
+  <nikoli@lavabit.com>. Drop old
 
   05 Dec 2011; Kacper Kowalik <xarthisius@gentoo.org> hdf5-1.8.8.ebuild:
   Fix REQUIRED_USE being defined twice. Thanks to Arfrever
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 0632896f70c0..5621f64f0e57 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -14,27 +14,25 @@ AUX hdf5-1.8.8-buildsystem.patch 1410 RMD160 a88c63145bf088b018d4dcf327415938d46
 AUX hdf5-1.8.8-implicits.patch 2005 RMD160 3eb7faffe476dec3f3cf49be0d285fef3c43fd2f SHA1 842fa0e605ba6ba5fa6c3134902c192c64584b13 SHA256 1fec9a12f20f28484a9047e39b4bb56694af394d9e591abf442046aed96d4b5c
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
 DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
-DIST hdf5-1.8.7.tar.bz2 5710170 RMD160 34641bf8e664c3b3382d1346a65e2f5c3eb485ee SHA1 be1daff26f066aca0b5be52d86dada6757fc4b95 SHA256 771761c9bec30b9a4137fa59ef88fdafdb0f4f35d1db0fd655f2591d19570fec
 DIST hdf5-1.8.8.tar.bz2 5827394 RMD160 077580c9828747473836cc39f8cb3fd4e5e045d9 SHA1 1bc16883ecd631840b70857bea637a06eb0155da SHA256 b0ebb0b5478c6c0427631d4ad08f96e39f1b09fde615aa98d2a1b8fb7f6dced3
 EBUILD hdf5-1.8.4-r1.ebuild 3134 RMD160 6dfc52e18b8d0005560f6c543b9641daeb20a11e SHA1 9f01a942144e3a1cdf8d9eea9b3e3620cd180892 SHA256 89aa8ed18e2d68e4c55d8f24c0db221f6e3f13d056f4f14eb29016dffddcdda7
-EBUILD hdf5-1.8.7.ebuild 3150 RMD160 dd97bcfbd37b1a8ccc58b68f132924524ef48ad7 SHA1 8be1115834e11ebead352ca696b95739709ff5d5 SHA256 64352ffb1767130ba79d14c6a4ba89b5a37065c7f9e09a2c282e4dc0298c1314
-EBUILD hdf5-1.8.8.ebuild 2810 RMD160 e0a72b5485e2e3ede42b5b797d1f5b2caa2b15db SHA1 2eba0879868ba899cf3af79b41ab053d8e2131b4 SHA256 6f410a83d9dc78657cc7c8ac030208b2414cd992abdc8d717ca4b286dcbdb5e6
-MISC ChangeLog 15907 RMD160 494de849133ba7d17b09d21bd7d7c0511dc3e0a5 SHA1 8fce6fe472f55270d53f38872199cda328abbfd6 SHA256 72512b2be8dd8aba6bd666f13d3c4eac0ff8a3fb799513b16bcd9bf1c8726ee3
+EBUILD hdf5-1.8.8-r1.ebuild 2853 RMD160 0aba75ac285153e91413d9b249788a9273f40e2c SHA1 3937f2236b24e3b7cad92fc80cf2e213e0b9b58f SHA256 69afc2ca646c2e2f7f0ac7d30f000ebc92ef5ee0a971c6715c0499a3364af8fb
+MISC ChangeLog 16165 RMD160 5ce693c294ff8e5d82e34a0724839efc578c4a71 SHA1 f93906521cdbbd141c9722a0fa5bef19d776a494 SHA256 d6237d34952bf3fdaf1646b389eb0523c6bfab33a62c3986daf89811509e47c0
 MISC metadata.xml 728 RMD160 3863f8962e54ddbd28c78256e03feedc571148a7 SHA1 f4ac101d9b30cca655a89a87185364dd4a24816b SHA256 1a503997c6e2248b43a36eccd2c09337a0e02b498926b4430b9d8df059e638ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO3PfGAAoJEF0huFKJUZL5VKQP/jDUN1JOzjGXr6CUvGiKvgl3
-HlG+4b7obThwnY/LD3gFcUCAM6/OcFMj+xKDpk5o1MMeZwf0zwdHlnDrMlu0nkbs
-7TMwulgtL6qww8O9eqAhovZTdLDe2WiE4E175W6r/0zUkPPIkTuIVQstm5jiihmP
-dwpPZfWVInw0UmmAas5IakxtaF+tYGsDcXuDavgMJVfbTuurDSwy4AZtRZyWWajE
-sY2FlM4VsrcvPdb+h1Wxf7rBxb4BaN5QnN53Xh6b2uMB3jhZrtWOzddNaz2sgK6z
-hWWH7W25xZSgSGKxmRnU5FO1keafU/jhj9CZJbMTwWaMuhh2TA3mzV+AVx2/RQgE
-Fkd9RBmtiN673xBJF3Ss4GyajsgCGDufpUQsdwlUHcEVa2NP4/eM+rCBBGjmqWfV
-/Pi/M3yOodV8X3zgq0nA1XhwwGw+LtlFM2vO5MjbhXO001251RgieXrphXjJih0G
-QKxfn0c4/Tqa0s6R6g1ad/W2R7h/O63QJoSuz/dUTJpLuCi2VAWv0DjdkugYjRey
-ho4Au2TUUbKbuojZ/TbX2ElTdRNd5N3yHK8z5shsSPKZeuM0dx1RSyFHkxigHZ7G
-QKEdL03npjapZsy3/uiFIQ1GtsqyEDLHYhQyh2HBbzsXSgmIGRGODx2KzH8i8cCm
-joBoX2NGqCOGQI3Bu3uu
-=9LQY
+iQIcBAEBCAAGBQJPsSN2AAoJEF0huFKJUZL50QQQAIul48iGD7g5SkhNy3kXsSWj
+Cl0XI2Lp6HY98714t6VYfl1668fwjlfZiSrUJ5ssSZ69s87BHPUGRM7VFsICHQ/K
+QRyRh38ppUnKTAjEczKBEB2gfzNU78SESgqdncRH00tbyLG1x3QSIMeVzaX0v1qj
+9y9mQbWVnlE7mkUIpnQx02ryoxaV2SoQZ4e1HhEzC1PcU6JhrolOawEHEm/n3aof
+PJ9W3f71WfzuhG2w7F7diHK+lVZN6rkox3uoXpnXCf3P4/Ln8sl1GAbjlXH6Y05D
+QnLqprUN1Co1bm4DEJUs//ab5O6T9aqR10L3Rj8aqHTKBoKBQuROsWB0yHgDCWU4
+756mgxLvZtkvBJQzogtZW9xVFjMsJRlYLHFszrPyPhy1LHw5MGLsOhKOBWVVac+Z
+G3MvOOvDUsWw5AOgYcdubhztm6w/G4ybKEIIpq/aXxkA1PCX6zkXhAe3SHUJ3V6D
+gYdByVlXMwMTqCoE+oIccbG1VzE9CtWfto8SiFs9yXPEt3xNUUywfvfKB1L0b1hA
+V7chUMBs+u5oEdxMDa/Jroh6cOpx4MhQS3c4rJbKklWRs/mC0W4nmqfuLAH4/D7M
+I1mOScVaQSGNW3qsRnwLj5roxHF2prRfaFITghk7TPZHrd24iA7gQ3MPNLSugJbg
+kmJioqjkg1+vVmoppGHx
+=2ayU
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/hdf5-1.8.7.ebuild b/sci-libs/hdf5/hdf5-1.8.7.ebuild
deleted file mode 100644
index f0d98fc15512..000000000000
--- a/sci-libs/hdf5/hdf5-1.8.7.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.7.ebuild,v 1.10 2011/10/23 11:40:12 scarabeus Exp $
-
-EAPI=4
-
-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 ~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran mpi static-libs 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
-		use fortran && export FC=mpif90
-	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="${EPREFIX}"/usr/share/doc/${PF} \
-		--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) \
-		$(use_with szip szlib) \
-		$(use_with threads pthread) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use examples; then
-		emake DESTDIR="${D}" install-examples
-	fi
-}
diff --git a/sci-libs/hdf5/hdf5-1.8.8.ebuild b/sci-libs/hdf5/hdf5-1.8.8-r1.ebuild
index 3efa0a3b3930..7385cf13862a 100644
--- a/sci-libs/hdf5/hdf5-1.8.8.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.8.ebuild,v 1.4 2011/12/05 16:56:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.8-r1.ebuild,v 1.1 2012/05/14 15:23:24 xarthisius Exp $
 
 EAPI=4
 
@@ -57,6 +57,10 @@ src_prepare() {
 	sed \
 		-e '/docdir/d' \
 		-i config/commence.am || die
+	if ! use examples; then
+		sed -e '/^install:/ s/install-examples//' \
+			-i Makefile.am || die #409091
+	fi
 	eautoreconf
 	# enable shared libs by default for h5cc config utility
 	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in	|| die
@@ -87,8 +91,4 @@ 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
 }