gentoo resync : 17.07.2021

3 files changed, 0 insertions, 134 deletions

diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 2e2abe68faf6..1d0963cade12 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -1,6 +1,4 @@
 AUX 50cdf 124 BLAKE2B 93acfc3dd493c8518497ed7dafa35cc61f66501bd9d7c4db1f4072cdda9742f2927b5f388dde26d33e76d4d33405a8a92fbf133a1ed729ce8cba21458f552123 SHA512 4fe515d03379f2b6e1723c771f73e65be9f67365a46e75dbeb3358bbdc6f3446b91efd989363bf229b7ae93a446ddedeefd883a0d59d28c1480a10a8994eeadc
-AUX cdf-3.2-soname.patch 738 BLAKE2B 4c6a94feeefa623e88622b6dfd76581ef6d0c0d91c376e597bfa1e0130a734ea6dd40ad5235272788d7338220710d26e634639383d8cf5cdbd1901778484a580 SHA512 f3bb09e43b3b36ed346dc7690cc0c75a28e8dcfb2c1ebbf8a0577abdc2d15bbcbce7b0da9c5de23ef65e669bd118692db498aef230e9395dd4b67dba48258a8d
-AUX cdf-3.5.0.2-Makefile.patch 3973 BLAKE2B 2106f52abb639b4f31f08372de81db5cb96dbdccd0a55821605e659b7f85fad554cd8d4212fa4b9e6fd6225e5f3fd6c98e76d7aa7c2fe05dd96ea49d3c8444fe SHA512 9842d43d8e2910f8d7cc00c27711f84cde622ab69084ce1c798625475034b73db857410d6fc1311933512bb3a235cfe2fb0808d2eebfc6165e3962e04aaed4e1
 AUX cdf-3.8.0-respect-flags.patch 3080 BLAKE2B 1a89fef44861e1954d42fa68f8dc9398299656eaa08686ea07577e329c70f28ea5967079a94819c8f8b4d99369ec8041fa37443a9be0d3e580fe396dacb1b3fd SHA512 7d6dd822f81a2d80b73cc55b76b46c0016ab1dc4c754a90b57c2d2c99912c045853cf132d7c26dbfe804fc4cc908647ad7832b3048edfe5b2b4e735b23499953
 DIST cdf380crm.pdf 2671048 BLAKE2B 2605d6465c744b57f11d08605aa888ead724b7553a0efd8830dae759eb54c6d0df807cca1c6611fd40b4c5eb9327fbfcd66f0f7cf82b69bf7619385928ebc6dd SHA512 fc1eef589ff0f3cd989d8743cc1d6cfeb5946cf9ae8e4a328ba746b33fe0f6a286cf7b7b7e7cab5e0231bef566c03d7b68afe6c0879e5fb32fc1e6c980f7e081
 DIST cdf380csrm.pdf 2409166 BLAKE2B 7e97e61865531b788553ca9747513ec32bc5e1a743e10e5bad5f62980a883d00cfeede975b83826ad72327071062080cd1db611fd40c4e5b3d22caf7d4dd3d0f SHA512 d669f032722e270d3f16f8d9a8920d4536430bd83a509591cf82b447770d16a9c6d9aba17e096f78445c4f0b7f4ab85082cf2480bc9384b46677a2325be0f163
