gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sci-mathematics
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
129 files changed, 1541 insertions, 1931 deletions
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild
deleted file mode 100644
index acd1d0deb899..000000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common eutils flag-o-matic multilib python-single-r1 toolchain-funcs
-
-# To stop the download madness we now roll our own tarball (Feb 2016)
-DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-BASE_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/"
-BASE_URI2="https://dev.gentoo.org/~tomka/files/"
-SRC_URI="
-	${BASE_URI2}/${P}-fat.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug emacs +optimization"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	sys-process/time
-	virtual/pkgconfig"
-
-RDEPEND="${PYTHON_DEPS}
-	sys-libs/gdbm
-	sci-mathematics/pari[gmp]
-	>=sys-libs/readline-6.1
-	dev-libs/libxml2:2
-	sci-mathematics/flint[gc]
-	sci-mathematics/frobby
-	sci-mathematics/4ti2
-	sci-mathematics/nauty
-	>=sci-mathematics/normaliz-2.8
-	sci-mathematics/gfan
-	sci-libs/cdd+
-	sci-libs/cddlib
-	sci-libs/lrslib[gmp]
-	virtual/blas
-	virtual/lapack
-	dev-util/ctags
-	sys-libs/ncurses
-	>=dev-libs/boehm-gc-7.4[threads]
-	dev-libs/libatomic_ops
-	emacs? ( virtual/emacs )"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/M2/M2"
-
-pkg_setup () {
-	tc-export CC CPP CXX PKG_CONFIG
-	append-cppflags "-I/usr/include/frobby"
-	# gtest needs python:2
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Patching .m2 files to look for external programs in
-	# /usr/bin
-	epatch "${FILESDIR}"/1.6-paths-of-external-programs.patch
-
-	# Shortcircuit lapack tests
-	epatch "${FILESDIR}/${P}"-lapack.patch
-
-	eautoreconf
-}
-
-src_configure (){
-	# Recommended in bug #268064 Possibly unecessary
-	# but should not hurt anybody.
-	if ! use emacs; then
-		tags="ctags"
-	fi
-
-	# configure instead of econf to enable install with --prefix
-	./configure LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--prefix="${D}usr/" \
-		--libdir='${exec_prefix}'/$(get_libdir)/ \
-		--disable-encap \
-		--disable-strip \
-		--with-issue=Gentoo \
-		$(use_enable optimization optimize) \
-		$(use_enable debug) \
-		--enable-build-libraries="factory" \
-		--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
-		|| die "failed to configure Macaulay"
-}
-
-src_compile() {
-	# Parallel build not supported yet
-	emake IgnoreExampleErrors=true -j1
-
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs" || die
-		elisp-compile *.el
-	fi
-}
-
-src_test() {
-	# No parallel tests yet & Need to increase the time
-	# limit for long running tests in Schubert2 to pass
-	emake TLIMIT=750 -j1 check
-}
-
-src_install () {
-	# Parallel install not supported yet
-	emake IgnoreExampleErrors=true -j1 install
-
-	# Remove emacs files and install them in the
-	# correct place if use emacs
-	rm -rf "${ED}"/usr/share/emacs/site-lisp || die
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs" || die
-		elisp-install ${PN} *.elc *.el
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "If you want to set a hot key for Macaulay2 in Emacs add a line similar to"
-		elog "(global-set-key [ f12 ] 'M2)"
-		elog "in order to set it to F12 (or choose a different one)."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
deleted file mode 100644
index 4356ae237912..000000000000
--- a/sci-mathematics/Macaulay2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 1.6-paths-of-external-programs.patch 3767 BLAKE2B 01c974baf0dbf8246eb3c8aa747f0fc5dc02853fa28fdef417deffb56f8a1af9919ba50f9fcaa42ed575c90761519b6239e9544f8600b1f086d8215ca466a9ae SHA512 556944da47742a3c4539e084bb6dab7c2375733eb4cbe4d14e1dea852bba3ac61e5f6ad5f805958a52d371a918c8672f7f0308c7c0454a502ca61bb59fea6bf5
-AUX 70Macaulay2-gentoo.el 597 BLAKE2B 58de58a469874a24be539fc104d829304d58237b1780dff5b61e6e5a497b150a0e4b342e797ab33de7d22ca58b93cbfd50f41057749fb6f3f84083eec4bb2d24 SHA512 2d6b6d3c85ca93bf4d4100f2172013074dec83f8ce067af219b026ca2b495ff1aa7fb3da027b64ef8e55ad431ce5d42bffdad1ab474bb3e95240ac4235f2f986
-AUX Macaulay2-1.8.2.1-lapack.patch 1836 BLAKE2B 6464d859336d16fffcb8bc1aaed9442a258429e9e325118cc1d55944fe851c0a531da3fca3f57849341066167b3c1a768051b78c25763ca958b90de27061fb34 SHA512 d3d13a67daeda87753c7c4daf888d2982109cb13bc0b88be46c2dd4993715077cf0ce5e155876bf5aaf51c886ce348df550184ade4af71e7143c2c2eb16c3b7f
-DIST Macaulay2-1.8.2.1-fat.tar.bz2 26102483 BLAKE2B 3841505051b544cc2bc2c302032120b0019e8cd7bf5573c958e0309bf40fbb89f5a57da81759f5880d2fb2c1bc586c3af4b5488500cad43699e7562da0f4f821 SHA512 64f7ea9b01cdb308023a55d8ab8bd6733540f25161dacf27052c071e143418c68c639d5115cf32540c11594b70eae14473f4ef6ce5bd12b6df0722da7c13dd2c
-EBUILD Macaulay2-1.8.2.1-r1.ebuild 3279 BLAKE2B 5653e6a759199ccf422d4142ff55fbc6caa33c7e2500070573f2c11298a12be361b1e11a3d1167ff8ecc1ba1cefc811fa6c4ac61dd3030156c788a8c6f1724af SHA512 ff3476345a0786ac0754de306c273650499f9f7a6264b199ffebd339988e07b33abf4583ee2b96a73c0f3c3c3f731957af760d84f883c32cad61ccd6783a9960
-MISC metadata.xml 527 BLAKE2B 8aac8a049fbb72e0ee7ee5cd71204857d86f00aa97c892f84b771628f1511e5124de7769006efb98e29e4644e9bcdf5a35c17eda63ca3d7c58a04e23cba19ab1 SHA512 7ca19042c8405096453426ec3582c3d342ff9a37ec520372f11ffd4e00a78ef018cc49d3f851e6dff2a000314f0eb6de0a4640d37edcb19ff2ad65196aaa03a1
diff --git a/sci-mathematics/Macaulay2/files/1.6-paths-of-external-programs.patch b/sci-mathematics/Macaulay2/files/1.6-paths-of-external-programs.patch
deleted file mode 100644
index 4c090deec9d8..000000000000
--- a/sci-mathematics/Macaulay2/files/1.6-paths-of-external-programs.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -U 3 -dHrN M2source/Macaulay2/packages/FourTiTwo.m2 M2source.patch/Macaulay2/packages/FourTiTwo.m2
---- M2source/Macaulay2/packages/FourTiTwo.m2	2011-09-22 14:36:51.000000000 +0100
-+++ M2source.patch/Macaulay2/packages/FourTiTwo.m2	2011-09-24 21:24:12.000000000 +0100
-@@ -47,7 +47,7 @@
- 
- path'4ti2 = (options FourTiTwo).Configuration#"path"
- -- NOTE: the absolute path should be put into the .init file for 4ti2 inside the .Macaulay2 directory.
--if path'4ti2 == "" then path'4ti2 = prefixDirectory | currentLayout#"programs"
-+if path'4ti2 == "" then path'4ti2 = "/usr/bin/"
- 
- getFilename = () -> (
-      filename := temporaryFileName();
-diff -U 3 -dHrN M2source/Macaulay2/packages/gfanInterface.m2 M2source.patch/Macaulay2/packages/gfanInterface.m2
---- M2source/Macaulay2/packages/gfanInterface.m2	2011-05-14 12:00:59.000000000 +0100
-+++ M2source.patch/Macaulay2/packages/gfanInterface.m2	2011-09-24 21:24:12.000000000 +0100
-@@ -25,7 +25,7 @@
-      }
- 
- gfan'path = gfanInterface#Options#Configuration#"path"
--if gfan'path == "" then gfan'path = prefixDirectory | currentLayout#"programs"
-+if gfan'path == "" then gfan'path = "/usr/bin/"
- if instance(gfan'path, String) then gfan'path = {gfan'path}
- if not instance(gfan'path,List) then error "expected configuration option gfan'path to be a list of strings or a string"
- gfan'path = join(
-diff -U 3 -dHrN M2source/Macaulay2/packages/NautyGraphs.m2 M2source.patch/Macaulay2/packages/NautyGraphs.m2
---- M2source/Macaulay2/packages/NautyGraphs.m2	2011-08-26 11:05:30.000000000 +0100
-+++ M2source.patch/Macaulay2/packages/NautyGraphs.m2	2011-09-24 21:25:53.000000000 +0100
-@@ -32,7 +32,7 @@
- -- Check the ~/.Macaulay2/init-NautyGraphs.m2 file for the absolute path.
- -- If it's not there, then use the M2-Programs directory.
- nauty'path = (options NautyGraphs).Configuration#"path";
--if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
-+if nauty'path == "" then nauty'path = "/usr/bin/";
- 
- -------------------
- -- Exports
-diff -U 3 -dHrN M2source/Macaulay2/packages/Nauty.m2 M2source.patch/Macaulay2/packages/Nauty.m2
---- M2source/Macaulay2/packages/Nauty.m2	2011-08-26 11:05:30.000000000 +0100
-+++ M2source.patch/Macaulay2/packages/Nauty.m2	2011-09-24 21:24:12.000000000 +0100
-@@ -48,7 +48,8 @@
- -- Check the ~/.Macaulay2/init-Nauty.m2 file for the absolute path.
- -- If it's not there, then use the M2-Programs directory.
- nauty'path = (options Nauty).Configuration#"path";
--if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
-+if nauty'path == "" then nauty'path = "/usr/bin/";
-+
- 
- -------------------
- -- Exports
-diff -U 3 -dHrN M2source/Macaulay2/packages/Normaliz.m2 M2source.patch/Macaulay2/packages/Normaliz.m2
---- M2source/Macaulay2/packages/Normaliz.m2	2011-05-25 16:47:50.000000000 +0100
-+++ M2source.patch/Macaulay2/packages/Normaliz.m2	2011-09-24 21:24:12.000000000 +0100
-@@ -166,7 +166,7 @@
-         nmzExec="normaliz";
-     );
- --    return nmzExec;
--    return prefixDirectory | currentLayout#"programs" | nmzExec;
-+    return "/usr/bin/" | nmzExec;
- );
- 
- 
-diff -U 3 -dHrN M2source/Macaulay2/packages/StatePolytope.m2 M2source.patch/Macaulay2/packages/StatePolytope.m2
---- M2source/Macaulay2/packages/StatePolytope.m2	2010-09-10 16:47:20.000000000 +0100
-+++ M2source.patch/Macaulay2/packages/StatePolytope.m2	2011-09-24 21:24:12.000000000 +0100
-@@ -31,7 +31,7 @@
- 
- 
- gfanCommand = (options StatePolytope)#Configuration#"gfan command"
--if gfanCommand === "gfan" then gfanCommand = prefixDirectory | currentLayout#"programs" | gfanCommand
-+if gfanCommand === "gfan" then gfanCommand = "/usr/bin/" | gfanCommand
- gfanCommand = "!" | gfanCommand
- 
- --The next two functions print out the ring and the ideal in the format required by gfan
diff --git a/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el b/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
deleted file mode 100644
index ac86e2132ed5..000000000000
--- a/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
+++ /dev/null
@@ -1,11 +0,0 @@
-;; sci-mathematics/Macaulay2 init file
-
-(add-to-list 'load-path "/usr/share/emacs/site-lisp/Macaulay2")
-
-(defvar M2-exe "/usr/bin/M2" "*The default Macaulay2 executable name.")
-(autoload 'M2 "M2.el" "Run Macaulay 2 in a buffer." t)
-(autoload 'Macaulay2 "M2" "Run Macaulay 2 in a buffer, non-interactive." t)
-(autoload 'M2-mode "M2" "Macaulay 2 editing mode" t)
-(autoload 'm2-mode "M2" "Macaulay 2 editing mode, name in lower case" t)
-(autoload 'm2-comint-mode "M2" "Macaulay 2 command interpreter mode, name in lower case" t)
-(setq auto-mode-alist (append auto-mode-alist '(("\\.m2$" . M2-mode))))
-\ No newline at end of file
diff --git a/sci-mathematics/Macaulay2/files/Macaulay2-1.8.2.1-lapack.patch b/sci-mathematics/Macaulay2/files/Macaulay2-1.8.2.1-lapack.patch
deleted file mode 100644
index 25185e7c560e..000000000000
--- a/sci-mathematics/Macaulay2/files/Macaulay2-1.8.2.1-lapack.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.ac	2015-09-03 14:49:42.000000000 +0200
-+++ configure.ac.new	2016-01-27 12:50:07.812215547 +0100
-@@ -1301,46 +1301,7 @@
-      BUILTLIBS="$SINGULARLIBS $BUILTLIBS"
- fi
- 
--# we need to do the fortran library testing last, in case AC_SEARCH_LIBS adds
--# one of them to $LIBS, making it impossible to check for the presence of C or
--# C++ libraries.  (I'm not sure why putting -llapack on the gcc command line
--# needlessly causes the library to be linked against.)
--FORTRANUSED=no
--if test "$LAPACK" = yes
--then AC_MSG_CHECKING([whether the Accelerate framework is available])
--     SAVELIBS=$LIBS LIBS="-framework Accelerate $LIBS"
--     AC_LANG(C)
--     AC_LINK_IFELSE(
--	 [AC_LANG_PROGRAM(,[sgemv_();dgetrf_();])],
--	 [
--	     AC_MSG_RESULT(yes)
--	     ],
--	 [
--	     AC_MSG_RESULT(no)
--	     LIBS=$SAVELIBS
--	     FORTRANUSED=yes
--	     if test $BUILD_lapack = no
--	     then AC_LANG(Fortran)
--	     	  if test "$FC" = ""
--		  then AC_MSG_ERROR(no fortran compiler found)
--		  else AC_MSG_NOTICE(using fortran compiler $FC)
--		  fi
--		  AC_SEARCH_LIBS(sgemv,blas f77blas,,BUILD_lapack=yes)
--		  AC_SEARCH_LIBS(dgetrf,lapack,,BUILD_lapack=yes)
--	     fi
--	 ])
--fi
--test $BUILD_lapack = yes && BUILTLIBS="-llapack -lrefblas $BUILTLIBS"
--
--if test $BUILD_lapack = yes
--then # test whether the fortran compiler can handle lapack, which, starting with
--     # version 3.2, requires fortran 90, not fortran 77
--    AC_LANG(Fortran)
--    AC_MSG_CHECKING([whether the fortran compiler is modern enough for lapack])
--    AC_COMPILE_IFELSE([instrinsic maxloc],
--	AC_MSG_ERROR(the fortran compiler ($FC) does not support the Fortran 90 language required for compiling lapack),
--	AC_MSG_RESULT(yes))
--fi
-+BUILTLIBS="$(${PKG_CONFIG} --libs lapack) $BUILTLIBS"
- 
- test "$USE_FCLIBS" = no && FCLIBS=
- test "$FORTRANUSED" = no && FCLIBS=
diff --git a/sci-mathematics/Macaulay2/metadata.xml b/sci-mathematics/Macaulay2/metadata.xml
deleted file mode 100644
index 76821a208f0c..000000000000
--- a/sci-mathematics/Macaulay2/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <use>
-    <flag name="optimization">Accept upstream's choices for -O option, i.e. -O3 almost everywhere.</flag>
-  </use>
-  <longdescription lang="en">
-  Macaulay2 is a research tool for algraic geometry and commutative
-  algebra. 
-</longdescription>
-</pkgmetadata>
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index fabd0f69c632..56dddf81e246 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 084f0fb21e16..9b3decfc5ba1 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -2,6 +2,7 @@ AUX 50agda2-gentoo.el 317 BLAKE2B c295509014fc7f254c5c0650b079d3827b182270c6e1aa
 AUX agda-2.4.2.5-hashtables.patch 558 BLAKE2B 88532103f488b643ac84ad37fae3776514034121624c43610910c44a67ac0e68cc5d5d8afece38e2fbf95dbaa3e268e2418d1c34ba4a8fbc60637d63765be42d SHA512 0297fc4605db3dc11f08ec068cfdce908d273c6d14f472e4d00b4416a8e5f671b3b77d4e0cb671671bafd07b39ec46e72eab6cab972145199b25b3c4cfb0b3a6
 DIST Agda-2.4.2.5.tar.gz 1031427 BLAKE2B bf64731e0c068c4f609e9651f0cb6ea763f1e02ddd8909269a140f8ebd036dbb5b36d9f1b038a32016447bbfbd4f9dd6a00a1cc34616efd7099a2b4ddcc7d3bc SHA512 c2e090a42f699200854c20dad868b4b67e99107f0cdbba20ed268f4618fcf80068ee31db37e4b6637f73128d9f652ef9276d8f7adea54628da759d79f5e4f4a2
 DIST Agda-2.5.2.tar.gz 1240885 BLAKE2B bccdaa0c40b8e116f44ee436171cec0a8e1366d7b1f0b469bf459eacf4256e29a00c60a371dcf7971c499e948ce6264861016bb51fcad3251f62cb3e7370c19c SHA512 39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164
-EBUILD agda-2.4.2.5-r2.ebuild 4422 BLAKE2B c5d222e5191cb21102965a280839b8d3d7c8dc8ddaeae239b03b09dfdf5fda4abea07a9df5690e0f986ffecc8632f9c7a6884c9f0e3ce8f80bbaf62622190def SHA512 709169949495bd804cd4fa45622e04856d6078d8b87c240415ec0effbbca69a2941aa8db67b1f5209484663ce2ca79a29d76fed79cf9f2a71ce1c7e3d8b76fe9
-EBUILD agda-2.5.2-r1.ebuild 5256 BLAKE2B fe72cecab078db6668a6796df896bef3383068a778a8360e991233e25dc947275a4a1745efe09065d0d66e53834de43e77a16e49941ef6f452607dd52bd8a41c SHA512 61dfdfc7c7072fcc509f4896387e9b7d5c81cd8db40ef29aa6ba2732d1aeedad0da4385ca8983d2ba1f341de130564747c83a5a57558339c5d1185f2552cafad
+EBUILD agda-2.4.2.5-r2.ebuild 4435 BLAKE2B 23391332d6a47ef08ded30dacafeaadaf90b7952f955370edbed5433e65fa9d589cf3aa5efedba072d936fbed19ac69fb7859ac559cbb50da87c1724479c3505 SHA512 4820821774519193231316539eb749f99a72c0bac66635c9498f91f68dcdd4899d6082c2d40b0a212de505ecada4ecf35b7e726e7279490a9a05699b028920f1
+EBUILD agda-2.5.2-r1.ebuild 5269 BLAKE2B dc51c050ba5a34cdcd4b47914fc0bd6eab1831598874b1d9aa388cdfdfd4c9fb09bec0c60e60abeb050e5a688571ba5d466066124be7044b3d4bee841d3ec6ab SHA512 b18c10ec2c8fdcc6f861c7fb06bc8459edb430cec90ee0b2ffaa139bab0be245ff328ee88289dcb73786bc269036af9c373c7bda212c0dbd54d1113697c0e407
+EBUILD agda-2.5.2-r2.ebuild 5304 BLAKE2B c8b634ef9ba0c757503364ac267792b001b1a62c698450a30ea8874d6adb3740151ca3acf4446753460ff0601217cea4cdce4aa48a75bfd9cd0b8f08f4795218 SHA512 955943813bc8538426e09d9bd506dbc1a09d72fe229a5d1365007751f28d1c2e038c2bcaf587a0a490233b1dc1024abbbfc9408655900764c91c1e57f61ff4a3
 MISC metadata.xml 907 BLAKE2B f4890d2c0e7c8d3eeb57ad9472ae3b5ae287fc7880fa853ec5d1a6c9867aa3e11ef71cd5b46ed5e9fd9e3c3307eea1260c4aa0d9f1598de64f48f43e0c2af137 SHA512 d48af119f929e739634165e1ece14ef2bf55eb996fd0852fd34783a18da04a156bf858b3f0a7ad3cd5c85e55c564bfb3e5552786161fd2ad66f86eb5d3d91426
diff --git a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
index 35d86bd4e84c..634862b133ad 100644
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
@@ -44,10 +44,10 @@ RDEPEND=">=dev-haskell/binary-0.7.2.1:=[profile?] <dev-haskell/binary-0.8:=[prof
 	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
 "
 RDEPEND+="
-		emacs? ( app-emacs/haskell-mode
-			virtual/emacs )
+		emacs? ( >=app-editors/emacs-23.1:*
+			app-emacs/haskell-mode )
 "
-PDEPEND="stdlib? ( =sci-mathematics/agda-stdlib-${PV} )"
+PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${PV} )"
 DEPEND="${RDEPEND}
 	dev-haskell/alex
 	>=dev-haskell/cabal-1.16.0
diff --git a/sci-mathematics/agda/agda-2.5.2-r1.ebuild b/sci-mathematics/agda/agda-2.5.2-r1.ebuild
index 630d67092eb1..9bc509d3579c 100644
--- a/sci-mathematics/agda/agda-2.5.2-r1.ebuild
+++ b/sci-mathematics/agda/agda-2.5.2-r1.ebuild
@@ -63,10 +63,10 @@ RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?
 		>=dev-haskell/uulib-0.9.20:=[profile?] )
 "
 RDEPEND+="
-		emacs? ( app-emacs/haskell-mode
-			virtual/emacs )
+		emacs? ( >=app-editors/emacs-23.1:*
+			app-emacs/haskell-mode )
 "
-PDEPEND="stdlib? ( =sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )"
+PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )"
 DEPEND="${RDEPEND}
 	dev-haskell/alex
 	>=dev-haskell/cabal-1.22.2.0
diff --git a/sci-mathematics/agda/agda-2.5.2-r2.ebuild b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
new file mode 100644
index 000000000000..c5ee1f841665
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal elisp-common
+
+MY_PN="Agda"
+MY_P="${MY_PN}-${PV}"
+
+## shared with sci-mathematics/agda-stdlib
+# upstream does not maintain version ordering:
+#  https://github.com/agda/agda-stdlib/releases
+# 0.11 -> 2.5.0.20160213 -> 2.5.0.20160412 -> 0.12
+# As Agda-stdlib is tied to Agda version we encode
+# both versions in gentoo version.
+##
+MY_UPSTREAM_AGDA_STDLIB_V="0.13"
+MY_GENTOO_AGDA_STDLIB_V="${PV}.${MY_UPSTREAM_AGDA_STDLIB_V}"
+
+DESCRIPTION="A dependently typed functional programming language and proof assistant"
+HOMEPAGE="http://wiki.portal.chalmers.se/agda/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cpphs debug uhc +stdlib emacs"
+
+RESTRICT=test # Unrecognized option: --test (did you mean any of --help --js --css ?)
+
+RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?]
+	>=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?]
+	>=dev-haskell/edisoncore-1.3.1.1:=[profile?]
+	>=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?]
+	>=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?]
+	>=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[profile?]
+	>=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
+	>=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?]
+	>=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?]
+	>=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?]
+	>=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
+	>=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?]
+	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.3.3.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-haskell/zlib-0.4.0.1:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	>=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?]
+	>=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?]
+		>=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?]
+		>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
+		>=dev-haskell/uulib-0.9.20:=[profile?] )
+"
+RDEPEND+="
+		emacs? ( >=app-editors/emacs-23.1:*
+			app-emacs/haskell-mode )
+"
+PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.22.2.0
+	dev-haskell/happy
+	cpphs? ( dev-haskell/cpphs )
+"
+RDEPEND+="!sci-mathematics/agda-executable"
+
+SITEFILE="50${PN}2-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if ! use emacs; then
+		sed -e '/.*emacs-mode.*$/d' \
+			-i "${S}/${MY_PN}.cabal" \
+			|| die "Could not remove agda-mode from ${MY_PN}.cabal"
+	fi
+	cabal_chdeps \
+		'EdisonCore >= 1.3.1.1 && < 1.3.2' 'EdisonCore >= 1.3.1.1'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag cpphs cpphs) \
+		$(cabal_flag debug debug) \
+		$(cabal_flag uhc uhc)
+}
+
+src_compile() {
+	if use emacs; then
+		BYTECOMPFLAGS="-L ./src/data/emacs-mode"
+		elisp-compile src/data/emacs-mode/*.el \
+			|| die "Failed to compile emacs mode"
+	fi
+	haskell-cabal_src_compile
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	dist/build/agda/agda --test +RTS -M1g || die
+}
+
+src_install() {
+	local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)"
+
+	haskell-cabal_src_install
+
+	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	# compile Agda.Primitive and Agda.Builtin modules, emulate Setup.hs postinst phase
+	Agda_datadir="${add}" \
+		"${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \
+		|| die "Failed to build 'Primitive.agdai'"
+	for file in "${add}"/lib/prim/Agda/Builtin/*.agda; do
+		Agda_datadir="${add}" \
+			"${ED}"/usr/bin/agda "${file}" \
+			|| die "Failed to build '${file}'"
+	done
+
+	if use emacs; then
+		elisp-install ${PN} src/data/emacs-mode/*.el \
+			|| die "Failed to install emacs mode"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "Failed to install elisp site file"
+	fi
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+	if use emacs; then
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	haskell-cabal_pkg_postrm
+	if use emacs; then
+		elisp-site-regen
+	fi
+}
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 32a349c41897..44cbfae283d9 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -2,4 +2,5 @@ DIST coq-8.6.1.tar.gz 5588811 BLAKE2B 1016e54ef9b42a8534add55ab057454fad35b3fe10
 DIST coq-8.9.1.tar.gz 6001970 BLAKE2B f65498e2485c59f4f95d2afeac35750ebf85b5af6db7c269a11635f2414df483d4cb159557060c9118de25f4922176f54d2e5c6f12174599371348341cb4d80f SHA512 66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983
 EBUILD coq-8.6.1-r1.ebuild 2007 BLAKE2B e11542ca13987c776b7dd4b181a4e369381d5b4bf16d61e2ba06b77d7c26e93295a18040ca757b02df492fb034f8852e9d340f52dbd22e7dde8cefaf60fe14f8 SHA512 b26850dc5f062a938a6974c1b49eb6f09645c75cdbac945262919be3d13c46e897d839ea063258868c6e6785cdeb31fc41152c2ffc0b412ca3b152e5ea89ffbc
 EBUILD coq-8.9.1-r1.ebuild 1884 BLAKE2B d060bd67a71bbe9cfc8c73ec578ca19565f88b671f667305ffbf7a911f46de8040918848321cbebee6c7957d566638007b634a0909ff8603497ca2ef71607a7f SHA512 76d68162cfc431547f5c499d1ffa80c1446a95e2f96c414830a93d4d91ed65143eb0c8bf3b12ed27d3d1b4bd302e498ea1ebf783b37a8576c7c009d4681a83ef
+EBUILD coq-8.9.1-r2.ebuild 1824 BLAKE2B c98446eed745fb1c111ad025ac19d9cc707917863ef32d47e1bdf0653b0d49ff2e050ab423ae864f55579c0e5bea0ac41e2c7ae51851e0ced846ff40d55d3646 SHA512 e7d7150b74cdfb9da5acc4dcf7e1355f9bc213d6a0aaaa72cad5a5db521718ef2533232bfb6176b7b09df2eda6283f82fa849dd2d56a671ee2b2f39496d5d358
 MISC metadata.xml 999 BLAKE2B 04e27cb6563eca4cfab69c0a73a12e2ea5cb3ccb6dc711400ebbfb4790c896ab8f7efff0da1f985596333a4f32cd6d8278e750ef90cb5f0d61728d8f453095fa SHA512 0c78334d0d352fbe268804040a4f7765fba09055e316fd67739d052fbb4048817e3136065939f763248a3cbe27daf5884f2953b887690a7593aed6b5dc7157a6
diff --git a/sci-mathematics/coq/coq-8.9.1-r2.ebuild b/sci-mathematics/coq/coq-8.9.1-r2.ebuild
new file mode 100644
index 000000000000..75d3af58a1fc
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.9.1-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop multilib
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk debug +ocamlopt doc"
+
+RESTRICT=test
+
+RDEPEND="
+	>=dev-lang/ocaml-4.0.7:=[ocamlopt?]
+	dev-ml/camlp5:=[ocamlopt?]
+	dev-ml/num:=
+	gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] )"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+	doc? (
+		media-libs/netpbm[png,zlib]
+		virtual/latex-base
+		dev-tex/hevea
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-latexextra
+		)"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	ocaml_lib=$(ocamlc -where)
+	local myconf=(
+		-prefix /usr
+		-bindir /usr/bin
+		-libdir /usr/$(get_libdir)/coq
+		-mandir /usr/share/man
+		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
+		-docdir /usr/share/doc/${PF}
+		-configdir /etc/xdg/${PN}
+		-lablgtkdir ${ocaml_lib}/lablgtk2
+		)
+
+	use debug && myconf+=( -debug )
+	use doc || myconf+=( -with-doc no )
+
+	if use gtk; then
+		if use ocamlopt; then
+			myconf+=( -coqide opt )
+		else
+			myconf+=( -coqide byte )
+		fi
+	else
+		myconf+=( -coqide no )
+	fi
+
+	use ocamlopt || myconf+=( -byte-only )
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake STRIP="true" -j1 world VERBOSE=1
+}
+
+src_test() {
+	emake STRIP="true" check VERBOSE=1
+}
+
+src_install() {
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
+	dodoc README.md CREDITS CHANGES.md
+
+	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+}
diff --git a/sci-mathematics/dunshire/Manifest b/sci-mathematics/dunshire/Manifest
index 22e7cdf574f1..1558f3847adb 100644
--- a/sci-mathematics/dunshire/Manifest
+++ b/sci-mathematics/dunshire/Manifest
@@ -1,3 +1,3 @@
 DIST dunshire-0.1.1.tar.gz 300878 BLAKE2B b0ed57e535313fbc653fdc7c8fd32fb98382db71dfe419e315f4b82fc4630e47757d74b9105e846b2eefaa7dcd93b12886eee341b11d0e8b562a52e480478e9a SHA512 5cdf8125d7fc1f76a483009392360e9e9088f9b58ca3f123d14e366421e831e4e7c8e17d367ba0430fb3cd61873cae7a004c903ff5417bfc9adecb7831681081
-EBUILD dunshire-0.1.1.ebuild 720 BLAKE2B e54c351613bb3c4bef3ccd2817ea05b23c95bb6e35477a0afeee7a882ad535a222fa98853c92de71c52916a239d0f3d1daa06efc05a5108891541e026bfb9617 SHA512 06b8b505e3d015da9f229b247dc26f09adc9642fc7a2755bd093071e688ed24d20d8f1f809d91116a9d7592a55c8bb800e6c8bb837ba2aa21e73e76fa65d7e43
+EBUILD dunshire-0.1.1.ebuild 716 BLAKE2B 3299010971dd19a8e2fc82718629296221c73277b0c54a54ff9f96dd821e008e6e099e03731cf23e3e7338db506bf7ff7907871454e94c59c1f62dd4e5714169 SHA512 8c8605f04a6f5024844fd4f522c0ce9cb706768dd04ad58cdb95a0b1664fc2aedb308c7bd6f14ba581f5f42beb537dc69e928103cceeb1a15df98bc4b00b10ed
 MISC metadata.xml 328 BLAKE2B 16beb1fab1e231e2bb2c8088729c9ab6fa1d4ab06f12f1da462fdeb18738d5fed80b28456df94b2af14f97855042d356b7f69ef956524c456bae62e12b4ba499 SHA512 1ae4898a1247c78ba707aa6e38819cbc5277e46fd32d3ca1172c70c18f42247624755262e3886a2deee76d2a39a3a54750edbc2d77a339543741c2488b095e45
diff --git a/sci-mathematics/dunshire/dunshire-0.1.1.ebuild b/sci-mathematics/dunshire/dunshire-0.1.1.ebuild
index 32b83f053c80..82de99fb080f 100644
--- a/sci-mathematics/dunshire/dunshire-0.1.1.ebuild
+++ b/sci-mathematics/dunshire/dunshire-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
new file mode 100644
index 000000000000..3c538ebc2bee
--- /dev/null
+++ b/sci-mathematics/eclib/Manifest
@@ -0,0 +1,3 @@
+DIST eclib-20190909.tar.bz2 914900 BLAKE2B df57972792f96e65b25db5a2ab1063d5a8f1ad05edbed77d9ca2632ddfb4af2cb8586e572155beec09cc0c03472300d1e6fcbdda3527c36e9106006239f50600 SHA512 df829b10c353f528f2040b55d6198e3a48eba179b9a80e71794e4c6d46ee9bb13b3eccec15c7d286ec5d8252e6ba91157c2a08ac4e2da86969a4158450a41960
+EBUILD eclib-20190909.ebuild 1032 BLAKE2B ac9d22b2bf93cc93236a325b5b9f282057a35e6c939f7d33991c7e08f26bcfd45d8f2a7518b47e99ae83160c9e836a8de2563ddba1d9a7cdef15672f17ab70c5 SHA512 3c43c89824caec646156deb47c23155d5b191be3d65718f5dafa43310176539d2852911e87ba0503e4b10b4573a04a9a5386c1db94b566118464a91291453bf8
+MISC metadata.xml 1058 BLAKE2B f78114f517aa1b21ee6bc36104f1e929b319d77c2a9373c41cfcea4a90d89ff9e0a0d512f4056b6d1c611a3dfe2f64b65117f8e3ba09dd4c3e535eab0cb76f3b SHA512 692e570681c68cd0a2285b616a792e91e341993fceac875f3e35911f04d1933b2e696c9d54d9f90c3a2f459c8365291e03c0a52c1cbf0491a3c303f9e1ba6d41
diff --git a/sci-mathematics/eclib/eclib-20190909.ebuild b/sci-mathematics/eclib/eclib-20190909.ebuild
new file mode 100644
index 000000000000..e30f083b9992
--- /dev/null
+++ b/sci-mathematics/eclib/eclib-20190909.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Programs for elliptic curves defined over the rational numbers"
+HOMEPAGE="https://www.warwick.ac.uk/~masgaj/mwrank/index.html"
+
+# We use the SageMath tarball instead of the one from github because
+# the github releases don't contain the "make dist" stuff and we would
+# need autotools.eclass to generate it.
+SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="boost flint minimal static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sci-mathematics/pari:=
+	dev-libs/ntl:=
+	boost? ( dev-libs/boost:= )
+	flint? ( sci-mathematics/flint:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		$(usex minimal --disable-allprogs "" "" "") \
+		$(use_with boost) \
+		$(use_with flint) \
+		$(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/eclib/metadata.xml b/sci-mathematics/eclib/metadata.xml
new file mode 100644
index 000000000000..9561ac3f61e9
--- /dev/null
+++ b/sci-mathematics/eclib/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <use>
+    <flag name="boost">
+      Add parallel capabilities using <pkg>dev-libs/boost</pkg>.
+    </flag>
+
+    <flag name="flint">
+      Enable the use of <pkg>sci-mathematics/flint</pkg> for certain
+      operations.
+    </flag>
+
+    <flag name="minimal">
+      Build only the "mwrank" program.
+    </flag>
+  </use>
+
+  <upstream>
+    <remote-id type="github">JohnCremona/eclib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-mathematics/factmsieve/Manifest b/sci-mathematics/factmsieve/Manifest
deleted file mode 100644
index 6665a440967b..000000000000
--- a/sci-mathematics/factmsieve/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX factmsieve-76.patch 1386 BLAKE2B 7d39ff2bd7cfeff73c484f1a4fe918e2087c73ef004265df2600e4b669bdb6a927be3d72894cf4c593c9f2caef1b7788deb2ac2a0fec1d8a6c059156a6d8329d SHA512 f2dcda3838b27d39e235875a9be7dfccf69618f73daf73d28f599a33fe428bec289f52329128179772f6fbcdaa8692df9763af75b701459f03698c768fed584f
-DIST factmsieve.76.zip 19563 BLAKE2B 466378c331f47fd302768b0902a1753e512bbebda0582916fb720045dea044873ea36849de11acc6016b6013aaa20634c84d8e987af3c6fa96358b54e47dc681 SHA512 b07b0676a635ff746b1edfaf064d27388df8f9c5c2fe1bd1e80d4c839c6e518e3a0b39a06b76f3d59c9fa3f4cc99df0831ba6309a2a7d2eb779b952a29996431
-EBUILD factmsieve-76-r1.ebuild 687 BLAKE2B 7f418cbc7c4bc52853196d1ca4a9bcad5d7e4b48d3fe82c2e0764ca69a37a9aa350e6ad4b967eead5e3367fd786c9fe769ea864c0a034746f4cd6df5eb60e989 SHA512 d79cf5f87602e5ca197bff1866c97a30d1538a64423483ab6331be57dba9c090cbcba07b8424623a10374e68586dcb7b1e6f4eefd23d987cc334f8e4bb47f3e4
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/sci-mathematics/factmsieve/factmsieve-76-r1.ebuild b/sci-mathematics/factmsieve/factmsieve-76-r1.ebuild
deleted file mode 100644
index b8e607498d38..000000000000
--- a/sci-mathematics/factmsieve/factmsieve-76-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Convenient factorization helper script using msieve and ggnfs"
-HOMEPAGE="http://gladman.plushost.co.uk/oldsite/computing/factoring.php"
-SRC_URI="http://gladman.plushost.co.uk/oldsite/computing/${PN}.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	sci-mathematics/msieve
-	sci-mathematics/ggnfs"
-DEPEND=""
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/${P}.patch" )
-
-src_install() {
-	python_fix_shebang ${PN}.py
-	dobin ${PN}.py
-}
diff --git a/sci-mathematics/factmsieve/files/factmsieve-76.patch b/sci-mathematics/factmsieve/files/factmsieve-76.patch
deleted file mode 100644
index eaf50efaecca..000000000000
--- a/sci-mathematics/factmsieve/files/factmsieve-76.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/factmsieve.py
-+++ b/factmsieve.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # factmsieve.py - A Python driver for GGNFS and MSIEVE
- #
- # Copyright (c) 2010, Brian Gladman
-@@ -56,9 +57,12 @@
- import time, subprocess, gzip, glob, math, tempfile, datetime
- import atexit, threading, collections, multiprocessing, platform
- 
-+# need to save pwd
-+CUR_DIR=os.path.realpath(os.curdir)
-+
- # Set binary directory paths
--GGNFS_PATH = '../../bin/x64/Release/'
--MSIEVE_PATH = '../../../msieve/build.vc10/x64/Release/'
-+GGNFS_PATH = '/usr/bin/'
-+MSIEVE_PATH = '/usr/bin/'
- 
- # Set the number of CPU cores and threads
- NUM_CORES = 4
-@@ -69,7 +73,7 @@
- # number of linear algebra threads to launch
- LA_THREADS = NUM_CORES * THREADS_PER_CORE
- 
--USE_CUDA = True
-+USE_CUDA = False
- GPU_NUM = 0
- MSIEVE_POLY_TIME_LIMIT = 0
- 
-@@ -103,8 +107,8 @@
- 
- # default parameter files
- 
--DEFAULT_PAR_FILE = GGNFS_PATH + 'def-par.txt'
--DEFAULT_POLSEL_PAR_FILE = GGNFS_PATH + 'def-nm-params.txt'
-+DEFAULT_PAR_FILE = '/usr/share/doc/ggnfs/def-par.txt'
-+DEFAULT_POLSEL_PAR_FILE = '/usr/share/doc/ggnfs/def-nm-params.txt'
- 
- # temporary files
- 
-@@ -258,7 +262,8 @@
- # write string to log(s):
- 
- def write_string_to_log(s):
--  with open(LOGNAME, 'a') as out_f:
-+  # XXX hax
-+  with open(CUR_DIR+'/'+LOGNAME, 'a') as out_f:
-     print(date_time_string() + s, file = out_f)
- 
- def output(s, console = True, log = True):
diff --git a/sci-mathematics/factmsieve/metadata.xml b/sci-mathematics/factmsieve/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/sci-mathematics/factmsieve/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index 9fb001dffb62..ca6b5f9212a5 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,6 +1,6 @@
 AUX 64fricas-gentoo.el 101 BLAKE2B 7d2499931132bd7bf32b528cbc6b09127af060b879ebea93421206f6f5fbe685b070624e507390902d7cfc7cd06a5988ca2df9959b2549736be912b731990c21 SHA512 be36ef5bfb525aa054cd3881ece83d47ee3a9cb7ef1b0c26215d449ddcad8f9f57045b29ab9063a62f43caa764abb251e5fcd04cf1d15bcc423e40d9e69239ef
 DIST fricas-1.3.4-full.tar.bz2 10381144 BLAKE2B caff50ef2b2d8e9ef76448c265316ac8878010c505f9d871aa5579210ab2de3915f56a44687d3f96aba1f857efc8b3ec182b9b6c5c390e38dbdaf7cdba188dcc SHA512 efee0d8a05979c806182e9e45f81b56037d1a660909971d6b94af1f97732cfb7b689709d8af4229b7f649506860b1ed915dd5afb91378f4c9d8a6e960a248170
 DIST fricas-1.3.5-full.tar.bz2 10477848 BLAKE2B 2431e6dacbe1fc9069baa4335876809ee334b677d3d1bd9ddfbb6c23f6bdaaf2307ec994956c736d9dbbe07915cb1e51a235ef58d6307bdd239dca1c19d65552 SHA512 b800a9b3793506e49a4c5a63bd12a20f00b183d00ed9bd0061865f6cea39b05c026975458dcb3bb7da652fb75b3ce6417bbe1c16312da08cd6a366428ae9eaf9
-EBUILD fricas-1.3.4.ebuild 2371 BLAKE2B 43f02e6bc5ba5ae728b4f207c15fbcab4147ec4f889e4f7f20d0383e7a6c2667fe77e69f6cd6864e2afd0bfccd4f375a38e02fc49175101fae8cafdd385b2b02 SHA512 5c3e9f6ad5dde530f6ced61868499332f4d5ba1a51e1629314bdc8829d2d3ecf71fa2a86c5901d42465c6917656e894a309ffb97f88609668fc7491afa8d1ad7
-EBUILD fricas-1.3.5.ebuild 2368 BLAKE2B 0b8f98bfc5de7608d448c4e2cd614da83ec4c95fc2c78984931738f062310994aab8b9c8704ba5bd451e116bf59e95c37bd412d86a4896bf800fa72de932b7f7 SHA512 5e69eca36f5d7feafe3d8861c9dbf5d78ef97fe96a3442372e58bb78dc11e99511c954d95ec2bc2392a6a27d9f5e79fcc6e4fc4b479d3f1309fc514c05ec7fe7
+EBUILD fricas-1.3.4.ebuild 2381 BLAKE2B d2c3443ec6a7c37a096b35e3626ddcea13a34031f2da6c5e76322c0c7d51b479a9c3be34e1e25c14c7ba2c46b6f316927685ef4bb81e1c50b43c3a2c33ce406b SHA512 16f8280000052a6197d93b1ef749217169ece60e19b286ade888c884f92a7454a58baeb3864aabff7b43584a4526d0121ca5ae9e2c549ab308c493ca67dfa5c1
+EBUILD fricas-1.3.5.ebuild 2381 BLAKE2B d2c3443ec6a7c37a096b35e3626ddcea13a34031f2da6c5e76322c0c7d51b479a9c3be34e1e25c14c7ba2c46b6f316927685ef4bb81e1c50b43c3a2c33ce406b SHA512 16f8280000052a6197d93b1ef749217169ece60e19b286ade888c884f92a7454a58baeb3864aabff7b43584a4526d0121ca5ae9e2c549ab308c493ca67dfa5c1
 MISC metadata.xml 1161 BLAKE2B 24d65236e4ad6534747f7295730f0e4a37e6c1a49faf1cef8ca2ed3a87459a21f77a3ff7d69b8487c86bac4cef4300607fac89faf57d3d99c8b6e86d9c7679e9 SHA512 c0555d42cc2d50498b1fa4bbf0fd658332f6ad79aaf0ab207ded28f7463401c901b67f53a1274794db2c0927806501493f99277f5325d52ccfacf5e522cfdfc5
diff --git a/sci-mathematics/fricas/fricas-1.3.4.ebuild b/sci-mathematics/fricas/fricas-1.3.4.ebuild
index b844cb78f7b6..2ed8ffb542ce 100644
--- a/sci-mathematics/fricas/fricas-1.3.4.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ COMS=(  .    lisp  .   ecl  .     ccl )
 
 IUSE="${LISPS[*]} X emacs gmp"
 RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gmp? ( dev-libs/gmp:= )"
 
 # Generating lisp deps
diff --git a/sci-mathematics/fricas/fricas-1.3.5.ebuild b/sci-mathematics/fricas/fricas-1.3.5.ebuild
index b9e209804b8d..2ed8ffb542ce 100644
--- a/sci-mathematics/fricas/fricas-1.3.5.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.5.ebuild
@@ -20,7 +20,7 @@ COMS=(  .    lisp  .   ecl  .     ccl )
 
 IUSE="${LISPS[*]} X emacs gmp"
 RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gmp? ( dev-libs/gmp:= )"
 
 # Generating lisp deps
diff --git a/sci-mathematics/geomview/Manifest b/sci-mathematics/geomview/Manifest
index 1d35f9cd575b..7c417ef9938c 100644
--- a/sci-mathematics/geomview/Manifest
+++ b/sci-mathematics/geomview/Manifest
@@ -3,5 +3,5 @@ AUX geomview-1.9.5-zlib.patch 1048 BLAKE2B e53d415fc75c25d4930241c92ae06ff6b857a
 AUX gvcl-mode.el 7416 BLAKE2B 764b13c0a68dc4c6091bd4b630d6d130d094600fa5a81ccca22ab2fdc34113fe953a74fde83fde050fed972c7e939ba46dc4151161736ca32879a765c7a9151f SHA512 b7f834cc5a3187e4a1fe5342a392d22576aee7f76f95493e02512e3055b1f5e349e170405e6b419c06816470167fc3a063f6f6dee934b35ed4f02f5a3e0a0812
 DIST geomview-1.9.5.tar.bz2 4532535 BLAKE2B 6be3f31050dd3954e88f224e818c6ff454fef9f7d716314ff0a4ca1bebad18726e55b238504d468a371edd72029bbb13795a2244e7a65815eaf1b78b2c167172 SHA512 a22bcd254e1e4c5c6797811f315d158f84fe82a3f95646bfdf3be203e9cd7fc8cacbf26f55a0a08bcb47cf2b2ad17ae4b48cdc4d78f810f48dab9fa1c7d56e7f
 DIST geomview.png.tar 10240 BLAKE2B ea1b81f69b77d93bdf4d4dff74e11cb6229d002f8c3c1ac1fbea23c443955e513302f0df0fe55d859309701c5dde6647f0fb9fb8d42b79329c16f1438f93d0a5 SHA512 3abdc04f04410a50876af6b0f1aefc6891c47926ca9e5a4a31bd001310972996497f4e6c33db059fdbca09b236b7763e5476d75427e653d54861b4b3a4e54f51
-EBUILD geomview-1.9.5-r1.ebuild 1468 BLAKE2B 494bba0bb8671edb1be2f9ac35993ba95294a24db5a580c6dfabc0a0154e6907c1b303a50080b039371ce0cc0241710bb67b32e619a94f176fb73f712e1bc1a3 SHA512 55b235a90a28d8061577ac022c4564148b6e8ee8568bc633bc51cdf45aa688c4f2206cccbddf75bb1c0ecbec497154001b56e45d43408280a696592015c9fc15
+EBUILD geomview-1.9.5-r1.ebuild 1478 BLAKE2B fbc24b9533938b440d6828c5e031484d854e211c2a828a8a5bd0136b95168db561be4c082d287ef0e5163ae930a8d439e4ae82013b929f8e9ee3bdf680f23d31 SHA512 9410e4cfe6d06ad54b5c895fa82a4ed8ccb8c32f624288b556acb43866a79bc772f57c2a486cfbf3472374857c0576dab6b25ad9bba15d7c5c656c42e3f7915b
 MISC metadata.xml 571 BLAKE2B 02ef7760d185b3c24d82102dae7510e4af721a3744274f0d9dfe6592bc5d09043a961f4134787673401e4609935b70e4f08678caed54d629575512b47cf1812d SHA512 80840d70575485e2e4358734df0468566ad42f7768273640291a646b4261ae51823f682ad0e6582954502fcc1c69622d473abee45275a4907f6b30fc91c94d48
diff --git a/sci-mathematics/geomview/geomview-1.9.5-r1.ebuild b/sci-mathematics/geomview/geomview-1.9.5-r1.ebuild
index 675a3515f014..0ffb2d155b8a 100644
--- a/sci-mathematics/geomview/geomview-1.9.5-r1.ebuild
+++ b/sci-mathematics/geomview/geomview-1.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="motionaveraging debug emacs zlib"
 DEPEND="x11-libs/motif:0
 	virtual/glu
 	virtual/opengl
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
 	x11-misc/xdg-utils"
diff --git a/sci-mathematics/gp2c/Manifest b/sci-mathematics/gp2c/Manifest
new file mode 100644
index 000000000000..7e648dc0134e
--- /dev/null
+++ b/sci-mathematics/gp2c/Manifest
@@ -0,0 +1,3 @@
+DIST gp2c-0.0.11pl2.tar.gz 851845 BLAKE2B 599469af3e9975270e6d9f88c1209ee3da9ae9ab9bfc90abf2431e00d553d427c15a509278b099a133262b6d02d6fa3f06090bd0083c46c9488e697dc5da5245 SHA512 20f7fc61480a70d3f8811d7881e0f386a1ced522b5c538443dc0a9fe3332d37a67ba68441eb512b5fefdb761e232f9316704fa456a311651161da7b4653ca4b7
+EBUILD gp2c-0.0.11.2-r1.ebuild 742 BLAKE2B 0e87bb9bd38c984c83226b9dc198a1af8a15ec607e6a366248429ea4403e3209681d37880ad799ddac196d81b8ee68c4648284bba52c1e78b8fc0d8551118caf SHA512 ad50c9ab4d0f125c1b031f60bed5b00d0cac62149a9ae551524e5f5e1b6b309f7d27995fd549a73ce91b94ef6bfefb01eaf28f5755c28f1d9b70eccb9500a51c
+MISC metadata.xml 886 BLAKE2B b4dfcb3e2de5064a3a537c6598814f7ec47a7db0a9bfefcc4cba78c373ed97d0ffa08fdd2ccbf049b28900c84afe8f594d7562fe35ad7c9a0ad59f2d63d9988d SHA512 71cf581ae9463fd7f4bb8eea880a940251571b076ec008d6ae2625c8158fb2562b8f4944e7092b05ba264b0bdb31ad31d4be2392ce8c1c82ff0452b513cf8ddc
diff --git a/sci-mathematics/gp2c/gp2c-0.0.11.2-r1.ebuild b/sci-mathematics/gp2c/gp2c-0.0.11.2-r1.ebuild
new file mode 100644
index 000000000000..51d76b1c279a
--- /dev/null
+++ b/sci-mathematics/gp2c/gp2c-0.0.11.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-"$(ver_rs  3 'pl')
+DESCRIPTION="A GP to C translator"
+HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Perl is run on the build host to compile the descriptions in desc/,
+# see for example desc/Makefile.am.
+BDEPEND="dev-lang/perl"
+
+# This is the first version of pari to put pari.cfg where we expect it.
+DEPEND=">=sci-mathematics/pari-2.11.2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure(){
+	econf --with-paricfg="${EPREFIX}/usr/share/pari/pari.cfg"
+}
diff --git a/sci-mathematics/gp2c/metadata.xml b/sci-mathematics/gp2c/metadata.xml
new file mode 100644
index 000000000000..41fcade95d92
--- /dev/null
+++ b/sci-mathematics/gp2c/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+    The gp2c compiler is a package for translating GP routines into the C
+    programming language, so that they can be compiled and used with the PARI
+    system or the GP calculator.
+  </longdescription>
+</pkgmetadata>
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index 9ede4d84395f..8f4571517d2c 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -2,6 +2,6 @@ AUX 50gretl-gentoo.el 473 BLAKE2B 4c855e4b79629828ba9f3c187550c64d26b93b6547ed85
 AUX gretl-1.9.14-readline.patch 390 BLAKE2B 2133a732fb9584a4e6be8353a6e30220ab9b0df89bee9d707eddd0b7e2d833476b6c71940853f6e1d07820ba9ea65b1d7fc72a4d43c2eedf73bdb3538dbac486 SHA512 e67dc762b90fa9dee505155452008667916724e669216da09816a2236b863d9798e091237bbb722aea91e42c6ce1fe50deff33cc4148a7b403c1a455f4c74177
 DIST gretl-1.9.14.tar.xz 7564192 BLAKE2B 45af589e18d44f6d9e3e5d27050fe07cb0d7241bc2d40a8ef0b5eeed40839812ea6775001712f7b176c902d968e58c0c6763a9e342ce6063a3773626f04d3f8f SHA512 61ff44cc52f3da971d3cf2cc6e52e0401280521fd761ea098f753acc529c9d35a12fc296b46136d5d257c9a29a83f91a78a77822a00ce3f65776a17f97223ee1
 DIST gretl-1.9.90.tar.xz 7764820 BLAKE2B 1a47c31a62aad662ed3cfb4ad2057000eef14daf1f8cac4125f511f0229e29c1a7f43bc2e6014ec5b971173d9698e842c13e36b0f12faaa2f4fa996e26d984cb SHA512 35ec45fb2ad2dec490567411c1a5d909dc7fc8f0c4a6ca142e6e92b2d95a9efc9581f154a7806cf3f5178b530cdca9508b7c215bca29e1bcaebfa874d476667a
-EBUILD gretl-1.9.14.ebuild 2564 BLAKE2B 70b31e229ea17d55a2aaf5921e6c8196672ad486e701c6f251032c81f6890ea75998c4d6aeaba15041f521515a96bad67f82ca8c88c49f16f4b7732bad3736d7 SHA512 8d582245edbf018e413015a8e6775dffbcb6bf7a7fda2562fd5765e4b3146e4b43156ced5b8bd484d1bb7d643caee06e5e51d502c5fb15d68359a0210842c8a9
-EBUILD gretl-1.9.90.ebuild 2700 BLAKE2B e23ff038a19d59580953c5416c5c734337e149d6f2870cd500b47269840ff9ef6895851b107d5e9d1cfc096eee02712d22733a251398bffede664e00d330739c SHA512 fe5c407c2b6259fc0921f012b7a19f48a5068482f2dede71ab11eff05f2344cec5a14be582d65aa0644a21d124f5be047201e2364194924dac68e339f181fb66
+EBUILD gretl-1.9.14.ebuild 2574 BLAKE2B 13bf84653593a70bb016ae7bed061b5edd5cddd32e2a5070e1cdaa87dc6401323e2cdbd1b330b65653a862a0f4426ce0fbc3539d673f195c12cfc05573a4474b SHA512 f4af7eee20003d246a2a19a2192cf605d54ae603fa92916f92ef0a7f3f92718080134b7ff50ba9e5cc4fc87e599ff29dc40394844fe973d046f1ff0475a34eae
+EBUILD gretl-1.9.90.ebuild 2710 BLAKE2B a976524c5217aa442f0edecff26a947386ef807397bb9350f1f11ce9764559dc15ee963d711718709dc9c7f7484c3be961a40fb7d7d36556a91fa281df259f53 SHA512 7233cd31b2c03f9779774db1057ca4ff5206c524815794ea85365f1d918fd45cdcbd6b5b310258d04e0632a2051572949728a227b37f20748287a5466e4d8dfe
 MISC metadata.xml 1122 BLAKE2B d9d243f2c1ff81869186aa07ad9ced3d6f8e90f0e5747ac745ff3e17c848ddb04281fc01bd6cdbcc756150db6ad28f1c69a4ce1b53f950e8b4d46fb8b9e4f457 SHA512 d5f169c5b22c7991efb2080425f682d51b9c5acd472d3f3155f64a45044c1a9a449ca5d34be9f792d7ce62be41584926c35896ffaf82c07fd6aeca17d0da423d
diff --git a/sci-mathematics/gretl/gretl-1.9.14.ebuild b/sci-mathematics/gretl/gretl-1.9.14.ebuild
index 3d18e40578d0..633e488873cc 100644
--- a/sci-mathematics/gretl/gretl-1.9.14.ebuild
+++ b/sci-mathematics/gretl/gretl-1.9.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ CDEPEND="
 	virtual/lapack
 	virtual/latex-base
 	accessibility? ( app-accessibility/flite )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gtk? (
 			media-libs/gd[png]
 			sci-visualization/gnuplot[gd]
diff --git a/sci-mathematics/gretl/gretl-1.9.90.ebuild b/sci-mathematics/gretl/gretl-1.9.90.ebuild
index a376ae9b64c8..b59ae725d308 100644
--- a/sci-mathematics/gretl/gretl-1.9.90.ebuild
+++ b/sci-mathematics/gretl/gretl-1.9.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,7 +28,7 @@ CDEPEND="
 	virtual/latex-base
 	accessibility? ( app-accessibility/flite:= )
 	curl? ( net-misc/curl:0= )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gtk? (
 			media-libs/gd:2=[png]
 			sci-visualization/gnuplot[gd]
diff --git a/sci-mathematics/lrcalc/Manifest b/sci-mathematics/lrcalc/Manifest
new file mode 100644
index 000000000000..91b9a29857bc
--- /dev/null
+++ b/sci-mathematics/lrcalc/Manifest
@@ -0,0 +1,4 @@
+AUX lrcalc-1.2-includes.patch 1939 BLAKE2B 37dc25d9219899cf9cd6268038715b927af294135f1acbebf5651fdfdcb50f7b041e53464c36f572201be411941d889b5ef7c1a20e31eda9915339ec378faf0b SHA512 d5ad549ddf23609870f6b15e389323bf26ea2c981c4af28c93dae7f70b4f7c96e242011213acb7c138ba9acc0ce0bc0c41d51d3fccf4cc5de331a12d965a46a6
+DIST lrcalc-1.2.tar.gz 363120 BLAKE2B d3f652abfe38e81331dcbac7068d087b198445bf02dc5ccb5bcbd76b9bbc329687209e6ccf40ecd09f166e7d2da054edd0e5c2b18503d8e4d961ae4ad91b5152 SHA512 699f4c2ddabe5879542d5c11f3df3979a4e009ad37741711a70fb48b4a0d4a7969e5bb110adb63d4473f3c2b61d1efdb7228a6b74c5dd7e1b5aea8cf1d170fab
+EBUILD lrcalc-1.2.ebuild 603 BLAKE2B 0e1121947537a15a4577228087eb5b91275afa58446ecb44a3aa37cc045a4e1d827f8aed3015803a9bb7f47e336e221030a272dc1c9585e35671fd9562562eea SHA512 06011d08163b707f3ac5d472fa58d713d97180542d0ab76683fc791d0f2774b4c9d559a2b909f16545886e5864a52d63bd6597a9e070b42fd576e5278e95201e
+MISC metadata.xml 834 BLAKE2B d230c80d9552789e93a2f2cc9e1a8eac968d4762ceeba6103f92676cb709d45bf39b2b6820e889d11ad30c60493aec84076d8ee3f5f038640038655f3e2c5a07 SHA512 f54cc63235625646117f0d569fb69c3b3b66b5508fb65a65a3fb92811ff44f72df7546d44728f5882d2db9b70520036ccfda05cb58d9cf9dd3164132dbebbc57
diff --git a/sci-mathematics/lrcalc/files/lrcalc-1.2-includes.patch b/sci-mathematics/lrcalc/files/lrcalc-1.2-includes.patch
new file mode 100644
index 000000000000..707da176a60f
--- /dev/null
+++ b/sci-mathematics/lrcalc/files/lrcalc-1.2-includes.patch
@@ -0,0 +1,90 @@
+From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001
+From: Anders Skovsted Buch <asbuch@math.rutgers.edu>
+Date: Sun, 29 Nov 2015 16:25:56 -0500
+Subject: [PATCH] Patch by Jeroen Demeyer to change include <vector.h> to
+ "vector.h", plus similar cases.
+
+---
+ src/lrcalc.c   | 2 +-
+ src/maple.c    | 4 ++--
+ src/schublib.h | 2 +-
+ src/symfcn.c   | 6 +++---
+ src/symfcn.h   | 4 ++--
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/lrcalc.c b/src/lrcalc.c
+index aff3f75..60df49e 100644
+--- a/src/lrcalc.c
++++ b/src/lrcalc.c
+@@ -8,7 +8,7 @@
+ #include <stdlib.h>
+ extern char *optarg;
+ 
+-#include <vectarg.h>
++#include "vectarg.h"
+ 
+ #include "symfcn.h"
+ #include "maple.h"
+diff --git a/src/maple.c b/src/maple.c
+index fdc0768..a5f4d14 100644
+--- a/src/maple.c
++++ b/src/maple.c
+@@ -4,8 +4,8 @@
+  */
+ 
+ #include <stdio.h>
+-#include <vector.h>
+-#include <hashtab.h>
++#include "vector.h"
++#include "hashtab.h"
+ #include "maple.h"
+ 
+ 
+diff --git a/src/schublib.h b/src/schublib.h
+index a8e8511..864850c 100644
+--- a/src/schublib.h
++++ b/src/schublib.h
+@@ -1,7 +1,7 @@
+ #ifndef _SCHUBLIB_H
+ #define _SCHUBLIB_H
+ 
+-#include <hashtab.h>
++#include "hashtab.h"
+ 
+ hashtab *trans(vector *w, int vars, hashtab *res);
+ hashtab *monk(int i, hashtab *slc, int rank);
+diff --git a/src/symfcn.c b/src/symfcn.c
+index 4ffbe4b..fd5df5d 100644
+--- a/src/symfcn.c
++++ b/src/symfcn.c
+@@ -5,9 +5,9 @@
+ 
+ #include <stdio.h>
+ 
+-#include <alloc.h>
+-#include <vector.h>
+-#include <hashtab.h>
++#include "alloc.h"
++#include "vector.h"
++#include "hashtab.h"
+ 
+ #include "symfcn.h"
+ 
+diff --git a/src/symfcn.h b/src/symfcn.h
+index b8543b1..29bb00d 100644
+--- a/src/symfcn.h
++++ b/src/symfcn.h
+@@ -1,8 +1,8 @@
+ #ifndef _SYMFCN_H
+ #define _SYMFCN_H
+ 
+-#include <hashtab.h>
+-#include <vector.h>
++#include "hashtab.h"
++#include "vector.h"
+ 
+ int part_itr_sz(vector *part);
+ int part_itr_sub(vector *part, vector *outer);
+-- 
+2.1.1.1.g1fb337f
+
diff --git a/sci-mathematics/lrcalc/lrcalc-1.2.ebuild b/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
new file mode 100644
index 000000000000..9039de904cd1
--- /dev/null
+++ b/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Littlewood-Richardson Calculator"
+HOMEPAGE="https://sites.math.rutgers.edu/~asbuch/lrcalc/"
+SRC_URI="https://sites.math.rutgers.edu/~asbuch/lrcalc/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2-includes.patch" )
+
+src_configure(){
+	econf $(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/lrcalc/metadata.xml b/sci-mathematics/lrcalc/metadata.xml
new file mode 100644
index 000000000000..c070753f1162
--- /dev/null
+++ b/sci-mathematics/lrcalc/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+    The "Littlewood-Richardson Calculator" is a package of C and Maple
+    programs for computing Littlewood-Richardson coefficients
+  </longdescription>
+</pkgmetadata>
diff --git a/sci-mathematics/lybniz/Manifest b/sci-mathematics/lybniz/Manifest
deleted file mode 100644
index 720815491dd8..000000000000
--- a/sci-mathematics/lybniz/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lybniz-1.3.2.tar.gz 70328 BLAKE2B 68c1f7f1c1bc64d8a11f74dc5e87a60e11d261028c495d91c69e9498e5a4e493f3c00c06163a2f55810855ab25fc61c082591a6f39b63b3e8c22d006ad2e34de SHA512 e4a8e92b467657b70a5137ea883a101f8335e2da10ce6a3d69b647cb4968be7c617d64fcc1572ea9e5bf49177282dc648844f4bf763cde00c25081118bf1e79e
-EBUILD lybniz-1.3.2-r1.ebuild 558 BLAKE2B 5516ce691e4eb9e4ca260d69a91d152c794e7eb7657f3fdd6910f7a681c1bfa63747c0a49bccc9ee1a683cfe6b680f85a18229d40cf437716a35df722189dd91 SHA512 e12397cc9283c4826b9175ff5d851fa389ccb06afddcee82f19f08c280537bf56c4550c274811ac6397577334a708dff521810f2b675a91a74719d2aa73e9138
-MISC metadata.xml 483 BLAKE2B c578bcb422549e5f59f3f58f89814e31abe01ee8d35c07dc5aa8226db4b700635da8312c7f100f330604fb8743270548866e054cfbd0250e3cdde292cc5dc2cf SHA512 6ca80d3944b1ee257bfb7c49b9b35d8abd91c54dd6fe34fc1b481d57335dc15b20135d803288603a5095a4bc817374e7120fbe02c87b9e71249d18b24106a19f
diff --git a/sci-mathematics/lybniz/lybniz-1.3.2-r1.ebuild b/sci-mathematics/lybniz/lybniz-1.3.2-r1.ebuild
deleted file mode 100644
index 3993079f7da7..000000000000
--- a/sci-mathematics/lybniz/lybniz-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A function plotter program written in PyGTK"
-HOMEPAGE="http://lybniz2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lybniz2/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e 's/Education;/Education;Math;/' \
-		${PN}.desktop || die
-
-	distutils-r1_src_prepare
-}
diff --git a/sci-mathematics/lybniz/metadata.xml b/sci-mathematics/lybniz/metadata.xml
deleted file mode 100644
index d82130d3e06a..000000000000
--- a/sci-mathematics/lybniz/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Lybniz is an easy to use mathematical function graph plotter using
-  PyGTK.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">lybniz2</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/mathomatic/Manifest b/sci-mathematics/mathomatic/Manifest
index 1dddabbab412..7ad05f8a8499 100644
--- a/sci-mathematics/mathomatic/Manifest
+++ b/sci-mathematics/mathomatic/Manifest
@@ -1,5 +1,5 @@
 DIST mathomatic-15.8.5.tar.bz2 270607 BLAKE2B dc8d39a53e8d8a2e252a7cecbf235d391cda282e7ed59c1c4b341ec4d8cab144098f4cee043946d4fcc230f92683276251aac4fd33d78ee7170fad191a03e644 SHA512 9d8b5fcc369d99b890fde06729daa6c86f1a400d5e42d5fd5d74525b9f4a7c28dea5a05882e753b44590e4624ec7399367a637019867ea85fe68e9e0ed3a3e6e
 DIST mathomatic-16.0.5.tar.gz 381466 BLAKE2B 31dde337646d39faad3bcda6b72e316de4febfaf8c825320c70d69fdd55bb377948ec9e8b5ad855dc0a5b9be0f50b19387a595dfee7299e71fbf19c4f2bae979 SHA512 0d98cf7ad707d6536731c98dd253f4cce30243e9eefe9912b8fec3ad4ac4261e324b93b4f0113789ce17fd0b2e3d75f7b258be7905d8e3c7bb4b756627b75950
-EBUILD mathomatic-15.8.5.ebuild 963 BLAKE2B d79e97bd4b6b32c73abdbf3e42e1c179b2a716c7785fbf2324587e85755c89e95efa3ff1ecbef7cd15ee8ae70c82f1bb465177e6f0369fbf94356eca16da7ff8 SHA512 64bc75e1f6ffefa26de6e1a91e6e9eecfe4865e89aab000fc2471aa05ccafdaee597166f343cf612c35be4c7071b750ab4e8bae08a4b4ea61d2b0c0051042a13
+EBUILD mathomatic-15.8.5.ebuild 977 BLAKE2B 8edbd6b6b3bdb2c0c285e978236cbb88e0dec32ab90287c1d46477d6de34103ee4acb3361e2e6db1c431c7134d8b5235604c4f360bea20479fbc6ea1aa22566f SHA512 b50f95713603d96320e86bbc814507ae0df5c87318bbe1a951b70be430bfb994292bcb015f995d55ab1e70e428b48a64cd7c30ea92e44d71b30efc08efb412f6
 EBUILD mathomatic-16.0.5.ebuild 1073 BLAKE2B 57be681320b29095cb4efc38a90b08c5af36af9b8c9a61fb87716f94c52925a444b4da2f6630efd8db8e27cce05151d28ff3fa72a5c4756c9e681e6ac5a905f0 SHA512 46ef23162020da08fd21f7fb675177def8051a642d7b1fba4593ec2cdd76a08a45f44b779c5ff65978578092ecde1494c04986b1a6a8fcf6fe291c70097995a5
 MISC metadata.xml 619 BLAKE2B f90c38439f4c52ec00af4c068b4088863b2f41481dbbe9f995681001ef0b64d37c1e2093bce6033e98cd4792d8dedddbc078b8b5b0cb25bbb96d07fb2690bf31 SHA512 8d5d1fd1e392f8eb3d7cf4551cbb5f2501c4885ae487c8a59555bb625d809d9c1e9ad4a131003d1af56be7d30258f24138a7554fa9848afc4cd58f89535ca7f0
diff --git a/sci-mathematics/mathomatic/mathomatic-15.8.5.ebuild b/sci-mathematics/mathomatic/mathomatic-15.8.5.ebuild
index eab05cc8391f..1c10050e1898 100644
--- a/sci-mathematics/mathomatic/mathomatic-15.8.5.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-15.8.5.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Automatic algebraic manipulator"
 HOMEPAGE="http://www.mathomatic.org/"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.bz2"
+SRC_URI="http://www.mathomatic.org/archive/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index e35073726567..814826cfa6e5 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -15,9 +15,10 @@ AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64d
 DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
 DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
 DIST maxima-5.42.2.tar.gz 41840181 BLAKE2B bca8a94366f1fe2f508436fdef8de80107b19c9b267a4b72dc6f56870078d35b3feb7dbdda384589b38c5351d6eeede1b9738a5ec2152063de2afacd1ced48c4 SHA512 5033b02272121f6aacff5ededf90eaad5e644a06d0c62aafd745401c08429da979ecd8274f7aa12596a0e32ddb614659af14e4273f59d372fe1ecbec081e7829
+DIST maxima-5.43.0-missing-texi-file.tar.gz 6713 BLAKE2B 4e2c8c7a2ec9007c47cbb45272eb00f930c0014e0a70e52418124bd06731668d47dd76a854c395ccfa2ef00f87e60d8a5811d9237653126680ecfa2d3013e9ec SHA512 e09f983e2eb76adbf8b237c2b2909ff643bd562e16c28f50096509470cd3c9e72d69d39d4ac35315698d20937489c28883604e24302c4424222b51ecc20e438d
 DIST maxima-5.43.0.tar.gz 34605709 BLAKE2B db9db75b7eff0454d4b9595120d726969b4e8b651f611ac69dcd92c4496bf9530ce76867348fd87a33444eef3abb7d123ef2726a7b96ebde9e43f231b21a2b8c SHA512 6611eda4bf81bc5454bf6dd641c73a470cc07b2f768d9550b3abeb7b68f1b4675fd5eca766c52844438e9247d8035be537c7120c9f49cdaed9f918d49ed16659
-EBUILD maxima-5.38.1.ebuild 4823 BLAKE2B e2f4aa9b01a251b0ff0250df56a9b9cb904ea1d859ff32414fc38f48d9cd772ebe5bab5dbe02fdfe87f6c70c848ad9b2b0b724a8dcbd8aecf459d492cbfa6132 SHA512 88dfd3edcef7450247c1c62b1c9c8759a8816ff6ba6691074088253d5ae3922afa828b21e543978617cc022701a2dfc82e2d2436c21430da1249949393cf6e12
-EBUILD maxima-5.42.1.ebuild 4904 BLAKE2B 9e3ebeec6da72caab22651f9e2421d36b7eed178a3aa86d07e7cdc62cba8af5a762ff6394a002138a83f03e313c3c0c80a9f2bf3343a1cb85b3a2182ffae8332 SHA512 0d6ce53ea40e4d34de1958a9e9739ff95179b424ac816b108c30f711784d5c1aed240a16c1b7c26f16b95a4b468c6113b79e434fc4a823dbf60697eff986f54e
-EBUILD maxima-5.42.2.ebuild 4907 BLAKE2B e01606981d1a4bb47d35ba0eece7ed52397cda03a913c1c9d198346db458fd6906d33cde56ac29881c864ac4c7fc14e93d111544005b1a20bfe0836eb0a5822b SHA512 afdc36255024bb493e1b119cda07cf37a9aa871c6b49af412121e45e12be2e510211ea8ad828dda76686d6cf2df435c8eccca7e264297f0abac8138b72d8a56f
-EBUILD maxima-5.43.0.ebuild 4986 BLAKE2B d21e48f2723187ff89309c360d82f08be6954d75a3dec63b13506cc6576c5950d9a6ab39a85e07dd67e69f4df5e12e152c4f824359a642deba62b1397b8303c3 SHA512 17b3b9ec3bf62cd236cf00c92d042e20c2e1e0787464d5136961a8c7fe66d196b1e44092fab7c03df2a3213bb15b9916762e0057668c3d127945b67cbad3dd76
+EBUILD maxima-5.38.1.ebuild 4833 BLAKE2B 2c5ebe02be239596fbc93f30c9e135eac32f50a968283a18584d05c3739136d5f0bd1bcb4ce6e810016bb0d66f1e46139e7d208cc381a704a027bc3c99ace3b8 SHA512 cb3273aaaae70bff0b29ed8c9eee4e4aba0fe7b49cdf3249f478c4016be8ea2610adbb15490b1852f11c9f51beaf7bd5d62eb9ff9c53f9c4a541c7af52dbea93
+EBUILD maxima-5.42.1.ebuild 4917 BLAKE2B a8d765381cd94518b530811e67ca3c47899af78db8e0ac524c490619885944189fecff035b6f7dfcdd3fb5abdd94c40b62a8b97e1819544fbbc7120ea1bf075f SHA512 ad0e0c1d56cab25e2b3c0f494b2746c1dc7e670e02e6f002bf4a4e6728daefd7c975142cd22741347c11ea4e8c2262780c3e88f9adb86fdbe135031ca3a28759
+EBUILD maxima-5.42.2.ebuild 4920 BLAKE2B 200ad44b31fd224c37c302aa4dcfb6b46a83d7cf462d1aaaaf933f91d753d8375914ad0b6f254f3c8f4eae4f89b0bbdf1885c3e943cbe8587ccfb93999a4204f SHA512 6fdbedf61012c414dad5e9d2dbf6e705967d43dfced240a4378dd523aba99e51082cd4bce283c683192f780854a1f694461ef4600b49415ef33503a8f1d03c2e
+EBUILD maxima-5.43.0.ebuild 5139 BLAKE2B 37ed211a5f1b7ea79d41a481437147f3888639a8c7aed1d5df7d083f3ea5ed8ee2b2368239d0456b4d9f2b63920201a02a11735530296b60bcb3e2d7bcf86fe2 SHA512 3d0e7204d55e0f93a68be876d72ca8431d209655d06eec48735bff1003774eb8ad63e2e1cb74c2532f7e288ebabc613234ed5d8c5043563922b51dc4825c7f47
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/maxima-5.38.1.ebuild b/sci-mathematics/maxima/maxima-5.38.1.ebuild
index 66c232a18d7a..a97ec7dee443 100644
--- a/sci-mathematics/maxima/maxima-5.38.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.38.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="!app-emacs/imaxima
 	X? ( x11-misc/xdg-utils
 		 sci-visualization/gnuplot[gd]
 		 tk? ( dev-lang/tk:0 ) )
-	emacs? ( virtual/emacs
+	emacs? ( >=app-editors/emacs-23.1:*
 		virtual/latex-base
 		app-emacs/auctex
 		app-text/ghostscript-gpl
diff --git a/sci-mathematics/maxima/maxima-5.42.1.ebuild b/sci-mathematics/maxima/maxima-5.42.1.ebuild
index 07c6bbdadd57..215a11d12fe9 100644
--- a/sci-mathematics/maxima/maxima-5.42.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.42.1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="!app-emacs/imaxima
 	X? ( x11-misc/xdg-utils
 		 sci-visualization/gnuplot[gd]
 		 tk? ( dev-lang/tk:0 ) )
-	emacs? ( virtual/emacs
+	emacs? ( >=app-editors/emacs-23.1:*
 		virtual/latex-base
 		app-emacs/auctex
 		app-text/ghostscript-gpl
diff --git a/sci-mathematics/maxima/maxima-5.42.2.ebuild b/sci-mathematics/maxima/maxima-5.42.2.ebuild
index f55566f65046..17150f7e4e35 100644
--- a/sci-mathematics/maxima/maxima-5.42.2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.42.2.ebuild
@@ -35,7 +35,7 @@ RDEPEND="!app-emacs/imaxima
 	X? ( x11-misc/xdg-utils
 		 sci-visualization/gnuplot[gd]
 		 tk? ( dev-lang/tk:0 ) )
-	emacs? ( virtual/emacs
+	emacs? ( >=app-editors/emacs-23.1:*
 		virtual/latex-base
 		app-emacs/auctex
 		app-text/ghostscript-gpl
diff --git a/sci-mathematics/maxima/maxima-5.43.0.ebuild b/sci-mathematics/maxima/maxima-5.43.0.ebuild
index 177564b4b5f1..ab449ae5f1e8 100644
--- a/sci-mathematics/maxima/maxima-5.43.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.43.0.ebuild
@@ -7,7 +7,9 @@ inherit autotools elisp-common eutils xdg-utils
 
 DESCRIPTION="Free computer algebra environment based on Macsyma"
 HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+# the 5.43.0 tarball misses doc/info/de/include-maxima.de.texi #687244
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${P}-missing-texi-file.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
@@ -36,7 +38,7 @@ RDEPEND="!app-emacs/imaxima
 	X? ( x11-misc/xdg-utils
 		 sci-visualization/gnuplot[gd]
 		 tk? ( dev-lang/tk:0 ) )
-	emacs? ( virtual/emacs
+	emacs? ( >=app-editors/emacs-23.1:*
 		virtual/latex-base
 		app-emacs/auctex
 		app-text/ghostscript-gpl
diff --git a/sci-mathematics/mlpy/Manifest b/sci-mathematics/mlpy/Manifest
deleted file mode 100644
index e8a88f607ebd..000000000000
--- a/sci-mathematics/mlpy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mlpy-3.5.0.tar.gz 1961206 BLAKE2B 11c72a660af7c8c0498884c2745e069f5752e49e4571bb1e103c3588bab99eda5da593ad50812b07f0cd320791677960da5b2e139551b7fe80770c11ecfc06e5 SHA512 b6b3cf6e1d47fe58d68da81752ce9324e78a97c9fc341c93db7b2ea0c5d1730fae9535b69671fda13cb012ab0173951768c1601f2b4ad678a6065c018b34eb0f
-EBUILD mlpy-3.5.0.ebuild 760 BLAKE2B 85e64ee3041f17317c715d29eb6fdd4d7ed4201bd6e4f60d4c9603728fc469dc2d915243b7a7e5a2ffb445c6f0305026d2dbf6366d883e42fc86c37f3845f111 SHA512 7c64b4d3e899a1fae30c71a14968d7593584d78b0d3241b3a58aaff1b2ec280d998c1600e6ab0e2a7bf95d2915215a2e7028f46cbfd1a1393975ea17f15db057
-MISC metadata.xml 636 BLAKE2B f691ff356b459cac337eac518f404302a97e22c2094dda399684545dd8de61c65c1c6696239dc18c8309efe9b71488d3a1a3f9b809670dacff015a19ca554974 SHA512 19452defd96c62d603f0f99cc2fb1359159c91ed7489e2f7d0e7b4d4e290dc9f74d3124b1cf75fa631bd0536df5fb39023efa534c3f6ea4de3e340363d7d8bfa
diff --git a/sci-mathematics/mlpy/metadata.xml b/sci-mathematics/mlpy/metadata.xml
deleted file mode 100644
index a878c2ab46ae..000000000000
--- a/sci-mathematics/mlpy/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  mlpy provides a wide range of state-of-the-art machine learning
-  methods for supervised and unsupervised problems and it is aimed at
-  finding a reasonable compromise among modularity, maintainability,
-  reproducibility, usability and efficiency.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">mlpy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/mlpy/mlpy-3.5.0.ebuild b/sci-mathematics/mlpy/mlpy-3.5.0.ebuild
deleted file mode 100644
index c25423df83a5..000000000000
--- a/sci-mathematics/mlpy/mlpy-3.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="High-performance Python library for predictive modeling"
-HOMEPAGE="https://mlpy.fbk.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	>=sci-libs/gsl-1.11
-	>=dev-python/numpy-1.3[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		pushd docs 2>/dev/null || die
-		emake html
-		dohtml -r build/html/*
-		popd 2>/dev/null || die
-	fi
-}
diff --git a/sci-mathematics/nusmv/Manifest b/sci-mathematics/nusmv/Manifest
deleted file mode 100644
index 930a7e89e443..000000000000
--- a/sci-mathematics/nusmv/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST NuSMV-2.6.0.tar.gz 4223312 BLAKE2B 8915a3d0488a3d1d2910db7b7ad789131657c9e8f5562663333ed7b306424ded1985ffaf00b89d0edc693472c3e51003e54e6e71b853f3b28a81a5b3ae88d440 SHA512 3749e0267c2adffaa5f2f98ee925f5a774e3132277a02c549b3f4b836f8b090a44d6a14730b58251d7bb88055eb55e89f0eab7fea8714cb2f0786afd803efd0e
-DIST zchaff.64bit.2007.3.12.zip 63139 BLAKE2B d843b029f51ae2437fafb306e6e8029bc484a061d99439d1e4a195831487238753360d1ec159edefc81c1d9565e2587ca492ddb4b5b90d3025e015d3202dde8b SHA512 075d0bceede6643a880763943cba9a2fa0f6c58c47b86c0a2bbbe86a2e3925dc5b3859800d1cab0c558d727635556beb77f9efbd0f2837a768ef8d513dc2b300
-EBUILD nusmv-2.6.0.ebuild 2385 BLAKE2B f362f4ec5dee01c5a6cd04b234bb9b71a99de70c6c06277e270479cfab9c2c63ec7b8f5bf00bb8e38c32f66747262506baa0be3bc31f464399723d2363530cd5 SHA512 147954f8d9be7beb81e63674618048c8c7dbfb9bfc27ded69450144974686a9762cee0b3227caed1b0bcf81045778d3c9ed9114c9c7334382e51a6f11eb193d6
-MISC metadata.xml 475 BLAKE2B c8f7c1d0bec9d2c4150257b8054ce8d8d4d68f092eebaa60ca91354a8d3710c5cb91081fbf25074d23a7c5c5d88770a059c7218aaf47b43652fc8b356ca95a5d SHA512 77ced108c3ec2595b851e8be0fe2103087699ff5c222e2c95f09378da82b0f4340e28314e1d763a154d24edeadf42d7e62e521d5b19a201be18748513eab0b2b
diff --git a/sci-mathematics/nusmv/metadata.xml b/sci-mathematics/nusmv/metadata.xml
deleted file mode 100644
index 314da184fb2b..000000000000
--- a/sci-mathematics/nusmv/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<use>
-		<flag name="minisat">Enable support for MiniSat</flag>
-		<flag name="zchaff">Enable support for zChaff</flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-mathematics/nusmv/nusmv-2.6.0.ebuild b/sci-mathematics/nusmv/nusmv-2.6.0.ebuild
deleted file mode 100644
index 0163a1103bdb..000000000000
--- a/sci-mathematics/nusmv/nusmv-2.6.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1 toolchain-funcs
-
-MY_P="NuSMV-${PV}"
-NUSMV_A="${MY_P}.tar.gz"
-ZCHAFF_A="zchaff.64bit.2007.3.12.zip"
-
-DESCRIPTION="NuSMV: new symbolic model checker"
-HOMEPAGE="http://nusmv.fbk.eu/"
-SRC_URI="http://nusmv.fbk.eu/distrib/${NUSMV_A}
-		zchaff? ( http://www.princeton.edu/~chaff/zchaff/${ZCHAFF_A} )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minisat doc zchaff"
-REQUIRED_USE="|| ( minisat zchaff )"
-
-SHARED_DEPEND="minisat? ( >=sci-mathematics/minisat-2.2.0_p20130925 )"
-RDEPEND="${SHARED_DEPEND}
-	dev-libs/expat"
-DEPEND="${SHARED_DEPEND}
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-doc/doxygen
-	)
-	app-arch/unzip
-	dev-libs/libxml2
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}/NuSMV"
-
-src_unpack() {
-	unpack "${NUSMV_A}"
-	if use zchaff; then
-		cp "${DISTDIR}/${ZCHAFF_A}" "${WORKDIR}/${MY_P}/zChaff" || die
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's/-mcpu=[^\s]*//' "${WORKDIR}/${MY_P}/cudd-2.4.1.1"/Makefile || die
-	# Prevent automatic build of minisat - we are using the ebuild from portage
-	sed -i -e 's/    add_subdirectory(${MINISAT_SOURCE_DIR} ${MINISAT_BUILD_DIR})//' \
-		-e 's/MINISAT_LIB/MiniSat/' CMakeLists.txt || die
-	sed -i -e 's/DEPENDS MINISAT_BUILD//' code/nusmv/core/sat/solvers/CMakeLists.txt || die
-	# Change the "prog-man/html" rule to optional
-	sed -i -e '/\s*install( .*html /s:${PROJECT_BINARY_DIR}:share/nusmv/doc OPTIONAL:' doc/prog-man/CMakeLists.txt || die
-	# Change the doc destination
-	sed -i -e "s:share/nusmv/doc:share/doc/${PF}:" doc/{tutorial,user-man,prog-man}/CMakeLists.txt || die
-
-	# Correction for proper parallel compilation
-#	sed -i -e 's/COMMAND ${MAKE}/COMMAND $(MAKE)/' "${WORKDIR}/${MY_P}/"{zchaff,MiniSat}/CMakeLists.txt || die
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MINISAT=$(usex minisat)
-		-DENABLE_ZCHAFF=$(usex zchaff)
-		-DMINISAT_INCLUDE_DIR="${EPREFIX}"/usr/include/minisat/simp
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local targets=( all )
-	use doc && targets+=( prog-man user-man html tutorial docs )
-	cmake-utils_src_compile "${targets[@]}"
-}
-
-src_install() {
-	cmake-utils_src_install
-	# Remove docs where they do not belong to
-	rm -f "${ED%/}"/usr/share/nusmv/{LGPL-2.1,README*,NEWS} || die
-}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 2204f090659b..1282a3642906 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -19,4 +19,4 @@ EBUILD octave-4.2.2.ebuild 5102 BLAKE2B 08512a3fd0d084a5e56cc0de1c6c22c171efe525
 EBUILD octave-4.4.0.ebuild 5082 BLAKE2B 8736fa239d93b6847d413e50cf75427bf16407814d5d32f55f2d8688b57fbeacb471afd2a86ec8c1f6a1c1da11882a40dd221e5eea9fdd0ad59e224c0f1e5d65 SHA512 b71030ab908c404a3672d1df9f85e2cf3aa99f4e6e968ae90a95af228912e4615e869d58efaa018a7cb1300d4630111af82bc306b3d1e56340df5dbd1065bd32
 EBUILD octave-4.4.1.ebuild 5180 BLAKE2B 495f7aa6fc5508fbe2285e5fbc8eb7a4055d84e538384487c3f535f9d5cb90bb3c0d896455d05a02878d786a0a338373380f8e955415673a625db17cc80a14fe SHA512 b26dd91d325a55a94da6eb4bba15f279f3d8c80dcecc19c53ff3d8c43c664aea45769b0f3310a38addab326bf6bc59aa6b88b2b07981d731803d82865989250d
 EBUILD octave-5.1.0.ebuild 5076 BLAKE2B 6f843fc6ff0157c6e4f80aaa2f2cc056c4215483e0b62b809821e8f81234caf8be57bb9232fd305fb2bf8d4266de452b7efa20c208a23f4aa7ca4e038785adb3 SHA512 41f83b3a3431a103b10a654573a8d7cb5eb1f45b79125e15818d8f2850faccd5266ee24ee102e4bed0452ba17a3d8999ca755830fea353ada4dd973282a5b0d1
-MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
+MISC metadata.xml 1137 BLAKE2B 69a3d32e58fcf2f855b54664e1fb4e0f2eec69bd8522218957320a0d0f8bf67fb8d5e28f7f108d3baf7992454adef3a416d4bdae9d7b4fd2bfe77225de17a69e SHA512 7351fa4b9a696406543cda7246378e4b4df4dad3033f9a87e4c5036663fc32965c7db45d8ff32959904a9bf71cff88484b542bc3e20ea0ee946a0025c091a345
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index c11ec7171e00..54f7c4586ad3 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -10,7 +10,6 @@
 	</longdescription>
 	<use>
 		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
-		<flag name="gui">Enable the graphical user interface</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for low level hash functions</flag>
 		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
 		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
diff --git a/sci-mathematics/p9m4/Manifest b/sci-mathematics/p9m4/Manifest
deleted file mode 100644
index 70648a1cc698..000000000000
--- a/sci-mathematics/p9m4/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX p9m4-v05-package.patch 1860 BLAKE2B e3701d1922d76f2b403cd950cd28269c5d75127f31757840903dd6c2332cd42984a5553040e217ae9722c529de4e2430fc2ca64847e87a895365dad505f5e57c SHA512 31bbf42c9fc6d266c1bdcc33278dbf2fc7f83c57c302d0af4808a181bcd3f4d64780e02b875c174a7d245c0d3c4ea3703bc8c04d4a70a8543c4d76b2ed3f946f
-AUX p9m4-v05-python2.6.patch 1909 BLAKE2B e6c95c8e2e958078f4db1316648c5a92f9e2669bbf6aeb6c6cd8642f2526ec13c6233fb270028f6bef28fee56889aecfaf67427f2f85490f0ce67fb04134a9a5 SHA512 b41da95bff1ea30f45b170383592b8dee78b58592c925ec2979f27810d64e8d9814187b254ff5b005776fe56f00d38b36cfb80c3d5a4abc5a17519a5ebd866a4
-AUX p9m4-v05-use-inst-paths.patch 1151 BLAKE2B 02e55389cab73decb8082d4b0b33e018cf58b8c77157bfce03c92707aa5be84a2432939976c4d631e45e3e56139e2629bff14fe9009bc7f345d4570b65696230 SHA512 285c92ba2d97346408dbea07ecd2047bd67d7b9b0de96c8676d9280e8cce23c93abba8fdb1443c5f1b942b79903d2f11bf8e90591e2ff70b167ad507fb4c6f85
-DIST p9m4-v05-64bit.patch.bz2 5095 BLAKE2B b49ee327ee9f05403d68d61eb162d6a9dd4b5786adb625eebbe7e6d2f47c36e54ec05e0594bc82a4152f7d92f88b8f2ac044732dc3df72c710c0ef3fbde560d7 SHA512 b80ea7ae9b652b55eee2542ba8d45712871e56dfda2e97bae2011a521e732d221a5c6a36ba33269a80f02ddc98a8f3c2470c7e832fc2b79331e7cca551aa7a36
-DIST p9m4-v05.tar.gz 889707 BLAKE2B 09407ba998e72b2b90b96a90e668114c16bd4c15d853354f8e86cc5b1ea0533f99548a35f048f504e40f61702b95de197309f22abd7b3e38fabef6dbfcc06280 SHA512 6ed8f3a5ab6e6b876eee388ab0f1bc535e60432317131657ba518781912f0f851aeab361d0169f96e29538130d691cf2d3798135e2386a7793799f0c4931120e
-EBUILD p9m4-05-r1.ebuild 2164 BLAKE2B ec9d979ab08fa8067bb894aa7656377858de0a32f33440cb56cb7b5afed311d90cc34986127e85bee3ea75f97e3fbce3313ef3ad8d0b6e349e0e64745e508f2b SHA512 c68545f2dea7f18688c06d893299771ee3ba39f2ca05399274f6c33875c12d50e39b0bc763e7fa554e1e25636c98038dc0d80ed8efa84d5d3756b6475eff4c65
-MISC metadata.xml 637 BLAKE2B eec457b5486d8dc76a003bdc37e687a7c0e5b7f1f2233550adabd44617e5d4edc6d78780df18ce1c699b3c6c6ae2c0b933d1ecc1895e6a0f60eb42fc8b29518e SHA512 68890672339a213c5309632728ff6ef0f4287c1fe22d217fcd2db8bd453802cbf9ed7ab2c2cbf1004f874e5dfc99b313359f37507eccffeec0297ad0a6ed35e3
diff --git a/sci-mathematics/p9m4/files/p9m4-v05-package.patch b/sci-mathematics/p9m4/files/p9m4-v05-package.patch
deleted file mode 100644
index 9ca737ce2ffe..000000000000
--- a/sci-mathematics/p9m4/files/p9m4-v05-package.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- p9m4-v05-orig/setup.py	2007-11-17 09:31:26.000000000 +1100
-+++ p9m4-v05/setup.py	2012-07-02 23:48:21.753760992 +1000
-@@ -26,23 +26,24 @@
- 
- from setuptools import setup
- 
--APP = ['prover9-mace4.py']
--DATA_FILES = ['platforms.py',
-- 'utilities.py',
-- 'wx_utilities.py',
-- 'files.py',
-- 'options.py',
-- 'partition_input.py',
-- 'my_setup.py',
-- 'control.py',
-- 'Images',
-- 'Samples',
-- 'bin-mac']
--OPTIONS = {'argv_emulation': True, 'iconfile': '/Users/mccune/gui/v4/p9.icns'}
-+OPTIONS = {'argv_emulation': True, 'iconfile': '/usr/share/p9m4/Images/p9.ico'}
- 
- setup(
--    app=APP,
--    data_files=DATA_FILES,
--    options={'py2app': OPTIONS},
--    setup_requires=['py2app'],
-+    name='p9m4',
-+    version='05',
-+    scripts=['prover9-mace4.py'],
-+    package_dir = {'p9m4': 'p9m4'},
-+    py_modules=['p9m4.platforms',
-+             'p9m4.utilities',
-+             'p9m4.wx_utilities',
-+             'p9m4.files',
-+             'p9m4.options',
-+             'p9m4.partition_input',
-+             'p9m4.my_setup',
-+             'p9m4.control'],
-+    # remove py2app
-+    # https://bugs.gentoo.org/show_bug.cgi?id=423555
-+    # sci-mathematics/p9m4-05: tries to use network during install
-+    # options={'py2app': OPTIONS},
-+    # setup_requires=['py2app'],
- )
---- p9m4-v05-orig/prover9-mace4.py	2007-12-08 03:27:13.000000000 +1100
-+++ p9m4-v05/prover9-mace4.py	2012-01-08 18:12:09.970620044 +1100
-@@ -27,13 +27,13 @@
- 
- # local imports
- 
--import partition_input
--import utilities
--from files import *
--from platforms import *
--from wx_utilities import *
--from my_setup import *
--from control import *
-+import p9m4.partition_input
-+import p9m4.utilities
-+from p9m4.files import *
-+from p9m4.platforms import *
-+from p9m4.wx_utilities import *
-+from p9m4.my_setup import *
-+from p9m4.control import *
- 
- Program_name = 'Prover9-Mace4'
- Program_version = '0.5'
diff --git a/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch b/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch
deleted file mode 100644
index 70cb006d268e..000000000000
--- a/sci-mathematics/p9m4/files/p9m4-v05-python2.6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nur p9m4-0.5/my_setup.py p9m4-0.5.new/my_setup.py
---- p9m4-0.5/my_setup.py	2008-01-14 23:30:55.000000000 +0000
-+++ p9m4-0.5.new/my_setup.py	2008-01-14 23:35:45.000000000 +0000
-@@ -158,7 +158,9 @@
-                     self.ed.SetStyle(start, end,
-                                      wx.TextAttr('RED',
-                                                  wx.Colour(200,200,255)))
--            error_dialog('%s\n%s' % (message,error if error else ''))
-+                error_dialog('%s\n%s' % (message,error))
-+            else:
-+                error_dialog(message)
-         else:
-             frame = Text_frame(self, to_top(self).box_font,
-                                'Error Output',
-diff -Nur p9m4-0.5/partition_input.py p9m4-0.5.new/partition_input.py
---- p9m4-0.5/partition_input.py	2008-01-14 23:30:55.000000000 +0000
-+++ p9m4-0.5.new/partition_input.py	2008-01-14 23:35:45.000000000 +0000
-@@ -63,14 +63,23 @@
-             m2 = r2.search(str, m1.end())
-             while m2 and in_span(m2.start(), comments):
-                 m2 = r2.search(str, m2.end())
--            match_end = m2.end() if m2 else len(str)
-+            if m2:
-+                match_end = m2.end()
-+            else:
-+                match_end = len(str)
-             other   += str[other_start:m1.start()]
-             if remove_patterns:
-                 keep_start = m1.end()
--                keep_end = m2.start() if m2 else len(str)
-+                if m2:
-+                    keep_end = m2.start()
-+                else:
-+                    keep_end = len(str)
-             else:
-                 keep_start = m1.start()
--                keep_end = m2.end() if m2 else len(str)
-+                if m2:
-+                    keep_end = m2.end()
-+                else:
-+                    keep_end = len(str)
-             matched += str[keep_start:keep_end]
-             next = other_start = match_end
-         else:
diff --git a/sci-mathematics/p9m4/files/p9m4-v05-use-inst-paths.patch b/sci-mathematics/p9m4/files/p9m4-v05-use-inst-paths.patch
deleted file mode 100644
index 5b48b94b27bf..000000000000
--- a/sci-mathematics/p9m4/files/p9m4-v05-use-inst-paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nur p9m4-0.5/files.py p9m4-0.5.new/files.py
---- p9m4-0.5/files.py	2008-01-14 23:31:00.000000000 +0000
-+++ p9m4-0.5.new/files.py	2008-01-14 23:39:51.000000000 +0000
-@@ -51,6 +51,9 @@
-         return sys.path[0]
-         # return os.path.dirname(os.path.abspath(sys.argv[0]))
- 
-+def data_dir():
-+    return '/usr/share/p9m4'
-+
- def bin():
-     if Win32():
-         return 'bin-win32'
-@@ -63,13 +66,13 @@
-         return 'bin'
- 
- def bin_dir():
--    return os.path.join(program_dir(), bin())
-+    return '/usr/bin'
- 
- def image_dir():
--    return os.path.join(program_dir(), 'Images')
-+    return os.path.join(data_dir(), 'Images')
- 
- def sample_dir():
--    return os.path.join(program_dir(), 'Samples')
-+    return os.path.join(data_dir(), 'Samples')
- 
- def binary_ok(fullpath):
-     if not fullpath:
-diff -Nur p9m4-0.5/prover9-mace4.py p9m4-0.5.new/prover9-mace4.py
---- p9m4-0.5/prover9-mace4.py	2007-12-07 16:27:13.000000000 +0000
-+++ p9m4-0.5.new/prover9-mace4.py	2008-02-10 22:45:45.000000000 +0000
-@@ -27,6 +27,8 @@
- 
- # local imports
- 
-+sys.path.append('/usr/share/p9m4/lib')
-+
- import partition_input
- import utilities
- from files import *
diff --git a/sci-mathematics/p9m4/metadata.xml b/sci-mathematics/p9m4/metadata.xml
deleted file mode 100644
index a1db72097c3a..000000000000
--- a/sci-mathematics/p9m4/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>gienah@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>sci-mathematics@gentoo.org</email>
-  <name>Gentoo Mathematics Project</name>
-</maintainer>
-<longdescription lang="en">
-  This is a Graphical User Interface for Prover9 and Mace4.
-  Prover9 is an automated theorem prover for first-order and
-  equational logic, and Mace4 searches for finite models and
-  counterexamples. Prover9 is the successor of the Otter prover.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-mathematics/p9m4/p9m4-05-r1.ebuild b/sci-mathematics/p9m4/p9m4-05-r1.ebuild
deleted file mode 100644
index 29cb679eeb2b..000000000000
--- a/sci-mathematics/p9m4/p9m4-05-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="p9m4-v"
-MY_P="${MY_PN}${PV}"
-
-DESCRIPTION="This is a Graphical User Interface for Prover9 and Mace4"
-HOMEPAGE="https://www.cs.unm.edu/~mccune/mace4/"
-SRC_URI="
-	https://www.cs.unm.edu/~mccune/prover9/gui/${MY_P}.tar.gz
-	https://dev.gentoo.org/~gienah/2big4tree/sci-mathematics/p9m4/p9m4-v05-64bit.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	sci-mathematics/prover9"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${WORKDIR}"/${MY_PN}05-64bit.patch
-	"${FILESDIR}"/${MY_PN}05-use-inst-paths.patch
-	"${FILESDIR}"/${MY_PN}05-package.patch
-	"${FILESDIR}"/${MY_PN}05-python2.6.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	rm -f \
-		p9m4-v05/bin/prover9 \
-		p9m4-v05/bin/mace4 \
-		p9m4-v05/bin/interpformat \
-		p9m4-v05/bin/prooftrans \
-		p9m4-v05/bin/isofilter \
-		p9m4-v05/bin/isofilter2 || die "Could not rm old executables"
-
-	mkdir p9m4 || die "Could not create directory p9m4"
-	mv Mac-setup.py \
-		Win32-setup.py \
-		control.py \
-		files.py \
-		my_setup.py \
-		options.py \
-		partition_input.py \
-		platforms.py \
-		utilities.py \
-		wx_utilities.py \
-		p9m4 \
-		|| die "Could not move package p9m4 python files to p9m4 directory"
-	touch p9m4/__init__.py \
-		|| die "Could not create empty p9m4/__init__.py file"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dosym prover9-mace4.py /usr/bin/prover9-mace4
-
-	insinto /usr/share/${PN}/Images
-	doins Images/*.{gif,ico}
-
-	if use examples; then
-		insinto /usr/share/${PN}/Samples
-		doins Samples/*.in
-
-		insinto /usr/share/${PN}/Samples/Equality/Mace4
-		doins Samples/Equality/Mace4/*.in
-
-		insinto /usr/share/${PN}/Samples/Equality/Prover9
-		doins Samples/Equality/Prover9/*.in
-
-		insinto /usr/share/${PN}/Samples/Non-Equality/Mace4
-		doins Samples/Non-Equality/Mace4/*.in
-
-		insinto /usr/share/${PN}/Samples/Non-Equality/Prover9
-		doins Samples/Non-Equality/Prover9/*.in
-	fi
-}
diff --git a/sci-mathematics/pari-data/Manifest b/sci-mathematics/pari-data/Manifest
index b22bf65687b2..f05e4a5e5ce7 100644
--- a/sci-mathematics/pari-data/Manifest
+++ b/sci-mathematics/pari-data/Manifest
@@ -1,7 +1,7 @@
-DIST elldata-20120726.tgz 28386778 BLAKE2B 093294a3cb2e5fa61397dec626a6cbd315cf3bd70e2fe26661b1eb800795e5f8a883af3f67793cd8f4c274a530ecfe680984395f52f63155b3d8afbe977516f8 SHA512 fa2d080783055e33e8338e4b54c484317896572c5b8e0227042608432f9839ac7467103f7cb74869c051ba70da0122b22ce1a190a688a220718abd5c141121fc
-DIST galdata-20120726.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab807b7caf12b783aacc2e75de82dc000e762da2ec895d52424281234af121e1edfd84adf9f02c26c4e59d23e2f3 SHA512 bc89c8a42416e8ca25c356b7ad6d80ffcfff127e561fc338df87147a9e370ec71f7ae2eb6bef73d634cc7a8f18c794d7fd5ebfd0a042d3d356526a2eee28125a
-DIST galpol-20120726.tgz 469851 BLAKE2B d4242ef8e8373be14af69f53c654cadf9580b5b6fcd8a705094f7c689fa36064525a69fe9e1284d1a36cf55e0436e65f42bb3dd51f45da92a11d68cca4fa7761 SHA512 4aa390761403f68f0d6b4f783e70b188f55d24c58614f72324c8cad86066e66153111fad674a38aeda84265ee994784a0bf276c49d1faa2c972bc1a075885f27
-DIST nftables-20120726.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
-DIST seadata-20120726.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
-EBUILD pari-data-20120726.ebuild 638 BLAKE2B b0f723649e9edd37977e7e5e687304cfa109237728a0f6d75f5244414dbecd936d8eb6d55fb27d6fed891f4e19d9af5e3ce46aedf8dae1c4460192ca677efeed SHA512 c050626c96977f72f87b7a0ca7b2d6b00c557106a1babc2441fac6908e14934b65b4b25c30c2d1c2f5745ed730febdfcfba01ab3b7acd7e95c8d2a1ca04a874c
+DIST elldata-20191216.tgz 58320300 BLAKE2B e3c0981695829e31662a496e9a541daa75a167ea8b2e17cd3970fe0109efb15ef3a4d979ca3e7c4e6a9b8071cccb43c2572a9e586e9eaf26962ea04c7441ecc2 SHA512 2c0c35796293bc599d4f851bc00032c87a639f9ad575b671898b3959b06e3df5dbef7947397731132e054a55bec99127e4bf54d0299b8f100f4144896f014d06
+DIST galdata-20191216.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab807b7caf12b783aacc2e75de82dc000e762da2ec895d52424281234af121e1edfd84adf9f02c26c4e59d23e2f3 SHA512 bc89c8a42416e8ca25c356b7ad6d80ffcfff127e561fc338df87147a9e370ec71f7ae2eb6bef73d634cc7a8f18c794d7fd5ebfd0a042d3d356526a2eee28125a
+DIST galpol-20191216.tgz 10049371 BLAKE2B 0b365579823f6f8243269144648302170eb2c2fd8c69ab3cc47e68e08745a909a9c1305080833f99c96c3ac8076ebaa9f680ba25e35eb84859a3aef22ba23c82 SHA512 5109081488ce5cb442b1a5d2f9c3206c48bfe27a743f7a6fdbd34f6d0a1cb5c2a4f5fdc173af25547eea4caefc525b9851fc9bbdb215b606598d4ab44cb60acf
+DIST nftables-20191216.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
+DIST seadata-20191216.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
+EBUILD pari-data-20191216.ebuild 837 BLAKE2B 26c5097539142ebd3dc41caa148b4b5852fa5b271c841aec7f7e79e8e01268bdb86b9580b000fac967b6b8ed3dad4ac98407abd7e1a9bc33ec9c289924b2013d SHA512 ba3336ce3dd2b588a96f0f6f7af0bab8d968330ece0b5234e5d4c52069cff4453ae34451be5bb0e0602ea58a971d5bba1edaee1911ff35660b7cf762c8f6cacd
 MISC metadata.xml 725 BLAKE2B ad3ba5be947834b57bb950e21eecec41a7805907fe4460d9c4d7d086c0d6a4291b4825c1820218ee4cbe3ecfeefeb3db02aea797a55c96d86291e023cef48c31 SHA512 b542df0fdb45fab2f578a5870266bcefcdd91b41b3c26c069bf101be4e5f98c73542c35d19710b5cb13bba0af64615b54f9b8020137c5a071252b3baa17621f1
diff --git a/sci-mathematics/pari-data/pari-data-20120726.ebuild b/sci-mathematics/pari-data/pari-data-20120726.ebuild
deleted file mode 100644
index c6c0f54d9ffc..000000000000
--- a/sci-mathematics/pari-data/pari-data-20120726.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Data sets for pari"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-
-for p in elldata galdata galpol seadata nftables; do
-	SRC_URI="${SRC_URI} http://pari.math.u-bordeaux.fr/pub/pari/packages/${p}.tgz -> ${p}-${PV}.tgz"
-done
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<sci-libs/pari-2.5.0-r1"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/pari
-	doins -r data/* nftables
-}
diff --git a/sci-mathematics/pari-data/pari-data-20191216.ebuild b/sci-mathematics/pari-data/pari-data-20191216.ebuild
new file mode 100644
index 000000000000..f41ab40d38c4
--- /dev/null
+++ b/sci-mathematics/pari-data/pari-data-20191216.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Additional dataset packages for PARI"
+HOMEPAGE="https://pari.math.u-bordeaux.fr/packages.html"
+
+# Beware, upstream occasionally updates these tarballs in-place
+# with new versions. When that happens, we need to bump this
+# package to a new version so that any mirrored tarballs will
+# get re-fetched to a new name.
+SRC_URI=""
+for p in elldata galpol seadata nftables galdata; do
+	SRC_URI+="https://pari.math.u-bordeaux.fr/pub/pari/packages/${p}.tgz \
+		-> ${p}-${PV}.tgz "
+done
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/pari
+	doins -r data/* nftables
+}
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 692bc8424f6a..cce706cdc609 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,7 +1,12 @@
+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 2626 BLAKE2B 3be495852655cf47cab2ebfc544477707ab9274329a4fc7f380bd683236968e0bafd9f91b9c45289912b2a634aa9ba38f3130e0192cacfb6dc383765803eb5ad SHA512 ff8c00f028da9e782256ad9f6af87a194286cf198e8639bd737663db9b4898903993a9ef01f9084bcd658913f3d639509f89cca9b77963790ede9bb998845821
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-no-automagic.patch 2638 BLAKE2B a0e88763f7f69d6d284286961ad90719cf0a02e533164342dbc34206c44dd447cc1ee5aac27dbd0f61c850082f0d19049886fe9d05676ef506e6154c5395c03f SHA512 1f9ded97ebffa20a248ad86c635e90fc2e38d318a7d47caa27c695b153dbefe2107d6a2e67d87653f4d0c703b047073b025e01a528b7ef4422d50a96aaf8b3fd
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
+DIST pari-2.11.2.tar.gz 4433038 BLAKE2B 89fd8c14d6ee8c8640432bec75e10b79897f0180212dcb1b04b654478a3258fc13a7f982bcb400e28997934a21667c0c3cb08fdb2e843a80a24c6499feafb639 SHA512 22f5a6ecad6d9b8b337c2655f538a196a0460f6fe98256d0f49557ce7b843f6b27ad364f45a9472aaafee9506386c886f1f0d62697078e501ec465151d4d10a1
 DIST pari-2.9.4.tar.gz 3851772 BLAKE2B 648e7fd14888bed2dfb7bbb9a25d097aa91899780da9734b444e29997916c27773109e735ecb2d3e9d164a596f3bb8da607d83f278e52d84c49a56df5c89b530 SHA512 539534496e9733bd905b6131374eef8019f93398423710d339bd3c01245e1af675a0a3f9489a05c3ceb2cf3b3426e6b1fb11ea4886b76a1b2e793b59f52e8787
+EBUILD pari-2.11.2.ebuild 3037 BLAKE2B 60ea0fd54d772c800e3b3e963aefd2307dcb7c94cb79b0fe2c5190ef3439d1a37dc28bc4e89cd9d5c615ed5ebb2a8241a9152bcf5291efe7a641f2de0e5c2558 SHA512 59656cf7644fc054ec19391ebb6c15338d02898c6e7dfb4e1c4e77b8f859c25ef3bfddd6121deaab5928269d01587ba9d101406ae7aa1a4d3cfb0f75a03bf34c
 EBUILD pari-2.9.4-r1.ebuild 3505 BLAKE2B 85db8c4eec1791b0f9965ad4a8122ae43b1cfc829f23e1f880516fe367cac08e9f00d4f83e97f064ff0c1a21fbde3833a49137ad6e0b488f1032d0ead37e77df SHA512 3c75e72b86b1a892f105cbdee9d55cf4e4a52e3ba9ca6c83ab2b42cd22ed5ffcc67a0f602de7e5bb4dffcd485c7a839a33cce02e87900d2c5464ebabd3dcf7f8
-MISC metadata.xml 1223 BLAKE2B 57268bb1e2649602e4a6228924f0ea7b32d8fea2718f83595b971e1d5338a8cdd8b91ecf245401f2eefbf206b80dde0e56784d8e147128733fa45dc7edd2eece SHA512 3bb69fc9e0757e6fd1ed9f9394565a34269cd9ccc8dc2ce88283e2f2da8b4ef586b20fb914be28a4b3617ff074319f5925e0fc7a1e264b655303e943a63d6bfe
+MISC metadata.xml 1734 BLAKE2B ffb61a9e3818ed778cd30e0b41279413fec1e624aef0c490e71f501b9797703bbd24413b180b588896d6d74af988e6102f58a04fc1c645f2b876ac2731a399c1 SHA512 b5caa3c3b98405d89681fb25c97dabb3302e971c68fda94e337b10dfc14761963ea548b4689ccb4ac59661425a85a53ea0d424b6acb35a475f42ef145ce9060e
diff --git a/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch b/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch
new file mode 100644
index 000000000000..6d6e6726ddf7
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch
@@ -0,0 +1,13 @@
+diff --git a/config/Makefile.SH b/config/Makefile.SH
+index 27c6d5b..43debb1 100644
+--- a/config/Makefile.SH
++++ b/config/Makefile.SH
+@@ -185,7 +185,7 @@ LD         = $LD \$(LD_FLAVOR)
+ LDFLAGS    = $LDFLAGS
+ DLLD_FLAVOR  = \$(LD_FLAVOR)
+ DLLD       = $DLLD \$(DLLD_FLAVOR)
+-DLLDFLAGS  = $DLLDFLAGS
++DLLDFLAGS  = $DLLDFLAGS \$(LDFLAGS)
+ EXTRADLLDFLAGS = $EXTRADLLDFLAGS
+ RUNTEST    = $RUNTEST
+ 
diff --git a/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch b/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch
new file mode 100644
index 000000000000..5f03d77d9e7c
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch
@@ -0,0 +1,25 @@
+diff --git a/config/Makefile.SH b/config/Makefile.SH
+index 27c6d5b..43debb1 100644
+--- a/config/Makefile.SH
++++ b/config/Makefile.SH
+@@ -366,9 +366,9 @@ clean: cleanall
+ .headers: $HEADERS
+ 	@touch \$@
+ 
+-install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-examples install-cfg
++install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-cfg
+ 
+-install: install-doc install-nodata install-data
++install: install-nodata install-data
+ 
+ install-include:
+ 	-mkdir -p \$(INCLUDEDIR)/pari
+@@ -425,7 +425,7 @@ install-cfg::
+ 	   \$(INSTALL_DATA) $desc/PARI/822.pm \$(DATADIR)/PARI;\
+ 	   \$(INSTALL_DATA) $desc/\$(DESC) \$(DATADIR); fi
+ 
+-install-doc: install-docdvi install-doctex
++install-doc: install-docpdf install-doctex install-examples
+ 
+ install-doctex:
+ 	-mkdir -p \$(BINDIR) \$(DOCDIR)
diff --git a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
new file mode 100644
index 000000000000..d4044cc426d8
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
@@ -0,0 +1,74 @@
+diff --git a/config/Makefile.SH b/config/Makefile.SH
+index 6cf5e59ee..7487941f9 100644
+--- a/config/Makefile.SH
++++ b/config/Makefile.SH
+@@ -74,12 +74,12 @@ case "$which_graphic_lib" in
+ ps|svg|none)
+   graph=plot$which_graphic_lib;;
+ Qt4)
+-  PLOTCFLAGS="\$(QTINC)"
+-  PLOTLIBS="\$(QTLIB) $QTLIBS"
++  PLOTCFLAGS="`pkg-config --cflags QtGui`"
++  PLOTLIBS="`pkg-config --libs QtGui`"
+   graph=plotQt4;;
+ fltk)
+-  PLOTCFLAGS=
++  PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
+   PLOTLIBS="$FLTK_LIBS"
+   postconfig='fltk-config --post '
+   graph=plotfltk;;
+ win32)
+@@ -267,7 +267,7 @@ RLLIBS    = $RLLIBS
+ # GMP
+ GMPINCLUDE = $GMPINCLUDE
+ # Graphic library.
+-QTMOC      = $QTMOC
++QTMOC      = "`which moc`"
+ QTINC      = $QTINC
+ QTLIB      = $QTLIB
+ PLOTCFLAGS = $PLOTCFLAGS
+diff --git a/config/get_config_options b/config/get_config_options
+index 4078d2720..5c12bd491 100644
+--- a/config/get_config_options
++++ b/config/get_config_options
+@@ -86,6 +86,7 @@ while test $# -gt 0; do
+   --with-ncurses-lib=*|--with-ncurses=*)
+       with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
+ 
++  --without-qt|--with-qt=no) without_qt=yes ;;
+   --with-qt) with_qt=yes ;;
+   --with-qt=*)
+       with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
+@@ -94,6 +95,7 @@ while test $# -gt 0; do
+   --with-qt-include=*)
+       with_qt_include=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
+ 
++  --without-fltk|--with-fltk=no) without_fltk=yes ;;
+   --with-fltk) with_fltk=yes ;;
+   --with-fltk=*)
+       with_fltk=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
+@@ -172,10 +174,12 @@ Optional libraries:
+   --with-gmp-lib=DIR          specify location of gmp libs
+ 
+   --with-qt[=DIR]            use the Qt graphical library [prefix for Qt dir.]
++  --without-qt               do not try to use the Qt lib
+   --with-qt-include=DIR      specify location of Qt headers
+   --with-qt-lib=DIR          specify location of Qt libs
+ 
+   --with-fltk                use the FLTK graphical library [need fltk-config]
++  --without-fltk             do not try to use the FLTK lib
+ 
+ Miscellaneous
+   --with-runtime-perl[=path-to-perl-binary] for gphelp / tex2mail
+diff --git a/config/get_graphic_lib b/config/get_graphic_lib
+index 4591f2aad..4808aab90 100644
+--- a/config/get_graphic_lib
++++ b/config/get_graphic_lib
+@@ -7,6 +7,7 @@ FLTK_LIBS QTDIR QTLIB"
+ 
+ if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
+ if test -n "$with_qt";   then which_graphic_lib=Qt; fi
++if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
+ if test "$fastread" != yes; then
+   cat << EOT
+ ==========================================================================
diff --git a/sci-mathematics/pari/metadata.xml b/sci-mathematics/pari/metadata.xml
index f4c3bc4e3381..d5bd7510bbd4 100644
--- a/sci-mathematics/pari/metadata.xml
+++ b/sci-mathematics/pari/metadata.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
diff --git a/sci-mathematics/pari/pari-2.11.2.ebuild b/sci-mathematics/pari/pari-2.11.2.ebuild
new file mode 100644
index 000000000000..4d53f82467fe
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.11.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 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="http://pari.math.u-bordeaux.fr/"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="data doc fltk gmp test threads X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="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
+
+	# 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.
+	./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/prng/Manifest b/sci-mathematics/prng/Manifest
index c4cbde620d96..f49a3dc2e35c 100644
--- a/sci-mathematics/prng/Manifest
+++ b/sci-mathematics/prng/Manifest
@@ -1,5 +1,5 @@
 AUX prng-3.0.2-fix-c99-inline-semantics.patch 3473 BLAKE2B b0a8ea02d13edf7e2918a92d58bf9852e5fd0a7b02a75da3ecb453b0717d037abb9d1d84c0d1bd88c7670290adbf5556b7947a31a96b28ddfae6d35375ad3058 SHA512 bcd545ddd2c8682c533ea5b1d4b97db4cdb44d85644fe2de4da43857cad9b19dbb726ecc50adc082a6f54cd3c3bd78048ee7eb3ac1c333d26272bf4d694f3872
 AUX prng-3.0.2-shared.patch 1049 BLAKE2B 7d9abc870911e53168104a31ad9ecaa6f98cb602ca7010698c37d745fe56d11833f147e547fc87533f4894183239cc593fbe6ed5e52f03000c2f630eb8534719 SHA512 bac71da41ab908b6682d3705434d33f37d7cbb240c87a3fc349b6461d5dc86a90010028be3b0331aa58dc3ddad31efe89986ca24966071092d6845f4c6c80864
 DIST prng-3.0.2.tar.gz 497047 BLAKE2B 8df71dbf8cfe5ba384a1700830b41f947198e51262904a04796968287ca54f21f96ba34af2c0bc93393851ff3c153d24744a5d843501e0f29387282a64a03c24 SHA512 16addfedd16f1caf7489356770c15bde17d8ec5c66dca9fbaa52e50f850f2ab81a1af9d522bb6028ba5e279490beaf6c72060494e8a5367a7453a417a619367f
-EBUILD prng-3.0.2-r2.ebuild 835 BLAKE2B c82fd347802e53ef7688a94541ff76faf9d032a3a5196d31ce55f14023dc69007c2d17634672b4f06cb1db4b0450733d66475ad958bbe8c6847777ece0660895 SHA512 fbfbd1ec6930d235ed0fcbd3fb3cebdd69af917f76a5e94388d149b3ce43c16db1730584e16ec388237009622c94ac5805fa0906a2724307683aba5be6ee4c2f
+EBUILD prng-3.0.2-r2.ebuild 854 BLAKE2B a64ab7fa90f5c55568b6259fda9541cd276a027fa39fc36f12cb19ae44aec19f8f0d9b51e8477358fdbaffc06374e2a7e2ec509f1ee8313c08e16a10940cd2ad SHA512 76dfb022380625b7c3671fbe58ce08c4ebecd450afaacc43f4f26979625c00350c89fa355efda209dbf3378f1e69dcf5d6218aac8e1bd0b936b87a531934fd13
 MISC metadata.xml 673 BLAKE2B 43ee427739a3c80cf2c2ca75a85179b16e86268d535b2f422dfa78ce73b0c9a2579f47ed46bd63ae7a1c09351bcfb8090d7a4ab56f56ae4ba563b1578a2fbb9a SHA512 ba4a5b40a842b31a09e01481bd39f781d7d89d0ff304a51af8c463aeaaa7d8abeee251755672d542dae4fe71c6fecebf3e8f4da53ddca4f608fb1fcc034e002a
diff --git a/sci-mathematics/prng/prng-3.0.2-r2.ebuild b/sci-mathematics/prng/prng-3.0.2-r2.ebuild
index 73e901ea3f8b..b851ff1d0272 100644
--- a/sci-mathematics/prng/prng-3.0.2-r2.ebuild
+++ b/sci-mathematics/prng/prng-3.0.2-r2.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="Pseudo-Random Number Generator library"
 HOMEPAGE="http://statmath.wu.ac.at/prng/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://statmath.wu.ac.at/prng/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT=0
diff --git a/sci-mathematics/prover9/Manifest b/sci-mathematics/prover9/Manifest
index 2bd301cb5f58..bc5c004d466b 100644
--- a/sci-mathematics/prover9/Manifest
+++ b/sci-mathematics/prover9/Manifest
@@ -1,5 +1,5 @@
 AUX LADR-2009-11A-manpages.patch 13832 BLAKE2B dfd8d0ba6722d788b4e7662c0c4113cc06c32f2f45cdd32327896147435d3f730b464189ee1766a1c162a90cd730d917d8b29c3c241a94d65a3fc5833f3bbca1 SHA512 4c9f862b33d7b6b33b5e4a82b38418c6ae41b7adae565d376cc741608eb989e3846c1e98589dea62f7cadeb0b1f0f5814afe95ee6cf0da63c6961620d8b2677c
 DIST LADR-2009-11A-makefile.patch.xz 4300 BLAKE2B 3ea0860901876c43aeadcee7cf7eca02c31c88ca6670c867ef4a41b9adc2aa13edf36f45807713f7b200355f5086b43a17722071be81f58af1bc5d70327e3e41 SHA512 c1d2e27d991036af24a29deb4401fbf9687415d2a37bebabb9cfc77d8672e0804d974f92cbd7b8e16c0a0c10b75831847f7b8ddb94244d7e632de7b1be5081f1
 DIST LADR-2009-11A.tar.gz 1795750 BLAKE2B ed44b1d0f5f5f3c9846ff578af10914421c79f580db9f9002f105b87d7af49fb6f2956b70d2ebfbd17b3a230d1065aadb1cc798ef7ebdad8749e66cea41120b6 SHA512 f26d3713eb2ba809fb3d55ce179e9d91555ab9166e075aa0843bafe57ce00f153cfed178b61993d4fd471655840e4f40775d75dac9fb5242a67e5d59c970dfc7
-EBUILD prover9-2009.11a.ebuild 2500 BLAKE2B e96ca81caf95d6e426f4f14498bc56d08c0d0a905ec160b0cd468827b1edfb558974e42aa995f47c29c7c41a94ec8be86a1c20eb08fb9f20eef87f82d8cac204 SHA512 6a6f96016a260d7d393c5e2059bec9db085b504e7193380d4c4deae0e40376a908e92b419ee96eaa969f4abbcbae219f7a0f52f26c249507ce7c240ac6801960
+EBUILD prover9-2009.11a.ebuild 2522 BLAKE2B a10953e16079d207594094d61556a9f326b343852f07df266d7b9ef15802236162283de37d6e2e0aeb940fddb7f4704c78efaca4b490437c21c1eb0eb8eb3e9c SHA512 d4b7091cfb8a04fe3097fd720b9e7a48bc241d22e9d159a52e1585b0b58fea71ddc74b9781905b31207012e933d3c2b833664d3c45bcc579241ad9b89f876ad0
 MISC metadata.xml 643 BLAKE2B cdef536d25ca7d2ba991037e4423c21bde719ae18976367e5e8d232d3f4d83f46b10c135f5f0f6986ba8d1756eee5cc85e78dfc4a4b81204945a7268a6ed899a SHA512 c3160f8aadceb5f065af9c5f14e9fe904b270bba1cf7781d33c39dca4f2641d61123839b93c4d7ad38139e8fc4c221016fe444cbfd7ddc99ea224090fccd7078
diff --git a/sci-mathematics/prover9/prover9-2009.11a.ebuild b/sci-mathematics/prover9/prover9-2009.11a.ebuild
index b9fe53f22b6a..1894b784a655 100644
--- a/sci-mathematics/prover9/prover9-2009.11a.ebuild
+++ b/sci-mathematics/prover9/prover9-2009.11a.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs versionator
+inherit eutils toolchain-funcs
 
 MY_PN="LADR"
 typeset -u MY_PV
-MY_PV=$(replace_all_version_separators '-')
+MY_PV=$(ver_rs 1 '-')
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Automated theorem prover for first-order and equational logic"
@@ -29,8 +29,8 @@ PATCHES=(
 S="${WORKDIR}/${MY_P}/"
 
 src_prepare() {
+	default
 	MAKEOPTS+=" -j1"
-	epatch "${PATCHES[@]}"
 	sed \
 		-e "/^CC =/s:gcc:$(tc-getCC):g" \
 		-i */Makefile || die
@@ -40,6 +40,12 @@ src_compile() {
 	emake all
 }
 
+src_test() {
+	emake test1
+	emake test2
+	emake test3
+}
+
 src_install () {
 	dobin \
 		bin/attack \
@@ -95,7 +101,8 @@ src_install () {
 		manpages/rewriter.1 \
 		manpages/prover9-apps.1
 
-	dohtml ladr/index.html.master ladr/html/*
+	docinto html
+	dodoc -r ladr/index.html.master ladr/html/*
 
 	insinto /usr/$(get_libdir)
 	dolib.so ladr/.libs/libladr.so.4.0.0
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index c66135ee815d..c93c83a64ef0 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,4 +1,4 @@
 AUX 50pspp-gentoo.el 171 BLAKE2B 32091c8c9db265cb3c37cae7a718128df3d187e01b6c0685ff929e7dbe1bf92b8759f0920264c786ad250e9c72724fba6ec0b22ee1c39802fc3aaf3b51720665 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883
 DIST pspp-1.2.0.tar.gz 7213194 BLAKE2B f468c6e025f996c9f806fb03e94a4497f02b774c509457cc6295bbefe37abc7e2ecf10d2876c8cff9a979d7a4264c7c185e1cec5fd1d5f2f00f1c6eae4da775e SHA512 49eed2b55f10584abba18ff7d2020fd08691bbc1a3c2f332e6d283e32aa84e0abdae6092d17db9c1a539c63d85ecdfcc2dad40c94a06904b8893a1976e5e48d3
-EBUILD pspp-1.2.0.ebuild 1690 BLAKE2B 0d1861cd7e5d7e5b28c4f485adba6f7ade2cec64f1ed2371f995924c3e7aefb1db1c1cb1633aaf7498960dcc93412d170ac60bd916cfdb9d0b28a2c752c0ceb8 SHA512 2cd9bd094ec054cca05cdffc7f524825d5ecc6c2c26da89fd363e3dd0e5a55db463bae374e0bcd6ac4e6ed072f1e808dcfc496163d7945fc14ecc4ee635039c8
+EBUILD pspp-1.2.0.ebuild 1703 BLAKE2B 2c9c9aeb16384d8be8fa4c156f61d78f324a1368fbcf56e6d6c2536c9ba0db4135809f9f071cc0104fcc747789a12b16371ead898372991a440be67cb5c78659 SHA512 882c370b3a4c5d17f47ea342b6b5b2b916485715a9aa64d3ef03da5e4cc97359167f3c9bbabb30e5a3f47c839b11e5dd864bda0b7a013d5927278e10a90a9b69
 MISC metadata.xml 711 BLAKE2B a8a82a6226fd60e70e8f0c4af6fd1e84545e46d0743f3b13d29c54461bf62ca2b890c718482fee2aa26ca4eb86300b3a11b01e659584942b9bb57ea70ee42882 SHA512 51b64f0c307003cfea98971696f7b26f4770171768a4b90c44f6233696749fe4cce0bf09b0392ad079abff8235fb3680668534cb407df75e6626aab6167ffd34
diff --git a/sci-mathematics/pspp/pspp-1.2.0.ebuild b/sci-mathematics/pspp/pspp-1.2.0.ebuild
index f4a8b7ec8103..656818f70b26 100644
--- a/sci-mathematics/pspp/pspp-1.2.0.ebuild
+++ b/sci-mathematics/pspp/pspp-1.2.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	sys-libs/zlib:0=
 	virtual/libiconv
 	cairo? ( x11-libs/cairo:0=[svg] )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gtk? (
 			x11-libs/gtk+:3=
 			x11-libs/gtksourceview:3.0=
diff --git a/sci-mathematics/pymc/Manifest b/sci-mathematics/pymc/Manifest
deleted file mode 100644
index f061f545be53..000000000000
--- a/sci-mathematics/pymc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pymc-2.3.6-remove-hardcoded-blas.patch 414 BLAKE2B 6bf59a1088f701c0897c002aabe0c9de0a87067da24ffb965afcb304950662f551fc63d4694cda2d6832d5faf963c3801e3fe2365c46ab5b791df1c28de0ad3f SHA512 776ecd9876342215c925ad4a2dfa123e9f6656c6e5a8f3b8d208cc89befc84164b5355d4c1afce8be8962951c3343629cfacb0449d6d0b05d9333886803bbb4a
-DIST pymc-2.3.6.zip 402827 BLAKE2B e8ed875d84e8783f35f9186c6d7d659f29a49937896261a0f8bd892f324d2e17887ce37381aece8d97e47389edf7d727dc73a40ef6abfe4682a7bcbd1a768336 SHA512 4b5e0663ca296efd8d242a0b6362a12d475cdabf661a430de5455e60999acf8a4a30d053303c2f79e8aec3e5e7d120f56cb341e283aa87f31c224e4e57300d13
-EBUILD pymc-2.3.6.ebuild 1323 BLAKE2B f39df705cf5011997e341041e8e30a1509f5aee25307b7626dcbde50e6461fdbdb813ce1a235ac74085a2ee5a3ca43fbe9f03ccd30169af15b9a2c43853dd13e SHA512 1b60973ba58034119c660e39dcaa9852ea7a417c8f07d292ed2d0cf75976d1057b08f19a18a78b1240cb35a58e646ef1acd887b9c6091b99898f79e8e3cd5159
-MISC metadata.xml 554 BLAKE2B 229a895f97fe3880b2b739dcbe09bb377bb9625eaa0ef6388097143d90b8aaae7c08100ff5e9503f5c2c1ea62e574f712de2826770177a52ea27d925edc38069 SHA512 0d9ac09e21100370ed731a23cbce01c73a734a4e2adb282a2c0cc185c75d011f3aeafc75283d27e30635f00cf7fb27a6a502e1a9cb922892d10016d6e9770d65
diff --git a/sci-mathematics/pymc/files/pymc-2.3.6-remove-hardcoded-blas.patch b/sci-mathematics/pymc/files/pymc-2.3.6-remove-hardcoded-blas.patch
deleted file mode 100644
index 93ce86f5c717..000000000000
--- a/sci-mathematics/pymc/files/pymc-2.3.6-remove-hardcoded-blas.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -80,7 +80,7 @@
- 
- # Compile covariance functions
- config.add_extension(name='gp.cov_funs.isotropic_cov_funs',\
--sources=['pymc/gp/cov_funs/isotropic_cov_funs.f','blas/BLAS/dscal.f'],\
-+sources=['pymc/gp/cov_funs/isotropic_cov_funs.f'],\
- extra_info=lapack_info)
- 
- config.add_extension(name='gp.cov_funs.distances',sources=['pymc/gp/cov_funs/distances.f'], extra_info=lapack_info)
diff --git a/sci-mathematics/pymc/metadata.xml b/sci-mathematics/pymc/metadata.xml
deleted file mode 100644
index 0b8c7cb3f0e5..000000000000
--- a/sci-mathematics/pymc/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>heroxbd@gentoo.org</email>
-    <name>Benda Xu</name>
-  </maintainer>
-  <longdescription lang="en">
-PyMC is a python module that implements Bayesian statistical models
-and fitting algorithms, including Markov chain Monte Carlo.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">pymc-devs/pymc</remote-id>
-    <remote-id type="pypi">pymc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/pymc/pymc-2.3.6.ebuild b/sci-mathematics/pymc/pymc-2.3.6.ebuild
deleted file mode 100644
index 17a639ab072b..000000000000
--- a/sci-mathematics/pymc/pymc-2.3.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Markov Chain Monte Carlo sampling toolkit"
-HOMEPAGE="https://github.com/${PN}-devs/${PN} https://pypi.org/project/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT=0
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE=AFL-3.0
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/numpy-1.6[${PYTHON_USEDEP},lapack]
-	>=dev-python/matplotlib-1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}/${PN}-2.3.6-remove-hardcoded-blas.patch" )
-
-# tests freeze at some point
-#RESTRICT="test"
-
-python_prepare_all() {
-	# forcibly remove bundled libs, just to be sure...
-	rm -r blas || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-fflags -fPIC
-	append-ldflags -shared
-
-	[[ $(tc-getFC) == *gfortran* ]] && mydistutilsargs=( config_fc --fcompiler=gnu95 )
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die
-	# Use agg backend instead of gtk
-	echo 'backend      : agg' > matplotlibrc || die
-
-	${EPYTHON} -c "import pymc; pymc.test()" || die "Tests failed on ${EPYTHON}"
-}
diff --git a/sci-mathematics/pymc3/Manifest b/sci-mathematics/pymc3/Manifest
index ac7408e3fb83..152c08a7e338 100644
--- a/sci-mathematics/pymc3/Manifest
+++ b/sci-mathematics/pymc3/Manifest
@@ -1,3 +1,3 @@
 DIST pymc3-3.1.tar.gz 34553828 BLAKE2B 73c4d50f7d656322fa1a7384aefa1f46caacccc8055138fefc27a82d765866efb9d4853a842a2df312058c558edd66b37a40295904c86f023f8fec5503877206 SHA512 30799d9c1b670adbcf5cc1463029d71a87c7b917e83b1f6cb453d75553616da7173421e7ae6e31b332c85f8170daea735344ff83ba6605cf3b15cf79c5c4fb97
-EBUILD pymc3-3.1.ebuild 1578 BLAKE2B 78cb77fc1ed2ad981ba93ca6233ffecd68e324b482cd1631ea552715d02be7e80fb81e673befc056e33f058a48144abb815f4672e6ef51b15cef32ff1b36207e SHA512 464b982de86f8bc94dd45de397c4febe19128dea1adb994abe6d029f9877fc111a169af904914738f71a65f759a87d5106a00530983ddfa6388297a9ab2c8763
+EBUILD pymc3-3.1.ebuild 1572 BLAKE2B e44ba3893aa920b20d9a623605fbf7d2d3dbe8f88ab276e28c5d6b4100d58c8610a153b9e8292ff9383da9be89f1eefbad5776137cce6a5535e1e6d6f2d92406 SHA512 746a9c4b3dca0563cc512d50fcb7eb9bb3f9c253e77628dceb243a8c616c9b0d4556e2add7e8ea4b34aacff7cc2e90d58f4f0d464cc3a0eb86158dacc154a121
 MISC metadata.xml 740 BLAKE2B 2c56161497137f40e0e25e85299af90c361ddbcaccb4436747ba111e725c9a881fdf88944dd0208909275bf4013b9e1d5983b590ad7f46589f584549288aa02c SHA512 c75ed4b57479fef93c4b667792cb284212f859532697c4d4876e2dc23ab13d2c470143d3236de03e741a0797049a12d3a7e2f0d2ae4f07b2cfb0b7943c78526d
diff --git a/sci-mathematics/pymc3/pymc3-3.1.ebuild b/sci-mathematics/pymc3/pymc3-3.1.ebuild
index c246e0768bb9..1b1dad62cb0c 100644
--- a/sci-mathematics/pymc3/pymc3-3.1.ebuild
+++ b/sci-mathematics/pymc3/pymc3-3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 virtualx xdg-utils
 
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
index 4a0166cb2b68..b28f6137fb52 100644
--- a/sci-mathematics/relational/Manifest
+++ b/sci-mathematics/relational/Manifest
@@ -1,3 +1,3 @@
 DIST relational_2.5.orig.tar.gz 118776 BLAKE2B bec1a8c1a3c7973b9200f9a61e65aa144998558a9798e1e869d970ba15d2f7970be8dad865cfa779f05ee535638011851534a3be0c354d216eb35f38f135cb4d SHA512 588e35a57cf915e544d62749b76ed81927ac06fd88271f0d4d88ee5f221928c2c24e2a88165aae63c1b9b120ddaa20e15e21fe9c207eac3150b744274ae45a8a
-EBUILD relational-2.5.ebuild 873 BLAKE2B 18c4d3ca41e3e5bf31ed7ba9b43a8ca8d64c95011f590e7cbfb1e17b27016fdf55dfae0ec387d2fe8ebd65fe22d856c95306b7437f42865b8b87374dc3a21496 SHA512 04ecdb22691a6b139bcad56bacafeb1bbf20d3b304e0b792509b66c61c470342398a0ff73680a51b2a46fb6795169413b580578b444b41cc946b0322c63020da
+EBUILD relational-2.5.ebuild 869 BLAKE2B d066edd39969b95a622ec79950d67a2c907dff527fc469df2b711c714caea7d0cf7a4ef6e457a42cc36e3fa4c0008859b10fef2eaf2cf389b2085ecc0a9ad4a5 SHA512 c7c3f81131c6e2f59ebd8fe136038e3bceb73a4b2c8f8d76537507c65f9800523c0e2fc8bfd3852278b166852ce1082df766a084961823421b6243f94089b631
 MISC metadata.xml 329 BLAKE2B 72059e28c196f127a1c314ad5c63025937a9daf16e8457885da10c94c32ccffec36d4c5049f2dcf2faf9ae67fe934d334a7235bc0f2bec0836614362cd41d122 SHA512 18759433ae0bb33800dc14a9bd518bbd383b8bbdbf876b02dad81afcabe3f0eea7828bd6820989e13253d73c70528d2a3bb4637e5e28d2fa5aab28b84aecdf32
diff --git a/sci-mathematics/relational/relational-2.5.ebuild b/sci-mathematics/relational/relational-2.5.ebuild
index 501b9b0f9b00..fb88c016ff80 100644
--- a/sci-mathematics/relational/relational-2.5.ebuild
+++ b/sci-mathematics/relational/relational-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1
 
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index a4735ab01c56..b0ff94b5aa60 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -2,5 +2,5 @@ AUX rkward-0.7.0b-qt-5.13-1.patch 678 BLAKE2B 5800aa876a5876167a0a7dac5e826b3a8f
 AUX rkward-0.7.0b-qt-5.13-2.patch 683 BLAKE2B b21d5bb3bbcb46a9b4c9052b85e421f7fdc876bd70e7b6572bfb557c0c28570d7f4e3fe04ba6b2d850713eb55d70d89e010c37eb4f18d6e3c04181ad44cc66cf SHA512 66a05ab2a5f491784f5f8dc819ebae4f12472b45f8d83ffa7a1041be736f71301d6022c7ed66552277850cf2b2308079e9aaf37d6a20e1d05e49c7ae6181568e
 AUX rkward-0.7.0b-qt-5.13-3.patch 822 BLAKE2B c6f6de62562d1ae50ad04aed1acc3a5bf4a3c8bff5b34df79b0c2a86525b7c0313c1322de9004dc2b0148d98a8a73152966eea9e57278ffca757020842f06ada SHA512 1c4c398b34f3209a5840b7be6d803df5ed2788b84db78672ed3cd71eebee801e80843b01485bb990051e7567dc302c77d9ad9dbc981138a99702c2907f3a4df6
 DIST rkward-0.7.0b.tar.gz 3978972 BLAKE2B 268ebbcdd16d64f546ffc78bfaf0fbe1546d42b09f7d869a82b9f2df2104c5a449052409773b3b063e9f5ca12948d9a19065ebe57e79684e6eb0ad73dfa5791a SHA512 c582ea2d35371315d41664a8620693c82017bd98d6bb380e64dfd2dda8b34b8890aa1e50b9c4a03838b41f22a1983ee0a48b97b30670b6a15143198631ad49ed
-EBUILD rkward-0.7.0b.ebuild 1283 BLAKE2B fe2638d19323ef3db46cfb6d638f36531c322b7c76d4dcc28153f2aa25b6c6ea912d98a357788951cfd44f3994ff1c53beceb85547543a08c1bd8452c7ebd5bb SHA512 389a73470046ac7532c2d807e38e9b65e02706772062a009f2033d919a8a9063fd3a039716a611fbf134a44fedcfa4339968f6898ca7a0dbd63c4c3ca9488ff8
+EBUILD rkward-0.7.0b.ebuild 1463 BLAKE2B 516f51a85a6dc6f7926fff5759585e65328a697b4f03089be841a8359cb16769e013346cb7a743d48dc561cd809fe18cc5a930c43dd9cc7f6a95f6c9a498aabc SHA512 5880bc0d5f805e6e72e9da82b714eebc997680352dbb4266d046aa6dda6f0d78dd1930cbcdbd8e5d52c013be763745cef34829692acb89d0db0627ac8e59b89a
 MISC metadata.xml 592 BLAKE2B 887f22ad10d784dd1a12f50ab14ae07e9da5f90828b78027c08c864641e334cd1343bd4bbd197ccec086fe9e7d1e95602f8f78cc3f1316701900b73e266d763d SHA512 81c026c96614186bc6b31f9737b91692df82523d2179d467aeb663f10b7ce079a4b52354d8f744dedbe5bf5cf1939921a26f24f8deec9a170ac435da1f9863f6
diff --git a/sci-mathematics/rkward/rkward-0.7.0b.ebuild b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
index ea892c6968ac..1f7aa1a0fc83 100644
--- a/sci-mathematics/rkward/rkward-0.7.0b.ebuild
+++ b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="IDE for the R-project"
 HOMEPAGE="https://rkward.kde.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV/b}/src/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2"
+SLOT="5"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
@@ -18,30 +21,30 @@ BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdewebkit-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
 	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	dev-lang/R
 "
 RDEPEND="${DEPEND}
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index c8d7b950219c..f66dd4c384bb 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -3,7 +3,7 @@ AUX rstudio-0.98.490-linker_flags.patch 806 BLAKE2B dc32a4a3bbe7ed2467c187aab7a1
 AUX rstudio-0.99.473-qtsingleapplication.patch 1889 BLAKE2B 1346ed138abd08318f23cbe4b34a0d2ee4ac0cf83206eba04c238c08c659859c11e207e3e6d03ad23e5baf6353a5f8ad49fbdffcea31104dc810fbb05f4ec9c3 SHA512 07af71ac080c0a2d4c2c62ec8f0ac451e6100a94e5360fafd274c62e2205d60d0c4b7fe18ed4536e515fa4a51a4ab819e47c529ce4fcbf93532dbb57e123fb37
 AUX rstudio-0.99.879-prefs.patch 1859 BLAKE2B f324ab7b87e7cef32ac8b2718059200e4040d82258ba6d47bf41527ba413627b5a0971924ce3e1bfa1337d206838cb9f1ade11a1fe35786fe2371b0cb86a4c11 SHA512 987d46d7dd8955ae55f29aa2ca51241697405d8219b719342a5e8b6621dcec8bffa5b41d09a82e03d65c6b9797fb6aea8791ea161f4406600a5d5bd20aaf00f8
 AUX rstudio-1.0.44-paths.patch 6722 BLAKE2B 46351eb6eda15f74b03f1c5beb0b22bb835f4312af1889997e042657383a0130986bf4ecbc45dac98aafed7c317048e8bb380287a79be696c5c0a403e5633857 SHA512 6191520733f33466cf45bcc102a386763acc37a0cc1c58718cb59f3e3b5549afe5a051039f50aa390d773433d992cdff11bdf27c7e2960eb6177cd99c3169828
-AUX rstudio-1.0.44-systemd.patch 1147 BLAKE2B ca1b24c2544ff2cb6b9e7a91b4ce25eda7f034a6bff91c2495a993e8ab69062a839f85f4ecb2604bbada7df40e67ab5476fdf05c5ebf48d1518dd7f1b950aae7 SHA512 ee22d4421ab52cff1815200ce1bda33ba7af752363537c6875ea19151767722183861301082eb03cb34403a08981cb10d66fd496e9e2687a4f3ca9de98f33d91
+AUX rstudio-1.0.44-systemd.patch 1060 BLAKE2B c5417748653b60c85cacfaab08f2baf6936c3c2d76fe0c23702fe006c4f13de9d17a3556c05c0f47be41c6f4629d92da265861b1c689415bbdd59a515d1848af SHA512 3559fc0cb229b50fbfd4361e5be982396d563e41475878f15f870609caa9f85bd50b32f90b8f8d9c432287cb7286920dca21279bc5bfb33f1fd95a0ce68a2c4e
 AUX rstudio-1.1.357-clang-pandoc.patch 3240 BLAKE2B bc7f55d2f2cea64643d02af314afbbd0df1d986889d0d3a2bbf6878e9f8ec7d73710c7e631bf0cbf04b4ecf4142236ef7a1dc0a073d34958a8bd0828594f605d SHA512 3a2fc154f934b4bbd92df6359dc26c27bf2f4f06b2dde572faba3c083879c8e0e98ed776701282d9f3a5cb3f4ac2416e04e6a30beedf4ffa5cbeca3a7e72421b
 AUX rstudio-1.1.453-boost-1.67.0.patch 1920 BLAKE2B d360259929a73ca6ed7b59997e34dfb2f40992ad6a25372fa2465d07c6df93838d62f5c9dd54b3b45850056bdcba24d20f84eda9480103e71feeac0b20df0a1b SHA512 250c16695c42b03d59ed690de8fc38494ac52047f5fe88b82df431082d524a396266c2b7e8c6afbf3b25e08102d99ef37b3892d62e7bc134f872718880660709
 AUX rstudio-1.1.453-core.patch 5843 BLAKE2B 9634a1d619c7e32e672d64ce90c092a9451499ffb27104a5228b4665abeffe7618f92ac04c29b6a3278c2702fe1361be43ba9eb1616acef71c42d39c68df9e65 SHA512 64e50dc812fb60ce6d8b17c6ea0eb6cfa055faa3a235d12e84ecb2691fcc90ef457d4eddc6e8029145fc3e919336fb0c91c293767c2d2f27bd542508c1e458aa
@@ -14,6 +14,7 @@ AUX rstudio-1.1.463-boost-1.70.0.patch 1765 BLAKE2B 43520b4ef0c20ce33cb336d5b7fd
 AUX rstudio-1.1.463-fix-ptr-int-compare.patch 595 BLAKE2B 10b7320990869c07c02e8a8cd06d41f67d0ddcbb7351fbbd2b9044144733b0b68225bc53c2aa93a98ea6715031d31346209700fbcbcb4c48809d9e3537cce435 SHA512 27fc52d4ff2a96212863eefabf3d69f4d18db259da4e366a0020c2deb4126d03208c9bf3c4877f75ccadaf5cc59da070a07380968d44942622525b1f33db90e3
 AUX rstudio-1.2.1335-boost-1.70.0_p1.patch 1771 BLAKE2B eaa29ff256b8ee79c0384075745c53999d2d4ace494c0403cfa805868638921b6b0aa48631c8399bd8f21a4ee5734c6e0f46d2abf5f5111466613fbf7eca73bc SHA512 01a105c269147e256a3a0d2f803809d215c492c22626bf8b7bd5d9b6465db584b8aaa48299a6cc4f7081dd537ffcdedae1e2c328fe9bae0e1dca844f13402586
 AUX rstudio-1.2.1335-boost-1.70.0_p2.patch 1081 BLAKE2B 19e78cfa2620335cdc2f058b84eba48f693d2cd3268813fb226641727c0f622bbe452d29bdd2be85518aaf4268306cd5e985ec5778e08f21bd802bfd5ef2eb2e SHA512 20c57a4eec8e8b333c718578caad1aca525df94090c7528f996077aab4a1a59d77a03e01d8ed2d3a77d444bebcd9744815fc168d2c3263b2f0b7646c5ebc37c0
+AUX rstudio-1.2.1335-boost-1.72-filesystem.patch 1057 BLAKE2B d375ad438e66f36d5cd0cb70572d164f54407acd6823f8c76571b40cce313a7f79afa63e44e92efc9a764bd660ace471f8332a9032c9f7b14fbd2e8b4dd325a9 SHA512 83b70516cc16564c175a6ceb810b27b2e89cea37c6f1f789871d2d115ce1705246edab06395bf6fce7951a5593017fae015571304f6ef36deb9efc13f1c388a7
 AUX rstudio-1.2.1335-core.patch 6336 BLAKE2B 00abd96a9d653fc6c557e9e3bd82227ead2edef5a49ae67ee0ee4ec97b5a80665c999f478516710c437a0148b9e3b372164aa5e4c50813db41de0eb667bdbd41 SHA512 7cda17801efd5afe91d9064c7c24bd285ee1c2bc2df3f2631fe68261194394adb217345be529b5a6880a93a99dd6f4f32a92d449ace30c31f6d85cbf79f039fa
 AUX rstudio-1.2.1335-fix-ptr-int-compare.patch 595 BLAKE2B 8db7be4c0be67670d60a8f096faa58b13a6dc87194d0997cf97768d8fd67e2c74b84c4de2a8f4502bbd9cf262293b8fe18f4d05428394dcc70ebc8962a969923 SHA512 2f083f036f3594af206fd71db5b761ae6a536e99e4b51264234a7d8169db252b0494da19d5e9d319817a84f6002f64ccb388bc6e0a42bf439c1365618da5626f
 AUX rstudio-1.2.1335-linker_flags.patch 505 BLAKE2B ac0ebca22f6dfcb799dd151e3c915c387dade30f86a9d335513d75c7c726c362255c745e91949ef3c1f58695d7a76a53550837c9d550113ba81d3d2d36507459 SHA512 221471a6ad720517a0b62563779ee11190f14b2f2f6d39e9e1c0acb32a03e41b9db5bd639c5336a26936d8f71ab5d88274471b00d224c6e31f2662680d6fd71c
@@ -21,6 +22,9 @@ AUX rstudio-1.2.1335-pandoc.patch 1392 BLAKE2B 55829768d2c05c5bb3ee13da383a5f9f0
 AUX rstudio-1.2.1335-paths.patch 6105 BLAKE2B 249118b4ecdaa00ad7192079f3d4cc38b623fcf82e4c1df688abefcc5d0cb17561fd5f873ef57a7338fda9b792224b7a166186ad13c84e18d975a4a21d7696a5 SHA512 7af93bc2e375a8070d22e3e923fd43135e5dc8d1875a6a206b14b92a07a20ed541cc6258cb92ce18e562d7247abb60e6e7e9d3fa680b6b9e8b9c34e8d93e4b1d
 AUX rstudio-1.2.1335-prefs.patch 2221 BLAKE2B 659738473f343ed1632221d33770d6caf59c1dc2cce6ff8e15e6742e3603edabd1ebb7f2e809837855a4dbd6792ef41668adb423a2a0a7ddbe378306fadaee20 SHA512 ba2b8f9186c97f17d265e475ee7e1444a4b9796675da2ac0148bef791aca4dda9a6b597c83c580837bbb55c53ea3f61871cba6b5bc60395c6a59e2778da3432f
 AUX rstudio-1.2.1335-qtsingleapplication.patch 2080 BLAKE2B 3e2c1b5df1c030a0d3f9adb01ad469a7e4032248eca156644aa74fdbf1a4584fd92185c9f3e38cb8ee8afdfd556f40642995702719b4d69fe9342f9e4de85dda SHA512 6b03194d47c7f7a39b13ccf93d02bb154e85b5d46777fbf5306e94da13f22fc83bf91bd923a58dfc9bceda517cda81673deb0f0a7b087d501b82a961174bc9cc
+AUX rstudio-1.2.5033-pandoc.patch 1442 BLAKE2B 28a1070057624fb70a2df6de0312dfa827a075ae481f6433733cdc6136a429fe67c72262d3106c6b00f7411f93d3e33ca69f232cc87aa9d8e50e11cad89d2dd6 SHA512 cdbb97f0705f6b56ce8e285d066c57a9f73ce87ef58d8101362a508cb1cc52a32418a742e84a9a9d6476b253984abe0759b45e824d360d8b550e53a98d2d05ca
+AUX rstudio-1.2.5033-paths.patch 6055 BLAKE2B 1c389cbd2980031080955c104e614d2bbcd0d747fd7d925a9650685bf30ddb84c34b66a4a6bcb58a1b18167e51804df9c22734460255eda866365231cda3e9f9 SHA512 ba213cf13ae15df043215e6b87bf554c9daba4124a1a83ecb2e5ccc8f26fd6f1467798901cc24451f04f4d25482da401cc9cdd5071a4c6ac28d9af37c45f51e5
+AUX rstudio-1.2.5033-prefs.patch 3684 BLAKE2B dfa5f7289a7e752704b6481dd6e02f8e88a91aaa36b25c91e8154f17bf3fbfcb2b674fcc790a82ae14deb0718b1d001f4931de6d6ccb99d1ed4dc9c8e71d6149 SHA512 86436aec19da35d99ec64ad1d4c243efad85a277ee72c2eaf94627c49389ba8d4bc626177a9d599bb95d00bc3e66210472e11a5ff38ed74a7a353a719f64fe4d
 AUX rstudio-server.conf 1337 BLAKE2B a9a85c76a1c7c5f32f55606c6e3c9b72662dbd25e4b005f9702ed301afc21425906faf06fca91c18328524c53437aee7c9c4aee26cf293cdc72375e91ec7f701 SHA512 f166f1aa4bd370fcfcb44c5694d4e6af8bc64c5f43671e0c1def10c555d248bebf54199097f37d628a083c65913f522b7b44c3bd6a1227c011cf25eed1dba4a6
 AUX rstudio-server.initd 377 BLAKE2B 4f49b9ae2a81cd60565f79f121d60f5531746febd1f6f68cc93863985bd9af28d4ef04f647bd1b492ca69273724c282bcaedcfb5d08b8f2ac237ddb6f5baa438 SHA512 828a485338088d129c57debec6557ad35db5b042c61489ae4341717ce2218bec59a873541c270f964bb9c708b75896f1a3e2e64a4245a1713979d3bd42c9d5c8
 AUX rstudio-server.service.in 161 BLAKE2B 0be9cb83304063c9123c6fa13b7751b2f848adde282fc586acccfa4110f902e4de9962211ca0c871f66f3563319fe195c9f230daa4d4e429357ff74701e4d2d7 SHA512 bcf1f30e460dd5f0562b20489ca5544c6bcfbfb0ee1c636c4365df433e97e02e9e3b233e4159a0c71ad6d319f34f93c22b8fbf6b36463e29f22df2acd71da173
@@ -35,9 +39,11 @@ DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a8
 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade
 DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17 SHA512 987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b
 DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c SHA512 90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde
+DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
 DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
 DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
 DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
 EBUILD rstudio-1.1.463-r1.ebuild 8679 BLAKE2B 2341733acb0bad21b48da77842bfff75f9b18860ec039282662609b312788d8d1dfd8ce7dd5b13ede6030167eb399554a68dced9dcbce4aa6c7e31f758cf9c30 SHA512 5003e147cf81e9e65aba48c8143623e3d0f5f2e1ae75fe8ac6300261962c93ba2132b2a41c961ae6cbaf5fb0e1ae5262e27702e3d2c6bd6d6cfd52f54a329ea7
-EBUILD rstudio-1.2.1335.ebuild 8630 BLAKE2B 5fb25a1c374b336a44ad91652fda367abeec3f5e9da0eb682eb2224ea81a0ac24bc8d801f0e0733118cb1f872d61507951778c3c16d7b1ea74abade932a0e542 SHA512 3f409a721d2f20e4c558bd6b2b40e6c06293162a5c92f06509cef13e356f2279554807a755bfd28cff0ab11b170f3fb53aa88b10a3984e92f9a2d8b9d0655ac9
+EBUILD rstudio-1.2.1335.ebuild 8688 BLAKE2B b02dac6ce848799534e95fa016d481526bf09525c84834f604dc6cbfe625e2b4d278fc4554119be6edfd27ad987c4cb9cfa48f56f0c5d165450ea8bfa2a7f276 SHA512 fd846f875b2a9c3e9e992371b8cd11ebe95f27e7b3252181fad50ce3a7ae3bd77b652742e0f4fb6f163cfd903d90dd4e701a29427509ca07615717c5e3d69912
+EBUILD rstudio-1.2.5033.ebuild 7183 BLAKE2B 38c0baa94c4c002dff6b5faf9ce7737832b74fc9de68d9077cc4e1f1a281a456023810a439d8a0b527d3e0ec6cd5860bac544bb30ab57d7077d22ffdb79fb875 SHA512 eb8460899577ddb1ac3925d42737fb8737798cd1b15f7c731283a4fc5b7e413101233325d15b56355d37aab1a27ef87266582c35771f04ab71e4f6714611cdd2
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch b/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
index 7eafd4386abd..56601de5341c 100644
--- a/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
+++ b/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
@@ -1,7 +1,7 @@
---- rstudio-1.0.44-orig/src/cpp/server/CMakeLists.txt	2016-10-19 08:32:41.000000000 +1100
-+++ rstudio-1.0.44/src/cpp/server/CMakeLists.txt	2016-12-02 11:11:45.259050839 +1100
-@@ -203,17 +203,12 @@
-            DESTINATION ${RSERVER_UPSTART_DIR})
+--- a/src/cpp/server/CMakeLists.txt
++++ b/src/cpp/server/CMakeLists.txt
+@@ -232,17 +232,12 @@
+            DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
  
      # install configured systemd profile
 -   set(RSERVER_SYSTEMD_DIR "extras/systemd")
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch
new file mode 100644
index 000000000000..b2c4d2392f6a
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch
@@ -0,0 +1,31 @@
+From a11d0454e5fe9c50005a03b9d9de84355df5c7fd Mon Sep 17 00:00:00 2001
+From: Kevin Ushey <kevinushey@gmail.com>
+Date: Fri, 15 Nov 2019 14:54:02 -0800
+Subject: [PATCH] avoid use of deprecated APIs
+
+---
+ src/cpp/core/FilePath.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/cpp/shared_core/FilePath.cpp b/src/cpp/shared_core/FilePath.cpp
+index 088366a9d6..495289e7fc 100644
+--- a/src/cpp/core/FilePath.cpp
++++ b/src/cpp/core/FilePath.cpp
+@@ -22,8 +22,6 @@
+ #include <windows.h>
+ #endif
+ 
+-#define BOOST_FILESYSTEM_NO_DEPRECATED
+-
+ #define BOOST_NO_CXX11_SCOPED_ENUMS
+ #include <boost/filesystem.hpp>
+ #undef BOOST_NO_CXX11_SCOPED_ENUMS
+@@ -1032,7 +1030,7 @@
+       {
+          // NOTE: The path gets round-tripped through toString/fromString, would
+          //   be nice to have a direct constructor
+-         if (!iterationFunction(itr.level(),
++         if (!iterationFunction(itr.depth(),
+                                 FilePath(BOOST_FS_PATH2STR(itr->path()))))
+          {
+             // end the iteration if requested
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
new file mode 100644
index 000000000000..b4f611063e17
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
@@ -0,0 +1,32 @@
+--- rstudio-1.2.5033-orig/src/cpp/session/CMakeLists.txt	2019-12-04 17:22:17.000000000 +1100
++++ rstudio-1.2.5033/src/cpp/session/CMakeLists.txt	2020-01-07 12:29:20.174304185 +1100
+@@ -25,9 +25,6 @@
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
+   message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)")
+ endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
+-  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
+-endif()
+ 
+ # we often install embedded versions of these packages but don't do so currently
+ 
+@@ -490,19 +487,6 @@
+    install(DIRECTORY "resources/connections"
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+ 
+-   # install pandoc
+-   if(WIN32)
+-      set(PANDOC_VERSION "2.7.2" CACHE INTERNAL "Pandoc version")
+-   else()
+-      set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
+-   endif()
+-
+-   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
+-   file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
+-   install(FILES ${PANDOC_FILES}
+-           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+-           DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
+-
+    # install rmarkdown package
+    # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+    # install(FILES ${RMARKDOWN_PACKAGE}
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch
new file mode 100644
index 000000000000..aa6a9b23fdec
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch
@@ -0,0 +1,118 @@
+--- rstudio-1.2.5033-orig/CMakeGlobals.txt	2019-12-04 17:22:17.000000000 +1100
++++ rstudio-1.2.5033/CMakeGlobals.txt	2020-01-07 12:20:19.115307754 +1100
+@@ -175,7 +175,7 @@
+    else()
+      set(RSTUDIO_INSTALL_BIN bin)
+    endif()
+-   set(RSTUDIO_INSTALL_SUPPORTING .)
++   set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
+ endif()
+ 
+ # if the install prefix is /usr/local then tweak as appropriate
+--- rstudio-1.2.5033-orig/src/cpp/server/CMakeLists.txt	2019-12-04 17:22:17.000000000 +1100
++++ rstudio-1.2.5033/src/cpp/server/CMakeLists.txt	2020-01-07 12:17:32.736309024 +1100
+@@ -194,7 +194,7 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
+ 
+    # install configured redhat init.d script
+    set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
+@@ -202,7 +202,7 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_REDHAT_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
+ 
+    # install configured suse init.d script
+    set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
+@@ -210,13 +210,13 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_SUSE_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
+ 
+    # install pam profile
+    set(RSERVER_PAM_DIR "extras/pam")
+    set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
+-           DESTINATION ${RSERVER_PAM_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
+ 
+    # install configured upstart profile
+    set(RSERVER_UPSTART_DIR "extras/upstart")
+@@ -224,12 +224,12 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
+-           DESTINATION ${RSERVER_UPSTART_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+    set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf")
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}
+-           DESTINATION ${RSERVER_UPSTART_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+ 
+     # install configured systemd profile
+    set(RSERVER_SYSTEMD_DIR "extras/systemd")
+--- rstudio-1.2.5033-orig/src/cpp/server/ServerOptions.cpp	2019-12-04 17:22:17.000000000 +1100
++++ rstudio-1.2.5033/src/cpp/server/ServerOptions.cpp	2020-01-07 12:17:32.773309023 +1100
+@@ -389,8 +389,8 @@
+ 
+    // convert relative paths by completing from the system installation
+    // path (this allows us to be relocatable)
+-   resolvePath(resourcePath, &wwwLocalPath_);
+-   resolvePath(resourcePath, &wwwSymbolMapsPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
+    resolvePath(binaryPath, &authPamHelperPath_);
+    resolvePath(binaryPath, &rsessionPath_);
+    resolvePath(binaryPath, &rldpathPath_);
+--- rstudio-1.2.5033-orig/src/cpp/session/SessionOptions.cpp	2019-12-04 17:22:17.000000000 +1100
++++ rstudio-1.2.5033/src/cpp/session/SessionOptions.cpp	2020-01-07 12:17:32.774309023 +1100
+@@ -53,7 +53,7 @@
+ namespace session {  
+ 
+ namespace {
+-const char* const kDefaultPandocPath = "bin/pandoc";
++const char* const kDefaultPandocPath = "bin";
+ const char* const kDefaultPostbackPath = "bin/postback/rpostback";
+ const char* const kDefaultRsclangPath = "bin/rsclang";
+ 
+@@ -571,14 +571,14 @@
+    }
+    
+    // convert relative paths by completing from the app resource path
+-   resolvePath(resourcePath_, &rResourcesPath_);
+-   resolvePath(resourcePath_, &agreementFilePath_);
+-   resolvePath(resourcePath_, &wwwLocalPath_);
+-   resolvePath(resourcePath_, &wwwSymbolMapsPath_);
+-   resolvePath(resourcePath_, &coreRSourcePath_);
+-   resolvePath(resourcePath_, &modulesRSourcePath_);
+-   resolvePath(resourcePath_, &sessionLibraryPath_);
+-   resolvePath(resourcePath_, &sessionPackageArchivesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_);
+    resolvePostbackPath(resourcePath_, &rpostbackPath_);
+ #ifdef _WIN32
+    resolvePath(resourcePath_, &consoleIoPath_);
+@@ -611,7 +611,7 @@
+    }
+    winptyPath_ = pty.complete(completion).absolutePath();
+ #endif // _WIN32
+-   resolvePath(resourcePath_, &hunspellDictionariesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_);
+    resolvePath(resourcePath_, &mathjaxPath_);
+    resolvePath(resourcePath_, &libclangHeadersPath_);
+    resolvePandocPath(resourcePath_, &pandocPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch
new file mode 100644
index 000000000000..034eba37a8b9
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch
@@ -0,0 +1,83 @@
+--- rstudio-1.2.5033-orig/src/gwt/build.xml	2019-12-04 17:22:17.000000000 +1100
++++ rstudio-1.2.5033/src/gwt/build.xml	2020-01-10 18:35:29.913030923 +1100
+@@ -28,17 +28,35 @@
+             classname="com.google.javascript.jscomp.ant.CompileTask"
+             classpath="${tools.dir}/compiler/compiler.jar"/>
+ 
++   <!-- Configure path to aopalliance -->
++   <property name="aopalliance.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/aopalliance-1/lib"/>
++
++   <!-- Configure path to javax-inject -->
++   <property name="javax.inject" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/javax-inject/lib"/>
++
++   <!-- Configure path to validation-api -->
++   <property name="validation.api" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/lib"/>
++   <property name="validation.api.sources" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/sources"/>
++
+    <!-- Configure path to GWT SDK -->
+-   <property name="gwt.sdk" value="${lib.dir}/gwt/2.8.1"/>
++   <property name="gwt.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gwt-2.8/lib"/>
++
++   <!-- Configure path to Google Gin -->
++   <property name="gin.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gin-2.1/lib"/>
+ 
+    <property name="gwt.extra.args" value=""/>
+    <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
+    <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
++   <property environment="env"/>
+ 
+    <path id="project.class.path">
+      <pathelement location="${build.dir}"/>
++      <fileset dir="${aopalliance.sdk}" includes="*.jar"/>
++      <fileset dir="${javax.inject}" includes="*.jar"/>
++      <fileset dir="${validation.api}" includes="*.jar"/>
++      <fileset dir="${validation.api.sources}" includes="*.zip"/>
+       <fileset dir="${gwt.sdk}" includes="*.jar"/>
+-      <fileset dir="${lib.dir}/gin/2.1.2" includes="*.jar"/>
++      <fileset dir="${gin.sdk}" includes="*.jar"/>
+    </path>
+ 
+    <path id="test.class.path">
+@@ -112,8 +130,10 @@
+             <pathelement location="${src.dir}"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
+          <jvmarg value="-Xmx1536M"/>
++         <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
+          <arg value="-war"/>
+          <arg value="${www.dir}"/>
+          <arg value="-localWorkers"/>
+@@ -154,6 +174,7 @@
+             <pathelement location="${src.dir}"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <jvmarg value="-Xmx2048M"/>
+          <arg value="-style"/>
+          <arg value="PRETTY"/>
+@@ -176,6 +197,7 @@
+             <pathelement location="src"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <jvmarg value="-Xmx2048M"/>
+          <arg value="-style"/>
+          <arg value="PRETTY"/>
+@@ -202,6 +224,7 @@
+             <pathelement location="src"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <jvmarg value="-Xmx2048M"/>
+       	<arg value="-src"/>
+       	<arg value = "src"/>
+@@ -237,6 +260,7 @@
+             <pathelement location="${test.dir}"/>
+             <pathelement location="${src.dir}"/>
+         </classpath>
++        <jvmarg value="-Duser.home=${env.T}"/>
+         <classpath refid="project.class.path"/>
+         <classpath refid="unittest.class.path"/>
+         <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/>
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 9d0dfd64d7d1..2ba27bd51487 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils
+inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils vcs-clean
 
 # TODO
 # * package gin and gwt
@@ -92,16 +92,17 @@ DEPEND="${RDEPEND}
 #	test? ( dev-java/junit:4 )
 
 PATCHES=(
-		"${FILESDIR}/${PN}-1.2.1335-prefs.patch"
-		"${FILESDIR}/${PN}-1.2.1335-paths.patch"
-		"${FILESDIR}/${PN}-1.2.1335-pandoc.patch"
-		"${FILESDIR}/${PN}-1.2.1335-linker_flags.patch"
-		"${FILESDIR}/${PN}-1.2.1335-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
-		"${FILESDIR}/${PN}-1.2.1335-core.patch"
-		"${FILESDIR}/${PN}-1.2.1335-fix-ptr-int-compare.patch"
-		"${FILESDIR}/${PN}-1.2.1335-boost-1.70.0_p1.patch"
-		"${FILESDIR}/${PN}-1.2.1335-boost-1.70.0_p2.patch"
+	"${FILESDIR}"/${PN}-1.2.1335-prefs.patch
+	"${FILESDIR}"/${PN}-1.2.1335-paths.patch
+	"${FILESDIR}"/${PN}-1.2.1335-pandoc.patch
+	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
+	"${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch
+	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
+	"${FILESDIR}"/${PN}-1.2.1335-core.patch
+	"${FILESDIR}"/${PN}-1.2.1335-fix-ptr-int-compare.patch
+	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
+	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch
+	"${FILESDIR}"/${PN}-1.2.1335-boost-1.72-filesystem.patch
 )
 
 src_unpack() {
diff --git a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
new file mode 100644
index 000000000000..88b8f9d905b8
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
+
+# TODO
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt
+GWT_VER=2.8.1
+GIN_VER=2.1.2
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage
+PANDOC_VER=1.19.2.1
+# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
+QT_VER=5.10
+QT_SLOT=5
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated libressl server"
+
+RDEPEND="
+	>=app-text/pandoc-${PANDOC_VER}
+	dev-java/aopalliance:1
+	dev-java/gin:2.1
+	dev-java/gwt:2.8
+	dev-java/javax-inject
+	=dev-java/validation-api-1.0*:1.0[source]
+	dev-haskell/pandoc-citeproc
+	dev-lang/R
+	dev-libs/boost:=
+	>=dev-libs/mathjax-2.7.4
+	sys-apps/util-linux
+	sys-devel/clang:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( sys-libs/pam )
+	)
+	dedicated? ( sys-libs/pam )
+	dedicated? (
+		sys-libs/pam
+		acct-user/rstudio-server
+		acct-group/rstudio-server
+	)
+	server? (
+		acct-user/rstudio-server
+		acct-group/rstudio-server
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5033-prefs.patch
+	"${FILESDIR}"/${PN}-1.2.5033-paths.patch
+	"${FILESDIR}"/${PN}-1.2.5033-pandoc.patch
+	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
+	"${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch
+	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
+	"${FILESDIR}"/${PN}-1.2.1335-core.patch
+	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
+	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	mkdir -p dependencies/common/dictionaries
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
+	sed -i \
+		-e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
+		src/cpp/server/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v${PV}
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+
+	eprefixify src/gwt/build.xml
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
+	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
+	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	if use !dedicated; then
+		mycmakeargs+=(
+			-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+			-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	local JAVA_ANT_REWRITE_CLASSPATH="yes"
+	local EANT_BUILD_XML="src/gwt/build.xml"
+	local EANT_BUILD_TARGET="clean"
+	java-pkg-2_src_compile
+
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update ;}
+}
+
+pkg_postrm() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update ;}
+}
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 400a8056bca1..f09bbee088b6 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -7,6 +7,6 @@ DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232d
 DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 5f565bf14677d8414300d7a5602aa96c8cef7e863fd858083fe4561742b545d74a5fc4de95ef0c63acf4f78c66405bac7ba77a954e42b2e87a6da608e4732bcd SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d
 DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025 SHA512 5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
 DIST singular-4.0.3.tar.gz 12615042 BLAKE2B b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d SHA512 781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
-EBUILD singular-4.0.2.ebuild 3685 BLAKE2B 434a1dbac875bb0cfdf4dc3df105529fb5cfcc74e2bc0cff2c2047f8ee68660aca8bf073e8a386c8d5447b04decbcaf8efc4d494e14e4915b2bd07f53325eefc SHA512 c29ac1e417f559ca1f81d3f0c8b0f887c40be8f8060a97aaba32c2583ab8117948a66cb329dab08adbd536465c736f61a5222517169f26122ac4042b7523d91d
-EBUILD singular-4.0.3.ebuild 2603 BLAKE2B c6d59b1c2d7d6885a390d09cd08abac12d6b3ce3ea099fd902656cfb86269b8d6d213bca3a917124c6cae929646605f5e0f105a41cfe70310f557f690d181518 SHA512 91cbb0906f0a3f99da2ffeb8c053c3b2a45ce4c33545dc3be54e1774e34852f7670b5702f165387d9b9f0884ca442292f46b80c6650321f504728f162ca040cf
+EBUILD singular-4.0.2.ebuild 3574 BLAKE2B fd5f29092e1c654b433fab848e753e88a1e5f92d708bbcc26c8cf3900096c7c876659e88169ae8eb8a5d8e6a079826fcd95ce5fa8678c05d16236e0ba8c0239e SHA512 45d0892f3773238a8f6b64685306b146ff833b552179e79382dcfebc590d6fc7fa4baedf89898b9a0d116eddc94187f63c915df1e8e00989e83c53d0eaa08536
+EBUILD singular-4.0.3.ebuild 2492 BLAKE2B 96537b66cb7263785ee4c476e312e200052733c6153dcf8b0624b2b7a33d27a23ecc5aae51965462c4a582a0f4baa8b55b5e5b01bc16a228637bc1f3396c88fd SHA512 4ed70ae84d1339eb8a08a9303fb167975c8600f4e8d500f40032ed66520fb8fb9206aba708181acd4d05f0bdfeef803de1f07805aa0050bf81bd6b73bc006048
 MISC metadata.xml 389 BLAKE2B dcba16dd34ab572d58d76ea55f528ee1a4bb4c0c37ca272c9a11afdb8117f6982e5109a4a4783d1efc6cb31fe273f07bf79f720f178fea635af29574007c93f9 SHA512 3c5aea925276639c81a03a2a8d05ecaa48edac510f144d92e173402721dbc253638341ac8afdfbc17098ac35d2f4f47b41e5d56427c8ecaa788dc28fbb0977ae
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
index 114d83fd0a31..3d17c7c868cf 100644
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ IUSE="boost doc emacs examples python +readline"
 
 RDEPEND="dev-libs/gmp:0
 	>=dev-libs/ntl-5.5.1
-	emacs? ( >=virtual/emacs-22 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	sci-mathematics/flint
 	sci-mathematics/4ti2
 	sci-libs/cddlib"
@@ -43,11 +43,6 @@ pkg_setup() {
 	append-flags "-fPIC"
 	append-ldflags "-fPIC"
 	tc-export AR CC CPP CXX
-
-	# Ensure that >=emacs-22 is selected
-	if use emacs; then
-		elisp-need-emacs 22 || die "Emacs version too low"
-	fi
 }
 
 src_prepare () {
diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild
index 6d898b9c9fcb..ffb1e2a5d952 100644
--- a/sci-mathematics/singular/singular-4.0.3.ebuild
+++ b/sci-mathematics/singular/singular-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="boost doc emacs examples python +readline"
 
 RDEPEND="dev-libs/gmp:0
 	>=dev-libs/ntl-5.5.1
-	emacs? ( >=virtual/emacs-22 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	sci-mathematics/flint
 	sci-mathematics/4ti2
 	sci-libs/cddlib"
@@ -42,11 +42,6 @@ pkg_setup() {
 	append-flags "-fPIC"
 	append-ldflags "-fPIC"
 	tc-export AR CC CPP CXX
-
-	# Ensure that >=emacs-22 is selected
-	if use emacs; then
-		elisp-need-emacs 22 || die "Emacs version too low"
-	fi
 }
 
 src_prepare () {
diff --git a/sci-mathematics/snns/Manifest b/sci-mathematics/snns/Manifest
deleted file mode 100644
index 3249607055c2..000000000000
--- a/sci-mathematics/snns/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX 4.2-ldflags.patch 1117 BLAKE2B 1e2252e184abc36e48d9b147d5704d2f98406a4fbff74b5d42a52f3d68802c2236046681567a5b8c2aa621ebd5ffcd41b4023749e5f16c07376be467c39e2220 SHA512 d2157760e02e5a2a613babb9eca7e1aa61406175b90a2e0d57254dbc720deeb84efc63d8c43deb2031334a952528961640ea9ad9d5a3f9850820f9802f63c64e
-AUX 4.3-bison-version.patch 463 BLAKE2B e9835d820c0dd2cc82744c7f6bc7d3b156beddb69c7ac28a956e57322bf0fa44103e8dd527aa176530fb7eeec825480ba0113523148ef3bded1e432442b2ed60 SHA512 71d983df6634db7f045d30acae780bb810f84b09c6bfd9cb3a5894622f20c5cc6dc706bc1bfc9d7cfe6957473b4bf7dd8b568c0c9f96c70bd56918e2dacbf185
-AUX 4.3-expand-path-strings.patch 1140 BLAKE2B 21ed37be55093c0c7b6d3c7f26ee191bb5345cf2d17f73fcb59a2f02e4e09f1dcd27afd53b4b183dfd7142a81096ce88f7dce34bf7ae6906f724c07856f28a34 SHA512 d7c24ef57d31c31bc565dff0d1dc32ed39192cd9d3e5ea3d2af74431a7b8adc44235db9946523974820b7c1a9b4033ff3dcf3f2320e4c6a36dab992c80d2a1b9
-AUX 4.3-snns-netperf.patch 4398 BLAKE2B 62a46bfc87a41911c591575d9f71df67c740856aaeb50026178d609abcb580a952f50338b103a6eacb4c12527f29dd3a8fb5bfc159b2f4af985c6be58ab338b0 SHA512 316c1121e7269adc142a0dd7b7dc9882605bc4c01cb5fa15e5b1d3de93ece31e4ff27894439e54fce6c174d763133bf7cd69b2142bfb3f030609e5e9ba5d41c1
-AUX 4.3-unstrip.patch 260 BLAKE2B 31860a583d6ae1d39d360282dc50a6117972001e09773a28d36f0c0d0f991716c1078b4d3e31c795b0a97961f8ce681996a35d3735e9535377865d196de80d5b SHA512 9fb6826160850c4de977367a16ebfcd49667ee5bb5647a3a0441a32e58ce5e7649e25c03d4c43b71eab037ad13bdefe1668bedde691fc9883ed2e5e743856b16
-DIST SNNSv4.2.Manual.pdf 2103861 BLAKE2B 2eaafc53a1c6d298f8dd67d019c39ef1dec9a82cae699247235a963d1bbdc673931dabfe30240672044e7d8596d7d6bf69260682a1dad7b4849be26b0e6b7b19 SHA512 204ff6cf31cdf6496042b7f1b6a1a446c4050c3d4d92ff046dc4970c4f8d3872f5d3430d2f41138e5e5b64a77348b95960eba53b2c305954b68dd0e483828016
-DIST SNNSv4.3.tar.gz 5076669 BLAKE2B 177a6d6a03497cfb6980e6d2c2be27a38d683bdfa8132e257599a6867f150eed0f6dd66b5e43a79f812a83760ec0e40cd5879ba2d8a41e4446e289fd08b3ddc0 SHA512 a057dc946b581eee01334956c33d6870b8b994d1b835834d58c37ae3a8585dfb1206f3082b17a49ee97b22f4c07c0efb47e4e3ae5aeb37e97f69472da3e21f0b
-EBUILD snns-4.3-r2.ebuild 2822 BLAKE2B 07b7202780a03d36b9aa4390327db2f72b3d9559f371734cd6378ddd04fa6819d26bbca1dd2cad9867b1ae9e92cfd2bfaaa41ea64d90cf17d3142abd9361a7a3 SHA512 597d77c543aa0fcda731079c63eb101bbb454bcb4c07860a74b69479f2d4110fd3e54e4131c2887c73fd92050d7e43ad7311c84d8f6a5441ab4b62f96e58d473
-EBUILD snns-4.3-r3.ebuild 2859 BLAKE2B af1000dd5b7e8f145f4fdafdeb7c3b738a6c4c99249cbaf0dfb799456462a96defd2a01980542338ae63ea35d02c4e2cc3454a81a63767c0a393e1cd35530daa SHA512 913f5591e0b0f703896b76bd38a22168fef715183bf3aeb4b2c11e9da2bfbf3a2294002c3dd333db4aaa02d7ae8b35496f9410bc36c2b686ce64cedec99042d2
-MISC metadata.xml 450 BLAKE2B 298ae57bd29e85e24d63fb428ebd6f35fb17acb84ba321e138f6bff7e326f8217c9b0b63c3700570afdd84b1633be1c4bc555b4798eaba885a504baacb179525 SHA512 99adeac1400d381b82d1d3ac3b94b8e00111c7354970937aa5bea8928fdfe15ed85304f073b14018b7396d0213f47c8309b3640570da59d7e5cfd065c395f30f
diff --git a/sci-mathematics/snns/files/4.2-ldflags.patch b/sci-mathematics/snns/files/4.2-ldflags.patch
deleted file mode 100644
index 9ff4769731d1..000000000000
--- a/sci-mathematics/snns/files/4.2-ldflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Respect LDFLAGS
-
-https://bugs.gentoo.org/show_bug.cgi?id=332475
-
---- a/tools/sources/Makefile
-+++ b/tools/sources/Makefile
-@@ -147,19 +147,19 @@
- # Linking of single stand alone programs
- 
- analyze: analyze.o
--	$(CC) analyze.o -lm -o analyze
-+	$(CC) $(LDFLAGS) analyze.o -lm -o analyze
- 
- pat_sel_simple: pat_sel_simple.o
--	$(CC) pat_sel_simple.o -lm -o pat_sel_simple
-+	$(CC) $(LDFLAGS) pat_sel_simple.o -lm -o pat_sel_simple
- 
- mkhead: mkhead.o
--	$(CC) mkhead.o -lm -o mkhead
-+	$(CC) $(LDFLAGS) mkhead.o -lm -o mkhead
- 
- mkout: mkout.o
--	$(CC) mkout.o -lm -o mkout
-+	$(CC) $(LDFLAGS) mkout.o -lm -o mkout
- 
- mkpat: mkpat.o
--	$(CC) mkpat.o -lm -o mkpat
-+	$(CC) $(LDFLAGS) mkpat.o -lm -o mkpat
- 
- 
- # Make sure that kernel libs are available and up to date
---- a/xgui/sources/Makefile
-+++ b/xgui/sources/Makefile
-@@ -202,7 +202,7 @@
- # Linking of xgui
- 
- xgui: $(LIBXGUI1) $(LIBXGUI2) $(BN3DLIB) $(KERNELLIBS)
--	$(CC) $(LIBXGUI1) $(LIBXGUI2) $(BN3DLIB) \
-+	$(CC) $(LDFLAGS) $(LIBXGUI1) $(LIBXGUI2) $(BN3DLIB) \
- 	$(X_LIBS) -lXaw3d -lXmu -lXt -lXext $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) \
- 	$(KERNELALLLIBS) -o xgui 
- 
diff --git a/sci-mathematics/snns/files/4.3-bison-version.patch b/sci-mathematics/snns/files/4.3-bison-version.patch
deleted file mode 100644
index ceb4b1e43c00..000000000000
--- a/sci-mathematics/snns/files/4.3-bison-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure	2015-04-08 16:27:05.000000000 -0400
-+++ b/configure	2015-04-08 16:26:41.000000000 -0400
-@@ -5071,7 +5071,7 @@
- else
-     { echo "$as_me:$LINENO: checking for version of bison" >&5
- echo $ECHO_N "checking for version of bison... $ECHO_C" >&6; }
--    bison_version=`$BISON --version`
-+    bison_version=`$BISON --version |head -n 1`
-     { echo "$as_me:$LINENO: result: $bison_version" >&5
- echo "${ECHO_T}$bison_version" >&6; }
-     warn_bison=yes
diff --git a/sci-mathematics/snns/files/4.3-expand-path-strings.patch b/sci-mathematics/snns/files/4.3-expand-path-strings.patch
deleted file mode 100644
index e62a3cfa6cd4..000000000000
--- a/sci-mathematics/snns/files/4.3-expand-path-strings.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/tools/sources/convert2snns.c	2008-04-21 03:56:07.000000000 -0400
-+++ b/tools/sources/convert2snns.c	2017-12-14 11:13:12.056308969 -0500
-@@ -54,8 +54,8 @@
- /* Init functionname */
- #define KOHONEN_INIT_FUNC_NAME      "Kohonen_Weights_v3.2"
- 
--char   *control_file,pattern_file[80],weight_file[80],
--       string[80],name[50];
-+char   *control_file,pattern_file[256],weight_file[256],
-+       string[256],name[256];
- int    no_of_exemplars,X,Y,
-        ret, i, j, unit_no,
-        IUnits, OUnits, HUnits;
---- a/tools/sources/snns2c.c	2017-12-14 11:05:48.372487874 -0500
-+++ b/tools/sources/snns2c.c	2017-12-14 11:11:08.484915822 -0500
-@@ -1622,7 +1622,7 @@
-   FILE   *fOutFile, *fHeaderFile;
-   pList  OutList, FunctionList;
-   time_t   timer;
--  char   HeaderFile[50];
-+  char   HeaderFile[256];
- 
-   /* calculate time for the date in the header of the output file */
-   time(&timer);
-@@ -1824,7 +1824,7 @@
-   FILE   *fOutFile, *fHeaderFile;
-   pList  OutList, FunctionList;
-   time_t timer;
--  char   HeaderFile[50];
-+  char   HeaderFile[256];
- 
-   /* calculate time for the date in the header of the output file */
-   time(&timer);
diff --git a/sci-mathematics/snns/files/4.3-snns-netperf.patch b/sci-mathematics/snns/files/4.3-snns-netperf.patch
deleted file mode 100644
index f154a538b2d9..000000000000
--- a/sci-mathematics/snns/files/4.3-snns-netperf.patch
+++ /dev/null
@@ -1,164 +0,0 @@
---- a/examples/nettalk.README	2008-04-21 03:55:43.000000000 -0400
-+++ b/examples/nettalk.README	2015-04-14 09:38:23.836014999 -0400
-@@ -60,7 +60,7 @@
- Hints:
- ======
- 
--We usually call nettalk.net from the tool 'netperf', a benchmarking
-+We usually call nettalk.net from the tool 'snns-netperf', a benchmarking
- version of SNNS without graphical user interface but with the full and
- current SNNS kernel. It is supplied with SNNS in the tools directory.
- We usually train and test nettalk for 10 cycles. Since convergence is
---- a/man/man1/snns.1	2008-04-21 03:56:05.000000000 -0400
-+++ b/man/man1/snns.1	2015-04-14 09:36:27.406012874 -0400
-@@ -111,7 +111,7 @@
- .BR netlearn (1)
- backpropagation test program
- 
--.BR netperf (1)
-+.BR snns-netperf (1)
- benchmark program
- 
- .BR pat_sel (1)
-@@ -132,4 +132,4 @@
- yet. 
- 
- .SH AUTHOR
--Guenter W. Mamier 
-\ No newline at end of file
-+Guenter W. Mamier 
---- a/tools/doc/netperf.doc	2008-04-21 03:56:06.000000000 -0400
-+++ b/tools/doc/netperf.doc	1969-12-31 19:00:00.000000000 -0500
-@@ -1,49 +0,0 @@
--                  ===============================
--                  Description of the tool NETPERF
--                  ===============================
--
--This is a benchmark program for SNNS. Propagtion and
--backpropagation tests are performed.
--
--synopsis: netperf
--
--
--example:
--
--unix >netperf
--
--produces
--
--  SNNS 3D-Kernel V3.1000
--  -----  Benchmark Test  -----
--
--  Filename of the network file: ../../../examples/nettalk.net
--  Loading the network ...
--
--  Network name: nettalk1
--  No. of units       : 349
--  No. of input units : 203
--  No. of output units: 26
--  No. of sites: 0
--  No. of links: 27480
--
--  Learning function: Std_Backpropagation
--  Update function  : Topological_Order
--
--  Do you want to benchmark
--  Propagation [1] or
--  Backpropagation [2] ?
--  Input: 1
--
--  Choose no. of cycles: 100
--
--  Begin propagation ...
--
--
--  No. of units updated: 34900
--  No. of sites updated: 0
--  No. of links updated: 2748000
--  CPU Time used: 3.05 seconds
--
--  No. of connection per second (CPS): 9.0098e+05
--
---- a/tools/doc/snns-netperf.doc	1969-12-31 19:00:00.000000000 -0500
-+++ b/tools/doc/snns-netperf.doc	2015-04-14 09:37:21.126013855 -0400
-@@ -0,0 +1,49 @@
-+                ====================================
-+                Description of the tool SNNS-NETPERF
-+                ====================================
-+
-+This is a benchmark program for SNNS. Propagtion and
-+backpropagation tests are performed.
-+
-+synopsis: snns-netperf
-+
-+
-+example:
-+
-+unix >snns-netperf
-+
-+produces
-+
-+  SNNS 3D-Kernel V3.1000
-+  -----  Benchmark Test  -----
-+
-+  Filename of the network file: ../../../examples/nettalk.net
-+  Loading the network ...
-+
-+  Network name: nettalk1
-+  No. of units       : 349
-+  No. of input units : 203
-+  No. of output units: 26
-+  No. of sites: 0
-+  No. of links: 27480
-+
-+  Learning function: Std_Backpropagation
-+  Update function  : Topological_Order
-+
-+  Do you want to benchmark
-+  Propagation [1] or
-+  Backpropagation [2] ?
-+  Input: 1
-+
-+  Choose no. of cycles: 100
-+
-+  Begin propagation ...
-+
-+
-+  No. of units updated: 34900
-+  No. of sites updated: 0
-+  No. of links updated: 2748000
-+  CPU Time used: 3.05 seconds
-+
-+  No. of connection per second (CPS): 9.0098e+05
-+
---- a/tools/sources/Makefile	2015-04-14 09:34:31.386010756 -0400
-+++ b/tools/sources/Makefile	2015-04-14 09:35:50.526012201 -0400
-@@ -89,7 +89,7 @@
- 
- TOOLS_PRG          = $(TOOLS_SOURCES_C:.c=)
- KRTOOLS_PRG        = snns2c pat_sel netlearn td_bignet ff_bignet \
--                     netperf snnsbat feedback-gennet convert2snns \
-+                     snns-netperf snnsbat feedback-gennet convert2snns \
-                      isnns linknets
- BATCH_PRG          = batchman
- 
-@@ -110,7 +110,7 @@
- tools:       $(TOOLS_PRG) $(KRTOOLS_PRG) $(BATCH_PRG)
- 
- $(TOOLSBINDIR):
--	-mkdir $(TOOLSBINDIR)
-+	-mkdir -p $(TOOLSBINDIR)
- 
- install: tools $(TOOLSBINDIR)
- 	for tooltarget in $(TOOLS_PRG) $(KRTOOLS_PRG) $(BATCH_PRG) ; do \
-@@ -191,8 +191,8 @@
- ff_bignet: ff_bignet.o $(KERNELLIBS)
- 	$(CC) $(LDFLAGS) ff_bignet.o $(KERNELALLLIBS) -o ff_bignet
- 
--netperf: netperf.o $(KERNELLIBS)
--	$(CC) $(LDFLAGS) netperf.o $(KERNELALLLIBS) -o netperf
-+snns-netperf: netperf.o $(KERNELLIBS)
-+	$(CC) $(LDFLAGS) netperf.o $(KERNELALLLIBS) -o snns-netperf
- 
- snnsbat: snnsbat.o $(KERNELLIBS)
- 	$(CC) $(LDFLAGS) snnsbat.o $(KERNELALLLIBS) -o snnsbat
diff --git a/sci-mathematics/snns/files/4.3-unstrip.patch b/sci-mathematics/snns/files/4.3-unstrip.patch
deleted file mode 100644
index 4f36040e2218..000000000000
--- a/sci-mathematics/snns/files/4.3-unstrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configuration/install-sh	2008-04-21 03:55:33.000000000 -0400
-+++ b/configuration/install-sh	2015-04-08 16:59:32.000000000 -0400
-@@ -79,7 +79,7 @@
- 	    shift
- 	    continue;;
- 
--	-s) stripcmd="$stripprog"
-+	-s) stripcmd=""
- 	    shift
- 	    continue;;
- 
diff --git a/sci-mathematics/snns/metadata.xml b/sci-mathematics/snns/metadata.xml
deleted file mode 100644
index cc5d9687eb2d..000000000000
--- a/sci-mathematics/snns/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>axs@gentoo.org</email>
-		<name>Ian Stakenvicius</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">snns</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/snns/snns-4.3-r2.ebuild b/sci-mathematics/snns/snns-4.3-r2.ebuild
deleted file mode 100644
index 475bb92a24e5..000000000000
--- a/sci-mathematics/snns/snns-4.3-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1 eutils
-
-MY_P="SNNSv${PV}"
-DESCRIPTION="Stuttgart Neural Network Simulator"
-HOMEPAGE="https://sourceforge.net/projects/snns/"
-SRC_URI="http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
-	doc? ( http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf )"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE="X doc python"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXaw3d
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	>=sys-devel/bison-1.2.2"
-
-RDEPEND+=" python? ( ${PYTHON_DEPS} )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/4.3-unstrip.patch
-	epatch "${FILESDIR}"/4.3-bison-version.patch
-	epatch "${FILESDIR}"/4.2-ldflags.patch
-	epatch "${FILESDIR}"/4.3-snns-netperf.patch # bug 248322
-
-	# change all references of Xaw to Xaw3d
-	cd "${S}"/xgui/sources
-	for file in *.c; do
-		sed -e "s:X11/Xaw/:X11/Xaw3d/:g" -i "${file}"
-	done
-
-	# clean up the dirty dist sources and remove files that apparently
-	# are not removed by any clean rules
-	emake clean
-	rm -Rf "${S}"/{tools,xgui}/bin \
-		"${S}"/{Makefile.def,config.h} \
-		"${S}"/configuration/config.{guess,log}
-
-	epatch_user
-
-	if use python; then
-		pushd "${S}"/python > /dev/null || die
-		distutils-r1_src_prepare
-		popd > /dev/null || die
-	fi
-}
-
-src_configure() {
-	econf --enable-global \
-		$(use_with X x)
-
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	local compileopts=( compile-kernel compile-tools )
-	use X && compileopts+=( compile-xgui )
-
-	# parallel make sometimes fails (phosphan)
-	# so emake each phase separately (axs)
-	for tgt in "${compileopts[@]}"; do
-		emake ${tgt}
-	done
-
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	pushd "${S}"/tools/sources > /dev/null || die
-	emake TOOLSBINDIR="${ED}"usr/bin install
-	popd > /dev/null || die
-
-	if use X; then
-		newbin xgui/sources/xgui snns
-
-		echo XGUILOADPATH=/usr/share/doc/${PF} > "${T}"/99snns
-		doenvd "${T}"/99snns
-
-		docompress -x /usr/share/doc/${PF}/{default.cfg,help.hdoc}
-		insinto /usr/share/doc/${PF}
-		doins default.cfg help.hdoc
-	fi
-
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_src_install
-		insinto /usr/share/doc/${PF}/python-examples
-		doins examples/*
-		newdoc README README.python
-		popd > /dev/null || die
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/SNNSv4.2.Manual.pdf
-	fi
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-	doman man/man*/*
-}
diff --git a/sci-mathematics/snns/snns-4.3-r3.ebuild b/sci-mathematics/snns/snns-4.3-r3.ebuild
deleted file mode 100644
index 706463b27ba5..000000000000
--- a/sci-mathematics/snns/snns-4.3-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1
-
-MY_P="SNNSv${PV}"
-DESCRIPTION="Stuttgart Neural Network Simulator"
-HOMEPAGE="https://sourceforge.net/projects/snns/"
-SRC_URI="http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
-	doc? ( http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf )"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="X doc python"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXaw3d
-		x11-libs/libXt
-	)
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	>=sys-devel/bison-1.2.2"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/4.3-unstrip.patch
-	eapply "${FILESDIR}"/4.3-bison-version.patch
-	eapply "${FILESDIR}"/4.2-ldflags.patch
-	eapply "${FILESDIR}"/4.3-snns-netperf.patch # bug 248322
-	eapply "${FILESDIR}"/4.3-expand-path-strings.patch
-
-	# change all references of Xaw to Xaw3d
-	cd "${S}"/xgui/sources
-	for file in *.c; do
-		sed -e "s:X11/Xaw/:X11/Xaw3d/:g" -i "${file}"
-	done
-
-	# clean up the dirty dist sources and remove files that apparently
-	# are not removed by any clean rules
-	emake clean
-	rm -Rf "${S}"/{tools,xgui}/bin \
-		"${S}"/{Makefile.def,config.h} \
-		"${S}"/configuration/config.{guess,log}
-
-	eapply_user
-
-	if use python; then
-		pushd "${S}"/python > /dev/null || die
-		distutils-r1_src_prepare
-		popd > /dev/null || die
-	fi
-}
-
-src_configure() {
-	econf --enable-global \
-		$(use_with X x)
-
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	local compileopts=( compile-kernel compile-tools )
-	use X && compileopts+=( compile-xgui )
-
-	# parallel make sometimes fails (phosphan)
-	# so emake each phase separately (axs)
-	for tgt in "${compileopts[@]}"; do
-		emake ${tgt}
-	done
-
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	pushd "${S}"/tools/sources > /dev/null || die
-	emake TOOLSBINDIR="${ED}"usr/bin install
-	popd > /dev/null || die
-
-	if use X; then
-		newbin xgui/sources/xgui snns
-
-		echo XGUILOADPATH=/usr/share/doc/${PF} > "${T}"/99snns
-		doenvd "${T}"/99snns
-
-		docompress -x /usr/share/doc/${PF}/{default.cfg,help.hdoc}
-		insinto /usr/share/doc/${PF}
-		doins default.cfg help.hdoc
-	fi
-
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_src_install
-		insinto /usr/share/doc/${PF}/python-examples
-		doins examples/*
-		newdoc README README.python
-		popd > /dev/null || die
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/SNNSv4.2.Manual.pdf
-	fi
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-	doman man/man*/*
-}
diff --git a/sci-mathematics/twelf/Manifest b/sci-mathematics/twelf/Manifest
index 974e439b52b8..da382e5b8f87 100644
--- a/sci-mathematics/twelf/Manifest
+++ b/sci-mathematics/twelf/Manifest
@@ -7,6 +7,6 @@ AUX twelf-1.7.1-emacs-twelf.patch 602 BLAKE2B b4b7572bd3b87013332e26096aa92a698e
 AUX twelf-1.7.1-mlton-20180207.patch 310 BLAKE2B b372c7ca65b4bb12983d84e590d4e303e4b41308ad6f6ccb3f28101e78e18a7138cb5a65011eeec8f04ba990e29804ec02d3faf11e4c6ca998f40f419bca3472 SHA512 4d8044248a28d92e961baa1a935de8f6f52751218e65abd2cae9a264c66e446608d73d6a993df07671330b003735d2fee4e75653e9a324844a0042333b28fdd1
 AUX twelf-1.7.1-mlton-mlb.patch 11244 BLAKE2B e07adfd1520179a8ca3c292638689c8cc344b8d01ebcf2ba9f668cbf2afa5b5132a88d0521ca4123a9165d8fea49cdbab20b48b791bd3e78610d54b534e9e596 SHA512 2d0f42399e444cbb736f38ad7bdc54f51322c17c010b273c365d9db9a1e6c045c19b872d4b5c1e50444559a981aa5569764ac859c7702c116c97c935fd959bfd
 DIST twelf-src-1.7.1.tar.gz 1147610 BLAKE2B 9fbb3c5a4823845a0c721112744330658be0e68784ef209a3d17fb72874ef50d7dbb434a7104704a5540f2f0bc30727bfe1ff602f986570f944454e77c24609d SHA512 1b4baa0f385b6b605583a9da312f23c775aab43e7398c6e151833a6b95c74112492530f44fcb7b14f8288774e9b63e2f9618a5debfbc4d34737bc2588f5850df
-EBUILD twelf-1.7.1-r1.ebuild 2428 BLAKE2B 5c7fc4a2d9d7df7526d5831a25d60add7187e871f17908a566d0089b023fede5001717876ecb3ad7e194e7aca0f9d68fad920a12e7c47c41f11d709e2e306331 SHA512 13352c5bc97c7827e8593f4c9f5c093385a039f4194a9ee78df525afb03254283f5a55b0e2abab7c35175433b078d5f648446bd9ae9a64331ca68f6b3fdefd08
-EBUILD twelf-1.7.1.ebuild 2356 BLAKE2B 7d1142527e925458868d2453c73a542f59419beb0752c7080475a04e3094cdad76ce0b34f378fc7b1ca66a0e05dfbac197fbaa1dcea9d38e443981af5e33ea47 SHA512 d34f450bed992b729272b78f61bb1cda0b0b88903331690d8d21d9a511300ddcf01a5f3c796798b4919c0040aabb30759ad08b003cf19c5820b55ac185a4edf9
+EBUILD twelf-1.7.1-r1.ebuild 2438 BLAKE2B 2b0f2461f8c1f6b245ea41f39043f3f1ad3633643521c1fccd5384acd319962c1d403a7de9d1d6c655a54a44b10daf215da28e6f82ebeadc77286717072f73b8 SHA512 4de8be441caf012ee6735e37408072639491935ab114c1b8966a4c3ed3bc238293ca63e6a5c0869912f9e0b2ebc5fd2274ac5519ea2c10645c73fd04a003c4cd
+EBUILD twelf-1.7.1.ebuild 2366 BLAKE2B aa2a68eddd7ba17aa5966d01937afc5085a8bf37e0bdcb2b7a9abc62cd092aa9ab7a338d5b01be6e2ebdb2fbcbd264b34bedce90bbf0115a3f5c0cbead05ec95 SHA512 6e3dfa9bea7843bb43903b963ad6cc3764a69cfffc0651788fdb140191981f8edf6cc2adb401b7d118ad9bcbbf01ff539effba702f296e5eb05476dc2fab7e8c
 MISC metadata.xml 446 BLAKE2B 318daa8b8e87beff1553a9e49e7db737736b8bad6f157753f42dd8fcfa0941dd83273cab94c056ab4e9555019263f1356e99baea1ef4dbca1da2df3d8f096ec7 SHA512 7fcca73104456672c8e262129cdcc232073d6d0a4cd48d6593734646a3611ac6056325cc88be5c3a3585d67bc76fa9fb663a0171df7b84612c56c0ec93bc0e2e
diff --git a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild b/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
index 56b41fcc37e9..21d5f0f5a01a 100644
--- a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,7 +27,7 @@ RDEPEND="
 		app-text/texi2html
 	)
 	emacs? (
-		virtual/emacs
+		>=app-editors/emacs-23.1:*
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild
index f9334067c389..9506fdd82542 100644
--- a/sci-mathematics/twelf/twelf-1.7.1.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -27,7 +27,7 @@ RDEPEND="
 		app-text/texi2html
 	)
 	emacs? (
-		virtual/emacs
+		>=app-editors/emacs-23.1:*
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index a26a6debde4c..c7e4d5cf6348 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -2,6 +2,7 @@ AUX why3-for-spark-2018-gentoo.patch 1015 BLAKE2B 201846ae0ef17bc6d777b7c1a8badd
 AUX why3-for-spark-2019-gentoo.patch 432 BLAKE2B 44e4dda628cdd9b1d27d000ac0e9a37e56cb87a704cf7f83c634775f7ecf8d868d9750561e078c318be5079f91bf9e0f30de9616e781a8a128fdd853e74b431f SHA512 804d9914031450ebdeeea24d2aad472b1765e0534d8ebe404189f039d78be361b51deb21027c85f2d1919668c1f5ef25e65694424a22f7533e5cd264e7e5a191
 DIST why3-2019-20190517-197BB-src.tar.gz 9439414 BLAKE2B 68072064e8ee9152528c90afc948047a1f4d58b960ac05b276761fdca5ba1204100c75f33db7bb0ea1a8a646b734e62892ed41bd875b954354f52b8f9d498d4a SHA512 9169a4ff9ee994a19f9f04b689d1b9c679f5340bcd631d7d49b4c55064f505bd5a6ca8149077e5d24d36f5365f0cab58587094e86f352a9105fc46f10c0746ba
 DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
-EBUILD why3-for-spark-2018.ebuild 1699 BLAKE2B 5d648c18c5c77e02afab395c874a769042acc6b705901477c016bd3ab77c02a892116d3a0d85631a67a2ffacc7cf044a4de3547b20deb3e2fdabdafd6648d6ca SHA512 271340f364718d8a29b36b4def19806d8428d7b84c0b8e882898018c91cfc892ae2f6d3d0dc74e05a5788ba0d73810ca1537b4f2ebb1f84f21f2cb588246a607
-EBUILD why3-for-spark-2019.ebuild 1768 BLAKE2B e598cf8b526394df6493c1f8753d0e45c9ec29a4e2337c19a16f00ccaa87bbf7021f0e9d5d2a3d336ac442350b8cc9280bc27bcb4483072998e297041887d8bd SHA512 43b68af3ada262eec23ed89adbf8e2ae3524a915eb649d219f9cbf663ad6face045ef3a29ad9a89d58d20fc00ce006216daf63ec0c6dcbe21612a8762e2a240a
+EBUILD why3-for-spark-2018.ebuild 1712 BLAKE2B 6bab5512436341fe88e22657752081b5ed78f6ae27f1b3e5dc95a916a2b641f1f362aba40a333b74622a3832b5c385100d9266bdc25a692f43a20a93be2605a8 SHA512 0077d68c18911e71f5ff3a54b48700b3e63dbf976acf9f153ebb9ce81d8de6f697b9750be0ac5dfd214f40677a3dbe9325d8005df169a853b90980099d7ce762
+EBUILD why3-for-spark-2019-r1.ebuild 1829 BLAKE2B 6329924da6edd1c9174ed3ce4b469e6b32ced981761a63077c75a4b28d4299365d1382dade9e5631f2fad90815f80afe828b01f517275c1f9c9d167f769fba8c SHA512 c8e256b8c9944791f2d86e86e2e48d277a6e98196de2f62f6d6afcf92d8d900d63a0971fc9f8575b752fc7a83082bffdf96f3bb5ca39c63e68f4b4cb9da413d2
+EBUILD why3-for-spark-2019.ebuild 1781 BLAKE2B 00bb8e39eff2bc94757bb823c663911ad308488a3d3491e6f00a4a30e541a2724a7e29f999c4c32966d9cc45feaf99b76bf3259a6014b133d9125ccff687fdbf SHA512 81e68202740eaea33e19dad98c14e6baa9fafaa69a4a25d87132bb55248d977cc94871f50929802f67fd670a068f01ae62d9863a8a091e97c4e5d762566850c3
 MISC metadata.xml 1363 BLAKE2B 820bfc974ca6984f78340f223f8f19d12f0313016118110a35cfe149129c2dc189d6f03f34bf3d30c9d3e5d9c9ab90bba33dca4320c034821a7a89f97b92a7f9 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
index 5400b37276c2..2335a61928f9 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
@@ -23,7 +23,7 @@ DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
 	coq? ( sci-mathematics/coq )
 	doc? ( dev-tex/rubber )
 	gtk? ( dev-ml/lablgtk[sourceview] )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	html? ( dev-tex/hevea )
 	hypothesis-selection? ( dev-ml/ocamlgraph )
 	zarith? ( dev-ml/zarith )
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild
new file mode 100644
index 000000000000..8d152264c067
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MYP=why3-${PV}-20190517-197BB-src
+
+DESCRIPTION="Platform for deductive program verification"
+HOMEPAGE="http://why3.lri.fr/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
+RESTRICT=strip
+
+DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt?]
+	>=dev-ml/ocamlbuild-0.14.0
+	dev-ml/menhir
+	dev-ml/num
+	coq? ( >=sci-mathematics/coq-8.9.1 )
+	doc? ( dev-tex/rubber )
+	gtk? ( dev-ml/lablgtk[sourceview] )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	html? ( dev-tex/hevea )
+	hypothesis-selection? ( dev-ml/ocamlgraph )
+	zarith? ( dev-ml/zarith )
+	zip? ( >=dev-ml/camlzip-1.07 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+REQUIRED_USE="html? ( doc )"
+
+src_configure() {
+	econf \
+		--disable-pvs-libs \
+		--disable-isabelle-libs \
+		--enable-verbose-make \
+		$(use_enable coq coq-libs) \
+		$(use_enable doc) \
+		$(use_enable emacs emacs-compilation) \
+		$(use_enable gtk ide) \
+		$(use_enable html html-doc) \
+		$(use_enable hypothesis-selection) \
+		$(use_enable ocamlopt native-code) \
+		$(use_enable profiling) \
+		$(use_enable zarith) \
+		$(use_enable zip)
+}
+
+src_compile() {
+	emake -j1
+	if use ocamlopt; then
+		emake byte
+	fi
+	use doc && emake doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install
+	emake DESTDIR="${D}" -j1 install-lib
+	emake DESTDIR="${D}" install_spark2014_dev
+	dosym ../why3server /usr/$(get_libdir)/why3/commands/why3server
+	einstalldocs
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r examples
+	if use doc; then
+		dodoc doc/manual.pdf
+		use html && dodoc -r doc/html
+	fi
+}
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
index a0caa7b6cf68..409bfc36cda5 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild
@@ -23,7 +23,7 @@ DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
 	coq? ( sci-mathematics/coq )
 	doc? ( dev-tex/rubber )
 	gtk? ( dev-ml/lablgtk[sourceview] )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	html? ( dev-tex/hevea )
 	hypothesis-selection? ( dev-ml/ocamlgraph )
 	zarith? ( dev-ml/zarith )
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 23810b10c33c..d71338ac611c 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,15 +1,8 @@
+AUX wxmaxima-19.12.2.patch 640 BLAKE2B 24b61f183bda737d581fcbefda5a0f6bd0c30497bcf9bf7c79142882753a6e3f7f5a9b2207ebf6849b883742f6920cc48af984c36f22957aec94d09cd02e5d84 SHA512 6a03b90ef4911a0464ef71afd39d27f47964487d587f8ba7b93a840fbaa877dceb77505a5fea5088fbf7c87d1835101017d74492ae830500c38c70f3020050f0
 DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
-DIST wxmaxima-19.05.7.tar.gz 13832202 BLAKE2B 6afe37dfcefe3f1711cc1cc89e4c61071dff2d49c60742a6d64ece9fa029823f6e94e20eb69e6d6cd8ccad1f5f656670089d593752f4be4d179222f5f2090d53 SHA512 3a7caee5ab03eefd4d2811345678d7b74081b0a4315dcc7739dbf4d265d274bb47a93ace5980a30185a13f40c1c970a8e4ba444bdd64b8b9ebd3b9a263cc6c06
-DIST wxmaxima-19.08.1.tar.gz 15153254 BLAKE2B 1bd48735ab95b078b9f35d7be623c1a16da6764649254579a2c2252ff858adb05e9408a85e5ed84dba6f15f879db761472276a5da77fa15e1c1823c678160aa3 SHA512 07f650144b8acd8295a45411185805185078f5236b67b33dac0f12308fc3b7522a6a46dfd2df35397c1d2fd5a357fb8d12473be4af576fcf09bda1e34352ae68
-DIST wxmaxima-19.09.0.tar.gz 15153282 BLAKE2B 96cb2db8938b73fb2dc3547310109df581a780a0372687aed9957cd3434fcbec8fef23467543f854f7e6b2c302dba6f3d5a411b17ab83e886175a62dc3fac385 SHA512 fad35fa118e49834d2ff6d54fb1f7cb8675ca1caadbb43c526b7a313479412c1a6c69959a0820c17af0119fc926f66c31368598c9e212fac56305a96d7a39838
-DIST wxmaxima-19.10.0.tar.gz 16573758 BLAKE2B 9bee3f8822e9c9ed28058496f7c5c6b2358feeafad39d08d92f3e6ff382817a8a7fd3e33b821f6faba3863f4c8871bc3bebee2b9d97ec6ccfdbfd7c0f7d44940 SHA512 39681cefb81a3816b7daeef7df5b23f57f3a4572ff34396fd447829ceaf6505d09f730255d3c44dd48232879b9994f26a9f86801fe333e15483026d864efdf14
-DIST wxmaxima-19.11.0.tar.gz 15304346 BLAKE2B 3a8038f4b67cee261d261f64671227963f91b55969b922282c3b2057029617a5989dc44dc8c28ab17a74e57c2547381dab98b07bf2a1f2f01a5d3c838d6d8a68 SHA512 bb0701ad2be71463ab412649164b2040e5fe95bd6fadb5332fbe5712dc4b65ef30fc86f2ff375e14f1879156fd77e1b8431f15794a136d7e6ee4e6a9393b903a
-DIST wxmaxima-19.12.1.tar.gz 15303584 BLAKE2B 0d7d1fb738563ba0d5805ddc746fc88548c76f249d6c79217f558b7a29c497cf4865810c4aa52f5787e9f4b87aacc93a6ce05726c3bc423c74f382b572ced12d SHA512 74bb60223fb47528f08ed737709eb703d533c27fadfd87deece08f6ec2a6ef1caa489f7ad31f0204010b1b421ab992b4167be133c69bca1b56872685ec0b2cad
+DIST wxmaxima-19.12.2.tar.gz 15765011 BLAKE2B fa788a9b5c204a06f85f84a89548af3b846e3e06f572df2b0f2d74aaf6dbfea98b26d8bbfd7c1c62ab8a0aa376d1af9d37bce563b474f5badf2a2bde43135d61 SHA512 5614f78f169eb1cacb46ae46ddb754103aa85cf90b309fffece4543fc06c600e967e2ea73bb8b82065075ded82fea44ccd709be651f5075e3b91edb304ad5ab6
+DIST wxmaxima-20.01.1.tar.gz 14011946 BLAKE2B ed80f02158aa0c43f37c040225010b35eea49756d8f052bcfa245d31a4a2203880463f51833ed40f2e1365473eb138269287c30a52e9f9b98ef4d9a5daac8cf5 SHA512 bff946f87db39b4bf416ef3440fdfea277f9dc9ed95debcea5798211299ae8c8dbb136a44be586a79e538b99fd38c46febf5378caab6ac31a01a01033f083937
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
-EBUILD wxmaxima-19.05.7.ebuild 1460 BLAKE2B 1137943c8725f8a47b31404ff691f4d865f419b9bdc224a851decc4d76c067c4b7dec561039c6b6efa9c6fc8b2643bb8f57f4c94dec60db954b8a02a3d049f65 SHA512 7437cacffb38ce11970036778acb916aadec00ad84e8d8de0f9627bb935e96caac30ede0f6b08ea72539fb3e93d96879796773741d95402df239536418e6dff4
-EBUILD wxmaxima-19.08.1.ebuild 1460 BLAKE2B 1137943c8725f8a47b31404ff691f4d865f419b9bdc224a851decc4d76c067c4b7dec561039c6b6efa9c6fc8b2643bb8f57f4c94dec60db954b8a02a3d049f65 SHA512 7437cacffb38ce11970036778acb916aadec00ad84e8d8de0f9627bb935e96caac30ede0f6b08ea72539fb3e93d96879796773741d95402df239536418e6dff4
-EBUILD wxmaxima-19.09.0.ebuild 1234 BLAKE2B 8cd862e12a583116859213c861d120095b88f5a815fcf8aed15499eaadaedcc5c0eae3c1e5b40e5bd4beae165fba68408c1c0772bf69ed28651264e214a82bf8 SHA512 f544e092e687134e312791a7b4d003bcc15b42aded3bc9e464ab1271c6e626fdb5fbdd87ae52c189a5e901099d3f8d47a9431b46c449f499081488b39d0e5218
-EBUILD wxmaxima-19.10.0.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
-EBUILD wxmaxima-19.11.0.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
-EBUILD wxmaxima-19.12.1.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
+EBUILD wxmaxima-19.12.2.ebuild 1367 BLAKE2B c12cba8e651a1edce842d59215dbe0e5ce34bdfd56db12e99c7338f4954f88fb31e4f298363fb13559e478ee903ecacd0245e4e0a6a5fb9cd9edc94164e7303a SHA512 87d33b367e9a0ff368443102c7da34a7ed3064a4ceb4d7d34b4abb61047903aa9cd9838f8d59ee4a1545e4d00f029e02215ed7c3d838a54aaf134c14612c1889
+EBUILD wxmaxima-20.01.1.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/files/wxmaxima-19.12.2.patch b/sci-mathematics/wxmaxima/files/wxmaxima-19.12.2.patch
new file mode 100644
index 000000000000..79ccce08390d
--- /dev/null
+++ b/sci-mathematics/wxmaxima/files/wxmaxima-19.12.2.patch
@@ -0,0 +1,10 @@
+diff -r -U1 wxmaxima-Version-19.12.2.orig/src/Dirstructure.cpp wxmaxima-Version-19.12.2/src/Dirstructure.cpp
+--- wxmaxima-Version-19.12.2.orig/src/Dirstructure.cpp	2019-12-22 17:54:12.000000000 +0700
++++ wxmaxima-Version-19.12.2/src/Dirstructure.cpp	2019-12-24 22:47:33.433140055 +0700
+@@ -43,4 +43,4 @@
+   // The path Gentoo hides the manual at
+-  if(wxDirExists(m_helpDir + wxString::Format("doc/wxmaxima-%s",GITVERSION)))
+-    m_helpDir += wxString::Format("doc/wxmaxima-%s",GITVERSION);
++  if(wxDirExists(m_helpDir + wxString::Format("/doc/wxmaxima-%s",GITVERSION)))
++    m_helpDir += wxString::Format("/doc/wxmaxima-%s",GITVERSION);
+ 
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild
deleted file mode 100644
index 6e3b401b1d7f..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="http://wxmaxima-developers.github.io/wxmaxima/"
-SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-S="${WORKDIR}"/${PN}-Version-${PV}
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	setup-wxwidgets
-	cmake-utils_src_prepare
-
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
-		|| die "sed info/CMakeLists.txt failed"
-
-	# locales
-	rm_po() {
-		rm "${S}"/locales/${1}.po || die "rm ${1}.po failed"
-	}
-	l10n_find_plocales_changes "${S}"/locales '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.08.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.08.1.ebuild
deleted file mode 100644
index 6e3b401b1d7f..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.08.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="http://wxmaxima-developers.github.io/wxmaxima/"
-SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-S="${WORKDIR}"/${PN}-Version-${PV}
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	setup-wxwidgets
-	cmake-utils_src_prepare
-
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
-		|| die "sed info/CMakeLists.txt failed"
-
-	# locales
-	rm_po() {
-		rm "${S}"/locales/${1}.po || die "rm ${1}.po failed"
-	}
-	l10n_find_plocales_changes "${S}"/locales '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.09.0.ebuild
deleted file mode 100644
index f73edd67a189..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.09.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils wxwidgets l10n xdg
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
-SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-S="${WORKDIR}"/${PN}-Version-${PV}
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	setup-wxwidgets
-	cmake-utils_src_prepare
-
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
-		|| die "sed info/CMakeLists.txt failed"
-
-	# locales
-	rm_po() {
-		rm "${S}"/locales/${1}.po || die "rm ${1}.po failed"
-	}
-	l10n_find_plocales_changes "${S}"/locales '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.12.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.12.1.ebuild
deleted file mode 100644
index b22b9bbbbd26..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.12.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils wxwidgets l10n xdg
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
-SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-S="${WORKDIR}"/${PN}-Version-${PV}
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	setup-wxwidgets
-	cmake-utils_src_prepare
-
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
-		|| die "sed info/CMakeLists.txt failed"
-
-	# locales
-	rm_po() {
-		rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f "${S}"/locales/manual/${1}.po
-		rm -f "${S}"/locales/wxwin/${1}.po
-		rm -f "${S}"/info/${PN}.${1}.md
-		rm -f "${S}"/info/${PN}.${1}.html
-	}
-	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.11.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild
index b22b9bbbbd26..809444233eef 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-19.11.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 WX_GTK_VER="3.0"
 PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils wxwidgets l10n xdg
+inherit cmake wxwidgets l10n xdg
 
 DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
 HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
@@ -24,9 +24,11 @@ RDEPEND="${DEPEND}
 	sci-visualization/gnuplot[wxwidgets]
 	sci-mathematics/maxima"
 
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
 src_prepare() {
 	setup-wxwidgets
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
 		|| die "sed info/CMakeLists.txt failed"
@@ -44,6 +46,6 @@ src_prepare() {
 }
 
 src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
+	docompress -x /usr/share/doc/${PF}
+	cmake_src_install
 }
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.10.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild
index b22b9bbbbd26..9a2b704c52cf 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-19.10.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,6 +44,6 @@ src_prepare() {
 }
 
 src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
+	docompress -x /usr/share/doc/${PF}
 	cmake-utils_src_install
 }
diff --git a/sci-mathematics/xmds/Manifest b/sci-mathematics/xmds/Manifest
deleted file mode 100644
index bfeda59fb7ab..000000000000
--- a/sci-mathematics/xmds/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xmds-2.2.2.tar.gz 33449671 BLAKE2B f17b687334fbae50d502b312dde43e534f5c6082723a79c50ee0b1c85bc5c52f7b1fa97b520ae9b382b36dcde51b2729e5b63d3bad2b17c46fedfcfa7f2f79f4 SHA512 470652112e17503f6f0a4da9a68d4f360e66d8b29701a30385f3d49f9b0359578c702ff92f54876b473976b0794f6c2b2302b0a16508e09a5ec53572454eda42
-EBUILD xmds-2.2.2.ebuild 1097 BLAKE2B be9f90ded8b31bf313ac9a46e931910190d75404431f5ba0b823c6814c4c0b97dc6eaf8bea55aa0895d4ddf277108358b7d043f75d267d80e4999dadb7ed3076 SHA512 88ac183a3daae878caddde57242dfa5811578635178fa34fa86bf49321155554ab0a40255c7526e6b3aa3b98c72c9f3c77ffad676ec9d89f7055f7f20c50f09a
-MISC metadata.xml 678 BLAKE2B d426bb3ddf6151ef3cf275f63cd6b353ba625d9f6a130d35ca1a0a6cbd83a3e95415c033b40b4ec6f10540050f66e7c54f6d9780e4ec47a79dc4e28f4314277a SHA512 f177dcaed1bdebc436febbfaa09629d13524cffda2d348b299260bf496f11270b102ac13c81ed676e3f4d6d7472d2651969f08e5405eb7be5f2975336b75d78c
diff --git a/sci-mathematics/xmds/metadata.xml b/sci-mathematics/xmds/metadata.xml
deleted file mode 100644
index 3b7403548310..000000000000
--- a/sci-mathematics/xmds/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<longdescription lang="en">
-XMDS is a code generator that integrates differential equations (ODEs, PDEs and
-SDEs are all supported).  The system of equations to be integrated is specified
-in a XML file, which XMDS then uses to generate a C++ integrator.  The code can
-autamatically take advantage of MPI and FFTW.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">xmds</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/xmds/xmds-2.2.2.ebuild b/sci-mathematics/xmds/xmds-2.2.2.ebuild
deleted file mode 100644
index bf3dbf1a7e00..000000000000
--- a/sci-mathematics/xmds/xmds-2.2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="XMDS - The eXtensible Multi-Dimensional Simulator"
-HOMEPAGE="http://www.xmds.org"
-SRC_URI="mirror://sourceforge/xmds/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples mpi"
-
-DEPEND="dev-python/cheetah[${PYTHON_USEDEP}]"
-RDEPEND=">=sci-libs/fftw-3.3.1:3.0=[mpi?]
-		mpi? ( virtual/mpi )
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mpmath[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		sci-libs/atlas
-		sci-libs/hdf5
-		sci-libs/gsl"
-#virtual/cblas
-
-python_install_all() {
-	use doc && HTML_DOCS+=( documentation/. )
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Configure XMDS2 by typing"
-	elog "xmds2 --reconfigure"
-	elog "See http://www.xmds.org/installation.html for further informations"
-}
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index d93488295476..b095a2217a68 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -3,5 +3,5 @@ AUX yacas-1.7.0-gnuinstalldirs.patch 13706 BLAKE2B 67c024ecb5111ae0188140143c7d5
 AUX yacas-1.7.0-use-bundled-not-external.patch 7485 BLAKE2B 9f4653465fa7dcb21a915c67e138053296a8a0c446b198f1ab394c34223be3526b247a2de90a46bbc481d5cdeaac43711f979edada93fded89144ca21c4f34d8 SHA512 58e58aeae8a9b89ba7df18d3a9ed9168f4654d5501d3cc42ced9079c87b3177e7d57e9109729d57eb0441d9de40a5212573671bfd739916366957a3be659d3ba
 DIST yacas-1.7.0.tar.gz 2610016 BLAKE2B 62400d8aaba192a088bb48e0e12ff79e7e2d24af4825b2d53aeffa7aace011beb728118d56e5a9dd9e7dedba545706bbf77cb9ef27b5075e555fc5cc1983dc5e SHA512 6da7d454b3a74638d743c5e8168b27b9a8a71e2c41fe3f35bcb397fb80e866277ddb5b4e15167e2c0d11dd6033491ca72b560440fe2db6dc34b91b2ad047ca1d
 DIST yacas-bundled-1.7.0.tar.xz 4940180 BLAKE2B e191f3806df0c15149df053c47b1f11a5113ee3b55cbc9a78bfaec058fb5d783e4157687bf4ee9a953bcd23a4e3e49a59e6743e4471e31209a9e24e03ddc8ff5 SHA512 a9c519d0721df69ec81998a3ec17043b59230f5b0650fc2fd6555eccb5503460f387433c019ae15bbd0fd3ff11e697d6da56a3d08aac5fadf4ff023ca5d8691c
-EBUILD yacas-1.7.0-r1.ebuild 1416 BLAKE2B a244961e5225b0baf9479fa68467ce62ace38d7cc2af4b0167aa3a9ea7e4b2c65187f786f5dd5b54e80bc38f7173bdfcb716bbae4981de57394f8842fabee61e SHA512 1f03029cc3bb8ebeca7a42a9b68fc332013522dfcd74a911654eee8c30e5e16f0cf48bcc71a1505f1aac5c8e203adf1cf9ef2b3947154efc8443136b11295e6e
-MISC metadata.xml 945 BLAKE2B 63739d4c7d0e8fc17f107f94585355ff2e2cd6e68718008e0c0af862b5d66cd1518e036a2ee1357584e849cf510b9cbfeca6d04c1a97fa3d42ddcdae36fb19d4 SHA512 926b90c3c18ecc5401b56ea8b09914b785575c78dbef8cdc928240e4a54c42146feabfcf9ea3eb91c131c2af6dc6471f08ce57994d0ff6fcfbf027432d70c999
+EBUILD yacas-1.7.0-r1.ebuild 1404 BLAKE2B efdf7cacc453179b9160a9e4eb6a9d5874dcd4a7bb5e8f574b5bf02c78b1fe74f3993b8e69902e06583fb67f9a521c0f95aedee524cec1c6f91dc47408c24830 SHA512 81fabcde11a797c837f8de983e47ac20ee018a0d95939b10a507c9da85fd6d16c6dea5c0bbbf6d77d4b0c4f9e7edc129650671dba85735ffda2e4799a1375b5a
+MISC metadata.xml 849 BLAKE2B f771001f7ad17f5d6929fa9ab8480719d907a60db89d6c4439726cd09161b1de85041f249d286b9d5724ff7d273640c3ea3141854094b3426270760b50fdf175 SHA512 e75f23a35b593c6e6f55cbdafb12b1ee2d49d3e11eb84c5e45d2224a819e1dfd591a29c227ecb72b118b073aa5a1d3c2a1875f09c94f91cde14bfce3228cc85c
diff --git a/sci-mathematics/yacas/metadata.xml b/sci-mathematics/yacas/metadata.xml
index 64fd190c1653..b773290a8a47 100644
--- a/sci-mathematics/yacas/metadata.xml
+++ b/sci-mathematics/yacas/metadata.xml
@@ -14,7 +14,6 @@
   algorithms.
   </longdescription>
   <use>
-    <flag name="gui">Build graphical interface for the native yacas engine. Requires Qt5</flag>
     <flag name="jupyter">Add support for jupyter notebook</flag>
   </use>
   <upstream>
diff --git a/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
index 0d808f23ce18..5848e44b18fd 100644
--- a/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
+++ b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
 DESCRIPTION="General purpose computer algebra system"
 HOMEPAGE="http://www.yacas.org/"
@@ -55,5 +55,5 @@ src_configure() {
 		-DENABLE_CYACAS_KERNEL=$(usex jupyter)
 		-DENABLE_CYACAS_UNIT_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 8bf53b70953e..9350b6d0e167 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,3 @@
 DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
-EBUILD z3-4.8.6.ebuild 2339 BLAKE2B de6532630288a2fd70f3d8ed47ee61b627bff96e26779a03f213ef868bb47c04fbaa62e30741fe31c7204e894c44166b1ecd4198d858b2b16088005b5da5242d SHA512 d0f9ef9fc1359830a495c679a6404f87bb7a0f377b9c740d4648a093d1ea731d9a434149ee5f5f6ca5410a52afc8f12e3d55045636788d38c8b1eaabf90a729e
+EBUILD z3-4.8.6.ebuild 2337 BLAKE2B 1f8627d18c873c2cfb398e030d5c738458ddb1847cc83623211aa384c623bdf9be4c4a5dd6d5766e508619c77cc7c9fcb2f5c71200b9b8c5df5c0c1dd4aac36d SHA512 ccd2db341b9e425d3bf00d722af24be8028659e3324c638cfd4556a1d0ee633f35dda3076af5c17a3b2d353fd6f97592530d39e7ff2dc851201811cae583cb39
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.6.ebuild b/sci-mathematics/z3/z3-4.8.6.ebuild
index 5845b66caf22..24aed3818759 100644
--- a/sci-mathematics/z3/z3-4.8.6.ebuild
+++ b/sci-mathematics/z3/z3-4.8.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit cmake-multilib python-single-r1 toolchain-funcs
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sci-mathematics
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)