summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-06 17:08:17 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-06 17:08:17 +0200
commitebae2975a18df74c749864ad5e50343a3f3b49d4 (patch)
tree328f8ce17daff33f548075e2102b12855d98f65e /sci-mathematics/flint
parentapp-admin/ansible: 2.9.6 stable amd64/x86 with cleanup (diff)
downloadgentoo-ebae2975a18df74c749864ad5e50343a3f3b49d4.tar.gz
gentoo-ebae2975a18df74c749864ad5e50343a3f3b49d4.tar.bz2
gentoo-ebae2975a18df74c749864ad5e50343a3f3b49d4.zip
sci-mathematics/flint: Drop 2.4.4-r1
Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-mathematics/flint')
-rw-r--r--sci-mathematics/flint/Manifest1
-rw-r--r--sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch33
-rw-r--r--sci-mathematics/flint/files/flint-2.4.3-libdir.patch44
-rw-r--r--sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch54
-rw-r--r--sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch17
-rw-r--r--sci-mathematics/flint/files/flint-2.4.4-test.patch19
-rw-r--r--sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch115
-rw-r--r--sci-mathematics/flint/files/flint-2.4.5-ntl62.patch13
-rw-r--r--sci-mathematics/flint/flint-2.4.4-r1.ebuild71
9 files changed, 0 insertions, 367 deletions
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index e35cd2be74ea..60823eff1c33 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,2 +1 @@
-DIST flint-2.4.4.tar.gz 1639262 BLAKE2B 54162a4d2f02c3e8e441b6a96c1e7ba4e5e8d8ad7b2d36bb7ead49bb112cd94403cb503d1e56621a0a6fedad6387e63dc39888ff3757e298aea55bf55acc4e20 SHA512 236997cf64bdc96741740889f450fdbaf7d7e9b58252645f864d28005c9e7bdf87f7187cd17526606c605f0489f026398a1361b8f209f71158ca3b31c42d86d2
DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
diff --git a/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch b/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch
deleted file mode 100644
index f0a2ec8531b0..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit afadc8d05674a0e3e2fcf6dfbcf5f3c8f9133119
-Author: hasufell <hasufell@hasufell.de>
-Date: Sun May 18 19:32:59 2014 +0200
-
- Respect CFLAGS/CXXFLAGS/LDFLAGS, fixes #66
-
- Even in linking command CFLAGS should be respected, no matter
- if all objects have already been compiled or not. Some flags
- affect both linking and object compilation and users shouldn't
- be required to figure them out. This is standard in most build
- systems anyway.
-
- Reorderd the linker line a bit, so it matches common practice,
- although this doesn't matter technically (except that LDFLAGS
- must go before libraries we link against).
-
-diff --git a/Makefile.in b/Makefile.in
-index a522ac1..6dda689 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -104,10 +104,10 @@ $(FLINT_LIB): $(LOBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) |
- $(AT)$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir); BUILD_DIR=../build/$(dir); export BUILD_DIR; MOD_DIR=$(dir); export MOD_DIR; $(MAKE) -f ../Makefile.subdirs -C $(dir) shared || exit $$?;)
- $(AT)if [ "$(WANT_NTL)" -eq "1" ]; then \
- $(MAKE) build/interfaces/NTL-interface.lo; \
-- $(CXX) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \
-+ $(CXX) $(CXXFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \
- fi
- $(AT)if [ "$(WANT_NTL)" -ne "1" ]; then \
-- $(CC) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \
-+ $(CC) $(CFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \
- fi
-
- libflint.a: $(OBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) | build build/interfaces
diff --git a/sci-mathematics/flint/files/flint-2.4.3-libdir.patch b/sci-mathematics/flint/files/flint-2.4.3-libdir.patch
deleted file mode 100644
index a569be40b8b8..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.3-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 27eb23c1844029ee64907500bd8aa87097ffcd32 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Sun, 18 May 2014 18:46:24 +0200
-Subject: [PATCH] Allow to control LIBDIR
-
-Some distributions have lib32/lib64 and need to control
-the destination properly.
----
- Makefile.in | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c16f838..b6ea4c9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -4,6 +4,8 @@ else
- $(DLPATH):=$(DLPATH_ADD)
- endif
-
-+LIBDIR=lib
-+
- QUIET_CC = @echo ' ' CC ' ' $@;
- QUIET_CXX = @echo ' ' CXX ' ' $@;
- QUIET_AR = @echo ' ' AR ' ' $@;
-@@ -169,13 +171,13 @@ else
- endif
-
- install: library
-- mkdir -p $(DESTDIR)$(PREFIX)/lib
-+ mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
- mkdir -p $(DESTDIR)$(PREFIX)/include/flint
- $(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \
-- cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/lib; \
-+ cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \
- fi
- $(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \
-- cp libflint.a $(DESTDIR)$(PREFIX)/lib; \
-+ cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \
- fi
- cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint
- $(AT)if [ ! -z $(EXT_HEADERS) ]; then \
---
-1.9.3
-
diff --git a/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch b/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch
deleted file mode 100644
index 3d63aedeab3c..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3506d617ef9dfc5184aa99be05a25e4f73d6c3f6 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@hasufell.de>
-Date: Sun, 18 May 2014 18:47:27 +0200
-Subject: [PATCH] Quote variables that could contain whitespaces
-
-Make does NOT take care of this in this context. It's
-not a variable assignment and installation would fail
-if DESTDIR contains any whitespace.
----
- Makefile.in | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index b6ea4c9..a522ac1 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -171,23 +171,23 @@ else
- endif
-
- install: library
-- mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
-- mkdir -p $(DESTDIR)$(PREFIX)/include/flint
-+ mkdir -p "$(DESTDIR)$(PREFIX)/$(LIBDIR)"
-+ mkdir -p "$(DESTDIR)$(PREFIX)/include/flint"
- $(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \
-- cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \
-+ cp $(FLINT_LIB) "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \
- fi
- $(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \
-- cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \
-+ cp libflint.a "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \
- fi
-- cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint
-+ cp $(HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"
- $(AT)if [ ! -z $(EXT_HEADERS) ]; then \
-- cp $(EXT_HEADERS) $(DESTDIR)$(PREFIX)/include/flint; \
-+ cp $(EXT_HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"; \
- fi
-- mkdir -p $(DESTDIR)$(FLINT_CPIMPORT_DIR)
-- cp qadic/CPimport.txt $(DESTDIR)$(FLINT_CPIMPORT_DIR)
-- mkdir -p $(DESTDIR)$(PREFIX)/include/flint/flintxx
-- cp flintxx/*.h $(DESTDIR)$(PREFIX)/include/flint/flintxx
-- cp *xx.h $(DESTDIR)$(PREFIX)/include/flint
-+ mkdir -p "$(DESTDIR)$(FLINT_CPIMPORT_DIR)"
-+ cp qadic/CPimport.txt "$(DESTDIR)$(FLINT_CPIMPORT_DIR)"
-+ mkdir -p "$(DESTDIR)$(PREFIX)/include/flint/flintxx"
-+ cp flintxx/*.h "$(DESTDIR)$(PREFIX)/include/flint/flintxx"
-+ cp *xx.h "$(DESTDIR)$(PREFIX)/include/flint"
-
- build:
- mkdir -p build
---
-1.9.3
-
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
deleted file mode 100644
index 5689e3633ee4..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: invoke $(CC) with -r and not -Wl,-r to fix FTBFS with PIE enabled
-Author: Logan Rosen <logan@ubuntu.com>
-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/files/flint-2.4.4-test.patch b/sci-mathematics/flint/files/flint-2.4.4-test.patch
deleted file mode 100644
index 11b7cfe21115..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.4-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 5e3d4a0504158f70d227e7cfc03985fe9a646797
-Author: hasufell <hasufell@hasufell.de>
-Date: Wed Jul 2 12:58:50 2014 +0200
-
- Fix NTL test build
-
-diff --git a/Makefile.in b/Makefile.in
-index 6dda689..e9de7da 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -214,7 +214,7 @@ build/interfaces/NTL-interface.o: interfaces/NTL-interface.cpp NTL-interface.h
- $(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) -c $< -o $@;
-
- build/interfaces/test/t-NTL-interface$(EXEEXT): interfaces/test/t-NTL-interface.cpp
-- $(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) $< build/interfaces/NTL-interface.o -o $@ $(LIBS);
-+ $(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) $< build/interfaces/NTL-interface.lo -o $@ $(LIBS);
-
- print-%:
- @echo '$*=$($*)'
diff --git a/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch b/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch
deleted file mode 100644
index 559cbe51fb28..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.5-gmp6-compat.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From a7f911140e7d0a0125653a40aa2c5fe257bd78f5 Mon Sep 17 00:00:00 2001
-From: Fredrik Johansson <fredrik.johansson@gmail.com>
-Date: Thu, 18 Sep 2014 14:49:05 +0200
-Subject: [PATCH] redefine fmpz_invmod to consider any integer invertible mod 1
- (for gmp 6.0 compatibility)
-
----
- fmpz/doc/fmpz.txt | 3 ++-
- fmpz/invmod.c | 11 +++++++++--
- fmpz/test/t-invmod.c | 21 +++++++++++++++++----
- 3 files changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/fmpz/doc/fmpz.txt b/fmpz/doc/fmpz.txt
-index fb422d8..2ada719 100644
---- a/fmpz/doc/fmpz.txt
-+++ b/fmpz/doc/fmpz.txt
-@@ -899,7 +899,8 @@ int fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
- Sets $f$ to the inverse of $g$ modulo $h$. The value of $h$ may
- not be $0$ otherwise an exception results. If the inverse exists
- the return value will be non-zero, otherwise the return value will
-- be $0$ and the value of $f$ undefined.
-+ be $0$ and the value of $f$ undefined. As a special case, we
-+ consider any number invertible modulo $h = \pm 1$, with inverse 0.
-
- void fmpz_negmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
-
-diff --git a/fmpz/invmod.c b/fmpz/invmod.c
-index a0cf601..0e20f39 100644
---- a/fmpz/invmod.c
-+++ b/fmpz/invmod.c
-@@ -67,7 +67,11 @@ fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
- if (c2 < WORD(0))
- c2 = -c2;
- if (c2 == WORD(1))
-- return 0; /* special case not handled by n_invmod */
-+ {
-+ fmpz_zero(f);
-+ return 1; /* special case not handled by n_invmod */
-+ }
-+
- gcd = z_gcdinv(&inv, c1, c2);
-
- return (gcd == UWORD(1) ? fmpz_set_si(f, inv), 1 : 0);
-@@ -106,7 +110,10 @@ fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h)
- if (c2 < WORD(0))
- c2 = -c2;
- if (c2 == WORD(1))
-- return 0; /* special case not handled by z_gcd_invert */
-+ {
-+ fmpz_zero(f);
-+ return 1; /* special case not handled by z_gcd_invert */
-+ }
- /* reduce g mod h first */
-
- r = flint_mpz_fdiv_ui(COEFF_TO_PTR(c1), c2);
-diff --git a/fmpz/test/t-invmod.c b/fmpz/test/t-invmod.c
-index aea236e..8ff1c7f 100644
---- a/fmpz/test/t-invmod.c
-+++ b/fmpz/test/t-invmod.c
-@@ -30,6 +30,19 @@
- #include "ulong_extras.h"
- #include "fmpz.h"
-
-+/* Use the definiton of GMP versions >= 6.0 */
-+int
-+mpz_invert2(mpz_t a, const mpz_t b, const mpz_t c)
-+{
-+ if (mpz_cmpabs_ui(c, 1) == 0)
-+ {
-+ mpz_set_ui(a, 0);
-+ return 1;
-+ }
-+ else
-+ return mpz_invert(a, b, c);
-+}
-+
- int
- main(void)
- {
-@@ -63,7 +76,7 @@ main(void)
- fmpz_get_mpz(e, b);
-
- r1 = fmpz_invmod(c, a, b);
-- r2 = mpz_invert(f, d, e);
-+ r2 = mpz_invert2(f, d, e);
-
- fmpz_get_mpz(g, c);
-
-@@ -106,7 +119,7 @@ main(void)
- fmpz_get_mpz(d, a);
-
- r1 = fmpz_invmod(c, a, a);
-- r2 = mpz_invert(f, d, d);
-+ r2 = mpz_invert2(f, d, d);
-
- fmpz_get_mpz(g, c);
-
-@@ -149,7 +162,7 @@ main(void)
- fmpz_get_mpz(e, b);
-
- r1 = fmpz_invmod(a, a, b);
-- r2 = mpz_invert(f, d, e);
-+ r2 = mpz_invert2(f, d, e);
-
- fmpz_get_mpz(g, a);
-
-@@ -192,7 +205,7 @@ main(void)
- fmpz_get_mpz(e, b);
-
- r1 = fmpz_invmod(b, a, b);
-- r2 = mpz_invert(f, d, e);
-+ r2 = mpz_invert2(f, d, e);
-
- fmpz_get_mpz(g, b);
-
diff --git a/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch b/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch
deleted file mode 100644
index e08fa774e298..000000000000
--- a/sci-mathematics/flint/files/flint-2.4.5-ntl62.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -druN flint-2.5.orig/interfaces/NTL-interface.cpp flint-2.5/interfaces/NTL-interface.cpp
---- flint-2.5.orig/interfaces/NTL-interface.cpp 2014-07-16 07:50:40.000000000 -0700
-+++ flint-2.5/interfaces/NTL-interface.cpp 2014-08-26 07:51:55.585884615 -0700
-@@ -32,9 +32,7 @@
- #include <NTL/ZZ.h>
- #include <NTL/ZZX.h>
- #include <NTL/mat_ZZ.h>
--#include <NTL/lip.h>
- #include <NTL/ctools.h>
--#include <NTL/g_lip.h>
- #include <gmp.h>
-
- #include "flint.h"
diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
deleted file mode 100644
index 846ee038654c..000000000000
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-RESTRICT="mirror !test? ( test )"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc gc ntl static-libs test"
-
-RDEPEND="dev-libs/gmp:0=
- dev-libs/mpfr:0
- gc? ( dev-libs/boehm-gc )
- ntl? ( dev-libs/ntl )"
-DEPEND="${RDEPEND}
- doc? (
- app-text/texlive-core
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )"
-
-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-PIE-FTBFS.patch
-
- sed -i \
- -e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
- ./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
-
- if use doc ; then
- emake -C doc/latex
- fi
-}
-
-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
-}