gentoo resync : 10.04.2018

18 files changed, 28 insertions, 812 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index dc3076fd9486..026d15cd1d9e 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index fa20bbbe4b6a..5bb4c15ed1f9 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,5 +1,5 @@
 DIST coq-8.6.1.tar.gz 5588811 BLAKE2B 1016e54ef9b42a8534add55ab057454fad35b3fe103ba877689489c7d9cf43d76c1fbee123801d91035d353a882120650f94c433d9ee1daa878b8c819609c949 SHA512 814ab76a06ca15f927081428da74add4bc67290199fa011853b9c68a00cdefaf813b10fbac18a434f4504fce8f2173eb544080bf6f50d62caa41bb8724b13083
 DIST coq-8.6.tar.gz 5538848 BLAKE2B 025d6598a5155712662ce20a56804b75c236f1d1dc4ed81e779aaf2916d5cb525acfcbef9b5960fc5b8b44f2e2290c9f7e5c2d6e84726400a9888587ee29cd16 SHA512 9f5f4913fda8cf83683fec9398b42d4567207c3d4b52b4638d5e09a24ed25a43905fb57a9fac1bb9f9d681bd47f3560e1da74e79348b3a3fd93e2e8c686cebae
-EBUILD coq-8.6.1.ebuild 2028 BLAKE2B 4f336c86e334e9979043e2576731509850f897190d18c257ee7baa576e86c34bd98f6c1d153c013f1dbeee4be187635bd20278e7ed867f8eb5981521747cafa2 SHA512 efe0e46aba141542802906c411de43257c8bd4b154f8828888b4b01651d5c7fb38d28e40f12cafc2df2cfefdefba94fe733dfe6490761a11813800fa03c4f320
-EBUILD coq-8.6.ebuild 2025 BLAKE2B efd094e9fccd341a5408af9963fb73c439d395e1ac1ced40a3a6eb36c75d86d4a447eb822c0a88bf56258c542a6dc785d04cb9c73ad0966904742eeaf02b8c7f SHA512 c3dcd0da423c16ffd723ef88178387c98e10444a766a5534b175bb945c8931151a0e13f2c0398bd248b6581480d3b9d46a29e55789ff492c179eca1ab28841ca
+EBUILD coq-8.6.1.ebuild 1991 BLAKE2B 625a0e1000c6ee4cd888e97fce07cebf8866ef5f830dd9d5e068bc85b40caae2214d2371409397c80a41d82b5240d864cac05fb31eb9d1810df9470cdda300d3 SHA512 30a6fb585df11a7f45f802dcb8e07c3be23e18c8e17976ecf2add66fe3f23d496099762dd16d11e0f214d9f1be290067dd29e7d4e1bdb7c1d161e52f995f4b64
+EBUILD coq-8.6.ebuild 1988 BLAKE2B d0b0a3880313d1f72b0fab73ae0b6afac6e4686aabbbd3dd4e7d21cd09d496088e0593e5b5fc15497f9987f7e51e8f6a58fbd307bc11e24f1af31360564838f2 SHA512 159c3541b12f23abb1de9502de2317d82181642ad5590b6d9225c185437d2730b12b5ffa3d7b7727951fa2da314e3f1db24a598446d7b62f7c1fe248a222fbd3
 MISC metadata.xml 1113 BLAKE2B 0162bb9994d76c6e3019c5e99459ed2fb5d25e7854213ac90735c9693256cb65d81da48cabf279bb6c8badd028e2f59bcab68a06232c92cc9203db16e36d3f79 SHA512 10bf7af26739a58d7e2165ab8d02b6412540c2abd1e28b800976fd8fc9df78275b5dafbdb2e660eae7fb4946769b41812ee5d2bba931317870d993869d7412b8
diff --git a/sci-mathematics/coq/coq-8.6.1.ebuild b/sci-mathematics/coq/coq-8.6.1.ebuild
index 9b09cfd79ddd..b07f22863ef7 100644
--- a/sci-mathematics/coq/coq-8.6.1.ebuild
+++ b/sci-mathematics/coq/coq-8.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 		dev-tex/hevea
 		dev-tex/xcolor
 		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra )
+		dev-texlive/texlive-mathscience
 		dev-texlive/texlive-latexextra
 		)"
 
diff --git a/sci-mathematics/coq/coq-8.6.ebuild b/sci-mathematics/coq/coq-8.6.ebuild
index f2f38a063820..b06ed6df0f92 100644
--- a/sci-mathematics/coq/coq-8.6.ebuild
+++ b/sci-mathematics/coq/coq-8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 		dev-tex/hevea
 		dev-tex/xcolor
 		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra )
+		dev-texlive/texlive-mathscience
 		dev-texlive/texlive-latexextra
 		)"
 
