From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Aug 2021 07:02:28 +0100 Subject: gentoo resync : 11.08.2021 --- sci-mathematics/flint/Manifest | 11 +-- .../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, 1 insertion(+), 296 deletions(-) delete mode 100644 sci-mathematics/flint/files/flint-2.5.2-memory_message.patch delete mode 100644 sci-mathematics/flint/files/flint-2.5.2-pie.patch delete mode 100644 sci-mathematics/flint/files/flint-2.5.2-utf8.patch delete mode 100644 sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch delete mode 100644 sci-mathematics/flint/files/flintxx-include.patch delete mode 100644 sci-mathematics/flint/flint-2.5.2-r1.ebuild delete mode 100644 sci-mathematics/flint/flint-2.6.3-r1.ebuild (limited to 'sci-mathematics/flint') diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest index bcc286dc1352..e46ba08ab143 100644 --- a/sci-mathematics/flint/Manifest +++ b/sci-mathematics/flint/Manifest @@ -1,13 +1,4 @@ -AUX flint-2.5.2-memory_message.patch 504 BLAKE2B ff8ddc685c973f75a133f36eb1284d833dfc35bf42c19c87a55c8b7816c77ed180b1438d782a7cde45025e11f6f30c4105465f2b80507cb42b6bb7d67fd0bc87 SHA512 86c99da2278530caccc3b4e7be06d014664c8f11438cb5dad32b68b91a5997e23366be6433d576ca9515cba5f46227939a1e4131199383ff7d00afe10e3b9d55 -AUX flint-2.5.2-pie.patch 3126 BLAKE2B 730b11cd1a47c476e7e12003a6a493fd019cd9fab7dcd5c691212bf23243378821b52c39bb0c1d0526e912aa6ae6b0d10939a155947932e6ba3df631df4cbf6c SHA512 58e11ac02c861f570887dcf61b1014fcb35e1b47104099a30511ad0ceab9340e4866b72b83f753421d8f33b611b59dbbe3156438789df69e0b3237320884d687 -AUX flint-2.5.2-utf8.patch 625 BLAKE2B ab76e01125f0f483b09c22a30656019963a98629c36e24f85c96800fe587dafaf2dbd2d26d4e319a97a29a6618ce9caa3078da5101a3ac6613f380596855a08d SHA512 cb0bdddd3de1077c01d118b0c9e7052d8510c1be976c44be0465bcaae41e02d6da80f78854e1bbff9ef47584c604b39181a2066dc0630e5effc7c77282d2352a -AUX flint-2.6.0-multilib-strict.patch 622 BLAKE2B d383ce45fb82fabd62530cc15a8bda65f1b088a115985469cd5bfd13d96d0bb9a21d9a073d78aa7ee98f08bd3f75f81445f274777562bca8f317b553cb8483cd SHA512 d360d3d57427d66dedb2f12b2dad03dbbe8530b0bec4184829eed7d8ba534eb8d6e24b302b149dfb852e0415d2612ec9e6312f8f2ac6f0f6a264b8a1f0a66a78 AUX flint-2.7.1-fix-cmake-findgmp.patch 5721 BLAKE2B db31d9e88304ec26a3fdd4ba9d53dd97044487413567e172235260fc238e6a4ad89225788726bdff94f36b699acda45c86025c23be04b895c1857d836a321113 SHA512 a364c4606fb9321443991d1356f9fb7b2c7fb946ad46760e6e1b1172acc1399f19fabd1eec4dbf8e75e1e61be5d8bfa88ac056ccff47d60f4d50fdff6e31193b -AUX flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366efa419dea62ffed2b0b5f95b787019e96fb95b9253b5289d58a2322b41f660f1719516e410e4245b09accb7b SHA512 144dc23d8706e22c6ac5d50bc2ce6c9e2eb8016155bec48a809bceec435d07781105c073b669302132963f063ab1c311e7381f78cc29a0141ca78eceb25aa0dc -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 -EBUILD flint-2.5.2-r1.ebuild 1715 BLAKE2B 3805ac1b99b797b928655535fb506a7851f6072edc96c7f3ed4fd2b93df130d4068a23bec0d3807d188c5198883683a95a5a5ed876eaf71ec6fe44907ace8b7d SHA512 eccb82bd32103efe2f3c732d680be5cfd8ef503e5b24c8b5086942412f59d898b8380759b80bb9ab3faad32943764e6a937e1abeb3ae35480656e1819ab6537c -EBUILD flint-2.6.3-r1.ebuild 1170 BLAKE2B 48d562711cbc2dc0fb758b9f24679a9529e912ccf0008fbeb46d639f099798f69189266e2bda1a6b4c7337dd6dbd82f6fddd9db6a4b1cf7639c4e0d1b5ae3372 SHA512 891e482a3182179ffad15aeced9d8232c8b85b8ff399c3f396c7c36a053746a9e5cdbfb7633d60aa0f6935f41434f1001eb19445ea9dbd9740b8d5a1a901998e EBUILD flint-2.7.1-r1.ebuild 1371 BLAKE2B 859d5bb309b970d5d92e909f8c5573d782d076ed79a23080fb879caba258e35825113823f19a1c5572de726f7f213bd0fc459c088dae48b50bca0fbbb8397552 SHA512 fad00e1482b27ada9a2847638ac1129b90b8c30b5f033af6103509e9181f4dcb6d944ba7ed23ec18c4de51ecb3b9fa8963f13da57e6d0f0a23d7c6e0de1d6ad3 -MISC metadata.xml 737 BLAKE2B 1f88d93a32f6d74075c11e0d29f8f5b8c7cbfed6d2eb943284c49b05bd20484ba392ed5acc7fbdb40defefc76355ce029a882e71f74ee1cc01eed4873a91073a SHA512 36de4a606c13677c8abc469378888f41590a5b8b02be101a106bb7765c2a2f9084d64de59db55106558bbc086e2bb9905c6609e92ea0c03e3a2b4bfcf170ced9 +MISC metadata.xml 639 BLAKE2B bfd10ae2cb1106eb7ff5de9d7005c21d1422e670b764044fbfc835108e6717e8d9f88009c6cf2eb8c248480fc4790db0da442de4e5fc528b69308ca03ca59b16 SHA512 28c46b457e0cc86d0f873e74dbf1de5c14a52f84e9d82fb9ef7c7ff5c7eb718e9b24190d949353f90f94111743e101d3bf6adf7060a8564e7f30d26db1ad42a1 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 65638aa7790b..000000000000 --- 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 442d0254e82d..000000000000 --- 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.000000000 +0200 -+++ flint-2.5.2-new/fq/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/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.000000000 +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.000000000 +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) $(ABI_FLAG) -r $^ -o $@ -nostdlib - - -include $(LOBJS:.lo=.d) - -Seulement dans flint-2.5.2-new/: Makefile.subdirs.orig -diff -ru flint-2.5.2-orig/padic_mat/Makefile flint-2.5.2-new/padic_mat/Makefile ---- flint-2.5.2-orig/padic_mat/Makefile 2015-08-13 18:16:22.000000000 +0200 -+++ flint-2.5.2-new/padic_mat/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/padic_poly/Makefile flint-2.5.2-new/padic_poly/Makefile ---- flint-2.5.2-orig/padic_poly/Makefile 2015-08-13 18:16:22.000000000 +0200 -+++ flint-2.5.2-new/padic_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/qadic/Makefile flint-2.5.2-new/qadic/Makefile ---- flint-2.5.2-orig/qadic/Makefile 2015-08-13 18:16:22.000000000 +0200 -+++ flint-2.5.2-new/qadic/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 --git a/sci-mathematics/flint/files/flint-2.5.2-utf8.patch b/sci-mathematics/flint/files/flint-2.5.2-utf8.patch deleted file mode 100644 index de82fc49dd38..000000000000 --- a/sci-mathematics/flint/files/flint-2.5.2-utf8.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/fmpz_mat/doc/fmpz_mat.txt b/fmpz_mat/doc/fmpz_mat.txt -index 2f07624..d741899 100644 ---- a/fmpz_mat/doc/fmpz_mat.txt -+++ b/fmpz_mat/doc/fmpz_mat.txt -@@ -1114,7 +1114,7 @@ void fmpz_mat_gram(fmpz_mat_t B, const fmpz_mat_t A) - - Sets \code{B} to the Gram matrix of the $m$-dimensional lattice \code{L} in - $n$-dimensional Euclidean space $R^n$ spanned by the rows of -- the $m$ × $n$ matrix \code{A}. Dimensions must be compatible. -+ the $m \times n$ matrix \code{A}. Dimensions must be compatible. - \code{A} and \code{B} are allowed to be the same object if \code{A} is a - square matrix. - 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 deleted file mode 100644 index 84ae3dfc292e..000000000000 --- a/sci-mathematics/flint/files/flint-2.6.0-multilib-strict.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/files/flintxx-include.patch b/sci-mathematics/flint/files/flintxx-include.patch deleted file mode 100644 index cb6744e23645..000000000000 --- a/sci-mathematics/flint/files/flintxx-include.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix include errors with flintxx - -https://github.com/wbhart/flint2/commit/c0768dc54b5ece38252857f8e7423d5ce81a43f7 - - - -diff --git a/flintxx/flint_classes.h b/flintxx/flint_classes.h -index eac2d1a..6baa392 100644 ---- a/flintxx/flint_classes.h -+++ b/flintxx/flint_classes.h -@@ -27,7 +27,7 @@ - // Contrary to other parts of this library, they are tailored very - // specifically towards FLINT. - --#include "flint.h" -+#include "../flint.h" - #include "mp.h" - #include "expression.h" - #include "expression_traits.h" diff --git a/sci-mathematics/flint/flint-2.5.2-r1.ebuild b/sci-mathematics/flint/flint-2.5.2-r1.ebuild deleted file mode 100644 index 4a5052ab0393..000000000000 --- a/sci-mathematics/flint/flint-2.5.2-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -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/13" -KEYWORDS="amd64 ~arm ppc x86" -IUSE="doc gc ntl static-libs" - -BDEPEND="doc? ( - app-text/texlive-core - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra -)" -DEPEND="dev-libs/gmp:= - dev-libs/mpfr:= - gc? ( dev-libs/boehm-gc ) - ntl? ( dev-libs/ntl:= )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/flintxx-include.patch" - "${FILESDIR}/${PN}-2.5.2-pie.patch" - "${FILESDIR}/${PN}-2.5.2-utf8.patch" - "${FILESDIR}/${PN}-2.5.2-memory_message.patch" -) - -src_prepare() { - default - - # The autodetection finds "lib" first, which may e.g. contain 32-bit - # libs during a 64-bit build. - sed -e "s:{GMP_DIR}/lib\":{GMP_DIR}/$(get_libdir)\":g" \ - -e "s:{MPFR_DIR}/lib\":{MPFR_DIR}/$(get_libdir)\":g" \ - -e "s:{NTL_DIR}/lib\":{NTL_DIR}/$(get_libdir)\":g" \ - -e "s:{GC_DIR}/lib\":{GC_DIR}/$(get_libdir)\":g" \ - -i configure || die -} - -src_configure() { - ./configure \ - --prefix="${EPREFIX}/usr" \ - --with-gmp="${EPREFIX}/usr" \ - --with-mpfr="${EPREFIX}/usr" \ - $(usex ntl "--with-ntl=${EPREFIX}/usr" "") \ - $(use_enable static-libs static) \ - $(usex gc "--with-gc=${EPREFIX}/usr" "") \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - || die -} - -src_compile() { - emake verbose - use doc && emake -C doc/latex -} - -src_test() { - emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check -} - -src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install - einstalldocs - use doc && dodoc doc/latex/flint-manual.pdf -} diff --git a/sci-mathematics/flint/flint-2.6.3-r1.ebuild b/sci-mathematics/flint/flint-2.6.3-r1.ebuild deleted file mode 100644 index dcf4d4d0e5ab..000000000000 --- a/sci-mathematics/flint/flint-2.6.3-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..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 ~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:= )" -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 -} diff --git a/sci-mathematics/flint/metadata.xml b/sci-mathematics/flint/metadata.xml index d0d5374ab2f5..276dbeb8557c 100644 --- a/sci-mathematics/flint/metadata.xml +++ b/sci-mathematics/flint/metadata.xml @@ -18,8 +18,6 @@ wbhart/flint2 - Enable garbage collection - support via dev-libs/boehm-gc Build NTL interface -- cgit v1.2.3