gentoo Easter resync : 12.04.2020

12 files changed, 2 insertions, 520 deletions

diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 0190da47d9fa..cb817ee0e2a0 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,19 +1,7 @@
-AUX flint-2.4.3-cflags-ldflags.patch 1879 BLAKE2B d4a076d75a5e612b13fffe1ca64fddf9da7c1cb22049039d8adffe7ca9da27fdaac1255125412d7d16c624d3a05fc6275fd211e289e815225910cb605abb01bf SHA512 05fe22492d8e96eeabd30c5b28f8743354e8bf4e593eaf58d8be6bb47341a1c7148c13de681a5983fdae32cc246259ab69cff8b390002c0836ac2ae7d0a9b87e
-AUX flint-2.4.3-libdir.patch 1215 BLAKE2B bd69e1eefd0a4db311d610a4566c458c251ebfe31a34e32019beb475cebcd63352c381347ac65f37bb38f6fb8938e9912e4e2d7cec413f90414c618c27c0021a SHA512 92beca631043d9bf40f8174462a213e56963736b3b3926540cbd010938e57fd8eb3565185e1941d969700566e106adbd006396b65ba9877dbcf6c630287a7ac7
-AUX flint-2.4.3-whitespaces.patch 1929 BLAKE2B f4c7999526dc44621e3979e261cbe1aaf8f1e26fe19f94db63af7e107e12f8b64597f39c95bdfa0a985ce930e26f059a7cd53cc447a8e7071ba903ad8c831309 SHA512 4bfa3bf3d7393ab577988b4def04fb2fe4107679a8f3eb2db7fd2c900d6ba0b79e685f5357d5d99633ea6eb8e4c7c38530f69f35fcfa250d6751e3d1f41a025f
-AUX flint-2.4.4-PIE-FTBFS.patch 615 BLAKE2B ae78b613c652624f7a994074233b71c8cb69dc543359424f37665d78e10bc3d876ec64f031b1d3185bea2080170487e0a2e1815be023a9cd6c4a9b315419e081 SHA512 80b5c7f68a6a31d2e8a8e5182f6eb975bfecfeae4fc30a039d0dd047d7c0351207980d0688de523789d876f098b111c9ab8f26b97bf95cd57a1c2f95ed6e46b1
-AUX flint-2.4.4-test.patch 709 BLAKE2B fab049ce8f75a4632a9a20d6ee0892f5e3b8f7ed65bd8bb1fb887569a86a1474ccc903b815dfdf203b426b74a519234cdb1a3851b1ba7698f4abe54fd12abb0b SHA512 46f66ef5104b535c0004b63cac30bd0dcd66ff554502387597d0ab5f8d7a8189431872510c0666ad99dd7c15ec7756a87b670ef162ad6b085150c6eee7a7a376
-AUX flint-2.4.5-gmp6-compat.patch 3495 BLAKE2B 69ac50eb94ee9d01d6c396024c08f2f7e6c2e3674c04712a63f18d2b8c9c830a903a27f88dfbb8c44841442a42feafd8272718f1654be2b1d9a495045a3b8e12 SHA512 e7caf37d900380eacb5bea67be1d2e78a1468b92dd21c052d8d5b5d362782425b52107cc97dc68ef73e0da494071f01e980e6b1fafed5bfc8a090f8b9e7e5c3b
-AUX flint-2.4.5-ntl62.patch 454 BLAKE2B cec67356f4b94431d11e3e81f9f37259ddf92a2a77678a604879475f3c8251d70ad5d7edf184ca1f0b01f19239b9b26670dae4e5f346353796855b6b82c07d6e SHA512 c19092d0dd4060469e383aa0844cff40ab55d9f4dda77edf5f8dc7f1a8ad833541cdf92d196fc6b21ad43fadcba6d70d0ace4574e1c6828d2c25d9f74094fbb0
 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 flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366efa419dea62ffed2b0b5f95b787019e96fb95b9253b5289d58a2322b41f660f1719516e410e4245b09accb7b SHA512 144dc23d8706e22c6ac5d50bc2ce6c9e2eb8016155bec48a809bceec435d07781105c073b669302132963f063ab1c311e7381f78cc29a0141ca78eceb25aa0dc