diff --git a/sci-mathematics/cvc3/Manifest b/sci-mathematics/cvc3/Manifest
index 45bbc825e95e..4d49fd332b25 100644
--- a/sci-mathematics/cvc3/Manifest
+++ b/sci-mathematics/cvc3/Manifest
@@ -2,5 +2,4 @@ AUX 50cvc3-gentoo.el 164 BLAKE2B 629cac93ab691b3379b6cdba9a24b2f426405a8606acac9
 AUX cvc3-2.4.1-gccv6-fix.patch 2907 BLAKE2B 8f3b8dfcfb834fa899195e5e3195c9dad94b1359a3b1e19e98cc65a0ab0b2df2516ee064ac2c7c825def61c8fbd3dc5af6a88a3461a0c73b6a9e4e971848fc4e SHA512 1e4e54820aa0ff256bc12916be1219961848430d3448ac4e04d4dcab5ba3ef1e056cad1a3c68ba5e9ff4f0f48c5a92e1b2e9e7eb14837265b166abe1228005cf
 DIST cvc3-2.4.1.tar.gz 1196616 BLAKE2B 8d3f7cbd24a1ba7e558fa8f91f9dd8f3fdc1aee3dd0d0e460bfb6e7922ae54cebaad3696912d3d0fb735ce1f6d00ac32a7d65c0b01af870124e48d9c96855aac SHA512 48e5cd82b3eb7506d762c2abc8db0c8fbc548575a1362dda53888075ac105a5bc0f0d58dfe01b60f207bc00ff8dfc39a5b3d9317784fe551658c884bb02e1ff2
 EBUILD cvc3-2.4.1-r1.ebuild 4298 BLAKE2B 4d4343b9de4774081a3f1470121e7bafd34793664671df478613b611123daed10523bb555301de9976237007974abeb5ccf5ca2c26d3f63d4648343065082f26 SHA512 7cc46232b5f2aa148967e13796ed6ba689e5b98bce5677a9efb1492bd97af7a6bf5e6c48d648e15d8e5b035f73a0a8930b66d903c2a57fdc8cabc756681dd252
-EBUILD cvc3-2.4.1.ebuild 4240 BLAKE2B a21e44617197a211352d934d33af8c4c86445e9c60d84af3fb74466875fe66aa31f36b530172bf448ff024f337c81cd87a4a593f924ef05f71dd236aaa82f741 SHA512 31329c448ca916bf2c26f712399b85e5da447649850bfef83c0b3c2ae3ac18e531189fa42295c47eb2c24780f7e8fea612ec6af50ee91efb89594baec7208706
 MISC metadata.xml 1806 BLAKE2B 640e42b6b1b85ddf30c9b17ad9b8f8817921c5b7e76cc1431fd582873524725ec2ccbe9537a2b95ec74b7022455e38f755c7a128cec2bfad31e9aec3325d9fa5 SHA512 7717a3e172f56cdac0c6716e2c776578fc5e5ee35dad288c605d28034eca54049414e7450d9b2a7d17869f3cdd0da41f61e407c5cd52fef2f3fa225e3e99133f
