Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/normaliz/files/
Date: Wed, 01 Feb 2017 22:41:29
Message-Id: 1485988760.ef2abb4669103067db05bf61bca5c179c9c2c364.soap@gentoo
1 commit: ef2abb4669103067db05bf61bca5c179c9c2c364
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Feb 1 18:44:24 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 22:39:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef2abb46
7
8 sci-mathematics/normaliz: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/3764
11
12 .../files/normaliz-3.0.0-gmp61-compat.patch | 70 ----------------------
13 1 file changed, 70 deletions(-)
14
15 diff --git a/sci-mathematics/normaliz/files/normaliz-3.0.0-gmp61-compat.patch b/sci-mathematics/normaliz/files/normaliz-3.0.0-gmp61-compat.patch
16 deleted file mode 100644
17 index cf6f81f..00000000
18 --- a/sci-mathematics/normaliz/files/normaliz-3.0.0-gmp61-compat.patch
19 +++ /dev/null
20 @@ -1,70 +0,0 @@
21 -diff --git a/source/libnormaliz/HilbertSeries.cpp b/source/libnormaliz/HilbertSeries.cpp
22 -index 311b839..47a84cd 100644
23 ---- a/source/libnormaliz/HilbertSeries.cpp
24 -+++ b/source/libnormaliz/HilbertSeries.cpp
25 -@@ -399,7 +399,7 @@ void HilbertSeries::computeHilbertQuasiPolynomial() const {
26 - //divide by gcd //TODO operate directly on vector
27 - Matrix<mpz_class> QP(quasi_poly);
28 - mpz_class g = QP.matrix_gcd();
29 -- g = gcd(g,quasi_denom);
30 -+ g = libnormaliz::gcd(g,quasi_denom);
31 - quasi_denom /= g;
32 - QP.scalar_division(g);
33 - //we use a normed shift, so that the cylcic shift % period always yields a non-negative integer
34 -diff --git a/source/libnormaliz/matrix.cpp b/source/libnormaliz/matrix.cpp
35 -index d643eca..ae7684c 100644
36 ---- a/source/libnormaliz/matrix.cpp
37 -+++ b/source/libnormaliz/matrix.cpp
38 -@@ -735,7 +735,7 @@ Integer Matrix<Integer>::matrix_gcd() const{
39 - Integer g=0,h;
40 - for (size_t i = 0; i <nr; i++) {
41 - h = v_gcd(elem[i]);
42 -- g = gcd<Integer>(g, h);
43 -+ g = libnormaliz::gcd<Integer>(g, h);
44 - if (g==1) return g;
45 - }
46 - return g;
47 -@@ -1766,7 +1766,7 @@ vector<Integer> Matrix<Integer>::solve_rectangular(const vector<Integer>& v, Int
48 - return vector<Integer>();
49 - }
50 - }
51 -- Integer total_gcd =gcd(denom,v_gcd(Linear_Form)); // extract the gcd of denom and solution
52 -+ Integer total_gcd = libnormaliz::gcd(denom,v_gcd(Linear_Form)); // extract the gcd of denom and solution
53 - denom/=total_gcd;
54 - v_scalar_division(Linear_Form,total_gcd);
55 - return Linear_Form;
56 -diff --git a/source/libnormaliz/sublattice_representation.cpp b/source/libnormaliz/sublattice_representation.cpp
57 -index e3a7c9d..f5bba3e 100644
58 ---- a/source/libnormaliz/sublattice_representation.cpp
59 -+++ b/source/libnormaliz/sublattice_representation.cpp
60 -@@ -213,7 +213,7 @@ void Sublattice_Representation<Integer>::compose(const Sublattice_Representation
61 -
62 - //check if a factor can be extraced from B //TODO necessary?
63 - Integer g = B.matrix_gcd();
64 -- g = gcd(g,c); //TODO necessary??
65 -+ g = libnormaliz::gcd(g,c); //TODO necessary??
66 - if (g > 1) {
67 - c /= g;
68 - B.scalar_division(g);
69 -diff --git a/source/libnormaliz/vector_operations.cpp b/source/libnormaliz/vector_operations.cpp
70 -index 7c676e9..7103775 100644
71 ---- a/source/libnormaliz/vector_operations.cpp
72 -+++ b/source/libnormaliz/vector_operations.cpp
73 -@@ -240,7 +240,7 @@ Integer v_gcd(const vector<Integer>& v){
74 - size_t i, size=v.size();
75 - Integer g=0;
76 - for (i = 0; i < size; i++) {
77 -- g=gcd(g,v[i]);
78 -+ g = libnormaliz::gcd(g,v[i]);
79 - if (g==1) {
80 - return 1;
81 - }
82 -@@ -255,7 +255,7 @@ Integer v_lcm(const vector<Integer>& v){
83 - size_t i,size=v.size();
84 - Integer g=1;
85 - for (i = 0; i < size; i++) {
86 -- g=lcm(g,v[i]);
87 -+ g = libnormaliz::lcm(g,v[i]);
88 - if (g==0) {
89 - return 0;
90 - }