fix bug #512502: depend on <=sci-libs/hdf5-1.8.12, not touching stable version

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB2EFA1D4

7 files changed, 44 insertions, 29 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index f5737570a133..97b1e8d15e7e 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.113 2014/04/29 23:29:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.114 2014/06/16 20:06:02 jauhien Exp $
+
+  16 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org> netcdf-4.1.3.ebuild,
+  netcdf-4.2.1.1.ebuild, netcdf-4.3.0.ebuild, netcdf-4.3.1.1.ebuild,
+  netcdf-4.3.2.ebuild:
+  fix bug #512502: depend on <=sci-libs/hdf5-1.8.12, not touching stable version
 
   29 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> netcdf-4.3.2.ebuild:
   FDisable doc generation because of missing doxygen files, bug #509052
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index e0636f9bb1a4..5778c5b2d6f8 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -12,17 +12,27 @@ DIST netcdf-4.3.0.tar.gz 4735397 SHA256 2814651c4db441a95bb8dd14479cc07f0598f7e3
 DIST netcdf-4.3.1.1.tar.gz 4729750 SHA256 09a4123d631714f488a2dc43292a7218e5241f2cf9288d2dbc8347d2fe176cad SHA512 7e5187c7f86d4daee856e20291e5ea565712ec09785bfcce78df107e9d8b977816c8d23ec08dca3b036934643d397875b05ca5af7e945cea26ed1264f9e686d7 WHIRLPOOL e78777ac45f3915002cef1e46779b3cbe087e52583f49b0407461f2ad7d5abee268026583791dbcd3153a18af06fdeb3552e11ccc77c1403aa500a1ce5281df9
 DIST netcdf-4.3.2.tar.gz 5013938 SHA256 57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e SHA512 9cb9c761bf1e17a37601c37000fdc0bb654afcf111e5ac2fb7dcf037c6aa827e66beb29d5c661edc50ea3f84849f3dee387aab9e85ef81a9b6ca3f36e45debdd WHIRLPOOL 7fb0dd3324c3e8864729db1409a76feb84ef35298c0f79a4258f1cd30a70e90070d9a44275d064d8a4952c32671182f1bfe97d47f26cf921a625bbe7160f3249
 EBUILD netcdf-4.1.1-r4.ebuild 2277 SHA256 797aca576368152b44ee5bc6599582cc0514f76260bc3e5e00ea98f4d5e0c08c SHA512 3d33e45775f382eeeea5ff5a141a3b19d262b8085e94919c4e01ae38ae949126f3631a5eb4c7119ba32a728773001eb07bd9ad91c11cf7af4602e8b63530c27e WHIRLPOOL bb0c2bf5d5dabb0cc32f96f9b3e3ba0d0243067cf4f8156b2d0f064a3e8984c5af7c8710d44bb504143845ced71ac85fd0d1bf23c77351711891c2e5530ba356
