[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2023-11-24 Thread Arthur Zamarin
commit: 1688e15eb077366ac714c71c9e7b3115455a6bc0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 24 15:12:11 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 24 15:12:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1688e15e

sci-mathematics/gmp-ecm: Stabilize 7.0.5-r1 arm64, #918178

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
index c627f3f4ee8d..ca1ed2e0cdeb 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2023-04-16 Thread WANG Xuerui
commit: 0f058ad625c2bf34e83b8b4763e7ed02f3bc0df7
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Apr 16 05:28:00 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Apr 16 12:03:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f058ad6

sci-mathematics/gmp-ecm: keyword 7.0.5-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
index d3b81e1bc203..4c5cc18e67fa 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/, sci-mathematics/gmp-ecm/files/

2022-11-19 Thread Michael Orlitzky
commit: 59d9451170d735877e7e49f39bfcd491d7e906ce
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Nov 20 00:48:44 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Nov 20 00:48:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d94511

sci-mathematics/gmp-ecm: drop 7.0.4-r4

Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/Manifest   |  1 -
 .../gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch| 49 
 .../gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch   | 25 ---
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild| 86 --
 4 files changed, 161 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 0b39c18a6861..9eed31676504 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,2 +1 @@
-DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
 DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 
7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f
 SHA512 
f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e

diff --git a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch 
b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch
deleted file mode 100644
index 6cca19161911..
--- a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/acinclude.m4 b/acinclude.m4
-index e92d2c9..b602f12 100644
 a/acinclude.m4
-+++ b/acinclude.m4
-@@ -604,32 +604,3 @@ AC_SUBST(CUDALDFLAGS)
- AC_SUBST(CUDARPATH)
- 
- ])
--
--dnl Checks whether the stack can be marked nonexecutable by passing an option
--dnl to the C-compiler when acting on .s files. Appends that option to 
ASMFLAGS.
--dnl This macro is adapted from one found in GMP 6.1.1.
--dnl FIXME: This test looks broken. It tests that a file with 
.note.GNU-stack...
--dnl can be compiled/assembled with -Wa,--noexecstack.  It does not determine
--dnl if that command-line option has any effect on general asm code.
--AC_DEFUN([CL_AS_NOEXECSTACK],[
--dnl AC_REQUIRE([AC_PROG_CC]) GMP uses something else
--AC_CACHE_CHECK([whether assembler supports --noexecstack option],
--cl_cv_as_noexecstack, [dnl
--  cat > conftest.c /dev/null \
-- && AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack
--   -c -o conftest.o conftest.s >/dev/null])
--  then
--cl_cv_as_noexecstack=yes
--  else
--cl_cv_as_noexecstack=no
--  fi
--  rm -f conftest*])
--  if test "$cl_cv_as_noexecstack" = yes; then
--LIBECM_LDFLAGS="$LIBECM_LDFLAGS -Wl,-znoexecstack"
--  fi
--])
-diff --git a/configure.ac b/configure.ac
-index 66a18dc..25b9aba 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -590,7 +590,6 @@ error
-   fi
-   ;;
- esac
--CL_AS_NOEXECSTACK
- AC_SUBST([LIBECM_LDFLAGS])
- 
- 

diff --git a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch 
b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch
deleted file mode 100644
index e382bf4ed28b..
--- a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# fix for https://bugs.gentoo.org/732032 merged upstream
-diff --git a/pm1fs2.c b/pm1fs2.c
-index 4471bf6..89f8077 100644
 a/pm1fs2.c
