gentoo resync : 01.10.2021

11 files changed, 402 insertions, 36 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index a5fe1c3d5927..f49d60c6b94a 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index cf4e80addae0..1288847de815 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -1,9 +1,13 @@
 AUX arb-2.18.0-build_type.patch 866 BLAKE2B c127152e03d8dd532558a7dc95e4dd2cc1079073d8c30095feea6fa11a65ced564b94dbe3f2c3295fe47a010982a95b2e4408101ad078017d296f9c796f33ddd SHA512 b38728b103b55b19da1f92f9db8bfae74f275d54f83f3409e18503f199467e48fb74bdfb3716c28c01201dd19e8d78d20036671f99cdb63738f33416dc8eb7a2
 AUX arb-2.18.0-multilib-strict.patch 590 BLAKE2B 7f438139ff5f0a19db074ea3bfab064da968424520bc81af242b58675657a7cacce0921076cb5525e00e2d6c33f2b75ed898ffdba7ce730855b09f2b7f8863a1 SHA512 ec9de9a642dd4cb859460132ed597474df4eb2b3f28cdf3ebcb5109fedc2866eda91b0d301149d94f71dd67c105a1dda3d0aed94dcfe34c9ff9fc4083ee6817c
+AUX arb-2.21.0-gamma_fmpq-testfix.patch 2291 BLAKE2B 019af88d2e8c56cd9fcab960fd8fca6f0fdb74e69e72866edcd437700761768c78bd0cfa925ed9bac1c33e4e7c958bfca7939b7cef7c1b7186537dd0573e5414 SHA512 fe40677a95996f54121379e5bef0921e13923be80c68a7821177b371d71d4847e4ed903f3bc0c266c6c6de7fae9ede7cbaa59d5927b4bdb3cc7e58d588aaad68
+AUX arb-2.21.0-qa-warning-fix.patch 541 BLAKE2B 22d701fc07e2c3b8ad3fa0603204d7d35a9c9182b6ba9ced2d786866f8a15a4dd07c97a2702d723de98f5e264a5ca107ad24dc99095e46485fb75696114c6909 SHA512 5addd977a49fa5e9ec9847b07a3043d78ce7d7df5d6947ae895dd345424fa1941335e7a3691cee1497036e33b47fe1858e42b07277629956fe0299c4034b2d79
 DIST arb-2.17.0.tar.gz 1589083 BLAKE2B 68d5b04dca24129ceaec4e05124e35b474157cf1efbb6505121a03058e014cd4eb67b99497dbbafcf62e9e31f9d11c92f749f6e047e6b1513b6c0cc5ef8f22da SHA512 201e0cebbd1c4857d194e5531c76c6e45a478cf6965b836818919adf0fc04f0fe25e16ecd49c62a438876b67f009b872c4f3c774fe35620be0b22c5e08bdb824
 DIST arb-2.18.1.tar.gz 1595831 BLAKE2B 010ae7a17a9cc1c11ded5806ff761115f3e78c48a5d8fc058eae0715b1e00e40345d4e6445a84c71c37627879648f445663dcc3bbcebdeaac8439a993ade38ee SHA512 07afb45829119bc695926dab4221051b221c2cc3952e42c9928efc74570b05fc01c97ea86b1b67c16d7a19a55b4e32dce97e08c9b72f36b33dd62bfccd19bb05
 DIST arb-2.19.0.tar.gz 1606463 BLAKE2B 85d832113ae42737a460198cbf485f825a9435963a888c0d0ab87b7ed7277d158480b573fd8ace42484dd4767bf4f1a372f637cfff01f18c105fd2b62d0d019e SHA512 199d1a26edd01e3b30f7aef69a9ae29456e3db384037744a1e073007ddb93a248873dfe83f3e48f9de58a9d17ebd7dc9a22a058f4adf766599d01d7eb17db204