-EBUILD netcdf-4.1.3.ebuild 2136 SHA256 c038f8912fd6e16b0c78695caeb1f063fe7b138681f2137e41d3a34730fa8ce6 SHA512 1e3fed32854b0c32d749a0e8f1974603ae8a803f3869faf5a8796a43ebb7571073faf6f63a75123c2abd69ff29d62e5f742ffa8837c3814baeeb12e78df264ac WHIRLPOOL dfd46a4f62104a13565fca41876064fcd46bdb912313bc3479efdb20a0f73a9fd99d349741c4a4546d47d65e12fabeacee71d1364731eb6bf320f1e288e8423f
-EBUILD netcdf-4.2.1.1.ebuild 1209 SHA256 e9a1427ff88a79db0788010b8cc9c773180654177a55002c0e8c5f4bca9c458a SHA512 30e412593a795aa363909650e5f8c8144cd84e946e34c24f856537a683d7db3e90abe26d7696f29e1039560e4acde2f936fa84826435e5fa27f426651f374a2e WHIRLPOOL 7b6fc9fb097ebc87365054b71831e7aebac1465cb140d24d25565d6f4d39c88f647928b590104db92295f34a4a9f21b8fb10a827a700873d8da87aa404e3c82c
-EBUILD netcdf-4.3.0.ebuild 1279 SHA256 4994772c5e909e6dc7bcfcc3a9501cd2db7c12e84ea90219359cf00972c19873 SHA512 17fe642f19a905590c910cb4f185edbbd26b0e0a49b224eb6174db2757ef5dd0511f59cdcb34c129d1a6e7bccc4ed9aecb61864ccecb488993055b044c5ed045 WHIRLPOOL 4d95dda51cfcf66052454dd50b49ccecf7b2f6ef4f2719c1d5694eaab9b8e2cf872bc8398d75c94c801f40902cea82e700c9cbd7c2bcc102993fe96d952ddf87
-EBUILD netcdf-4.3.1.1.ebuild 1268 SHA256 aa7a60ff59db24a85f03e31d4fa0b27c067dc3169eb47b338c7d3fbc309feb0f SHA512 6b5dcf494287f4c1a33f40c6270983694d986d9c5eb2e340e2c5027292ffafe4f92558443e82f81fdf7f4f800dc565d81af080a33eb181be88e39b682f5a9967 WHIRLPOOL 910c12559e1012b5bade3df23edc055be424dbce587195359c3b96529741b4b6b7df9ec97263056c835807fdce767bc81971b033e384bc92b68213bab057f868
-EBUILD netcdf-4.3.2.ebuild 1515 SHA256 8d5f9df767f834d082fd3959189393c8464baecfeff4b82428f8f57af730e9a5 SHA512 b189b25171f8982c092e4d29c79a2ccaa0166269ecf924ed0dfb5e37fd97d56ca18a77105bc21e1fd6348db7c6b3c3387b614519f5fd6d68375a9edff7be50dd WHIRLPOOL 6506b2f054ff546f4c6e25e674c3d227aa2b5c1de3bd7d85dc3a2e6a28ced9902046f6ac51b2cff4387f39e9334d38a5b619bff75b3e41786be429d935524360
-MISC ChangeLog 20117 SHA256 d96a39720d95c6f1b32ee5db0bd4562eef818f3b6db2f61c3fa2ecfd4396d6c1 SHA512 2da2456bd0c8dfe0ef95979de9c0bb4fec13e83e73549afe5ed1ee57957c4a80432c97d8fc5d70351143f304fbbc35488271ec060377c92c34b80fc27c08363a WHIRLPOOL 80102b26f592c16d8673699ca241d63168f44034a8670db2a1399c10354d40cf48ce400898b35d27a268d7f225bae7f2f47153367917dea94399e87e2a654955
+EBUILD netcdf-4.1.3.ebuild 2142 SHA256 c91fadaa77f3ac45c3eacb7aea4813b58484c77d9e432bb254de04a5a5989950 SHA512 ebfe44dc3a5e38eb502598346e7b8ce8000702c019d1ded613098005870cae2b0f4b4c214dbf468933c5941cff0893ee4c1ceb28c295612f79504297db30aa03 WHIRLPOOL 212d182b495b22e680eb26b3d7fdb8407037810c80ce75100e77c9198ba6aa89ef47593b454eba5e7ec28ea8829e64824b03844d3314f69f515cf3f71a289c82
+EBUILD netcdf-4.2.1.1.ebuild 1221 SHA256 5411f4cabbf0e6771602192bb360a4c2e04bd6bb76360c1956482901bc98dff1 SHA512 8d9173dd162f04725e4ad012d8ee77243a3456bbfa5c2d2e58d5d3f9fccd2212645a63363048889ebe56e8d270217851abb5107a4b28ac9c438454e81a194823 WHIRLPOOL 666709f4c70f031a9e34ff6eb262d40335f5ce42974298a9d29dbec6938bf6c7bc664df71fc29879a660c5da0e53ca8c183031fbfa023402fcd43ddf262929cb
+EBUILD netcdf-4.3.0.ebuild 1286 SHA256 85534c3143260ebe12ca9490d1a4d8bb2c28f16a9b71f2bcbf218f640bc1767d SHA512 345bb4ed6c8de8da07936b88feff6e35d611dcd6b96b39d8f926359f8c20e47beae62e21ded65b440d35a7728172b056d71706e608a5f93bd97906662e17a1da WHIRLPOOL 55aa0c8ff7ddf00ef149f8d1be71f97195347d87bb0669b5016eed6dadcd04afb029e632023d6110d81db9434c89a4e307aeab94cdebbe038f444b5b5c3783a1
+EBUILD netcdf-4.3.1.1.ebuild 1275 SHA256 1076dec72780b9f2267fbe792eb2dc3843332af905a85466840eff0d5a88e2b3 SHA512 ba5bd0c4df2e78032f9ce6d40562e658f49e8a06fa5c98faa823449c60d62cfe9444d7beab90d15eaefeabfb7637d3d523e86bf26197da4388cb6118f165c080 WHIRLPOOL 513e3e8e951aebe02c475999f44003081930b37ddeea159b293daf3427f8d9dc383455bbba9db42b685bf8866fa80356780255cb1cfe448d5535295f425beb28
+EBUILD netcdf-4.3.2.ebuild 1532 SHA256 a752520ad57231e047bb2239e0ebfa5e0453ae678a69a7905aaa9c46581f5494 SHA512 af35a133095706b893905d903c9c92a6189d9594144f13788204cb8db7e964c626c44447ebaeabb9f0b8ad0c6e37edecb74f657e05d3d8fa1c6f356a9ee86c1f WHIRLPOOL 6de8627acbb70c92bbca9cc78060424d167178410bbe070f042a0535d8b33af91268644ed20bedfa46b3c7d722cb64717b6a9148091a090054b9dca06e69be21
+MISC ChangeLog 20365 SHA256 ab46ee60ecc4f73fd861461491186540b06b9e88e5ccdfecb02bb5dc9ee929c6 SHA512 a570f455070576579641e18a3723e3e56eb74d9351f4cf815a2d934894a84869fcb361bb326c23a7f544df89fa88ca30695a54f41960c2e0a58ee153bea72613 WHIRLPOOL ad62f289af825143e1a0d65f1852395cd564a59ba49c9979e0f8ce53c85d6738537a27a116d68955103cb1aed4430281b8838d6d576727c8a3e7bee39a99fbd7
 MISC metadata.xml 862 SHA256 9c27407b048f86a8cf1fd94d7bf30f68bfb742a6e793e1211c5900cab4e703cf SHA512 e16b6cf453424843cc4407540773f86ae1233843c3066dc230b6e58c1829ac0a5ddb4f8ed329f179a1ebfc63326c525811da276f01c533667da827f9194be43b WHIRLPOOL 8d3a040e1968b34eb850e1564a0e16353305fdf6728e38336a9cdbe230ecf9da101b44f77f7173d62108b8d86a983cb7675f7b5adaf9086967ceb104659eccb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNgNc8ACgkQ1ycZbhPLE2CMSQCeMT88PqB3Pm9K9gMmVvVx0o1D
