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

2024-03-10 Thread Michael Orlitzky 
commit: 13e806399cb8fd6a4711ea36aba899c3cc5ad41f
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Mar 11 02:51:37 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Mar 11 02:54:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e80639

sci-mathematics/flint: add 3.1.0

Fixes the pkg-config install location too.

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

 sci-mathematics/flint/Manifest |  1 +
 .../flint/files/flint-3.1.0-fix-pc-install.patch   | 29 
 sci-mathematics/flint/flint-3.1.0.ebuild   | 84 ++
 3 files changed, 114 insertions(+)

diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 730cca7ed921..b1c7fc7e9dbf 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,2 +1,3 @@
 DIST flint-2.9.0.tar.gz 5283894 BLAKE2B 
a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa
 SHA512 
4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
 DIST flint-3.0.1.tar.gz 7624944 BLAKE2B 
0d94252075945f39af3dd2e49803cbe16aa65b108964dfc0c12bdfd9188748944c1e839401e17b974f8f6f8832e4da84d62a63f20b63cfff0ff5c2736bfd2d47
 SHA512 
4b5b432b962135cd708a0ce4242343f3226f0fdf73c3f541728ed4540e7ef6cb7812a48b6b46e65a8fcc1f5cae93d8bb59838d24728024cd9aa0f7b8e5c6f98f
+DIST flint-3.1.0.tar.gz 7585407 BLAKE2B 
697be5bd88e7793eb160d5f0e2110a7b8371ef8d3ca82b576c4cc755983a660a884d35d3cbb442288caa074b7f41699f4c6bc3c244272d9e9f5755d8d209004d
 SHA512 
1d33bb35853f4bdca047899ebb4ac9873748c6d57ad3b6aded32219261e95713fb26b394d8c86f6183b9f44db58697def07e6c565ac789461d5ccc4dca3e9ba7

diff --git a/sci-mathematics/flint/files/flint-3.1.0-fix-pc-install.patch 
b/sci-mathematics/flint/files/flint-3.1.0-fix-pc-install.patch
new file mode 100644
index ..5e0145cb95e7
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-3.1.0-fix-pc-install.patch
@@ -0,0 +1,29 @@
+From f4e0dfda90f6574048578f112bea1013d54f0987 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Sun, 10 Mar 2024 21:48:51 -0400
+Subject: [PATCH 1/1] CMakeLists.txt: install the pkg-config file to the
+ configured libdir
+
+Currently it installs to lib/pkgconfig, which can be incorrect on
+systems where (for example) the normal libdir is lib64 and "lib" is
+reserved for 32-bit libraries.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 30935cef4..d8dfee38d 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -537,7 +537,7 @@ set(PACKAGE_NAME ${PROJECT_NAME})
+ set(PACKAGE_VERSION ${PROJECT_VERSION})
+ configure_file(flint.pc.in flint.pc @ONLY)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flint.pc DESTINATION lib/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flint.pc DESTINATION 
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ if(BUILD_TESTING)
+ set(FLINT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src) # To get src/test/main
+-- 
+2.43.0
+