+DIST arb-2.21.0.tar.gz 1842021 BLAKE2B 1ab3c4d18eb1918eaee9ea9aff68d82fc33a136ff5612e5173bf0cc29e5753f2c002256d68ae7983b5677d5082ab6849c68755e7544cee24144ca4e84e4d8411 SHA512 e441f8325d3095f1d568ebf9018520aedb25b6a066678e870942efcc8ac005dbf10cdffe42bc4fdbce3ba3ac397241c1d92fb54556e444243bd56dd3d5d72664
 EBUILD arb-2.17.0.ebuild 2025 BLAKE2B aad028595287b91057475d8ea72305c8f720558917009660ef09502e5e22c371192eb6c0e52f281d6fdf9944cbf2038b9d39b1ca7ad9f5a5337b5e796f49bd92 SHA512 5160ed2793dd71af6005ec4ca75bc404c880c149519b85b3f19c51da2321ffbe99b0c6bc7e41dab1de6f624abd16bb3fcc55479dd8ae6cf4af20bca3a3954ed6
 EBUILD arb-2.18.1.ebuild 778 BLAKE2B a8b078451c6ae4907242d87c08a39814bf1c4e77648ed20ccecdc0a93810e3553b03e01aea9a194de9d8c853f871ce016717c95a5cc3dcc53604d1fb77a5067c SHA512 edd48a1e3724defd85700a5c6ec6b98ea9c12cae5f060c540be4610c7e7c8cf266d76ce7522bb482f868e8bede4430d2fd88996d985b6ea294ee79cb4713b938
 EBUILD arb-2.19.0.ebuild 751 BLAKE2B 84cdad6036faaf1a78268921ce0398addc31c6ac4e70681af10794f1c14c50545998870d31c28d8d59f0479ea7b9de395b8e9668daab66e0f2b2f894476d4978 SHA512 c484d59ebfb19fd9a9e05f69c9b7a246bc2e2d6802bb3c938afd3fefc82d984c7545c9b4314b61e949dc05ede11d222e377a66e50eb3123e385d643e983db125
+EBUILD arb-2.21.0.ebuild 787 BLAKE2B aa52e2c080e4a5b6816af28443c8f9386b12c36113df4dc88e21cf7dee6795ba6bf060358fbebb289f74ee4efa6f71e3f81e5db767803e1a03edc09af027f1ec SHA512 b9c7c98053b7769a86be7346b2210c71544d6f8757e580cf47f7e07e21e3ef8d277e4177156b972c5fbe92eb8a6ab691341bc2eae4579e419eb9a87f5eff4e69
 MISC metadata.xml 1108 BLAKE2B a2e3c1cf3f6c710c9b3e6fbf629101c3dccc9ae60c80da0d08853669019d7a2a03bb276dbe078cb6cb5ce6060ef7139a3658481d61a6d5e6d25f0cc1593be344 SHA512 2865a818ec7ffb77afc1c849fc960c2c39ec3bf6586b5f67e5c5037c6b6836fff0390224f27b1251a613d07107cf164ca11e05ec2f6988b629bd7e3a476e4854
