gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /sci-mathematics
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
43 files changed, 723 insertions, 757 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 405c2a38bca4..6a43a26397a6 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 49486bb48265..2ee260903c55 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,4 +1,7 @@
 AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1c1cc6a3ac2edea5e27d6f8ba082fc209c3694e1144a94d9d3b1897418af250252ff40a26e521bbf72d7da0f SHA512 b6b7af8c48c0398375343c8fa72f3e15d8f9031848cf94e6e2880f04b5e8d695691dcf67b84daa1706464289f7db0300046af4c93adcf278f7951eccc734af89
+AUX cvc4-1.8-gentoo.patch 1655 BLAKE2B 019d1cd6cc1b95042f4a04470c659a0e6b14e6e4d45eee16187feed1ee7664564e29a230b6d859ad70a3f2e442a44cb1ae296617e29cd894106a10e290490ee3 SHA512 1cf38e1d817f9347308dd982c6ff1f6344d654fda69fc6a2313cf6c9fbeb331cc168e002a1f9731c5481ed063aa5feb360014d60fd0e1cc55a6aeeea44ac13c0
 DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
+DIST cvc4-1.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445
 EBUILD cvc4-1.7-r1.ebuild 1379 BLAKE2B c806041f0941649a8108f6148ad2226647721a9396e5d8d889649e3185ba229aaa405ab1a22409aa4d1b7a21142213646df734e24bcec26b5899bbd114d92aff SHA512 d4ad9b8b61f48feb744d3ea5f6964112e63e9beba1f156b997bcde57a2aed295a54e3e93444d9570d997979a81b3fd74cae5f4fd335df201b504ba2ab9b67469
+EBUILD cvc4-1.8.ebuild 1294 BLAKE2B b582be8424ee773310d4decdf2a03f7144037a80e117584dd9961b4a4548119cd553ddc30ea7ab5beaae3e6ec37b062993931a2d7c48c15b230c9b9efd0fda97 SHA512 0192be6902b0482a229581f8a7fb33ffe884ef101021959cf4f2cc98acec1bb344a21f18f57d43150681b058c0a83c0c7252e5a238c51315c3617a3194cc8ddf
 MISC metadata.xml 801 BLAKE2B a8dffba2bb9a740412d4193911d1ab118336993d12d6d7e42c758af438d297baf6798e2ce9c6aa9be4282678e366087d54b8d3f8c46b43be6d73bcf421ee318a SHA512 d90e35c93e5defc5599f5e9d9b88a757a4a845574684270f1aab0cb8194c50b31fa3135ea221f63d0d71f867619c039f32cfb46b63fa370289e8eb5205d3b25d
diff --git a/sci-mathematics/cvc4/cvc4-1.8.ebuild b/sci-mathematics/cvc4/cvc4-1.8.ebuild
new file mode 100644
index 000000000000..347dbda0a248
--- /dev/null
+++ b/sci-mathematics/cvc4/cvc4-1.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
+HOMEPAGE="https://cvc4.github.io/"
+SRC_URI="https://github.com/CVC4/CVC4-archived/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cln proofs readline replay +statistics"
+
+RDEPEND="dev-libs/antlr-c
+	dev-java/antlr:3
+	dev-libs/boost
+	readline? ( sys-libs/readline:0= )
+	cln? ( sci-libs/cln )
+	!cln? ( dev-libs/gmp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}"/${PN^^}-archived-${PV}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DANTLR_BINARY=/usr/bin/antlr3
+		-DENABLE_GPL=ON
+		-DENABLE_OPTIMIZED=ON
+		-DUSE_CLN="$(usex cln ON OFF)"
+		-DUSE_READLINE="$(usex readline ON OFF)"
+		-DENABLE_STATISTICS="$(usex statistics ON OFF)"
+		-DENABLE_PROOFS="$(usex proofs ON OFF)"
+		-DENABLE_REPLAY="$(usex replay ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" \
+		systemtests
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	mv "${D}"/usr/{lib,$(get_libdir)}
+}
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
new file mode 100644
index 000000000000..372bea03fb72
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
@@ -0,0 +1,42 @@
+--- a/CMakeLists.txt	2019-07-09 14:47:12.552425226 +0200
++++ b/CMakeLists.txt	2019-07-09 14:50:02.595001358 +0200
+@@ -143,7 +143,7 @@
+ 
+ # Note: Module CodeCoverage requires the name of the debug build to conform
+ #       to cmake standards (first letter uppercase).
+-set(BUILD_TYPES Production Debug Testing Competition)
++set(BUILD_TYPES Production Debug Testing Competition Gentoo)
+ 
+ if(ENABLE_ASAN)
+ #_cmake_modify_IGNORE   set(CMAKE_BUILD_TYPE Debug)
+@@ -166,12 +166,10 @@
+ endif()
+ 
+ message(STATUS "Building ${CMAKE_BUILD_TYPE} build")
+-include(Config${CMAKE_BUILD_TYPE})
+ 
+ #-----------------------------------------------------------------------------#
+ # Compiler flags
+ 
+-add_check_c_cxx_flag("-O${OPTIMIZATION_LEVEL}")
+ add_check_c_cxx_flag("-Wall")
+ add_check_c_flag("-fexceptions")
+ add_check_c_cxx_flag("-Wno-deprecated")
+--- a/test/regress/CMakeLists.txt	2019-07-14 09:49:38.429990489 +0200
++++ b/test/regress/CMakeLists.txt	2019-07-14 09:50:28.854234838 +0200
+@@ -2155,7 +2155,6 @@
+   regress4/C880mul.miter.shuffled-as.sat03-348.smtv1.smt2
+   regress4/NEQ016_size5.smtv1.smt2
+   regress4/bug143.smtv1.smt2
+-  regress4/comb2.shuffled-as.sat03-420.smtv1.smt2
+   regress4/hole10.cvc
+   regress4/instance_1151.smtv1.smt2
+ )
+--- a/src/CMakeLists.txt	2019-07-18 08:56:47.923025745 +0200
++++ b/src/CMakeLists.txt	2019-07-18 08:58:10.584750385 +0200
+@@ -915,4 +915,4 @@
+ # Note: This is a temporary fix until the new C++ API is in place.
+ install(CODE "execute_process(COMMAND
+                 ${CMAKE_CURRENT_LIST_DIR}/fix-install-headers.sh
+-                ${CMAKE_INSTALL_PREFIX})")
++                \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})")
diff --git a/sci-mathematics/dunshire/Manifest b/sci-mathematics/dunshire/Manifest
index 6c3355b09df0..6a14161be4a7 100644
--- a/sci-mathematics/dunshire/Manifest
+++ b/sci-mathematics/dunshire/Manifest
@@ -1,3 +1,3 @@
 DIST dunshire-0.1.1.tar.gz 300878 BLAKE2B b0ed57e535313fbc653fdc7c8fd32fb98382db71dfe419e315f4b82fc4630e47757d74b9105e846b2eefaa7dcd93b12886eee341b11d0e8b562a52e480478e9a SHA512 5cdf8125d7fc1f76a483009392360e9e9088f9b58ca3f123d14e366421e831e4e7c8e17d367ba0430fb3cd61873cae7a004c903ff5417bfc9adecb7831681081
-EBUILD dunshire-0.1.1-r1.ebuild 963 BLAKE2B e776418109fab251fa0bf4adb8f57e2bedf9a910696430008c7c8e572aea1aebf6c9820dab953abf4c0b8ea6bc68d2b43e5033a0bdda3e004449525c3b403758 SHA512 a8cf87d7375b3c13de38a9794530e509203b26976b2e56fbeaf068271f8d7bfc5c32af35d12a59abd2a96d14bad2d516d382df01022d671d90eec78223aa8ea6
+EBUILD dunshire-0.1.1-r1.ebuild 958 BLAKE2B 7412f18b9bdc9202e9a21a5c3679f66b3ca620b451be8902100c145265e666d31eb38594fc0856e870071d56a3067dbc5b5af9302e589cb82e36bcbb63db9f09 SHA512 e6697066c2fe6aaaf9752836f317f924ccebd7cd7d277928709697ab3f496d1fc8201081effb156f4ba85ec2b12baedd97ee1f38ea7fc003ef1d776ba14bc113
 MISC metadata.xml 328 BLAKE2B 16beb1fab1e231e2bb2c8088729c9ab6fa1d4ab06f12f1da462fdeb18738d5fed80b28456df94b2af14f97855042d356b7f69ef956524c456bae62e12b4ba499 SHA512 1ae4898a1247c78ba707aa6e38819cbc5277e46fd32d3ca1172c70c18f42247624755262e3886a2deee76d2a39a3a54750edbc2d77a339543741c2488b095e45
diff --git a/sci-mathematics/dunshire/dunshire-0.1.1-r1.ebuild b/sci-mathematics/dunshire/dunshire-0.1.1-r1.ebuild
index 54f28b18eaf5..b8f5fb37cda4 100644
--- a/sci-mathematics/dunshire/dunshire-0.1.1-r1.ebuild
+++ b/sci-mathematics/dunshire/dunshire-0.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 2104da78b61f..7f81b5fab4d4 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -2,12 +2,12 @@ AUX flint-2.5.2-memory_message.patch 504 BLAKE2B ff8ddc685c973f75a133f36eb1284d8
 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 5711 BLAKE2B c8191a307f8d6fb545cdee06acc1d84f4a8eb43ff96dc32be9f28dd0336e4f4130e0d59b2b446638c7f29f0b9da9407d675b9bf223addf9d584eb6177aef3b36 SHA512 825ce6f102ab3e4506ad691cbe0cf596176dd6262746d053181ed54afbcd980b8cdfd33fda7e690cd4c764a0a6df60af0cec58cd82baaeb60d9c381333bedd11
+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 1374 BLAKE2B ff8a236d2cbf6b916636aa34a6ccf05373b84e36ad59eb3188214ab55b91fbdc12be435c742e4b7d34545f6eff1e0bfe26c1a092604ff3ede46cfd0006ada66b SHA512 9e2a7aa019698d4fc2e72f251cb3377c159b75ce73144feb8131ce1f065dd0ed6ae1d9f88bd2e094f5c64580e02f6aa98a176405019c3adf4fd3c43bd64c88f7
+EBUILD flint-2.7.1-r1.ebuild 1372 BLAKE2B 4026ba6637f534d522ad3b7390ec491e764e440a913094fc98d9765b8cd3f89a0388099a56eb9805a2c588efc870d8cb7139b1d4daf8223314aed166b46b3162 SHA512 4f5cdebc04ff9888f5a235f4409b0428ba8ce4c18548c709cc0abf296254e6724f18d081f248f32c447c253af5dd7a71935bbd202e5789dd2b79981dd691a33e
 MISC metadata.xml 852 BLAKE2B 9d4e42cbf30d12f45eee522daebfa264095ecc7da2a031a0c7676066f2dadb18e71d7c53fd1f5c7220c78276029532999e44ccacad31903fb174ce2bf36ae3d0 SHA512 f05df1daaf10afa63535a1db4bf5a75185e9523aced9329d90df59e5ca5d1eeee23b30dfe3fab6a11bdcc95b1b5e9a8b1012a19457c66e3dccbdab5a6e303e4d
diff --git a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch b/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
index d94d65c08d7e..ca6e56ce1970 100644
--- a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
+++ b/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch
@@ -1,4 +1,4 @@
-From 9f1ef23f34a7ceca1063606cfc749e4d32bef81c Mon Sep 17 00:00:00 2001
+From 41c4a0869d68d894cbe74a63612df75fd1e93bdf Mon Sep 17 00:00:00 2001
 From: Michael Orlitzky <michael@orlitzky.com>
 Date: Mon, 19 Apr 2021 16:56:54 -0400
 Subject: [PATCH 1/1] CMake/FindGMP.cmake: compile a test program to check the
@@ -7,18 +7,18 @@ Subject: [PATCH 1/1] CMake/FindGMP.cmake: compile a test program to check the
 The existing GMP version check consists of grepping the contents of
 the gmp.h header to parse out a few constants. This test fails, at
 least, on Gentoo, where the usual header file is a wrapper that
-includes the true header (to allow for simultaneous 32/64-bit
-support).
+includes the true header to allow for simultaneous 32/64-bit
+support.
 
-This commit updates the FindGMP check to compile a test program
-against gmp.h that compares the version bounds within C, and reports
-success or failure as the return value from main().
+This commit updates FindGMP to compile a test program against gmp.h
+that compares version constants using the C preprocessor. If GMP is
+too old, the test program will fail to compile and CMake will know.
 ---