diff --git a/sci-mathematics/flint/flint-3.1.0.ebuild 
b/sci-mathematics/flint/flint-3.1.0.ebuild
new file mode 100644
index ..f95e430165ae
--- /dev/null
+++ b/sci-mathematics/flint/flint-3.1.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="https://www.flintlib.org/;
+
+# flintlib.org tarballs have been broken in the past, Bill Hart suggests
+# we get them from Github (which he has control over).
+SRC_URI="https://github.com/flintlib/flint/archive/refs/tags/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/19"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   doc? (
+   app-text/texlive-core
+   dev-python/sphinx
+   dev-tex/latexmk
+   dev-texlive/texlive-latex
+   dev-texlive/texlive-latexextra
+   )
+"
+DEPEND="dev-libs/gmp:=
+   dev-libs/mpfr:=
+   ntl? ( dev-libs/ntl:= )
+   virtual/cblas"
+# flint 3 includes arb and arb cannot use flint 3.
+RDEPEND="${DEPEND}
+   !sci-mathematics/arb"
+
+# The rst files are API docs, but they're very low-effort compared to
+# the PDF and HTML docs, so we ship them unconditionally and hide only
+# the painful parts behind USE=doc.
+DOCS="AUTHORS README.md doc/source/*.rst"
+
+PATCHES=(
+   "${FILESDIR}/flint-3.0.1-find-cblas.patch"
+   "${FILESDIR}/${P}-fix-pc-install.patch"
+)
+
+src_configure() {
+   # https://github.com/flintlib/flint/issues/1683
+   append-cflags

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

2023-12-23 Thread Michael Orlitzky 
commit: 92e78412b4cfab142f98c25a4de65386f8f54da9
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Dec 24 04:17:42 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Dec 24 04:18:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e78412

sci-mathematics/flint: add 3.0.1

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

 sci-mathematics/flint/Manifest |  1 +
 .../flint/files/flint-3.0.1-find-cblas.patch   | 44 
 sci-mathematics/flint/flint-3.0.1.ebuild   | 81 ++
 3 files changed, 126 insertions(+)

diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index de7412c463e2..730cca7ed921 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1 +1,2 @@
 DIST flint-2.9.0.tar.gz 5283894 BLAKE2B 
a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa
 SHA512 
4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
+DIST flint-3.0.1.tar.gz 7624944 BLAKE2B 
0d94252075945f39af3dd2e49803cbe16aa65b108964dfc0c12bdfd9188748944c1e839401e17b974f8f6f8832e4da84d62a63f20b63cfff0ff5c2736bfd2d47
 SHA512 
4b5b432b962135cd708a0ce4242343f3226f0fdf73c3f541728ed4540e7ef6cb7812a48b6b46e65a8fcc1f5cae93d8bb59838d24728024cd9aa0f7b8e5c6f98f

diff --git a/sci-mathematics/flint/files/flint-3.0.1-find-cblas.patch 
b/sci-mathematics/flint/files/flint-3.0.1-find-cblas.patch
new file mode 100644
index ..77a9ed2e888f
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-3.0.1-find-cblas.patch
@@ -0,0 +1,44 @@
+From 5cb3535b911c78adb9c8a908104fc4be3ffbfe51 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Sat, 23 Dec 2023 14:38:46 -0500
+Subject: [PATCH 1/1] CMake/FindCBLAS.cmake: search only for cblas
+
+On Gentoo, users can "eselect cblas" to choose a cblas implementation
+at runtime. Packages build against the reference cblas, but the others
+are (by design) compatible, so we can force one to take precedence at
+runtime with an ld.so.conf entry. But that only works when consumers
+link to libcblas.so. If they link directly to (say) openblas, then
+changing how libcblas.so resolves won't help.
+
+When Flint tries to find "cblas," it looks for accelerate and openblas
+before plain cblas. That runs afoul of the scheme described above. To
+remedy it, we patch the search function so that only "cblas" is
+considered. Since virtual/cblas always pulls in the reference
+implementation, there'd be no point in altering the search order to
+consider e.g. openblas after cblas.
+---
+ CMake/FindCBLAS.cmake | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMake/FindCBLAS.cmake b/CMake/FindCBLAS.cmake
+index f5b5b1c..f4919f4 100644
+--- a/CMake/FindCBLAS.cmake
 b/CMake/FindCBLAS.cmake
+@@ -11,13 +11,11 @@
+ find_path(CBLAS_INCLUDE_DIRS NAMES cblas.h
+   HINTS CBLAS_ROOT ENV CBLAS_ROOT
+   PATHS ${INCLUDE_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX}/include
+-  PATH_SUFFIXES openblas cblas blis flexiblas
+   )
+ 
+-find_library(CBLAS_LIBRARIES NAMES accelerate openblas cblas blas blis 
flexiblas
++find_library(CBLAS_LIBRARIES NAMES cblas
+   HINTS CBLAS_ROOT ENV CBLAS_ROOT
+   PATHS ${LIB_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX}/lib
+-  PATH_SUFFIXES openblas cblas blis flexiblas
+   )
+ 
+ include(FindPackageHandleStandardArgs)
+-- 
+2.41.0
+

diff --git a/sci-mathematics/flint/flint-3.0.1.ebuild 
b/sci-mathematics/flint/flint-3.0.1.ebuild
new file mode 100644
index ..7f24b83f5744
--- /dev/null
+++ b/sci-mathematics/flint/flint-3.0.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="https://www.flintlib.org/;
+
+# flintlib.org tarballs have been broken in the past, Bill Hart suggests
+# we get them from Github (which he has control over).
+SRC_URI="https://github.com/flintlib/flint/archive/refs/tags/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/18"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   doc? (
+   app-text/texlive-core
+   dev-python/sphinx
+   dev-tex/latexmk
+   dev-texlive/texlive-latex
+   dev-texlive/texlive-latexextra
+   )
+"
+DEPEND="dev-libs/gmp:=
+   dev-libs/mpfr:=
+   ntl? ( dev-libs/ntl:= )
+   virtual/cblas"
+# flint 3 includes arb and arb cannot use flint 3.
+RDEPEND="${DEPEND}
+   !sci-mathematics/arb"
+
+# The rst files are API docs, but they're very low-effort compared

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

2022-12-19 Thread Andreas Sturmlechner 
commit: c538f82307e643d0b373e7b3dee488d2e7fcae1f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 18 11:47:51 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 19 14:44:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c538f823

sci-mathematics/flint: drop 2.7.1-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-mathematics/flint/Manifest |   1 -
 .../files/flint-2.7.1-fix-cmake-findgmp.patch  | 146 -
 sci-mathematics/flint/flint-2.7.1-r1.ebuild|  70 --
 3 files changed, 217 deletions(-)

diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 7e848b2cdf98..4106b7b4242d 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,4 +1,3 @@
-DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 
9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9
 SHA512 
abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
 DIST flint-2.8.4.tar.gz 5212964 BLAKE2B 
ddd3b9dca76ddac2070d3e12dfc4c5ea1a3b505c7bf28e41489798798d65ed2a5db12e01059816d42e5d1209166d17ee6035dcf0a94d991f78df59c6ad06b271
 SHA512 
1f66574a5f2f27e1f3cd0a334712c0e64f4a4b8dd57179a71f9adba4c4faff23ba8da3993f51c4f44f52a588d0d1678b1e1a272e8fe3367f2abc88e9d86ad804
 DIST flint-2.8.5.tar.gz 5212805 BLAKE2B 
8922a2925b68d93fd35aa5b78eb0b8cbc6aa609498b8846ce4ff036c2fece3932a0eabb0f04a5c152147d8df3eccd6570832f55dafe4f7a35de135246454a83d
 SHA512 
849fb61612f3becfde0d8afc019a9312a7ea07d3000a6bc558eb82babecd737e3af894d3084e4a57d52f7db0403d7298cbfa277b08e2b1f5497897637ed4825f
 DIST flint-2.9.0.tar.gz 5283894 BLAKE2B 
a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa
 SHA512 
4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba

diff --git a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch 
b/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
deleted file mode 100644
index ca6e56ce1970..
--- a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 41c4a0869d68d894cbe74a63612df75fd1e93bdf Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky 
-Date: Mon, 19 Apr 2021 16:56:54 -0400
-Subject: [PATCH 1/1] CMake/FindGMP.cmake: compile a test program to check the
- gmp version.
-
-The existing GMP version check consists of grepping the contents of
-the gmp.h header to parse out a few constants. This test fails, at
-least, on Gentoo, where the usual header file is a wrapper that
-includes the true header to allow for simultaneous 32/64-bit
-support.
-
-This commit updates FindGMP to compile a test program against gmp.h
-that compares version constants using the C preprocessor. If GMP is
-too old, the test program will fail to compile and CMake will know.

- CMake/FindGMP.cmake | 91 +++--
- 1 file changed, 47 insertions(+), 44 deletions(-)
-
-diff --git a/CMake/FindGMP.cmake b/CMake/FindGMP.cmake
-index ce4df70f5..951151274 100644
 a/CMake/FindGMP.cmake
-+++ b/CMake/FindGMP.cmake
-@@ -2,28 +2,23 @@
- # https://gmplib.org/
- #
- # This module supports requiring a minimum version, e.g. you can do
--#   find_package(GMP 6.0.0)
--# to require version 6.0.0 to newer of GMP.
-+#   find_package(GMP 6.2.1)
-+# to require version 6.2.1 to newer of GMP.
- #
- # Once done this will define
- #
- #  GMP_FOUND - system has GMP lib with correct version
- #  GMP_INCLUDE_DIRS - the GMP include directory
- #  GMP_LIBRARIES - the GMP library
--#  GMP_VERSION - GMP version
- #
--# Copyright (c) 2016 Jack Poulson, 
--# Redistribution and use is allowed according to the terms of the BSD license.
- 
--find_path(GMP_INCLUDE_DIRS NAMES gmp.h PATHS $ENV{GMPDIR} 
${INCLUDE_INSTALL_DIR})
--
--# Set GMP_FIND_VERSION to 5.1.0 if no minimum version is specified
-+# Set GMP_FIND_VERSION to 6.0.0 if no minimum version is specified
- if(NOT GMP_FIND_VERSION)
-   if(NOT GMP_FIND_VERSION_MAJOR)
--set(GMP_FIND_VERSION_MAJOR 5)
-+set(GMP_FIND_VERSION_MAJOR 6)
-   endif()
-   if(NOT GMP_FIND_VERSION_MINOR)
--set(GMP_FIND_VERSION_MINOR 1)
-+set(GMP_FIND_VERSION_MINOR 0)
-   endif()
-   if(NOT GMP_FIND_VERSION_PATCH)
- set(GMP_FIND_VERSION_PATCH 0)
-@@ -32,43 +27,51 @@ if(NOT GMP_FIND_VERSION)
- 
"${GMP_FIND_VERSION_MAJOR}.${GMP_FIND_VERSION_MINOR}.${GMP_FIND_VERSION_PATCH}")
- endif()
- 
--if(GMP_INCLUDE_DIRS)
--  # Since the GMP version macros may be in a file included by gmp.h of the 
form
--  # gmp-.*[_]?.*.h (e.g., gmp-x86_64.h), we search each of them.
--  file(GLOB GMP_HEADERS "${GMP_INCLUDE_DIRS}/gmp.h" 
"${GMP_INCLUDE_DIRS}/gmp-*.h"
--

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

2021-08-07 Thread Michael Orlitzky 
commit: 6f50af77c606fcf9477a8e8a34b9a6d698dcc3b8
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Aug  7 03:29:28 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug  7 11:47:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f50af77

sci-mathematics/flint: remove old "unused" versions.

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

 sci-mathematics/flint/Manifest |  2 -
 .../flint/files/flint-2.5.2-memory_message.patch   | 16 -
 sci-mathematics/flint/files/flint-2.5.2-pie.patch  | 78 --
 sci-mathematics/flint/files/flint-2.5.2-utf8.patch | 13 
 .../flint/files/flint-2.6.0-multilib-strict.patch  | 20 --
 sci-mathematics/flint/files/flintxx-include.patch  | 19 --
 sci-mathematics/flint/flint-2.5.2-r1.ebuild| 74 
 sci-mathematics/flint/flint-2.6.3-r1.ebuild| 64 --
 sci-mathematics/flint/metadata.xml |  2 -
 9 files changed, 288 deletions(-)

diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index e1079aba8dc..bf41b8b7db5 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,3 +1 @@
-DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 
36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47
 SHA512 
cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
-DIST flint-2.6.3.tar.gz 4526340 BLAKE2B 
d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13
 SHA512 
8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 
9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9
 SHA512 
abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a

diff --git a/sci-mathematics/flint/files/flint-2.5.2-memory_message.patch 
b/sci-mathematics/flint/files/flint-2.5.2-memory_message.patch
deleted file mode 100644
index 65638aa7790..000
--- a/sci-mathematics/flint/files/flint-2.5.2-memory_message.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This fixes a Python 3 doctest failure in
-rings/polynomial/polynomial_integer_dense_flint.pyx: see #28334.
-See https://github.com/wbhart/flint2/pull/585 for upstream PR
-
-diff --git a/memory_manager.c b/memory_manager.c
-index 04abf8a..bece9f5 100644
 a/memory_manager.c
-+++ b/memory_manager.c
-@@ -41,6 +41,7 @@ pthread_mutex_t register_lock;
- static void flint_memory_error()
- {
- flint_printf("Exception (FLINT memory_manager). Unable to allocate 
memory.\n");
-+fflush(stdout);
- abort();
- }
-

diff --git a/sci-mathematics/flint/files/flint-2.5.2-pie.patch 
b/sci-mathematics/flint/files/flint-2.5.2-pie.patch
deleted file mode 100644
index 442d0254e82..000
--- a/sci-mathematics/flint/files/flint-2.5.2-pie.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-In newer binutils, ld options -r and -pie conflict.
-Patch due to Jörg-Volker Peetz
-(source : https://groups.google.com/d/msg/sage-devel/TduebNoZuBE/sEULolL0BQAJ),
-packaged by Emmanuel Charpentier
-
-diff -ru flint-2.5.2-orig/fq/Makefile flint-2.5.2-new/fq/Makefile
 flint-2.5.2-orig/fq/Makefile   2015-08-13 18:16:22.0 +0200
-+++ flint-2.5.2-new/fq/Makefile2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
-   $(CC) $(CFLAGS) -c $(INCS) $< -o $@
- 
- $(MOD_LOBJ): $(LOBJS)
--  $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+  $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- $(BUILD_DIR)/%.lo: %.c
-   $(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/fq_poly/Makefile flint-2.5.2-new/fq_poly/Makefile
 flint-2.5.2-orig/fq_poly/Makefile  2015-08-13 18:16:22.0 +0200
-+++ flint-2.5.2-new/fq_poly/Makefile   2016-11-07 18:41:09.148996528 +0100
-@@ -35,7 +35,7 @@
-   $(CC) $(CFLAGS) -c $(INCS) $< -o $@
- 
- $(MOD_LOBJ): $(LOBJS)
--  $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+  $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
- 
- $(BUILD_DIR)/%.lo: %.c
-   $(CC) $(PICFLAG) $(CFLAGS) $(INCS) -c $< -o $@
-diff -ru flint-2.5.2-orig/Makefile.subdirs flint-2.5.2-new/Makefile.subdirs
 flint-2.5.2-orig/Makefile.subdirs  2015-08-13 18:16:22.0 +0200
-+++ flint-2.5.2-new/Makefile.subdirs   2016-11-07 18:41:09.144996522 +0100
-@@ -59,7 +59,7 @@
-   $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF 
"$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
- 
- $(MOD_LOBJ): $(LOBJS)
--  $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
-+  $(QUIET_CC) $(CC)

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

2020-06-16 Thread Michael Orlitzky 
commit: 3b0bafb98e2d78db75264322a5561a63d4e34d65
Author: François Bissey  gmail  com>
AuthorDate: Tue Jun 16 10:54:52 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jun 17 01:40:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0bafb9

sci-mathematics/flint: upstream bump to 2.6.0

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Closes: https://github.com/gentoo/gentoo/pull/16267
Closes: https://bugs.gentoo.org/728446
Signed-off-by: François René Pierre Bissey  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/flint/Manifest |  1 +
 .../flint/files/flint-2.6.0-multilib-strict.patch  | 20 +++
 sci-mathematics/flint/flint-2.6.0.ebuild   | 63 ++
 3 files changed, 84 insertions(+)

diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 60823eff1c3..94837defb11 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1 +1,2 @@
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 
36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47
 SHA512 
cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
+DIST flint-2.6.0.tar.gz 4517938 BLAKE2B 
25eeaae93dda01b91d7c76db6cd637ac61199f60cb169998b506eb733b0ed4dbd306c9d370caaf84dd20fbd85779d5b05de52086d82c8bc9afe67a581064462b
 SHA512 
623655a121190d0a1f24305eee323e14f90d2c6451c174133706cde8b62fdf6363d79bfcbe6dce8ffe04bc64d0131d902917f44e0d38c1d647d982710cbc8a8a

diff --git a/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch 
b/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch
new file mode 100644
index 000..84ae3dfc292
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d94776..b04fa78 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -293,10 +293,12 @@ if(NOT MSVC)
+   target_link_libraries(flint PUBLIC m)
+ endif()
+ 
++include(GNUInstallDirs)
++
+ install(TARGETS flint
+-RUNTIME DESTINATION bin
+-ARCHIVE DESTINATION lib
+-LIBRARY DESTINATION lib
++RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
++ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+ )
+ 
+ install(FILES ${HEADERS} DESTINATION include/flint)

diff --git a/sci-mathematics/flint/flint-2.6.0.ebuild 
b/sci-mathematics/flint/flint-2.6.0.ebuild
new file mode 100644
index 000..d6ba11ee4b1
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/;
+SRC_URI="http://www.flintlib.org/${P}.tar.gz;
+
+LICENSE="LGPL-2.1+"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? (
+   dev-python/sphinx
+   app-text/texlive-core
+   dev-texlive/texlive-latex
+   dev-texlive/texlive-latexextra
+   )
+   ${PYTHON_DEPS}"
+DEPEND="dev-libs/gmp:=
+   dev-libs/mpfr:=
+   ntl? ( dev-libs/ntl:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.6.0-multilib-strict.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_NTL="$(usex ntl)"
+   -DBUILD_TESTING="$(usex test)"
+   -DBUILD_DOCS="$(usex doc)"
+   )
+
+   cmake-utils_src_configure
+
+   if use doc ; then
+   HTML_DOCS="${BUILD_DIR}/html/*"
+   DOCS=(
+   "${S}"/README
+   "${S}"/AUTHORS
+   "${S}"/NEWS
+   "${BUILD_DIR}"/latex/Flint.pdf
+   )
+   fi
+}
+
+src_compile() {
+   cmake-utils_src_compile
+
+   if use doc ; then
+   cmake-utils_src_make html
+   cmake-utils_src_make pdf
+   fi
+}

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

2017-09-24 Thread Thomas Deutschmann 
commit: 78913ef011e8aaf88033f9ad8cdc235d118fccf7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Sep 24 19:17:22 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Sep 24 19:17:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78913ef0

sci-mathematics/flint: Fix FTBFS with PIE enabled

Closes: https://bugs.gentoo.org/608704
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch | 17 +
 sci-mathematics/flint/flint-2.4.4-r1.ebuild |  3 ++-
 sci-mathematics/flint/flint-2.4.5.ebuild|  3 ++-
 sci-mathematics/flint/flint-2.5.2.ebuild|  2 ++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch 
b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
new file mode 100644
index 000..5689e3633ee
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
@@ -0,0 +1,17 @@
+Description: invoke $(CC) with -r and not -Wl,-r to fix FTBFS with PIE enabled
+Author: Logan Rosen 
+Forwarded: yes
+
+diff --git a/Makefile.subdirs b/Makefile.subdirs
+index ec05fb0..f2d8b37 100644
+--- a/Makefile.subdirs
 b/Makefile.subdirs
+@@ -59,7 +59,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
+   $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF 
"$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
+ 
+ $(MOD_LOBJ): $(LOBJS)
+-  $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
++  $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
+ 
+ -include $(LOBJS:.lo=.d)
+ 

diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild 
b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
index aca6c9be941..1068395a40c 100644
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
@@ -30,7 +30,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.4.3-libdir.patch \
"${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \
"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
-   "${FILESDIR}"/${PN}-2.4.4-test.patch
+   "${FILESDIR}"/${PN}-2.4.4-test.patch \
+   "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
 
sed -i \
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \

diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild 
b/sci-mathematics/flint/flint-2.4.5.ebuild
index a8293b9632a..b36ea8b5f2b 100644
--- a/sci-mathematics/flint/flint-2.4.5.ebuild
+++ b/sci-mathematics/flint/flint-2.4.5.ebuild
@@ -32,7 +32,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
"${FILESDIR}"/${PN}-2.4.4-test.patch \
"${FILESDIR}"/${PN}-2.4.5-gmp6-compat.patch \
-   "${FILESDIR}"/${PN}-2.4.5-ntl62.patch
+   "${FILESDIR}"/${PN}-2.4.5-ntl62.patch \
+   "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
 
sed -i \
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \

diff --git a/sci-mathematics/flint/flint-2.5.2.ebuild 
b/sci-mathematics/flint/flint-2.5.2.ebuild
index 0217ae0600c..64f94ae79dc 100644
--- a/sci-mathematics/flint/flint-2.5.2.ebuild
+++ b/sci-mathematics/flint/flint-2.5.2.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
)"
 
 src_prepare() {
+   epatch "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
+
sed -i \
-e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
./configure || die