gentoo resync : 19.03.2019

17 files changed, 37 insertions, 556 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 1f65a4860694..238087eb8c34 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest
index 03983fd499fe..1a6e3d302b87 100644
--- a/sci-mathematics/genius/Manifest
+++ b/sci-mathematics/genius/Manifest
@@ -1,4 +1,4 @@
-DIST genius-1.0.21.tar.xz 2539784 BLAKE2B c4b6451c422c5f5a6a41d8af9ee003f69c4d813202eedba8eccabdcb2eb2405df552487e11f4ebd546968a04b2e6da2244452871d58fcef68d68105415f6ef98 SHA512 d4f5e80e1cc6216d7f460f7de86d232566eeb30fec90b93b2e6ccb8d2d0c14aaadf9b969c9a4f940a036e246f085edd02298c769504b620d2eb97ef2a3a852da
+DIST genius-1.0.23.tar.xz 2910332 BLAKE2B 8c9822737dfd0b445092c6b96376249093f3cfece4f0b98cb1bf62e9066336875fc014798b301686a9ffcaf5e37c1f324771c5b9e86c1578455874964427cca6 SHA512 8c64235d22734a7653468d39500ebbaa38b0ba7c25e292b4e96ddf825082584bf8c70e7ddc463b685ea01d51d3e08233b4e0cf8816a9a0e3357badb90d8e43c7
 DIST genius-reference.pdf 1024944 BLAKE2B e0058fbd266a4ed4bf29306520ac64b7ff9a970fa79b5132f5556b61a97dd985fe916c888d0d5a678528ef231a9c66310dc2affe01491c7848451b3d54f58274 SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285
-EBUILD genius-1.0.21.ebuild 1103 BLAKE2B bbb9d40dbf4a671e6efe9768ac9dca35ca0e5379f8cb0b7e33c99603e401040df70564fd49c847e40482949f62e4d4f25056fc1c370be2575e240a5f970b7fbf SHA512 c7db91cf952d711f206d78a3046fa6a9d6a8d644507db0dd70312f52eebd18367808aacb16304d7b12b417794199f25821d6c688061c5fd4c0518731ead43ca8
+EBUILD genius-1.0.23.ebuild 1258 BLAKE2B 32922b3bac91addad409e8ade4bf19be151b923f418ef6dc259f3c562a471b5e0df59f7e55e818ad026db5bdb6cb0ad4333cbf2eb2e5e45bc58be655efc0f363 SHA512 1cd21045f40466f85ab5a2f18f0bc387d96d2756d7d37cf37c7c380a3f754f635bd81bed39985afb762cace1f61a2a61e9fd0f8c000156fb164a3d2a2cb1e812
 MISC metadata.xml 809 BLAKE2B 9102651076c5b608afc1fbd7a2371d771587fbdc4960e56692f0999ddbfc9bef8096e04e59c491dc7c85ce4f75ec9fb9b093f49a3e53979d62e787e13377c345 SHA512 4259f2ea73e57edc70689d48522cb28ae79443b97b25799bfda21e9114bac15ae77bc27933fd6773c99daeaa060088cb0cb0acae71acd4af81fe7ae408c9e06c
diff --git a/sci-mathematics/genius/genius-1.0.21.ebuild b/sci-mathematics/genius/genius-1.0.23.ebuild
index b1212cfa833f..aadd433bff97 100644
--- a/sci-mathematics/genius/genius-1.0.21.ebuild
+++ b/sci-mathematics/genius/genius-1.0.23.ebuild
@@ -11,40 +11,35 @@ HOMEPAGE="https://www.jirka.org/genius.html"
 SRC_URI="${SRC_URI}
 	doc? ( https://www.jirka.org/${PN}-reference.pdf )"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gnome nls"
+IUSE="doc gnome"
 
 RDEPEND="
-	dev-libs/glib:2
+	>=dev-libs/glib-2.16:2
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
-	dev-libs/popt
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
 	gnome? (
-		x11-libs/gtk+:2
-		gnome-base/libgnome
-		gnome-base/libgnomeui
-		gnome-base/libglade:2.0
+		>=x11-libs/gtk+-2.18:2
 		x11-libs/gtksourceview:2.0
-		x11-libs/vte:0 )
+		>=x11-libs/vte-0.26.0:0 )
 "
 DEPEND="${RDEPEND}