diff --git a/sci-mathematics/arb/arb-2.21.0.ebuild b/sci-mathematics/arb/arb-2.21.0.ebuild
new file mode 100644
index 000000000000..e18ea81def99
--- /dev/null
+++ b/sci-mathematics/arb/arb-2.21.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake
+
+DESCRIPTION="C library for arbitrary-precision interval arithmetic"
+HOMEPAGE="https://fredrikj.net/arb/"
+SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-2+"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	sci-mathematics/flint:="
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gamma_fmpq-testfix.patch"
+	"${FILESDIR}/${P}-qa-warning-fix.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch b/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch
new file mode 100644
index 000000000000..179ba8887f32
--- /dev/null
+++ b/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch
@@ -0,0 +1,73 @@
+From 450435a84a40acc1871cd84f1caf2ea47c11a18c Mon Sep 17 00:00:00 2001
+From: fredrik <fredrik.johansson@gmail.com>
+Date: Tue, 28 Sep 2021 12:07:45 +0200
+Subject: [PATCH] fix (hopefully) spurious test failures for gamma_fmpq
+
+---
+ arb_hypgeom/gamma_fmpq.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/arb_hypgeom/gamma_fmpq.c b/arb_hypgeom/gamma_fmpq.c
+index 996a87e5..ee750d0d 100644
+--- a/arb_hypgeom/gamma_fmpq.c
++++ b/arb_hypgeom/gamma_fmpq.c
+@@ -529,22 +529,22 @@ arb_hypgeom_gamma_fmpq_outward(arb_t y, const fmpq_t x, slong prec)
+ 
+     if (q == 1 || q == 2 || q == 3 || q == 4 || q == 6)
+     {
+-        arb_hypgeom_gamma_small_frac(t, p, q, prec);
++        arb_hypgeom_gamma_small_frac(t, p, q, prec + 4 * (m != 0));
+     }
+     else
+     {
+-        arb_hypgeom_gamma_fmpq_hyp(t, a, prec);
++        arb_hypgeom_gamma_fmpq_hyp(t, a, prec + 4 * (m != 0));
+     }
+ 
+     /* argument reduction */
+     if (m >= 0)
+     {
+-        arb_rising_fmpq_ui(u, a, m, prec);
++        arb_rising_fmpq_ui(u, a, m, prec + 4);
+         arb_mul(y, t, u, prec);
+     }
+     else
+     {
+-        arb_rising_fmpq_ui(u, x, -m, prec);
++        arb_rising_fmpq_ui(u, x, -m, prec + 4);
+         arb_div(y, t, u, prec);
+     }
+ 
+@@ -602,7 +602,7 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
+     }
+ 
+     arb_set_fmpq(t, a, prec + 4);
+-    success = arb_hypgeom_gamma_taylor(t, t, 0, prec);
++    success = arb_hypgeom_gamma_taylor(t, t, 0, prec + 4);
+ 
+     if (success)
+     {
+@@ -611,12 +611,12 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
+ 
+         if (m >= 0)
+         {
+-            arb_rising_fmpq_ui(u, a, m, prec);
++            arb_rising_fmpq_ui(u, a, m, prec + 4);
+             arb_mul(y, t, u, prec);
+         }
+         else
+         {
+-            arb_rising_fmpq_ui(u, x, -m, prec);
++            arb_rising_fmpq_ui(u, x, -m, prec + 4);
+             arb_div(y, t, u, prec);
+         }
+ 
+@@ -684,7 +684,7 @@ arb_hypgeom_gamma_fmpq(arb_t y, const fmpq_t x, slong prec)
+         wp = (slong) fmpz_bits(fmpq_numref(x)) - (slong) fmpz_bits(fmpq_denref(x));
+         wp = FLINT_MAX(wp, 0);
+         wp = FLINT_MIN(wp, 4 * prec);
+-        wp += prec;
++        wp += prec + 4;
+ 
+         arb_set_fmpq(y, x, wp);
+ 
diff --git a/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch b/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch
new file mode 100644
index 000000000000..dd5440f938de
--- /dev/null
+++ b/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch
@@ -0,0 +1,21 @@
+From d271652d3124c9e65a97df310a141c607a0b5ee5 Mon Sep 17 00:00:00 2001
+From: fredrik <fredrik.johansson@gmail.com>
+Date: Wed, 29 Sep 2021 19:55:34 +0200
+Subject: [PATCH] add missing include
+
+---
+ acb_poly/lgamma_series.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/acb_poly/lgamma_series.c b/acb_poly/lgamma_series.c
+index 504b0cb4..d50ffb9f 100644
+--- a/acb_poly/lgamma_series.c
++++ b/acb_poly/lgamma_series.c
+@@ -10,6 +10,7 @@
+ */
+ 
+ #include "acb_poly.h"
++#include "acb_hypgeom.h"
+ 
+ void
+ _acb_log_rising_correct_branch(acb_t t,
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 60aa6a552fd5..4ed43a86a9ef 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,4 +1,6 @@
 AUX flint-2.7.1-fix-cmake-findgmp.patch 5721 BLAKE2B db31d9e88304ec26a3fdd4ba9d53dd97044487413567e172235260fc238e6a4ad89225788726bdff94f36b699acda45c86025c23be04b895c1857d836a321113 SHA512 a364c4606fb9321443991d1356f9fb7b2c7fb946ad46760e6e1b1172acc1399f19fabd1eec4dbf8e75e1e61be5d8bfa88ac056ccff47d60f4d50fdff6e31193b
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
+DIST flint-2.8.0.tar.gz 5209922 BLAKE2B 801c6130b3e8119998c3288d243358f567a843597c425cf5edcd37f6dd0f71a5d796e5dc3c8f3ffb8407f8e6dc01a3f4c62daa758e62eee2bbbf6ed07f1721e0 SHA512 91125f7c3aaccb40768091c36c11b5fb5d1e5010e7cb71145d18d348606baa1e72aeae27baa826c00c4a190c39ef19af9488357d0d5634a7c5774e9aeeaef3fc
 EBUILD flint-2.7.1-r1.ebuild 1371 BLAKE2B 859d5bb309b970d5d92e909f8c5573d782d076ed79a23080fb879caba258e35825113823f19a1c5572de726f7f213bd0fc459c088dae48b50bca0fbbb8397552 SHA512 fad00e1482b27ada9a2847638ac1129b90b8c30b5f033af6103509e9181f4dcb6d944ba7ed23ec18c4de51ecb3b9fa8963f13da57e6d0f0a23d7c6e0de1d6ad3
+EBUILD flint-2.8.0.ebuild 1318 BLAKE2B f56232bcfd9e1e66da8836069f6ad3f79ab369912d4e7eb6befb28be4f41e912ffb24ce2f0654ad530758eb9b06cb0c362f05410a80bd7f3cf7b0f089869d611 SHA512 9c992949c4b8a5faf7dd90ea872352f1c72fe5fb34d508f8c3319176c14432e78bcd708fe75c5014f86e06eefc4290f66784c4e5520f62ddf6762159e0867759
 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14
diff --git a/sci-mathematics/flint/flint-2.8.0.ebuild b/sci-mathematics/flint/flint-2.8.0.ebuild
new file mode 100644
index 000000000000..c0196d38a199
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.8.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ninja doesn't like "-lcblas" so using make.
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/"
+SRC_URI="http://www.flintlib.org/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/16"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? (
+	dev-python/sphinx
+	app-text/texlive-core
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-tex/latexmk
+	)
+	${PYTHON_DEPS}"
+DEPEND="dev-libs/gmp:=
+	dev-libs/mpfr:=
+	ntl? ( dev-libs/ntl:= )
+	virtual/cblas"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_NTL="$(usex ntl)"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_DOCS="$(usex doc)"
+		-DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include"
+		-DCBLAS_LIBRARIES="-lcblas"
+	)
+
+	cmake_src_configure
+
+	if use doc ; then
+		HTML_DOCS="${BUILD_DIR}/html/*"
+		DOCS=(
+			"${S}"/README
+			"${S}"/AUTHORS
+			"${S}"/NEWS
+			"${BUILD_DIR}"/latex/Flint.pdf
+		)
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build html
+		cmake_build pdf
+	fi
+}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 605b67a55a6e..35e497b3539e 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -4,6 +4,8 @@ AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b4
 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.2.0.tar.gz 32620419 BLAKE2B 55fd06336263b43f921ef30cac4fb82951a6be19aa60b6c24f24bcf3884923d824b6e4e6a8ad2983c394f541e556f7830922b34f8565bff3d07a7830c5df3cb0 SHA512 4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2