-DIST flint-2.4.4.tar.gz 1639262 BLAKE2B 54162a4d2f02c3e8e441b6a96c1e7ba4e5e8d8ad7b2d36bb7ead49bb112cd94403cb503d1e56621a0a6fedad6387e63dc39888ff3757e298aea55bf55acc4e20 SHA512 236997cf64bdc96741740889f450fdbaf7d7e9b58252645f864d28005c9e7bdf87f7187cd17526606c605f0489f026398a1361b8f209f71158ca3b31c42d86d2
-DIST flint-2.4.5.tar.gz 1640022 BLAKE2B 1267d81bb0270556614ebc8bff65287e0b3738ba0f3245f066ee7ea6971ab4d9082beb2c0a336dcd5b9c1517261aaf55c0bee519c6f71984834a7920002ad95c SHA512 088ff512ea2330f9323a6ca0dc875e8c0926d755317d6007eba4b333a14d7612e82ebcfeabd26d1ec4b9204c4517dee08f914ad1ec852e37336fe378710a8bfc
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
-EBUILD flint-2.4.4-r1.ebuild 1556 BLAKE2B df9874dd99c5a624e59d3cfe31e7b76cbcb9186d46cd54374f26b698cf303dbfc887af151bc1ddab8aabc799a560d1325d43a20657dc7039da6f92580ba7984c SHA512 2e32029930d81a5f2e7e23b589a1ff4cb07b06cbddc350d588a50159cef5cbc4b3c05bb1fbf16752313cc98443106d4b0ff3d794bf543100f522ff1f3d71937b
-EBUILD flint-2.4.5.ebuild 1644 BLAKE2B 041ab4f00f44bdd24cbba2d7e41f6ce8a3c3066dfdb2a5af3704c935400ee8d0368b08c1a0034ac80ff580ad08f3d9b6e7e7167893a0a9f93c92933365fe64e4 SHA512 8a2b4c422b2cb28f4dd89fb035a85cc3fbfe725b069f934de2a51a1e114929f80670d047a5c4acca7e585d0f51ba9b6d90f3f38c12bcc8daa557fbf9baa68ca6
-EBUILD flint-2.5.2-r1.ebuild 1712 BLAKE2B 5958681f6035d6ef083c2479cd06ccc9fea58fc4470cc8d9298857379630af4d29589ce0b2f41f08fb512b50267ef37529169287e61489765ddc57794677ebee SHA512 65d3890260fa76fba84e6911923dbbc2907c4b2b13862a7db730812fca1f90e7b31aff724d814c59c60ddf393dc670ec661d1ed2f8dfd4dc3dd3e197e331036c
-EBUILD flint-2.5.2.ebuild 1380 BLAKE2B 2b8e87bfe4d77f3d937a2ed963e894d382694f0bda1b36b3dd8166b994aa0c89f26b921686a9d92702417f7cbdf3d0af17b1e22e48e4e6b859ba4001ef9113b0 SHA512 8faa425010435c1badc4323aad4d2db99c09c79a42103340142bdf442a090857118d74171e11d347a5b844e294d5406f0b1055910312ff53e2594ccadc22a826
+EBUILD flint-2.5.2-r1.ebuild 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
 MISC metadata.xml 481 BLAKE2B f0d2cbeda37050bec654c0cba3c45b7340f37b29aa570c744d0a882f662481e7d8d777f48b0530fa23090807d9ad0a913733f4d55a3661f82322cfe544b90508 SHA512 63b38afaf08270df42d3a26cca9f5f491562dd89d8e9c43def3849a624d6694343147e47a602d75e44a656a8db1f7cb06885534fe39917cb46f2f895efc8ff16
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
-}
diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild b/sci-mathematics/flint/flint-2.4.5.ebuild
deleted file mode 100644
index 36bcaaaea7a9..000000000000
--- a/sci-mathematics/flint/flint-2.4.5.ebuild
+++ /dev/null
@@ -1,73 +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 ~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.5-gmp6-compat.patch \
-		"${FILESDIR}"/${PN}-2.4.5-ntl62.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
-}
diff --git a/sci-mathematics/flint/flint-2.5.2-r1.ebuild b/sci-mathematics/flint/flint-2.5.2-r1.ebuild
index 795bf6e90c61..161e3cc3445d 100644
--- a/sci-mathematics/flint/flint-2.5.2-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.flintlib.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="doc gc ntl static-libs"
 
 BDEPEND="doc? (
diff --git a/sci-mathematics/flint/flint-2.5.2.ebuild b/sci-mathematics/flint/flint-2.5.2.ebuild
deleted file mode 100644
index 0a6ef5a44bd8..000000000000
--- a/sci-mathematics/flint/flint-2.5.2.ebuild
+++ /dev/null
@@ -1,67 +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/13"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc gc ntl static-libs test"
-
-RDEPEND="dev-libs/gmp:=
-	dev-libs/mpfr:=
-	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.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
-}