gentoo resync : 28.04.2021

4 files changed, 12 insertions, 142 deletions

diff --git a/sci-biology/glimmer/files/glimmer-3.02-glibc210.patch b/sci-biology/glimmer/files/glimmer-3.02-glibc210.patch
deleted file mode 100644
index f6051ec82054..000000000000
--- a/sci-biology/glimmer/files/glimmer-3.02-glibc210.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durr glimmer3.02-orig/src/Common/gene.cc glimmer3.02/src/Common/gene.cc
---- glimmer3.02-orig/src/Common/gene.cc	2009-12-28 13:34:21.577437056 +0000
-+++ glimmer3.02/src/Common/gene.cc	2009-12-28 13:36:06.914974685 +0000
-@@ -443,7 +443,7 @@
- //  Return a subscript corresponding to character  ch .
- 
-   {
--   char  * p;
-+   const char  * p;
- 
-    p = strchr (CONVERSION_STRING, tolower (ch));
-    if  (p == NULL)
-diff -durr glimmer3.02-orig/src/ICM/icm.cc glimmer3.02/src/ICM/icm.cc
---- glimmer3.02-orig/src/ICM/icm.cc	2009-12-28 13:34:21.577437056 +0000
-+++ glimmer3.02/src/ICM/icm.cc	2009-12-28 13:36:44.649451803 +0000
-@@ -1981,7 +1981,7 @@
- //  model) for character  ch .
- 
-   {
--   char  * p;
-+   const char  * p;
- 
-    p = strchr (ALPHA_STRING, tolower (Filter (ch)));
-    if  (p == NULL)
diff --git a/sci-biology/glimmer/files/glimmer-3.02-jobserver-fix.patch b/sci-biology/glimmer/files/glimmer-3.02-jobserver-fix.patch
deleted file mode 100644
index 91498b116d12..000000000000
--- a/sci-biology/glimmer/files/glimmer-3.02-jobserver-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru glimmer3.02-orig/src/Makefile glimmer3.02/src/Makefile
---- glimmer3.02-orig/src/Makefile	2006-06-12 21:40:14.000000000 +0200
-+++ glimmer3.02/src/Makefile	2010-03-18 14:30:15.000000000 +0100
-@@ -2,12 +2,12 @@
- 
- 
- all:
--	@ TGT=objs
--	@ $(dosubdirs)
--	@ TGT=libs
--	@ $(dosubdirs)
--	@ TGT=progs
--	@ $(dosubdirs)
-+	@+ TGT=objs
-+	@+ $(dosubdirs)
-+	@+ TGT=libs
-+	@+ $(dosubdirs)
-+	@+ TGT=progs
-+	@+ $(dosubdirs)
- 
- 
- install: all
diff --git a/sci-biology/glimmer/files/glimmer-3.02-ldflags.patch b/sci-biology/glimmer/files/glimmer-3.02-ldflags.patch
deleted file mode 100644
index 0a04fbef1dcc..000000000000
--- a/sci-biology/glimmer/files/glimmer-3.02-ldflags.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/src/c_make.gen b/src/c_make.gen
-index 414dead..84c3030 100644
---- a/src/c_make.gen
-+++ b/src/c_make.gen
-@@ -200,45 +200,12 @@ LOCAL_SYS_INC=$(SEP_PATH)/../SYS/inc
- #### Do not redefine if (a) passed in on command line, or (b)
- #### defined in an environment variable.
- 
--ifneq "$(origin CC)" "environment"
--CC      = cc
--endif
--
--ifneq "$(origin CPPFLAGS)" "environment"
--CPPFLAGS=
--endif
--
--ifneq "$(origin CFLAGS)" "environment"
--CFLAGS  =
--endif
--
--ifneq "$(origin CDEFS)" "environment"
--CDEFS  =
--endif
--
--ifneq "$(origin CXX)" "environment"
--CXX	= g++
--endif
--
--ifneq "$(origin CXXFLAGS)" "environment"
--CXXFLAGS=
--endif
--
--ifneq "$(origin CXXDEFS)" "environment"
--CXXDEFS= -D__cplusplus
--endif
--
--ifneq "$(origin AR)" "environment"
--AR      = ar
--endif
--
--ifneq "$(origin ARFLAGS)" "environment"
--ARFLAGS = rvs
--endif
--
--ifneq "$(origin LDFLAGS)" "environment"
--LDFLAGS =
--endif
-+CC      ?= cc
-+CXX	?= g++
-+CXXFLAGS ?=
-+CXXDEFS = -D__cplusplus
-+AR      ?= ar
-+ARFLAGS ?= rvs
- 
- #### Delete default suffix rules
- .SUFFIXES:
-@@ -359,13 +326,13 @@ $(PROGS):
- 	  cd $(LOCAL_OBJ); \
- 	    if $(CC) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \
-                $(LD_DIRS) $(filter-out lib%.a, $+) \
--	       $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) ; then \
-+	       $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) $(LIBS) ; then \
- 			true; else rm -f $(LOCAL_BIN)/$(notdir $@); fi; \
- 	else \
- 	  cd $(LOCAL_OBJ); \
- 	    if $(CXX) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \
-                $(LD_DIRS) $(filter-out lib%.a, $+) \
--	       $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) ; then \
-+	       $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) $(LIBS) ; then \
- 			true; else rm -f $(LOCAL_BIN)/$(notdir $@); fi; \
- 	fi ;
- 
-diff --git a/src/c_make.glm b/src/c_make.glm
-index 0decc17..b82131c 100644
---- a/src/c_make.glm
-+++ b/src/c_make.glm
-@@ -8,10 +8,7 @@ include $(LOCAL_WORK)/src/c_make.gen
- 
- SUBDIRS = Common ICM Glimmer Util
- 
--CFLAGS = -g -Wall
--CXXFLAGS = -g -Wall
--
--LDFLAGS = -g -lm
-+LIBS = -lm
- 
- 
- #AS_BUILD_DIR =$(LOCAL_WORK)
diff --git a/sci-biology/glimmer/files/glimmer-3.02b-ldflags.patch b/sci-biology/glimmer/files/glimmer-3.02b-ldflags.patch
index 0a04fbef1dcc..dc41ef00de7e 100644
--- a/sci-biology/glimmer/files/glimmer-3.02b-ldflags.patch
+++ b/sci-biology/glimmer/files/glimmer-3.02b-ldflags.patch
@@ -1,8 +1,6 @@
-diff --git a/src/c_make.gen b/src/c_make.gen
-index 414dead..84c3030 100644
 --- a/src/c_make.gen
 +++ b/src/c_make.gen
