gentoo resync : 12.03.2021

12 files changed, 232 insertions, 114 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 2cda125ec60e..ea7e8af739d1 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/fann/Manifest b/sci-mathematics/fann/Manifest
index a6ed25be77c7..70f71b11fc9a 100644
--- a/sci-mathematics/fann/Manifest
+++ b/sci-mathematics/fann/Manifest
@@ -1,5 +1,5 @@
 AUX fann-2.2.0-examples.patch 941 BLAKE2B 82b5480468179cad681e2c1359a84fe550ed4f23b42441d8b943a79c86d51d7b491e879cb597ee0c097acb26210196a7755345e4ece02692a93c3f6ea18b07ee SHA512 617c43352912b965d0c7ef445aecdb15a5148260e3f41c1b0e8cdd5abb0246e6ad0338c74b75c690fbc63175692578dcc596612108c3b9804694cecace046b34
 DIST FANN-2.2.0-Source.zip 2285087 BLAKE2B aacb49c20c4ea0d86f4eeb3144462051b43480ed613228f3a590ea258878cd2d0528cd301cb993a96ed0bec0d69d5b7c4288f25046d5272c1c8295167862a349 SHA512 c486694aac53cf91a83f8b68d9020fc74ca2bea9416c9d06b6dc8f53d30a2261bd00212e3d439adef9fbdd82532056f7c1afed793f5574c2d6191d84d26fb5c2
-EBUILD fann-2.2.0-r1.ebuild 765 BLAKE2B 7866b7be045f97b9d7fd1caf7eabdf8d925dd65a507af9e84dd26335f8f1c83c8c5a54fadd641388800adfb97d2e241373f7b2f3df5230575666d3b11ff765b1 SHA512 af42792ce0f421b800ca3294f81ee347ed7774ba380748510abb516da5c23dd37b581199dac5f74ebe5ee580385dd51ea358653d94a6a89f21b35025c3410c3a
-EBUILD fann-9999.ebuild 670 BLAKE2B ae3770582c07a75f50f21faaf6f31eb3495f88361f214d9481272ec473c0e2697121b3db176254b9549071176fc2818293fa7f0c3cd16dae8610fd684df693e9 SHA512 83592e8a710b60bb52b4109b2562aa3d8dec39af06e7ea714f8523bb03eb18b6a9c7a1a838120f1ed4d58471716ad727cb5143748f073d728da594ce79be6d6b
+EBUILD fann-2.2.0-r1.ebuild 751 BLAKE2B 3fbc6f46fd9d4ebc6618cb8d3afa6504716c9d57cc71833537093789508365c3969b54a6e29eb8a306a704152b2b8e205d799e037c47e618849c2b0ba63f70ab SHA512 1939eb9a8d8b8d1dc67fadfd5c6cf7c13ccfb201add8ea362cd7f27a5bd7903180267b367064086db6a2e3e99257d7705c4902eb41ed92ccce3803ce6b17552d
+EBUILD fann-9999.ebuild 655 BLAKE2B b78e772cf400c622470219f1e3bc1a01d8283bf79e70c8b45477b903b4f0dba461618aab58935bd7f947d37d897e62cf4c2759ccfc3424c3860cfbf2722a6d84 SHA512 0c712886a687853533ca63b60f1f468ba9a2bc2cba6606653e8734e11a5573d1a8302d0b226a2f6481d24f20689adfb5d90edd6e4f226c85de27576dc3f5576a
 MISC metadata.xml 841 BLAKE2B e6e263aaef2bb1a54d3a7d438064282532a2d81be2558bda6ecd92f02df6ad1745693aac8f8d31606c8e363e871fe9acff132c264ee398c14ead8a09e5ebbb87 SHA512 4cca56af735bab9710d8e62891c749e990813eb99bc28c01fec63de8038fecd89bbd7b331841a530aaf1b61cf3b77f7995a7006cebe158ad197527ae2fea7ef6
