sci-biology/eugene: Bump to 4.1d from science-overlay

Gentoo-bug: 594700
* EAPI=6
* Fix -Wformat warnings

Package-Manager: portage-2.3.1

2 files changed, 101 insertions, 0 deletions

diff --git a/sci-biology/eugene/files/eugene-4.1d-Wformat.patch b/sci-biology/eugene/files/eugene-4.1d-Wformat.patch
new file mode 100644
index 000000000000..ab6d2bd1d2ee
--- /dev/null
+++ b/sci-biology/eugene/files/eugene-4.1d-Wformat.patch
@@ -0,0 +1,84 @@
+Fix -Wformat warnings caused by wrong printf specifiers:
+* Sensor.Riken.cc:95:61: warning: format ‘%d’ expects argument of type ‘int’, but
+* argument 3 has type ‘std::vector<RAFLgene>::size_type {aka long unsigned int}’ [-Wformat=]
+*    fprintf(stderr, "%d RAFL EST pairs read, ", RAFLtmp.size());
+
+--- a/src/Hits.cc
++++ b/src/Hits.cc
+@@ -163,7 +163,7 @@
+     if (ThisHit != NULL)
+         for (int i=0; i<*NumHits-1; i++) ThisHit = ThisHit->Next;
+ 
+-    while ((read=fscanf(HitFile,"%d %d %d %lf %d %s %d %d %as\n", &deb, &fin,
++    while ((read=fscanf(HitFile,"%d %d %d %lf %d %s %d %d %ss\n", &deb, &fin,
+                         &poids, &evalue, &phase, HitId, &HSPDeb, &HSPFin,HSP)) >= 8)
+     {
+         if (HSP) fprintf(stderr, "%s", HSP);
+--- a/src/SensorPlugins/Est/Sensor.Est.cc
++++ b/src/SensorPlugins/Est/Sensor.Est.cc
+@@ -1353,13 +1353,13 @@
+     exit(2);
+   }
+ 
+-  fprintf(fp, "vPos %d\n",  vPos.size());
++  fprintf(fp, "vPos %zu\n",  vPos.size());
+   for (int i=0; i< vPos.size();i++ )
+   {
+     fprintf(fp, "vPos %d\t%d\n",i,  vPos[i]);
+   }
+   
+-  fprintf(fp, "vESTMatch %d\n",  vESTMatch.size());
++  fprintf(fp, "vESTMatch %zu\n",  vESTMatch.size());
+   for (int i=0; i< vESTMatch.size();i++ )
+   {
+     fprintf(fp, "vESTMatch %d\t\n", vESTMatch[i]);
+--- a/src/SensorPlugins/Riken/Sensor.Riken.cc
++++ b/src/SensorPlugins/Riken/Sensor.Riken.cc
+@@ -92,7 +92,7 @@
+   
+   
+   
+-  fprintf(stderr, "%d RAFL EST pairs read, ", RAFLtmp.size());
++  fprintf(stderr, "%zu RAFL EST pairs read, ", RAFLtmp.size());
+   
+   sort(RAFLtmp.begin(), RAFLtmp.end(), Before);
+   
+@@ -148,7 +148,7 @@
+     }
+   }
+   
+-  fprintf(stderr,"resulting %d\n",RAFL.size());
++  fprintf(stderr,"resulting %zu\n",RAFL.size());
+   fflush(stderr);
+ 
+   //    for (RAFLtmpindice=0; RAFLtmpindice< (int)RAFL.size(); RAFLtmpindice++) {
+--- a/src/SensorPlugins/SMachine/Sensor.SMachine.cc
++++ b/src/SensorPlugins/SMachine/Sensor.SMachine.cc
+@@ -197,7 +197,7 @@
+   fclose(fp);
+ 
+   if (end ==2) {
+-    fprintf(stderr, "Error in SpliceMachine splice site file %s, line %d\n", name, len);
++    fprintf(stderr, "Error in SpliceMachine splice site file %s, line %zu\n", name, len);
+     exit(2);
+   }
+ }
+--- a/src/SoTerms.cc
++++ b/src/SoTerms.cc
+@@ -67,14 +67,14 @@
+     j++;
+     if (line[0] == 'i' && line[1] == 'd') 
+     {
+-      i = sscanf(line, "id: %s", &value);
++      i = sscanf(line, "id: %s", value);
+       if (i > 0) 
+       {
+ 	char soId[60];
+ 	char soName[60];
+ 	strcpy (soId, value );
+ 	fgets (line, MAX_LINE, fp);
+-	i = sscanf(line, "name: %s", &value);
++	i = sscanf(line, "name: %s", value);
+ 	strcpy (soName, value );
+ 	idToName_[to_string(soId)]=to_string(soName);
+ 	nameToId_[to_string(soName)]=to_string(soId);
diff --git a/sci-biology/eugene/files/eugene-4.1d-fix-c++14.patch b/sci-biology/eugene/files/eugene-4.1d-fix-c++14.patch
new file mode 100644
index 000000000000..a27261c68c06
--- /dev/null
+++ b/sci-biology/eugene/files/eugene-4.1d-fix-c++14.patch
@@ -0,0 +1,17 @@
+Fix building with C++14, which errors out due to collisions with isinf
+from cmath. We don't need to fix ancient broken OSX toolchains.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594700
+
+--- a/src/SensorPlugins/Tester/Sensor.Tester.cc
++++ b/src/SensorPlugins/Tester/Sensor.Tester.cc
+@@ -18,9 +18,7 @@
+ // ------------------------------------------------------------------
+ 
+ // MacOS-X kludge. cmath undefines these macros. Turn them into inlines 
+-#include <math.h>
+-inline int (isinf)(double r) { return isinf(r); }
+-inline int (isnan)(double r) { return isnan(r); }
++#include <cmath>
+ 
+ #include <iomanip>
+ #include <fstream>