-@@ -200,45 +200,12 @@ LOCAL_SYS_INC=$(SEP_PATH)/../SYS/inc
+@@ -200,45 +200,11 @@
  #### Do not redefine if (a) passed in on command line, or (b)
  #### defined in an environment variable.
  
@@ -48,13 +46,12 @@ index 414dead..84c3030 100644
 +CC      ?= cc
 +CXX	?= g++
 +CXXFLAGS ?=
-+CXXDEFS = -D__cplusplus
 +AR      ?= ar
 +ARFLAGS ?= rvs
  
  #### Delete default suffix rules
  .SUFFIXES:
-@@ -359,13 +326,13 @@ $(PROGS):
+@@ -359,13 +325,13 @@
  	  cd $(LOCAL_OBJ); \
  	    if $(CC) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \
                 $(LD_DIRS) $(filter-out lib%.a, $+) \
@@ -70,11 +67,9 @@ index 414dead..84c3030 100644
  			true; else rm -f $(LOCAL_BIN)/$(notdir $@); fi; \
  	fi ;
  
-diff --git a/src/c_make.glm b/src/c_make.glm
-index 0decc17..b82131c 100644
 --- a/src/c_make.glm
 +++ b/src/c_make.glm
-@@ -8,10 +8,7 @@ include $(LOCAL_WORK)/src/c_make.gen
+@@ -8,18 +8,14 @@
  
  SUBDIRS = Common ICM Glimmer Util
  
@@ -86,3 +81,12 @@ index 0decc17..b82131c 100644
  
  
  #AS_BUILD_DIR =$(LOCAL_WORK)
+ INC_IMPORT_DIRS += \
+ 		$(patsubst %, $(LOCAL_WORK)/src/%, $(strip $(SUBDIRS))) \
+                 $(LOCAL_WORK)/inc
+-LIB_IMPORT_DIRS += $(LOCAL_WORK)/lib /usr/lib /usr/shlib /usr/X11R6/lib \
+-     $(SYBASE)/lib
++LIB_IMPORT_DIRS += $(LOCAL_WORK)/lib
+ 
+ OBJ_SEARCH_PATH = $(LOCAL_WORK)/obj
+