diff --git a/sci-mathematics/cvc3/cvc3-2.4.1.ebuild b/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
deleted file mode 100644
index 4352e6377d2c..000000000000
--- a/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit elisp-common
-
-DESCRIPTION="CVC3 is a theorem prover for Satisfiability Modulo Theories (SMT) problems"
-HOMEPAGE="http://www.cs.nyu.edu/acsys/cvc3/index.html"
-SRC_URI="http://www.cs.nyu.edu/acsys/cvc3/releases/2.4.1/${P}.tar.gz"
-
-LICENSE="BSD MIT HPND zchaff? ( zchaff )"
-RESTRICT="mirror zchaff? ( bindist )"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs isabelle test zchaff"
-
-RDEPEND="dev-libs/gmp:0=
-		isabelle? (
-			>=sci-mathematics/isabelle-2011.1-r1:=
-		)"
-DEPEND="${RDEPEND}
-		doc? (
-			app-doc/doxygen
-			media-gfx/graphviz
-		)
-		emacs? (
-			virtual/emacs
-		)"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	sed -e 's#prefix=@prefix@#prefix=$(patsubst %/,%,$(DESTDIR))@prefix@#' \
-		-e 's#libdir=@libdir@#libdir=$(patsubst %/,%,$(DESTDIR))@libdir@#' \
-		-e 's#mandir=@mandir@#mandir=$(patsubst %/,%,$(DESTDIR))@mandir@#' \
-		-i "${S}/Makefile.local.in" \
-		|| die "Could not set DESTDIR in Makefile.local.in"
-}
-
-src_configure() {
-	# --enable-static disables building of shared libraries, statically
-	# links /usr/bin/cvc3 and installs static libraries.
-	# --enable-static --enable-sharedlibs behaves the same as just --enable-static
-	econf \
-		--enable-dynamic \
-		$(use_enable zchaff)
-
-	if use test; then
-		sed -e 's@LD_LIBS = @LD_LIBS = -L'"${S}"'/lib -Wl,-R'"${S}"'/lib @' \
-			-i "${S}/test/Makefile" \
-			|| die "Could not set library paths in test/Makefile"
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		pushd doc || die "Could not cd to doc"
-		emake
-		popd
-	fi
-
-	if use emacs ; then
-		pushd "${S}/emacs" || die "Could change directory to emacs"
-		elisp-compile *.el || die "emacs elisp compile failed"
-		popd
-	fi
-
-	if use test; then
-		pushd test || die "Could not cd to test"
-		emake
-		popd
-	fi
-}
-
-src_test() {
-	pushd test || die "Could not cd to test"
-	./bin/test || die "tests failed"
-	popd
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		pushd "${S}"/doc/html || die "Could not cd to doc/html"
-		dohtml *.html
-		insinto /usr/share/doc/${PF}/html
-		doins *.css *.gif *.png
-		popd
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.{el,elc}
-		cp "${FILESDIR}"/${SITEFILE} "${S}"
-		elisp-site-file-install ${SITEFILE}
-	fi
-
-	if use isabelle; then
-		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
-			|| die "isabelle getenv ISABELLE_HOME failed"
-		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		cat <<- EOF >> "${S}/settings"
-			CVC3_COMPONENT="\$COMPONENT"
-			CVC3_HOME="${ROOT}usr/bin"
-			CVC3_SOLVER="\$CVC3_HOME/cvc3"
-			CVC3_REMOTE_SOLVER="cvc3"
-			CVC3_INSTALLED="yes"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins "${S}/settings"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-	if use zchaff; then
-		einfo "This copy of CVC3 is also configured to use the SAT solver zchaff whose"
-		einfo "copyright is owned by Princeton University and is more restrictive."
-		einfo "Specifically, it may be used for internal, noncommercial, research purposes"
-		einfo "only. See the copyright notices from the zchaff source files which are"
-		einfo "included in the LICENSE file."
-		einfo "To build CVC3 without these files, please build cvc3 without the zchaff"
-		einfo "use flag (note: zchaff is disabled by default):"
-		einfo "USE=-zchaff emerge sci-mathemathematics/cvc3"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/cvc3" ]; 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 CVC3 being installed during an upgrade.
-				sed -e "/contrib\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/e/Manifest b/sci-mathematics/e/Manifest
index a6fbb918c0b0..1444fdcb9d47 100644
--- a/sci-mathematics/e/Manifest
+++ b/sci-mathematics/e/Manifest
@@ -4,5 +4,4 @@ DIST E-1.8.tgz 1832975 BLAKE2B ebac17f157f591874107009d1ad45d03449c8d440f3ad6dab
 EBUILD e-1.5.ebuild 3351 BLAKE2B 1e5ccec6ef815a1d102333da7afecd4a252b8b47e234b81d296e391e9bf002796448983902615118cb0a92e8dc8c02135d22717752086d19d32696dac822232d SHA512 076d4b17661ed30e3321dd9312fcb4a7904a98d69a61bbf6cf9718ba55422048a861e54e1780513b7fb4384a3ea6a3a05d8f6c79c43ff051f06e7a301612573e
 EBUILD e-1.6.ebuild 3351 BLAKE2B a92fde5209ec23fd45574c3f82527549aa18e5dac9ae2247a1d68d17ae7e96c0a19e8a54c5c685c505cfc07dfe977b64a634454ee7cf1f16072c08c7cb52aee5 SHA512 07ae850f91c1406369fbd89ed5a12205da41bccb762af521b88bec2557a30c87d8ce332353e5f9f124ecfb9bde23343665d90464ce41d211c341c205454779ed
 EBUILD e-1.8-r1.ebuild 3172 BLAKE2B b7e844811d5e81724af7b6b6c14d0cab271cda71a66d60086d639ebd31ac216ac55e67a2d34245e67499eb0f40644cecd5295636fe1bdd22c83fde0c7ac8b6ba SHA512 ca65245640594ff13a36e6350b91229835e21fe8a9a1841d3168007899fcf4e9db25c36901008d4fba1250e948635001322e2a9b3408b79fae1d126913a4733a
-EBUILD e-1.8.ebuild 3172 BLAKE2B 762cbd4e2abea3554b60065f4ea0d1c71d8652686fd1e48f694729e323015f5c2da2197bd652162ed4db5962fc8cfdf472fe5a1ea64f8beffbec010d77ec337c SHA512 13e554697d0c8386c0b58a2b73ccc52c0f741436c36e6e18d7fc2fd382ffa1f01c2a580ce296c1aa8191634f6857d0e6ab5e585a66dd4606fe49b6471fb25597
 MISC metadata.xml 1462 BLAKE2B 3b2783ef3103c8a0f8606b0553e89b5265867b2b3272dd28530f5a8e8a745240726c937db655a31cc6ba923b579da8ba33a180c6f745a45e238b28b7a688a173 SHA512 635575800430295b5110104d38cbab61277b8d32acd23b883053a3092df0ea6531bac0fbae8a402cc9af0e11d7095959f44bee989050e4123ea7400c4c671e23
diff --git a/sci-mathematics/e/e-1.8.ebuild b/sci-mathematics/e/e-1.8.ebuild
deleted file mode 100644
index c6173fc90ec2..000000000000
--- a/sci-mathematics/e/e-1.8.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="E"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="E is a theorem prover for full first-order logic with equality"
-HOMEPAGE="http://www4.informatik.tu-muenchen.de/~schulz/E/E.html"
-SRC_URI="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples isabelle"
-
-RDEPEND="isabelle? (
-			>=sci-mathematics/isabelle-2011.1-r1:=
-		)"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-
-src_configure() {
-	./configure --prefix="${ROOT}usr" \
-		--man-prefix="${ROOT}share/man" \
-		|| die "E configure failed"
-
-	sed -e "s@CFLAGS     = @CFLAGS     = ${CFLAGS} @" \
-		-e "s@LD         = \$(CC) @LD         = \$(CC) ${LDFLAGS} @" \
-		-i "${S}/Makefile.vars" \
-		|| die "Could not add our flags to Makefile.vars"
-}
-
-src_install() {
-	dobin "${S}/PROVER/eprover" \
-		"${S}/PROVER/epclextract" \
-		"${S}/PROVER/eproof" \
-		"${S}/PROVER/eproof_ram" \
-		"${S}/PROVER/eground" \
-		"${S}/PROVER/e_ltb_runner" \
-		"${S}/PROVER/e_axfilter" \
-		"${S}/PROVER/checkproof" \
-		"${S}/PROVER/ekb_create" \
-		"${S}/PROVER/ekb_delete" \
-		"${S}/PROVER/ekb_ginsert" \
-		"${S}/PROVER/ekb_insert"
-
-	doman "${S}/DOC/man/eprover.1" \
-		"${S}/DOC/man/epclextract.1" \
-		"${S}/DOC/man/eproof.1" \
-		"${S}/DOC/man/eproof_ram.1" \
-		"${S}/DOC/man/eground.1" \
-		"${S}/DOC/man/e_ltb_runner.1" \
-		"${S}/DOC/man/e_axfilter.1" \
-		"${S}/DOC/man/checkproof.1" \
-		"${S}/DOC/man/ekb_create.1" \
-		"${S}/DOC/man/ekb_delete.1" \
-		"${S}/DOC/man/ekb_ginsert.1" \
-		"${S}/DOC/man/ekb_insert.1"
-
-	if use doc; then
-		pushd "${S}"/DOC || die "Could not cd to DOC"
-		dodoc ANNOUNCE CREDITS DONE E-REMARKS E-REMARKS.english E-USERS \
-			HISTORY NEWS PORTING ReadMe THINKME TODO TPTP_SUBMISSION \
-			WISHLIST eprover.pdf
-		dohtml *.html
-		dohtml estyle.sty
-		popd
-	fi
-
-	if use examples; then
-		insinto /usr/share/${MY_PN}/examples
-		doins -r EXAMPLE_PROBLEMS
-		doins -r SIMPLE_APPS
-	fi
-
-	if use isabelle; then
-		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
-			|| die "isabelle getenv ISABELLE_HOME failed"
-		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
-		cat <<- EOF >> "${S}/settings"
-			E_HOME="${ROOT}usr/bin"
-			E_VERSION="${PV}"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins "${S}/settings"
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/eproof" ]; 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 E being installed during an upgrade.
-				sed -e "/contrib\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/kodkod/Manifest b/sci-mathematics/kodkod/Manifest
index 42e4c8eb0412..40a523d9ddab 100644
--- a/sci-mathematics/kodkod/Manifest
+++ b/sci-mathematics/kodkod/Manifest
@@ -2,5 +2,4 @@ AUX kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch 1045 BL
 DIST kodkod-1.5.2.zip 2092639 BLAKE2B 76bcecb5d1063a7ee0244bfc1496e2684007ea3264a967cf2b8757caff96be872a5d7419f7f6ca1d2a990d5eaaaca8d63af950e66c4eb4453de6fc132d5716a0 SHA512 d55d84e1daabe37c6994fd434c157d5eaecd1d0b2bbe4ab5a2d5e0e529a378d0cb8dc1eac5b89336706f899b23b9682dfd1033f4a2caec76485b12966e091df0
 DIST waf-1.7.16 91846 BLAKE2B 1b95a96d1fb67775c905882d2a6e51a53a586b4e2e88399df13ee25dba870cbc28115ead4aac8a7ee4e8fa2b7593b61b88d0388a874a658b81dc4d33ed3207f8 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf
 EBUILD kodkod-1.5.2-r1.ebuild 3837 BLAKE2B 509854ca2cbcf2587795051c70e7193ca52289021fa7a407ea13e9178b5e86c9340749758c7d6dd5b4c846ba3c2e3c8fb5d3db573268f39f0191328904106be0 SHA512 76b42bb0e823f1bfe318af13cee2a2b6a8f93d49b3dca93a92bcf3eb876351a684464d03c5d5e7eed4227501ca37c5c306c44e330cbba9f8e3766afacbbef2a2
-EBUILD kodkod-1.5.2.ebuild 3835 BLAKE2B a2335b2ebf4a91da694caa17ec4241b51f2bd89eddbb6b72a45508959c11cf01cc6ad9b189e2c7f05f06441497ba0a01bbeec267e8cc7a150bb11aac09d5df06 SHA512 eb5da579f6a4ecdc317a13c497b1c89fad986cf65e77e8881ca7c9370761878f5d71737196c685a08c857c59f267e29703bef68c6186f5f1622111a786303e64
 MISC metadata.xml 927 BLAKE2B 678d66d0843b85a81ffbdeb2c8e498af617eb125fa62009e4a06373f9c9965d5c77fd69e4892765e54f214f3302bdc658ea4c6cd3e4266b6e88b3bccfa5abac1 SHA512 6ef6a53f3a21c6786ba6044925d13de7bf396a3e59d1810e963a75005575e57d9a816ac765338055f1d7a3f05f7fda8c98d6a357da7d310a223b0158d887b307
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
deleted file mode 100644
index 230c75396a8e..000000000000
--- a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils java-pkg-2 python-any-r1 waf-utils
-
-DESCRIPTION="a constraint solver for relational logic"
-HOMEPAGE="http://alloy.mit.edu/kodkod/index.html"
-SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
-	https://waf.googlecode.com/files/waf-1.7.16"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEP="${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/kodkod-1.5"
-
-JAVA_SRC_DIR="src"
-LIBDIR="/usr/"$(get_libdir)"/${PN}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack "${A% *}"
-	cp "${DISTDIR}/${A#* }" "${S}/waf" || die "Could not copy waf"
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	chmod u+x waf \
-		|| die "Could not set execute permisions on waf file"
-	sed -e 's@private N parent, left, right@protected N parent, left, right@' \
-		-e 's@private boolean color@protected boolean color@' \
-		-i "${S}/src/kodkod/util/ints/IntTree.java" \
-		|| die "Could not change private to protected in IntTree.java"
-	sed -e 's@conf.env.LINKFLAGS =@conf.env.LINKFLAGS +=@' \
-		-i "${S}/lib/cryptominisat-2.9.1/wscript" \
-		-i "${S}/lib/lingeling-276/wscript" \
-		|| die "Could not fix wscripts to respect LDFLAGS"
-	# Fix bug 453162 - sci-mathematics/kodkod-1.5.2: fails to build
-	epatch "${FILESDIR}/${PN}-1.5.2-changes-in-most-specific-varargs-method-selection.patch"
-
-	# Fix Bug 458462 sci-mathematics/kodkod-1.5.2: fails to build with JAVA_PKG_STRICT
-	local x=""
-	for i in $JAVACFLAGS
-	do
-		if [ "${x}" == "" ]; then
-			x="'${i}'"
-		else
-			x="${x}, '${i}'"
-		fi
-	done
-	for j in $(find . -name wscript -print)
-	do
-		sed -e "s@def configure(conf):@def configure(conf):\n    conf.env.JAVACFLAGS = [${x}]@" \
-			-i "${j}" \
-			|| die "Could not set JAVACFLAGS in ${j}"
-	done
-}
-
-# note: kodkod waf fails when passed --libdir:
-# waf: error: no such option: --libdir
-src_configure() {
-	${WAF_BINARY:="${S}/waf"}
-
-	tc-export AR CC CPP CXX RANLIB
-	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr $@ configure"
-
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
-		"--prefix=${EPREFIX}/usr" \
-		"$@" \
-		configure || die "configure failed"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	if has doc ${JAVA_PKG_IUSE} && use doc; then
-		pushd src/kodkod || die "Could not cd to src/kodkod"
-		local doclint="-Xdoclint:none"
-		local jv="$(javac -version 2>&1 | cut -d' ' -f 2)"
-		if [[ "${jv}" == 1.6* ]] || [[ "${jv}" == 1.7* ]]; then
-			doclint=""
-		fi
-		javadoc ${doclint} -sourcepath "${S}"/src/kodkod:"${S}"/build/src/kodkod \
-			-classpath $(find "${PWD}" -name \*.jar -print | xargs | sed -e 's@ @:@g') \
-			$(find . -name \*.java -print) \
-			|| die "javadoc failed"
-		popd
-	fi
-}
-
-src_install() {
-	insinto "/usr/"$(get_libdir)
-	dodir ${LIBDIR}
-	exeinto ${LIBDIR}
-	for i in $(find . \( -name \*.so -o -name plingeling \) -print | xargs); do
-		doexe $i
-	done
-
-	for i in $(find . \( -name kodkod.jar -o -name org.sat4j.core.jar \) -print | xargs); do
-		einfo "java-pkg_dojar $i"
-		java-pkg_dojar $i
-	done
-
-	# javadoc
-	if has doc ${JAVA_PKG_IUSE} && use doc; then
-		java-pkg_dojavadoc src/kodkod
-	fi
-
-	# dosrc
-	if has source ${JAVA_PKG_IUSE} && use source; then
-		local srcdirs=""
-		if [[ ${JAVA_SRC_DIR} ]]; then
-			local parent child
-			for parent in ${JAVA_SRC_DIR}; do
-				for child in ${parent}/*; do
-					srcdirs="${srcdirs} ${child}"
-				done
-			done
-		else
-			# take all directories actually containing any sources
-			srcdirs="$(cut -d/ -f1 ${sources} | sort -u)"
-		fi
-		java-pkg_dosrc ${srcdirs}
-	fi
-}
diff --git a/sci-mathematics/kodkodi/Manifest b/sci-mathematics/kodkodi/Manifest
index c4290d0fea84..5d8167f1ac6d 100644
--- a/sci-mathematics/kodkodi/Manifest
+++ b/sci-mathematics/kodkodi/Manifest
@@ -1,4 +1,3 @@
 DIST kodkodi-1.5.2.tgz 2826648 BLAKE2B 1c2c83b2fd0df3bf01d8aa5a5332a4347cd64493daef28780b3cc8fa7d627bed1d05cee91afdfef88b62d262e8ba39be6d8ae719b2f6e0da40808d5ef3176c17 SHA512 117e0f1b3e3ee88efb9a9e2f02e8a7ce82a3487528ad0476acf20fafd885d3d48c051bd4a8cb6aa5cda61f24dfa74159448b83398be4119e726e757f6ff3aad4
 EBUILD kodkodi-1.5.2-r1.ebuild 2893 BLAKE2B b70a581375137db1c0cc714dd1fc5f42947470287f93970eabd8bd2e2a6c082a68f8eddb9eeff63f611f14422c24dd7c5e1401aedd2fe77121bd7dc0176a2e64 SHA512 b7a36e799ed2b0a96a28662f5e0e98c56fcdbac4e85e090b83f30f941300c8cf572a6125b6193abf50341f17ad379db397063aa17aec64b4f8135bd8fb06b0a9
-EBUILD kodkodi-1.5.2.ebuild 2895 BLAKE2B 73c853f04d0e31edc842db092c5376fe9422c9ece8d410b18a64398bbdb8fb55fac3468b43276f044b3329ae6ac6b09e5800e3d181305c36e9f5f3aa1203692e SHA512 186712deb7f8723099aa33a9ddcd26d69c0bee4b69fe1da0f407aba110a08cb7019ade2cfcbb9dffd389c3f55022b00a05545dd8a17b6a6da826cafe8aa5f631
 MISC metadata.xml 570 BLAKE2B 9a1bb608090c1748c207a1aaa0cb88d91b381ca5201ebc71b36f23e5f96b896ab0ad23434cb5fd5e251058e2c2098f4f009c73946c16a65f9fc1d9f31cab89b4 SHA512 e41523244a6503726c4e81500011d26554e709d6eb670005f761fa6fe82c3243b0f5eb2840f83c242cd376763cc467d40049bbb53cef856724f04f9ab2a1c251
diff --git a/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild b/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild
deleted file mode 100644
index 9041007f4db1..000000000000
--- a/sci-mathematics/kodkodi/kodkodi-1.5.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple multilib
-
-DESCRIPTION="A text front-end for the Kodkod Java library"
-HOMEPAGE="http://www21.in.tum.de/~blanchet/#software"
-SRC_URI="http://www21.in.tum.de/~blanchet/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="isabelle examples"
-
-COMMON_DEP="dev-java/antlr:3
-	=sci-mathematics/kodkod-1.5*:="
-RDEPEND="${COMMON_DEP}
-	isabelle? (
-		>=sci-mathematics/isabelle-2011-r1:=
-	)
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="kodkod,antlr-3"
-
-java_prepare() {
-	sed -e 's@exec "$ISABELLE_TOOL" java $KODKODI_JAVA_OPT@java@' \
-		-i "${S}/bin/kodkodi" || die "Could not patch bin/kodkodi"
-	rm -f jar/*.jar || die "Could not rm jar files"
-}
-
-src_compile() {
-	JAVA_SRC_DIR="src"
-	TARGETDIR="/usr/share/${P}"
-	KODKOD_LIBDIR="/usr/"$(get_libdir)"/kodkod"
-
-	java-pkg-simple_src_compile
-
-	pushd "${S}/target/classes" > /dev/null || die
-	jar -uf "${S}"/${PN}.jar $(find -name '*.class') || die
-	popd > /dev/null
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README HISTORY manual/${PN}.pdf LICENSES/Kodkodi
-	insinto ${TARGETDIR}
-	if use examples; then
-		doins -r examples
-	fi
-
-	if use isabelle; then
-		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
-			|| die "isabelle getenv ISABELLE_HOME failed"
-		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		cat <<- EOF >> "${S}/settings"
-			KODKODI="\$COMPONENT"
-			KODKODI_VERSION="${PV}"
-			KODKODI_PLATFORM=\$ISABELLE_PLATFORM
-			KODKODI_CLASSPATH="$(java-config --classpath=antlr:3):${ROOT}usr/share/${PN}-${SLOT}/lib/kodkodi.jar:$(java-config --classpath=kodkod)"
-			KODKODI_JAVA_LIBRARY_PATH="${KODKOD_LIBDIR}"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins "${S}/settings"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/bin"
-		exeinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/bin"
-		doexe bin/kodkodi
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/kodkodi" ]; 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 kodkodi being installed during an upgrade.
-				sed -e "/contrib\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index c1c29a90d563..e983ead5fa46 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,16 +1,11 @@
 AUX octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch 199 BLAKE2B 36c7f66c0fba3387dcbc027dc60370f1526e0f5bd42c4a24ed031745f6fdf6ff3860909dc2462b6577db30b8b47ec301299ccd3584fbb99d1b1b205c8f46e0b6 SHA512 e9984fe54b7b4c49783f5f7559d24e9f1076b47ff8c0ec2751dda2e96c1f84ad48f03a760fd4d8b87fba021174237bc7f19c75ba7f33e84bce6def6318184e7d
-AUX octave-4.2.0-fix-qscintilla-detection.patch 436 BLAKE2B e48ea3c1b0f2215d903ae301425cb94729445809350bf6e5dc8d51cb0a98d77f85ebc37c0d4cb046521809174494ce63398a895219c127ddd26d8a0d2453860d SHA512 5cee5fbd5c78228e1b179d5541a5ba1fc23e71db1552cb5b2759ed131ba743787b52875aa54527bb3d8f1949061627e72c9cbd253feba5af99f34f228c4a65f7
-AUX octave-4.2.0-imagemagick-configure.patch 735 BLAKE2B e90fc5176a4168f639c7c7953c0b229c35f30d4eaa410ad7be812fd6ace4c8a73b844a76851d231945b332471755854787b0aa99f5aca92c2aa02dfb81a2becb SHA512 357c46f93b0a998c6966fca1bd97a04641dd9e77251378e945f815a518b55b0ec991c46d209173c23954346bdb5ba914c82a3141e85744aeb7e58a6376be3d5d
 AUX octave-4.2.0-imagemagick.patch 5945 BLAKE2B 44898e339d9f26ed776839365f0719414216f40a275a000b9dfef879d17ac26318ca6b10cc96c485f860dcc335f4b7820e4bcf95da704326a2c8bb44b265dec9 SHA512 061c941cd23a3565f35c70bfaf0db23ea62f70e8943794216b00cb1d8ced201859f98eae5aba5f566627a301745691b53aa6a62cf9bfc0ee9d99159859ceb593
-AUX octave-4.2.0-ncurses-pkgconfig.patch 1034 BLAKE2B dc21406651de72c8146862e0e8567d0fe98686050158695de75e7e6f174c70c56c37108f402fc18b21abaac4085e404092ba21cf50a8be018141a583cc02f962 SHA512 8f5e8dc2506ff0483db2823aa87544ad52a7b65d658db32c9a224aab2adac286892665068170af2d898b372dd6e176123f5516456b7f98e4c0ce5a71559c825f
 AUX octave-4.2.0-pkgbuilddir.patch 1346 BLAKE2B 38b3e3ea90e7e5f381cf75e7becad83c92dd4d8be07e30ca82e54f7811fbf42d83872059c5bab1af884d5f5e70c4826c119ed69286d07338d017335e68922969 SHA512 7dc10b4d27aa0fb4443dffaa28c84843d9c233172eb1c7b7d93d196434ea7db9c330b3152def21829e483ab3765423927e70718ca0662ae7aeba3a1a8540fa19
 AUX octave-4.2.0-texi.patch 557 BLAKE2B bb79b2b56975feaa60e1dd0f6811cf7e11ab7080c88cc9103373a6bb0066c99e09a02b9651cf0317c0c19c31584fe68ba9c8796217c8e3aad316cda9ef3fb745 SHA512 1d4a6ce92ffde0945858b605cb37ed7c91abca201dd2c7f0d974852ef65c59e638a91aa219612c7acf9b46a0743a4a5e0ccbe590a8a056efd0d9d3293928c56a
 AUX octave-4.2.0-zlib-underlinking.patch 275 BLAKE2B a6353807c2c672b80ce5a015c5650cf017443bd92256ceb39d855e22bb9f20431c1837fa1e4fff1b4f547ff12da4fa85e6e1e49e5c350a9e5e7910de73c63b6b SHA512 093b13ad457e290d746908a5de1855071b2cd27b4c08101826d32fcf63398e863c3b72bb81f19255a04a880a2bf49e3ced1141bf7d0044db1328c6f2c9492f66
 AUX octave-4.2.2-fix-qscintilla-detection.patch 452 BLAKE2B bed48bf923cbfba50c50fdadfc807da0e199e2e7160f2a3078ba13fb58c123ecada0510ba8dd101f7772c7164533ff2aeb0841484ce41a86d27761b2e39e7fb0 SHA512 f5dd5a349dbdb36cba718ed378609f73090a32ce40240f002312539820538a30039c550c8b78493f3dca9e5f5eda8858c2e97afd313052d40d47d3edf08f1e80
 AUX octave-4.2.2-imagemagick-configure.patch 873 BLAKE2B 9de92c88f83c56d521f83df7672e71bc9398ad782004339c737d2991d85154cc1cf2c3d5fe912892c87b18f51af6b11d4b8fadcc5ed058b76cfa604b93aaa720 SHA512 582df053f6c14790461408a180ce66589bd6501e3f9ecdc126b2cf12e8044198dff6eb66904b7704f87cba46adaabbac3126e46c61e406debe8cca49b935f93d
 AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c52f54e105f209edf79c869e6ce253a9cec7a3373a8dd0c98196ba3271f9b2b066ad3de3784151072055f2319ebbb4d1b68a475 SHA512 d2d6fe57a11f0493f86378bc4e1fc71378ae6d1878d17a367b77aa16a29880e37134e61343ba081f7ab2c4d127d93611491bef1320d6cd202eff0d78681cd4cc
-DIST octave-4.2.1.tar.gz 25409651 BLAKE2B c53dd025cbad023d4d343d47ff13051f6f66bc8cfeece6c56eda83a80c92d2256fd1e75d5574ae024e42d707eb22b60420269f91a4930642aec8e3391a17b035 SHA512 c437c57eb145ddea7b97124dc6406d130fd91c9141198b93bc756bb05cb3f7645a7c591443faeb65e69edf6abc2b8d5612e515f7703a04eed27213a2133009b7
 DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
-EBUILD octave-4.2.1.ebuild 4971 BLAKE2B 41099313b75cddf9153d4e1f1bacd05c239afa2c0cbfcc151162e09f4da677539bf38494f2c97a544b4cbeaa0f8a1c0ad9bbd0f9a2b158144e8adbd1b4735cfe SHA512 0f87f0a29c8810cf6a5b70fbb661dcab35003099ac02ee2ae2637b02fa018adfd24a5379fc64ebcc6dff84f535fcc4e90dbcf3b438886d6521045d03d24668f4
-EBUILD octave-4.2.2.ebuild 4950 BLAKE2B 0bf5d2fe8ba3bb656a57a3e887bbd9d916a3a59fc9cf1fe965905c794c6d20c2ea42f31347a682dc3aafa010c0943cf9d389da347a9c8c36d28ced4b68d269f3 SHA512 37420732ecad2efb09663c2f5fdfcf21135d91092a2f8f5b8653cc17ccd6c14aa37a70397bd73b829b687ff667334201cf1c3a846e3a33b38f61eb66ecc9b21d
+EBUILD octave-4.2.2.ebuild 5021 BLAKE2B 9aab0665c81a0be5b773c21d3e19a74ab5451ba2135f517562f1f0bbdcefb4a07d3d9bfc4f6bf64dedbbd3eed8bdb3649383ef509a5eaa86519faa5ce9c49e3d SHA512 61c577fbaee39d056af1e9de45ad3eb55372175a8a5ed18efb33755e2e2e2649a1880c048af0ef6e83b46fe9676d87af8b042dd49d87b94265ac7d4a0f5bfd8c
 MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
diff --git a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
deleted file mode 100644
index ea714ecbfbbf..000000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-In Gentoo, QScintilla for Qt5 has the same library name
-as its Qt4 variant.
-
---- a/m4/acinclude.m4
-+++ b/m4/acinclude.m4
-@@ -1327,7 +1327,7 @@
-     ;;
-     5)
-       QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
--      octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+      octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2"
-     ;;
-     *)
-       AC_MSG_ERROR([Unrecognized Qt version $qt_version])
diff --git a/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch
deleted file mode 100644
index d5b2870185bb..000000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1560,11 +1560,11 @@
-   MAGICK_LIBS=
- 
-   PKG_CHECK_EXISTS([$magick++], [
--    ## Make sure we only get -I, -L, and -l flags.  Some Graphics/ImageMagick++
-+    ## Make sure we only get -I, -D, -L, and -l flags.  Some Graphics/ImageMagick++
-     ## packages add extra flags that are useful when building
-     ## Graphics/ImageMagick++ extentions.  These extra flags break the
-     ## Octave build.
--    MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
-+    MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'`
-     MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
-     MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
- 
diff --git a/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch b/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch
deleted file mode 100644
index 89f6f6e7014d..000000000000
--- a/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/m4/acinclude.m4
-+++ b/m4/acinclude.m4
-@@ -1194,32 +1194,8 @@
- dnl Find a suitable termlib to use.
- dnl
- AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [
--  TERM_LIBS=
--  ac_octave_save_LIBS="$LIBS"
--  AC_SEARCH_LIBS([tputs],
--                 [ncurses curses termcap terminfo termlib],
--                 [], [])
--  LIBS="$ac_octave_save_LIBS"
--  case "$ac_cv_search_tputs" in
--    -l*)
--      TERM_LIBS="$ac_cv_search_tputs"
--    ;;
--    no)
--      warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!"
--      AC_MSG_WARN([$warn_termlibs])
--    ;;
--  esac
--
--dnl  Old code (9/9/2012).  Delete when new code is definitely proven.
--dnl
--dnl  for _termlib in ncurses curses termcap terminfo termlib; do
--dnl    AC_CHECK_LIB([${_termlib}], [tputs], [
--dnl      TERM_LIBS="-l${termlib}"
--dnl      octave_cv_lib_found_termlib=yes
--dnl      break])
--dnl  done
--
--  AC_SUBST(TERM_LIBS)
-+  PKG_CHECK_MODULES([TERM], [ncurses])
-+  CPPFLAGS="${CPPFLAGS} ${TERM_CFLAGS}"
- ])
- dnl
- dnl Check for the Qhull version.
diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild b/sci-mathematics/octave/octave-4.2.1.ebuild
deleted file mode 100644
index e7ecf516cc42..000000000000
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl
-	portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/bzip2
-	app-text/ghostscript-gpl
-	dev-libs/libpcre:3=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	virtual/blas
-	virtual/lapack
-	curl? ( net-misc/curl:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:0= )
-	gnuplot? ( sci-visualization/gnuplot )
-	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	java? ( >=virtual/jre-1.6.0:* )
-	opengl? (
-		media-libs/freetype:2=
-		media-libs/fontconfig:1.0=
-		>=x11-libs/fltk-1.3:1=[opengl,xft]
-		x11-libs/gl2ps:0=
-		virtual/glu
-	)
-	openssl? ( dev-libs/openssl:0= )
-	portaudio? ( media-libs/portaudio )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig
-	)
-	qhull? ( media-libs/qhull:0= )
-	qrupdate? ( sci-libs/qrupdate:0= )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		>=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
-	)
-	readline? ( sys-libs/readline:0= )
-	sndfile? ( media-libs/libsndfile )
-	sparse? (
-		sci-libs/arpack:0=
-		sci-libs/camd:0=
-		sci-libs/ccolamd:0=
-		sci-libs/cholmod:0=
-		sci-libs/colamd:0=
-		sci-libs/cxsparse:0=
-		sci-libs/umfpack:0=
-	)
-	X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
-	gui? ( dev-qt/linguist-tools:5 )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-	java? ( >=virtual/jdk-1.6.0 )
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
-		dev-texlive/texlive-metapost
-	)
-	sys-apps/texinfo
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.0-texi.patch
-	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-	"${FILESDIR}"/${PN}-4.2.0-imagemagick-configure.patch
-	"${FILESDIR}"/${PN}-4.2.0-imagemagick.patch
-	"${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-4.2.0-ncurses-pkgconfig.patch
-	"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
-	"${FILESDIR}"/${PN}-4.2.0-fix-qscintilla-detection.patch
-)
-
-src_prepare() {
-	# nasty prefix hacks for fltk:1 and qt4 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# [QA] detect underlinking #593670
-	append-ldflags $(test-flags-CXX -Wl,-z,defs)
-
-	# unfortunate dependency on mpi from hdf5 (bug #302621)
-	use hdf5 && has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
-	econf \
-		--localstatedir="${EPREFIX}/var/state/octave" \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--disable-64 \
-		--disable-jit \
-		--enable-shared \
-		--with-z \
-		--with-bz2 \
-		--without-OSMesa \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with X x)
-}
-
-src_compile() {
-	default
-	if use java; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc $(find doc -name '*.pdf')
-	else
-		# bug 566134, macros.texi is installed by make install if use doc
-		insinto /usr/share/${PN}/${PV}/etc
-		doins doc/interpreter/macros.texi
-	fi
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && \
-		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
-	doenvd 99octave
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild
index f120643f0170..66323d5a8b53 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
+HOMEPAGE="https://www.gnu.org/software/octave/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/${PV}"
@@ -27,6 +27,13 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	glpk? ( sci-mathematics/glpk:0= )
 	gnuplot? ( sci-visualization/gnuplot )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		>=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
+	)
 	hdf5? ( sci-libs/hdf5:0= )
 	imagemagick? (
 		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
@@ -36,9 +43,9 @@ RDEPEND="
 	opengl? (
 		media-libs/freetype:2=
 		media-libs/fontconfig:1.0=
+		virtual/glu
 		>=x11-libs/fltk-1.3:1=[opengl,xft]
 		x11-libs/gl2ps:0=
-		virtual/glu
 	)
 	openssl? ( dev-libs/openssl:0= )
 	portaudio? ( media-libs/portaudio )
@@ -49,13 +56,6 @@ RDEPEND="
 	)
 	qhull? ( media-libs/qhull:0= )
 	qrupdate? ( sci-libs/qrupdate:0= )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		>=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
-	)
 	readline? ( sys-libs/readline:0= )
 	sndfile? ( media-libs/libsndfile )
 	sparse? (
@@ -69,19 +69,19 @@ RDEPEND="
 	)
 	X? ( x11-libs/libX11:0= )"
 DEPEND="${RDEPEND}
-	gui? ( dev-qt/linguist-tools:5 )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-	java? ( >=virtual/jdk-1.6.0 )
+	dev-util/gperf
+	sys-apps/texinfo
+	virtual/pkgconfig
 	doc? (
-		virtual/latex-base
 		dev-texlive/texlive-fontsrecommended
 		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
 		dev-texlive/texlive-metapost
+		virtual/latex-base
 	)
-	sys-apps/texinfo
-	dev-util/gperf
-	virtual/pkgconfig"
+	gui? ( dev-qt/linguist-tools:5 )
+	java? ( >=virtual/jdk-1.6.0 )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.0-texi.patch
@@ -95,7 +95,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	# nasty prefix hacks for fltk:1 and qt4 linking
+	# nasty prefix hacks for fltk:1 linking
 	if use prefix; then
 		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
 	fi
@@ -177,11 +177,13 @@ src_install() {
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 }