- CMake/FindGMP.cmake | 97 +++++++++++++++++++++++++--------------------
- 1 file changed, 53 insertions(+), 44 deletions(-)
+ CMake/FindGMP.cmake | 91 +++++++++++++++++++++++----------------------
+ 1 file changed, 47 insertions(+), 44 deletions(-)
 
 diff --git a/CMake/FindGMP.cmake b/CMake/FindGMP.cmake
-index ce4df70f5..bd2871ca3 100644
+index ce4df70f5..951151274 100644
 --- a/CMake/FindGMP.cmake
 +++ b/CMake/FindGMP.cmake
 @@ -2,28 +2,23 @@
@@ -55,7 +55,7 @@ index ce4df70f5..bd2871ca3 100644
    endif()
    if(NOT GMP_FIND_VERSION_PATCH)
      set(GMP_FIND_VERSION_PATCH 0)
-@@ -32,43 +27,57 @@ if(NOT GMP_FIND_VERSION)
+@@ -32,43 +27,51 @@ if(NOT GMP_FIND_VERSION)
      "${GMP_FIND_VERSION_MAJOR}.${GMP_FIND_VERSION_MINOR}.${GMP_FIND_VERSION_PATCH}")
  endif()
  
@@ -102,42 +102,36 @@ index ce4df70f5..bd2871ca3 100644
 +
 +if(GMP_INCLUDE_DIRS AND GMP_LIBRARIES)
 +
-+  # Return "1" if the version is OK, or "0" otherwise.  This is
-+  # opposite the usual C program conventions, but makes the purpose of
-+  # the result variable semantically clear. We create an integer using
-+  # a few basic GMP functions to ensure that we can actually link against
-+  # the GMP library.
++  # This program will fail to compile if GMP is too old.
++  # We prefer to perform this "test" at compile-time to
++  # avoid problems with e.g. try_run() during cross-compilation.
 +  file(WRITE ${PROJECT_BINARY_DIR}/gmp-version-check.c ""
 +  "#include <gmp.h>\n"
 +  "\n"
-+  "int main(int argc, char **argv) {\n"
-+  "  mpz_t x;\n"
-+  "  mpz_init_set_str(x, \"7612058254738945\", 10);\n"
-+  "  mpz_clear(x);\n"
-+  "  if (__GNU_MP_VERSION < ${GMP_FIND_VERSION_MAJOR}) {\n"
-+  "    return 0;\n"
-+  "  }\n"
-+  "  else {\n"
-+  "    if (__GNU_MP_VERSION_MINOR < ${GMP_FIND_VERSION_MINOR}) {\n"
-+  "      return 0;\n"
-+  "    }\n"
-+  "    else {\n"
-+  "      if (__GNU_MP_VERSION_PATCHLEVEL < ${GMP_FIND_VERSION_PATCH}) {\n"
-+  "        return 0;\n"
-+  "      }\n"
-+  "    }\n"
-+  "  }\n"
-+  "  return 1;\n"
-+  "}\n")
++  "#define GMP_FIND_VERSION_MAJOR ${GMP_FIND_VERSION_MAJOR}\n"
++  "#define GMP_FIND_VERSION_MINOR ${GMP_FIND_VERSION_MINOR}\n"
++  "#define GMP_FIND_VERSION_PATCH ${GMP_FIND_VERSION_PATCH}\n"
++  "\n"
++  "#if __GNU_MP_VERSION < GMP_FIND_VERSION_MAJOR\n"
++  "#error insufficient GMP major version\n"
++  "#elif __GNU_MP_VERSION == GMP_FIND_VERSION_MAJOR\n"
++  "#if __GNU_MP_VERSION_MINOR < GMP_FIND_VERSION_MINOR\n"
++  "#error insufficient GMP minor version\n"
++  "#elif __GNU_MP_VERSION_MINOR == GMP_FIND_VERSION_MINOR\n"
++  "#if __GNU_MP_VERSION_PATCH < GMP_FIND_VERSION_PATCH\n"
++  "#error insufficient GMP patch version\n"
++  "#endif\n"
++  "#endif\n"
++  "#endif\n"
++  "\n"
++  "int main(int argc, char** argv) { return 0; }\n")
 +
-+  # Try to run the test program above with the appropriate version
++  # Try to compile the test program above with the appropriate version
 +  # strings substituted in.
-+  try_run(GMP_VERSION_OK
-+          GMP_VERSION_COMPILE_OK
++  try_compile(GMP_VERSION_OK
 +          "${PROJECT_BINARY_DIR}"
 +          "${PROJECT_BINARY_DIR}/gmp-version-check.c"
-+          CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${GMP_INCLUDE_DIRS}"
-+          LINK_LIBRARIES "${GMP_LIBRARIES}")
++          CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${GMP_INCLUDE_DIRS}")
  endif()
  
 -find_library(GMP_LIBRARIES gmp PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR})
diff --git a/sci-mathematics/flint/flint-2.7.1-r1.ebuild b/sci-mathematics/flint/flint-2.7.1-r1.ebuild
index 912adc940b12..f8e7471260ea 100644
--- a/sci-mathematics/flint/flint-2.7.1-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.7.1-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2.1+"
 # Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
 SLOT="0/15"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="doc ntl test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index b358f870e3ef..712226a7b288 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -2,6 +2,6 @@ AUX gfan-0.6.2-Makefile.patch 6603 BLAKE2B 48f9b4280418aef41d502d770c070ec1dcef9
 AUX gfan-0.6.2-testsuite.patch 3223 BLAKE2B ddb94775a13bd503df5c9563750a6b4b68c9e72e1a19aaa0415c5484e07765dfd28ba02b3a0fab65a0b9cd5c61afafbc6a3d862a1de68ece57ef9d8bb2835c16 SHA512 d62e765a39ee1a8cb149fcae8afb538b19a91206dd0b8cf0ac2b681b28569e44f492b770b9e61d7573f2d52f265ad4cf25671197c204238a89075709753a83e6
 AUX gfan-0.6.2-xcode9.3_compat.patch 367 BLAKE2B fb7c685a4dd811fed83e2734a16507b1792e3a97c666d0e7de1d2ed53a7b9b43c5319517f9eef829f47147dc725f2c4ead38968fa3868baa1d16630a8b844636 SHA512 129d2c35777f82bf2a1581450ecb12dd6811fb72b583748b30665c0f9b20d39646233d9b40fb64a3c7790360514a51b30e49c53d83c34d259f664bf820ae1ce2
 DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
-EBUILD gfan-0.6.2-r1.ebuild 1664 BLAKE2B 92b9e0f24b298aa32180a1406e0b5280c744a2a504a189b9836a13892d8d89226167335697605561be07350b09b0890b1e0939fbe87fb7b181f2916e1c7c5f2a SHA512 f76ceff1753b8dc00c161ecf824ea1f5751e52a357806b947a108ca05e9388c9f34349f738cf899d6d09fc8e6162842382a58d32a5f176269df1b24c5db4bfb3
+EBUILD gfan-0.6.2-r1.ebuild 1663 BLAKE2B 3f417e4faa748930b9ba7d7e63f00c3ed024fd2ea9b5301da54e4a11e0801355c4d629c86680bf46549e41eeeb627dc5f28b5d507e3e12ee40202f1427a534fa SHA512 29a1ca7909dbec0912de73c47ea4600c2880b3f2eb28dcc74837306dc99b004d2477629a616ff8ccf9f9206de8aef34d88370a61942cbfa367eae31fa095d938
 EBUILD gfan-0.6.2.ebuild 1628 BLAKE2B 272e77ecdf1e7132bb3a703ed3871cea502d621d596ec47c3529459c120a44921028aa0c064936a49c6b727b6bf44f78971679ff3bf3f9450d3ae945a02193e0 SHA512 c4eaf7e2debfcca9d3a92e6f9abfc1e568c09747db8ebf7caa3ad34c3208de47b8841819d1c5ddd6866b127f9d9496e61616f2bda1cbeb1588c58b682cc0550c
 MISC metadata.xml 1343 BLAKE2B 1e3385eaf888fa6a69e1e3f761bd5a1037e5a5308878664e604ba5efd096747f84a0a3343d8de7f6eb5dd3ce726d94bdb933e17b9eaf8e345b02fd071fbf821b SHA512 ca914de593af1279439f35fdcc812924b831c30bfa86366443f16cb720acd3e38267f25057f59e76a6b8ff1aa48a33ecfa72c093419aab95c92ed82c3308cd94
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
index 01434747eede..185e558ce126 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest
index fdef73f6d030..3f53973eef64 100644
--- a/sci-mathematics/jags/Manifest
+++ b/sci-mathematics/jags/Manifest
@@ -1,3 +1,3 @@
 DIST JAGS-4.2.0.tar.gz 1875538 BLAKE2B 039cefdb546ec28b905f22a4ec3dfe6d85c64064701283fe38be59f53da971b523d8bb5b7c5efe3e9da81a255b064cb8b66cac2fd4e844883b7fcf89cdabdbb1 SHA512 316483cd1a879c70c9b8ad6f23665196b95b9745da3924a47e14f4b0fd7c1abf9237575561cb31044623594360b6e991de68e1d9746baedeb285c65b77baada8
-EBUILD jags-4.2.0.ebuild 881 BLAKE2B 93add171452876ca06c2d6efc6b2665c73eebde57e02c2f1354b98a19ff6d689bab77f6ad08ab5d8d11db29a5c56bb32fd5eaf5ed9ad57e7feba50a745391032 SHA512 d669aa5cdf592d0517df6f2ee7012418b78db47e0d61bfc5f2a635fb1228587fdc45f4075e1ca9d5ac2480e1b9a88f9b04f16fc55f0f49c19fa657f98e6e9255
+EBUILD jags-4.2.0.ebuild 894 BLAKE2B aba98ae327b60f41e48cdd755a8ad260d36e30ee443815b1de1bf46849305fa3e80f093323d358fe796f0def4c04c980a9ea4123c22ff51a779167ebd19cb38f SHA512 e0391a0dc0fd916ea0c82d722f7d989451866218a31ada58bc217cd5eb6d365ec75612e57664a977eb87240ee85229bf10676d9805b3688503a65b8f6bb93623
 MISC metadata.xml 862 BLAKE2B 4e1fc4e399dfcdbfc828dc577661e28255c94004bb1f16734994d82b34279300b136217effbf545d1c0cdf3bfb9d1510b2549f1edcbe51f036924e7d4bab1416 SHA512 86f27a081286b51ba645006d3c65ec43d69aa4e15218bac97730295e2ebd1cab67c592f1c7fefdbdd9b959b68e54eaf358173f7d599cb1ab5ff13dea7eef3705
diff --git a/sci-mathematics/jags/jags-4.2.0.ebuild b/sci-mathematics/jags/jags-4.2.0.ebuild
index 6eaa6ccff4a7..0ed77c62577f 100644
--- a/sci-mathematics/jags/jags-4.2.0.ebuild
+++ b/sci-mathematics/jags/jags-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit ltprune toolchain-funcs
+inherit toolchain-funcs
 
 MYP="JAGS-${PV}"
 