+DIST octave-6.3.0.tar.gz 32859335 BLAKE2B 032f0e74b2fcd41358db1adc7f7274f6c8e327f5f86a32739864078bf236af26544f5988e774ebdd2ed28a6906e86556ce44ecd4bc5d3e710d839ecf5dcad9d9 SHA512 9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b7aaaa40519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
 EBUILD octave-6.2.0.ebuild 5384 BLAKE2B 2069e4642fdbfc3f9fc8f1f32cc7f8158f8b19b895078649e2c7d6b3a8a3a4a90974416acf4d63d8d3eddeffcdaa6c0fea19adc41d45746b24dbaade8f425ab7 SHA512 3bcf79a1f9836a8a24e94e4b637030bd573e4c90f090a76807e0dbd1dc53b5417c6669bf760852f628b6836f96b0ae452d81596ff6ee42aada95c6d04f85eda3
+EBUILD octave-6.3.0.ebuild 5134 BLAKE2B fd44f94ae9fbfb79d14454a226f125e4d80a0f266f2f36ac3339870a995258780edfe16077dfec8719a5222989ca1adbd7f469afc3bac207b870a48e487da423 SHA512 a0ed121465799575865f4a5227b34f0626c5c92954cdfed3f1daa7a2f72422be2fcfde43f449a13d34f16760d5af7a7068db54932b893ed7d5b5157ffeabc7e2
 MISC metadata.xml 1154 BLAKE2B 34f491369b5ef047f0540be74994b9d6507310db475dc25868e2320e5c4474ebeaba2f80ba90759df53c15294c71ad9631e5f98ad81d2098d3e86e308d5c9eaf SHA512 9f73af69e5318693db98720836f0df25518c4bc3ac9ff72071aa04aaca1147e2c21d14a299b199689e926bff059c33c20f39b9f85062d1e1227e466b2b8b3446
