summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2014-11-25 15:26:26 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2014-11-25 15:26:26 +0000
commit9c187ed409413ffb18671dcb97fab62292d5868e (patch)
treeef0eed0c0403f36450cfe3e67b4903f63c9d373c /sci-libs/hdf5
parentSupport python 3.4 (diff)
downloadhistorical-9c187ed409413ffb18671dcb97fab62292d5868e.tar.gz
historical-9c187ed409413ffb18671dcb97fab62292d5868e.tar.bz2
historical-9c187ed409413ffb18671dcb97fab62292d5868e.zip
Version bump, drop old
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x5D21B852895192F9
Diffstat (limited to 'sci-libs/hdf5')
-rw-r--r--sci-libs/hdf5/ChangeLog9
-rw-r--r--sci-libs/hdf5/Manifest28
-rw-r--r--sci-libs/hdf5/files/hdf5-1.8.14-implicits.patch (renamed from sci-libs/hdf5/files/hdf5-1.8.11-implicits.patch)50
-rw-r--r--sci-libs/hdf5/hdf5-1.8.11.ebuild108
-rw-r--r--sci-libs/hdf5/hdf5-1.8.14.ebuild (renamed from sci-libs/hdf5/hdf5-1.8.12.ebuild)73
5 files changed, 91 insertions, 177 deletions
diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index f13d1019c107..f1f83e4b6171 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-libs/hdf5
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.118 2014/06/04 16:05:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.119 2014/11/25 15:26:17 xarthisius Exp $
+
+*hdf5-1.8.14 (25 Nov 2014)
+
+ 25 Nov 2014; Kacper Kowalik <xarthisius@gentoo.org>
+ +files/hdf5-1.8.14-implicits.patch, +hdf5-1.8.14.ebuild,
+ -files/hdf5-1.8.11-implicits.patch, -hdf5-1.8.11.ebuild, -hdf5-1.8.12.ebuild:
+ Version bump, drop old
*hdf5-1.8.13 (04 Jun 2014)
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 775461c1facf..445aef3adaa0 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -5,9 +5,9 @@ AUX hdf5-1.8.10-buildsystem.patch 1489 SHA256 7fb52e8187009180ea0d5d45c7a48e7680
AUX hdf5-1.8.10-comments.patch 1584 SHA256 d8a7e54546d4571b1a494d3426ac56b0e32cd1e4be0df2be2d069f83cde30b16 SHA512 6b0b360f7d841bde3da8676fd630ab5f7e4ef0864f5ddeec5c2a6f94f182f59a965cf11086288245c46839e3cdd15d7301fdc6cfc9dd41c4f091e7bc938a4522 WHIRLPOOL 54aa4d9d65784b7c274533b082f42d75b70f2fc50909884da82738bceb6dbef6ab0345cae369fcf7de11c7665bb056679e934ee3ebea2af1733b4072fc42a54f
AUX hdf5-1.8.10-implicits.patch 1424 SHA256 7c733026322ac3fbc86af9983c81b87ba87fc6ac1149c3befb30141e83a79325 SHA512 f48c2ba476496ed137e03b49afe4c12c29a85dd8144558ad21bbef2845eb80574f59def56d4df8d339e884cb8d8662bcf800e9ace2f0b1ab50a811c4bbdd54fc WHIRLPOOL 458b385b8b6a4acd9a581e6e26ee5e582b9c8685464e9240cda75dce7f2a0be69f9011ac54df773546b18d501e092133eb7ef106f8bf1d59fd95a036c5cf026c
AUX hdf5-1.8.10_p1-comments.patch 1014 SHA256 dd0dc78b4b431868040cb86c16b2a75e9794f9f1152c87d46ead6850649ce49c SHA512 09bd427fb73c5485362ae036b35bb68b6ecd5439d88c131bc2ccc9af86142c87f085a18a4b0f40f0fafaba2e06d677fcfa25519ef219d75c93ded2faa5a91bdf WHIRLPOOL 6a12fcda0d84420a456457a20ca9d3c0c3bb088d56ff5e2d63beace56296348ef5a1075ad19a532d955a0b469a39e50a91897215871f43c89ca83065d46919a7
-AUX hdf5-1.8.11-implicits.patch 1238 SHA256 2139c1f88573a59391de1d49f56455a0012311b34620d63eb5c946467bae7a29 SHA512 27fb12b32f53585732fcc8ce174189ab40e8e631553b657d7953fea59856aa7cdceac74746f001b02e22a87a393ded73e54e3ed6f9aadff2cf4a17042200339a WHIRLPOOL f52e42db4c492fcbf41786abb986010f1be435c68535dce2af6cb895c649e5cffb3cf72d43cfc25922afe3b5f95b154232e3b2eda64d1fd63b18136320cf0cd4
AUX hdf5-1.8.13-implicits.patch 1034 SHA256 0b53f6295b0b4cd627ac302fdd9a06425abb0f0e2f7d66cba94fcb6058deec78 SHA512 b6b715e330dd08b357cd21ab1848dfd78b0e4e7f2284aa689aaad0b4dc8d7c6b71a07b28b62acc2c2334ba2f000fd6dccfb33c90fdcb654563a0a34b7e1a87a6 WHIRLPOOL 1d93a8766e65940c1a5a138fc62d1a0f94854f324df9995e4bd1990a732c7a306252d8eeb7a39393e9d0518372660060dc1599552620cd68373fc73a6cf71291
AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 SHA256 cec0d9c73a0f4611c3453190a2c01ad7dce4c62feea6e0a7cd79a93c84f43e62 SHA512 e43021ceb83909ab06ba378363c192aa0f1b34cc7c2b121f5000e215516dbdea1b825a53ac4023073bf4870a5c3452c22f5535391d95af45ad63a309e1ffa5a4 WHIRLPOOL d0e75d8a05e13385aedd075cf96380a10dfeffaace5d5a8ba4926a5f7ed583bf36e17583dba6110a1ddbcf2652bed15b902a57ec157fb30412a2fd3b87a303a3
+AUX hdf5-1.8.14-implicits.patch 1404 SHA256 0a79465488a99b1dd2d98ee5755b7fee2cddcb490a569f1fb57ef84e9f18f350 SHA512 f54e99560b3a845ed171765350f11d8bc22efbf6a040e4eb2fd893b51654cc270c6f1e645fe3c6afeacdb9ad40bf9e5cf53f34ca709977ddcb2b406d2b2510b5 WHIRLPOOL 2ac312b180a00e6ae1779926dc5ba8b71240769e1228477a3e0491052d8aadb490199669e6964b612ed14fec2492b539f47604f87478db107dd0460040b05ef9
AUX hdf5-1.8.8-array_bounds.patch 624 SHA256 849df1a9fed1d6225b0032507294fbd4eec13f7514e1175907f2c9c00aafb48c SHA512 611816451d8afb284e06082c15527aa71fbf67fd1c48c64257df751e4005ff038485f2a604289f92af106d44abda7537070fc7721e6a555724645b07058dfbde WHIRLPOOL b88a7e82e5e8b99ea76a823514b395a1bb432a019b1ccd7a052c350bb11c22ed8a6bbffab38e152de5d95cb7d2572e3e6fd195fb4ce049b66a7d0e38fef87684
AUX hdf5-1.8.8-buildsystem.patch 1410 SHA256 a97a7a82197eb4f3c9d43836f24c2c2ae14962970a0b680e5305a977b8c611a5 SHA512 610264a578d292daef20e0b796ccdb899823ca9284321b67aede261717e2bb094116f7775ce9b7ed5d176c61ff187e1cad0ff3c1800c33662c411171b87c4391 WHIRLPOOL a7b58c1a2f08dc9291a7dc84a376135bf307749f27f323a627c6072f89ec44f6cab25a2219106b98b622ac7bcd5949c8915f345ad135d8117f15a28e63d37ae5
AUX hdf5-1.8.8-implicits.patch 2005 SHA256 1fec9a12f20f28484a9047e39b4bb56694af394d9e591abf442046aed96d4b5c SHA512 eeae0ff2e9a2561b4494ac2d3853e13f9b07813f73688cf526bb57bdcda6e186a165a1be3d122c2bf60690aac4e07219c849ccda28dbddc0bd739986c5eb89a5 WHIRLPOOL d554083409fcb562bbfcf6a9c1f5a0ab8e80eeacb5db47f390dd6ae92f10e382fb67addf00a9deed7a75db4e5dbb54beb555c39048e4589f91bb5818ca332aec
@@ -16,19 +16,27 @@ AUX hdf5-1.8.9-mpicxx.patch 494 SHA256 b8412a94dcc88b520f28ea119694dd3037ab6bd2c
AUX hdf5-1.8.9-static_libgfortran.patch 429 SHA256 7802a4535f456c951fb4162850edd53f667ac29fc4838fce960a18f23d2dfc0d SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9 WHIRLPOOL 08e6f90b86ee3020eab9c3e02caf315ff77b57365f96175c1aea6c52b254dd59d2e7bf647a6458ef51147fdb3a20622bd31bdbc82e69b0bbb689178edb6768f4
AUX mpd.conf 48 SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4 SHA512 82eafba82e93066ee2faea52b08f59c2231a5bb1a5e64551d399dceb7e48cdb5edda51c264a2e2b6016826613dff50aa2b7d4e946eb0732e2a260332b87f2ec7 WHIRLPOOL 3fc71bb16abbc090549af95912e0945e15abf3c303d6e89bad77d6064acf30fb26067fe95f26f707cd13274f30a8ab090f9b1bf1fc26dd018e652c280dbecb54
DIST hdf5-1.8.10.tar.bz2 6024645 SHA256 fa6e6b37b7976edac860732b87c50370e3beba3ae784d05f16f298c033a45a44 SHA512 de9269eb21142bc92214f05293a5fb7f77eb74e4a9293f4fb26e346842ebfff340b1a13cd631082548b6fabfe9a0b670bad28e35b58675d4db55061e91a59955 WHIRLPOOL baf65f79da563de94403d34141d7e7e28cd121b693772948ed91ca5ba71c57ac7b0b292e09e0189a90dc9af3bd7a717437496752a3f9c3daa82f327f226d5023
-DIST hdf5-1.8.11.tar.bz2 5928553 SHA256 5ea1ba82fc77350ee628b795ae6ede05feeaf1c6b437911a9478de456600cafb SHA512 a29484d1b046be7cb6f050417f097859aba605c0ebab09ea568458a316d36c294576f2b115a098a330c544ff3e08e31d36cd9ca7d048892b234d61ba36240747 WHIRLPOOL c624837e5648012be706d9e7930ad9feea225ab8e5df00609f9b30b07038958f73385f3aec9435f7fc6ae0b25988dd5da65b7a08bee598d9ea772951314693b4
-DIST hdf5-1.8.12.tar.bz2 5994923 SHA256 10a369a4fc207bb09245f57c758e587420e06dfc0e445e337a58b0848b75a949 SHA512 99c922372cc9f777839356934509057c716a083c682422101af1815849d9b2b87ac992bc89795c947715be9b696fa002ab38f34d18945a4756604a69ffbb480a WHIRLPOOL ac92b0e5e49a8667b145b78429aea6b3aa2b593d727fa039534d9d736269900b75f6d3c7492c04f21220628a929788dd6c90d0337715639df1fca8f43c4fbcbb
DIST hdf5-1.8.13.tar.bz2 9496378 SHA256 c2f5a412107aba6f99fd7a4a9db6ce5f5fc8171ec931472784e5839d26aa17ef SHA512 76dcd045c5dffe28478e9eb4ff5ff3f9d400b044c5af19d8b1040f8f0d1ecdce9c92d49f7df0450412214ff37023ea76ed031411a99dd4c2b848ebd3b332b853 WHIRLPOOL 5606cff29b21a7006467a9a19b246188aa088d042fdffcedd02782ef960b22049360c0239ec2cc932b8f1826c62c40289ff288dc33254dbbc1586c9b5212da19
+DIST hdf5-1.8.14.tar.bz2 9503743 SHA256 53722cb9f5977af2908f92fc1a3f8c597800a5cb448cfe5c75060d6335bb9bab SHA512 c4f0bb01df7bef9cd29c42ec2e27f4bd27c3e059cf18f1285c583e92b94ef799f8a29ec85c17bab12e47a69626851fbda4b8d74543266b01aa2cffc42cde4fea WHIRLPOOL 646d44d446e2bd2855567046ca00f302e02d39880a77f2d75fd6231ad74692c07910c8670ffa5e02f2922e4e28c5a4afd06f907ac5950615dd328c3e7346f578
EBUILD hdf5-1.8.10.ebuild 3672 SHA256 8e6c2335caa4dfa8c0481481d3b828b4dd5f831e3d4c8d0219ca69b840af631d SHA512 26620e19aaacc5b658ef641b42a4d2fe96c18d72d8787f8245f7945b1d362fdbc608da8808da3e9c274bd9d02b327b4458a8b60a53529d18d649ca83d92aac16 WHIRLPOOL 857eec4579bd1d1889eba7a04c979835edd31f09237efb4d402950234b9fda89483f3e0306d6868031e89b3acedf83a710b18061324494397f8575436a2bc443
-EBUILD hdf5-1.8.11.ebuild 3284 SHA256 a0c80826a4dc2d0b96ba1c0efdd5d35861cea6a4a7ad36ebc1ca1f5879750986 SHA512 810909fb8550746742af71763a7e5107eb5ce54a0937c7861b7af6549a831ce261c343f2efddacd39f399f78b6644e1492d3452b57069f2ab3574c578cce64c3 WHIRLPOOL 61a47d2a9a5fd708683357b125f12e0485b7c3bbc0646ba764800da2826bd2385937196810c97268256c809525998235deaed6e809f7bb65511107753534b3f6
-EBUILD hdf5-1.8.12.ebuild 3243 SHA256 aac69a48e59dba2b3ef52c0183c6d025806a8c764845c78228a7901864bfde65 SHA512 ab9daabfcfc8a19f89c2d34776d19efe8e1ad86f83f45ea9360b4d28757951658147906f2acc17f5ec2fdeab5d18f4922e79a27eb9470a44a6d9b7f6da3af549 WHIRLPOOL 015c82f5d0d378eeb3700ac07647ab1eeefa84e16a2a77cf942b10c40d5012c366f58212e58692756fcf957c5aa190da2a2b8558cdd0630dff96d8618841f82c
EBUILD hdf5-1.8.13.ebuild 3080 SHA256 719fd9f0af78d5f786a63c4104d69f3651662bd4c8f3f9e31fa56c0a4e3fe558 SHA512 e399704fa35acd6e896e53357c5241f7bb2bf140d8d4d468cbc5a7b7a370d54f9467f153cc743e5120a4a7625f7def1ed98751eeb7a42d0d22d664deb9d83f8e WHIRLPOOL 209ab603ca707c8aad7a7ba7fb1fd36c4cc87bb35589b89949278b9efa3cd66492eba12c76a8c4b98f12acfb760a7cb6afbf513b49006628983c6726b19fd1ed
-MISC ChangeLog 22090 SHA256 fb45e5dabae9b08c69c1cf375e44d49300f094f18b28165034c1692127a727e2 SHA512 7de90c6e22b7dceb6e917a03ce54fdd2c25bb07cb499888b1a5261a0d55f759aafd90bd90b971abad077a80a963dcf7f74b50d0118e9aba54be29dfd9f8608eb WHIRLPOOL 8aac3a6420838062f976343b68e4dd4fc3b8282e86ad394b72b58b9701684c40145254338a566f484ddb0caea2d67190dbee53a4181fde41ef441a4730688452
+EBUILD hdf5-1.8.14.ebuild 3082 SHA256 34b49e7f7e3548e3e5f5b7b572f1d1dd3cfb09cf22e1c7b556fed9ebdfea303f SHA512 8b4016913b273fa8e0f6cf9d2fbebd792b4a2be9756a6cc99da5782543339d575a8d8d5b27dfc58f6b66597a09faad5cf65c2c86c2187ab810035dcdc41c82fc WHIRLPOOL 1023f1394f5facecc082a23d5db391d466ae68867bd834eb02d1ea853380d739781c4968c2943cb239f94aac27fe95b58cdc49b94ff5f976ab56ad6689d7e707
+MISC ChangeLog 22339 SHA256 e91c455b98fea1495342601e348e265e336d1a5eef1213fcbd2e87420e821fe5 SHA512 8ae882deb9ea76714a04ca2bfdde03ea48d219165e5f77885f45f9a340b65555100435d0e2b8c9de75bd21df095544429d27ef3f7cb5d9175b98e08cdf087209 WHIRLPOOL d7ed3aa69dab27b1ace6c46a34017868880568d879ce523372c499c04dc2e5e14516ad5cbdd42e9ea7abd1656bbfd296a69080590dc65430866e8eb6164098b3
MISC metadata.xml 702 SHA256 86c9065ba540628d3d1fca13625ed7c92e6ff09634362c5daa76c56905ca1160 SHA512 033892c6ece179fc84c08b4fd36bd1e12fe24ce36f425a0d32d79df63f11987740171648571880c2963b4d614a853d63bf475361b906fe4f66af870dcaf7b612 WHIRLPOOL 906c13b521650a53730589a13743fe91309d4a07b4c927bb8bc49b1d7fe7c87a9c2995bb00eadbccda62d98ff93528cc438c7d883c2ff6791d8aafa7b2beb425
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iEYEAREIAAYFAlOPQ+gACgkQ1ycZbhPLE2CoGQCePKOYx2nw4Pldk9Dt3aDEpTHV
-CZ0AoKaYiXjsXQLrjwdOAGxdmMtvztBM
-=M9Tw
+iQIcBAEBCAAGBQJUdJ+dAAoJEF0huFKJUZL5zQgQAJkCCT4GjcyocYbvnVqLq3Hp
+DensRV4mTclkSpFC9n2Ome1G5CJgFWDkMPOneG231bGy+fezXo85pLLapmNUs3/Y
+wDw6SQUMjuU6Q0C9GnUezynK8XNSeIxUavYYt1hAgy74zRHwVmYAdGEQ2dsWzwuT
+7HgCDnh5fk6uieIHj8dhIrnrPPqOx5U13gQLMtjOp5m4Q+i44TsWoSfC1/wpBpCt
+2xiTnk2FUt9/biasW7BRubv/jWAUk17D3OmBz9c0RQcVJF5jgQp6BSB9iMbwvrgR
+FPtj2Q0TkA1p1/OtNqVUJSWNUgcPBiBQzy1D8E9Ojyl7meSKOinT13pK3ul9TRRv
+M9WbdwqBpe8qNM1WE1MwAv5WslCh9D0XW6f4F0pzoaUBosjhUj/UkRX98pafx+6J
+TysAtX+v/93Sgy8Nzs7NrYAdxcNO9Tj4oSLctL7136XdjokS9MREoj0ysgj8k/J0
+MHplYTShXjQBySQjiqvlkbRlL/faFKEAma68cUWC0JUT+6Y/qxLHIpRZQnhkTng1
+9UlFFjpOcCZFqQECCt1axCHcZBEbwtWU2g/LPqS4OFQJKYi9HOkOsvuOWOpDEs8L
+VZl0Y6cA3q0CpmPIVCt3xJlY+DpJONDqP3n3Wwq2IYzQeaN5ckDh/z0WWN/MjkHN
+jmnZr00JoNDGyTFaExF4
+=yt1W
-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/files/hdf5-1.8.11-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.14-implicits.patch
index 478557013596..4ee6e83d9f2f 100644
--- a/sci-libs/hdf5/files/hdf5-1.8.11-implicits.patch
+++ b/sci-libs/hdf5/files/hdf5-1.8.14-implicits.patch
@@ -1,13 +1,35 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1522,6 +1522,9 @@ case "$host_cpu-$host_vendor-$host_os" in
+ ## however, we do not do this since it breaks the big test on some
+ ## older platforms.
+ AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS"
++
++ ## _GNU_SOURCE is needed for vasprintf
++ AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS"
+ ;;
+ esac
+
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
-@@ -49,6 +49,7 @@
- #define YY_FLEX_MINOR_VERSION 5
-
- #include <stdio.h>
-+#include "H5public.h"
- #ifdef H5_HAVE_UNISTD_H
- #include <unistd.h>
- #endif
+@@ -40,6 +40,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#include <unistd.h>
+
+ /* end standard C headers. */
+
+--- a/hl/src/H5LTanalyze.l
++++ b/hl/src/H5LTanalyze.l
+@@ -16,6 +16,7 @@
+ %{
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <hdf5.h>
+ #include "H5LTparse.h"
+
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -702,5 +702,8 @@ void validate_mdc_config(hid_t file_id,
@@ -31,15 +53,3 @@
static void coll_write_test(int chunk_factor);
---- a/configure.ac
-+++ b/configure.ac
-@@ -1504,6 +1504,9 @@ case "$host_cpu-$host_vendor-$host_os" in
- ## however, we do not do this since it breaks the big test on some
- ## older platforms.
- AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS"
-+
-+ ## _GNU_SOURCE is needed for vasprintf
-+ AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS"
- ;;
- esac
-
diff --git a/sci-libs/hdf5/hdf5-1.8.11.ebuild b/sci-libs/hdf5/hdf5-1.8.11.ebuild
deleted file mode 100644
index 306c29db4aae..000000000000
--- a/sci-libs/hdf5/hdf5-1.8.11.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.11.ebuild,v 1.1 2013/09/18 10:11:32 xarthisius Exp $
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-MY_P=${PN}-${PV/_p/-patch}
-
-inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib
-
-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/releases/${MY_P}/src/${MY_P}.tar.bz2"
-
-LICENSE="NCSA-HDF"
-SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib"
-
-REQUIRED_USE="
- cxx? ( !mpi ) mpi? ( !cxx )
- threads? ( !cxx !mpi !fortran )
- fortran2003? ( fortran )"
-
-RDEPEND="
- mpi? ( virtual/mpi[romio] )
- szip? ( >=sci-libs/szip-2.1 )
- zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool:2
- >=sys-devel/autoconf-2.69"
-
-pkg_setup() {
- tc-export CXX CC AR # workaround for bug 285148
- if use fortran; then
- use fortran2003 && FORTRAN_STANDARD=2003
- fortran-2_pkg_setup
- fi
- 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
- 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
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.8.10-buildsystem.patch \
- "${FILESDIR}"/${PN}-1.8.8-array_bounds.patch \
- "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch \
- "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch \
- "${FILESDIR}"/${P}-implicits.patch \
- "${FILESDIR}"/${PN}-1.8.10_p1-comments.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
- 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
- # bug #419677
- use prefix && \
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \
- -Wl,-rpath,"${EPREFIX}"/$(get_libdir)
-}
-
-src_configure() {
- econf \
- --enable-production \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --enable-deprecated-symbols \
- --enable-shared \
- --disable-silent-rules \
- $(use_enable prefix sharedlib-rpath) \
- $(use_enable static-libs static) \
- $(use_enable debug debug all) \
- $(use_enable debug codestack) \
- $(use_enable cxx) \
- $(use_enable fortran) \
- $(use_enable fortran2003) \
- $(use_enable mpi parallel) \
- $(use_enable threads threadsafe) \
- $(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 {} +
-}
diff --git a/sci-libs/hdf5/hdf5-1.8.12.ebuild b/sci-libs/hdf5/hdf5-1.8.14.ebuild
index 8e3ae62b60b0..4a1816122120 100644
--- a/sci-libs/hdf5/hdf5-1.8.12.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.14.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.12.ebuild,v 1.1 2013/11/15 15:49:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.14.ebuild,v 1.1 2014/11/25 15:26:17 xarthisius Exp $
EAPI=5
FORTRAN_NEEDED=fortran
-MY_P=${PN}-${PV/_p/-patch}
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib
-inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib
+MY_P=${PN}-${PV/_p/-patch}
DESCRIPTION="General purpose library and file format for storing scientific data"
HOMEPAGE="http://www.hdfgroup.org/HDF5/"
@@ -25,13 +27,22 @@ REQUIRED_USE="
RDEPEND="
mpi? ( virtual/mpi[romio] )
- szip? ( >=sci-libs/szip-2.1 )
- zlib? ( sys-libs/zlib )"
+ szip? ( >=sci-libs/szip-2.1:0= )
+ zlib? ( sys-libs/zlib:0= )"
DEPEND="${RDEPEND}
sys-devel/libtool:2
>=sys-devel/autoconf-2.69"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
+ "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
+ "${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch
+ "${FILESDIR}"/${PN}-1.8.14-implicits.patch
+)
+
pkg_setup() {
tc-export CXX CC AR # workaround for bug 285148
if use fortran; then
@@ -51,14 +62,7 @@ pkg_setup() {
fi
}
-S=${WORKDIR}/${MY_P}
-
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.8.10-buildsystem.patch \
- "${FILESDIR}"/${PN}-1.8.8-array_bounds.patch \
- "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch \
- "${FILESDIR}"/${PN}-1.8.9-mpicxx.patch \
- "${FILESDIR}"/${PN}-1.8.11-implicits.patch
# respect gentoo examples directory
sed \
-e "s:hdf5_examples:doc/${PF}/examples:g" \
@@ -70,38 +74,31 @@ src_prepare() {
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
# bug #419677
use prefix && \
append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \
-Wl,-rpath,"${EPREFIX}"/$(get_libdir)
+ autotools-utils_src_prepare
}
src_configure() {
- econf \
- --enable-production \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --enable-deprecated-symbols \
- --enable-shared \
- --disable-silent-rules \
- $(use_enable prefix sharedlib-rpath) \
- $(use_enable static-libs static) \
- $(use_enable debug debug all) \
- $(use_enable debug codestack) \
- $(use_enable cxx) \
- $(use_enable fortran) \
- $(use_enable fortran2003) \
- $(use_enable mpi parallel) \
- $(use_enable threads threadsafe) \
- $(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 {} +
+ local myeconfargs=(
+ --enable-production
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ --enable-deprecated-symbols
+ $(use_enable prefix sharedlib-rpath)
+ $(use_enable debug debug all)
+ $(use_enable debug codestack)
+ $(use_enable cxx)
+ $(use_enable fortran)
+ $(use_enable fortran2003)
+ $(use_enable mpi parallel)
+ $(use_enable threads threadsafe)
+ $(use_with szip szlib)
+ $(use_with threads pthread)
+ $(use_with zlib)
+ )
+ autotools-utils_src_configure
}