diff --git a/sci-mathematics/fann/fann-2.2.0-r1.ebuild b/sci-mathematics/fann/fann-2.2.0-r1.ebuild
index f37ab14a8884..044956a1bb4e 100644
--- a/sci-mathematics/fann/fann-2.2.0-r1.ebuild
+++ b/sci-mathematics/fann/fann-2.2.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_P=FANN-${PV}-Source
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Fast Artificial Neural Network Library"
-HOMEPAGE="http://leenissen.dk/fann/"
+HOMEPAGE="http://leenissen.dk/fann/wp/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples"
 
 RDEPEND=""
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -30,7 +30,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-multilib_src_install
+	cmake_src_install
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
diff --git a/sci-mathematics/fann/fann-9999.ebuild b/sci-mathematics/fann/fann-9999.ebuild
index 6ac50e2ce43f..b9c40c483009 100644
--- a/sci-mathematics/fann/fann-9999.ebuild
+++ b/sci-mathematics/fann/fann-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-multilib git-r3 toolchain-funcs
+inherit cmake git-r3 toolchain-funcs
 
 DESCRIPTION="Fast Artificial Neural Network Library"
-HOMEPAGE="http://leenissen.dk/fann/"
+HOMEPAGE="http://leenissen.dk/fann/wp/"
 EGIT_REPO_URI="https://github.com/libfann/fann"
 
 LICENSE="LGPL-2.1"
@@ -20,7 +20,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-multilib_src_install
+	cmake_src_install
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 56cdb241bb37..21219ee51ff3 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -3,7 +3,7 @@ AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
-DIST octave-6.1.0.tar.gz 32592405 BLAKE2B e39d7e8726b1aad8e378c8578e3d019b735ee82aa00230c9c35b36238848aa4c557da11707203c1ff845c26a117852c40ad9a42138812dcb5eba9b77a583a117 SHA512 34abe6fa489aea94bfeb08027653cd83a73611c6032c8b3ddc4b59223f316ee275f74490048a45aebf178858494f6920593565e612f6e77351102494cb9f49f7
+DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 55fd06336263b43f921ef30cac4fb82951a6be19aa60b6c24f24bcf3884923d824b6e4e6a8ad2983c394f541e556f7830922b34f8565bff3d07a7830c5df3cb0 SHA512 4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2
 EBUILD octave-5.2.0.ebuild 5465 BLAKE2B 4334c91112a379067fb32b5e0a3ceb78400752711d32c9bcd1c7367f14663d26303f2102890596fbb000b0e9167c2a8d2e63fae9d57d2392991cab4221748dd1 SHA512 afd895fc8d2cad63ad70a637ecc3d68acf2c12627b2f50fe33713ad6286a023e09acdeaa6689477dbe8e58817619bbacc9714fa857d8115daf1366c7b3537cec
-EBUILD octave-6.1.0-r1.ebuild 5446 BLAKE2B 2553aa591bf9508b5af433faef266fcee808f185a6e59bec92515504fae255c3a0a93109ca9fff7adc6905eb34c3a2f3b17fa6ef09943cb84cfc7eb3283182fe SHA512 754a7ccab42bcc3b59f87798d17a844a100fc139d0457935d8024ea2d925b0d1ae46992cf5f96122191d3b705d2f4128a6cd264ee0103f42f60b584e8c96c563
+EBUILD octave-6.2.0.ebuild 5446 BLAKE2B f1dd7e5090ab03b4bb1d75815d8e77e640ae82cfb68325623b2d3d38e16e2560d367a870e8a5078b5a19b796ca90d7ab7f81b610a71ee3afa39546c10ab7957f SHA512 148cedbe493103ef9bf4a6a257aeb282000035c3ea4b6e4a97ab374cace89b7352fa6f5513d87a9930828db19668bf7452919a459eb57a9700a7a4add59b05bb
 MISC metadata.xml 1153 BLAKE2B 66d7908c8b90f850ac9c83075ffde66d32235e43cb6a23ae16aad8227f02733d8db8e37e8d23ebf7fd0af92c1af0de6fe47b65713dda94d6000e43d02e168733 SHA512 0131cf603beefbc01be92a7b2cfdebc7bc8e68419aa8432ac5aaedf1ac18581f3b50b4f98f543585dba4d830ccb394f9e288aaac2e36c763e8ed800775c459a1