diff --git a/sci-mathematics/octave/octave-6.3.0.ebuild b/sci-mathematics/octave/octave-6.3.0.ebuild
new file mode 100644
index 000000000000..0b1370942764
--- /dev/null
+++ b/sci-mathematics/octave/octave-6.3.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
+	portaudio postscript +qhull +qrupdate readline sndfile +sparse
+	ssl static-libs sundials X zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+RDEPEND="
+	app-arch/bzip2
+	app-text/ghostscript-gpl
+	sys-apps/texinfo
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	curl? ( net-misc/curl:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gnuplot? ( sci-visualization/gnuplot )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-libs/qscintilla:=
+	)
+	hdf5? ( sci-libs/hdf5:0= )
+	java? ( >=virtual/jre-1.6.0:* )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		virtual/glu
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+	)
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig
+	)
+	qhull? ( media-libs/qhull:0= )
+	qrupdate? ( sci-libs/qrupdate:0= )
+	readline? ( sys-libs/readline:0= )
+	sndfile? ( media-libs/libsndfile )
+	sparse? (
+		sci-libs/arpack:0=
+		sci-libs/camd:0=
+		sci-libs/ccolamd:0=
+		sci-libs/cholmod:0=
+		sci-libs/colamd:0=
+		sci-libs/cxsparse:0=
+		sci-libs/umfpack:0=
+	)
+	ssl? (
+		 dev-libs/openssl:0=
+	)
+	sundials? ( >=sci-libs/sundials-4:0= )
+	X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	java? ( >=virtual/jdk-1.6.0 )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	# Some of these use_with flags are a bit mismatched. The configure
+	# script offers only --without-foo, and detects "foo" automatically
+	# unless --without-foo is specified. Passing --with-foo is not an
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	econf \
+		--localstatedir="${EPREFIX}/var/state/octave" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		--disable-64 \
+		--disable-jit \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
+	default
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		dodoc $(find doc -name '*.pdf')
+	else
+		# bug 566134, macros.texi is installed by make install if use doc
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && \
+		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+	doenvd 99octave
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 83a1f28f9c43..f33c6c83c891 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,7 +1,6 @@
 AUX pari-2.11.2-Makefile-LDFLAGS.patch 394 BLAKE2B 534fcd325397a388545acbce5d96bd5417c31005512ee8f256283921fb64ec4a9ec27fb7e721648b117d3be1000816d1e9bc5ae5adc5df63afe1b0490db020c6 SHA512 de3283be39cff0bba916b314eb9e112324626513f30b5c0e0340617535d8e66ee93fdd9613839633bf7e85244caff6fa1379cc5d0c0a7f9484d028a650eb8845
 AUX pari-2.11.2-Makefile-docinstall.patch 867 BLAKE2B e8b83357ef42ebcb00abfe7bb5adc30414d1975fbde128ffe84c42898374969c608cd6f3b8b0061023681f6416e86552c80552ac51aa884e260d716f79b750c1 SHA512 089ab09532b2e888a272495606f5c0eeb6e12f764f3605c268a3e4e20e707d87c33feea2a745f7441e2cff6e7402df64f17f7b118350a8d4a0972ad8a5a82c69
 AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eedbbfc08e5b40bce3f045309cef936f88356324b6d721c5cdb458a2343fb4ee6473238571dd779b74506e7e2b7d835e0c7 SHA512 549acaeaa393b0b42818e3648c21fdba3162abfefef147a1429d0e39f58ece0a46e94a6ee953435549c23d62b115b2dab0ee261eda2eb7fd0a2b430223f5f59c
