From 45392c898b8ba163e95028bd98896e77f0c73806 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Oct 2024 04:04:09 +0100 Subject: gentoo auto-resync : 15:10:2024 - 04:04:09 --- sci-mathematics/Manifest.gz | Bin 19346 -> 19341 bytes sci-mathematics/flint/Manifest | 3 +- .../files/flint-3.1.3_p1-fix-pc-location.patch | 26 ++++++ sci-mathematics/flint/flint-3.1.3_p1-r1.ebuild | 90 +++++++++++++++++++++ sci-mathematics/flint/flint-3.1.3_p1.ebuild | 89 -------------------- 5 files changed, 118 insertions(+), 90 deletions(-) create mode 100644 sci-mathematics/flint/files/flint-3.1.3_p1-fix-pc-location.patch create mode 100644 sci-mathematics/flint/flint-3.1.3_p1-r1.ebuild delete mode 100644 sci-mathematics/flint/flint-3.1.3_p1.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index d94202ee1f69..c9e99bd98dc5 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest index bb704a69a211..4ab2642a12c0 100644 --- a/sci-mathematics/flint/Manifest +++ b/sci-mathematics/flint/Manifest @@ -1,5 +1,6 @@ AUX flint-3.0.1-find-cblas.patch 1755 BLAKE2B bdf73d282a98f11126271d1afb5dd27daa2242fbd4923558a720753db85fcc71474ab559822a3549d60c555ab72c8273350c9df3fea2ba4d134bd7a45ec4c089 SHA512 1dc9342031472e59a5ba68540f070dc410134be5d52d7545a780c5b2867fad3c84410c5719ada517a0f2780f384c02487d128e0264bdaa54e8cdf34d2a5b71df AUX flint-3.1.3_p1-c99-I.patch 14288 BLAKE2B b0c030835fa6f239367fd169e428c09551893f4b7a7d525344d33ee8c9756f6652b570543af5bd0ffccc292753bde9dad4cbe933aa71187660fe96852f65fea5 SHA512 7698f3003cab0909a7a42d8c6701a3a4837325aa595ab171781faef482850b1c013dcf9f11e089fe860de7fa7aad0b9f62830b3f41a73343fb0663135f5067e3 +AUX flint-3.1.3_p1-fix-pc-location.patch 1021 BLAKE2B 742529fe63da7433eedf5945d41135ad26cb46de4524c2126b3db029ce1eb75f036579396cdfa16d8c8b91b1b46c4e40b017677e7e51884d169f2c6d1274ef91 SHA512 f33ef280cc6c6e8f28d1bc0c88dd0cd018a9c3066b39c1898e1bb99ef95fb649efb4354c6a29a5210bf0b204820a0c78489f8bd73d895a3cf81aafd89459c7cd DIST flint-3.1.3_p1.tar.gz 7588734 BLAKE2B 87acf8778e21e37c01e12b198ff81e62ab113df3e0e9c6155ff7dd505828f79d5c49d85093e261ea96397e906350caa03477e3ecbdd1fc09d6ae5c984397a2be SHA512 1b16ff2fb9cb2ac4b75513278b8c14683e8d83db39985631df14d6ea74bee4d6ea818a200321d5f0de6f1af89898f7a99dc7088f712f4c6db1a2546199aefba7 -EBUILD flint-3.1.3_p1.ebuild 2091 BLAKE2B 58aef5504347696f5114385657e66f7e784f4e46e7cd39288bbc815f863978d9399c7009a9a30e67379d544d94bbe75091450f057e98a7fd5198f1367828cc74 SHA512 4f7c3760ef481d5e4f0bbda9d7b29c2ab8d0b098cff7191d23fd992d14dc92980a7c4b1143b2d638950ac1ab6681649a3cce091e1075ec47deac277dde39f0de +EBUILD flint-3.1.3_p1-r1.ebuild 2143 BLAKE2B 0fd33eed838547b58b961280b3aacfbb21c4d4829d2edff5e6572b451ccc5f5b2f9fdb4506fbd77034dde8cdb23fa6fd9f3bd8b2a3d1e5ed66b7807dd61dc0aa SHA512 0e3710c96a76ea0bf1a562d661d55a43097b81e6a4a120689d3f8dcd52239d5c3a2a4cac89a7e4e9501e07e47a32cc0ef3dd592799859a1005597ad092542850 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14 diff --git a/sci-mathematics/flint/files/flint-3.1.3_p1-fix-pc-location.patch b/sci-mathematics/flint/files/flint-3.1.3_p1-fix-pc-location.patch new file mode 100644 index 000000000000..82c9fc27d8f2 --- /dev/null +++ b/sci-mathematics/flint/files/flint-3.1.3_p1-fix-pc-location.patch @@ -0,0 +1,26 @@ +From f4e0dfda90f6574048578f112bea1013d54f0987 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Sun, 10 Mar 2024 21:48:51 -0400 +Subject: [PATCH] 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 30935cef47..d8dfee38df 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 diff --git a/sci-mathematics/flint/flint-3.1.3_p1-r1.ebuild b/sci-mathematics/flint/flint-3.1.3_p1-r1.ebuild new file mode 100644 index 000000000000..bca7c62b7b66 --- /dev/null +++ b/sci-mathematics/flint/flint-3.1.3_p1-r1.ebuild @@ -0,0 +1,90 @@ +# 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/" + +MY_PV="${PV/_/-}" +SRC_URI="https://github.com/flintlib/flint/archive/refs/tags/v${MY_PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" +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}/flint-3.1.3_p1-c99-I.patch" + "${FILESDIR}/flint-3.1.3_p1-fix-pc-location.patch" +) + +src_configure() { + # Test failures: + # * https://bugs.gentoo.org/934463 + # * https://github.com/flintlib/flint/issues/2029 + filter-flags -floop-nest-optimize \ + -ftree-loop-linear \ + -floop-strip-mine \ + -floop-block \ + -fgraphite-identity + + local mycmakeargs=( + -DWITH_NTL="$(usex ntl)" + -DBUILD_TESTING="$(usex test)" + -DBUILD_DOCS="$(usex doc)" + ) + + cmake_src_configure + + if use doc; then + # Avoid the "html/_source" directory that will contain a copy of + # the rst sources we've already installed, and also avoid + # installing html/objects.inv. + HTML_DOCS="${BUILD_DIR}/html/*.html + ${BUILD_DIR}/html/*.js + ${BUILD_DIR}/html/_static" + DOCS+=" ${BUILD_DIR}/latex/Flint.pdf" + fi +} + +src_compile() { + cmake_src_compile + + if use doc; then + cmake_build html + cmake_build pdf + fi +} diff --git a/sci-mathematics/flint/flint-3.1.3_p1.ebuild b/sci-mathematics/flint/flint-3.1.3_p1.ebuild deleted file mode 100644 index 4f60961ecba2..000000000000 --- a/sci-mathematics/flint/flint-3.1.3_p1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# 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/" - -MY_PV="${PV/_/-}" -SRC_URI="https://github.com/flintlib/flint/archive/refs/tags/v${MY_PV}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" -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}/flint-3.1.3_p1-c99-I.patch" -) - -src_configure() { - # Test failures: - # * https://bugs.gentoo.org/934463 - # * https://github.com/flintlib/flint/issues/2029 - filter-flags -floop-nest-optimize \ - -ftree-loop-linear \ - -floop-strip-mine \ - -floop-block \ - -fgraphite-identity - - local mycmakeargs=( - -DWITH_NTL="$(usex ntl)" - -DBUILD_TESTING="$(usex test)" - -DBUILD_DOCS="$(usex doc)" - ) - - cmake_src_configure - - if use doc; then - # Avoid the "html/_source" directory that will contain a copy of - # the rst sources we've already installed, and also avoid - # installing html/objects.inv. - HTML_DOCS="${BUILD_DIR}/html/*.html - ${BUILD_DIR}/html/*.js - ${BUILD_DIR}/html/_static" - DOCS+=" ${BUILD_DIR}/latex/Flint.pdf" - fi -} - -src_compile() { - cmake_src_compile - - if use doc; then - cmake_build html - cmake_build pdf - fi -} -- cgit v1.2.3