diff options
Diffstat (limited to 'sci-libs/netcdf')
| -rw-r--r-- | sci-libs/netcdf/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-libs/netcdf/Manifest | 16 | ||||
| -rw-r--r-- | sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch | 50 | ||||
| -rw-r--r-- | sci-libs/netcdf/netcdf-4.1.1-r2.ebuild (renamed from sci-libs/netcdf/netcdf-4.1.1-r1.ebuild) | 10 |
4 files changed, 72 insertions, 14 deletions
diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog index 179d80e450c0..8b554bd67803 100644 --- a/sci-libs/netcdf/ChangeLog +++ b/sci-libs/netcdf/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-libs/netcdf # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.76 2010/12/04 21:40:09 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.77 2010/12/05 11:38:45 xarthisius Exp $ + +*netcdf-4.1.1-r2 (05 Dec 2010) + + 05 Dec 2010; Kacper Kowalik <xarthisius@gentoo.org> -netcdf-4.1.1-r1.ebuild, + +netcdf-4.1.1-r2.ebuild, files/netcdf-4.1.1-implicits.patch: + Properly use autotools-utils.eclass wrt #347780 by Juergen Rose + <rose@rz.uni-potsdam.de>. Skip configure phase for netcdf and libcf as we + don't build them. More implicits fixes. Drop old. *netcdf-4.1.1-r1 (04 Dec 2010) diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest index 92b73d7e06d0..077a8964fc59 100644 --- a/sci-libs/netcdf/Manifest +++ b/sci-libs/netcdf/Manifest @@ -3,21 +3,21 @@ Hash: SHA1 AUX netcdf-3.6.3-as-needed.patch 1794 RMD160 4b81004e09b1d620ad6fe3450ed3906f214cfa32 SHA1 f3c3809227674cdcdd0ec0ea3236c68cda8e9bf7 SHA256 4bd124aac6f9b3aeedf91b89e713cb1dd035423361ef609e784b17b4b08be645 AUX netcdf-3.6.3-parallel.patch 518 RMD160 840c57498d0dd75f33f1653be0a811248b2c1d18 SHA1 f8a14e3d069c9983bbb9fd3b3ebdd9f480617e2a SHA256 ff26354df395398b70ebb28c26a0478e6a0bff18fdf6b46cece9a619d3df1b97 -AUX netcdf-4.1.1-implicits.patch 1186 RMD160 11bd2ea587d796ef72735e4388502891b7a1f9c7 SHA1 7fbe9f23584e010679d00c81bf1e244f0694916e SHA256 8de834032c716208219143ec4c8b5dfc84325742129b6e5bc2e9d5efbde74bbe +AUX netcdf-4.1.1-implicits.patch 2588 RMD160 1e27a022bb0fb7910bb9940ff2b9410dc0b8550b SHA1 205249ed81d4a09d9ea5bd9936b72c422badece7 SHA256 ffd6d894ea0dc29c56100d9c94fb22e51cb5fe775a41d02aa6367ccf2e091d95 AUX netcdf-4.1.1-parallel-build.patch 1251 RMD160 4510fb75315e3762b6cd288f0cc082fa6c843f85 SHA1 74afa2ca9af5eb082a97e0019dcddc2b4ee40078 SHA256 e69c47d96f5b20320450a0f292966b7eaa72d7aa869e1caf7460a3ea0c72a7d1 DIST netcdf-3.6.3.tar.gz 11572512 RMD160 6917caa05adc2fb9dbf2d43354f6dd00914486a2 SHA1 711e5f2a24e1679b17715398ba58127e50cd7fb3 SHA256 afa1a0fa82b9ea33b035257b6e9662b22e135f98b2fd93d5cf030320dfc3ffa1 DIST netcdf-4.1.1.tar.gz 11201096 RMD160 89b6e1a2115ef348ac83166aa7a50e045fbd98e2 SHA1 6fece208825b978fc2240732f6f57927d71a0552 SHA256 7933d69d378c57f038375bae4dd78c52442a06e2647fce4b75c13a225e342fb0 EBUILD netcdf-3.6.3.ebuild 2415 RMD160 f5af681e5bf3b635a5a537385d213b97017edaf8 SHA1 125ad71d02a32dcfd014a2dbc2f88c5dccea0b44 SHA256 7e4f33e1a5682a7176f8f08f0cb81e9fe345d0610f3836e99b765d574f074a4f -EBUILD netcdf-4.1.1-r1.ebuild 2083 RMD160 ee00cb83807195aea9d39e3ed3465915a549d26b SHA1 9c1448969afb3c61895823ea946add387565844e SHA256 5cd1ff98f7afebf457f07e783facf469874272087b46bd32f493402a4e9a8ca3 +EBUILD netcdf-4.1.1-r2.ebuild 2138 RMD160 6035234e132c0a4ccb83a06515ca94599ab326ef SHA1 03ecf5b7da3aecd6e1c59442611a0721c2af675b SHA256 f2510899c415ae384b0c6efcd26390dd37372feed5e96a82c4b643013bcaa8ec EBUILD netcdf-4.1.1.ebuild 1963 RMD160 3e39844a9b490185dca99f309bee84463b4310a6 SHA1 87a21817a8c0ba7d353a8b8dd39bf454bcb8caaf SHA256 2dfedef4cd594e8e9ef2147a3108ff81f841887de0c4caf9bab813dc4dcfca62 -MISC ChangeLog 14210 RMD160 8cc9d6064b6d20267ecaa3248356124c558d8f82 SHA1 bf64779ac8dadfd967f8927635a427bbe69dbeca SHA256 a7f5e540036e2e910f1bf528353a176e9634c13a2e39dd9da1b203452e54ffb6 +MISC ChangeLog 14579 RMD160 45262f818b93fae3d971a319ba96cc2f8636f281 SHA1 989738b8c1349a6b17bbbc3985a532cac278dd22 SHA256 0d52a7c2a2902e07367a105bcb0eccfd9b91721f080eba705182ba99124f0a4e MISC metadata.xml 689 RMD160 ea3463e14f45ed00c810c1ba8b452eb22ed68bc8 SHA1 78128a34222208d7accfdec9e92c75f0ec67ed6a SHA256 31c1ec42edfa2928152c62863bec9f485cf378552ddc9366578aa883dd309f2f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iJwEAQECAAYFAkz6tUMACgkQIiMqcbOVdxQPRgQAhtY53NrsSfTGTv8CZsca8lja -iwqsc0urI+8feSCJzZRLX4d45wpJ4RU/c0IeCPB7USfYG390eYaaAetK0aBCVrzb -Cq9vVHIPp/2KZUyXHULxhfCHXZMUkxTvjmumVd3eoIW74F3DfH9uVcU2UiPnPsWK -i2wOmprEkoGqK+ApIY4= -=oxF+ +iJwEAQECAAYFAkz7ec8ACgkQIiMqcbOVdxTIvQP8DPb6AvpAdUwCCUpWkyWFqoJM +X2ts+RVak2Y3FKXIWjw+mMXQ09f5syqGe0wLYMFfznCvfNf3iqYYAlaX7FrhrdbE +p9aRXkSYRXPKWbYD4vvAbKhYHOZs1nx98hotj9Jlowwx9MylfKPvEtfvqYG5Cg19 +c0Mn+8OZqKIBx8eJ5w4= +=6P+9 -----END PGP SIGNATURE----- diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch b/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch index bd2982bf3a74..9733cb5afab9 100644 --- a/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch +++ b/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch @@ -28,3 +28,53 @@ Fix implicit function declarations FCALLSCFUN5(NF_INT, nc_create_par_fortran, NF_CREATE_PAR, nf_create_par, STRING, FINT2CINT, FINT2CINT, FINT2CINT, PCINT2FINT) +--- libncdap3/oc/daplex.c ++++ libncdap3/oc/daplex.c +@@ -86,6 +86,8 @@ + SCAN_PROG + }; + ++int daperror(DAPparsestate* state, const char* msg); ++ + /**************************************************/ + + int +--- libncdap3/oc/ocinternal.c ++++ libncdap3/oc/ocinternal.c +@@ -37,6 +37,8 @@ + #endif + + extern OCnode* makeunlimiteddimension(void); ++int occurlopen(CURL** curlp); ++void occurlclose(CURL* curl); + + #ifdef WIN32 + #include <fcntl.h> +--- libncdap3/oc/dapparse.c ++++ libncdap3/oc/dapparse.c +@@ -11,6 +11,7 @@ + static OCtype octypefor(Object etype); + static char* scopeduplicates(OClist* list); + static int check_int32(char* val, long* value); ++void setwordchars(DAPlexstate* lexstate, int kind); + + /****************************************************/ + +--- libncdap3/ncdap3.c ++++ libncdap3/ncdap3.c +@@ -4,6 +4,7 @@ + * $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch,v 1.2 2010/12/05 11:38:45 xarthisius Exp $ + *********************************************************************/ + #include "config.h" ++#include "netcdf3.h" + #include "ncdap3.h" + #include "dispatch3.h" + #include "dapdispatch3.h" +--- libncdap3/oc/dapparselex.h ++++ libncdap3/oc/dapparselex.h +@@ -88,4 +88,5 @@ + extern void daplexinit(char* input, DAPlexstate** lexstatep); + extern void daplexcleanup(DAPlexstate** lexstatep); + ++void dassetup(DAPparsestate* state); + #endif /*DAPPARSELEX_H*/ diff --git a/sci-libs/netcdf/netcdf-4.1.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.1.1-r2.ebuild index 1c19295b6e8e..7ff69b8aa4a6 100644 --- a/sci-libs/netcdf/netcdf-4.1.1-r1.ebuild +++ b/sci-libs/netcdf/netcdf-4.1.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r1.ebuild,v 1.1 2010/12/04 21:40:09 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r2.ebuild,v 1.1 2010/12/05 11:38:45 xarthisius Exp $ EAPI="3" @@ -46,6 +46,8 @@ pkg_setup() { src_prepare() { # use system cfortran rm -f fortran/cfortran.h || die + # we don't build udunits and libcf + sed -i -e '/udunits libcf/d' configure.ac || die if ! use doc; then sed -i -e "/\$(NC_TEST4)/ s/man4//" Makefile.am || die fi @@ -70,8 +72,6 @@ src_configure() { $(use_enable cxx) $(use_enable fortran separate-fortran) $(use_enable hdf5 netcdf-4) - $(use_enable hdf5 ncgen4) - $(use_enable doc docs-install) ${myconf} ) autotools-utils_src_configure @@ -80,8 +80,8 @@ src_configure() { src_compile() { # hack to allow parallel build if use doc; then - emake pdf || die - emake -j1 -C man4 || die + autotools-utils_src_compile pdf + autotools-utils_src_compile -j1 -C man4 fi autotools-utils_src_compile } |