-+++ b/pm1fs2.c
-@@ -1562,17 +1562,16 @@ list_scale_V (listz_t R, const listz_t F, const 
mpres_t Q,
- #pragma omp parallel if (deg > 1000)
-   {
- mpmod_t modulus_local;
--long i; /* OpenMP insists on signed loop iteration var :( */
- 
- mpmod_init_set (modulus_local, modulus);
- 
- #pragma omp for
--for (i = 0; (unsigned long) i <= 2 * deg - 2; i++)
-+for (i = 0; i <= 2 * deg - 2; i++)
-   mpres_mul_z_to_z (H[i], Vt, H[i], modulus_local);
- mpmod_clear (modulus_local);
-   }
- #else
--  for (i = 0; (unsigned long) i <= 2 * deg - 2; i++)
-+  for (i = 0; i <= 2 * deg - 2; i++)
- mpres_mul_z_to_z (H[i], Vt, H[i], modulus);
- #endif
- 

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
deleted file mode 100644
index 404d71631f44..
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_PN="ecm"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm;

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2022-11-19 Thread Sam James
commit: 9e6e4084856d2a910f310f0448d988ccef115d2c
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 20 00:13:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 20 00:13:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e6e4084

sci-mathematics/gmp-ecm: Stabilize 7.0.5-r1 amd64, #882059

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
index 4aebc124d873..66be53db2089 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2022-11-19 Thread Sam James
commit: 7bd93ba0ff163055297181ff4da765f6491ccdcd
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 20 00:13:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 20 00:13:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd93ba0

sci-mathematics/gmp-ecm: Stabilize 7.0.5-r1 x86, #882059

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
index 66be53db2089..d3b81e1bc203 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2022-11-18 Thread Arthur Zamarin
commit: 9f2933efcb43a36833a39fc372405375f6bfa7bd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 18 17:29:17 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 18 17:29:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2933ef

sci-mathematics/gmp-ecm: Keyword 7.0.5-r1 ppc64, #871921

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
index 8470285a6df1..4aebc124d873 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2022-10-07 Thread Michael Orlitzky
commit: 99594b75e43dcb09056c07ffb3bd4270a916913d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Oct  8 01:15:04 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Oct  8 02:05:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99594b75

sci-mathematics/gmp-ecm: new revision to drop USE=cuda support.

Our CUDA support doesn't work at the moment, and neither François nor I
have access to the hardware. To avoid annoying users, we disable it
until someone who has the hardware can tell us how to fix it.

And while I'm deleting things... we say goodbye to static-libs, too.
They aren't generally useful to end users.

Closes: https://bugs.gentoo.org/873289
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../{gmp-ecm-7.0.5.ebuild => gmp-ecm-7.0.5-r1.ebuild}   | 17 +
 sci-mathematics/gmp-ecm/metadata.xml|  3 ---
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
similarity index 84%
rename from sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
rename to sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
index 42feb39cf26a..8470285a6df1 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
@@ -14,16 +14,13 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~ppc-macos ~x64-macos"
-IUSE="cuda +custom-tune openmp static-libs cpu_flags_x86_sse2"
+IUSE="+custom-tune openmp cpu_flags_x86_sse2"
 
-DEPEND="dev-libs/gmp:=
-   cuda? (
-   dev-util/nvidia-cuda-toolkit
-   x11-drivers/nvidia-drivers
-   )
-"
+DEPEND="dev-libs/gmp:="
 RDEPEND="${DEPEND}"
-# xsltproc is used to produce the manppage in combination with the appropriate 
stylesheet
+
+# xsltproc is used to produce the manppage in combination with the
+# appropriate stylesheet
 BDEPEND="dev-libs/libxslt
app-text/docbook-xsl-stylesheets"
 
@@ -52,16 +49,12 @@ src_compile() {
 src_configure() {
econf \
--enable-shared \
-   $(use_enable static-libs static) \
$(use_enable openmp) \
-   $(use_enable cuda gpu) \
$(use_enable cpu_flags_x86_sse2 sse2) \
$(use_enable custom-tune asm-redc)
 }
 
 src_install() {
default
-
-   # remove .la file
find "${ED}" -name '*.la' -delete || die
 }

diff --git a/sci-mathematics/gmp-ecm/metadata.xml 
b/sci-mathematics/gmp-ecm/metadata.xml
index 3723f0d56e48..e89f3c570a87 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -16,9 +16,6 @@
   
 
   
-
-  Use NVidia's cuda toolkit for computations
-
 
   Improve performance of some operations by selecting
   machine-specific defaults



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2022-05-16 Thread David Seifert
commit: 469d4113139fc891ac59df4a45542acba438e04a
Author: David Seifert  gentoo  org>
AuthorDate: Mon May 16 08:12:25 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon May 16 08:12:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469d4113

sci-mathematics/gmp-ecm: [QA] use tc-check-openmp correctly

Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild | 9 +++--
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild| 6 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index 2a77bd33a96a..404d71631f44 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic toolchain-funcs
+inherit autotools toolchain-funcs
 
 MY_PN="ecm"
 MY_P="${MY_PN}-${PV}"
@@ -27,7 +27,11 @@ PATCHES=(
 S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
-   use openmp && tc-check-openmp
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare(){
@@ -64,6 +68,7 @@ src_compile() {
emake ecm-params && emake clean && emake
fi
 }
+
 src_configure() {
econf \
--enable-shared \

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
index bf4ba87d79a1..42feb39cf26a 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
@@ -30,7 +30,11 @@ BDEPEND="dev-libs/libxslt
 S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
-   use openmp && tc-check-openmp
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2022-05-13 Thread Conrad Kostecki
commit: 6080cacf2cd377d319b617fff83e470497ca45de
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri May 13 22:11:51 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri May 13 22:49:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6080cacf

sci-mathematics/gmp-ecm: fix qa WhitespaceFound

Signed-off-by: Conrad Kostecki  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index a3e4c57b7900..2a77bd33a96a 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ src_prepare(){
# create a sample with the assembly code needed
# Quote around # are needed because the files will be processed by M4.
cat <<-EOF > "${T}/sample.asm"
-   
+
\`#'if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits
\`#'endif



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2022-05-06 Thread Michael Orlitzky
commit: 99942c6ca1519833a3557de313fff0056788f71f
Author: François Bissey  gmail  com>
AuthorDate: Thu May  5 23:31:46 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri May  6 11:42:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99942c6c

sci-mathematics/gmp-ecm: upstream bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://bugs.gentoo.org/842843
Closes: https://github.com/gentoo/gentoo/pull/25341
Signed-off-by: François René Pierre Bissey  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/Manifest |  1 +
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild | 63 
 sci-mathematics/gmp-ecm/metadata.xml |  3 ++
 3 files changed, 67 insertions(+)

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index fce77a75e928..0b39c18a6861 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1 +1,2 @@
 DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
+DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 
7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f
 SHA512 
f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
new file mode 100644
index ..bf4ba87d79a1
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN="ecm"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm;
+SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/${MY_P}.tar.gz;
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~ppc-macos ~x64-macos"
+IUSE="cuda +custom-tune openmp static-libs cpu_flags_x86_sse2"
+
+DEPEND="dev-libs/gmp:=
+   cuda? (
+   dev-util/nvidia-cuda-toolkit
+   x11-drivers/nvidia-drivers
+   )
+"
+RDEPEND="${DEPEND}"
+# xsltproc is used to produce the manppage in combination with the appropriate 
stylesheet
+BDEPEND="dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+   use openmp && tc-check-openmp
+}
+
+src_compile() {
+   default
+   if use custom-tune; then
+   # One "emake" was needed to build the library. Now we can find
+   # the best set of parameters, and then run "emake" one more time
+   # to rebuild the library with the custom parameters. See the
+   # project's README or INSTALL-ecm. The build targets don't 
depend
+   # on ecm-params.h, so we need to "make clean" to force a 
rebuild.
+   emake ecm-params && emake clean && emake
+   fi
+}
+
+src_configure() {
+   econf \
+   --enable-shared \
+   $(use_enable static-libs static) \
+   $(use_enable openmp) \
+   $(use_enable cuda gpu) \
+   $(use_enable cpu_flags_x86_sse2 sse2) \
+   $(use_enable custom-tune asm-redc)
+}
+
+src_install() {
+   default
+
+   # remove .la file
+   find "${ED}" -name '*.la' -delete || die
+}

diff --git a/sci-mathematics/gmp-ecm/metadata.xml 
b/sci-mathematics/gmp-ecm/metadata.xml
index e89f3c570a87..3723f0d56e48 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -16,6 +16,9 @@
   
 
   
+
+  Use NVidia's cuda toolkit for computations
+
 
   Improve performance of some operations by selecting
   machine-specific defaults



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-11-21 Thread Yixun Lan
commit: f5b974585bc66ed9e3d91f1d2ade3a97417f6e40
Author: Alex Fan  gmail  com>
AuthorDate: Fri Nov 19 09:27:15 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Nov 22 03:05:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b97458

sci-mathematics/gmp-ecm: keyword 7.0.4-r4 for ~riscv

Signed-off-by: Alex Fan  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index d090e6592b6d..a3e4c57b7900 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-10-12 Thread Michael Orlitzky
commit: 849d4da0d05fde9eb8382abb4251055b92ce38d7
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Oct 12 08:14:14 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Oct 12 08:18:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849d4da0

sci-mathematics/gmp-ecm: remove old "unused" gmp-ecm-7.0.4-r2.ebuild.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/Manifest|  1 -
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 44 -
 2 files changed, 45 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index f0a304c3ece..fce77a75e92 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,2 +1 @@
 DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
deleted file mode 100644
index ee5812002cc..000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/;
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz;
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
-IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
-
-DEPEND="dev-libs/gmp:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/ecm-${PV}"
-
-pkg_pretend() {
-   use openmp && tc-check-openmp
-}
-
-src_compile() {
-   default
-   if use custom-tune; then
-   # One "emake" was needed to build the library. Now we can find
-   # the best set of parameters, and then run "emake" one more time
-   # to rebuild the library with the custom parameters. See the
-   # project's README or INSTALL-ecm. The build targets don't 
depend
-   # on ecm-params.h, so we need to "make clean" to force a 
rebuild.
-   emake ecm-params && emake clean && emake
-   fi
-}
-src_configure() {
-   econf \
-   --enable-shared \
-   $(use_enable static-libs static) \
-   $(use_enable openmp) \
-   $(use_enable cpu_flags_x86_sse2 sse2) \
-   $(use_enable custom-tune asm-redc)
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-10-12 Thread Agostino Sarubbo
commit: e129e9e61160e2c87cc43e9e751de79024af8ed9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 12 07:14:44 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 12 07:14:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e129e9e6

sci-mathematics/gmp-ecm: x86 stable wrt bug #817674

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index ed60e447609..d090e6592b6 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-10-12 Thread Agostino Sarubbo
commit: 74061aad0f4975ad692e11b6c67aadc2527e89b7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 12 07:09:12 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 12 07:10:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74061aad

sci-mathematics/gmp-ecm: amd64 stable wrt bug #817674

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index 800fcf6b358..ed60e447609 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-06-14 Thread Michael Orlitzky
commit: 8c7da7cc0a7a42cc82475a54a18b80c574ee8cc8
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jun 15 00:22:50 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun 15 00:40:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7da7cc

sci-mathematics/gmp-ecm: remove old "unused" gmp-ecm-7.0.4-r3.ebuild.

Closes: https://bugs.gentoo.org/795819
Closes: https://github.com/gentoo/gentoo/pull/21244
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild | 57 -
 1 file changed, 57 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
deleted file mode 100644
index f36a15f13d2..000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PN="ecm"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm;
-SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17f98056/${MY_P}.tar.gz;
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
-IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
-
-DEPEND="dev-libs/gmp:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-7.0.4-openmp.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-   use openmp && tc-check-openmp
-}
-
-src_compile() {
-   default
-   if use custom-tune; then
-   # One "emake" was needed to build the library. Now we can find
-   # the best set of parameters, and then run "emake" one more time
-   # to rebuild the library with the custom parameters. See the
-   # project's README or INSTALL-ecm. The build targets don't 
depend
-   # on ecm-params.h, so we need to "make clean" to force a 
rebuild.
-   emake ecm-params && emake clean && emake
-   fi
-}
-src_configure() {
-   econf \
-   --enable-shared \
-   $(use_enable static-libs static) \
-   $(use_enable openmp) \
-   $(use_enable cpu_flags_x86_sse2 sse2) \
-   $(use_enable custom-tune asm-redc)
-}
-
-src_install() {
-   default
-
-   # remove .la file
-   find "${ED}" -name '*.la' -delete || die
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/files/, sci-mathematics/gmp-ecm/

2021-06-14 Thread Michael Orlitzky
commit: 9c1907192c06e8030cbf975866ab01b98b577e98
Author: François Bissey  gmail  com>
AuthorDate: Mon Jun 14 23:12:37 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun 15 00:40:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c190719

sci-mathematics/gmp-ecm: fix executable stack for good

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Bug: https://bugs.gentoo.org/795819
Signed-off-by: François René Pierre Bissey  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch| 49 +
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild| 81 ++
 2 files changed, 130 insertions(+)

diff --git a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch 
b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch
new file mode 100644
index 000..6cca1916191
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-execstack.patch
@@ -0,0 +1,49 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index e92d2c9..b602f12 100644
+--- a/acinclude.m4
 b/acinclude.m4
+@@ -604,32 +604,3 @@ AC_SUBST(CUDALDFLAGS)
+ AC_SUBST(CUDARPATH)
+ 
+ ])
+-
+-dnl Checks whether the stack can be marked nonexecutable by passing an option
+-dnl to the C-compiler when acting on .s files. Appends that option to 
ASMFLAGS.
+-dnl This macro is adapted from one found in GMP 6.1.1.
+-dnl FIXME: This test looks broken. It tests that a file with 
.note.GNU-stack...
+-dnl can be compiled/assembled with -Wa,--noexecstack.  It does not determine
+-dnl if that command-line option has any effect on general asm code.
+-AC_DEFUN([CL_AS_NOEXECSTACK],[
+-dnl AC_REQUIRE([AC_PROG_CC]) GMP uses something else
+-AC_CACHE_CHECK([whether assembler supports --noexecstack option],
+-cl_cv_as_noexecstack, [dnl
+-  cat > conftest.c /dev/null \
+- && AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack
+-   -c -o conftest.o conftest.s >/dev/null])
+-  then
+-cl_cv_as_noexecstack=yes
+-  else
+-cl_cv_as_noexecstack=no
+-  fi
+-  rm -f conftest*])
+-  if test "$cl_cv_as_noexecstack" = yes; then
+-LIBECM_LDFLAGS="$LIBECM_LDFLAGS -Wl,-znoexecstack"
+-  fi
+-])
+diff --git a/configure.ac b/configure.ac
+index 66a18dc..25b9aba 100644
+--- a/configure.ac
 b/configure.ac
+@@ -590,7 +590,6 @@ error
+   fi
+   ;;
+ esac
+-CL_AS_NOEXECSTACK
+ AC_SUBST([LIBECM_LDFLAGS])
+ 
+ 

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
new file mode 100644
index 000..800fcf6b358
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN="ecm"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm;
+SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17f98056/${MY_P}.tar.gz;
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
+IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
+
+DEPEND="dev-libs/gmp:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.0.4-openmp.patch
+   "${FILESDIR}"/${PN}-7.0.4-execstack.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+   use openmp && tc-check-openmp
+}
+
+src_prepare(){
+   default
+
+   # patch the asm files
+   # create a sample with the assembly code needed
+   # Quote around # are needed because the files will be processed by M4.
+   cat <<-EOF > "${T}/sample.asm"
+   
+   \`#'if defined(__linux__) && defined(__ELF__)
+   .section .note.GNU-stack,"",%progbits
+   \`#'endif
+   EOF
+
+   # patch the asm files
+   cat "${T}/sample.asm" >> x86_64/mulredc1.asm
+   for i in {2..20} ; do
+   cat "${T}/sample.asm" >> x86_64/mulredc"$i".asm
+   cat "${T}/sample.asm" >> x86_64/mulredc1_"$i".asm
+   done
+
+   eautoreconf
+}
+
+src_compile() {
+   default
+   if use custom-tune; then
+   # One "emake" was needed to build the library. Now we can find
+   # the best set of parameters, and then run "emake" one more time
+   # to rebuild the library with the custom parameters. See the
+   # project's README or INSTALL-ecm. The build targets don't 
depend
+   # on ecm-params.h, so we need to "make clean" to force a 
rebuild.
+   emake ecm-params && emake clean && emake
+   fi
+}
+src_configure() {
+   econf \
+   --enable-shared \
+   $(use_enable static-libs static) \
+   $(use_enable openmp) \
+   $(use_enable cpu_flags_x86_sse2 sse2) \
+ 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-05-31 Thread Michael Orlitzky
commit: 6a33db02ff416c7e53b8326db405f92af92970ca
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon May 31 22:43:43 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon May 31 22:43:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a33db02

sci-mathematics/gmp-ecm: add myself and François Bissey as maintainers.

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/metadata.xml | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/metadata.xml 
b/sci-mathematics/gmp-ecm/metadata.xml
index a10f80bc75f..1922e4c13f3 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -1,8 +1,24 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+
+  
+m...@gentoo.org
+  
+
+  
+frp.bis...@gmail.com
+François Bissey
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+
   
-Improve performance of some operations by 
selecting machine-specific defaults
+
+  Improve performance of some operations by selecting
+  machine-specific defaults
+
   
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-05-31 Thread David Seifert
commit: abc4c0faa8ca69740b63352128814ed03e9cbc10
Author: David Seifert  gentoo  org>
AuthorDate: Mon May 31 20:45:18 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon May 31 20:45:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc4c0fa

sci-mathematics/gmp-ecm: drop inactive maintainer

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/gmp-ecm/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/metadata.xml 
b/sci-mathematics/gmp-ecm/metadata.xml
index b5bb0a9997e..a10f80bc75f 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-patr...@gentoo.org
-Patrick Lauer
-  
+  
   
 Improve performance of some operations by 
selecting machine-specific defaults
   



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-04-18 Thread Andreas Sturmlechner
commit: 54d055e9ebdb2ff79557ae136685701c085f425f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 18 12:05:42 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 18 12:05:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d055e9

sci-mathematics/gmp-ecm: Drop unmaintained live ebuild

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-.ebuild | 48 -
 1 file changed, 48 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild
deleted file mode 100644
index 2a431acc63f..000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/;
-#SRC_URI="https://gforge.inria.fr/frs/download.php/30965/${P}.tar.gz;
-ESVN_REPO_URI="svn://scm.gforge.inria.fr/svnroot/ecm/trunk"
-
-inherit autotools flag-o-matic subversion
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="blas -openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   dev-libs/gmp:0=
-   blas? ( sci-libs/gsl )
-   openmp? ( sys-devel/gcc:*[openmp] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/ecm-${PV}
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-   eautoreconf
-}
-
-src_configure() {
-   # --enable-shellcmd is broken
-   econf $(use_enable openmp) $myconf
-}
-
-src_compile() {
-   append-ldflags "-Wl,-z,noexecstack"
-   # the custom-tune bits are obsoleted with sane defaults
-   default
-}
-
-src_install() {
-   default
-   mkdir -p "${D}/usr/include/${PN}/"
-   cp "${S}"/*.h "${D}/usr/include/${PN}" || die "Failed to copy headers" 
# needed by other apps like YAFU
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-01-24 Thread Sam James
commit: d838dec67d3e9bc8118c9db418aa54b48ac9cb38
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 24 16:14:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 24 16:21:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d838dec6

sci-mathematics/gmp-ecm: restore dropped ~arm{,64}

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
index acc3febe501..f36a15f13d2 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 
SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/, sci-mathematics/gmp-ecm/files/

2021-01-21 Thread Sam James
commit: cafe8af137d1a9e2bfa62e9ebfb20df5cb6e2831
Author: François Bissey  gmail  com>
AuthorDate: Tue Oct 27 00:32:14 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 22 04:28:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafe8af1

sci-mathematics/gmp-ecm: fix #732032, #750716 and update HOME and SRC_URI

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Closes: https://bugs.gentoo.org/732032
Closes: https://bugs.gentoo.org/750716
Signed-off-by: François René Pierre Bissey  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18044
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/gmp-ecm/Manifest   |  1 +
 .../gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch   | 25 ++
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild| 57 ++
 3 files changed, 83 insertions(+)

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index d960832dd1a..f0a304c3ece 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1 +1,2 @@
+DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350

diff --git a/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch 
b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch
new file mode 100644
index 000..e382bf4ed28
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/files/gmp-ecm-7.0.4-openmp.patch
@@ -0,0 +1,25 @@
+# fix for https://bugs.gentoo.org/732032 merged upstream
+diff --git a/pm1fs2.c b/pm1fs2.c
+index 4471bf6..89f8077 100644
+--- a/pm1fs2.c
 b/pm1fs2.c
+@@ -1562,17 +1562,16 @@ list_scale_V (listz_t R, const listz_t F, const 
mpres_t Q,
+ #pragma omp parallel if (deg > 1000)
+   {
+ mpmod_t modulus_local;
+-long i; /* OpenMP insists on signed loop iteration var :( */
+ 
+ mpmod_init_set (modulus_local, modulus);
+ 
+ #pragma omp for
+-for (i = 0; (unsigned long) i <= 2 * deg - 2; i++)
++for (i = 0; i <= 2 * deg - 2; i++)
+   mpres_mul_z_to_z (H[i], Vt, H[i], modulus_local);
+ mpmod_clear (modulus_local);
+   }
+ #else
+-  for (i = 0; (unsigned long) i <= 2 * deg - 2; i++)
++  for (i = 0; i <= 2 * deg - 2; i++)
+ mpres_mul_z_to_z (H[i], Vt, H[i], modulus);
+ #endif
+ 

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
new file mode 100644
index 000..acc3febe501
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PN="ecm"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm;
+SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17f98056/${MY_P}.tar.gz;
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
+
+DEPEND="dev-libs/gmp:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.0.4-openmp.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+   use openmp && tc-check-openmp
+}
+
+src_compile() {
+   default
+   if use custom-tune; then
+   # One "emake" was needed to build the library. Now we can find
+   # the best set of parameters, and then run "emake" one more time
+   # to rebuild the library with the custom parameters. See the
+   # project's README or INSTALL-ecm. The build targets don't 
depend
+   # on ecm-params.h, so we need to "make clean" to force a 
rebuild.
+   emake ecm-params && emake clean && emake
+   fi
+}
+src_configure() {
+   econf \
+   --enable-shared \
+   $(use_enable static-libs static) \
+   $(use_enable openmp) \
+   $(use_enable cpu_flags_x86_sse2 sse2) \
+   $(use_enable custom-tune asm-redc)
+}
+
+src_install() {
+   default
+
+   # remove .la file
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-01-06 Thread Brian Evans
commit: ae1b2b5d0d0e0a1bc02a312718346f47fa69bbc5
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jan  6 21:26:02 2021 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Jan  6 21:29:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae1b2b5d

sci-mathematics/gmp-ecm: Really drop x86-macos

Signed-off-by: Brian Evans  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 1fff65f0cca..ee5812002cc 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -17,9 +17,6 @@ IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 DEPEND="dev-libs/gmp:="
 RDEPEND="${DEPEND}"
 
-# Can't both be enabled.
-REQUIRED_USE="x86-macos? ( !custom-tune )"
-
 S="${WORKDIR}/ecm-${PV}"
 
 pkg_pretend() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2021-01-06 Thread Fabian Groffen
commit: 0edaecf698efc05ef73fdc3d31b18ae5478e03ef
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 15:18:43 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:19:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edaecf6

sci-mathematics/gmp-ecm: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 00cc0de3c93..1fff65f0cca 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz;
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-10-27 Thread Sam James
commit: a9ee98d3b2441717ef9535d8fe3d3602f5e24932
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 27 19:55:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 27 19:55:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ee98d3

sci-mathematics/gmp-ecm: Keyword 7.0.4-r2 arm64, #749927

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 2b76bc93f5b..00cc0de3c93 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz;
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-10-26 Thread Sam James
commit: b06385867dd266dea4e5e9a6a974a357d61cd77f
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 27 05:08:13 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 27 05:08:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0638586

sci-mathematics/gmp-ecm: Keyword 7.0.4-r2 arm, #749927

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 7ed81f19115..2b76bc93f5b 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz;
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-03-09 Thread Michael Orlitzky
commit: fcb61af43cb39edaeab005da0ff0c38e2fd179e2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Mar  9 13:37:01 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Mar  9 13:37:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb61af4

sci-mathematics/gmp-ecm: cleanup old versions.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/Manifest|  1 -
 sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild | 60 -
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild | 55 ---
 3 files changed, 116 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 1459ba43224..d960832dd1a 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,2 +1 @@
-DIST gmp-ecm-6.4.4.tar.gz 941058 BLAKE2B 
e83f02592a8bb86285f258fefc3e302cc516109e7f87835b25412baf526df58e5ea38347acfd926b90fac15b4103981a14aa7b853dba0cb0168467a223e0
 SHA512 
039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
deleted file mode 100644
index 463c145bb3c..000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/;
-SRC_URI="https://gforge.inria.fr/frs/download.php/32159/${P}.tar.gz;
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune -openmp static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   dev-libs/gmp:0=
-   blas? ( sci-libs/gsl )
-   openmp? ( sys-devel/gcc:*[openmp] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/ecm-${PV}
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-   sed -e '/libecm_la_LIBADD/s:$: -lgmp:g' -i Makefile.am || die
-   eautoreconf
-}
-
-src_configure() {
-   # --enable-shellcmd is broken
-   econf \
-   --enable-shared \
-   $(use_enable static-libs static) \
-   $(use_enable openmp) \
-   ${myconf}
-}
-
-src_compile() {
-   append-ldflags "-Wl,-z,noexecstack"
-   if use custom-tune; then
-   use amd64 && cd x86_64
-   use x86 && cd pentium4
-   emake
-   cd .. && make bench_mulredc || die
-   sed -i -e 's:#define TUNE_MULREDC_TABLE://#define 
TUNE_MULREDC_TABLE:g' `readlink ecm-params.h` || die
-   sed -i -e 's:#define TUNE_SQRREDC_TABLE://#define 
TUNE_SQRREDC_TABLE:g' `readlink ecm-params.h` || die
-   ./bench_mulredc | tail -n 4 >> `readlink ecm-params.h` || die
-   fi
-   default
-}
-
-src_install() {
-   default
-   mkdir -p "${ED}/usr/include/${PN}/"
-   cp "${S}"/*.h "${ED}/usr/include/${PN}" || die "Failed to copy headers" 
# needed by other apps like YAFU
-}

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
deleted file mode 100644
index e650e69207f..000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/;
-SRC_URI="https://gforge.inria.fr/frs/download.php/36224/${P}.tar.gz;
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune -openmp static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   dev-libs/gmp:0=
-   blas? ( sci-libs/gsl )
-   openmp? ( sys-devel/gcc:*[openmp] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/ecm-${PV}
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-   sed -e '/libecm_la_LIBADD/s:$: -lgmp:g' -i Makefile.am || die
-   eautoreconf
-}
-
-src_configure() {
-   # --enable-shellcmd is broken
-   econf \
-   --enable-shared \
-   $(use_enable static-libs static) \
-   $(use_enable openmp) \
-   ${myconf}
-}
-
-src_compile() {
-   append-ldflags "-Wl,-z,noexecstack"
-   if use custom-tune; then
-   emake && emake ecm-params # need to build all to get benchmark 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-03-09 Thread Agostino Sarubbo
commit: 5324b4e99cfbad623585651b01bed213ea53b9e8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  9 12:48:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  9 12:48:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5324b4e9

sci-mathematics/gmp-ecm: x86 stable wrt bug #711872

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 60519d2c2bc..7ed81f19115 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz;
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-03-09 Thread Agostino Sarubbo
commit: 1e3ce8b70ec8d3c9bc21c028250b5513283947d6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  9 12:39:43 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  9 12:39:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3ce8b7

sci-mathematics/gmp-ecm: amd64 stable wrt bug #711872

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index f93af7a063f..60519d2c2bc 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz;
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-03-02 Thread Michael Orlitzky
commit: f503f4650237eee281e0fb2b1afab795af2b21c5
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Mar  2 14:03:40 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Mar  2 17:20:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f503f465

sci-mathematics/gmp-ecm: add "emake clean" to force a rebuild.

Taking another shot at making USE=custom-tune do what it's supposed to
do. The project's targets don't depend on ecm-params.h, so after we
generate them, we need to "emake clean" and rebuild everything
manually in order to use the custom parameters.

Bug: https://bugs.gentoo.org/711078
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index fa9bae77856..f93af7a063f 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -32,8 +32,9 @@ src_compile() {
# One "emake" was needed to build the library. Now we can find
# the best set of parameters, and then run "emake" one more time
# to rebuild the library with the custom parameters. See the
-   # project's README or INSTALL-ecm
-   emake ecm-params && emake
+   # project's README or INSTALL-ecm. The build targets don't 
depend
+   # on ecm-params.h, so we need to "make clean" to force a 
rebuild.
+   emake ecm-params && emake clean && emake
fi
 }
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-03-01 Thread Michael Orlitzky
commit: 01fa816214124421eb411b4fe0136af92cdc314a
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Mar  1 13:28:15 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Mar  1 13:58:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fa8162

sci-mathematics/gmp-ecm: fix USE=custom-tune.

I overzealously removed the series of steps needed to build gmp-ecm
with custom parameters in the -r2. We need to build, find the custom
parameters, and then build again to reap the benefits. I left a
comment in the ebuild to explain that to other, future mes.

Bug: https://bugs.gentoo.org/711078
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 62d2aabe95e..fa9bae77856 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -26,6 +26,16 @@ pkg_pretend() {
use openmp && tc-check-openmp
 }
 
+src_compile() {
+   default
+   if use custom-tune; then
+   # One "emake" was needed to build the library. Now we can find
+   # the best set of parameters, and then run "emake" one more time
+   # to rebuild the library with the custom parameters. See the
+   # project's README or INSTALL-ecm
+   emake ecm-params && emake
+   fi
+}
 src_configure() {
econf \
--enable-shared \



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-02-29 Thread Michael Orlitzky
commit: 960d8a87276d41050e18b644d6b4409c23ba2bdc
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Feb 29 16:02:02 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Feb 29 16:03:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960d8a87

sci-mathematics/gmp-ecm: fix openmp check.

I screwed up the openmp check during translation from a manual
tc-has-openmp() check to tc-check-openmp(). Fixed now, sorry!

Closes: https://bugs.gentoo.org/711078
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 98a97183de0..62d2aabe95e 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz;
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+custom-tune -openmp static-libs cpu_flags_x86_sse2"
+IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="
 RDEPEND="${DEPEND}"
@@ -23,7 +23,7 @@ REQUIRED_USE="x86-macos? ( !custom-tune )"
 S="${WORKDIR}/ecm-${PV}"
 
 pkg_pretend() {
-   tc-check-openmp
+   use openmp && tc-check-openmp
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2020-02-28 Thread Michael Orlitzky
commit: 4bbb8b0f1cb8b3c8a42775c5077e610ad7f4f558
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Feb 28 13:34:04 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Feb 28 13:36:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bbb8b0f

sci-mathematics/gmp-ecm: new EAPI=7 revision.

The dependencies and build system of gmp-ecm have been improved over
the years, and much of the cruft in the ebuild could simply be
deleted. This commit adds an -r2, based on François Bissey's ebuild in
the sage-on-gentoo overlay, to modernize things. I've manually verified
the diff for sanity, and the test suite passes for me on amd64.

Closes: https://bugs.gentoo.org/466498
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild | 36 +
 1 file changed, 36 insertions(+)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
new file mode 100644
index 000..98a97183de0
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="http://ecm.gforge.inria.fr/;
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz;
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+custom-tune -openmp static-libs cpu_flags_x86_sse2"
+
+DEPEND="dev-libs/gmp:="
+RDEPEND="${DEPEND}"
+
+# Can't both be enabled.
+REQUIRED_USE="x86-macos? ( !custom-tune )"
+
+S="${WORKDIR}/ecm-${PV}"
+
+pkg_pretend() {
+   tc-check-openmp
+}
+
+src_configure() {
+   econf \
+   --enable-shared \
+   $(use_enable static-libs static) \
+   $(use_enable openmp) \
+   $(use_enable cpu_flags_x86_sse2 sse2) \
+   $(use_enable custom-tune asm-redc)
+}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2019-10-16 Thread Sergei Trofimovich
commit: 8d0127eebc78c40a53504ed1e4c409250831a11c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Oct 16 08:24:27 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Oct 16 08:24:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0127ee

sci-mathematics/gmp-ecm: drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/gmp-ecm/Manifest|  1 -
 sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild | 50 -
 2 files changed, 51 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 5306618db19..1459ba43224 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,3 +1,2 @@
-DIST gmp-ecm-6.4.3.tar.gz 944719 BLAKE2B 
aa07f0b6c4a4b0d3bb36b596ddbaefd259b2387fa0295a829c8e239b0edde0e1f3887bff19a6b0b67083cbec7706fa41214a21eeca8b83eb4b3f7e3cc372c113
 SHA512 
71ccdf3b48e96b0acad45302c87a7b17a20ad289efde212a34fb11491531b96848f1824606fdab7604874ca7d8165baba4bbfbc8424e27e884ad0d4f56a6
 DIST gmp-ecm-6.4.4.tar.gz 941058 BLAKE2B 
e83f02592a8bb86285f258fefc3e302cc516109e7f87835b25412baf526df58e5ea38347acfd926b90fac15b4103981a14aa7b853dba0cb0168467a223e0
 SHA512 
039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
deleted file mode 100644
index 0a752d428d6..000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/;
-SRC_URI="https://gforge.inria.fr/frs/download.php/30965/${P}.tar.gz;
-
-inherit eutils
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune -openmp test"
-
-# gmp 5.1 breaks a few things with this version
-DEPEND="> `readlink ecm-params.h` || die
-   fi
-   emake -j1 || die
-}
-
-src_install() {
-   emake DESTDIR="${D}" install || die
-   mkdir -p "${D}/usr/include/${PN}/"
-   cp "${S}"/*.h "${D}/usr/include/${PN}" || die "Failed to copy headers" 
# needed by other apps like YAFU
-}
-
-src_test() {
-   make check || die
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2019-09-15 Thread 罗百科
commit: 0b5a793dab90853dce0fb1d202f157c6ed415f18
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Sep 15 10:41:52 2019 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Sep 15 10:41:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5a793d

sci-mathematics/gmp-ecm: Fix custom-tune useflag

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Patrick Lauer  gentoo.org>

 .../gmp-ecm/{gmp-ecm-7.0.4.ebuild => gmp-ecm-7.0.4-r1.ebuild}  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
similarity index 92%
rename from sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild
rename to sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
index 54f7a1bbd2d..67ee9231661 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
@@ -41,8 +41,7 @@ src_configure() {
 src_compile() {
append-ldflags "-Wl,-z,noexecstack"
if use custom-tune; then
-   use amd64 && cd x86_64
-   use x86 && cd pentium4
+   emake && emake ecm-params # need to build all to get benchmark 
bits, then run benchmark
emake
fi
default



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2019-08-25 Thread 罗百科
commit: 086077afa79e55f21c9285dec27752f18a34833b
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Aug 25 14:44:13 2019 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Aug 25 14:44:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086077af

sci-mathematics/gmp-ecm: Bump

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Patrick Lauer  gentoo.org>

 sci-mathematics/gmp-ecm/Manifest |  1 +
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild | 55 
 2 files changed, 56 insertions(+)

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index aa8aa2b10d4..5306618db19 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,2 +1,3 @@
 DIST gmp-ecm-6.4.3.tar.gz 944719 BLAKE2B 
aa07f0b6c4a4b0d3bb36b596ddbaefd259b2387fa0295a829c8e239b0edde0e1f3887bff19a6b0b67083cbec7706fa41214a21eeca8b83eb4b3f7e3cc372c113
 SHA512 
71ccdf3b48e96b0acad45302c87a7b17a20ad289efde212a34fb11491531b96848f1824606fdab7604874ca7d8165baba4bbfbc8424e27e884ad0d4f56a6
 DIST gmp-ecm-6.4.4.tar.gz 941058 BLAKE2B 
e83f02592a8bb86285f258fefc3e302cc516109e7f87835b25412baf526df58e5ea38347acfd926b90fac15b4103981a14aa7b853dba0cb0168467a223e0
 SHA512 
039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097
+DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 
6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c
 SHA512 
b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild
new file mode 100644
index 000..54f7a1bbd2d
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="http://ecm.gforge.inria.fr/;
+SRC_URI="https://gforge.inria.fr/frs/download.php/36224/${P}.tar.gz;
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+blas +custom-tune -openmp static-libs test"
+
+DEPEND="
+   dev-libs/gmp:0=
+   blas? ( sci-libs/gsl )
+   openmp? ( sys-devel/gcc:*[openmp] )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/ecm-${PV}
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+   sed -e '/libecm_la_LIBADD/s:$: -lgmp:g' -i Makefile.am || die
+   eautoreconf
+}
+
+src_configure() {
+   # --enable-shellcmd is broken
+   econf \
+   --enable-shared \
+   $(use_enable static-libs static) \
+   $(use_enable openmp) \
+   ${myconf}
+}
+
+src_compile() {
+   append-ldflags "-Wl,-z,noexecstack"
+   if use custom-tune; then
+   use amd64 && cd x86_64
+   use x86 && cd pentium4
+   emake
+   fi
+   default
+}
+
+src_install() {
+   default
+   mkdir -p "${ED}/usr/include/${PN}/"
+   cp "${S}"/*.h "${ED}/usr/include/${PN}" || die "Failed to copy headers" 
# needed by other apps like YAFU
+}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2019-06-23 Thread David Seifert
commit: 5394f2ed078e80cf22b8d957c3799e4808056a8f
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jun 23 18:13:44 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jun 23 18:13:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5394f2ed

sci-mathematics/gmp-ecm: Remove dep on sci-mathematics/gwnum

Closes: https://github.com/gentoo/gentoo/pull/12313
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild | 9 ++---
 sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild | 9 ++---
 sci-mathematics/gmp-ecm/gmp-ecm-.ebuild | 9 ++---
 sci-mathematics/gmp-ecm/metadata.xml| 1 -
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
index e6069353208..0a752d428d6 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,22 +11,17 @@ inherit eutils
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune gwnum -openmp test"
+IUSE="+blas +custom-tune -openmp test"
 
 # gmp 5.1 breaks a few things with this version
 DEPEND="https://gforge.inria.fr/frs/download.php/32159/${P}.tar.gz;
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune gwnum -openmp static-libs test"
+IUSE="+blas +custom-tune -openmp static-libs test"
 
 DEPEND="
dev-libs/gmp:0=
blas? ( sci-libs/gsl )
-   gwnum? ( sci-mathematics/gwnum )
openmp? ( sys-devel/gcc:*[openmp] )"
 RDEPEND="${DEPEND}"
 
-# can't be both enabled
-REQUIRED_USE="gwnum? ( !openmp )"
-
 S=${WORKDIR}/ecm-${PV}
 
 MAKEOPTS+=" -j1"
@@ -34,7 +30,6 @@ src_prepare() {
 }
 
 src_configure() {
-   use gwnum && local myconf="--with-gwnum="${EPREFIX}"/usr/$(get_libdir)"
# --enable-shellcmd is broken
econf \
--enable-shared \

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild
index a7936e1d8ea..728b19ecd52 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,18 +13,14 @@ inherit autotools eutils flag-o-matic subversion
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="blas gwnum -openmp test"
+IUSE="blas -openmp test"
 
 DEPEND="
dev-libs/gmp:0=
blas? ( sci-libs/gsl )
-   gwnum? ( sci-mathematics/gwnum )
openmp? ( sys-devel/gcc:*[openmp] )"
 RDEPEND="${DEPEND}"
 
-# can't be both enabled
-REQUIRED_USE="gwnum? ( !openmp )"
-
 S=${WORKDIR}/ecm-${PV}
 
 MAKEOPTS+=" -j1"
@@ -34,7 +30,6 @@ src_prepare() {
 }
 
 src_configure() {
-   if use gwnum; then myconf="--with-gwnum=/usr/lib"; fi
# --enable-shellcmd is broken
econf $(use_enable openmp) $myconf
 }

diff --git a/sci-mathematics/gmp-ecm/metadata.xml 
b/sci-mathematics/gmp-ecm/metadata.xml
index 928a8daa207..b5bb0a9997e 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -7,6 +7,5 @@
   
   
 Improve performance of some operations by 
selecting machine-specific defaults
-Use GWNum lib where possible
   
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2016-05-14 Thread David Seifert
commit: 45c2ec0e8fce4c1a399dfe8ee0bfccc94f19e6be
Author: David Seifert  gentoo  org>
AuthorDate: Sat May 14 22:58:55 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May 14 23:16:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c2ec0e

sci-mathematics/gmp-ecm: Fix QA MissingSlotDep

Package-Manager: portage-2.2.28

 sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
index 329a7d5..0f6024c 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+blas +custom-tune gwnum -openmp static-libs test"
 
 DEPEND="
-   dev-libs/gmp
+   dev-libs/gmp:0=
blas? ( sci-libs/gsl )
gwnum? ( sci-mathematics/gwnum )
-   openmp? ( sys-devel/gcc[openmp] )"
+   openmp? ( sys-devel/gcc:*[openmp] )"
 RDEPEND="${DEPEND}"
 
 # can't be both enabled



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gmp-ecm/

2016-05-14 Thread David Seifert
commit: a5267052b6c38f1e26f92d830af71bf1faa7c921
Author: David Seifert  gentoo  org>
AuthorDate: Sat May 14 23:01:18 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May 14 23:16:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5267052

sci-mathematics/gmp-ecm: Fix QA MissingSlotDep

Package-Manager: portage-2.2.28

 sci-mathematics/gmp-ecm/gmp-ecm-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild 
b/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild
index 0c39ab7..0442422 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,10 +17,10 @@ KEYWORDS=""
 IUSE="blas gwnum -openmp test"
 
 DEPEND="
-   dev-libs/gmp
+   dev-libs/gmp:0=
blas? ( sci-libs/gsl )
gwnum? ( sci-mathematics/gwnum )
-   openmp? ( sys-devel/gcc[openmp] )"
+   openmp? ( sys-devel/gcc:*[openmp] )"
 RDEPEND="${DEPEND}"
 
 # can't be both enabled