diff --git a/sci-mathematics/octave/octave-6.1.0-r1.ebuild b/sci-mathematics/octave/octave-6.2.0.ebuild
index 291afd256768..0485737c240b 100644
--- a/sci-mathematics/octave/octave-6.1.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-6.2.0.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
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index edff7bfda9b1..74a0e5b53a46 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,5 +1,8 @@
 AUX topcom-0.17.7-buildsystem.patch 16106 BLAKE2B 3194b44cd20ace8f164b5624e988fab30839a4a967adf1f7fec91a1c517ae2e94404df9ee6a92ad96212aaf4f5ce2226a9e931543e8feb111436bdc6e7432f99 SHA512 a9fc6a067537f85b437e8a3de17cae8ad1cf96848832bc493ade869be9d4621193ec40752d5f80a5244768fe121a53bde97e606e04ede6f602228d244cf312e6
+AUX topcom-0.17.8-buildsystem.patch 4989 BLAKE2B a19b70ff73da5e93beac923db339b8ffbde2a8867417ac2be02bf0c067ed11d47400e89fa0c4c0abd51fdc838da8190e41d1141bc4f23d89842b6de8f51f2edc SHA512 7d5339ae6140222898df6ddaf17a47cd016f4fb7dc88d30dea492d2818402ab1882907b86e15168f4bc31b576aac9cb74307601e1f021b65253f08adb1acf60d
 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.8-r1.ebuild 1338 BLAKE2B ceebbca3c12c3f4ca6bea32254b21c6ab828109edd8c333de5cbaa22f40de643d44b9abe1402f92dbf6fa54837313cbdea715c03091f4814ca2b8733edb56dac SHA512 b5596ec29e1cfa621fd704758132ad8064d4aa9a325a80504ec8d6adea729c9bf921e3bb991e000134ae7556cdbcfdc7df2915181e7f5c2fe06f63d44dfd9555
 MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
