gentoo resync : 19.07.2019

22 files changed, 431 insertions, 48 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index c84a9677de2a..cb9a50d88db4 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index 2061a95c8954..2f49251243f4 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -1,6 +1,6 @@
 AUX arb-2.11.1-pie-ftbs.patch 585 BLAKE2B cf7fd0230dd00a52452b1ad80f284028eab6c35c8aeb160e3f74b924a7c6e422a0740a3954eb2937b5b13085e47a25abc6c8f9dede88bd5f90cac5570c6b2710 SHA512 f147d61a6c9dfac57ded28a7265db9e6be76ebb8c9c787960d4dafc36ef703cebc42ba4a3ca8ef03ae3b81589d6a6a555a7ff381ddc9fd391466156677e0b4ff
 DIST arb-2.11.1.tar.gz 1248835 BLAKE2B 8ba11f3a92103231c4710c0158ce0811b2a01872e1ec7b7a4a4320d27ab86688aa8733df6dd2464aa55c0a506a8a595e4c370848c78b5c3a650e647f0c6d7411 SHA512 7a014da5208b55f20c7a3cd3eb51070b09ae107b04cbbd6329925780c2ab4d7c38e1fb3619f21456fa806939818370fcae921f59eb013661b6bdd3d0971e3353
 DIST arb-2.16.0.tar.gz 1526059 BLAKE2B 14f4a9b23fa6fc46659b742cc95b4970cee74cf52bda8bc696831b0a5c1f946f41f1c2bba180ad1199c55d741366b3376aeed0efbf6ee087b26f6de788519739 SHA512 171c965aeb03cd2830df8a53990403c6da480a94d44385dadfbb2d02697f7c03e8b9a217094b0ad93f796d889a1564f4b9ae9db35ef9de90f61bb2e3220911be
-EBUILD arb-2.11.1-r1.ebuild 1584 BLAKE2B 51a0f06c3357d1fedd7435d362b4f0cba35b4c479a23af1290989b7bbbec14fb61a6cce90292b793ee3692741cf949c501a89806d6f4f0e2b2d0070b268b152b SHA512 a489c8422518fdcb774e42b77c176301d64fc2c4d76ea8dc5865556ad2a1ce6ec562fed29e7c913c37fc69281d9b2d34fd62d2aaf5936e0fc0a6ed7679df0df8
-EBUILD arb-2.16.0.ebuild 1534 BLAKE2B 757103d7596a6b8e82675a480845dd4ef7b391efdc5b43d04963df4bdbd5c4d92603c7e7f67e06a8bc9455ed7d8ac809bd8082e76bccd80a749c2710a64bd262 SHA512 a544ff3bb4be78fb154e8d5988c8eb591bd96928ec163fae68f070ad9d2e6d67664c2d9d00972e48574bd136a6f1c24e4d95287da329fbf8bf1b842380b080bf
+EBUILD arb-2.11.1-r1.ebuild 1580 BLAKE2B b62d1fe839b0318d20fe1bd647a01c23bbd61a408dbdd6db3c3da8d25686477b16ee2c558184c09b4b46cba125919f9424b4840117b9e6a42070c89605464e6b SHA512 b42edca44c4b32a2d51f6d2516445fc4569a317acbcac1a5164c7d5cd1711a6731bcca8eec1865e1ed28a5b68bf050f6652a1dd542d7a325b35437cad9a47b64
+EBUILD arb-2.16.0.ebuild 1533 BLAKE2B 0c6d3a805a3ace2e04530d81d005b035a510b2eeabad6a0c1add07580554aaef68fa40b578a8df1bd71e8023937db94f2d1b664769de8ad2cde2374b3cb9d531 SHA512 0cad0ee64353f3c2178b50573f02d7b0c9468f5cdf8c73fbb410ffa6058377ed8dc93029b5614d495e116303561fb5e9d88ab25e7faa494252fe29ca9de34f80
 MISC metadata.xml 756 BLAKE2B da8035991c582b71f7bb25866fd86ad79c40640f5685436935bfd6efb26af9e11a31fb28ea83df5ef7f0951ecb26155021d289e0b9926aba03c8c7d9e417677f SHA512 843e473b1cb261c97f817d2c003f632c973a67ba1d8cfe188a40f41cc89fe6167917e2b669768420a7c7c88b19f5b4b68ba4529ab73e373c6696786ecfad11b6
diff --git a/sci-mathematics/arb/arb-2.11.1-r1.ebuild b/sci-mathematics/arb/arb-2.11.1-r1.ebuild
index 88e262a3d9fd..26602ecdad3e 100644
--- a/sci-mathematics/arb/arb-2.11.1-r1.ebuild
+++ b/sci-mathematics/arb/arb-2.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0/2"
-KEYWORDS="~amd64  ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/sci-mathematics/arb/arb-2.16.0.ebuild b/sci-mathematics/arb/arb-2.16.0.ebuild
index 72f391958855..d835bfd1bd6d 100644
--- a/sci-mathematics/arb/arb-2.16.0.ebuild
+++ b/sci-mathematics/arb/arb-2.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0/2"
-KEYWORDS="~amd64  ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 364d3cb09511..5a86e7bb1ddf 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,3 +1,6 @@
+AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1c1cc6a3ac2edea5e27d6f8ba082fc209c3694e1144a94d9d3b1897418af250252ff40a26e521bbf72d7da0f SHA512 b6b7af8c48c0398375343c8fa72f3e15d8f9031848cf94e6e2880f04b5e8d695691dcf67b84daa1706464289f7db0300046af4c93adcf278f7951eccc734af89
 DIST cvc4-1.6.tar.gz 7815893 BLAKE2B 626e0dd49f911384e64d7e8ecf635aa12dad32830b2032bdcb96afd1a17c3566f56df51f75e9193cf365b562855733d0ea4ff3311ac99fc86e928a956298d2ad SHA512 0887b3f74a4b9e51e634591c7cf39d730110ca5d930149bab4816a49e383eeea8ccadf8474d22f5529cc03ddd045acacf8a2b92434b882adf352f4de4075fcd4
+DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
 EBUILD cvc4-1.6.ebuild 556 BLAKE2B 2943590af801614ea64b26ff72ee9d445c544dacc62b93428c60e8e80a8fea9884f646d3d3680c89d246c34f42215998aadbc39618ee5334d5ee3503e179543b SHA512 bd9ed1c3e2c635ba47667d77fb0929a2681ec6bc09570e74b0e093b76208746e804b7dd04852bb00c44d3b69f31385346ab838ef8e058d701eaf2dd5aabe4d17
+EBUILD cvc4-1.7.ebuild 1072 BLAKE2B f310aefde818c98368dc49cd6ab03c86d64984b3048ef508f2da8b13457e5574eecd32aa595b3cded6918702878afca2baadf30240f141385e4fbc88d4292cb3 SHA512 b731c2b4895167ab9f02ba3120294f964825361fabed861b8692006b317c376eeaca55e21b7ba45404d861f0f33146df685687f9be37e2aa28750ee564b9060e
 MISC metadata.xml 635 BLAKE2B 96c8a55b5e69e6f52bb5b66ac46361b07bee92c72216d73837a4644ea139b3fc9375f8e8ca68db04975675d6520d7275c02c0cfd27957c77b3506e90b332cc8d SHA512 166da2a33b4d8d33ee237d6175973e382399e1864317fd585395f1f3c78b1487ef4e95c866bfc8e9928fc10f648c45b6f95d0803b608cd8a8b9040c1054f2538
diff --git a/sci-mathematics/cvc4/cvc4-1.7.ebuild b/sci-mathematics/cvc4/cvc4-1.7.ebuild
new file mode 100644
index 000000000000..0b192f127391
--- /dev/null
+++ b/sci-mathematics/cvc4/cvc4-1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
+HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
+SRC_URI="https://github.com/CVC4/CVC4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cln"
+
+RDEPEND="dev-libs/antlr-c
+	dev-java/antlr:3
+	dev-libs/boost
+	cln? ( sci-libs/cln )
+	!cln? ( dev-libs/gmp:= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/CVC4-${PV}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	CMAKE_MAKEFILE_GENERATOR=emake
+	local mycmakeargs=(
+		-DANTLR_BINARY=/usr/bin/antlr3
+		-DENABLE_GPL=ON
+		-DUSE_CLN="$(usex cln ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" \
+		examples \
+		boilerplate \
+		ouroborous \
+		reset_assertions \
+		sep_log_api \
+		smt2_compliance \
+		two_smt_engines \
+		statistics
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"/usr/{lib,$(get_libdir)}
+}
diff --git a/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
new file mode 100644
index 000000000000..55331f6c39b8
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
@@ -0,0 +1,43 @@
+--- a/CMakeLists.txt	2019-07-09 14:47:12.552425226 +0200
++++ b/CMakeLists.txt	2019-07-09 14:50:02.595001358 +0200
+@@ -143,7 +143,7 @@
+ 
+ # Note: Module CodeCoverage requires the name of the debug build to conform
+ #       to cmake standards (first letter uppercase).
+-set(BUILD_TYPES Production Debug Testing Competition)
++set(BUILD_TYPES Production Debug Testing Competition Gentoo)
+ 
+ if(ENABLE_ASAN)
+ #_cmake_modify_IGNORE   set(CMAKE_BUILD_TYPE Debug)
+@@ -166,12 +166,10 @@
+ endif()
+ 
+ message(STATUS "Building ${CMAKE_BUILD_TYPE} build")
+-include(Config${CMAKE_BUILD_TYPE})
+ 
+ #-----------------------------------------------------------------------------#
+ # Compiler flags
+ 
+-add_check_c_cxx_flag("-O${OPTIMIZATION_LEVEL}")
+ add_check_c_cxx_flag("-Wall")
+ add_check_c_flag("-fexceptions")
+ add_check_c_cxx_flag("-Wno-deprecated")
+--- a/test/regress/CMakeLists.txt	2019-07-14 09:49:38.429990489 +0200
++++ b/test/regress/CMakeLists.txt	2019-07-14 09:50:28.854234838 +0200
+@@ -1810,7 +1810,7 @@
+   regress4/C880mul.miter.shuffled-as.sat03-348.smt
+   regress4/NEQ016_size5.smt
+   regress4/bug143.smt
+-  regress4/comb2.shuffled-as.sat03-420.smt
++  #regress4/comb2.shuffled-as.sat03-420.smt
+   regress4/hole10.cvc
+   regress4/instance_1151.smt
+ )
+--- a/src/CMakeLists.txt	2019-07-18 08:56:47.923025745 +0200
++++ b/src/CMakeLists.txt	2019-07-18 08:58:10.584750385 +0200
+@@ -915,4 +915,4 @@
+ # Note: This is a temporary fix until the new C++ API is in place.
+ install(CODE "execute_process(COMMAND
+                 ${CMAKE_CURRENT_LIST_DIR}/fix-install-headers.sh
+-                ${CMAKE_INSTALL_PREFIX})")
++                \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})")
diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest
index 1a6e3d302b87..d4e46ed9232b 100644
--- a/sci-mathematics/genius/Manifest
+++ b/sci-mathematics/genius/Manifest
@@ -1,4 +1,6 @@
+AUX genius-1.0.23-tinfo.patch 772 BLAKE2B 30f93f5ab25e51427d946906e0557c7298b280f1311e2f8f47af980e3035993d5b81c1d96258f08e5f23fcf347d992c2025f5448aa82de6d4134b0cde60bec93 SHA512 7f916124faa5f267c00e6609f0956339644a47db236d1f0d0468e64686f39de263b5a57da873dba09ba3b8967b6c8c35bc2b5fee7441b6af74e736deb5285402
+AUX genius-1.0.24-no_scrollkeeper.patch 1072 BLAKE2B fc05460f03b369e7c867b965a3bd3d6b0ac7722129377106c36358c4a07548f1a5a3c227bca9da2e7d5ad5ecf1290275fa6f46393aadd3865012c317b3f66f61 SHA512 d047ef4f3d253f48cee701f37709230d5c78694f98dcadc9b2bae399c93e9e043fa7bff27c81b8bf529cd83f06155b1059384c73e4647fd19795b5921316bdb9
 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.23.ebuild 1258 BLAKE2B 32922b3bac91addad409e8ade4bf19be151b923f418ef6dc259f3c562a471b5e0df59f7e55e818ad026db5bdb6cb0ad4333cbf2eb2e5e45bc58be655efc0f363 SHA512 1cd21045f40466f85ab5a2f18f0bc387d96d2756d7d37cf37c7c380a3f754f635bd81bed39985afb762cace1f61a2a61e9fd0f8c000156fb164a3d2a2cb1e812