-YD4AoIqPbtCH37PGD7ysgK5KFSgag4Hf
-=6iKj
+iQIcBAEBCAAGBQJTn04yAAoJELvuk32y76HU+sAP/2/2ZS0DlkczgTiGxfYS4nxt
+Qpzv+ulAU2fHouh9vB1leTch9qfYWOUbYfTGLUJ2vc3v1Ta2kpsOIYOa2tjCTjai
+Vl2H1fp2MqP/SanW9lKG+uGK8ErYOUaEQypoXzQa7IvYVXGz7Ycu+cYQh9tqT1Di
+As7irSxAN6zNh3oxaZ+b7Yz2s0QVw3qG/fHprIXbrIwjCgqf33hnq5jrobI2z1ka
+B+jRrLeCTUYC8B4qoYZ0ZV1TkBdmTqOUSYyGp0DVVpZb464o5ymUy1gb3qkZBAlA
+/1XioKYZDipsqwWs/OhRAFlGqE1r25H0tfKEs4sRDOdOmOWkj4cIbwqBx8mBInkS
+08IgVo2dBfR70FV3o8L4+V2wEsaVbMM1FEWaCLLbCACOBrkLehb9pRrZeibZixg+
+2QFe7hJQa99xwiOj7RqPxgf8TcsPe6F12z/CXFWGJgRMWudfPFJaZu5CwAGfrig1
+ydXhNw/0WdELS2pKj510AvrW+QoEJlJnKISGsPOqX7M/thPvPaIB5khrmzk4gY4X
+Zu3o6wZCAS+dGm9Ojww+YeNVpQQsXX3fxf6aLK5AcJgJC8RzUeO/LBbY4d/9DsOS
+Cm+o3D5cZ5J/1TTsvAd7Fo2LNCgI+Hj/GK8NmU82PVsUXIIRY4ynO5jSvTta2I+r
+b5MFo+gUiDPhrtbugvQq
+=Zhgw
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/netcdf-4.1.3.ebuild b/sci-libs/netcdf/netcdf-4.1.3.ebuild
index bbd3f7123e40..339e6484dfe4 100644
--- a/sci-libs/netcdf/netcdf-4.1.3.ebuild
+++ b/sci-libs/netcdf/netcdf-4.1.3.ebuild
@@ -1,8 +1,8 @@
-# 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/netcdf/netcdf-4.1.3.ebuild,v 1.9 2013/08/21 17:51:56 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.3.ebuild,v 1.10 2014/06/16 20:06:02 jauhien Exp $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=true
 FORTRAN_NEEDED=fortran
@@ -20,7 +20,7 @@ IUSE="cxx dap doc fortran hdf5 static-libs"
 
 RDEPEND="
 	dap? ( net-misc/curl )
