From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E75F1158020 for ; Mon, 19 Dec 2022 14:47:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 175ABE0ADD; Mon, 19 Dec 2022 14:47:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F9CCE0A85 for ; Mon, 19 Dec 2022 14:47:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA37934176E for ; Mon, 19 Dec 2022 14:47:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8D367D8 for ; Mon, 19 Dec 2022 14:47:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1671461095.c538f82307e643d0b373e7b3dee488d2e7fcae1f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/flint/, sci-mathematics/flint/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/flint/Manifest sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch sci-mathematics/flint/flint-2.7.1-r1.ebuild X-VCS-Directories: sci-mathematics/flint/ sci-mathematics/flint/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c538f82307e643d0b373e7b3dee488d2e7fcae1f X-VCS-Branch: master Date: Mon, 19 Dec 2022 14:47:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 33150ec0-4c13-455b-9d3b-abed162e6e25 X-Archives-Hash: dd090890e6b026f46bc88779f6206c51 commit: c538f82307e643d0b373e7b3dee488d2e7fcae1f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 18 11:47:51 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 19 14:44:55 2022 +0000 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..000000000000 --- 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" -- "${GMP_INCLUDE_DIRS}/x86*/gmp.h") -- foreach(gmp_header_filename ${GMP_HEADERS}) -- file(READ "${gmp_header_filename}" _gmp_version_header) -- string(REGEX MATCH -- "define[ \t]+__GNU_MP_VERSION[ \t]+([0-9]+)" _gmp_major_version_match -- "${_gmp_version_header}") -- if(_gmp_major_version_match) -- set(GMP_MAJOR_VERSION "${CMAKE_MATCH_1}") -- string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_MINOR[ \t]+([0-9]+)" -- _gmp_minor_version_match "${_gmp_version_header}") -- set(GMP_MINOR_VERSION "${CMAKE_MATCH_1}") -- string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_PATCHLEVEL[ \t]+([0-9]+)" -- _gmp_patchlevel_version_match "${_gmp_version_header}") -- set(GMP_PATCHLEVEL_VERSION "${CMAKE_MATCH_1}") -- set(GMP_VERSION -- ${GMP_MAJOR_VERSION}.${GMP_MINOR_VERSION}.${GMP_PATCHLEVEL_VERSION}) -- endif() -- endforeach() -+find_path(GMP_INCLUDE_DIRS -+ NAMES gmp.h -+ PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR}) - -- # Check whether found version exists and exceeds the minimum requirement -- if(NOT GMP_VERSION) -- set(GMP_VERSION_OK FALSE) -- message(STATUS "GMP version was not detected") -- elseif(${GMP_VERSION} VERSION_LESS ${GMP_FIND_VERSION}) -- set(GMP_VERSION_OK FALSE) -- message(STATUS "GMP version ${GMP_VERSION} found in ${GMP_INCLUDE_DIRS}, " -- "but at least version ${GMP_FIND_VERSION} is required") -- else() -- set(GMP_VERSION_OK TRUE) -- endif() -+find_library(GMP_LIBRARIES -+ gmp -+ PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR}) -+ -+if(GMP_INCLUDE_DIRS AND GMP_LIBRARIES) -+ -+ # This program will fail to compile if GMP is too old. -+ # We prefer to perform this "test" at compile-time to -+ # avoid problems with e.g. try_run() during cross-compilation. -+ file(WRITE ${PROJECT_BINARY_DIR}/gmp-version-check.c "" -+ "#include \n" -+ "\n" -+ "#define GMP_FIND_VERSION_MAJOR ${GMP_FIND_VERSION_MAJOR}\n" -+ "#define GMP_FIND_VERSION_MINOR ${GMP_FIND_VERSION_MINOR}\n" -+ "#define GMP_FIND_VERSION_PATCH ${GMP_FIND_VERSION_PATCH}\n" -+ "\n" -+ "#if __GNU_MP_VERSION < GMP_FIND_VERSION_MAJOR\n" -+ "#error insufficient GMP major version\n" -+ "#elif __GNU_MP_VERSION == GMP_FIND_VERSION_MAJOR\n" -+ "#if __GNU_MP_VERSION_MINOR < GMP_FIND_VERSION_MINOR\n" -+ "#error insufficient GMP minor version\n" -+ "#elif __GNU_MP_VERSION_MINOR == GMP_FIND_VERSION_MINOR\n" -+ "#if __GNU_MP_VERSION_PATCH < GMP_FIND_VERSION_PATCH\n" -+ "#error insufficient GMP patch version\n" -+ "#endif\n" -+ "#endif\n" -+ "#endif\n" -+ "\n" -+ "int main(int argc, char** argv) { return 0; }\n") -+ -+ # Try to compile the test program above with the appropriate version -+ # strings substituted in. -+ try_compile(GMP_VERSION_OK -+ "${PROJECT_BINARY_DIR}" -+ "${PROJECT_BINARY_DIR}/gmp-version-check.c" -+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${GMP_INCLUDE_DIRS}") - endif() - --find_library(GMP_LIBRARIES gmp PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR}) -+if(NOT GMP_VERSION_OK) -+ message(STATUS "No sufficient GMP version detected") -+endif() - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(GMP DEFAULT_MSG --- -2.26.3 - diff --git a/sci-mathematics/flint/flint-2.7.1-r1.ebuild b/sci-mathematics/flint/flint-2.7.1-r1.ebuild deleted file mode 100644 index f8e7471260ea..000000000000 --- a/sci-mathematics/flint/flint-2.7.1-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ninja doesn't like "-lcblas" so using make. -CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake 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+" - -# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15 -SLOT="0/15" - -KEYWORDS="amd64 ~arm ~arm64 ~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 - dev-tex/latexmk - ) - ${PYTHON_DEPS}" -DEPEND="dev-libs/gmp:= - dev-libs/mpfr:= - ntl? ( dev-libs/ntl:= ) - virtual/cblas" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-fix-cmake-findgmp.patch" ) - -src_configure() { - local mycmakeargs=( - -DWITH_NTL="$(usex ntl)" - -DBUILD_TESTING="$(usex test)" - -DBUILD_DOCS="$(usex doc)" - -DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include" - -DCBLAS_LIBRARIES="-lcblas" - ) - - cmake_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_src_compile - - if use doc ; then - cmake_build html - cmake_build pdf - fi -}