diff options
author | Jauhien Piatlicki <jauhien@gentoo.org> | 2014-06-16 20:06:02 +0000 |
---|---|---|
committer | Jauhien Piatlicki <jauhien@gentoo.org> | 2014-06-16 20:06:02 +0000 |
commit | 4cf3afa3f8835c95e60b0d9bb90509247dfb5a8c (patch) | |
tree | aac11f8cb0d77d02f18caa6e68d6afabd69a2e3d /sci-libs/netcdf | |
parent | Enable workaround for wmluiltok on non-native ABIs only, bug 513370. (diff) | |
download | gentoo-2-4cf3afa3f8835c95e60b0d9bb90509247dfb5a8c.tar.gz gentoo-2-4cf3afa3f8835c95e60b0d9bb90509247dfb5a8c.tar.bz2 gentoo-2-4cf3afa3f8835c95e60b0d9bb90509247dfb5a8c.zip |
fix bug #512502: depend on <=sci-libs/hdf5-1.8.12, not touching stable version
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)
Diffstat (limited to 'sci-libs/netcdf')
-rw-r--r-- | sci-libs/netcdf/ChangeLog | 7 | ||||
-rw-r--r-- | sci-libs/netcdf/netcdf-4.1.3.ebuild | 8 | ||||
-rw-r--r-- | sci-libs/netcdf/netcdf-4.2.1.1.ebuild | 10 | ||||
-rw-r--r-- | sci-libs/netcdf/netcdf-4.3.0.ebuild | 8 | ||||
-rw-r--r-- | sci-libs/netcdf/netcdf-4.3.1.1.ebuild | 6 | ||||
-rw-r--r-- | sci-libs/netcdf/netcdf-4.3.2.ebuild | 6 |
6 files changed, 25 insertions, 20 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/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] )" |