commit: 6f50af77c606fcf9477a8e8a34b9a6d698dcc3b8 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sat Aug 7 03:29:28 2021 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sat Aug 7 11:47:12 2021 +0000 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 <mjo <AT> 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..00000000000 --- 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..00000000000 --- 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 de82fc49dd3..00000000000 --- 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 84ae3dfc292..00000000000 --- 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 cb6744e2364..00000000000 --- 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 4a5052ab039..00000000000 --- 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 dcf4d4d0e5a..00000000000 --- 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 d0d5374ab2f..276dbeb8557 100644 --- a/sci-mathematics/flint/metadata.xml +++ b/sci-mathematics/flint/metadata.xml @@ -18,8 +18,6 @@ <remote-id type="github">wbhart/flint2</remote-id> </upstream> <use> - <flag name="gc">Enable garbage collection - support via <pkg>dev-libs/boehm-gc</pkg></flag> <flag name="ntl">Build NTL interface</flag> </use> </pkgmetadata>