@@ -41,5 +41,5 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc doc/manual/*.pdf
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index b9adb1edc4be..225e2da1d0a6 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -7,6 +7,7 @@ AUX dont-hardcode-python.patch 1702 BLAKE2B 8d784d665840325f40db95c0f50158e1c89e
 AUX ecls-3.patch 2147 BLAKE2B d454b620f01d734d6a774f64dbac67f0996aeacc2a029225cc8a9269211169e7b69237f8b734b92b1f037b5abdcd7ec3ba374924b498fdc63025a1eca5a0d9e6 SHA512 1fcaa4a79d4aaf08dd4162c6d59f8f168909320575a43dcb435cbd758338244ac3b89888501f4cb1fc0f9d8d43b3abe587bc898aacb45c19ba0858f74512366e
 AUX ecls-4.patch 726 BLAKE2B 7aa2520c10b1c142297791c0d87c9e65578ba6b2f3c7402f2c4bb2474fc1c22f85f0f27bed0530bd711e785a0bec500ef6a57b53d9481300901d11f1131126c9 SHA512 0d1616aba389a43e646ef99dd5d9176b2e49ad0569d9a63dea5562b829748f1a1e0d599fb0b359ffc7031ed43c7f08c4cea2ab9a3a97be49f09a7394a280aa15
 AUX emacs-0.patch 807 BLAKE2B 82c879f9c252c4efefb007f8553e845ddc52d76af5cbeab740a1f2bde459b5e87957e0f3e5a9d76d5c1e879ddbebdfb9a6d6b80745cc40e3ddc4379887f4e9b2 SHA512 f62d364651838ed196a2e8965930b42313cb73f912b898b953b526ffc5dc0135841b53618fbbb6a32d21d3412ba5f2bfb253bf41c640a136f68d830f43628ac4
+AUX imaxima-0.patch 598 BLAKE2B 1c7593840556e723660e735c7bffd706b365c76d18b0a1d7e07eb318794e9b7d4f54173fd2efca06c57e5a0713983e01fe86a24752df7cc1ea540101374ed922 SHA512 3c7d846197fa1996ae8cd4210cfb80e613bc659fd3086f0f8df381ab7ee12f329aba3ce616059afa35e378c26b28a653f7aaed7ff47e3b2febf2f98010252b71
 AUX rmaxima-0.patch 552 BLAKE2B 8b8ceb5ea671049490ab006be31f6e81f85d9e43950296db920b3a0d4eb8b19cd14b8b599c98e1dc82f69d441d04c631c4aec2315eaee68f791ddce75dc7ed56 SHA512 a60c8c5ac23b0342823fbcd15e27f44ea85652640271ea845e383796422fa416b221dd036eb0a1639f70f9b09473471657612c7a5f99892cfb214d52156a6907
 AUX sbcl-2.patch 1072 BLAKE2B 3e16339b7b9acbbfcd424780432be4a4267b994c3a7a8774c95ff8335d48565d15dae3cba16b127a9184e4fe20b5d6930df2e385c2a15b9f58e2d0fa597665a1 SHA512 b8df0b53f4ae04e175dfab8889206ea8ffa83c51b2408322423d5f52cf956b1084e7d1ba0c054032f9121cb1684fcc6bb9d48b1a967f9e01492ad25c035b1c62
 AUX support-new-vtk.patch 924 BLAKE2B 960c3342ca4374c03aff30d7d2326c6e826ffb2cb025952c8af381102ef2556b21e78ec9a4316740871ebf7afea1c8053f50342a7a66ad897fa6b79ac29b30fe SHA512 6cc8b0a67d6aa6bc87f003181a891c480420bed228ede8cd9f7143c5473f8e11a4fceb405e182ac00ce26f7380d714c6487ebb9fe4603d94e7e0111cbef68f75
@@ -14,7 +15,9 @@ AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
 DIST maxima-5.44.0.tar.gz 34976354 BLAKE2B d6870b6fb0581d9e60d6ed97c7daed8ce12b8b1ae49d0edb7b8d31dd723f9b879eb70440659ff958f53cee16d8d2a92f80dcaa3898d9f6dbabd79a5059073a65 SHA512 1e043bebb7c6d002c113d8de20a98d58d1a8e7bedfc9bcf52819e7c7554655991dc2f42f0333889706574249736db833a237b3e59b967e7e42ede28262e31f2f
+DIST maxima-5.45.0.tar.gz 39946933 BLAKE2B bdccb6cb88d458eec4359b7bc0b5337c9d1d0af9fe4cfeece9c80e840a2aa3963793cdf5c02437b72af647ef6c9306224c524f5a715860808d3b49ad5a85641f SHA512 353d33a89e5fd1986e84698866cc9716307a5ab3c7a29908ed474b5d00f6f8869f616334ff068c2c5d175c4bbb95f892d6061b12e43686ee4813b9a16e5a4139
 EBUILD maxima-5.42.1.ebuild 4895 BLAKE2B dd388cfe14cef36137a91ff71912c23390e176d796ce02c36f59cbb1e8993a03b16ee32b4e6d792e59d95bad3bcd90e3e9ded23abb1e3c371f466bd53f44502c SHA512 64c8a759525fff99c99831be56ea268b213392c65b1ef2e9db133addfaefead39710264c6a599eee7c53262ef16f75fbdbb35a9516a7054f0934d6fd46303520
 EBUILD maxima-5.44.0-r4.ebuild 6278 BLAKE2B 9da7f0e09a3b6f370b20ce11915e4d9e893c1e1ea499ebfcf22d81ee2a0c17053b1e38450551855ac62356e3d4b8201f9a067ff94e169a00eb6c5a42ed73d82d SHA512 03083941bd72b72341edd0d5b35501b309a62d14bde6be6555d670e6a21b85ed800c35810dec1a713d6ffc59e0b8279a4daa4fb85385676412d0bff877d94dd4
 EBUILD maxima-5.44.0-r8.ebuild 6352 BLAKE2B e74faa47dd0ba27775e386b81c04e57cc94e992a7b2d0aa78aa24002bfa8256f9baaab8aab6414971d035f57a1bdcc522240975b523fe45c00d588e48af46684 SHA512 5ef06927b60d9c4071cd0a696ab9e3c66ebfc4ea0e8f48ee53675345804de996385da1f65666df4f6583a523c90493705485aa4c809daa7db58b24bd7639f5e4
+EBUILD maxima-5.45.0.ebuild 6349 BLAKE2B f9027a22e01e173860cc2752198db6286164fe9af92ca27bb79a7ecc6794981968322ff42762f3ddd620affcab1163035250aebffe719c03d20247c2350bb294 SHA512 3415b2e32d7b7ee9bf0f936ee950d5c911d98de90720d07cbb0e249dada4a0bedb556c2d7bb7116570cbc16af6f8fc9c5599bb45a774d8ffcf64c1eb47f2126d
 MISC metadata.xml 1733 BLAKE2B 30e06c199d4c4919ea90aa5a0b3091b124b4b43fc7791d758afdb0d94069edfafe386ddd7ddbeb9aa2589a5ec3866ecabd9d71c1b41380db6212529ad376c846 SHA512 2a9ccad0ef037a65f7dae3ac3769ab0bdf54ac8789387d3bcab0e022f9dfb77b019d14dc03bd7777937076e822c837511c12fd8198e7b9bd7eb6e621e46c0be4
diff --git a/sci-mathematics/maxima/files/imaxima-0.patch b/sci-mathematics/maxima/files/imaxima-0.patch
new file mode 100644
index 000000000000..6e7ce2ee1a55
--- /dev/null
+++ b/sci-mathematics/maxima/files/imaxima-0.patch
@@ -0,0 +1,10 @@
+diff -r -U2 maxima-5.45.0.orig/interfaces/emacs/imaxima/setup-imaxima-imath.el maxima-5.45.0/interfaces/emacs/imaxima/setup-imaxima-imath.el
+--- maxima-5.45.0.orig/interfaces/emacs/imaxima/setup-imaxima-imath.el	2021-05-16 06:20:53.000000000 +0700
++++ maxima-5.45.0/interfaces/emacs/imaxima/setup-imaxima-imath.el	2021-05-25 18:31:38.005882847 +0700
+@@ -133,5 +133,5 @@
+ ;;; imaxima-maxima-options should be "" instead of "(user::run)"
+ ;;; assigned in the imaxima.el
+-(setq imaxima-maxima-options "")
++;(setq imaxima-maxima-options "")
+ 
+ (autoload 'maxima "maxima" "Maxima CAS mode" t nil)
diff --git a/sci-mathematics/maxima/maxima-5.45.0.ebuild b/sci-mathematics/maxima/maxima-5.45.0.ebuild
new file mode 100644
index 000000000000..32f16ada3d35
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.45.0.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit autotools elisp-common flag-o-matic python-single-r1 xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test"
+RESTRICT="!test? ( test )"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+	IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+LISP_DEPEND="
+	clisp? ( dev-lisp/clisp )
+	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
+	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
+	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
+	ecls? ( dev-lisp/ecls app-misc/rlwrap )
+	gcl? ( dev-lisp/gcl[ansi,readline] )
+	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
+"
+
+# Python is used in e.g. doc/info/build_html.sh to build the docs.
+# LISP_DEPEND is included in both BDEPEND and DEPEND because the various
+# lisp engines are used to both compile and run maxima. It's possible
+# that they don't (all?) need to be listed in DEPEND; who knows.
+BDEPEND="
+	${PYTHON_DEPS}
+	${LISP_DEPEND}
+	test? ( sci-visualization/gnuplot )
+	sys-apps/texinfo
+"
+
+DEPEND="
+	${LISP_DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gui? ( dev-lang/tk:0 )
+"
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+#
+# VTK is an optional plotting backend that can be enabled by
+# running "draw_renderer: 'vtk;" within maxima.
+#
+# It's NON-optional for the scene() command, but that command is
+# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
+# Thus we include VTK only as an optional dependency.
+#
+# We require app-misc/rlwrap for any lisps that don't support readline
+# themselves.
+RDEPEND="
+	${DEPEND}
+	X? (
+		x11-misc/xdg-utils
+		sci-visualization/gnuplot[gd]
+		vtk? (
+			${PYTHON_DEPS}
+			sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
+		)
+	)
+	emacs? (
+		virtual/latex-base
+		app-emacs/auctex
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latexrecommended
+	)"
+
+# Maxima can make use of X features like plotting (and launching a PNG
+# viewer) from the console, but you can't use the xmaxima GUI without X.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
+	gui? ( X )"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+	# Set the PYTHON variable to whatever it should be.
+	python-single-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}/dont-hardcode-python.patch"
+	"${FILESDIR}/imaxima-0.patch"
+	"${FILESDIR}/xdg-utils-1.patch"
+	"${FILESDIR}/wish-2.patch"
+	"${FILESDIR}/rmaxima-0.patch"
+	"${FILESDIR}/emacs-0.patch"
+	"${FILESDIR}/clisp-1.patch"
+	"${FILESDIR}/clozurecl-3.patch"
+	"${FILESDIR}/ecls-4.patch"
+	"${FILESDIR}/cmucl-1.patch"
+	"${FILESDIR}/sbcl-2.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #343331
+	rm share/Makefile.in || die
+	rm src/Makefile.in || die
+	touch src/*.mk
+	touch src/Makefile.am
+
+	eautoreconf
+}
+
+src_configure() {
+	local CONFS=""
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in ${LANGS}; do
+			if use "l10n_${lang/_/-}"; then
+				CONFS="${CONFS} --enable-lang-${lang}"
+				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	# Using raw-ldflags fixes the error,
+	#
+	#   x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option
+	#   value (expected an integer): 1 -Wl
+	#
+	# when building the maxima.fas library for ECL. See upstream bugs:
+	#
+	#   * https://sourceforge.net/p/maxima/bugs/3759/
+	#   * https://gitlab.com/embeddable-common-lisp/ecl/-/issues/636
+	#
+	# The 32-bit and 64-bit version of the clozurecl executable
+	# are both called "ccl" on Gentoo, so we need the additional
+	# use_with for clozurecl64. See bugs 665364 and 715278....
+	#
+	# The usex works around https://sourceforge.net/p/maxima/bugs/3757/
+	#
+	econf ${CONFS} \
+		LDFLAGS="$(raw-ldflags)" \
+		$(use_enable clisp) \
+		$(use_enable clozurecl ccl) \
+		$(use_enable clozurecl64 ccl64) \
+		$(usex clozurecl64 "--with-ccl64=ccl" "") \
+		$(use_enable cmucl) \
+		$(use_enable ecls ecl) \
+		$(use_enable emacs) \
+		$(use_enable gcl) \
+		$(use_with gui wish) \
+		$(use_enable sbcl) \
+		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+	# The variable PYTHONBIN is used in one place while building the
+	# German documentation. Some day that script should be converted
+	# to use the value of @PYTHON@ obtained during ./configure.
+	emake PYTHONBIN="${PYTHON}"
+	if use emacs; then
+		pushd interfaces/emacs/emaxima > /dev/null
+		elisp-compile *.el
+		popd > /dev/null
+		pushd interfaces/emacs/imaxima > /dev/null
+		BYTECOMPFLAGS="-L . -L ../emaxima"
+		elisp-compile *.el
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	docompress -x /usr/share/info
+	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+	# do not use dodoc because interfaces can't read compressed files
+	# read COPYING before attempt to remove it from dodoc
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS COPYING README README-lisps.md
+	dodir /usr/share/doc
+	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+	if use emacs; then
+		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+		insinto ${TEXMF}/tex/latex/emaxima
+		doins interfaces/emacs/emaxima/emaxima.sty
+
+		insinto /usr/share/${PN}/${PV}/doc/imaxima
+		doins interfaces/emacs/imaxima/README
+		doins -r interfaces/emacs/imaxima/imath-example
+
+		if ! use gcl; then
+			# This emacs package is used to run gcl, maxima, gdb, etc.
+			# all at once and possibly in the same buffer. As such, it's
+			# no use without gcl (more to the point: it requires gcl.el).
+			find "${ED}" -name 'dbl.el' -type f -delete || die
+		fi
+	fi
+
+	if use ecls; then
+		# Use ECL to find the path where it expects to load packages from.
+		ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
+		insinto "${ECLLIB#${EPREFIX}}"
+		doins src/binary-ecl/maxima.fas
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 1faa570433d1..b3b711a3c85b 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -2,4 +2,4 @@ AUX msieve-1.51-reduce-printf.patch 1598 BLAKE2B 3cce6aab49b9c66fb4f0feede9a56a7
 AUX msieve-1.53-fix-version.patch 1138 BLAKE2B 110bdba41cc622eb6edbebef641df4f5cbd9c184e87c8ee2824c7a29aa10f4615c98d4e1ef754fea960756d6afc1bf58e66c9f9d561fa3c699b462b216a9aabe SHA512 3133cd9d424328802060578fef60b7e0657b044927ac6a4e677c356f79224ec3d066764ab3ce6a06e5fc203bd8a000cbde47705277dcb6cc5f6a9004200d299d
 DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
 EBUILD msieve-1.53-r1.ebuild 1232 BLAKE2B 2552549e4c0ced96b57a7643f4febcbb109a40885521d23408e48d265084345e2063b2bf9acea6007f254d287bf3b49be8b5e3b4fb3ab3d5c3cae7480952e120 SHA512 cdbca923a6d310ebade396846afd725a00b837fce68a422fc706d43a30135c581ee83db290b57571dcea60f3bad0add79bcc4e691f5bef46741b9e0f388d8b91
-MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
+MISC metadata.xml 332 BLAKE2B a7b126bc34dfaf5e3078c0d4b1e70a285a8cab6200903dd4f59c43c14c2594c4affd883b0f6d30f4104fa6209514a4f4f4b685ae4f3fdf7c75cde13823ca1878 SHA512 586936bb8d4ab18b188facba8b7e0a819c98b9518c5bd3ec4551df20c21458a32abd46d1e11351a27ad7b1f5676f04eec80ef19300b21b4d0933273d8b95a3ea
diff --git a/sci-mathematics/msieve/metadata.xml b/sci-mathematics/msieve/metadata.xml
index 64f702132222..1b40d2cd9690 100644
--- a/sci-mathematics/msieve/metadata.xml
+++ b/sci-mathematics/msieve/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="ecm">Enable support for the GMP-ECM library</flag>
   </use>
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 6ebc0f57fdea..eb6096d91505 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,5 +1,5 @@
 DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682b07c73e36dbbd947eb65500e03758577d32355adb02fa4e271ca2f49bc5cb0449e26f1bdd11eab2dd5dbafd8f17 SHA512 c7fb1620e758dc59de88f0d7c55f50db0f67be772a00af27205e478f30c3836b7cf012a16a8adfdee3f0367d3adb4e3f887dc7d03793a7ca1601968ddb1946ce
-DIST normaliz-3.3.0.tar.gz 4243027 BLAKE2B 4785c47a2d815518e98b012dcbfe3cb70aac0ea8e06ad8f15ad6ba73120589e24f82050c25368775299974a43fce42052ffdf49379cd2b14ef4e415f6bb2d8f9 SHA512 3e09be1a265746c2cedf24c6a38de2f3801a906a66a0fa73a98b05916a5e6f412d84f5e38276781b5d99ff779a2db3fc420acdadd036e9822cae41b2ed539be5
+DIST normaliz-3.8.10.tar.gz 5086191 BLAKE2B b40de665718dc1cee8a7246ccfb9b8496bdfa0754408f0260421352f1b4776133047ed1a5e8e0f044bdc15dde63a9f7d9ea1721773f36ecdccce3a8575493772 SHA512 8755011b1305b571d6bef7b6200e01bb56dbadce3f67de022fae0ef42c69c095b1f7cd2a2a432282098277ee39aa17caeffda15c806b28a6060a737930d5b82c
 EBUILD normaliz-3.1.3.ebuild 1659 BLAKE2B d50183eef102f41a0db131c387a4a03aa0cf85fc4b076bbafa07969a63d331e0ef71205f3683e174a3b78f4d4bb8b8cd529423a4fba4669670818f7a99b6b2a8 SHA512 01a49bb35e3aa5fec13193d67244396e31e295e3904f4c1e3dbd96ce78a4c6c3aef05d35d3e305b4b055accee30d8cfa67d1fcfbc3c564e64f9493a67ef01880
-EBUILD normaliz-3.3.0.ebuild 1172 BLAKE2B 31a37d8153d01416c0022053bd61c9b5fb2ea68d26afde3f1eddd213c61566bf424e97832b56ad192cb627b97921b97ad41009df634abe4e08e3ebe00591a3d5 SHA512 980d246ab87765f2e9d9ecfa0c8555a83d7cc929a8462795b5e56e314ce4a3eba25cdf748e112d541991ee80e005918dbd72c5d784bf62623bc6b33153e56665
+EBUILD normaliz-3.8.10.ebuild 1119 BLAKE2B 200cb8327d24aab7eec7e3c4b2a95a2b7b7ef27ecc51df6a8d45887e69390509b7fd40b4813165bf8e9ec160484c306a0c3f93bb0d61d509e5957d552f929198 SHA512 624f581635eb35c79a52a8071a4c4ea2a3a9bfa6b91ee214f4c5168f952d6c9e0db4fe3ab317c1bc5052bdfc40d559b796728c70540f50b86e39287a17d8b945
 MISC metadata.xml 694 BLAKE2B d14ea00cecc15244599561d12a957d298904851ca82ebfd728696344e5252cd42c05b6f1c06fa6b85ec70a9b4f75b188164fc4a87dbf2bf3e4d4151dd232c5de SHA512 f6407f218dead7d90fa4dde54fd4c77f075c2ad544371c1556e052fd719e58aec5c380dd6c9fc542ad581ab46609011e11ff255f41c06a7189ad83670d44f9fe
diff --git a/sci-mathematics/normaliz/normaliz-3.3.0.ebuild b/sci-mathematics/normaliz/normaliz-3.8.10.ebuild
index 0f6a3edf3801..bac3b0b1866a 100644
--- a/sci-mathematics/normaliz/normaliz-3.3.0.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.8.10.ebuild
@@ -1,33 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools toolchain-funcs ltprune
-
-MYP="Normaliz-${PV}"
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Tool for computations in affine monoids and more"
 HOMEPAGE="http://www.mathematik.uni-osnabrueck.de/normaliz/"
 SRC_URI="https://github.com/Normaliz/Normaliz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Normaliz-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0/3"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc extras openmp static-libs"
+IUSE="doc extras openmp"
 
 # would be nice to package scip and cocoalib
-
 RDEPEND="
 	dev-libs/gmp:=[cxx]
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-libs/boost
 "
 # Only a boost header is needed -> not RDEPEND
 
-S="${WORKDIR}/${MYP}"
-
 pkg_setup() {
 	use openmp && tc-check-openmp
 }
@@ -40,7 +37,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable openmp) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_test() {
@@ -49,7 +46,8 @@ src_test() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+	find "${ED}" -name "*.la" -delete || die
+
 	use doc && dodoc doc/Normaliz.pdf
 	if use extras; then
 		newdoc Singular/normaliz.pdf singular-normaliz.pdf
diff --git a/sci-mathematics/rw/Manifest b/sci-mathematics/rw/Manifest
index 04d7a82852ff..e8922b4fbc5d 100644
--- a/sci-mathematics/rw/Manifest
+++ b/sci-mathematics/rw/Manifest
@@ -1,5 +1,3 @@
-DIST rw-0.8.tar.gz 217215 BLAKE2B e6f379ce7cde0fafb0c6e234e8958018c0682ad47e60da3755a891b7eee4c910e84556252a333a12fe0cf2eac88863a272cb8fa6d2cfa4c9f1e93bd88bc6a2d2 SHA512 609d46fd3c76e2eb1724cc3e3ff9354d13b3c15ce23b96bef9f73f02b490e1d8713146230db079fcc87f45f5acc0e04130dac04e27589836e20891c63219f3ec
 DIST rw-0.9.tar.gz 340385 BLAKE2B 2eba540146094eea7adb26874ed6f7982e46a863c786bf6f4a55af2d1d3167641e10c324f2b0e0e366bb8f83503b5da5fb02447abf46ae955da78ac8fe6149b6 SHA512 f4f1910506cbdb557ca50bac6f63cfca3271a5df8d13c67d2d9bba79b9cdb03196a679e6091554175decbee0871888de71bed5746662c9a75418f0f5dd9bd609
-EBUILD rw-0.8-r3.ebuild 1112 BLAKE2B 620c546ad9687c361b5092e7e27604332d7b9a119ac29b1ecab7fa2a295cb400ffebb174983e3466522cf2911e2998dbb76ef4619d165a66a643ab3274e76042 SHA512 b9f2e9d3a04ef177f00ec01c061ba8e2177483392ab81eada207f01efc11dec9aa8fcf2c1e599ebc768aa8638e32d1a1f4795f395188484089d875771ea87cfd
-EBUILD rw-0.9.ebuild 810 BLAKE2B 46a02e8c61f514e12f7199b4f9f6e39d66533ad416423edbd1c4b65fe9989f12230b5204865f27825015d700a975ca3394dd7b9795f13060bc5fbf6f4609cfab SHA512 c98ca1e619f5a79423647ed03f8deaeab64f49744a52136ecc1af666a33ab415a6c7a8162157066cc6c47ed9565ed8fb8b52005ec1660b6de3d77bf7a546ff56
+EBUILD rw-0.9.ebuild 808 BLAKE2B ee05a2cdf52369f428d1c7b05d3f2ce546f551b39da05c5811d1d20378061d06845dcdde01999bcc3aabd81edde9c6feb79ea3bc6cf85f0cfdbef5ba73c79b04 SHA512 6b750e656db891a847b66d13b4be5e61c17076443b51cd486db31e09be2cc1cbab2cd60a62ba3ae09dc8fbe103afd94f15d2226dee8b7355f1b1dc64dfd86ee1
 MISC metadata.xml 1158 BLAKE2B 91f1631afabd79f4d65e078925c616d9c8b5d71242e1f580dddd4b7d4e8ab0144601d20f844a20ae13e6901acedb58d080bcbe26e9256a8fc83fd62961f8c38d SHA512 899ba937d5b83082bec40e1b9d16afc2762c79066e1ed4e35019f276bdf4af7b3bea9d7a4007e86325d913b311af8a4a81877c5ece9ad1efec58f88782d3df74
diff --git a/sci-mathematics/rw/rw-0.8-r3.ebuild b/sci-mathematics/rw/rw-0.8-r3.ebuild
deleted file mode 100644
index 3daf3404e457..000000000000
--- a/sci-mathematics/rw/rw-0.8-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Compute rank-width decompositions of graphs"
-HOMEPAGE="https://sourceforge.net/projects/rankwidth/"
-SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-# We have a file collision (librw.so) with xpaint, bug 560210.
-RDEPEND="!media-gfx/xpaint"
-
-src_prepare() {
-	# The upstream tarball for v0.8 contains SYMLINKS to ar-lib,
-	# compile, install-sh, ltmain.sh, etc. And those symlinks don't
-	# always point to a working location for us, so we have to
-	# (re)generate actual files for that stuff. Bug 696986.
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# The executable depends on igraph, which has gone off the rails
-	# upstream and has copy/pasted ~10 libraries into its src/ directory.
-	econf --disable-executable --disable-static
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete \
-		|| die 'failed to delete libtool archives'
-}
diff --git a/sci-mathematics/rw/rw-0.9.ebuild b/sci-mathematics/rw/rw-0.9.ebuild
index 17031e1789f4..66b44f3cc23e 100644
--- a/sci-mathematics/rw/rw-0.9.ebuild
+++ b/sci-mathematics/rw/rw-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 # We have a file collision (librw.so) with xpaint, bug 560210.
diff --git a/sci-mathematics/sha1-polyml/Manifest b/sci-mathematics/sha1-polyml/Manifest
index 937dc7bd30a7..c966d6393a2b 100644
--- a/sci-mathematics/sha1-polyml/Manifest
+++ b/sci-mathematics/sha1-polyml/Manifest
@@ -1,3 +1,3 @@
 DIST polyml-5.6-1.tar.gz 22041657 BLAKE2B c097dda273b12dfe013706e5fa313f210f1f0bf6b32766db6e459ce1bca46f93504baef3d7644922c60d119431d659cbd69d8cd273fcc94609eadff058d3cb9b SHA512 3107f4a5b17283dc3873b0ecf7eb1c607c42e14e859b50345b666f19412a2592e359ea29f03e56d390491e9104a71e0bf80eb39884f51d8724b37f8f935fa7d2
-EBUILD sha1-polyml-5.6_p1.ebuild 1906 BLAKE2B 08981e8894274905a4d4eb428bd85cbe32848b4455196c336cf7859e0ef7b5de5137ec72ce70aa615e276369db04607e44515bd2c40b376f9aa665127a88a822 SHA512 95e93614c546a3b5f08c5917986cee5765e5ba8981832ff5dbb013d070726fa454661b2d2425d452a4cc8228d11b155d4ed2accd00f26b459609101783497ca7
+EBUILD sha1-polyml-5.6_p1.ebuild 1898 BLAKE2B e876a967fa77cdef8bda9f03f5c24a0060769c5992e88e16b3f288ca36e4e4b3dc7a0856ab448449e5ba0217b108e125c1779331b22ddaf70399d15532584ba9 SHA512 2bf6adb9a8f691972a47ce317a766ce5a42b6030449ea240db813e4e52114e2fc03021f220f1bd60eec9ab412928919befc3c945e3ef22d56e15369fcf83edff
 MISC metadata.xml 631 BLAKE2B f1ea7f8c4cde6c764c3c0649d2977636de0984756e1d3953f0ec142688ac75b6c2f909220766115408059e81a596cde28a31b6d9684b41080b0cc6cc36e2904e SHA512 ce2a008b92696040b1de592443a3bf1ca927aa95380bc92e4558c0d362dd1d2dc33c023a522946fe0295936feb95a2b920cbe0fbd44e65d7c9d5ca3f955bb7b1
diff --git a/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild b/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
index 66505a9d8b1f..20d02506c3c9 100644
--- a/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
+++ b/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,6 @@ SRC_URI="http://isabelle.in.tum.de/components/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index b232d12bdf2d..731216862618 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,17 +1,11 @@
 AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431
-AUX singular-4.0.0-fix-omalloc-ar-detection.patch 484 BLAKE2B 801f773c434ad35a18f80be4453a70540438054fca6fe7e8ba58520d8e17c47da51669d951989c161049d451d111a57d2e6f365ef4ee523829e056fdc2c4c72f SHA512 4f74b1d436c17efa3872a6b24e56c691220813a3cc2debeb19caa5dd6bf0e3c39af32e43e3d7afb5af40f985ec56377128185b9138dfcf77a04618ba444ea619
-AUX singular-4.0.2-ntl8-compat.patch 1149 BLAKE2B ed7ca37745eb37dd6493dfc4b531c3b9dc7390bc246a5ac08480ab188746883f3320031b14f9fe542c5889a56fa6c5c93a4b3f23e581cfb11cc308caa4dfa868 SHA512 178f0130cd6a606d6c93f5cc42dfe92782a16cc6b3d0e2695ce16d2115f70e502f702e8e72fd5d3b61b1bb5b3f4038a4fbf6277418b3f0bf89cae7939d5ed606
-AUX singular-4.0.3-fix-destdir.patch 992 BLAKE2B ffde08cf18fe22214acee27877090d7a7e3f458fac2f6f928cc822995c77579e705acb87b3bac4a9f84806bb3ce84eacfe7b51db3b51c94121c92b5335e207bb SHA512 6b0496d1901c51da66d75fde1b980333df8b1e03572f49ecd56f3f3c67d3af1b08527c7b764aa3b62b0296b97aaaa861d257a97a4370b3600b2cd7ffb9580936
-AUX singular-4.0.3-fix-resources-name.patch 10175 BLAKE2B 54b576ab1d5db6a1d2aca507472e3eba0a4c02507c82de7dfd1d6ad069c5225c8c2957c9258f57f686b5fa845427d95cbb350bf4bb151ee13e5b4eaa8e900c17 SHA512 29c43d97598c647ac2754ed897411638f0141b60de590a53fc3f476cd1d627b270ecab29e16923b00757d8218d680c6b837070fa6899e4c770243bf71e86a09f
 AUX singular-4.0.3-gfan_linking.patch 705 BLAKE2B 9ec4dafad75885132d4f6bea65f945a5f6f383e39f3d375a70e12a86db983cc3d64e14b148db07c9577a46d2a8f534f43988d264fdb43dc61b247843af5f438d SHA512 4c2ab45f449f9c3d79165e1c9a0634fb08a9cd34dbc898e0e172409f6914ccd6e1c4e1719ccf0b36e591b4840e8cba08576ac1b57fadd08f8344b45e1af40d89
 AUX singular-4.1.3-doc_install.patch 2834 BLAKE2B d8e35169534ed9087fc1faf6029a111819d2198d5fa61134ba083920604f93a346e6f274da02361b0c03ba05fea2c4f1b23fe2af8a46d8e6705cf4ccd025751a SHA512 36d3b6f2d90479ae508c7771d4fd7724ada5f5102ece78c4d5bc113c23848973706f19a9e1467de322ecee29712dc1d915f41b491bef23529a43380ff69d84ef
+AUX singular-4.2.0-doc_install.patch 3390 BLAKE2B 753101890dadfdbd5c0e53a7e2c94572a02d43f0370f861ea164b4db38daf010ec30c8b939f030998f3b18e49f397b4a379991ad91f9edc83c26bc06354fe53f SHA512 8a6e95ca94faada5b9d4c568e1e2f2fa67ff34b514eba7c9d9f8b0701a1e1eb56d26d7740818149f534b28e6c98c08205d429297efaa905549def320573c7a26
+AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
-DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232da60412a8380045ac594cbe313bf6a403068d1724f637d47de44e66baf34c74fa5c4ee622721c5bbd67764e65e66c8583a SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25
-DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 5f565bf14677d8414300d7a5602aa96c8cef7e863fd858083fe4561742b545d74a5fc4de95ef0c63acf4f78c66405bac7ba77a954e42b2e87a6da608e4732bcd SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d
-DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025 SHA512 5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
-DIST singular-4.0.3.tar.gz 12615042 BLAKE2B b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d SHA512 781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
-EBUILD singular-4.0.2.ebuild 3564 BLAKE2B b24e5fe11a2b8d3b400663c5950f9a7d9342db159c53c0ff9a703f1c9ee929d15d7ebde73a4ee303dba99f4d181b118b37c1a3529e8dcd410e98a3296ab2ae4f SHA512 ef838c4b4ed39e442ec90eafa0783a9b2d8526d2da37eeae89050a0c6507f7d813dfbe07a2ebd092fd097573c6607415d8a21dfa044573f3bad79919c15b425b
-EBUILD singular-4.0.3.ebuild 2499 BLAKE2B 5d17c7d35ec1ba6073e7d4703134fe96b4f8d59ae34922947dbc0f8f2aa6ddf52535e766aa62b1f66be5ef92c9dab5b458f02266239f8ba1013920e59c73ae8b SHA512 bfb148756c9f381ccdd6e2374971c0e1e589e7739b473a86826a35d6e15e0d724fcb76cf672896dbf9f562f033d2752bdbe1bc8521cd276b1fc6358e0014ce90
-EBUILD singular-4.2.0_p1.ebuild 2261 BLAKE2B 5c3e9208ffc6bbe2e0e1be3ef26a2ac30c2b859630d9354a219575517293ca74608cdadeee539544c308ff4e495d778eb4b985449e04167df8d833ba9e1da4a8 SHA512 f77fbffe6507710d11ad0081127c2a52918d4762d52aa7741e899106b54e233cd064c28d47b0b2865f4e162cdd31f65e712fa577a2cb35d270d23ce834b52a89
-MISC metadata.xml 389 BLAKE2B dcba16dd34ab572d58d76ea55f528ee1a4bb4c0c37ca272c9a11afdb8117f6982e5109a4a4783d1efc6cb31fe273f07bf79f720f178fea635af29574007c93f9 SHA512 3c5aea925276639c81a03a2a8d05ecaa48edac510f144d92e173402721dbc253638341ac8afdfbc17098ac35d2f4f47b41e5d56427c8ecaa788dc28fbb0977ae
+DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
+EBUILD singular-4.2.0_p1.ebuild 2258 BLAKE2B d74e8ad0c98142364ff097e5e2d8585d01ba863021178d9c5206507c2318e71c0484bf620d77bae4927722395ef9b785d6e00be0d7d7bbd91086d71a2f54e143 SHA512 a9339d04e4beb91f440caede447bd565bf1576cab72b93e44ae39ce9be6ef26e294713b39526baa8c5ff68c867cbcddb9e87c42f19c27ca6e82786e4a5b2bf12
+EBUILD singular-4.2.0_p3.ebuild 2261 BLAKE2B 2e68d795ff1ce9984b01dd470b7715e561ba5dd32f5aefe812c4626aced0f2ac540615bfe20d7c5e2d933e91b02c3b764fdfd79e703e511a07dae4b283a480fa SHA512 19bc85354919eaafd0e244d423f44b6b4026e49a286df4613fcb2e55cade16568c5a9c4cad9890825de9bc7f0b8feac4bdaf280ac234ef767bd8c33ed07dab77
+MISC metadata.xml 275 BLAKE2B aaeef273b6352edaadf69ef76545573fbe0d22a6062f9567bcb34b1fdea4e2fb140b9aa0b4d8f44a3c3e31108f34eb555dded6f5808fac84fd29a83ef184da88 SHA512 e7e449f8bf039a1fc4707c0b12706d27b237fb3e7bee5e457bc79e032a04d7b9eb2901059b007350cc3617689638b76f97fbbd672e2d0101e2071448642415a7
diff --git a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
deleted file mode 100644
index 87b44234af5f..000000000000
--- a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -dHrN singular-4.0.0.orig/omalloc/configure.ac singular-4.0.0/omalloc/configure.ac
---- singular-4.0.0.orig/omalloc/configure.ac	2014-03-06 18:07:49.000000000 +0100
-+++ singular-4.0.0/omalloc/configure.ac	2014-05-09 15:41:19.755097185 +0200
-@@ -117,7 +117,7 @@
- dnl check for programs
- dnl
- AC_CHECK_PROG(AR, ar, ar, :)
--if test "$ac_cv_prog_AR" != ar; then
-+if test "$ac_cv_prog_AR" = no; then
-   AC_MSG_ERROR(*** ar program not found)
- fi
- AC_CHECK_PROGS(PERL, perl, "no")
diff --git a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch b/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch
deleted file mode 100644
index d3e6b77a28e9..000000000000
--- a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/factory/NTLconvert.cc b/factory/NTLconvert.cc
-index 41ce9b2..e32093d 100644
---- a/factory/NTLconvert.cc
-+++ b/factory/NTLconvert.cc
-@@ -30,6 +30,7 @@
- #include <NTL/GF2EXFactoring.h>
- #include <NTL/tools.h>
- #include <NTL/mat_ZZ.h>
-+#include <NTL/version.h>
- #include "int_int.h"
- #include <limits.h>
- #include "NTLconvert.h"
-@@ -500,8 +501,14 @@ convertZZ2CF (const ZZ & a)
-     return CanonicalForm(coeff_long);
-   }
-   else
--  {
--    long sizeofrep= ((long *) a.rep) [1];
-+  { 
-+    const long * rep =
-+#if NTL_MAJOR_VERSION <= 6
-+      static_cast<long *>( a.rep );
-+#else
-+      static_cast<long *>( a.rep.rep ); // what about NTL7?
-+#endif
-+    long sizeofrep= rep[1];
-     bool lessZero= false;
-     if (sizeofrep < 0)
-     {
-@@ -519,7 +526,7 @@ convertZZ2CF (const ZZ & a)
-       cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2;
-       cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l);
-     }
--    int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) (((long *) (a.rep)) + 2), sizeofrep);
-+    int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) ((rep) + 2), sizeofrep);
- 
-     char* cf_stringtemp2;
-     if (lessZero)
diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch b/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch
deleted file mode 100644
index caeed33f1fc3..000000000000
--- a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7eac42b467723a83a951218be53785411be3dbc4 Mon Sep 17 00:00:00 2001
-From: jgmbenoit <quatermaster@rezozer.net>
-Date: Thu, 28 Apr 2016 05:47:53 +0000
-Subject: [PATCH] automake: install-data-local: missing DESTDIR prefix
-
----
- Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 32778f7..24dd251 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,9 +17,9 @@ dist-hook:
- 	$(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
- 
- install-data-local:
--	-cat ${top_srcdir}/doc/doc.tbz2| (cd $(datadir)/singular;tar jxf -)
--	-mkdir $(datadir)/info
--	-mv  $(datadir)/singular/singular.hlp  $(datadir)/info/.
-+	-cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -)
-+	-mkdir $(DESTDIR)$(datadir)/info
-+	-mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/.
- 
- configheaderdir = ${includedir}/singular
- nodist_configheader_HEADERS = singularconfig.h
diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch b/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch
deleted file mode 100644
index bcda4ced6472..000000000000
--- a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-From a3a6a07858b7e91c4c8a3c8d07e53957a8547af2 Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Thu, 1 Sep 2016 10:48:08 +0200
-Subject: [PATCH] change library name: libresources -> libsingular_resources
-
----
- Singular/Makefile.am               |  4 ++--
- autogen.sh                         |  1 +
- factory/configure.ac               |  8 ++++----
- gfanlib/configure.ac               |  2 +-
- libpolys/configure.ac              |  8 ++++----
- m4/options.m4                      | 10 +++++-----
- resources/Makefile.am              | 18 +++++++++---------
- resources/configure.ac             |  6 +++---
- resources/feFopen.cc               |  2 +-
- resources/feResource.cc            |  2 +-
- resources/omFindExec.c             |  2 +-
- resources/resources.pc.in          | 17 -----------------
- resources/singular_resources.pc.in | 17 +++++++++++++++++
- 13 files changed, 49 insertions(+), 48 deletions(-)
- delete mode 100644 resources/resources.pc.in
- create mode 100644 resources/singular_resources.pc.in
-
-diff --git a/Singular/Makefile.am b/Singular/Makefile.am
-index e2bcc23..be84a08 100644
---- a/Singular/Makefile.am
-+++ b/Singular/Makefile.am
-@@ -176,7 +176,7 @@ ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
- # ESingular_LDFLAGS = -static ${AM_LDFLAGS}
- ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
--${top_builddir}/resources/libresources.la
-+${top_builddir}/resources/libsingular_resources.la
- 
- 
- ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
-@@ -186,7 +186,7 @@ TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
- # TSingular_LDFLAGS = -static ${AM_LDFLAGS}
- TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
--${top_builddir}/resources/libresources.la
-+${top_builddir}/resources/libsingular_resources.la
- 
- TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
- # utils.cc utils.h
-diff --git a/autogen.sh b/autogen.sh
-index d027997..0d09c08 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -4,6 +4,7 @@ cd `dirname "$0"`
- 
- # -d --warnings=all
- autoreconf  -v -f -i
-+find . -name configure -exec sed -i "s/-g -O2/-g/g" {} \; -print
- 
- cd -
- 
-diff --git a/factory/configure.ac b/factory/configure.ac
-index 7ea255b..a9caf73 100644
---- a/factory/configure.ac
-+++ b/factory/configure.ac
-@@ -120,10 +120,10 @@ AM_CONDITIONAL(
-     [WITH_PARSER_FOR_CANONICAL_FORM],
-     [test "x$enable_streamio" = xyes])
- 
--AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
--AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] )
-+AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] )
-+AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] )
- 
--AC_MSG_CHECKING(whether libresources should be used)
-+AC_MSG_CHECKING(whether libsingular_resources should be used)
- if test "x$with_Singular" = xyes;
- then
-   AC_MSG_RESULT(yes)
-@@ -134,7 +134,7 @@ then
-   AC_MSG_CHECKING([  RESOURCES_LIBS?..])
-   AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
- 
--  PKG_REQUIRE="$PKG_REQUIRE resources"
-+  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
-   AC_SUBST(PKG_REQUIRE)
- else
-   AC_MSG_RESULT(no)
-diff --git a/gfanlib/configure.ac b/gfanlib/configure.ac
-index 015134c..d3d2cd7 100644
---- a/gfanlib/configure.ac
-+++ b/gfanlib/configure.ac
-@@ -2,7 +2,7 @@
- # Process this file with autoconf to produce a configure script.
- 
- AC_PREREQ([2.63])
--AC_INIT([libgfan], [0.1], [ren@mathematik.uni-kl.de])
-+AC_INIT([libgfan], [0.6], [ren@mathematik.uni-kl.de])
- AC_CONFIG_MACRO_DIR([../m4])
- AC_CONFIG_AUX_DIR([../build-aux])
- AC_CONFIG_SRCDIR([gfanlib.h])
-diff --git a/libpolys/configure.ac b/libpolys/configure.ac
-index 049e44d..4b2f1ae 100644
---- a/libpolys/configure.ac
-+++ b/libpolys/configure.ac
-@@ -90,10 +90,10 @@ SING_CHECK_OMALLOC()
- 
- ENABLE_RESOURCES="yes"
- 
--AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
--AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] )
-+AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] )
-+AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] )
- 
--AC_MSG_CHECKING(whether libresources should be used)
-+AC_MSG_CHECKING(whether libsingular_resources should be used)
- 
- if test "x$ENABLE_RESOURCES" = xyes;
- then
-@@ -105,7 +105,7 @@ then
-   AC_MSG_CHECKING([  RESOURCES_LIBS?..])
-   AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
- 
--  PKG_REQUIRE="$PKG_REQUIRE resources"
-+  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
-   AC_SUBST(PKG_REQUIRE)
- else
-   AC_MSG_RESULT(no)
-diff --git a/m4/options.m4 b/m4/options.m4
-index 31b86e4..066dc4d 100644
---- a/m4/options.m4
-+++ b/m4/options.m4
-@@ -150,19 +150,19 @@ AC_DEFUN([SING_USE_OMALLOC],
- 
- AC_DEFUN([SING_USE_RESOURCES],
- [
-- AC_ARG_ENABLE(resources,
--  [AS_HELP_STRING([--disable-resources], [do NOT use libresources within the factory])],
-+ AC_ARG_ENABLE(singular_resources,
-+  [AS_HELP_STRING([--disable-singular_resources], [do NOT use libsingular_resources within the factory])],
-   [if test "x$enableval"  = "xyes"; then
-     ENABLE_RESOURCES=yes
-    fi],
-     ENABLE_RESOURCES=yes)
- 
-- AC_MSG_CHECKING(whether to use libresources in factory and co.)
-+ AC_MSG_CHECKING(whether to use libsingular_resources in factory and co.)
-  if test "x$ENABLE_RESOURCES" = xyes; then
-   AC_MSG_RESULT(yes)
-   RESOURCES_INCLUDES="-I$ac_abs_top_srcdir "
- 
--  RESOURCES_LIBS="$ac_abs_top_builddir/resources/libresources.la"
-+  RESOURCES_LIBS="$ac_abs_top_builddir/resources/libsingular_resources.la"
- 
-   AC_SUBST(RESOURCES_INCLUDES)
-   AC_SUBST(RESOURCES_LIBS)
-@@ -171,7 +171,7 @@ AC_DEFUN([SING_USE_RESOURCES],
- 
-   ac_configure_args="$ac_configure_args $ENABLE_ARG"
- 
--  PKG_REQUIRE="$PKG_REQUIRE resources"
-+  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
-   AC_SUBST(PKG_REQUIRE)
-  else
-   AC_MSG_RESULT(no)
-diff --git a/resources/Makefile.am b/resources/Makefile.am
-index fa69ccc..934175b 100644
---- a/resources/Makefile.am
-+++ b/resources/Makefile.am
-@@ -1,24 +1,24 @@
- ACLOCAL_AMFLAGS = -I ../m4
- 
--libresources_LTLIBRARIES = libresources.la
-+libsingular_resources_LTLIBRARIES = libsingular_resources.la
- 
--libresourcesdir = $(libdir)
-+libsingular_resourcesdir = $(libdir)
- 
- 
- AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
- 
- 
- SOURCES  = omFindExec.c feResource.cc feFopen.cc
--libresources_la_SOURCES   = $(SOURCES)
-+libsingular_resources_la_SOURCES   = $(SOURCES)
- 
--libresources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
-+libsingular_resources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
- 
--libresources_includedir  =$(includedir)/resources
-+libsingular_resources_includedir  =$(includedir)/resources
- 
--libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h
-+libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h
- 
--nodist_libresources_include_HEADERS = resourcesconfig.h
--DISTCLEANFILES = $(nodist_libresources_include_HEADERS)
-+nodist_libsingular_resources_include_HEADERS = singular_resourcesconfig.h
-+DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS)
- 
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = resources.pc
-+pkgconfig_DATA = singular_resources.pc
-diff --git a/resources/configure.ac b/resources/configure.ac
-index bc5f294..212a1d5 100644
---- a/resources/configure.ac
-+++ b/resources/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([resources], [4.0.3])
-+AC_INIT([singular_resources], [4.0.3])
- 
- AC_CONFIG_MACRO_DIR([../m4])
- AC_CONFIG_AUX_DIR([../build-aux])
-@@ -14,7 +14,7 @@ dnl Check if build env is sane
- AM_SANITY_CHECK
- 
- # Add pre'prefixed config
--AX_PREFIX_CONFIG_H([resourcesconfig.h],[],[_config.h])
-+AX_PREFIX_CONFIG_H([singular_resourcesconfig.h],[],[_config.h])
- 
- SING_RESET_FLAGS()
- SING_CHECK_SET_ARGS()
-@@ -70,5 +70,5 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
- AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- 
--AC_CONFIG_FILES([resources.pc Makefile])
-+AC_CONFIG_FILES([singular_resources.pc Makefile])
- AC_OUTPUT
-diff --git a/resources/feFopen.cc b/resources/feFopen.cc
-index 98cfd44..10800a0 100644
---- a/resources/feFopen.cc
-+++ b/resources/feFopen.cc
-@@ -1,4 +1,4 @@
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
- #include "feResource.h"
- #include "feFopen.h"
- 
-diff --git a/resources/feResource.cc b/resources/feResource.cc
-index 49a6855..a3accf9 100644
---- a/resources/feResource.cc
-+++ b/resources/feResource.cc
-@@ -5,7 +5,7 @@
- * ABSTRACT: management of resources
- */
- 
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
- #include "feResource.h"
- #include "omFindExec.h"
- 
-diff --git a/resources/omFindExec.c b/resources/omFindExec.c
-index e79f2c8..1d5852a 100644
---- a/resources/omFindExec.c
-+++ b/resources/omFindExec.c
-@@ -6,7 +6,7 @@
-  *******************************************************************/
- 
- 
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
- 
- 
- #if defined(HAVE_UNISTD_H) && defined(STDC_HEADERS)
-diff --git a/resources/resources.pc.in b/resources/resources.pc.in
-deleted file mode 100644
-index d040056..0000000
---- a/resources/resources.pc.in
-+++ /dev/null
-@@ -1,17 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--
--Name: @PACKAGE@
--Description: The Singular resources manager
--Version: @PACKAGE_VERSION@
--URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
--
--# Requires:
--# Conflicts:
--
--Cflags: -I${includedir} @SINGULAR_CFLAGS@
--Libs: -L${libdir} -l@PACKAGE@
--# Libs.private:
--
-diff --git a/resources/singular_resources.pc.in b/resources/singular_resources.pc.in
-new file mode 100644
-index 0000000..d040056
---- /dev/null
-+++ b/resources/singular_resources.pc.in
-@@ -0,0 +1,17 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE@
-+Description: The Singular resources manager
-+Version: @PACKAGE_VERSION@
-+URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
-+
-+# Requires:
-+# Conflicts:
-+
-+Cflags: -I${includedir} @SINGULAR_CFLAGS@
-+Libs: -L${libdir} -l@PACKAGE@
-+# Libs.private:
-+
diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
new file mode 100644
index 000000000000..b0656d9fb676
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
@@ -0,0 +1,79 @@
+From 74ec250d3d89d0125c409b3340aca50a00b067ad Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 30 May 2021 08:28:41 -0400
+Subject: [PATCH 3/3] autotools: support docdir and htmldir.
+
+Instead of hard-coding the "doc" and "html" subdirectories,
+allow them to be ./configured.
+---
+ Makefile.am             | 8 ++++----
+ configure.ac            | 5 +++++
+ resources/configure.ac  | 4 ++++
+ resources/feResource.cc | 2 +-
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index fbea51d..c5d78a7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,10 +16,10 @@ bin_SCRIPTS = libsingular-config
+ 
+ install-data-local:
+ 	if test -e $(srcdir)/doc/doc.tbz2; then\
+-	  (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
+-	   mkdir $(DESTDIR)$(datadir)/info;\
+-	   mkdir $(DESTDIR)$(datadir)/doc;\
+-	   mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
++	   mkdir -p $(DESTDIR)$(docdir);\
++	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx --no-same-owner -f -));\
++	   mv  $(DESTDIR)$(docdir)/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
++	   @INSTALL_DATA@ doc/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
+ 	fi
+ 
+ uninstall-local:
+diff --git a/configure.ac b/configure.ac
+index 490a45f..997db6c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ AC_SUBST(DATA_DIR, "$config_datadir")
+ 
++AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
++AX_NORMALIZE_PATH([config_docdir],['/'])
++AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
++AC_SUBST(DOC_DIR, "$config_docdir")
++
+ SING_SHOW_FLAGS([Compiler/linker flags: ])
+ 
+ 
+diff --git a/resources/configure.ac b/resources/configure.ac
+index 0dc468f..da68144 100644
+--- a/resources/configure.ac
++++ b/resources/configure.ac
+@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
+ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ 
++AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
++AX_NORMALIZE_PATH([config_htmldir],['/'])
++AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir])
++
+ AC_CONFIG_FILES([singular_resources.pc Makefile])
+ AC_OUTPUT
+diff --git a/resources/feResource.cc b/resources/feResource.cc
+index 3d75bc9..7e4fc8c 100644
+--- a/resources/feResource.cc
++++ b/resources/feResource.cc
+@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
+   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
+   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%D/info/singular.hlp", (char *)""},
+   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%D/singular/singular.idx",  (char *)""},
+-  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%D/singular/html",              (char *)""},
++  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    HTML_DIR,              (char *)""},
+   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "https://www.singular.uni-kl.de/Manual/",    (char *)""},
+   {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
+   {"Path",      'p',    feResPath,  NULL,                   "%b;%P;$PATH",             (char *)""},
+-- 
+2.31.1
+
diff --git a/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch
new file mode 100644
index 000000000000..267bf19361ad
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch
@@ -0,0 +1,38 @@
+From 705149b86a80dd8b53fa8c1717872e9b2e9dbbcb Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 30 May 2021 08:10:10 -0400
+Subject: [PATCH 1/3] gfanlib/Makefile.am: use LIBADD for additional libraries.
+
+The $GMP_LIBS and $CDDGMPLDFLAGS variables were being added to
+libgfan_la_LDFLAGS, which isn't quite correct. Since both contain
+library (-l) flags, they belong in _LIBADD rather than _LDFLAGS:
+
+  https://www.gnu.org/software/automake/manual/html_node/Libtool-Flags.html
+
+This commit moves them to a new libgfan_la_LIBADD variable.
+---
+ gfanlib/Makefile.am | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am
+index cec8d8f..96e1893 100644
+--- a/gfanlib/Makefile.am
++++ b/gfanlib/Makefile.am
+@@ -18,9 +18,13 @@ AM_CXXFLAGS = @CXX11_FLAG@
+ 
+ SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
+ libgfan_la_SOURCES = $(SOURCES)
+-libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS)
++libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS)
+ libgfan_la_CPPFLAGS= $(GMP_CPPFLAGS) $(CDDGMPCPPFLAGS)
+ 
++# Despite the naming convention, $CDDGMPLDFLAGS contains "-lcddgmp"
++# and the rest of the $GMP_LIBS flags.
++libgfan_la_LIBADD = $(CDDGMPLDFLAGS) $(GMP_LIBS)
++
+ noinst_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h  gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h  gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h
+ 
+ DISTCLEANFILES =  config.h
+-- 
+2.31.1
+
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index faab92efd936..d17eda6d58f4 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -5,7 +5,4 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <use>
-    <flag name="boost">Compile against external boost headers (<pkg>dev-libs/boost</pkg>)</flag>
-  </use>
 </pkgmetadata>
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
deleted file mode 100644
index c66500337100..000000000000
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch elisp-common flag-o-matic toolchain-funcs versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators '.')
-# Consistency is different...
-MY_DIR2=$(get_version_component_range 1-3 ${PV})
-MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
-# This is where the share tarball unpacks to
-MY_SHARE_DIR="${WORKDIR}"/share/
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="https://www.singular.uni-kl.de/"
-SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
-		 https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux"
-IUSE="boost doc emacs examples python +readline"
-
-RDEPEND="dev-libs/gmp:0
-	>=dev-libs/ntl-5.5.1
-	emacs? ( >=app-editors/emacs-23.1:* )
-	sci-mathematics/flint
-	sci-mathematics/4ti2
-	sci-libs/cddlib"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	boost? ( dev-libs/boost )
-	readline? ( sys-libs/readline )"
-
-SITEFILE=60${PN}-gentoo.el
-
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-pkg_setup() {
-	append-flags "-fPIC"
-	append-ldflags "-fPIC"
-	tc-export AR CC CPP CXX
-}
-
-src_prepare() {
-	# Need to do something about resources later...
-	# epatch "${FILESDIR}"/${PN}-4.0.0-gentoo.patch
-
-	# omalloc's old configure will fail if ar is not exactly 'ar'.
-	epatch "${FILESDIR}"/${PN}-4.0.0-fix-omalloc-ar-detection.patch
-
-	epatch "${FILESDIR}"/${PN}-4.0.2-ntl8-compat.patch
-
-	# autoreconf everything since otherwise it assumes autmake-1.13 is installed
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-gmp \
-		  --with-ntl \
-		  --with-flint \
-		  --enable-gfanlib \
-		  --disable-debug \
-		  --disable-doc \
-		  --enable-factory \
-		  --enable-libfac \
-		  --enable-IntegerProgramming \
-		  $(use_with python python embed) \
-		  $(use_with boost Boost) \
-		  $(use_enable emacs) \
-		  $(use_with readline) || die "configure failed"
-}
-
-src_compile() {
-	emake
-
-	if use emacs; then
-		cd "${MY_SHARE_DIR}"singular/emacs/
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-# src_install() {
-# 	dodoc README
-# 	# execs and libraries
-# 	cd "${S}"/build/bin
-# 	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
-# 	insinto /usr/$(get_libdir)/${PN}
-# 	doins *.so
-#
-# 	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
-#
-# 	# stuff from the share tar ball
-# 	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
-# 	insinto /usr/share/${PN}
-# 	doins -r LIB
-# 	if use examples; then
-# 		insinto /usr/share/doc/${PF}
-# 		doins -r examples
-# 	fi
-# 	if use doc; then
-# 		dohtml -r html/*
-# 		insinto /usr/share/${PN}
-# 		doins doc/singular.idx
-# 		cp info/${PN}.hlp info/${PN}.info &&
-# 		doinfo info/${PN}.info \
-# 			|| die "failed to install info files"
-# 	fi
-# 	if use emacs; then
-# 		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \
-# 			|| die "elisp-install failed"
-# 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-# 	fi
-# }
-
-pkg_postinst() {
-	einfo "The authors ask you to register as a SINGULAR user."
-	einfo "Please check the license file for details."
-
-	if use emacs; then
-		echo
-		ewarn "Please note that the ESingular emacs wrapper has been"
-		ewarn "removed in favor of full fledged singular support within"
-		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
-		ewarn "and you should be good to go! See bug #193411 for more info."
-		echo
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild
deleted file mode 100644
index 3a0712e9be7f..000000000000
--- a/sci-mathematics/singular/singular-4.0.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common flag-o-matic multilib prefix toolchain-funcs versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators '.')
-# Consistency is different...
-MY_DIR2=$(get_version_component_range 1-3 ${PV})
-MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
-# This is where the share tarball unpacks to
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="https://www.singular.uni-kl.de/"
-SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
-		 https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
-IUSE="boost doc emacs examples python +readline"
-
-RDEPEND="dev-libs/gmp:0
-	>=dev-libs/ntl-5.5.1
-	emacs? ( >=app-editors/emacs-23.1:* )
-	sci-mathematics/flint
-	sci-mathematics/4ti2
-	sci-libs/cddlib"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	boost? ( dev-libs/boost )
-	readline? ( sys-libs/readline )"
-
-SITEFILE=60${PN}-gentoo.el
-
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-pkg_setup() {
-	append-flags "-fPIC"
-	append-ldflags "-fPIC"
-	tc-export AR CC CPP CXX
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${P}"-fix-resources-name.patch
-	eapply "${FILESDIR}"/"${P}"-fix-destdir.patch
-	eapply_user
-	# autoreconf everything since otherwise it assumes autmake-1.13 is installed
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-gmp \
-		  --with-ntl \
-		  --with-flint \
-		  --enable-gfanlib \
-		  --disable-debug \
-		  --disable-doc \
-		  --enable-factory \
-		  --enable-libfac \
-		  --enable-IntegerProgramming \
-		  $(use_with python python embed) \
-		  $(use_with boost Boost) \
-		  $(use_enable emacs) \
-		  $(use_with readline) || die "configure failed"
-}
-
-src_compile() {
-	emake
-
-	if use emacs; then
-		cd "${S}"/emacs/
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-pkg_postinst() {
-	einfo "The authors ask you to register as a SINGULAR user."
-	einfo "Please check the license file for details."
-
-	if use emacs; then
-		echo
-		ewarn "Please note that the ESingular emacs wrapper has been"
-		ewarn "removed in favor of full fledged singular support within"
-		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
-		ewarn "and you should be good to go! See bug #193411 for more info."
-		echo
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/singular/singular-4.2.0_p1.ebuild b/sci-mathematics/singular/singular-4.2.0_p1.ebuild
index b015ba5fee61..47a82d1c8fae 100644
--- a/sci-mathematics/singular/singular-4.2.0_p1.ebuild
+++ b/sci-mathematics/singular/singular-4.2.0_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~x86-linux"
 IUSE="emacs examples +readline static-libs"
 
 RDEPEND="dev-libs/gmp:0
diff --git a/sci-mathematics/singular/singular-4.2.0_p3.ebuild b/sci-mathematics/singular/singular-4.2.0_p3.ebuild
new file mode 100644
index 000000000000..df77bad38d57
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.2.0_p3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+MY_PN=Singular
+MY_PV=$(ver_rs 3 '')
+# Consistency is different...
+MY_DIR2=$(ver_cut 1-3 ${PV})
+MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Sources"
+SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+IUSE="emacs examples +readline static-libs"
+
+RDEPEND="dev-libs/gmp:0
+	dev-libs/ntl:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	sci-mathematics/flint
+	sci-libs/cddlib
+	dev-lang/perl
+	readline? ( sys-libs/readline )"
+
+DEPEND="${RDEPEND}"
+
+SITEFILE=60${PN}-gentoo.el
+
+S="${WORKDIR}/${PN}-${MY_DIR2}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-gfan_linking.patch"
+	"${FILESDIR}/${PN}-4.2.0-doc_install.patch"
+	"${FILESDIR}/${PN}-4.2.0-no-static.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-gmp \
+		--with-ntl="${EPREFIX}"/usr \
+		--with-flint \
+		--enable-gfanlib \
+		--disable-debug \
+		--disable-doc \
+		--enable-factory \
+		--enable-libfac \
+		--enable-IntegerProgramming \
+		--disable-polymake \
+		$(use_enable static-libs static) \
+		$(use_enable emacs) \
+		$(use_with readline)
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		pushd "${S}"/emacs
+		elisp-compile *.el || die "elisp-compile failed"
+		popd
+	fi
+}
+
+src_install() {
+	# Do not compress singular's info file (singular.hlp)
+	# some consumer of that file do not know how to deal with compression
+	docompress -x /usr/share/info
+
+	default
+
+	dosym Singular /usr/bin/"${PN}"
+
+	# purge .la file
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	# SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
+	# an already installed version of singular may be used and cause segfault
+	# See https://github.com/Singular/Sources/issues/980
+	SINGULAR_PROCS_DIR="" emake check
+}
+
+pkg_postinst() {
+	einfo "Additional functionality can be enabled by installing"
+	einfo "sci-mathematics/4ti2"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index cfa6df1c0c4c..bdc83bbbfe85 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -3,6 +3,6 @@ AUX topcom-0.17.8-buildsystem.patch 4989 BLAKE2B a19b70ff73da5e93beac923db339b8f
 DIST TOPCOM-0.17.7.tar.gz 8661519 BLAKE2B f42d273b39b15ccaf0d24ad360dc91cecd2ab83c97eb5a2fffe95575d7c8063d9afa842d7bfae03faee32ced1f98ccc55a750a59c1f544acded462a478aac636 SHA512 528e566e488641e078a8c9150f88a1544f607e6859da1d95a98dc5890c5a52882f8c8790097c3a77277066bd5d4c10a1e0a9c131fbc521f56f6139eeab7e21d1
 DIST TOPCOM-0.17.8.tar.gz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
 DIST TOPCOM-manual.html 19251 BLAKE2B 8e361fd81bed45b552766a86a856ed1411154b5c523e14463750651d1c8d7b0f1f25a7c29bfdc34910fad3d19a1df94ded47b63a973f22baf3d60a7c5f0e1578 SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67
-EBUILD topcom-0.17.7.ebuild 1188 BLAKE2B 82bdec14402b06680db2ef7fd070a338a5347f2d814c5308eb4d38e4b4169d78dc04d6706eb41606ef6dcda9f1f25ddee770f1e62c355d9ccd2290b2a66e6fc5 SHA512 b4ee0b662c918abbb555e78ad75ef7187d02683cba5614c1dfc75366d4844bfde39c7018de9e8db718d87cbfd5fcb7ce2dc01aa05d20f03462ae20283d7aa1da
+EBUILD topcom-0.17.7-r1.ebuild 1167 BLAKE2B 2e94f559c1f84a4ff1d384f2da1a86dbc76fa2fc405fedf6d00040d8ca3a71f23365f4d04947236f02195ea3d2b0c23a762e1abf48c384de88b233d6686bda40 SHA512 a4e492e95d249625f67cdab3e492475a3276e45e550f9b6c643fa1214db07dca72f84bf3110bd2dbcaff0694542d2d05bab0197ae2b43077ebe010273be87981
 EBUILD topcom-0.17.8-r1.ebuild 1301 BLAKE2B 459aa85f1cbf0a33ef96c597e9a7e00dfa4d15fc2fc5a5fbd0bc0825d6620fc8d36ff41bc4cfcdae7a477bc52797368efe76b01044396b6b9e51027f0205eba6 SHA512 9d77312e83cbe06a53dc5c8b573a118bc38b49b60515972fd08b88ffc5fbef5987d03bfe4b0c52ba92a66d981121e7f64882f26e4a9e1548d3de853283358938
 MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/sci-mathematics/topcom/topcom-0.17.7.ebuild b/sci-mathematics/topcom/topcom-0.17.7-r1.ebuild
index 6ff02493a140..0e7e8c06ff27 100644
--- a/sci-mathematics/topcom/topcom-0.17.7.ebuild
+++ b/sci-mathematics/topcom/topcom-0.17.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ src_install() {
 
 	use examples && dodoc -r "${S}"/examples
 
-	docinto /usr/share/doc/${PF}/html
+	docinto html
 	use doc && dodoc "${DISTDIR}"/TOPCOM-manual.html
 
 	mv "${ED}"/usr/bin/cube "${ED}"/usr/bin/topcom_cube || die
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 5e595c869d31..4a9e5c0a6376 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -2,8 +2,10 @@ DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6
 DIST wxmaxima-21.01.0.tar.gz 16220587 BLAKE2B b987e8c44c253484d152092093ab9154b7c2a5817c584bc1a4f4a0e5beec3ec2e0bc6995aea6ba28df2223b039ca97905225cc2524840174b2c99a5f7774dab2 SHA512 aec5aa5d3a9883e9b21b890c133684004576411a8341f3913ae548175979ad1f07a16d0fccd24c7757d40f4d06b4070b00fa7ef54f73f26b99c825e03e2a408b
 DIST wxmaxima-21.04.0.tar.gz 17684730 BLAKE2B a3b12970ad976a3ee3fc237b6d60f52d460e87997b869825d17645daa0f82bcc6f7999188fe4c92bba819d7a895cff468ff273ab62ab30f38a7a54a6dba47786 SHA512 723373c9fd9877bce38a205455e6ac58a48a61ac3ad0be5c09d0b24abeebd35af481f19efe5de08a2507f1198a8b4b6cfa987c50e4d4a580b4e05ec2c3e5a4f7
 DIST wxmaxima-21.05.1.tar.gz 17782450 BLAKE2B cf52c26342631810fd121ce89af98784bc243e650e3db3a26b577f63fffe63380c7af4db3d5f97ef3330455051ec0bc8349726cf70817dd24e7206dd0d274ef8 SHA512 beb100c5aba34a90e2c5c0f54022948e72e1b3f72862823fc23973abec644ed0f615d3c82499738c17d49d1c9af9ab6b868486d0187ee9971a7e6b017eda10cd
+DIST wxmaxima-21.05.2.tar.gz 17782421 BLAKE2B 8a4057087b38f1023f5773b4f3457060b1624e6de654c2b5fadb8fb529461bdf3393e6ea443e69d0ea2057130aa1a7de7ab6739d7797c3a90bb114ec96587289 SHA512 a5d7832d224bad0963a86d3714172d51b67a1c8daf933e66b6c7817da102f942e37aa2a31d8f0f1e27438b61b1ba2705af333edcf2c33a53fdeec318fe837ff6
 EBUILD wxmaxima-20.12.2.ebuild 1431 BLAKE2B 9a4b92a92dcf9636eec1449f27de9c4dbf5493d13e9cbbbc4c6ea8be8bfe5ca9d282b9df2b6c4a3f1d3c442a363551becf1bbf1c40da4eec77bdc69ed36723af SHA512 36ac799799deba2250d21a576a4387d2f4491afeae5dcaf5316d62008196a7ec80b4cc0d1745b67bc845c47172b1affb0f24405fd39edd12abf94c070ef32946
 EBUILD wxmaxima-21.01.0.ebuild 1896 BLAKE2B 5f1defc0d4e009b83ed05b436d58ac434c0d85733c4e51a17e54ebf62c4eeb7fe33b74acb9a650ece08587b0e7fbb4742043b3f0b130d8fcf72d7fe600947e39 SHA512 747541798d41f07190e841518563e648de0e379d6f8485dd03b62b22407cbd090e24bdaf4c7e8d094e07ec00e82b440ce60129f4eaccca3fe7bf1f15559fc966
 EBUILD wxmaxima-21.04.0.ebuild 1896 BLAKE2B 5f1defc0d4e009b83ed05b436d58ac434c0d85733c4e51a17e54ebf62c4eeb7fe33b74acb9a650ece08587b0e7fbb4742043b3f0b130d8fcf72d7fe600947e39 SHA512 747541798d41f07190e841518563e648de0e379d6f8485dd03b62b22407cbd090e24bdaf4c7e8d094e07ec00e82b440ce60129f4eaccca3fe7bf1f15559fc966
 EBUILD wxmaxima-21.05.1.ebuild 1896 BLAKE2B 5f1defc0d4e009b83ed05b436d58ac434c0d85733c4e51a17e54ebf62c4eeb7fe33b74acb9a650ece08587b0e7fbb4742043b3f0b130d8fcf72d7fe600947e39 SHA512 747541798d41f07190e841518563e648de0e379d6f8485dd03b62b22407cbd090e24bdaf4c7e8d094e07ec00e82b440ce60129f4eaccca3fe7bf1f15559fc966
+EBUILD wxmaxima-21.05.2.ebuild 1896 BLAKE2B 5f1defc0d4e009b83ed05b436d58ac434c0d85733c4e51a17e54ebf62c4eeb7fe33b74acb9a650ece08587b0e7fbb4742043b3f0b130d8fcf72d7fe600947e39 SHA512 747541798d41f07190e841518563e648de0e379d6f8485dd03b62b22407cbd090e24bdaf4c7e8d094e07ec00e82b440ce60129f4eaccca3fe7bf1f15559fc966
 MISC metadata.xml 723 BLAKE2B ab9996b65f11ba1e2a463a837e93de7520b8bc71bf691f3d01a9586d94f27273d41c9114912d5c551fc41329b1f2bce92fd433d620caadbba2bbe947e8532660 SHA512 277b301079c31fb3c5d8daddd6d53baab62eeea4ea66b6492aeb8bbea9f8cc15394b56e32e91e40899aa8637ee74da3b35c231ef117ac8c31a5880f87a096c05
diff --git a/sci-mathematics/wxmaxima/wxmaxima-21.05.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-21.05.2.ebuild
new file mode 100644
index 000000000000..86038f4610e9
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-21.05.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
+inherit cmake wxwidgets l10n xdg
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-Version-${PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+	media-fonts/jsmath
+	sci-visualization/gnuplot[wxwidgets]
+	sci-mathematics/maxima"
+
+src_prepare() {
+	setup-wxwidgets
+	cmake_src_prepare
+
+	sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \
+		|| die "sed info/CMakeLists.txt failed"
+
+	# locales
+	rm_po() {
+		rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
+		rm -f locales/manual/${1}.po
+		rm -f info/${PN}.${1}.md
+		rm -f info/${PN}.${1}.html
+		sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt
+	}
+	l10n_find_plocales_changes locales/wxMaxima '' '.po'
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWXM_UNIT_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Just run the unit tests manually for now as tests fail in a non-descriptive
+	# way even with virtualx
+	# bug #736695
+	cd "${BUILD_DIR}/test/unit_tests" || die
+
+	local tests=(
+		AFontSize
+		CellPtr
+		ImgCell
+	)
+
+	local test
+	for test in "${tests[@]}" ; do
+		./test_${test} || die "Unit test ${test} failed!"
+	done
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}
+	cmake_src_install
+}
diff --git a/sci-mathematics/yafu/Manifest b/sci-mathematics/yafu/Manifest
index b8a3b6a1349e..0745dafed605 100644
--- a/sci-mathematics/yafu/Manifest
+++ b/sci-mathematics/yafu/Manifest
@@ -1,4 +1,4 @@
 AUX yafu-1.34.3-Makefile.patch 211 BLAKE2B 787be431c83a03f4db65c4117f6b75b8f510dee9fcf93b8bcf20a7dcdf4393068da16720914e9dba6a098df7698a5101567b01b7f2addc1d3032ac9204a718d0 SHA512 ee88e14d5d7bc61f1666712ca96800f9f2715e3634e69edb4e8d4aceb4cc364f72fdffa7117970204574100cf3481f458dea2b5effa6b025cd26fb5c77a45d42
 DIST yafu-1.34-src.zip 686655 BLAKE2B 6c5ccb587aeacf4c72c7969d409846ad768f2f7ec1c7c100372617ce75c00a6d61a0a00691f6ebce4de1250e00cb4abe4abeee5278d2aab19d0d8861c8bd1916 SHA512 f8afba77e0286c579b4152517ba3a0b6b85d43606e4fafc653dc06b7f7c2aba0f8f3c65b38f3496657495bff476dd4cc8e06daaad8a7a78a36fc6e1c0cf046a4
 EBUILD yafu-1.34.3-r1.ebuild 1249 BLAKE2B 67b4b85adcf4f7209f55e90e054bf019b8268280598f7a1434f1bc44ebe70cb776f870e510e7c875d52b3b41de3bd252b6975535a91f956919f67014d6c52ad8 SHA512 acadd85a8e5c255aab171043c4fc5072dfae1d836d28b7e1f2d4ddb5fc2cc1963b4c3ff912e90dbef228859efd85dc8b88bdfe38600fc2b9fd54af97e73bad11
-MISC metadata.xml 321 BLAKE2B a198ce4210cbb59177aeef1e04575105f7117d292fb84fbc8ed0749043b9ce7cf429a02de9af2283b4689fca16337c88966d3ad52b8cd7fcf3b2c8ca82872652 SHA512 d59beca59e217b2192b449adb9be13f2bf301526ddc16abbdd08b248abb03f085aca725e21465f4e1aec65cce0f6cbea53ecafedfb5f87d66c8f9f74cf590e9e
+MISC metadata.xml 241 BLAKE2B ca626b854640fe4e1fb231645fdda01e1a8000bc7e61a194b6964a32128951d2dda204b084b2dd364c2c383269f5ed51a12f966b1399dd5c0240c9a07eaa7db9 SHA512 6bf7bf6b0d724680a072a25510dc6cc1c43fb84a03a754b4524a824714a55d4cf90ef3690be8693dd361c5da6c56a2ff4506cf59cbc22f034092453d8f2c6c92
diff --git a/sci-mathematics/yafu/metadata.xml b/sci-mathematics/yafu/metadata.xml
index 056ae1719a6e..f5b47bd8043d 100644
--- a/sci-mathematics/yafu/metadata.xml
+++ b/sci-mathematics/yafu/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">yafu</remote-id>
 	</upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /sci-mathematics
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)