-	app-text/rarian
 	dev-util/gtk-update-icon-cache
 	dev-util/intltool
-	|| ( sys-devel/bison dev-util/yacc )
+	virtual/yacc
 	sys-devel/flex
-	app-text/gnome-doc-utils
-	nls? ( sys-devel/gettext )
-"
+" # eautoreconf needs autoconf-archive
+# dev-util/gtk-update-icon-cache because configure checks for it for some reason and never calls it with DESTDIR set..
 
 src_configure() {
+	# Unrecognized --disable-scrollkeeper warning comes from gnome2.eclass adding it based on grep, but upstream has them commented out in .ac with "#" instead of "dnl"
 	gnome2_src_configure \
 		$(use_enable gnome) \
-		$(use_enable nls) \
+		--enable-nls \
 		--disable-extra-gcc-optimization \
 		--disable-static
 }
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 8d7b851d9041..df7074cdf4ce 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -12,10 +12,9 @@ AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f
 AUX xdg-utils-0.patch 1090 BLAKE2B 7a342a9e0bfd5b3aae1e3f8c45046c4fcaffea277cb68193e92fce4b23e03a0430ae095891183497e5deb969f1ba5e68f2423a9576c7465b137300bc2b096803 SHA512 31b121a2d6f1c24e5f2fa3e6129f661a891660665bf45a2907146e3bae9309d185f83d7001287df92a73aff81562a7011ad6b92e03516883bc0ae0730570fa38
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
-DIST maxima-5.41.0.tar.gz 41540226 BLAKE2B ff726044c9026bc58d04832fa6382146ed7e7d61d801fa7131b1e7e2ed386b99e238e039481697f9aa24cea59ffd0f6811675cd28818c9fe53f023f965f9d149 SHA512 1b93ae2db055ba7fb4a95924a896667f0cfa1c675c603c104181662aeb32b10b006158526b2f3ad93a59688a23eacdc82e870bb8ffb182a89e1e51de013ec209
 DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
+DIST maxima-5.42.2.tar.gz 41840181 BLAKE2B bca8a94366f1fe2f508436fdef8de80107b19c9b267a4b72dc6f56870078d35b3feb7dbdda384589b38c5351d6eeede1b9738a5ec2152063de2afacd1ced48c4 SHA512 5033b02272121f6aacff5ededf90eaad5e644a06d0c62aafd745401c08429da979ecd8274f7aa12596a0e32ddb614659af14e4273f59d372fe1ecbec081e7829
 EBUILD maxima-5.38.1.ebuild 4823 BLAKE2B e2f4aa9b01a251b0ff0250df56a9b9cb904ea1d859ff32414fc38f48d9cd772ebe5bab5dbe02fdfe87f6c70c848ad9b2b0b724a8dcbd8aecf459d492cbfa6132 SHA512 88dfd3edcef7450247c1c62b1c9c8759a8816ff6ba6691074088253d5ae3922afa828b21e543978617cc022701a2dfc82e2d2436c21430da1249949393cf6e12
-EBUILD maxima-5.41.0-r1.ebuild 4890 BLAKE2B 5aa2a97dfd4dc72718a544c7de8a058d7a5ed102086b52e51906421cc69182df0252b336a7e4c2469cbe51fb761154088812edb764355859e3718eaa1b574783 SHA512 a2bfb607dfe6faa7098ae880ca4f3b7e3db808ecfa714611947df5d4fe00d7fdc6b9f7477ae9ccd3d83f25ae70c7eeffd0295105b5043ebbaeaa4c7f1bea8ee3
-EBUILD maxima-5.41.0-r2.ebuild 4919 BLAKE2B 3f0de627f910ab9f749983c1dda434834738c2d9fed5749260a7d97bef9af64de6347a236a185e61312bd851afbd98d3fbbe769cbdff135188a99d7269011a6f SHA512 4cd6fff9032366c57bdc314716c58f72a2bfe61961db813cd3eab3b8a1c31349215ec338927dfface779d3386a85b32802a46beb90a3096690da8e4880a69902
 EBUILD maxima-5.42.1.ebuild 4910 BLAKE2B aa4d06f09fd352360b361b935e2484a7d2787beced1d9bf2aadc2bdee148f1465ed05a370e987d45381bfa877fe447a26e246d540ab5af1826986e37d58ac504 SHA512 9c8293d6dedf745389f528ae8570f1fa842bf5ab7767b4f7088368307a6da1088cdaa5670096a59a806008e42ad6206cb3c675ce38bf70be786c30377784c9e8