-AUX pari-2.13.1-rnfdisc.patch 1335 BLAKE2B 25c16204f996b210d345d1ca903d2256b07f8575ea5363cc5646508e84c77785f9a05b6c751a49bd15cf6915128d5e1f533d468ff0d2c544bd8b7d8cad37ac2f SHA512 70ec83d1dd028458d3f2d15b4159f53136ed50c84275d38121ad04bb38ef144c235e460aca8927152791e57a8e1fd9ebe5e233c624d953213fe83c00bbb09b24
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
diff --git a/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch b/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch
deleted file mode 100644
index 39d325911e88..000000000000
--- a/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3edb98db78dd49bb8b4137b46781a7cd570c2556 Mon Sep 17 00:00:00 2001
-From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
-Date: Sun, 28 Mar 2021 13:27:24 +0200
-Subject: [PATCH] rnfdisc_factored: remove spurious Q_primpart [#2284]
-
-diff --git a/src/basemath/base2.c b/src/basemath/base2.c
-index b2b63ada5..531f5c558 100644
---- a/src/basemath/base2.c
-+++ b/src/basemath/base2.c
-@@ -3582,7 +3582,7 @@ rnfdisc_factored(GEN nf, GEN pol, GEN *pd)
- 
-   nf = checknf(nf);
-   pol = rnfdisc_get_T(nf, pol, &lim);
--  disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, Q_primpart(pol)));
-+  disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, pol));
-   pol = nfX_to_monic(nf, pol, NULL);
-   fa = idealfactor_partial(nf, disc, lim);
-   P = gel(fa,1); l = lg(P);
-diff --git a/src/test/32/rnf b/src/test/32/rnf
-index 6bd4585..d24e1ce 100644 (file)
---- a/src/test/32/rnf
-+++ b/src/test/32/rnf
-@@ -832,9 +832,9 @@ error("inconsistent dimensions in idealtwoelt.")
- 0
- 0
- 1
--[[7361, 3786, 318, 5823; 0, 1, 0, 0; 0, 0, 1, 0; 0, 0, 0, 1], [-3, 6, -2, 0]
--~]
--[2, -1]
-+[[433, 322, 318, 1318/17; 0, 1, 0, 12/17; 0, 0, 1, 5/17; 0, 0, 0, 1/17], [25
-+/17, -12/17, 12/17, 16/17]~]
-+[1, -1]
-   ***   at top-level: rnfdedekind(nf,P,pr2,1)
-   ***                 ^-----------------------
-   *** rnfdedekind: sorry, Dedekind in the difficult case is not yet implemented.