1 |
commit: b14e522ffe5eead45d8850b08c329126d0ec1a09 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 31 10:17:17 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 31 10:17:17 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14e522f |
7 |
|
8 |
sci-mathematics/msieve: Clean up ebuild |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
sci-mathematics/msieve/files/fix-version.patch | 15 ------ |
14 |
sci-mathematics/msieve/files/reduce-printf.patch | 62 ------------------------ |
15 |
sci-mathematics/msieve/msieve-1.53-r1.ebuild | 46 +++++++++--------- |
16 |
3 files changed, 24 insertions(+), 99 deletions(-) |
17 |
|
18 |
diff --git a/sci-mathematics/msieve/files/fix-version.patch b/sci-mathematics/msieve/files/fix-version.patch |
19 |
deleted file mode 100644 |
20 |
index 748a7ae8c68..00000000000 |
21 |
--- a/sci-mathematics/msieve/files/fix-version.patch |
22 |
+++ /dev/null |
23 |
@@ -1,15 +0,0 @@ |
24 |
---- common/driver.c 2011-05-02 09:10:50.000000000 +0800 |
25 |
-+++ common/driver.c.new 2012-11-30 16:43:59.067925006 +0800 |
26 |
-@@ -191,10 +191,9 @@ |
27 |
- |
28 |
- logprintf(obj, "\n"); |
29 |
- logprintf(obj, "\n"); |
30 |
-- logprintf(obj, "Msieve v. %d.%02d (SVN %s)\n", |
31 |
-+ logprintf(obj, "Msieve v. %d.%02d\n", |
32 |
- MSIEVE_MAJOR_VERSION, |
33 |
-- MSIEVE_MINOR_VERSION, |
34 |
-- MSIEVE_SVN_VERSION); |
35 |
-+ MSIEVE_MINOR_VERSION); |
36 |
- start_time = time(NULL); |
37 |
- if (obj->flags & MSIEVE_FLAG_LOG_TO_STDOUT) { |
38 |
- printf("%s", ctime(&start_time)); |
39 |
|
40 |
diff --git a/sci-mathematics/msieve/files/reduce-printf.patch b/sci-mathematics/msieve/files/reduce-printf.patch |
41 |
deleted file mode 100644 |
42 |
index dad1dc7db8f..00000000000 |
43 |
--- a/sci-mathematics/msieve/files/reduce-printf.patch |
44 |
+++ /dev/null |
45 |
@@ -1,62 +0,0 @@ |
46 |
-diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c |
47 |
---- msieve-1.50/common/minimize.c 2011-07-04 23:32:33.000000000 +0800 |
48 |
-+++ msieve-copy/common/minimize.c 2012-11-26 23:09:22.889240528 +0800 |
49 |
-@@ -210,7 +210,7 @@ |
50 |
- } |
51 |
- } |
52 |
- |
53 |
-- printf("too many line iterations\n"); |
54 |
-+ //printf("too many line iterations\n"); |
55 |
- *min_out = x; |
56 |
- *status = 1; |
57 |
- return fx; |
58 |
-diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/optimize.c |
59 |
---- msieve-1.50/gnfs/poly/stage2/optimize.c 2011-10-15 23:03:39.000000000 +0800 |
60 |
-+++ msieve-copy/gnfs/poly/stage2/optimize.c 2012-11-26 23:14:36.243232414 +0800 |
61 |
-@@ -390,7 +390,7 @@ |
62 |
- score = minimize(best, num_vars, tol, 40, |
63 |
- objective, &opt_data); |
64 |
- |
65 |
-- printf("i %u score %le\n", i, score); |
66 |
-+ //printf("i %u score %le\n", i, score); |
67 |
- for (j = 0; j <= rotate_dim; j++) { |
68 |
- double cj = floor(best[ROTATE0 + j] + 0.5); |
69 |
- mpz_set_d(c->gmp_help1, cj); |
70 |
-@@ -422,7 +422,7 @@ |
71 |
- tol = 1e-5; |
72 |
- score = ifs_rectangular(apoly.coeff, apoly.degree, |
73 |
- best[SKEWNESS]); |
74 |
-- printf("transition score %le\n", score); |
75 |
-+ //printf("transition score %le\n", score); |
76 |
- } |
77 |
- } |
78 |
- |
79 |
-@@ -430,9 +430,9 @@ |
80 |
- #if 0 |
81 |
- printf("norm %.7e skew %lf\n", *pol_norm, best[SKEWNESS]); |
82 |
- for (i = 0; i < 2; i++) |
83 |
-- gmp_printf("%+Zd\n", c->gmp_lina[i]); |
84 |
-+ //gmp_printf("%+Zd\n", c->gmp_lina[i]); |
85 |
- for (i = 0; i <= deg; i++) |
86 |
-- gmp_printf("%+Zd\n", c->gmp_a[i]); |
87 |
-+ //gmp_printf("%+Zd\n", c->gmp_a[i]); |
88 |
- #endif |
89 |
- } |
90 |
- |
91 |
-diff -Naur msieve-1.50/gnfs/poly/stage2/stage2.c msieve-copy/gnfs/poly/stage2/stage2.c |
92 |
---- msieve-1.50/gnfs/poly/stage2/stage2.c 2011-10-09 09:32:49.000000000 +0800 |
93 |
-+++ msieve-copy/gnfs/poly/stage2/stage2.c 2012-11-26 23:14:30.894232552 +0800 |
94 |
-@@ -122,10 +122,10 @@ |
95 |
- } |
96 |
- |
97 |
- #if 0 |
98 |
-- gmp_printf("%+Zd\n", c->gmp_lina[0]); |
99 |
-- gmp_printf("%+Zd\n", c->gmp_lina[1]); |
100 |
-+ //gmp_printf("%+Zd\n", c->gmp_lina[0]); |
101 |
-+ //gmp_printf("%+Zd\n", c->gmp_lina[1]); |
102 |
- for (i = 0; i <= degree; i++) |
103 |
-- gmp_printf("%+Zd\n", c->gmp_a[i]); |
104 |
-+ //gmp_printf("%+Zd\n", c->gmp_a[i]); |
105 |
- |
106 |
- printf("coeff ratio = %.5lf\n", |
107 |
- fabs(mpz_get_d(c->gmp_a[degree-2])) / coeff_bound); |
108 |
|
109 |
diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild |
110 |
index 5df9a95f4e7..4cf9b2d6dce 100644 |
111 |
--- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild |
112 |
+++ b/sci-mathematics/msieve/msieve-1.53-r1.ebuild |
113 |
@@ -1,7 +1,7 @@ |
114 |
-# Copyright 1999-2020 Gentoo Authors |
115 |
+# Copyright 1999-2021 Gentoo Authors |
116 |
# Distributed under the terms of the GNU General Public License v2 |
117 |
|
118 |
-EAPI="7" |
119 |
+EAPI=7 |
120 |
|
121 |
inherit toolchain-funcs |
122 |
|
123 |
@@ -14,30 +14,31 @@ SLOT="0" |
124 |
KEYWORDS="~amd64 ~x86" |
125 |
IUSE="zlib +ecm mpi" |
126 |
|
127 |
-DEPEND=" |
128 |
+RDEPEND=" |
129 |
ecm? ( sci-mathematics/gmp-ecm ) |
130 |
mpi? ( virtual/mpi ) |
131 |
- zlib? ( sys-libs/zlib:= )" |
132 |
-RDEPEND="${DEPEND}" |
133 |
+ zlib? ( sys-libs/zlib )" |
134 |
+DEPEND="${RDEPEND}" |
135 |
+ |
136 |
+PATCHES=( |
137 |
+ # TODO: Integrate ggnfs properly |
138 |
+ "${FILESDIR}"/${PN}-1.51-reduce-printf.patch |
139 |
+ "${FILESDIR}"/${PN}-1.53-fix-version.patch |
140 |
+) |
141 |
|
142 |
src_prepare() { |
143 |
default |
144 |
|
145 |
- # TODO: Integrate ggnfs properly |
146 |
- eapply \ |
147 |
- "${FILESDIR}"/${PN}-1.51-reduce-printf.patch \ |
148 |
- "${FILESDIR}"/${PN}-1.53-fix-version.patch |
149 |
- |
150 |
- sed -i -e 's/-march=k8//' Makefile || die |
151 |
- sed -i -e 's/CC =/#CC =/' Makefile || die |
152 |
- sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die |
153 |
+ sed -i -e 's/-march=k8//' Makefile || die |
154 |
+ sed -i -e 's/CC =/#CC =/' Makefile || die |
155 |
+ sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die |
156 |
sed -i -e 's/LIBS += -lecm/LIBS += -lecm -lgomp/' Makefile || die |
157 |
} |
158 |
|
159 |
src_compile() { |
160 |
- use ecm && export "ECM=1" |
161 |
- use mpi && export "MPI=1" |
162 |
- use zlib && export "ZLIB=1" |
163 |
+ use ecm && export ECM=1 |
164 |
+ use mpi && export MPI=1 |
165 |
+ use zlib && export ZLIB=1 |
166 |
emake \ |
167 |
CC=$(tc-getCC) \ |
168 |
AR=$(tc-getAR) \ |
169 |
@@ -46,11 +47,12 @@ src_compile() { |
170 |
} |
171 |
|
172 |
src_install() { |
173 |
- mkdir -p "${ED}/usr/include/msieve" |
174 |
- mkdir -p "${ED}/usr/lib/" |
175 |
- mkdir -p "${ED}/usr/share/doc/${P}/" |
176 |
- cp include/* "${ED}/usr/include/msieve" || die "Failed to install" |
177 |
- cp libmsieve.a "${ED}/usr/lib/" || die "Failed to install" |
178 |
dobin msieve |
179 |
- cp Readme* "${ED}/usr/share/doc/${P}/" || die "Failed to install" |
180 |
+ |
181 |
+ insinto /usr/include/msieve |
182 |
+ doins -r include/. |
183 |
+ |
184 |
+ dolib.a libmsieve.a |
185 |
+ |
186 |
+ dodoc Readme* |
187 |
} |