[gentoo-commits] repo/gentoo:master commit in: sci-libs/netcdf/files/

[David Seifert]

commit:     3cecce2cc54b02e18fc5c282a78f544829619945
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan 29 09:12:24 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 20:09:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cecce2c

sci-libs/netcdf: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3709

 sci-libs/netcdf/files/netcdf-4.1.1-fortran.patch   | 15 ----
 sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch | 80 ----------------------
 sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch   | 32 ---------
 .../netcdf/files/netcdf-4.1.1-parallel-build.patch | 40 -----------
 4 files changed, 167 deletions(-)

diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-fortran.patch b/sci-libs/netcdf/files/netcdf-4.1.1-fortran.patch
deleted file mode 100644
index 825fd3b..00000000
--- a/sci-libs/netcdf/files/netcdf-4.1.1-fortran.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Default to gfortran if cannot figure out F77 compiler
-
-https://bugs.gentoo.org/show_bug.cgi?id=348922
-
---- netcdf-4.1.1/configure.ac
-+++ netcdf-4.1.1/configure.ac
-@@ -973,7 +973,7 @@
-              *)
-                 # If it's a gnu compiler, guess f2c.
-                 if test "x$ac_cv_fc_compiler_gnu" = xyes; then
--                   AC_DEFINE(f2cFortran, [1], [Turned on by netCDF configure.])
-+                   AC_DEFINE(gFortran, [1], [Turned on by netCDF configure.])
-                 fi
-                 ;;
-          esac

diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch b/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch
deleted file mode 100644
index a30aafc..00000000
--- a/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Fix implicit function declarations
-
---- libsrc/nc.c
-+++ libsrc/nc.c
-@@ -15,7 +15,7 @@
- #  include <mpp/shmem.h>
- #  include <intrinsics.h>
- #endif
--#ifdef HAVE_UNISTD
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- 
---- fortran/fort-nc4.c
-+++ fortran/fort-nc4.c
-@@ -30,6 +30,14 @@
- /* These are in libsrc4/nc4vars.c... */
- int nc_inq_var_chunking_ints(int ncid, int varid, int *contiguousp, int *chunksizesp);
- int nc_def_var_chunking_ints(int ncid, int varid, int contiguous, int *chunksizes);
-+int nc_set_var_chunk_cache_ints(int ncid, int varid, int size, int nelems, int preemption);
-+int nc_get_var_chunk_cache_ints(int ncid, int varid, int *sizep, int *nelemsp, int *preemptionp);
-+
-+/* These are in libsrc4/nc4file.c... */
-+int nc_set_chunk_cache_ints(int size, int nelems, int preemption);
-+int nc_get_chunk_cache_ints(int *sizep, int *nelemsp, int *preemptionp);
-+int nc_create_par_fortran(const char *path, int cmode, int comm, int info, int *ncidp);
-+int nc_open_par_fortran(const char *path, int mode, int comm, int info, int *ncidp);
- 
- 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 @@
-  *   $Id$
-  *********************************************************************/
- #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/files/netcdf-4.1.1-mpi-fix.patch b/sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch
deleted file mode 100644
index 4656ef1..00000000
--- a/sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Ensure hdf5.h is included before netcdf.h to avoid build error with openmpi >= 1.4.1
-
---- libsrc4/nc4internal.h
-+++ libsrc4/nc4internal.h
-@@ -8,13 +8,13 @@
- 
- #include <config.h>
- #include <stdio.h>
-+#include <hdf5.h>
- #include "error.h"
- #include <stdlib.h>
- #include <ctype.h>
- #include <stdarg.h>
- #include <string.h>
- #include "netcdf3.h"
--#include <hdf5.h>
- #include <netcdf.h>
- 
- #ifdef USE_PARALLEL
---- libncdap4/ncdap4.h
-+++ libncdap4/ncdap4.h
-@@ -12,9 +12,9 @@
- #include <stdio.h>
- 
- #include "config.h"
-+#include "nc4internal.h"
- #include "netcdf.h"
- #include "nc.h"
--#include "nc4internal.h"
- #include "ncdap.h"
- #include "getvara.h"
- #include "constraints3.h"

diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch b/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
deleted file mode 100644
index 22708e2..00000000
--- a/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Avoid building fortran modules twice, just install them instead.
-
-https://bugs.gentoo.org/296174
-
---- netcdf-4.1.1/f90/Makefile.am
-+++ netcdf-4.1.1/f90/Makefile.am
-@@ -101,17 +101,25 @@
- # Some fortran compilers change the file names of .mod files to all
- # uppercase. Just to be special.
- if UPPER_CASE_MOD
--nodist_include_HEADERS = TYPESIZES.mod NETCDF.mod
--TYPESIZES.mod: typeSizes.o
--NETCDF.mod: $(NETCDF_O)
--BUILT_SOURCES = TYPESIZES.mod
-+NETCDF_MODULES = TYPESIZES.mod NETCDF.mod
- else
--nodist_include_HEADERS = typesizes.mod netcdf.mod 
--typesizes.mod: typeSizes.o
--netcdf.mod: $(NETCDF_O)
--BUILT_SOURCES = typesizes.mod
-+NETCDF_MODULES = typesizes.mod netcdf.mod 
- endif
- 
-+NETCDF_LO := $(NETCDF_O:.o=.lo)
-+$(NETCDF_LO): typeSizes.o
-+install-data-local:
-+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-+	@list='$(NETCDF_MODULES)'; test -n "$(includedir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-+	done
-+
- # This is what we are building: a convenience library of F90 functions.
- noinst_LTLIBRARIES = libnetcdff90.la
-