+EBUILD genius-1.0.23.ebuild 1461 BLAKE2B a23dd485bc36ebfae68e6cea6f6b63867b77f521e2e4b636050595b1ef3e7f62e21f3aa76669bcbcc23c9a484fe6acea88af6ca335bd5b9789cf47d0617bc564 SHA512 512066eb09d4fe81722bb3cbe0802e074f1f658b24d0ebbb822b973dae9554934d2c469058dcb24320e290309bec4ab82385897e8f0c131c1a569c0d025f98b3
 MISC metadata.xml 809 BLAKE2B 9102651076c5b608afc1fbd7a2371d771587fbdc4960e56692f0999ddbfc9bef8096e04e59c491dc7c85ce4f75ec9fb9b093f49a3e53979d62e787e13377c345 SHA512 4259f2ea73e57edc70689d48522cb28ae79443b97b25799bfda21e9114bac15ae77bc27933fd6773c99daeaa060088cb0cb0acae71acd4af81fe7ae408c9e06c
diff --git a/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch b/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch
new file mode 100644
index 000000000000..e3250f0817c5
--- /dev/null
+++ b/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/675670
+
+--- genius-1.0.23/configure.ac
++++ genius-1.0.23/configure.ac
+@@ -15,6 +15,8 @@
+ 
+ AC_PROG_INTLTOOL([0.21])
+ 
++PKG_PROG_PKG_CONFIG
++
+ dnl ================= Requirements ================================================
+ 
+ VTE_REQUIRED=0.26.0
+@@ -64,8 +66,8 @@
+ 
+ dnl Check for termcap
+ AC_CHECK_LIB(termcap, tgetent,[TERMCAP_LIB="-ltermcap"],
+-	     [AC_CHECK_LIB(ncurses, tgetent,
+-                           [TERMCAP_LIB="-lncurses"
++	     [PKG_CHECK_MODULES(NCURSES, ncurses,
++                           [TERMCAP_LIB="$NCURSES_LIBS"
+                             AC_DEFINE(USE_NCURSES,[1], [Use ncurses library])
+                             AC_CHECK_HEADER(ncurses/curses.h, [
+ 					    AC_DEFINE(INC_NCURSES,[1],[ncurses include])])], [
diff --git a/sci-mathematics/genius/files/genius-1.0.24-no_scrollkeeper.patch b/sci-mathematics/genius/files/genius-1.0.24-no_scrollkeeper.patch
new file mode 100644
index 000000000000..dc69ba7fd3f9
--- /dev/null
+++ b/sci-mathematics/genius/files/genius-1.0.24-no_scrollkeeper.patch
@@ -0,0 +1,29 @@
+--- genius-1.0.24/configure.ac
++++ genius-1.0.24/configure.ac
+@@ -247,16 +247,16 @@
+ fi
+ 
+ #dnl scrollkeeper checks 
+-#AC_ARG_ENABLE([scrollkeeper],
+-#	[AC_HELP_STRING([--disable-scrollkeeper],
+-#		[do not make updates to the scrollkeeper database])],,
+-#		enable_scrollkeeper=yes)
+-#AM_CONDITIONAL([ENABLE_SK],[test "$enable_scrollkeeper" = "yes"])
+-#
+-#AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-#if test x$SCROLLKEEPER_CONFIG = xno; then
+-#  AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
+-#fi
++dnl AC_ARG_ENABLE([scrollkeeper],
++dnl 	[AC_HELP_STRING([--disable-scrollkeeper],
++dnl 		[do not make updates to the scrollkeeper database])],,
++dnl 		enable_scrollkeeper=yes)
++dnl AM_CONDITIONAL([ENABLE_SK],[test "$enable_scrollkeeper" = "yes"])
++dnl 
++dnl AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
++dnl if test x$SCROLLKEEPER_CONFIG = xno; then
++dnl   AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
++dnl fi
+ 
+ dnl mime checks
+ AC_ARG_ENABLE(update-mimedb,
diff --git a/sci-mathematics/genius/genius-1.0.23.ebuild b/sci-mathematics/genius/genius-1.0.23.ebuild
index aadd433bff97..f13471ac3010 100644
--- a/sci-mathematics/genius/genius-1.0.23.ebuild
+++ b/sci-mathematics/genius/genius-1.0.23.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools gnome2
 
 DESCRIPTION="Genius Mathematics Tool and the GEL Language"
 HOMEPAGE="https://www.jirka.org/genius.html"
@@ -30,11 +30,22 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/gtk-update-icon-cache
 	dev-util/intltool
-	virtual/yacc
+	sys-devel/autoconf-archive
 	sys-devel/flex
-" # eautoreconf needs autoconf-archive
+	virtual/yacc
+" # eautoreconf needs sys-devel/autoconf-archive
 # dev-util/gtk-update-icon-cache because configure checks for it for some reason and never calls it with DESTDIR set..
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.23-tinfo.patch"
+	"${FILESDIR}/${PN}-1.0.24-no_scrollkeeper.patch"
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	eautoreconf
+}
+
 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 \
diff --git a/sci-mathematics/octave-epstk/Manifest b/sci-mathematics/octave-epstk/Manifest
index 7b3ad97b1fa7..e3f3cb017f54 100644
--- a/sci-mathematics/octave-epstk/Manifest
+++ b/sci-mathematics/octave-epstk/Manifest
@@ -1,4 +1,4 @@
 DIST octave-epstk_2.4-1.debian.tar.gz 10905 BLAKE2B 79290d650a3a9e485c2b45fabcf5aa6c68585656f5f1c81ac3412ea123986bb51ed18b7f093bcec954964e260907594d5fda0f28915ef951fe59c6d238092278 SHA512 93ce2bdb04b2be36bc73d2c13a1bdd909b30597a76bc80db0abb1b4f53467742086559ed1f5ce265cea70f84c9b33d07a514b4fc1c8afc46640d0031907e6dea
 DIST octave-epstk_2.4.orig.tar.bz2 1072111 BLAKE2B 25694cb80fe66efb15508f6654218a2fcfd66997258e590626caf4daeafdc68b92dba5c9b0066c25777af609606d9b6e15ebea45c8fabcca17c962a1d664172c SHA512 64de7c23e2a79f03a6aeaa9e8a73c6d95e59cf616fc601bd8c6ad18d3870b1c60752f95cdc174cc31b3095e8b6e3858111c7d72b3b6df8effee4393791282112
-EBUILD octave-epstk-2.4.ebuild 871 BLAKE2B dbffdcfac3e8df62a095fbf54f764f73c7fdd357e5452481d44017157978f8a539af6a0939d97848c6856906ead60e23be5e1179e7e75d33f58c483461b97c08 SHA512 a84e188cc192d109733cc27ab92aa54dae4f0a5a184147f8397ff15d2b0391e7676018e29b7f82e896db7fb09e6bc27bc6fac26569a1dd5c20a64220915c3cef
+EBUILD octave-epstk-2.4.ebuild 868 BLAKE2B 3ddb8270c3858a654876d3db3e5373e310371eca82075dc26acad5fd7cc107513ca1e957f2af050dd1b7a5f59912a89b3c4ba43063665eef9dde4e8c5996503a SHA512 e47d7a229519766dca5f67108b1cde3753cd37dd8cf47e6d05764790d91a6245f2eb2237f5fe657b1272fd903b03bbbe5711dd5c428227d2129cc6ac5f763422
 MISC metadata.xml 614 BLAKE2B 7e4e57a0aa9b57d55fe747609630d9ec2b037595f88ba1d3352a3702c85de6695c43035d75780189bc7293b581766b5305ff37c005de2843a6e9033000540d0c SHA512 d3ff3c6669d6fb6dac67df09c9eb7245e5cbf91d9bdd0d0ae47f66fcf3e11a2f769bdc9f934a35189792364a902518ae6d906963859eabfdc65579f6253e1061
diff --git a/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild b/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
index f1642d9333f1..8b9301f8ff6a 100644
--- a/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
+++ b/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/sci-mathematics/rw/Manifest b/sci-mathematics/rw/Manifest
index 03206891d507..1090bb410f8a 100644
--- a/sci-mathematics/rw/Manifest
+++ b/sci-mathematics/rw/Manifest
@@ -1,3 +1,3 @@
 DIST rw-0.7.tar.gz 322255 BLAKE2B 88d8f5da9b95619bd3cbb4fa3e006b64306e0dccb96f87945cbb86e757ba9ac68ee4446e558442afe1b06ef8bb9dcbbde2ac91872608e8b3c4732748f36c89e0 SHA512 2bccbaf1a7432b845e9bf14d79e350275d1ca417cb368e870b6cb1a310a92cce67c9e4ce3c550da2900a8e08c3771cc534d593f67267eee17d25c756d8c36e3b
-EBUILD rw-0.7-r2.ebuild 932 BLAKE2B 872790fa88eae132fc30fbb46cf7bb6777cd58652ca4ca793579032bbca46ba3b113cf8ee2640d3f1171f4a571a7166ccfc82307458a325bf983a04cb714a520 SHA512 906441df650f9c36e2cffc43e550be61bba214c43a980909251d7b62ebca024d7df250c4b4ed04defc95ab5316be17ce753e1394c612861daec2dd042eac1c48
+EBUILD rw-0.7-r2.ebuild 929 BLAKE2B d705d84ddf178ea26edee3ad7656dd72210d5534c2e4350abdc02c772415f0a491bdb8a2037bfe09e5d02464940b7c44523564dda593ead264b2560b19a85101 SHA512 cce48e453d7bfde36e91f45d35b3d89f9807a4b674866067d64ab7e0d4382dda3904d717b2183aa44f76310636acb51982ffe83689ed4a7c3654eb2b595a5c8d
 MISC metadata.xml 1121 BLAKE2B fde7ce008a730dcebc7c7b9223cbb32bdb80debeee70bab8d342d2a0ffd5fa8d68f99e62cf6f788b3fee1c0ab91ffbe73ca514afcfd53e62a3a22dfbdb55584c SHA512 9c22d1d83b1c68e0e6cc25d93965b1a4efb01e85083a8886be0b5cd74a4700c74fa855b8d9dbee3feadf102cbe964d1119610e6456e06a1e16ed7e993a35717b
diff --git a/sci-mathematics/rw/rw-0.7-r2.ebuild b/sci-mathematics/rw/rw-0.7-r2.ebuild
index c1baf16e3828..b7bbee63c20c 100644
--- a/sci-mathematics/rw/rw-0.7-r2.ebuild
+++ b/sci-mathematics/rw/rw-0.7-r2.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
@@ -10,7 +10,7 @@ SRC_URI="${AUTHORPAGE}software/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+executable"
 
 DEPEND="executable? ( >=dev-libs/igraph-0.6 )"
diff --git a/sci-mathematics/sha1-polyml/Manifest b/sci-mathematics/sha1-polyml/Manifest
index 9bc610e6c198..a43b118ec78d 100644
--- a/sci-mathematics/sha1-polyml/Manifest
+++ b/sci-mathematics/sha1-polyml/Manifest
@@ -1,5 +1,5 @@
 DIST polyml-5.5.0.tar.gz 12776783 BLAKE2B 8ec50df7a43049f564e4f0fd67aa961fb2dd075359934a58340526e77a852006fdc1083d199837ea406524cbe3fc53d5a85d83e5a414662e141257b18d8c9a22 SHA512 4d8accc7083e12a0117fb4e34367e9b22c500d31094d8f0e381b91e91a3e8122cb5ca760ecc86bdcf7ff50a460848a181747bafc068b4a300b01de54e55fbad7
 DIST polyml-5.6-1.tar.gz 22041657 BLAKE2B c097dda273b12dfe013706e5fa313f210f1f0bf6b32766db6e459ce1bca46f93504baef3d7644922c60d119431d659cbd69d8cd273fcc94609eadff058d3cb9b SHA512 3107f4a5b17283dc3873b0ecf7eb1c607c42e14e859b50345b666f19412a2592e359ea29f03e56d390491e9104a71e0bf80eb39884f51d8724b37f8f935fa7d2
-EBUILD sha1-polyml-5.5.0.ebuild 2720 BLAKE2B a4fc20fa15fb904b7ffdf46d1d30a61af828c900ef1170be27e3b89f38c86cbfc44f33c0e171a31972b48481eba228038229d8ba819b18637a03e54965e1d17f SHA512 3a321471a02bbda005f91f31d5fd0545b672011782ed3a141c924327bf2cf3fab2d6bd174bb179dc64c4f254651bce2899dd6eccb2fd8815bfb8be8a7214293d
-EBUILD sha1-polyml-5.6_p1.ebuild 1909 BLAKE2B 4b8785f28fb2f57a00f346b58c1a083788dce5091cd368a47e79b6f3963eedc5a94ca73fe0ae15c9144f6a46bf0929e996cb6359b730c43f4dabdd1620ba13e5 SHA512 a5000690eeaedd7ad5337ce50fcb66fdbabd3a6460c37d218e2d3de705314d0cbaafd740794f1a1585feb8f5d5ce2a68f6efe003843a1448f8748431b50e6493
+EBUILD sha1-polyml-5.5.0.ebuild 2717 BLAKE2B 39e0790e8fdfe25cc4c546827d48a99f75ca0ce2ce1588fff4c7e7111466137d5d7d5fa86a7b95f2e71bbb0ac8b08dedd97c574423ce4e6237e604fe1668b270 SHA512 c60123afd281d043a47d0a501f5ee3171ae78bbc6fe74e086215735abc46f917abf8c543d6bfc6399af5774905258be70101d5b4b15cae4bda282243e23077b6
+EBUILD sha1-polyml-5.6_p1.ebuild 1906 BLAKE2B 08981e8894274905a4d4eb428bd85cbe32848b4455196c336cf7859e0ef7b5de5137ec72ce70aa615e276369db04607e44515bd2c40b376f9aa665127a88a822 SHA512 95e93614c546a3b5f08c5917986cee5765e5ba8981832ff5dbb013d070726fa454661b2d2425d452a4cc8228d11b155d4ed2accd00f26b459609101783497ca7
 MISC metadata.xml 631 BLAKE2B f1ea7f8c4cde6c764c3c0649d2977636de0984756e1d3953f0ec142688ac75b6c2f909220766115408059e81a596cde28a31b6d9684b41080b0cc6cc36e2904e SHA512 ce2a008b92696040b1de592443a3bf1ca927aa95380bc92e4558c0d362dd1d2dc33c023a522946fe0295936feb95a2b920cbe0fbd44e65d7c9d5ca3f955bb7b1
diff --git a/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild b/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild
index 3a1ac9d40258..2ca76f2ee378 100644
--- a/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild
+++ b/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.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"
@@ -14,7 +14,7 @@ SRC_URI="http://isabelle.in.tum.de/components/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild b/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
index 4f792144ace1..66505a9d8b1f 100644
--- a/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
+++ b/sci-mathematics/sha1-polyml/sha1-polyml-5.6_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ SRC_URI="http://isabelle.in.tum.de/components/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index bccaa6449a5d..16ebd0696f42 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -1,3 +1,4 @@
-DIST yacas-1.6.1.tar.gz 2611119 BLAKE2B df627e162c3498e1866f3874c63736ba7ce447c451617df7d4f5dc8974a393362f8ed77315e5a3b05b024ef32219170ce1cf93c2de0567d3dfaf71a72bb76a43 SHA512 fffd15f76fef15aa8502053deefa6fee2a4f8b25414fa1209579351e36131b8117135e5f7009986ac8bb6af575d2e500a0d61c4996a8a50c767a5fa80ac1eff2
-EBUILD yacas-1.6.1-r1.ebuild 1173 BLAKE2B 8de703a37b3689cd65d8d0fb80872941f5e78025ac6306a6ec8885abd98b85610f3544cfadfd5ba3a18fa7e62f5eb46effba20ecdc1a35bb60fb382459ad5aae SHA512 8cc592b18d43b83b19623fa773a5f34c3f089959efc254ac5573f5aab0c668a1e75e522d72e67062f350badb875bf6004d2267bb0417c94e1287b38b0bc10abb
-MISC metadata.xml 1082 BLAKE2B 0d420b306d4c5d883eefb75f5216eeddd3b2a7d12ed2bd4a8209f7ecc9c893c884d8fca7fa192e86298ee158434657f758903ad37dd765f974efddd3c42c7d5d SHA512 fc56f8a12091e5242041a19384052f62fa019e3413620e8c1e01493956c47952e6465e4e73970a0c339834631fb93f34b3d5800c917beeb5b8a14a53fa21ab21
+AUX yacas-1.7.0-gnuinstalldirs.patch 13706 BLAKE2B 67c024ecb5111ae0188140143c7d5a82119aac1aa653901dd787eb9a698828c46277aee2e15820e7902e8eb972b1011ab4a3250afb075734fd911257cecb70dd SHA512 5fdf24b613cccee2802f3047b80058d18fe707f82d94282d95d70c8f748a6f6ea75cf7760baf4b24ef29294038b2bc88c1975ee4516a5d953251f15f1f1f17f3
+DIST yacas-1.7.0.tar.gz 2610016 BLAKE2B 62400d8aaba192a088bb48e0e12ff79e7e2d24af4825b2d53aeffa7aace011beb728118d56e5a9dd9e7dedba545706bbf77cb9ef27b5075e555fc5cc1983dc5e SHA512 6da7d454b3a74638d743c5e8168b27b9a8a71e2c41fe3f35bcb397fb80e866277ddb5b4e15167e2c0d11dd6033491ca72b560440fe2db6dc34b91b2ad047ca1d
+EBUILD yacas-1.7.0.ebuild 1173 BLAKE2B 3e10f5485c9e3f4f13665c631b5ab4bd44f393032c02732fe11929afba007f2bc091781750970a463d48e7ad7725136666164cc7bc07ac1cf3764f242ace5f90 SHA512 161961ea7962aece553b93413660bc3e770d73942538a27aadd7faff24914e85177ebb4f7c54ceaced7955b6d600e39d162e0042b516afc107a76f527dbc0bb1
+MISC metadata.xml 945 BLAKE2B 63739d4c7d0e8fc17f107f94585355ff2e2cd6e68718008e0c0af862b5d66cd1518e036a2ee1357584e849cf510b9cbfeca6d04c1a97fa3d42ddcdae36fb19d4 SHA512 926b90c3c18ecc5401b56ea8b09914b785575c78dbef8cdc928240e4a54c42146feabfcf9ea3eb91c131c2af6dc6471f08ce57994d0ff6fcfbf027432d70c999
diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch b/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch
new file mode 100644
index 000000000000..88e61dccbc53
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch
@@ -0,0 +1,219 @@
+From f1665438b617e312d96fbe771603424cbebeee4e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Jul 2019 23:25:12 +0200
+Subject: [PATCH] Use GNUInstallDirs
+
+---
+ CMakeLists.txt                            |  5 +--
+ cyacas/libyacas/CMakeLists.txt            |  8 +++--
+ cyacas/libyacas_mp/CMakeLists.txt         |  8 +++--
+ cyacas/yacas-gui/CMakeLists.txt           |  4 +--
+ cyacas/yacas-gui/resources/CMakeLists.txt | 40 +++++++++++------------
+ cyacas/yacas-kernel/CMakeLists.txt        |  2 +-
+ cyacas/yacas/CMakeLists.txt               |  2 +-
+ docs/CMakeLists.txt                       |  2 +-
+ tests/CMakeLists.txt                      |  4 +--
+ 9 files changed, 40 insertions(+), 35 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9982f519..596cec3c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,12 +30,13 @@ if (ENABLE_JYACAS)
+     set (LANGUAGES ${LANGUAGES} Java)
+ endif ()
+ 
+-project (YACAS VERSION 1.7.0 LANGUAGES ${LANGUAGES})
++project (yacas VERSION 1.7.0 LANGUAGES ${LANGUAGES})
+ 
+ set (CMAKE_CXX_STANDARD 17)
+ set (CMAKE_CXX_STANDARD_REQUIRED ON)
+ set (CMAKE_CXX_EXTENSIONS OFF)
+ 
++include (GNUInstallDirs)
+ include (CTest)
+ 
+ set (YACAS_SCRIPTS
+@@ -251,7 +252,7 @@ set (YACAS_SCRIPTS
+     scripts/yacasinit.ys)
+ 
+ if (ENABLE_CYACAS)
+-    install (DIRECTORY scripts/ DESTINATION share/yacas/scripts COMPONENT app)
++    install (DIRECTORY scripts/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/scripts COMPONENT app)
+ endif ()
+ 
+ if (ENABLE_DOCS)
+diff --git a/cyacas/libyacas/CMakeLists.txt b/cyacas/libyacas/CMakeLists.txt
+index 14841f60..6839bb0a 100644
+--- a/cyacas/libyacas/CMakeLists.txt
++++ b/cyacas/libyacas/CMakeLists.txt
+@@ -94,9 +94,11 @@ set_target_properties (libyacas PROPERTIES OUTPUT_NAME "yacas")
+ target_include_directories (libyacas PUBLIC include "${CMAKE_CURRENT_BINARY_DIR}/config")
+ target_link_libraries (libyacas libyacas_mp)
+ 
+-install (TARGETS libyacas LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin COMPONENT app)
+-install (DIRECTORY include/ DESTINATION include COMPONENT dev)
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/config/yacas/yacas_version.h" DESTINATION include/yacas COMPONENT dev)
++install (TARGETS libyacas LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++                          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++                          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app)
++install (DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev)
++install (FILES "${CMAKE_CURRENT_BINARY_DIR}/config/yacas/yacas_version.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/yacas COMPONENT dev)
+ 
+ # if (APPLE)
+ #   add_library (libyacas_framework SHARED ${SOURCES} ${HEADERS})
+diff --git a/cyacas/libyacas_mp/CMakeLists.txt b/cyacas/libyacas_mp/CMakeLists.txt
+index 06a3fc9d..3ebabfe6 100644
+--- a/cyacas/libyacas_mp/CMakeLists.txt
++++ b/cyacas/libyacas_mp/CMakeLists.txt
+@@ -29,8 +29,10 @@ add_library (libyacas_mp ${SOURCES} ${HEADERS})
+ set_target_properties (libyacas_mp PROPERTIES OUTPUT_NAME "yacas_mp")
+ target_include_directories (libyacas_mp PUBLIC include)
+ 
+-install (TARGETS libyacas_mp LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin COMPONENT app)
+-install (DIRECTORY include/ DESTINATION include COMPONENT dev)
++install (TARGETS libyacas_mp LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++                             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++                             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app)
++install (DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev)
+ 
+ # if (APPLE)
+ #   add_library (libyacas_mp_framework SHARED ${SOURCES} ${HEADERS})
+@@ -48,4 +50,4 @@ endif ()
+ 
+ if (ENABLE_CYACAS_UNIT_TESTS)
+     add_subdirectory (test)
+-endif ()
+\ No newline at end of file
++endif ()
+diff --git a/cyacas/yacas-gui/CMakeLists.txt b/cyacas/yacas-gui/CMakeLists.txt
+index 981de305..ed5550b7 100644
+--- a/cyacas/yacas-gui/CMakeLists.txt
++++ b/cyacas/yacas-gui/CMakeLists.txt
+@@ -121,11 +121,11 @@ add_subdirectory (resources)
+ if (APPLE)
+     install (TARGETS yacas-gui BUNDLE DESTINATION ${CMAKE_INSTALL_BUNDLE_PREFIX})
+ else ()
+-    install (TARGETS yacas-gui DESTINATION bin)
++    install (TARGETS yacas-gui DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif ()
+ 
+ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-    install (PROGRAMS yacas-gui.desktop PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ DESTINATION share/applications)
++    install (PROGRAMS yacas-gui.desktop PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+ endif ()
+ 
+ if (WIN32)
+diff --git a/cyacas/yacas-gui/resources/CMakeLists.txt b/cyacas/yacas-gui/resources/CMakeLists.txt
+index dbdedcfa..a7d8d305 100644
+--- a/cyacas/yacas-gui/resources/CMakeLists.txt
++++ b/cyacas/yacas-gui/resources/CMakeLists.txt
+@@ -42,24 +42,24 @@ ExternalProject_Add (yacas-gui_delanuay
+     BUILD_COMMAND ""
+     INSTALL_COMMAND "")
+ 
+-install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION share/yacas/resources/plot3d)
++install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
+ 
+ if (NOT APPLE)
+-    install (FILES plot3d/plot3d.js DESTINATION share/yacas/resources/plot3d)
+-    install (DIRECTORY jquery DESTINATION share/yacas/resources)
+-    install (DIRECTORY webchannel DESTINATION share/yacas/resources)
+-    install (DIRECTORY mathbar DESTINATION share/yacas/resources)
+-    install (DIRECTORY yacas_gui DESTINATION share/yacas/resources)
+-    install (FILES yacas_gui.html DESTINATION share/yacas/resources)
+-    install (DIRECTORY pixmaps DESTINATION share)
+-    install (DIRECTORY icons DESTINATION share)
++    install (FILES plot3d/plot3d.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
++    install (DIRECTORY jquery DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
++    install (DIRECTORY webchannel DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
++    install (DIRECTORY mathbar DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
++    install (DIRECTORY yacas_gui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
++    install (FILES yacas_gui.html DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources)
++    install (DIRECTORY pixmaps DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
++    install (DIRECTORY icons DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+ 
+-    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/lib DESTINATION share/yacas/resources/codemirror)
+-    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/mode/yacas DESTINATION share/yacas/resources/codemirror/mode)
+-    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/edit DESTINATION share/yacas/resources/codemirror/addon)
+-    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/hint DESTINATION share/yacas/resources/codemirror/addon)
++    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/lib DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror)
++    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/mode/yacas DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/mode)
++    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/edit DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
++    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/hint DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
+ 
+-    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.js ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.resize.js DESTINATION share/yacas/resources/flot)
++    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.js ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.resize.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/flot)
+ 
+     install (FILES
+             ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/build/three.min.js
+@@ -68,12 +68,12 @@ if (NOT APPLE)
+             ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/CanvasRenderer.js
+             ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/Projector.js
+             ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/utils/SceneUtils.js
+-            DESTINATION share/yacas/resources/three)
++            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/three)
+ 
+-    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.css ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.js DESTINATION share/yacas/resources/vis)
++    install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.css ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/vis)
+ 
+-    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
+-    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
+-    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/TeX)
+-    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/unpacked DESTINATION share/yacas/resources/mathjax)
++    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
++    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
++    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/TeX)
++    install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/unpacked DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax)
+ endif ()
+diff --git a/cyacas/yacas-kernel/CMakeLists.txt b/cyacas/yacas-kernel/CMakeLists.txt
+index ae2c7298..1e6c4cf1 100644
+--- a/cyacas/yacas-kernel/CMakeLists.txt
++++ b/cyacas/yacas-kernel/CMakeLists.txt
+@@ -33,4 +33,4 @@ include_directories (include)
+ add_executable (yacas-kernel src/main.cpp src/yacas_kernel.cpp src/yacas_engine.cpp src/hmac_sha256.cpp)
+ target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} ${JSONCPP_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread)
+ 
+-install (TARGETS yacas-kernel DESTINATION bin)
+\ No newline at end of file
++install (TARGETS yacas-kernel DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/cyacas/yacas/CMakeLists.txt b/cyacas/yacas/CMakeLists.txt
+index 3bdc3563..5e97c0af 100644
+--- a/cyacas/yacas/CMakeLists.txt
++++ b/cyacas/yacas/CMakeLists.txt
+@@ -36,4 +36,4 @@ if (WIN32)
+   target_link_libraries (yacas wsock32 ws2_32 shlwapi)
+ endif()
+ 
+-install (TARGETS yacas RUNTIME DESTINATION bin COMPONENT app)
++install (TARGETS yacas RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app)
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 869cd57c..f69d9740 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -38,6 +38,6 @@ add_custom_target(yacas_docs ALL
+     COMMENT "Building HTML documentation with Sphinx")
+ 
+ install (DIRECTORY "${SPHINX_SINGLEHTML_DIR}"
+-         DESTINATION share/yacas/documentation
++         DESTINATION ${CMAKE_INSTALL_DOCDIR}
+          COMPONENT doc
+          PATTERN ".buildinfo" EXCLUDE)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 55ba67ef..9bb9c0e2 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -55,8 +55,8 @@ set (YACAS_TESTS
+   transforms.yts)
+ 
+ 
+-install (FILES ${YACAS_TESTS} DESTINATION share/yacas/tests COMPONENT app)
+-install (PROGRAMS ${TEST_YACAS_CMD} DESTINATION share/yacas/tests COMPONENT app)
++install (FILES ${YACAS_TESTS} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/tests COMPONENT app)
++install (PROGRAMS ${TEST_YACAS_CMD} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/tests COMPONENT app)
+ 
+ if (ENABLE_CYACAS_CONSOLE)
+     foreach (_test ${YACAS_TESTS})
+-- 
+2.22.0
+
diff --git a/sci-mathematics/yacas/metadata.xml b/sci-mathematics/yacas/metadata.xml
index 9790239a614e..64fd190c1653 100644
--- a/sci-mathematics/yacas/metadata.xml
+++ b/sci-mathematics/yacas/metadata.xml
@@ -14,9 +14,7 @@
   algorithms.
   </longdescription>
   <use>
-    <flag name="doc">Generate HTML documentation</flag>
     <flag name="gui">Build graphical interface for the native yacas engine. Requires Qt5</flag>
-    <flag name="java">Build the Java yacas engine and text console for it</flag>
     <flag name="jupyter">Add support for jupyter notebook</flag>
   </use>
   <upstream>
diff --git a/sci-mathematics/yacas/yacas-1.6.1-r1.ebuild b/sci-mathematics/yacas/yacas-1.7.0.ebuild
index 66d4e6ae5dac..4e3f18521f97 100644
--- a/sci-mathematics/yacas/yacas-1.6.1-r1.ebuild
+++ b/sci-mathematics/yacas/yacas-1.7.0.ebuild
@@ -1,54 +1,53 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit java-pkg-opt-2 cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="General purpose computer algebra system"
 HOMEPAGE="http://www.yacas.org/"
 SRC_URI="https://codeload.github.com/grzegorzmazur/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 
-SLOT="0/1"
 LICENSE="GPL-2"
+SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gui java +jupyter static-libs"
+IUSE="gui +jupyter static-libs test"
 
-COMMON_DEPEND="
+DEPEND="
 	gui? (
 		dev-qt/qtcore:5[icu]
 		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwebkit:5
 		dev-qt/qtmultimedia:5
-		dev-qt/qtsql:5
-		dev-qt/qtprintsupport:5
+		dev-qt/qtnetwork:5
 		dev-qt/qtopengl:5
 		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
 	)
 	jupyter? (
-		dev-python/jupyter
 		dev-libs/boost:=
 		dev-libs/jsoncpp:=
 		dev-libs/openssl:0=
+		dev-python/jupyter
 		net-libs/zeromq
 		>=net-libs/zmqpp-4.1.2
-	)"
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx )
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.6 )"
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_DOCS=$(usex doc)
+		-DENABLE_CYACAS_BENCHMARKS=OFF
+		-DENABLE_DOCS=OFF # requires sphinxcontrib-bibtex
+		-DENABLE_JYACAS=OFF # requires manual install
 		-DENABLE_CYACAS_GUI=$(usex gui)
 		-DENABLE_CYACAS_KERNEL=$(usex jupyter)
-		-DENABLE_JYACAS=$(usex java)
+		-DENABLE_CYACAS_UNIT_TESTS=$(usex test)
 	)
 	cmake-utils_src_configure
 }