gentoo resync : 04.05.2021

22 files changed, 759 insertions, 29 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 6784e5197834..03bf8549ab1f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index eddab6a7bd73..91b65d1bea88 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -3,7 +3,7 @@ AUX arb-2.18.0-multilib-strict.patch 590 BLAKE2B 7f438139ff5f0a19db074ea3bfab064
 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
-EBUILD arb-2.17.0.ebuild 2024 BLAKE2B 2f2f914247a7d094219271914125633fcb40df6aebd1d721de8cff1580b4bd7ba03eabb9f6ced6c36f50008e7f138b8064fb7aa4dca35ff312f7058a7d70ca68 SHA512 0a16600bf1f11d6976c244a03c2844137b06612e7a860447835d5056c68f04a91478db041dcf1fb82a75528e91b68160a8c43d3332cd40ed90bd002a706decb7
+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
 MISC metadata.xml 1107 BLAKE2B f9d008fa5d063c0c184aa8f4b6b8588b56d417936a19c350fb252adfc0e95e14e2ea81e3f9bd1d56d1c5b978e5964b4cc3d37603cedda9c55c0a111d0987485f SHA512 7bb01ca2427e92d6ed0c65c495922cb80d241b988bd73741f132c522cac3f3c45a796a042f7ace440eb8eecfc483a1f7c01928519b8999cff52e78b111ac1296