+EBUILD maxima-5.42.2.ebuild 4907 BLAKE2B e01606981d1a4bb47d35ba0eece7ed52397cda03a913c1c9d198346db458fd6906d33cde56ac29881c864ac4c7fc14e93d111544005b1a20bfe0836eb0a5822b SHA512 afdc36255024bb493e1b119cda07cf37a9aa871c6b49af412121e45e12be2e510211ea8ad828dda76686d6cf2df435c8eccca7e264297f0abac8138b72d8a56f
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/maxima-5.41.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.41.0-r1.ebuild
deleted file mode 100644
index c9917d44ca01..000000000000
--- a/sci-mathematics/maxima/maxima-5.41.0-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils xdg
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps
-LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=(   .    .     y               .    .         y     )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( .    .     .               ecl  ccl       .     )
-# patch file version; . - no patch
-PATCH_V=(   2    1     .               2    2         1     )
-
-IUSE="emacs tk nls unicode X ${LISPS[*]}"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} l10n_${lang/_/-}"
-done
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-RDEPEND="!app-emacs/imaxima
-	X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk:0 ) )
-	emacs? ( virtual/emacs
-		virtual/latex-base
-		app-emacs/auctex
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latexrecommended )"
-
-# generating lisp dependencies
-depends() {
-	local LISP DEP
-	LISP=${LISPS[$1]}
-	DEP="dev-lisp/${LISP}:="
-	if [ "${SUPP_RL[$1]}" = "." ]; then
-		DEP="${DEP} app-misc/rlwrap"
-	fi
-	echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	LISP=${LISPS[${n}]}
-	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-
-# default lisp
-DEF_LISP=0 # sbcl
-ARM_LISP=2 # gcl
-DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
-	local n=${#LISPS[*]}
-
-	for ((n--; n >= 0; n--)); do
-		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
-	done
-
-	if [ -z "${NLISPS}" ]; then
-		use arm && DEF_LISP=${ARM_LISP}
-		ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
-		NLISPS=${DEF_LISP}
-	fi
-}
-
-src_prepare() {
-	local n PATCHES v
-	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-0 )
-
-	n=${#PATCHES[*]}
-	for ((n--; n >= 0; n--)); do
-		epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
-	done
-
-	n=${#LISPS[*]}
-	for ((n--; n >= 0; n--)); do
-		v=${PATCH_V[${n}]}
-		if [ "${v}" != "." ]; then
-			epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
-		fi
-	done
-
-	# bug #343331
-	rm share/Makefile.in || die
-	rm src/Makefile.in || die
-	touch src/*.mk
-	touch src/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local CONFS CONF n lang
-	for n in ${NLISPS}; do
-		CONF=${CONF_FLAG[${n}]}
-		if [ ${CONF} = . ]; then
-			CONF=${LISPS[${n}]}
-		fi
-		CONFS="${CONFS} --enable-${CONF}"
-	done
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "l10n_${lang/_/-}"; then
-				CONFS="${CONFS} --enable-lang-${lang}"
-				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${CONFS} \
-		$(use_with tk wish) \
-		$(use_enable emacs) \
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		pushd interfaces/emacs/emaxima > /dev/null
-		elisp-compile *.el
-		popd > /dev/null
-		pushd interfaces/emacs/imaxima > /dev/null
-		BYTECOMPFLAGS="-L . -L ../emaxima"
-		elisp-compile *.el
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	docompress -x /usr/share/info
-	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
-	if use emacs; then
-		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
-		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-
-		insinto /usr/share/${PN}/${PV}/doc/imaxima
-		doins interfaces/emacs/imaxima/README
-		doins -r interfaces/emacs/imaxima/imath-example
-	fi
-
-	# if we use ecls, build an ecls library for maxima
-	if use ecls; then
-		ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
-		insinto "${ECLLIB#${EPREFIX}}"
-		doins src/binary-ecl/maxima.fas
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
diff --git a/sci-mathematics/maxima/maxima-5.41.0-r2.ebuild b/sci-mathematics/maxima/maxima-5.42.2.ebuild
index c09441ad8026..f55566f65046 100644
--- a/sci-mathematics/maxima/maxima-5.41.0-r2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.42.2.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 @@ SUPP_RL=(   .    .     y               .    .         y     )
 # . - just --enable-<lisp>, <flag> - --enable-<flag>
 CONF_FLAG=( .    .     .               ecl  ccl       .     )
 # patch file version; . - no patch
-PATCH_V=(   2    1     .               2    2         1     )
+PATCH_V=(   2    1     .               3    2         1     )
 
 IUSE="emacs tk nls unicode X ${LISPS[*]}"
 
@@ -95,7 +95,7 @@ pkg_setup() {
 
 src_prepare() {
 	local n PATCHES v
-	PATCHES=( emacs-0 emacs-27 rmaxima-0 wish-2 xdg-utils-1 )
+	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
 
 	n=${#PATCHES[*]}
 	for ((n--; n >= 0; n--)); do
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 9ec90c81cc28..e0d7dc9e172a 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,3 +1,3 @@
-DIST rkward-0.7.0.tar.gz 3991768 BLAKE2B b823a7dd1b04bb92f08a9a1ef6bc32de8f4f1084c9d2fac65817022ea717f51f6b6d239396352ba2699f33e7806f968b2b3b74c7288a9fe8b0d889404cc0d878 SHA512 2cbf1adb0923140b983f9a6e64f775f05228cefa6188a3ff1cd0cf9ac8e64b8c57e5e0d4cba342a0d9a73f057e657f28d44c979e31c82b5d1c9b70e62e14385e
-EBUILD rkward-0.7.0.ebuild 1252 BLAKE2B d20fe9312cf4de99c4a6b502b49e457e3c97d545469f6b2ba9b05f78e318491e7ca41bdf112efab203d9372a3ca66a8cfabf020a16185518b520327020c90bf3 SHA512 88c47a0a190b368af293990a9b6153d36dc505733c683cb417172883e276006358db7906ebfa7945fdf0c083da83d904658e6cece0d958fd81d35f59f686379c
+DIST rkward-0.7.0b.tar.gz 3978972 BLAKE2B 268ebbcdd16d64f546ffc78bfaf0fbe1546d42b09f7d869a82b9f2df2104c5a449052409773b3b063e9f5ca12948d9a19065ebe57e79684e6eb0ad73dfa5791a SHA512 c582ea2d35371315d41664a8620693c82017bd98d6bb380e64dfd2dda8b34b8890aa1e50b9c4a03838b41f22a1983ee0a48b97b30670b6a15143198631ad49ed
+EBUILD rkward-0.7.0b.ebuild 1230 BLAKE2B 6d3794f828633e12f78b015fa86cfe08f492f6b882d6ca7d62fc7650cf254b7f7907200b1668db6b694fb9d4d6c58fa38c52e16d93f0cf2a002556a3ebd88d9c SHA512 c4d3fe54ef4bf3d86892c5b54bebaa1450419b3afd856feaa67f548a8125a90c1668cbaa9b19ac0699f390f653f780cdcb0083397d0135f339ad7289423723a4
 MISC metadata.xml 592 BLAKE2B 887f22ad10d784dd1a12f50ab14ae07e9da5f90828b78027c08c864641e334cd1343bd4bbd197ccec086fe9e7d1e95602f8f78cc3f1316701900b73e266d763d SHA512 81c026c96614186bc6b31f9737b91692df82523d2179d467aeb663f10b7ce079a4b52354d8f744dedbe5bf5cf1939921a26f24f8deec9a170ac435da1f9863f6
diff --git a/sci-mathematics/rkward/rkward-0.7.0.ebuild b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
index cc0161f93c23..4c651729fa1d 100644
--- a/sci-mathematics/rkward/rkward-0.7.0.ebuild
+++ b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="IDE for the R-project"
 HOMEPAGE="https://rkward.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
+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=""
 
-COMMON_DEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -37,15 +39,12 @@ COMMON_DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwebkit)
+	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-lang/R
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	virtual/libintl
 	!sci-mathematics/rkward:4
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index 2353adb7ecce..d474f2c83362 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -1,7 +1,5 @@
 AUX why3-for-spark-2017-gentoo.patch 1300 BLAKE2B 616ed7cf1d5c8494a0b9f724ef1b011ad51e9f7edfb8bc88892902ad0cdc23793c8f8cd0e491757be08d90cb1159878d8bd3a34e1ebba62c927b9f676f58c241 SHA512 7ec992b1d0f0f285903b69876b853a8d368c73f4ed3dfccc25f5ae18e72e0c6f71ce9b81e18f2a685d19a7bfa8e69571cb71d4faa5ec67e0fbf2231202c2ea3d
 AUX why3-for-spark-2018-gentoo.patch 1015 BLAKE2B 201846ae0ef17bc6d777b7c1a8baddd1f684e82b811b16d2cce447423189a899f3e599cbf5cbd01630e2b246f8257ba5a890b20aaf62b0c1bc24e46642a37600 SHA512 871534c90f4f7c680f07dcd0bcacc4ce75c43b3132e8570b73e66316fe4333c244b9c443998916af7ff8fd297c20f7079ec5e8bf4c97207d0b7537722cd010a6
-DIST why3-for-spark-gpl-2017-src.tar.gz 9248235 BLAKE2B d9eb7201dfd5962c88ac8995e3cd800bf318f575a5e6ff7d0219941c0f0c9052e6b2c95c7c16fcd81b90cac647d503041bf16560bd44b58e7e0ced1ef2314bd2 SHA512 8f444402f6c1744cd7c565117732935791b1ae7996a94314c40a66d125eae8a81f2257314246c94fd29d3cd16abcff6a50a152a1191a4aae39a2c8a8d7c3b9e1
 DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
-EBUILD why3-for-spark-2017.ebuild 1793 BLAKE2B 8764c9d48d7582654b5fed8d6e3e7c5bc49488887f56d299b2e97777c0e3f8cdb2f755d6b916a921c550e8aaf756212c1bbb4ba6bdbba40b647fa462e2bae6ee SHA512 2cf8b76eef6ca80e2f6639f7d28c7442eaff1bea156d699b6948600250ec0b31ee74b6f35ceb9d840a84fa032a9f3b8ec86d5829a446596b2831d94b736249d4
-EBUILD why3-for-spark-2018.ebuild 1705 BLAKE2B 8cbf0c541584efa8ed1f48fa82ae1ac0907ed3b745aa48254ba3df84ff19d4ad78f3bc6557f64456711a52e926c6d404db12c5367276f173430d20e54e81ea9e SHA512 e3740ebce7707fa46739add8d3671594b575e21ee0c8f5644d9b27f3c208b6c9656abff9753d74029de54add141959ee11980be46e48f7605128eda07e9ccf83
+EBUILD why3-for-spark-2018.ebuild 1699 BLAKE2B 5d648c18c5c77e02afab395c874a769042acc6b705901477c016bd3ab77c02a892116d3a0d85631a67a2ffacc7cf044a4de3547b20deb3e2fdabdafd6648d6ca SHA512 271340f364718d8a29b36b4def19806d8428d7b84c0b8e882898018c91cfc892ae2f6d3d0dc74e05a5788ba0d73810ca1537b4f2ebb1f84f21f2cb588246a607
 MISC metadata.xml 1363 BLAKE2B 820bfc974ca6984f78340f223f8f19d12f0313016118110a35cfe149129c2dc189d6f03f34bf3d30c9d3e5d9c9ab90bba33dca4320c034821a7a89f97b92a7f9 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
deleted file mode 100644
index d7e68eab3720..000000000000
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Platform for deductive program verification"
-HOMEPAGE="http://why3.lri.fr/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055
-	-> ${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.02.3[ocamlopt?]
-	dev-ml/menhir
-	coq? ( sci-mathematics/coq )
-	doc? ( dev-tex/rubber )
-	gtk? ( dev-ml/lablgtk[sourceview] )
-	emacs? ( app-editors/emacs:* )
-	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_prepare() {
-	mv configure.{in,ac} || die
-	sed -i \
-		-e "s:configure.in:configure.ac:g" \
-		Makefile.in
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-pvs-libs \
-		--disable-isabelle-libs \
-		$(use_enable coq coq-libs) \
-		$(use_enable coq coq-tactic) \
-		$(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() {
-	default
-	if use ocamlopt; then
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	default
-	emake DESTDIR="${D}" install-lib
-	emake DESTDIR="${D}" install_spark2014_dev
-	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-2018.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
index da20dbb96af0..5400b37276c2 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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? ( app-editors/emacs:* )
+	emacs? ( virtual/emacs )
 	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 1c4cad5b5ee5..7c2c66b1b6a5 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,7 +1,7 @@
 DIST wxmaxima-15.08.2.tar.gz 5592673 BLAKE2B cacb508cbcb24e27a43998ba0079b14117980669c25b39b017c0c659ef48d2ad338c6503aea99447a14250ed1a68a3414880828fc8ffdcbd3177b8eb9355a919 SHA512 a537c49477f54df4fd9e4e42a5e0d0d740f1ede817d807a98b7cec877a3ad77b2be0a61ae487a7fa5beb193b112eca163b8873292ecab5acf118d58a91e91af6
 DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
-DIST wxmaxima-19.02.2_p1.tar.gz 11933618 BLAKE2B 6521f3fede54658e0bd6328580bc68fd3a187a43050a4f5738a7db834e465a3c234b30e053792005f6a7b0390854b47d2beeadde23c34b820bcbd780b8d9a080 SHA512 35cf81e8ce7b230acbec52082531956b9ad7e933343859d2132c9d3ba9c64447933d39a416008dd9956a2223b3fd92728ae3515a6e85fb494a17ea6a7848f8cd
+DIST wxmaxima-19.03.1.tar.gz 12065575 BLAKE2B a376ac6f8dafd8779b6161695595a3f2fc87e8242086a0f97bfb2823151c198a94c824baa9297dd586271ef121fc9af692b33ac06b2266d58dbbab9212c14d98 SHA512 7aa9e03104d276a1cc753a4edfdc0948822efe3ef93b08090a91efc50efe4ec0d913ff5f87069c1433c18f5b8bf086d025dd6bf7560f3b42a70e883914cc995a
 EBUILD wxmaxima-15.08.2.ebuild 1653 BLAKE2B 1822797d2cf9afbd98b08d4ad3384c118c592e3bf0a40af159bcf9793ec1f18a9e4019e94a270908942101b90b53564ac7c135b8c8ed65a169f70cdfad29c3af SHA512 2cdc1c72257ffe6cbcb6c833f6c0c91b857e784d8df6abb595cf9f6172abc78dbbb558a8835e8781d0fd493f2b18358c6ee7260200c524796c2b61f607b597ae
-EBUILD wxmaxima-18.11.4.ebuild 1330 BLAKE2B b722ebd5caddfce54a7b614c84585ef0a7da5e4f88cb9fa1d3b441fa10a640f08484c1ebeb9051c53e14402f3330f3bd8d18d5f6623dad2d8bcde39327b86cea SHA512 c296f4fca6e7c4e4d27681f3d5198c84e87fd671726a4dacd596a1ea3d2b7086308ec7465f3464698ee0a91c2b2db9816c59fe4575f0ecacc5876a4608b4ae75
-EBUILD wxmaxima-19.02.2_p1.ebuild 1408 BLAKE2B 196b8ec82c2594229bff1c237710773f8257b323c1582d633a6616b57ef3f7743d428a91199946d999bb2e97701def68562e13267d45331a763050e75b53f720 SHA512 2eb6690963b524d4c8cb2afd1491a42e9eae6d89a90f0d9ed60dade19ce634c031062d5610dbd25bd9f9274b1fdc91ebbf4b80595f95d4971907e6caa05970f6
+EBUILD wxmaxima-18.11.4.ebuild 1325 BLAKE2B 0bb0a389fdada309652292dd5477c0bc77835bdea898b8bdb0552dd1a61497542af2e8fd1f756d890bf3439c1e8d659b6f26e32036fcd41b4f121053b9ddad46 SHA512 563121eba0859f7dd14de81d80deb4f5e0597e214636be44704c36f3624f7e8543e0b55f31c5777459d066b304daf5e05fd6c221d302da29ae7f5aef83ffd3df
+EBUILD wxmaxima-19.03.1.ebuild 1457 BLAKE2B 9808b0a528d892427606f7a96bb08bbe42c4d1f6c0ff6905554a6302d15905a4c0c7cfe4bf54ad4a982a0fe3973455ad48846a46b59bbc0d23ddebfe23dc9ee5 SHA512 223884373b3919e5c5ee9b6f4a3ab488722db92ca3b964b7b09dcc842bd348a9d218b30f73acedef2492234061bcc2787b6fdb3c8110129e93c454a92aa019d2
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild b/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild
index 56c7b4a3e198..a1d603f91425 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-18.11.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE=""
 S="${WORKDIR}"/${PN}-Version-${PV}
 
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.02.2_p1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.03.1.ebuild
index c59167cdf74c..8da63e3b2c61 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-19.02.2_p1.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-19.03.1.ebuild
@@ -8,7 +8,7 @@ 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://dev.gentoo.org/~grozin/${P}.tar.gz"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 5625cce1679a..ec786c82c424 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,11 +1,8 @@
 AUX z3-4.4.1-gcc-6.patch 668 BLAKE2B d6d87a3f8204f04359b2843e6988b9ac2c13df9fae5d15ad0309848d98d2b909599f41fb157cb60efa43ec1179952f157cf78f3d7b1c7b5491b640868af7b212 SHA512 2efd883026643f365141665f257a863c6b22ad30327db82ad03719d33abfd58bc681cf4c9db9145098584817e57e59f7b1fe90a5390e72a49bce66cd23481f7f
 DIST z3-4.4.1.tar.gz 3347371 BLAKE2B 57f090b891618613c4647a89620d12f2ac05ea110268e63b343594f53fa2cc7aa347781001e2778ea7dc1ce475c964ddeced7a82c304b4be706ad164fd17a285 SHA512 76991a24f47f2b53ceb8d7a9a6be19913c57994ffb6cf6acfe30f61b2e73959cf02a99f656053594fccb5aaf4d1f44b3ae7e51f1c8953b213d738ceeeaea74f8
 DIST z3-4.5.0.tar.gz 3573695 BLAKE2B 285cc4d1f998d61ddb0b854044b7c79c1bb4cccf51bbdcba7c4a45698d74d9591f84d0aa74c5ef7c8aea2c6539ac987f29e326b44037e954108df67644dff594 SHA512 1ebc2c908d90b6b879f1e819c864ff894613276af47a440f27cf94968c195656952434754c3eb20f4bdbdd8497d227d22e1b4821c0d320b11052b5648d9e2dc7
-DIST z3-4.8.3.tar.gz 4119116 BLAKE2B 02535832a28ba09bb5b5c9354c77941bdce29fe977fa88d59e2e757fd6242b7d9ffcb0bbc0f9462ac7fd58bc29020be848b27311cf3f51cd60e84f66713a05e1 SHA512 34a2dca0083ed469fdaf5ac062dda26248633245607ddd9ef90629c5f76ae30f87bfa4191c04ba9be7a617bf182a1bd00b59fd2274699e12ece69b86088c8044
 DIST z3-4.8.4.tar.gz 4117081 BLAKE2B 6912defbae0e5444c451c4d7c6fb5d51167a1ae166257c7bfc53044ce7e9b9c4bd9824986c2ae1e6abfd6fef495234c9bea60078f8db2c1faaae11f34d666831 SHA512 4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4
 EBUILD z3-4.4.1.ebuild 4306 BLAKE2B 7e81603d96667c8e5748467668615f07a9e2194be963b67ae94eb90b29252d7fb53be373df21efbbea007aa8671609f2199fcb8a5f866b1f284228ad0d6e9d00 SHA512 1a370b019b33e83d5984b6abf321b39ff25f3b633ca60b2c48ddf9e33b30252389b5cb6f2e34e0dc1103730c9e5bf60ac688d67914d9c5dae52cf5fc5354620c
 EBUILD z3-4.5.0.ebuild 4721 BLAKE2B 8d0dab01c8c06bb07462bb51311520bb9f600b64ab43dd1ad5975c39554416d1a019665d30079535f5e20cefa5d65c6e6eb7140fd2ebc90cd2c363e9c732421c SHA512 e52d01917d884d10c24bf081303bdef7b1efa3b042f838ebc7de678a473fdd01d7738a216c9e14c4929b847fe7e5c3abe7a92bdafc827a1c1aa54b86abe46664
-EBUILD z3-4.8.3-r1.ebuild 2616 BLAKE2B 6415055ad140af1bea27f2b22cc017d14e31325903664988e7c3d20395c27e470b2d55e2666e295229bd5a788a0281fc904aca66cc590604b4693a1138f70b2f SHA512 2a0c235ba0998234f2bb83100018c4e5199670e0f50132fb3e6e94e7428336a08b1e6af26f26680f41d8d89ad37bcd836224d99b0f111ef3bb7db4023486ba6f
-EBUILD z3-4.8.3.ebuild 2553 BLAKE2B 2da1ac99c690c15575fc93f71f4283ca3cd47adabad11131e96c8b8d56df9b91dda34f3a5691bc768eca49ba592c2781c204d25abfea60bbe032fabf43d06693 SHA512 9a108c53195e7a550e163f310a159496730d3b17a2ca582e321a12077f4d24bdc3b97d8b2e0d9ec7ceb82fdc957f6c44bf66d0c51208e1227a4bd51f2793f753
 EBUILD z3-4.8.4.ebuild 2636 BLAKE2B f22553c8f6a408a464a1f6473dc32b9e634899095543c9555e442ad17ca414463625299ccaa3f458416d53841d95ec3139221f0af52ace8630c7849e7cc82b6d SHA512 ef7623e11f3bcee40e5e5cca3ce3e24ec9c1a2053c27857fe8e6713a287c50cee52522042479e7936b299da322a5be3164d6ea19861627b1eab49f7388787a4c
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.3-r1.ebuild b/sci-mathematics/z3/z3-4.8.3-r1.ebuild
deleted file mode 100644
index 6c92ed32341e..000000000000
--- a/sci-mathematics/z3/z3-4.8.3-r1.ebuild
+++ /dev/null
@@ -1,106 +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_{4,5,6,7}} )
-
-inherit cmake-multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="http://z3.codeplex.com/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gmp isabelle java openmp python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.8 )"
-
-S=${WORKDIR}/${PN}-${P}
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	python_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp && ! tc-has-openmp; then
-			ewarn "Please use an openmp compatible compiler"
-			ewarn "like >gcc-4.2 with USE=openmp"
-			die "Openmp support missing in compiler"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DUSE_LIB_GMP=$(usex gmp)
-		-DUSE_OPENMP=$(usex openmp)
-		-DENABLE_EXAMPLE_TARGETS=OFF
-		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DBUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DBUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cmake-utils_src_make test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT%/}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT%/}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT%/}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT%/}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT%/}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.8.3.ebuild b/sci-mathematics/z3/z3-4.8.3.ebuild
deleted file mode 100644
index 7c82aaa652f3..000000000000
--- a/sci-mathematics/z3/z3-4.8.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-
-inherit cmake-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="http://z3.codeplex.com/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gmp isabelle java openmp python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.8 )"
-
-S=${WORKDIR}/${PN}-${P}
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	python_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp && ! tc-has-openmp; then
-			ewarn "Please use an openmp compatible compiler"
-			ewarn "like >gcc-4.2 with USE=openmp"
-			die "Openmp support missing in compiler"
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DUSE_LIB_GMP=$(usex gmp)
-		-DUSE_OPENMP=$(usex openmp)
-		-DENABLE_EXAMPLE_TARGETS=OFF
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_PYTHON_BINDINGS=$(usex python)
-		-DBUILD_JAVA_BINDINGS=$(usex java)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-src_install() {
-	local DOCS=( "README.md" "RELEASE_NOTES" )
-	cmake-utils_src_install
-
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT%/}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT%/}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT%/}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT%/}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT%/}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}