-	hdf5? ( >=sci-libs/hdf5-1.8.6[zlib,szip,fortran?] )"
+	hdf5? ( <=sci-libs/hdf5-1.8.12:0=[zlib,szip,fortran?] )"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.4
diff --git a/sci-libs/netcdf/netcdf-4.2.1.1.ebuild b/sci-libs/netcdf/netcdf-4.2.1.1.ebuild
index 60e26da9a4c4..8d3c4512af0a 100644
--- a/sci-libs/netcdf/netcdf-4.2.1.1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 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/netcdf/netcdf-4.2.1.1.ebuild,v 1.3 2012/12/17 16:32:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.2.1.1.ebuild,v 1.4 2014/06/16 20:06:02 jauhien Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools-utils
 
@@ -17,8 +17,8 @@ IUSE="+dap doc examples hdf +hdf5 mpi static-libs szip test tools"
 
 RDEPEND="
 	dap? ( net-misc/curl )
-	hdf? ( sci-libs/hdf >=sci-libs/hdf5-1.8.8 )
-	hdf5? ( >=sci-libs/hdf5-1.8.8[mpi=,szip=,zlib] )"
+	hdf? ( sci-libs/hdf <=sci-libs/hdf5-1.8.12:0= )
+	hdf5? ( <=sci-libs/hdf5-1.8.12:0=[mpi=,szip=,zlib] )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/sci-libs/netcdf/netcdf-4.3.0.ebuild b/sci-libs/netcdf/netcdf-4.3.0.ebuild
index 85cd8f5e4e6e..9c4dd05bb452 100644
--- a/sci-libs/netcdf/netcdf-4.3.0.ebuild
+++ b/sci-libs/netcdf/netcdf-4.3.0.ebuild
@@ -1,6 +1,6 @@
-# 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/netcdf/netcdf-4.3.0.ebuild,v 1.1 2013/07/05 16:33:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.3.0.ebuild,v 1.2 2014/06/16 20:06:02 jauhien Exp $
 
 EAPI=5
 
@@ -18,8 +18,8 @@ IUSE="+dap doc examples hdf +hdf5 mpi static-libs szip test tools"
 
 RDEPEND="
 	dap? ( net-misc/curl )
-	hdf? ( sci-libs/hdf >=sci-libs/hdf5-1.8.8 )
-	hdf5? ( >=sci-libs/hdf5-1.8.8[mpi=,szip=,zlib] )"
+	hdf? ( sci-libs/hdf <=sci-libs/hdf5-1.8.12:0= )
+	hdf5? ( <=sci-libs/hdf5-1.8.12:0=[mpi=,szip=,zlib] )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/sci-libs/netcdf/netcdf-4.3.1.1.ebuild b/sci-libs/netcdf/netcdf-4.3.1.1.ebuild
index 2c22acc1c13a..ba174b591a1c 100644
--- a/sci-libs/netcdf/netcdf-4.3.1.1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.3.1.1.ebuild,v 1.1 2014/02/27 17:56:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.3.1.1.ebuild,v 1.2 2014/06/16 20:06:02 jauhien Exp $
 
 EAPI=5
 
@@ -17,8 +17,8 @@ IUSE="+dap doc examples hdf +hdf5 mpi static-libs szip test tools"
 
 RDEPEND="
 	dap? ( net-misc/curl )
-	hdf? ( sci-libs/hdf >=sci-libs/hdf5-1.8.8 )
-	hdf5? ( >=sci-libs/hdf5-1.8.9[mpi=,szip=,zlib] )"
+	hdf? ( sci-libs/hdf <=sci-libs/hdf5-1.8.12:0= )
+	hdf5? ( <=sci-libs/hdf5-1.8.12:0=[mpi=,szip=,zlib] )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/sci-libs/netcdf/netcdf-4.3.2.ebuild b/sci-libs/netcdf/netcdf-4.3.2.ebuild
index ae54da389456..99f1eba19732 100644
--- a/sci-libs/netcdf/netcdf-4.3.2.ebuild
+++ b/sci-libs/netcdf/netcdf-4.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.3.2.ebuild,v 1.2 2014/04/29 23:29:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.3.2.ebuild,v 1.3 2014/06/16 20:06:02 jauhien Exp $
 
 EAPI=5
 
@@ -17,8 +17,8 @@ IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
 
 RDEPEND="
 	dap? ( net-misc/curl:0= )
-	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
-	hdf5? ( sci-libs/hdf5:0=[mpi=,szip=,zlib] )"
+	hdf? ( sci-libs/hdf:0= <=sci-libs/hdf5-1.8.12:0= )
+	hdf5? ( <=sci-libs/hdf5-1.8.12:0=[mpi=,szip=,zlib] )"
 DEPEND="${RDEPEND}"
 # doc generation is missing many doxygen files in tar ball
 #	doc? ( app-doc/doxygen[dot] )"