sci-libs/libcmatrix: Allow for compiling with GCC 6

Gentoo-bug: 594680
* EAPI=6
* Make PATCHES -p1 compliant
* Rename PATCHES to be in ${P}-xyz.patch format

Package-Manager: portage-2.3.1

9 files changed, 42 insertions, 2 deletions

diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch
new file mode 100644
index 000000000000..74e49285dd04
--- /dev/null
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch
@@ -0,0 +1,40 @@
+Fix building with C++14, which errors out due -Wnarrowing conversions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594680
+
+--- a/include/lcm_ssecomplex.h
++++ b/include/lcm_ssecomplex.h
+@@ -151,7 +151,7 @@
+ {
+   static const union {
+     int i[4]; ssecomplex_t v;
+-  } signbithigh = {{0,0,0,0x80000000}};
++  } signbithigh = {{0,0,0,(int)0x80000000}};
+   ssecomplex_t b_im = _mm_shuffle_pd(b,b,3); // Imag. part of b in both
+   const ssecomplex_t b_re = _mm_shuffle_pd(b,b,0); // Real part of b in both
+   const ssecomplex_t tmp=_mm_mul_pd(a,b_re);
+@@ -166,7 +166,7 @@
+   ssecomplex_t b_re = _mm_set1_pd(b);
+   static const union {
+     int i[4]; ssecomplex_t v;
+-  } signbithigh = {{0,0,0,0x80000000}};
++  } signbithigh = {{0,0,0,(int)0x80000000}};
+   b_re = _mm_xor_pd(b_re, signbithigh.v); // Change sign of high
+   return complex(_mm_mul_pd(a.z_, b_re));
+ }
+@@ -184,14 +184,14 @@
+ inline complex operator- (const complex& a) {
+   static const union { // (signbit,signbit)
+     int i[4]; ssecomplex_t v;
+-  } signbits = {{0,0x80000000,0,0x80000000}};
++  } signbits = {{0,(int)0x80000000,0,(int)0x80000000}};
+   return complex(_mm_xor_pd(a, signbits.v)); // Change sign of both elements
+ }
+ 
+ inline complex conj(const complex& a) {
+   static const union { // (signbit,signbit)
+     int i[4]; ssecomplex_t v;
+-  } signbithigh = {{0,0,0,0x80000000}};
++  } signbithigh = {{0,0,0,(int)0x80000000}};
+   return complex(_mm_xor_pd(a.z_, signbithigh.v)); // Change sign of imag. part
+ }
+ 
diff --git a/sci-libs/libcmatrix/files/3.11.0-shared.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-shared.patch
index 6c5c3167619e..6c5c3167619e 100644
--- a/sci-libs/libcmatrix/files/3.11.0-shared.patch
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-shared.patch
diff --git a/sci-libs/libcmatrix/files/3.2.1-atlas.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch
index b10b41d4e389..b10b41d4e389 100644
--- a/sci-libs/libcmatrix/files/3.2.1-atlas.patch
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.4.patch
index 24c1a89b48d0..24c1a89b48d0 100644
--- a/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.4.patch
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.6.patch
index b3d8c8d19996..b3d8c8d19996 100644
--- a/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.6.patch
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.7.patch
index 633c9d50cf94..633c9d50cf94 100644
--- a/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.7.patch
diff --git a/sci-libs/libcmatrix/files/3.2.1-minuit2.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch
index 24dc5628b8f0..e7a6cec644bf 100644
--- a/sci-libs/libcmatrix/files/3.2.1-minuit2.patch
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch
@@ -1,5 +1,5 @@
---- configure-libraries.ac	2008-03-04 00:48:46.000000000 +0100
-+++ configure-libraries.ac.new	2009-03-19 18:22:21.000000000 +0100
+--- a/configure-libraries.ac
++++ b/configure-libraries.ac
 @@ -14,8 +14,8 @@
  	fi
  	if test x$FOUNDMINUIT = xyes; then
diff --git a/sci-libs/libcmatrix/files/3.2.1-shared.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch
index 4e843027abde..4e843027abde 100644
--- a/sci-libs/libcmatrix/files/3.2.1-shared.patch
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch
diff --git a/sci-libs/libcmatrix/files/3.9.0-atlas.patch b/sci-libs/libcmatrix/files/libcmatrix-3.9.0-atlas.patch
index 329e794645eb..329e794645eb 100644
--- a/sci-libs/libcmatrix/files/3.9.0-atlas.patch
+++ b/sci-libs/libcmatrix/files/libcmatrix-3.9.0-atlas.patch