new file mode 100644
index 000000000000..deb1ad3ebbad
--- /dev/null
+++ b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
@@ -0,0 +1,151 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2020-02-15 12:44:55.065569980 +0100
++++ b/configure.ac	2020-02-15 14:08:21.905767776 +0100
+@@ -9,7 +9,9 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_CXX
+-AC_PROG_RANLIB
++LT_INIT
++AC_ENABLE_SHARED
++AC_DISABLE_STATIC
+ 
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lg:
+@@ -18,10 +20,6 @@
+ dnl AC_CHECK_LIB(stdc, main)
+ dnl Replace `main' with a function in -lstdc++:
+ dnl AC_CHECK_LIB(stdc++, main)
+-dnl Make libgmp:
+-make -C external gmp
+-dnl Make libcddgmp:
+-make -C external cdd
+ dnl Check for soplex:
+ AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.')
+ 
+diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am
+--- a/lib-src/Makefile.am	2020-02-15 12:44:55.145570436 +0100
++++ b/lib-src/Makefile.am	2020-02-15 14:08:44.741903592 +0100
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES       = libTOPCOM.a
++lib_LTLIBRARIES       = libTOPCOM.la
+ 
+-libTOPCOM_a_SOURCES = \
++libTOPCOM_la_SOURCES = \
+ Admissibles.cc \
+ CheckTriang.cc \
+ Circuits.cc \
+@@ -90,9 +90,9 @@
+ 
+ AM_CPPFLAGS     = -I../lib-src-reg
+ AM_CPPFLAGS    += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS    += -I../external/include
++AM_CPPFLAGS    += $(CPPFLAGS)
+ AM_CPPFLAGS    += -I$(includedir)
+ 
+ AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-35
+ 
+-AM_CXXFLAGS     = -O2 -g
++AM_CXXFLAGS     = $(CXXFLAGS)
+diff -ur a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
+--- a/lib-src-reg/Makefile.am	2020-02-15 12:44:55.165570550 +0100
++++ b/lib-src-reg/Makefile.am	2020-02-15 14:08:22.921773817 +0100
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES = libCHECKREG.a
++lib_LTLIBRARIES = libCHECKREG.la
+ 
+-libCHECKREG_a_SOURCES = \
++libCHECKREG_la_SOURCES = \
+ SPXinterface.cc \
+ LPinterface.cc \
+ RegularityCheck.cc
+@@ -12,9 +12,9 @@
+ 
+ AM_CPPFLAGS     = -I../lib-src 
+ AM_CPPFLAGS    += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS    += -I../external/include
++AM_CPPFLAGS    += $(CPPFLAGS)
+ AM_CPPFLAGS    += -I$(includedir)
+ 
+ AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
+ 
+-AM_CXXFLAGS     = -O2
++AM_CXXFLAGS     = $(CXXFLAGS)
+diff -ur a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2020-02-15 12:44:55.065569980 +0100
++++ b/Makefile.am	2020-02-15 14:08:22.929773865 +0100
+@@ -1,6 +1 @@
+ SUBDIRS      = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
+-EXTRA_DIST   = external/Makefile
+-EXTRA_DIST  += external/gmp-6.1.1.tar.bz2
+-EXTRA_DIST  += external/cddlib-0.94f-TOPCOM.tar.gz
+-EXTRA_DIST  += external/gmpxx-patch
+-
+diff -ur a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am	2020-02-15 12:44:55.165570550 +0100
++++ b/src/Makefile.am	2020-02-15 14:08:22.933773888 +0100
+@@ -83,18 +83,14 @@
+ santos_dim4_triang_SOURCES         = santos_dim4_triang.cc
+ santos_22_triang_SOURCES           = santos_22_triang.cc
+ 
+-LDADD           = ../lib-src/libTOPCOM.a \
+-                  ../lib-src-reg/libCHECKREG.a \
+-                  ../external/lib/libcddgmp.a \
+-                  ../external/lib/libgmpxx.a \
+-                  ../external/lib/libgmp.a
+-
+ AM_CPPFLAGS     = -I../lib-src
+ AM_CPPFLAGS    += -I../lib-src-reg
++AM_CPPFLAGS    += -L../lib-src-reg
++AM_CPPFLAGS    += -L../lib-src
+ AM_CPPFLAGS    += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS    += -I../external/include
++AM_CPPFLAGS    += $(CPPFLAGS)
+ AM_CPPFLAGS    += -I$(includedir)
+ 
+-AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
++AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG
+ 
+-AM_CXXFLAGS     = -O2
++AM_CXXFLAGS     = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG
+diff -ur a/src-reg/Makefile.am b/src-reg/Makefile.am
+--- a/src-reg/Makefile.am	2020-02-15 12:44:55.165570550 +0100
++++ b/src-reg/Makefile.am	2020-02-15 14:08:22.933773888 +0100
+@@ -2,20 +2,15 @@
+ 
+ checkregularity_SOURCES = checkregularity.cc
+ 
+-LDADD           = ../lib-src-reg/libCHECKREG.a \
+-                  ../lib-src/libTOPCOM.a \
+-                  ../external/lib/libcddgmp.a \
+-                  ../external/lib/libgmpxx.a \
+-                  ../external/lib/libgmp.a
+-
+ AM_CPPFLAGS     = -I../lib-src
+ AM_CPPFLAGS    += -I../lib-src-reg
++AM_CPPFLAGS    += -L../lib-src-reg
++AM_CPPFLAGS    += -L../lib-src
+ AM_CPPFLAGS    += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS    += -I../external/include
++AM_CPPFLAGS    += $(CPPFLAGS)
+ AM_CPPFLAGS    += -I$(includedir)
+ 
+ 
+-AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
+-
+-AM_CXXFLAGS     = -O2
++AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG
+ 
++AM_CXXFLAGS     = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG
+diff -ur a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
+--- a/wrap-gmp-gmpxx/Makefile.am	2020-02-15 12:44:55.165570550 +0100
++++ b/wrap-gmp-gmpxx/Makefile.am	2020-02-15 14:08:23.105774912 +0100
+@@ -3,6 +3,6 @@
+ Rational.h
+ 
+ AM_CPPFLAGS        = -I../external/include
+-AM_CPPFLAGS       += -I$(includedir)
++AM_CPPFLAGS       += -I$(includedir) $(CPPFLAGS)
+ 
+-AM_CXXFLAGS     = -O2
++AM_CXXFLAGS     = $(CXXFLAGS)
diff --git a/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild b/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild
new file mode 100644
index 000000000000..a3496c642f69
--- /dev/null
+++ b/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
+HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
+SRC_URI="
+	http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-${PV}.tar.gz
+	doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="doc examples"
+
+DEPEND="
+	dev-libs/gmp:0
+	>=sci-libs/cddlib-094f
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-shells/tcsh"
+
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+HTML_DOCS=( "${DISTDIR}/TOPCOM-manual.html" )
+
+src_prepare () {
+	default
+
+	# ... and link in tree versions:
+	append-libs -lgmp -lgmpxx -lcddgmp
+	append-cxxflags -I/usr/include/cddlib
+
+	eautoreconf
+
+	find external -delete || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install () {
+	default
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	use doc && einstalldocs
+
+	mv "${ED}/usr/bin/cube" "${ED}/usr/bin/topcom_cube" || die
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "Due to a file collision with media-libs/lib3ds the helper"
+	elog "'cube' has been installed as topcom_cube (see bug #547030)."
+}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index d23bb73bc9d6..10aab8b5b09a 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,5 +1,3 @@
 DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
-DIST z3-4.8.9.tar.gz 4624159 BLAKE2B ff97a688ef3f977cd1204ddafaf6b4ef5824fc8f9f38f0ce9a31657b99b8cb08ee5834893ac67056eb4d7f7df67585933029292eed41d140a93c10b9daa8e100 SHA512 a50da5c3f9e27d3e804c1b71f648a3dbd5a55223b7344d66f191a1b34a4d787810abd976840d3ab3878aaf5c96d89f5a517cac0781b82aa927a9d8d54836d54f
-EBUILD z3-4.8.10.ebuild 2425 BLAKE2B d9fe65ebd7708d31a9501533f30338ce56c6412dfa5f2ef31227923127aa7ee4fb5175497b93b8cca4273f630fc2b42916bb2048ce791e7cc81d3780ee248789 SHA512 b8ffa66d92ed8ba8fafc742c4881be42320ec1f51f649ccf6210876b39b8d5b2cd362ef7cbffc07e8646694f390bf0b2e79d90042f95533e15e2966ad15d4bfd
-EBUILD z3-4.8.9.ebuild 2420 BLAKE2B 687bf631678489e642d77b9b10c8e9ecc0444853543c1f6f75e6bfd739c002c080aa199c73665019f8b6e098b0d0f1c63c22d474b9b89b8e6a451277418e27fd SHA512 31660cad19bb792d5b293d802a6c7181a524e3949a6bd7a4e1b51370815eb7e20cd9388e97533fbb5fc51f4d8d6633b9ecd65444b673e315b8ba1e6d8cb7fc86
+EBUILD z3-4.8.10.ebuild 2420 BLAKE2B 39acf50fa71c74efce6841e2a55a20402294882dd02b43496b545fe07a533f2d91253c3cc223db37f5f8b9cc9b681fe60fa07972b18f6742e08694290af6f890 SHA512 ca5881c4a2603a92ef122753fb972eda636f58363f83e7b02fd6a9822538fe1978c1b4a895a91ddc2f1c26fdadc5240b7cbb24e38c3d4dce9585dd0bad500e77
 MISC metadata.xml 616 BLAKE2B aeef1be6d9c4a94062310c6e2c3ac7fb1efe39bb608d96c143a01e9a01585f11ee25aa56d8f67d0a96d880b543882f2cb781247c034eda75e7f6f030767bf660 SHA512 aed4bbc517cc4f9e78ad3f5d50af5837757efa2985aa61a3faf40e39203179d356830a1d6fd4712422257eb244a67ae5eb5c4b2db76ab75769f5fe5e6d045a0c
diff --git a/sci-mathematics/z3/z3-4.8.10.ebuild b/sci-mathematics/z3/z3-4.8.10.ebuild
index 6ffa59ba2b62..ab2ad4852f5d 100644
--- a/sci-mathematics/z3/z3-4.8.10.ebuild
+++ b/sci-mathematics/z3/z3-4.8.10.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-mathematics/z3/z3-4.8.9.ebuild b/sci-mathematics/z3/z3-4.8.9.ebuild
deleted file mode 100644
index 6ad0a69983de..000000000000
--- a/sci-mathematics/z3/z3-4.8.9.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake-multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}