diff --git a/sci-libs/cdf/files/cdf-3.2-soname.patch b/sci-libs/cdf/files/cdf-3.2-soname.patch
deleted file mode 100644
index e4f28617faca..000000000000
--- a/sci-libs/cdf/files/cdf-3.2-soname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/lib/Makefile.orig	2007-12-03 17:47:58.476149933 +0000
-+++ src/lib/Makefile	2007-12-03 17:50:34.353032850 +0000
-@@ -94,7 +94,7 @@
- 
- shared.yes: libcdf.$(SHAREDEXT)
- 
--libcdf.so \
-+libcdf.$(SHAREDEXT) \
- libcdf.dylib \
- libcdf.sl: $(OBJs)
- 	@if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
-@@ -102,8 +102,8 @@
- 	  echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
- 	       $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
- 	else \
--	  echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
--	       $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS); \
-+	  echo $(LD) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS); \
-+	       $(LD) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS); \
- 	fi
- 
- libcdf.o: $(OBJs)
diff --git a/sci-libs/cdf/files/cdf-3.5.0.2-Makefile.patch b/sci-libs/cdf/files/cdf-3.5.0.2-Makefile.patch
deleted file mode 100644
index 3bab69dfc6ac..000000000000
--- a/sci-libs/cdf/files/cdf-3.5.0.2-Makefile.patch
+++ /dev/null
@@ -1,110 +0,0 @@
- Makefile           | 27 ++++++++++++++++-----------
- src/tools/Makefile |  6 +++---
- 2 files changed, 19 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7f240db..222c4f1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -771,17 +771,17 @@ all
- "PIC=$(PIC_$(OS)_$(ENV))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "LDx=$(LD_$(OS)_$(ENV))" \
--"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
--"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
-+"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
- "AROPTIONS=$(AROPTIONS_$(OS))" \
- "RANLIB=$(RANLIB_$(OS))" \
- all
- 	@cd $(TOOLSsrcDIR); $(MAKE) \
- "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
-@@ -791,9 +791,9 @@ all
- "FCx=$(FC_$(OS))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
--"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
-+"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
- "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
-@@ -829,12 +829,17 @@ install: install.$(PART)
- install.all: install.definitions install.include install.lib \
- 	     install.tools install.help_ notify.user copy.leapseconds
- 
--install.definitions: create.bin copy.definitions change.definitions
-+install.definitions: create.bin
- install.include: create.include copy.include
- install.tools: create.bin copy.tools
- install.help_: create.help copy.help
- 
- install.lib: create.lib copy.lib.a
-+	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
-+	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
-+	 else \
-+	   $(NULL) ; \
-+	 fi
- 	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
- 	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
- 	 else \
-@@ -940,8 +945,8 @@ copy.include:
- 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
- 
- copy.lib.so:
--	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
--	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
-+	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
-+	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
- 
- copy.lib.sl:
- 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
-@@ -2128,15 +2133,15 @@ show.posix.alphaI: show.supported
- show.supported:
- 	@echo SHARED is $(SUPPORTED.$(SHARED_$(OS)))
- 	@echo CURSES is $(SUPPORTED.$(CURSES_$(OS)_$(ENV)))
--	@echo FOPTIONS=$(FOPTIONS_$(OS))
-+	@echo FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS))
- 	@echo FOPTIONSld=$(FOPTIONSld_$(OS))
- 	@echo SHAREDEXT=$(SHAREDEXT_$(OS))
--	@echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
-+	@echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
- 	@echo RANLIB=$(RANLIB_$(OS))
- 	@echo FCx=$(FC_$(OS))
- 	@echo CCx=$(CC_$(OS)_$(ENV))
- 	@echo PIC=$(PIC_$(OS)_$(ENV))
--	@echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
-+	@echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
- 	@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
- 	@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
- 	@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
-diff --git a/src/tools/Makefile b/src/tools/Makefile
-index 3773c0c..1cabf61 100644
---- a/src/tools/Makefile
-+++ b/src/tools/Makefile
-@@ -40,12 +40,12 @@ CURSESLIB=-lncurses
- INCLUDEcdf= ../include
- 
- CC=$(CCx)
--CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
--CFLAGSld=$(COPTIONSld)
-+CFLAGS:=$(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf)
-+CFLAGSld=$(LDFLAGS) $(COPTIONSld)
- 
- WHICHOS=$(shell uname -a | cut -f1 -d" ")
- ifeq ("$(WHICHOS)","Darwin")
--  LIBCDFa=../lib/libcdf.a
-+  LIBCDFa=../lib/libcdf.so.3
- else
-   WHICHOS=$(shell uname -a | cut -f7 -d" ")
-   ifeq ("$(WHICHOS)","Cygwin")