diff --git a/sci-mathematics/arb/arb-2.17.0.ebuild b/sci-mathematics/arb/arb-2.17.0.ebuild
index b1298f379e34..70ee466cd34f 100644
--- a/sci-mathematics/arb/arb-2.17.0.ebuild
+++ b/sci-mathematics/arb/arb-2.17.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-src_prepare(){
+src_prepare() {
 	default
 
 	# The autodetection finds "lib" first, which may e.g. contain 32-bit
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index c8286cba3daf..7ff017e5e613 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,4 +1,8 @@
-AUX calc-2.12.5.4-as-needed.patch 6226 BLAKE2B cb75c4ffbc5fd916e6d94d00bd32f8170be6eb82f47f1fde3d2d5968853ac7c7719883844563df6b545aa7226b178f9f54f7adb89a843fdd9ab7b92701193276 SHA512 fd65cdc727b9859d8d1a55e4140bb74301dc1941f647f5d52026818a1da56f90d21eea26a578bfd4fb0988cb3c516985239e8a06a3de15a9109fbe77b9536466
+AUX calc-2.12.5.4-as-needed.patch 6202 BLAKE2B c1ed259eba709b26938ebf60aa5ca2cb2d329e121034560464dfae8416061aa00ac5e918039d38c68e425b8569a3eefe36d67146d6505a376bf7a61b455b1c38 SHA512 50641158fd7bc598e208f404ce8c9831f9287eced1c29f995c133b1725862aa1aec924014e165e03097e875554ac87633d9a0ab16804eeb3076c23af22e9bd3a
+AUX calc-2.13.0.1-RPATH.patch 7951 BLAKE2B 97a3fac3850f2d6f6d81145f75fdd5cd97e7877720ee15e9ad2163acfecadf246c08e459648f2404ae2ba2f5c7c8af09f5ad4ee5693cac3683285169518ce402 SHA512 39391f63a718df325a197adbfc289a97a8dfd367ef26b23becf37c85a90a55eeddae679b7df3eca77ac588e743235d356035fbc9eba4e57d7f3b3029ce078216
+AUX calc-2.13.0.1-respect-LDFLAGS.patch 9767 BLAKE2B a8a8852fd806e17c0eeec5e82ce9ce4f80f53641c691942c4599550e8f6506c4f2464882d6694f5e3ce37a91df5f57786e6666a93504318f531ad9b29c9ed564 SHA512 83be5d78452a24695d5c4ff55ad92852ac755801170e7e67a81b60fac20ba4d7d782a59786e96f9fb7ec08d5249a1829b687a14f781c7eb5ce6e13b0620742dd
 DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f
-EBUILD calc-2.12.5.4.ebuild 1307 BLAKE2B 10710094c959e3fddcebadfe9930d502f2eb9066f328f334cf1aa07f68c1904b615a3c78d0780f14805a79065beadc6d155f1ea5aeb6d0273f1218eebae134f6 SHA512 d7946e90939b06292bae693aefdd3a7e86055f0f10de03d71d339873d43e1fba93949fb52011ca98b70767b948b2a1d81c0ce9737798dcbe0d68412a9c4cdd4f
+DIST calc-2.13.0.1.tar.bz2 987542 BLAKE2B bbd93aa296211dde8f7d00a86e222bf4ccc0065da021c1666c333610c6837a1984995c74995571af025e68ec64519ed2d158731448037ee0a4f2eafccfc1a625 SHA512 7d7e07072779c97aaeb966f9282a6e4127c839ecadd0b7269d37d587949c47075d301c3420735f903ba179ae2bbbd309fd29e459fbf12b450e528aadc66537c4
+EBUILD calc-2.12.5.4.ebuild 1310 BLAKE2B 2e98a4bc4665ecd786f5db43576177d3761e26f1b9dc74daf4ce52d45305c53e160c849348b8a93513618930f87934fa552da799d9eb0b95e6d50be72232953d SHA512 5d39ec954eb6f18d6fd00be72df0ce15696ca795ee1fbde5460e3fe8c4609446d2557051bf8bf283a52c19d8ff6bfd5caaad29c2d9d2f954634647b4e212583b
+EBUILD calc-2.13.0.1.ebuild 1404 BLAKE2B d3991c2e4edd8f745d52f2cb08bc8dc7afc0c3ee2fa007264178c1cf285b5a5216b3887135c2e1fe2c6b50c46c8d8e0fece0bf41223342ed34b3cc0082668a15 SHA512 4f5d567b9494dc52ec28fd0588a585314adb6dfc3f59921a69ee92d807f92fdb89b325b81cee88d0b4fdb4a099434928254e7ecf9e9452f0577ed4c21fdec2d6
 MISC metadata.xml 711 BLAKE2B 6c2e8e29413c40ccc3226b0e90f181b0ef4dea5d26bed5acc054c05576ca3c339ea433b4aaa45e940515346e83fffaf93d210a0eaecd55a64b822b425b54798f SHA512 8d88980b122ab65162de6d7038f4fc3744f741dabaf543d3edb6a013b61c3c6b53e30643174064c14fadc6d85d08c141aae0336f347b95caa78019c4e6fa8290
diff --git a/sci-mathematics/calc/calc-2.12.5.4.ebuild b/sci-mathematics/calc/calc-2.12.5.4.ebuild
index d2a43a0ad77a..d1dc4ec7f9e1 100644
--- a/sci-mathematics/calc/calc-2.12.5.4.ebuild
+++ b/sci-mathematics/calc/calc-2.12.5.4.ebuild
@@ -37,7 +37,7 @@ src_compile() {
 		LDFLAGS="${LDFLAGS}" \
 		CALCPAGER="${PAGER}" \
 		USE_READLINE="-DUSE_READLINE" \
-		READLINE_LIB="-lreadline -lhistory $(tc-getPKG_CONFIG --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
+		READLINE_LIB="-lreadline -lhistory $($(tc-getPKG_CONFIG) --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
 		all
 }
 
diff --git a/sci-mathematics/calc/calc-2.13.0.1.ebuild b/sci-mathematics/calc/calc-2.13.0.1.ebuild
new file mode 100644
index 000000000000..38f0159d1f8e
--- /dev/null
+++ b/sci-mathematics/calc/calc-2.13.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Arbitrary precision C-like arithmetic system"
+HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
+SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.13.0.1-RPATH.patch
+	"${FILESDIR}"/${PN}-2.13.0.1-respect-LDFLAGS.patch
+)
+
+src_prepare() {
+	default
+
+	ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die
+	sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die
+}
+
+src_compile() {
+	# parallel compilation hard to fix. better to leave upstream.
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		DEBUG="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		CALCPAGER="${PAGER}" \
+		USE_READLINE="-DUSE_READLINE" \
+		READLINE_LIB="-lreadline -lhistory $($(tc-getPKG_CONFIG) --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
+		all
+}
+
+src_test() {
+	if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
+		ewarn "Can't run check when running in sandbox - see bug #59676"
+	else
+		emake chk
+	fi
+}
+
+src_install() {
+	emake \
+		T="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc BUGS CHANGES LIBRARY
+}
diff --git a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
index 3e7e03002ac3..3dbb2cd1bf47 100644
--- a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
+++ b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
@@ -1,5 +1,5 @@
---- calc-2.12.5.3/Makefile
-+++ calc-2.12.5.3/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1136,14 +1136,14 @@
  BLD_TYPE= calc-dynamic-only
  #
diff --git a/sci-mathematics/calc/files/calc-2.13.0.1-RPATH.patch b/sci-mathematics/calc/files/calc-2.13.0.1-RPATH.patch
new file mode 100644
index 000000000000..c7657a8b772c
--- /dev/null
+++ b/sci-mathematics/calc/files/calc-2.13.0.1-RPATH.patch
@@ -0,0 +1,199 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1384,9 +1384,6 @@ ifeq ($(target),Linux)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -1436,7 +1433,6 @@ ifeq ($(target),Darwin)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
+ LD_SHARE= ${DARWIN_ARCH}
+ #SET_INSTALL_NAME= no
+ SET_INSTALL_NAME= yes
+@@ -1518,9 +1514,6 @@ ifeq ($(target),FreeBSD)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -1578,9 +1571,6 @@ ifeq ($(target),OpenBSD)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -1632,9 +1622,6 @@ ifeq ($(target),SunOS)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -1684,9 +1671,6 @@ ifeq ($(target),Cygwin)
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -1740,9 +1724,6 @@ ifeq ($(target),simple)
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+ #
+@@ -1799,9 +1780,6 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -1839,9 +1817,6 @@ ifeq ($(target),)
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -2115,7 +2090,6 @@ CUSTOM_PASSDOWN=  \
+     CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
+     CUSTOMINCDIR="${CUSTOMINCDIR}" \
+     DEBUG="${DEBUG}" \
+-    DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \
+     E="${E}" \
+     FMT=${FMT} \
+     GREP=${GREP} \
+@@ -4510,7 +4484,6 @@ env:
+ 	@echo 'C_SRC=${C_SRC}'; echo ''
+ 	@echo 'DATE=${DATE}'; echo ''
+ 	@echo 'DEBUG=${DEBUG}'; echo ''
+-	@echo 'DEFAULT_LIB_INSTALL_PATH=${DEFAULT_LIB_INSTALL_PATH}'; echo ''
+ 	@echo 'DEV_BITS=${DEV_BITS}'; echo ''
+ 	@echo 'DIFF=${DIFF}'; echo ''
+ 	@echo 'DISTLIST=${DISTLIST}'; echo ''
+--- a/custom/Makefile
++++ b/custom/Makefile
+@@ -667,9 +667,6 @@ ifeq ($(target),Linux)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -719,7 +716,6 @@ ifeq ($(target),Darwin)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
+ LD_SHARE= ${DARWIN_ARCH}
+ #SET_INSTALL_NAME= no
+ SET_INSTALL_NAME= yes
+@@ -801,9 +797,6 @@ ifeq ($(target),FreeBSD)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -861,9 +854,6 @@ ifeq ($(target),OpenBSD)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -915,9 +905,6 @@ ifeq ($(target),SunOS)
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -967,9 +954,6 @@ ifeq ($(target),Cygwin)
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -1023,9 +1007,6 @@ ifeq ($(target),simple)
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+ #
+@@ -1082,9 +1063,6 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+@@ -1122,9 +1100,6 @@ ifeq ($(target),)
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+-    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+-- 
+2.31.1
+
diff --git a/sci-mathematics/calc/files/calc-2.13.0.1-respect-LDFLAGS.patch b/sci-mathematics/calc/files/calc-2.13.0.1-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..971d20e7ef75
--- /dev/null
+++ b/sci-mathematics/calc/files/calc-2.13.0.1-respect-LDFLAGS.patch
@@ -0,0 +1,267 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2541,11 +2541,11 @@ sample: ${SAMPLE_TARGETS}
+ 
+ sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+ 	${CC} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+-	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
++	      ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@
+ 
+ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+ 	${CC} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+-	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
++	      ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@
+ 
+ ###
+ #
+@@ -2554,15 +2554,15 @@ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+ ###
+ 
+ hist.o: hist.c ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} \
++	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} ${LDFLAGS} \
+ 	    -c hist.c
+ 
+ seed.o: seed.c ${MAKE_FILE} ${LOC_MKF}
+ 	${CC} ${CFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \
+-	    ${WNO_LONG_LONG} -c seed.c
++	    ${WNO_LONG_LONG} ${LDFLAGS} -c seed.c
+ 
+ file.o: file.c ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} -c file.c
++	${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} ${LDFLAGS} -c file.c
+ 
+ ###
+ #
+@@ -4190,7 +4190,7 @@ depend: hsrc custom/Makefile
+ 	${Q} :> skel/makedep.out
+ 	${Q} cd skel; ${MAKEDEPEND} \
+ 	    -w 1 -f makedep.out -- \
+-	    ${CFLAGS} -- \
++	    ${CFLAGS} ${LDFLAGS} -- \
+ 	    ${C_SRC} ${BUILD_C_SRC} 2>/dev/null
+ 	-${Q} for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \
+ 	    if [ X"$$i" != X"/dev/null" ]; then \
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -1941,12 +1941,12 @@ calc.usage: calc.1 ${MAKE_FILE} ${LOC_MKF}
+ sample: ${SAMPLE_TARGETS}
+ 
+ sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+-	${CC} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+-	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
++	${CC} ${CFLAGS} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
++	      ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@
+ 
+ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+-	${CC} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+-	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
++	${CC} ${CFLAGS} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
++	      ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@
+ 
+ ###
+ #
+@@ -1955,15 +1955,15 @@ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+ ###
+ 
+ hist.o: hist.c ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} \
++	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} ${LDFLAGS} \
+ 	    -c hist.c
+ 
+ seed.o: seed.c ${MAKE_FILE} ${LOC_MKF}
+ 	${CC} ${CFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \
+-	    ${WNO_LONG_LONG} -c seed.c
++	    ${WNO_LONG_LONG} ${LDFLAGS} -c seed.c
+ 
+ file.o: file.c ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} -c file.c
++	${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} ${LDFLAGS} -c file.c
+ 
+ ###
+ #
+@@ -3557,7 +3557,7 @@ depend: hsrc custom/Makefile
+ 	${Q} :> skel/makedep.out
+ 	${Q} cd skel; ${MAKEDEPEND} \
+ 	    -w 1 -f makedep.out -- \
+-	    ${CFLAGS} -- \
++	    ${CFLAGS} ${LDFLAGS} -- \
+ 	    ${C_SRC} ${BUILD_C_SRC} 2>/dev/null
+ 	-${Q} for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \
+ 	    if [ X"$$i" != X"/dev/null" ]; then \
+--- a/custom/Makefile
++++ b/custom/Makefile
+@@ -1280,7 +1280,7 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
+ ##
+ 
+ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
+-	${CC} ${CFLAGS} c_sysinfo.c -c
++	${CC} ${CFLAGS} ${LDFLAGS} c_sysinfo.c -c
+ 
+ ##
+ #
+@@ -1407,7 +1407,7 @@ depend:
+ 	${Q} :> skel/custom/makedep.out
+ 	${Q} cd skel/custom; ${MAKEDEPEND} \
+ 	    -I../../.. -w 1 -f makedep.out -- \
+-	    ${CFLAGS} -- \
++	    ${CFLAGS} ${LDFLAGS} -- \
+ 	    ${C_SRC} 2>/dev/null
+ 	${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out
+ 	-${Q} for i in ${C_SRC} /dev/null; do \
+-- 
+2.31.1
+
+--- a/Makefile
++++ b/Makefile
+@@ -2487,12 +2487,12 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \
+ 
+ calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+ 	${RM} -f $@
+-	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
++	${CC} ${CPPFLAGS} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+ 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
+ 
+ libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${LIBCALC_SHLIB} ${LIBOBJS} \
+-	      ${READLINE_LIB} ${READLINE_EXTRAS} -o libcalc${LIB_EXT_VERSION}
++	${CC} ${CPPFLAGS} ${LIBCALC_SHLIB} ${LIBOBJS} \
++	      ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o libcalc${LIB_EXT_VERSION}
+ 
+ libcalc${LIB_EXT}: libcalc${LIB_EXT_VERSION}
+ 	${Q} ${RM} -f $@
+@@ -2540,11 +2540,11 @@ calc.usage: calc.1 ${MAKE_FILE} ${LOC_MKF}
+ sample: ${SAMPLE_TARGETS}
+ 
+ sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+-	${CC} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
++	${CC} ${CPPFLAGS} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+ 	      ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@
+ 
+ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+-	${CC} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
++	${CC} ${CPPFLAGS} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+ 	      ${READLINE_LIB} ${READLINE_EXTRAS} ${LDFLAGS} -o $@
+ 
+ ###
+@@ -2554,15 +2554,15 @@ sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+ ###
+ 
+ hist.o: hist.c ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${CFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} ${LDFLAGS} \
++	${CC} ${CFLAGS} ${CPPFLAGS} ${TERMCONTROL} ${USE_READLINE} ${READLINE_INCLUDE} ${LDFLAGS} \
+ 	    -c hist.c
+ 
+ seed.o: seed.c ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${CFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \
++	${CC} ${CFLAGS} ${CPPFLAGS} ${WNO_IMPLICT} ${WNO_ERROR_LONG_LONG} \
+ 	    ${WNO_LONG_LONG} ${LDFLAGS} -c seed.c
+ 
+ file.o: file.c ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${CFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} ${LDFLAGS} -c file.c
++	${CC} ${CFLAGS} ${CPPFLAGS} ${WNO_ERROR_LONG_LONG} ${WNO_LONG_LONG} ${LDFLAGS} -c file.c
+ 
+ ###
+ #
+@@ -4109,7 +4109,7 @@ endif
+ calc-static${EXT}: .hsrc ${CALCOBJS} \
+ 		   ${CALC_STATIC_LIBS} ${MAKE_FILE} ${LOC_MKF}
+ 	${RM} -f $@
+-	${CC} ${LDFLAGS} ${CALCOBJS} ${LD_STATIC} ${CALC_STATIC_LIBS} \
++	${CC} ${CPPFLAGS} ${LDFLAGS} ${CALCOBJS} ${LD_STATIC} ${CALC_STATIC_LIBS} \
+ 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
+ 
+ libcustcalc.a: custom/libcustcalc.a
+@@ -4133,12 +4133,12 @@ endif
+ 
+ sample_rand-static${EXT}: sample_rand.o ${CALC_STATIC_LIBS} \
+ 			  ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${LDFLAGS} sample_rand.o ${LD_STATIC} \
++	${CC} ${CPPFLAGS} ${LDFLAGS} sample_rand.o ${LD_STATIC} \
+ 	      ${CALC_STATIC_LIBS} ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
+ 
+ sample_many-static${EXT}: sample_many.o ${CALC_STATIC_LIBS} \
+ 			  ${MAKE_FILE} ${LOC_MKF}
+-	${CC} ${LDFLAGS} sample_many.o ${LD_STATIC} \
++	${CC} ${CPPFLAGS} ${LDFLAGS} sample_many.o ${LD_STATIC} \
+ 	      ${CALC_STATIC_LIBS} ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
+ 
+ ###
+@@ -4190,7 +4190,7 @@ depend: hsrc custom/Makefile
+ 	${Q} :> skel/makedep.out
+ 	${Q} cd skel; ${MAKEDEPEND} \
+ 	    -w 1 -f makedep.out -- \
+-	    ${CFLAGS} ${LDFLAGS} -- \
++	    ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -- \
+ 	    ${C_SRC} ${BUILD_C_SRC} 2>/dev/null
+ 	-${Q} for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \
+ 	    if [ X"$$i" != X"/dev/null" ]; then \
+--- a/custom/Makefile
++++ b/custom/Makefile
+@@ -1271,7 +1271,7 @@ custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \
+ 	${CALC_STATIC_LIBCUSTCALC}
+ 
+ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
+-	${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
++	${CC} ${CPPFLAGS} ${LDFLAGS} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
+ 
+ ##
+ #
+@@ -1280,7 +1280,7 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
+ ##
+ 
+ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
+-	${CC} ${CFLAGS} ${LDFLAGS} c_sysinfo.c -c
++	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} c_sysinfo.c -c
+ 
+ ##
+ #
+@@ -1407,7 +1407,7 @@ depend:
+ 	${Q} :> skel/custom/makedep.out
+ 	${Q} cd skel/custom; ${MAKEDEPEND} \
+ 	    -I../../.. -w 1 -f makedep.out -- \
+-	    ${CFLAGS} ${LDFLAGS} -- \
++	    ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -- \
+ 	    ${C_SRC} 2>/dev/null
+ 	${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out
+ 	-${Q} for i in ${C_SRC} /dev/null; do \
+--- a/custom/Makefile.simple
++++ b/custom/Makefile.simple
+@@ -748,7 +748,7 @@ custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \
+ 	${CALC_STATIC_LIBCUSTCALC}
+ 
+ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
+-	${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
++	${CC} ${LDFLAGS} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
+ 
+ ##
+ #
+@@ -757,7 +757,7 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
+ ##
+ 
+ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
+-	${CC} ${CFLAGS} c_sysinfo.c -c
++	${CC} ${CFLAGS} ${LDFLAGS} c_sysinfo.c -c
+ 
+ ##
+ #
+--- a/custom/Makefile.tail
++++ b/custom/Makefile.tail
+@@ -93,7 +93,7 @@ custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \
+ 	${CALC_STATIC_LIBCUSTCALC}
+ 
+ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
+-	${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
++	${CC} ${CPPFLAGS} ${LDFLAGS} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
+ 
+ ##
+ #
+@@ -102,7 +102,7 @@ libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
+ ##
+ 
+ c_sysinfo.o: c_sysinfo.c ${MAKE_FILE}
+-	${CC} ${CFLAGS} c_sysinfo.c -c
++	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} c_sysinfo.c -c
+ 
+ ##
+ #
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index e5035955746f..2104da78b61f 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -7,7 +7,7 @@ AUX flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366ef
 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 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
+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
 MISC metadata.xml 852 BLAKE2B 9d4e42cbf30d12f45eee522daebfa264095ecc7da2a031a0c7676066f2dadb18e71d7c53fd1f5c7220c78276029532999e44ccacad31903fb174ce2bf36ae3d0 SHA512 f05df1daaf10afa63535a1db4bf5a75185e9523aced9329d90df59e5ca5d1eeee23b30dfe3fab6a11bdcc95b1b5e9a8b1012a19457c66e3dccbdab5a6e303e4d
diff --git a/sci-mathematics/flint/flint-2.5.2-r1.ebuild b/sci-mathematics/flint/flint-2.5.2-r1.ebuild
index 161e3cc3445d..4a5052ab0393 100644
--- a/sci-mathematics/flint/flint-2.5.2-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.5.2-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=7
@@ -32,7 +32,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.5.2-memory_message.patch"
 )
 
-src_prepare(){
+src_prepare() {
 	default
 
 	# The autodetection finds "lib" first, which may e.g. contain 32-bit
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index b28327c84cd4..3499f1e800b7 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,5 +1,5 @@
 AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b05151b126cf74a5bccf5036e1fd3aa97f12fd91808fab7fe23a3194e6a4a7a9f12be5b69a5dfda5aedec8a0117c SHA512 56102439f05f0e27bda49f1e9803bbba7921c87eab383fc2f068ccca6ef598f11e35d00f5a737076a6a41df08ef9065e567cb84030ba6ea928520f371d51b9ed
 AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
 DIST giac_1.7.0-1.tar.gz 82118267 BLAKE2B a9bb4cb260bfc7ba187907d054c737aa8f5de7baf132913dac2a054e886ec632d9077a52fb1e837a1db623223199592407734857725ee4b22c775f928893bb9d SHA512 05565ee22f4d81a4149935df9a32dc78ac07d06db1555a3d951169d184c746c61cd4d57407eabeb982fb8cb5b4a82726b5a553e6a9e689517a241eb0a8726929
-EBUILD giac-1.7.0.1.ebuild 4148 BLAKE2B 92bbb495a0b62c8a0e341cd6670fac2cf1203cb5561537b0f44e461b0470d3a60aed2f060ca98695c83cc56d4a32146994643d2d84878045aaec98c4714e2874 SHA512 0cb2124906eac884461a2b7628506b8782ab92d0b7852b741796eae9576f9b7f8fb9f6c1d34edd3974f5b427c21e0f4666c0dc1b922ca788daa02a8dfca2c855
+EBUILD giac-1.7.0.1.ebuild 4152 BLAKE2B 6d8c415a85f374778fbec7ceb998fc552020f2b28fdce57da38e08f5a3050e5d3fd7c004465d2fa48792a357b6038cc32819bac10bfc74567a2e67e3cd1ac18e SHA512 4261dc8e2460e78910e63e3565fcb5d9b7c8bea57ca1a5fe9bb1b124da5d7e0ede17044d8812015f78e574500048523d4641a33b7860a465b3683c618c414c3c
 MISC metadata.xml 1314 BLAKE2B c38eadb22de3e64b39e144c8dd2e2c359b88ea7910390ea6044af9f8f83a6db08cb4f0142d1217ddd0f4ff051f2bb94f846a789adc521d02d4c704763da1c50a SHA512 7554640bd7ab2b2c1cb77d492d044d419b178497f8b5a6165168f4c3ab0c421121e98b0f0f25d3d10479a8fcd6635f28cfdae4562d6e0b5143b541155f697077
diff --git a/sci-mathematics/giac/giac-1.7.0.1.ebuild b/sci-mathematics/giac/giac-1.7.0.1.ebuild
index 78894fa8a1e7..53d532f38e09 100644
--- a/sci-mathematics/giac/giac-1.7.0.1.ebuild
+++ b/sci-mathematics/giac/giac-1.7.0.1.ebuild
@@ -60,12 +60,12 @@ RESTRICT="!test? ( test ) mirror"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-src_prepare(){
+src_prepare() {
 	default
 	eautoreconf
 }
 
-src_configure(){
+src_configure() {
 	if use gui; then
 		append-cppflags -I$(fltk-config --includedir)
 		append-lfs-flags
@@ -148,14 +148,14 @@ src_install() {
 	find "${ED}" -type f -name '*.la' -delete || die
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
 	fi
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 9ad58a500805..f3ba8708126d 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,4 +1,6 @@
 AUX ginac-1.5.1-pkgconfig.patch 340 BLAKE2B 4e45d5af711f0a6bb833bd805340527be8972b8587f47ffe34b9e473b2783f6cb98af2b2397b199bfca1c7522250c68249112ac67a750ec59f31e26628978bd0 SHA512 b88c7ef69686733a3e817d9d4961246eb64aebf753b51bf8f6ea5c6fdfef41e52b6a20656e074f0bcc42dfe7965a440642d9036628a139f2c87bbde5f59d76d1
 DIST ginac-1.7.11.tar.bz2 1077491 BLAKE2B 741e9c8adfec15c225c3656b935707f86292b98310b50533269b238d1a9746bf54d186074c879fdbdd23f915dde225d9ee34fdbd87977835e8f9e78af364d77d SHA512 35a029915c946fcc10ba7b78df6fe1ece9a9f2f6bc172816a923c35f5b495154ab356526b904ac2a16a1bd6b0a81c480c5abb39ef40238ca7b32d1acbf97276c
+DIST ginac-1.8.0.tar.bz2 1124136 BLAKE2B 087c286f621ca5502c54c1765d948f0549a60668fd610bd16ea627af2f4056b13331097768771a0ac14807212de59b132608dc615bf2618dd487a9478dbf5a83 SHA512 6cacd0d87ffae24118f2fbaed4d201ee2d3812a751becef1982308e91cf489543db14443439da9333f3620dc5c8b1c32587e1aff0bed69e6e334310dc64edf49
 EBUILD ginac-1.7.11.ebuild 1473 BLAKE2B 8add0d658de3be7f6b01e4866afbc289f27cba4a208d372b582b2ffd2e2bb1279f5b0f317fdc0746b3d79742a3be639f1cbdc1b8fcbcc4109392f15c667e5ec7 SHA512 38cbd823741cd188884bc7f03298ee7df2e9ea12beb10d2b3e848d3cad3ca0b2174974efa0a146b832d30cad7b1bc7a19057a9b3e86e2787447f4cc1e12f9a7f
+EBUILD ginac-1.8.0.ebuild 1476 BLAKE2B 704301ca488a748b37464da91ae3cf8a8d477f037dd9146f8acf8f7214ffefcf6a26d722c3a3f6bb749ab6b7a51c341e96bfa61dfc58b8621847f228b47b979b SHA512 4c6f9049db3ccc23838c7ad3d390fb238b3012595259ee3cf1b55aa68aadb769bc4d6ff15b7b9e6f2771b41f9ecc0e5c00a28534050a87639877871a7ce1b903
 MISC metadata.xml 685 BLAKE2B 78804186606452771e8b37a00dd41458fd7ffabd1813303528cda8596cebdd54c5daea16f324b7d23dfcf679255e73f1cff84116b0bf8a81cd79bb559dcd77ae SHA512 d0075823063455623b875bf678448b146243347879eb9ca5a4fb9324183d8dcda9c060145d5b874fead55491625ef08289b349b8abf1bf105e09ac9ebc647c37
diff --git a/sci-mathematics/ginac/ginac-1.8.0.ebuild b/sci-mathematics/ginac/ginac-1.8.0.ebuild
new file mode 100644
index 000000000000..8c06689bf026
--- /dev/null
+++ b/sci-mathematics/ginac/ginac-1.8.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-any-r1
+
+DESCRIPTION="C++ library and tools for symbolic calculations"
+SRC_URI="http://www.ginac.de/${P}.tar.bz2"
+HOMEPAGE="https://www.ginac.de/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND=">=sci-libs/cln-1.2.2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-fontsrecommended
+		media-gfx/transfig
+		virtual/texi2dvi
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch )
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--disable-static
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		local -x VARTEXFONTS="${T}"/fonts
+		emake -C doc/reference html pdf
+		emake -C doc/tutorial ginac.pdf ginac.html
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc >/dev/null || die
+		newdoc tutorial/ginac.pdf tutorial.pdf
+		newdoc reference/reference.pdf reference.pdf
+
+		docinto html/reference
+		dodoc -r reference/html_files/.
+
+		docinto html
+		newdoc tutorial/ginac.html tutorial.html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		pushd doc >/dev/null || die
+		docinto examples
+		dodoc examples/*.cpp examples/ginac-examples.*
+		docompress -x /usr/share/doc/${PF}/examples
+		popd >/dev/null || die
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 21219ee51ff3..f1dc762996b1 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -4,6 +4,6 @@ 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
-EBUILD octave-5.2.0.ebuild 5465 BLAKE2B 4334c91112a379067fb32b5e0a3ceb78400752711d32c9bcd1c7367f14663d26303f2102890596fbb000b0e9167c2a8d2e63fae9d57d2392991cab4221748dd1 SHA512 afd895fc8d2cad63ad70a637ecc3d68acf2c12627b2f50fe33713ad6286a023e09acdeaa6689477dbe8e58817619bbacc9714fa857d8115daf1366c7b3537cec
-EBUILD octave-6.2.0.ebuild 5446 BLAKE2B f1dd7e5090ab03b4bb1d75815d8e77e640ae82cfb68325623b2d3d38e16e2560d367a870e8a5078b5a19b796ca90d7ab7f81b610a71ee3afa39546c10ab7957f SHA512 148cedbe493103ef9bf4a6a257aeb282000035c3ea4b6e4a97ab374cace89b7352fa6f5513d87a9930828db19668bf7452919a459eb57a9700a7a4add59b05bb
+EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
+EBUILD octave-6.2.0.ebuild 5384 BLAKE2B 2069e4642fdbfc3f9fc8f1f32cc7f8158f8b19b895078649e2c7d6b3a8a3a4a90974416acf4d63d8d3eddeffcdaa6c0fea19adc41d45746b24dbaade8f425ab7 SHA512 3bcf79a1f9836a8a24e94e4b637030bd573e4c90f090a76807e0dbd1dc53b5417c6669bf760852f628b6836f96b0ae452d81596ff6ee42aada95c6d04f85eda3
 MISC metadata.xml 1153 BLAKE2B 66d7908c8b90f850ac9c83075ffde66d32235e43cb6a23ae16aad8227f02733d8db8e37e8d23ebf7fd0af92c1af0de6fe47b65713dda94d6000e43d02e168733 SHA512 0131cf603beefbc01be92a7b2cfdebc7bc8e68419aa8432ac5aaedf1ac18581f3b50b4f98f543585dba4d830ccb394f9e288aaac2e36c763e8ed800775c459a1
diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild b/sci-mathematics/octave/octave-5.2.0.ebuild
index 873ea617a81f..0427a86b5e74 100644
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ b/sci-mathematics/octave/octave-5.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
@@ -11,7 +11,7 @@ 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 libressl opengl
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse
 	ssl static-libs X zlib"
 KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
@@ -48,8 +48,7 @@ RDEPEND="
 		x11-libs/gl2ps:0=
 	)
 	ssl? (
-		 !libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
+		 dev-libs/openssl:0=
 	)
 	portaudio? ( media-libs/portaudio )
 	postscript? (
diff --git a/sci-mathematics/octave/octave-6.2.0.ebuild b/sci-mathematics/octave/octave-6.2.0.ebuild
index 0485737c240b..f38aa0631f6a 100644
--- a/sci-mathematics/octave/octave-6.2.0.ebuild
+++ b/sci-mathematics/octave/octave-6.2.0.ebuild
@@ -11,7 +11,7 @@ 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 libressl opengl
+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"
@@ -71,8 +71,7 @@ RDEPEND="
 		sci-libs/umfpack:0=
 	)
 	ssl? (
-		 !libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
+		 dev-libs/openssl:0=
 	)
 	sundials? ( >=sci-libs/sundials-4:0= )
 	X? ( x11-libs/libX11:0= )"
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index cdb0559ab8bc..9c56c524b671 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -6,6 +6,8 @@ AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f87d7a9f366aea83f36ab984f02e312cd451fad7ee6efb2fa285780e8fa78540bb1fd4b135a62d265176c80e0 SHA512 1312f452244cd1d814a1e43e108378c956669b614845f21199b7039fe6462881168983d4badb8a80bb1bac202cd82d92788a2b4f3c23d16f993cae6e251c4fe1
 DIST pari-2.13.0.tar.gz 4758091 BLAKE2B 21a008fbca9af60c7298daf2db5c596cf881fbf4748899f417e317b2e2c0a951d152ffdab061a5f7da73db65345134a90d91e57069d9f0d0ac6eb2ad470a7a98 SHA512 671bed101be0ba0eef2c4aa4d9580477f2492f2cd354f04773df00c2fa1456d1d6d8e568d617675dc4adce3e6d1f8cbaafae45452891ceb10eba60cd669b529f
+DIST pari-2.13.1.tar.gz 4760932 BLAKE2B 50c8be1d07f303665013623f07109ef42a6d82ea88e4795c90be8ae4c714f78c2f009df40c457cc1c45f1591e5b8550965a35e3c9c272b8cd17508d774ef182e SHA512 57d0811c66d58ce6abf4d34d3f2ee98efaa22aa5f65941b8bd3d2ceaf5ba57447a8fe334b9587387b31298c85f19ec356a9db05d11dc6d956f921e7fc7d1596e
 EBUILD pari-2.11.4.ebuild 3327 BLAKE2B 8117499dc50d8146bd3988fbaf4c18ccf719cd482372687bc58eaadec09011ec29b1324d58df2669d0fbc6dcbf3985e3dedf8bb20ad6793bfbc496913d467d6d SHA512 39034792b1b133599cba2eb89d7c459a6eb39da7db0f3ee0793b0941f5be9c992e5b4a1a0a58ad0e272fdf00b5b7e24ade75f7d2e7a2b2691d565eceefeff05a
 EBUILD pari-2.13.0.ebuild 3424 BLAKE2B 5d6bd25923c72ee36a037ca56f26fe71491ad3d2d1d98a3249291fc7ad50efdae7d9b170dd66691345f6e2c5080dc945fef06ed14174a89f3376e31faeca281e SHA512 ef976b96b5ad8600d96d9892ca24e449b1be11542ad531734fadec759b00188ac4afd9114fec76aace0f40e129e71e75acdc839b402cd31dd6bc93b6005898a9
+EBUILD pari-2.13.1.ebuild 3424 BLAKE2B 5d6bd25923c72ee36a037ca56f26fe71491ad3d2d1d98a3249291fc7ad50efdae7d9b170dd66691345f6e2c5080dc945fef06ed14174a89f3376e31faeca281e SHA512 ef976b96b5ad8600d96d9892ca24e449b1be11542ad531734fadec759b00188ac4afd9114fec76aace0f40e129e71e75acdc839b402cd31dd6bc93b6005898a9
 MISC metadata.xml 1764 BLAKE2B 8c5ad974148c99e21c30630ef1866a3ca7d34c87c214973c4025977130393a055de729bba4fda75d5e2ee288f439b1fc71e44bd3b68d09255f2ed3c81909f6fe SHA512 752c757e7b38995d44af25595da8626e773cb6083a0f9aafe7f3b6af1203b7da743b04b51bbc3f023e5e09c0620fe64fec1d44da7d84c88c4ef4619cbe347565
diff --git a/sci-mathematics/pari/pari-2.13.1.ebuild b/sci-mathematics/pari/pari-2.13.1.ebuild
new file mode 100644
index 000000000000..bc5709ab3388
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.13.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Computer-aided number theory C library and tools"
+HOMEPAGE="https://pari.math.u-bordeaux.fr/"
+SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+# The subslot is the value of $soname_num obtained from
+# upstream's config/version script.
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="data doc fltk gmp test threads X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
+DEPEND="
+	sys-libs/readline:0=
+	data? ( sci-mathematics/pari-data )
+	doc? ( X? ( x11-misc/xdg-utils ) )
+	fltk? ( x11-libs/fltk:1= )
+	gmp? ( dev-libs/gmp:0= )
+	X? ( x11-libs/libX11:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.9.4-strip.patch
+	"${FILESDIR}/${PN}"-2.9.4-ppc.patch
+	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
+	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
+	"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
+	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
+)
+
+src_prepare() {
+	default
+
+	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
+	sed -i \
+		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
+		-e 's:"acroread":"xdg-open":' \
+		doc/gphelp.in || die "Failed to fix doc dir"
+}
+
+src_configure() {
+	tc-export CC CXX PKG_CONFIG
+
+	# Workaraound to "asm operand has impossible constraints" as
+	# suggested in bug #499996.
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# need to force optimization here, as it breaks without
+	if is-flag -O0; then
+		replace-flags -O0 -O2
+	elif ! is-flag -O?; then
+		append-flags -O2
+	fi
+
+	# sysdatadir installs a pari.cfg stuff which is informative only.
+	# It is supposed to be for "architecture-dependent" data.
+	# It needs to be easily discoverable for downstream packages such as gp2c.
+	# We set LD to "" so that it is set to the value of the compiler used
+	# which is how a normal end user is expected to configure it. pari's build
+	# system do not cope very well with a naked linker, it is expecting a
+	# compiler driver. See https://bugs.gentoo.org/722090
+	LD="" ./Configure \
+		--prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}/usr/share/${PN}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sysdatadir="${EPREFIX}"/usr/share/pari \
+		--mandir="${EPREFIX}"/usr/share/man/man1 \
+		--with-readline="${EPREFIX}"/usr \
+		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_with fltk) \
+		$(use_with gmp) \
+		--without-qt \
+		$(usex threads "--mt=pthread" "" "" "") \
+		|| die "./Configure failed"
+}
+
+src_compile() {
+	local mymake=""
+	use hppa && \
+		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+
+	emake ${mymake} gp
+
+	if use doc; then
+		# To prevent sandbox violations by metafont
+		VARTEXFONTS="${T}/fonts" emake docpdf
+	fi
+}
+
+src_test() {
+	# Welcome to the jungle, where the tests fail if you make your
+	# terminal bigger.
+	emake COLUMNS=80 test-all
+}
+
+src_install() {
+	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
+	default
+
+	if use doc; then
+		docompress -x "/usr/share/doc/${PF}"
+		emake \
+			DESTDIR="${D}" \
+			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+			DOCDIR="${ED}/usr/share/doc/${PF}" \
+			install-doc
+	fi
+}
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index ced070bee23d..cde7611291d7 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -14,5 +14,5 @@ AUX rstudio-server.initd 377 BLAKE2B 4f49b9ae2a81cd60565f79f121d60f5531746febd1f
 AUX rstudio-server.service.in 161 BLAKE2B 0be9cb83304063c9123c6fa13b7751b2f848adde282fc586acccfa4110f902e4de9962211ca0c871f66f3563319fe195c9f230daa4d4e429357ff74701e4d2d7 SHA512 bcf1f30e460dd5f0562b20489ca5544c6bcfbfb0ee1c636c4365df433e97e02e9e3b233e4159a0c71ad6d319f34f93c22b8fbf6b36463e29f22df2acd71da173
 DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9
 DIST rstudio-1.3.1093.tar.gz 89554292 BLAKE2B defd68e65a2cbc570aaf6fb14bd16342946154cda7322549d426281aea48d923803f061c1cd7d74b65b000a67ed62713dd06d311617e54130cb7c08147b34694 SHA512 c8a8d2312353e574dc2fb8ff2e64bd46c8aaf889c86f9c81ce22a7275e4cbec436dadfdaee513c3fc47dd3ad003e07a25baac4d8fcf47cc21df919afa084e92e
-EBUILD rstudio-1.3.1093.ebuild 6980 BLAKE2B 51467f99af427ab86437818788918cdeec384de97b450ea7028ad046edbe259984d3e8158ae86b51e238e4d47bcd9ddef5e110532f3544bc28e6c06a3e64ca83 SHA512 9dd2ac83e838def156fb9fac7c94ccb61fae52f7144acfd924f328077dd0630a455a914dd0c59ff186878ee4ed8f4502296d07f867be2e6003a5f5a6953a4498
+EBUILD rstudio-1.3.1093.ebuild 6922 BLAKE2B d35f9b9bacfdef7539632043be189d82676ecc7033cafd27caadb5f7ffa58ce220176239dfb3031314aa67a69158a83d688739d4c08bcd238be68d7bea3026bd SHA512 4796b58aa3dac3d4759b0c521ffa0157978c3b12be5655f03f5bff72dfcdfac96e13d1697bde1cadbef2284fdb1c51829d59d4b6bfb6db2af080f85b723e7e87
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
index af87bd08951d..4fee0074c081 100644
--- a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.3.1093.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=7
@@ -28,7 +28,7 @@ SRC_URI="
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
+IUSE="dedicated server"
 
 RDEPEND="
 	>=app-text/pandoc-${PANDOC_VER}
@@ -75,8 +75,8 @@ RDEPEND="
 		acct-user/rstudio-server
 		acct-group/rstudio-server
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core