gentoo resync : 02.08.2019

22 files changed, 278 insertions, 61 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index cb9a50d88db4..c4e5a8b952d3 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index bb9077b89f00..92813d443d77 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,3 +1,5 @@
 DIST alt-ergo-1.30.tar.gz 380329 BLAKE2B fab16757ed110474cf8f9d01ab53f76b6a300eb478b32bbfd6bb79d7603b1f5c2fc5c97bf44358eb138283f3487ef90febd23865723a4721b01bd870cfdd6507 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2
-EBUILD alt-ergo-1.30.ebuild 729 BLAKE2B 0084ec01dae4d2721c5feefa73bc8fb0143be410769201db6d7b9672cdfb3fa623546f60da5bf1f235d35e264a6f4edae9dc21e04988acbf6a0fbdc8584661a2 SHA512 cc7669a3e7e44fd029b14faf7f912a45b8a5cf4a6570e3e116ace9a8fbd20bae20f00c75aa22129eb77b7f4efe3d1ad37f1a27beb67b6d9e3a6ec8f48ded5962
+DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21
+EBUILD alt-ergo-1.30.ebuild 735 BLAKE2B e875147f8814ba6b81a8cd4c352691289002129d34be71fdd89d758a99b136b37acdce1f38f52cc9c2d7ad74cff8bf548fa4384e7b529a2ec2b4aa7cf2174fe3 SHA512 8acf024245c85c16d6d74a6400a1fcc5b7c7c17fdfaf713f77e8c1de0b9f29e615a1085c283f064c0f22de2e0c0dc0625a1d430ef89506d3976da6b1c0d414ca
+EBUILD alt-ergo-2.3.0.ebuild 936 BLAKE2B bec8b3a17a4802c3238f277e67271671652a308a8f927ddab3b31b1ff20ebe0f9557dcb3ad9159e945f9f77e29d1fc4d754f9a066643cd74e8792cd2625671c5 SHA512 1025018fcec4c48aeaff5f94468e430f601e1387d75104bc5545e36c67ad3a1a7c226396be566603c6787da3b009e198910fa2d797602fab7bbe4977176dbea5
 MISC metadata.xml 670 BLAKE2B 5f03c359cb298cc9a0fea6ef3a5deb092e5ccca7acfb2b7a5630303659bfd853fe86277ebbfb1fb7b6677d45dde2d5c68d55fffa8d3d8187acac3765f52df7c9 SHA512 9e514e4da2b92aa1e8e8e084450f478b51947172b689664dfe6c0fe0eb139e278e13689c8ba53825cb3bc32140cfd4cd7a68fede0d013cd065d5339d34931e8d
diff --git a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
index e5229fc89224..80b72760c868 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-1.30.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
@@ -16,7 +16,7 @@ DEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
 	dev-ml/zarith
 	gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] )
 	dev-ml/camlzip
-	dev-ml/ocplib-simplex"
+	<=dev-ml/ocplib-simplex-0.3"
 RDEPEND="${DEPEND}"
 
 DOCS=( CHANGES INSTALL.md README.md )
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
new file mode 100644
index 000000000000..69ade990ba8f
--- /dev/null
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Automatic theorem prover"
+HOMEPAGE="https://alt-ergo.ocamlpro.com"
+SRC_URI="https://alt-ergo.ocamlpro.com/http/${P}/${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples gtk +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
+	dev-ml/zarith
+	gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] )
+	dev-ml/camlzip
+	>=dev-ml/ocplib-simplex-0.4
+	>=dev-ml/menhir-20181006
+	dev-ml/dune"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES INSTALL.md README.md )
+
+src_configure() {
+	./configure --prefix /usr --libdir=/usr/$(get_libdir)
+}
+
+src_compile() {
+	emake
+	use gtk && emake gui
+}
+
+src_install() {
+	default
+	use gtk && emake DESTDIR="${D}" install-gui
+	insinto /usr/share/doc/${PF}
+	use examples && doins -r examples
+	mv "${D}"/usr/doc/* "${D}"/usr/share/doc/${PF}/ || die
+	rmdir "${D}"/usr/doc || die
+}
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 5a86e7bb1ddf..94152a39ed34 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -2,5 +2,5 @@ AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1
 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
+EBUILD cvc4-1.7.ebuild 1344 BLAKE2B b1c187f77296c5bba332a4795b990fb3df340a10c9acc9de6397e64b883b48e56ba3d0b42fef398cdfa8151799eeb2a59fae644466a2a605de6183cf84844c85 SHA512 34b1d046465f6cac1e8e098c743f79042fff0ad0eb051b68da0a0f6ca78bb27cf6ddbfe6ce8b1ba94eb779fc3faf69a7c79a42f3ddff34167ef7b28acd096fb1
+MISC metadata.xml 801 BLAKE2B a8dffba2bb9a740412d4193911d1ab118336993d12d6d7e42c758af438d297baf6798e2ce9c6aa9be4282678e366087d54b8d3f8c46b43be6d73bcf421ee318a SHA512 d90e35c93e5defc5599f5e9d9b88a757a4a845574684270f1aab0cb8194c50b31fa3135ea221f63d0d71f867619c039f32cfb46b63fa370289e8eb5205d3b25d
diff --git a/sci-mathematics/cvc4/cvc4-1.7.ebuild b/sci-mathematics/cvc4/cvc4-1.7.ebuild
index 0b192f127391..09aab161f76d 100644
--- a/sci-mathematics/cvc4/cvc4-1.7.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.7.ebuild
@@ -12,11 +12,12 @@ SRC_URI="https://github.com/CVC4/CVC4/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cln"
+IUSE="+cln proofs readline replay +statistics"
 
 RDEPEND="dev-libs/antlr-c
 	dev-java/antlr:3
 	dev-libs/boost
+	readline? ( sys-libs/readline:0= )
 	cln? ( sci-libs/cln )
 	!cln? ( dev-libs/gmp:= )"
 DEPEND="${RDEPEND}"
@@ -30,7 +31,12 @@ src_configure() {
 	local mycmakeargs=(
 		-DANTLR_BINARY=/usr/bin/antlr3
 		-DENABLE_GPL=ON
+		-DENABLE_OPTIMIZED=ON
 		-DUSE_CLN="$(usex cln ON OFF)"
+		-DUSE_READLINE="$(usex readline ON OFF)"
+		-DENABLE_STATISTICS="$(usex statistics ON OFF)"
+		-DENABLE_PROOFS="$(usex proofs ON OFF)"
+		-DENABLE_REPLAY="$(usex replay ON OFF)"
 	)
 	cmake-utils_src_configure
 }
diff --git a/sci-mathematics/cvc4/metadata.xml b/sci-mathematics/cvc4/metadata.xml
index d1a299673f89..8ab072c90512 100644
--- a/sci-mathematics/cvc4/metadata.xml
+++ b/sci-mathematics/cvc4/metadata.xml
@@ -7,6 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="cln">Use sci-libs/cln</flag>
+		<flag name="statistics">Include statistics</flag>
+		<flag name="replay">Turn on the replay feature</flag>
+		<flag name="proofs">Support for proof generation</flag>
 	</use>
 	<longdescription lang="en">
 		CVC4 is an efficient open-source automatic theorem prover for
diff --git a/sci-mathematics/gwnum/Manifest b/sci-mathematics/gwnum/Manifest
deleted file mode 100644
index b015170b0998..000000000000
--- a/sci-mathematics/gwnum/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gwnum-277.tar.bz2 24143696 BLAKE2B 529fa5408d3251225817eaf8a211949f562b1003d1e42f3ba31d7b122365ad7b99ace76021de22734e2cba3fa9a9a8f0bff3e99d3fede0be94624c33ae40c608 SHA512 d88a15b01fad458640a84ffa3d5fca6fb35ecd99aff711e679cdae2a58b95c9caefdd4218015f620fd7a93bb54aabad1311205d7ec62d212ca8c6e80af696cc3
-EBUILD gwnum-277.ebuild 786 BLAKE2B 4654f6f4be0250449ffda2f06c05e75cc6667f5b720f3f3edf75d3eb5feeb5c4d78c14b0f9df1b96aacecaf85b4d50bd9664e07ac56bde5deadd4914b3979e39 SHA512 d91f3e4cd41c6fcfc3437725ca4a651bb5480f39af0f5821e64c082ce74849d4d2f899e9a3bf4b611e6d1f9717ba0dc61d8d2952b58388acb39c385364a35529
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/sci-mathematics/gwnum/gwnum-277.ebuild b/sci-mathematics/gwnum/gwnum-277.ebuild
deleted file mode 100644
index e19779765901..000000000000
--- a/sci-mathematics/gwnum/gwnum-277.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-DESCRIPTION="George Woltman's GWNUM library"
-HOMEPAGE="http://www.mersenne.org/freesoft/"
-# Sourcecode split out from prime95, we don't need the full lib
-SRC_URI="http://gentooexperimental.org/~patrick/${P}.tar.bz2"
-
-inherit eutils
-
-LICENSE="gwnum BSD GPL-2+"
-SLOT="0"
-# Need to test if it actually compiles on x86
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist" #465566
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# makefile doesn't return zero? || die fails :(
-	use amd64 && emake -f make64
-	use x86 && emake
-}
-
-src_install() {
-	mkdir "${D}/usr/lib" -p
-	cp gwnum.a gwnum.lib "${D}/usr/lib" || die
-	mkdir "${D}/usr/include" -p
-	cp *.h "${D}/usr/include" || die
-}
diff --git a/sci-mathematics/gwnum/metadata.xml b/sci-mathematics/gwnum/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/sci-mathematics/gwnum/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-mathematics/kodkod/Manifest b/sci-mathematics/kodkod/Manifest
index 40a523d9ddab..5fad470506ad 100644
--- a/sci-mathematics/kodkod/Manifest
+++ b/sci-mathematics/kodkod/Manifest
@@ -1,5 +1,5 @@
 AUX kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch 1045 BLAKE2B 42d8124cc53f3720c35395324dcd88fe7553781376ec6f777cb93480adcb124851df09e9fc299c134cdd108273d5c5a60a3a0c57833bcde46f3effd511c4677b SHA512 ff30065387503ffa1fb74de988a36526f3680a648faae1a6826db6b91c2dfaac0f63ff6dba32e5fcef11a7b5727a385dfd9301d030f45213e091886c40ea7867
 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-r1.ebuild 3796 BLAKE2B 4fbba81e70a9cd7ffe9a80e47fee34827571be6553f3db94d3f7cbc78dac1155bd9d17a9e6c4624562e2e42558210f0ba4fb7b0ac4d5bfb1262a34be9be4c154 SHA512 90bbac904dc08bdecfdd40ab721b539fbc38452b14a484f0d84e96394858405fb08611b779f1cf94130edcddc0146f6dac3d9a35e367920238d370bd1a5bed9f
 MISC metadata.xml 927 BLAKE2B 678d66d0843b85a81ffbdeb2c8e498af617eb125fa62009e4a06373f9c9965d5c77fd69e4892765e54f214f3302bdc658ea4c6cd3e4266b6e88b3bccfa5abac1 SHA512 6ef6a53f3a21c6786ba6044925d13de7bf396a3e59d1810e963a75005575e57d9a816ac765338055f1d7a3f05f7fda8c98d6a357da7d310a223b0158d887b307
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild b/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
index 33f6ca4a7bc9..11c25bef00ae 100644
--- a/sci-mathematics/kodkod/kodkod-1.5.2-r1.ebuild
+++ b/sci-mathematics/kodkod/kodkod-1.5.2-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"
@@ -18,7 +18,6 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEP="${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEP}
diff --git a/sci-mathematics/lpsolve/Manifest b/sci-mathematics/lpsolve/Manifest
index 51390a091e47..644b9f356760 100644
--- a/sci-mathematics/lpsolve/Manifest
+++ b/sci-mathematics/lpsolve/Manifest
@@ -1,3 +1,3 @@
 DIST lpsolve-5.5.2.0.tar.xz 737000 BLAKE2B 912690a7e4ed5fd5d475f322f5c168554fb3d47281545f42d2383ccbe72b3cb0036f72878c94899889972e266e9cf6ad73e59ac1e822deae753ae5b31a00c9b8 SHA512 341bff74dccf805cfd3aa4ee844a51f3c46ce875e88b1bf079a6ff0074f7cbd27420ec9c6a66a2530098a85c967457214543895651f4c570b956324a51bb9fe6
-EBUILD lpsolve-5.5.2.0.ebuild 676 BLAKE2B edcbc7ea1202d57d5338d75f0ebc432e3a08ebddc2eecf3fd8a43ada0d76e04199126e5180b38ae8aefafbfa7f0b718ee8f88b84788064cb2ba361fe4b042649 SHA512 f12844e5198a8ce3a86b87e6c62bd67da4162119d1b876bbb046c360cadeeee59a033a20878e82d96e5216905806fad1ca649d4b1678797852cf8a05d0729b64
+EBUILD lpsolve-5.5.2.0.ebuild 672 BLAKE2B d1bf38682b9f1d1cd5c5fb735162316cdb27079698f4bb50428cca13c5240007e5284bc0a214913d3031a06ee445f16ca962a93fb1947cf3fe7af77aa0399a06 SHA512 c0b795e95c1db20a2d904c69052b2239de975964a03fa0b6ad85cb6bf2f95f9e9e7f97e0a7344b6f796135a49ab419a9f34350e3dbb0163e16e0e7e6bf981c39
 MISC metadata.xml 462 BLAKE2B cc1d11f0cf8ec77ba2700ac44f3b0a791734b7edf4afc7f1b991a1ad612e1684ec9389b7517ae2678ecf247537c5c3e7e0bec2de8561964ebfc50b9f53ed57a9 SHA512 817ef33327783389aa73830c2ff2b9b54a140dbcaa9ed61a6d0ad7c2058014fc311c5abeef20cac157fac94d71fe2e8de8f241b3d7a2a2df26817d96cc19dd86
diff --git a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild b/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
index 5de810343b29..6ea531bf763f 100644
--- a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
+++ b/sci-mathematics/lpsolve/lpsolve-5.5.2.0.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
@@ -9,7 +9,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="sci-libs/colamd"
diff --git a/sci-mathematics/psmt2-frontend/Manifest b/sci-mathematics/psmt2-frontend/Manifest
new file mode 100644
index 000000000000..0c4582c4a099
--- /dev/null
+++ b/sci-mathematics/psmt2-frontend/Manifest
@@ -0,0 +1,4 @@
+AUX psmt2-frontend-0.2-gentoo.patch 607 BLAKE2B 4d3a967d9c694e74b1e33426d73f41e97be37510241291339e4d7c4e677ef247cc9dd28728df4fcdb6a0819aa8d1ccb6233d65cb206cbf78dcf9004af7744a7b SHA512 6ec9c1c89ceb023b57820f083722b4c4a693a27c38fcc63a9bf6403853c716a398f055a8db579e683a03f2ca8ccfcd9235796ce1f44867d47805279f6a0a8700
+DIST psmt2-frontend-0.2.tar.gz 26976 BLAKE2B 2b45ceb8d824f5b11455ad0026064b6329b6c6e6173c091b36dc42e8c1dd36924d12d9296db3dcfe748a84fdc37a1a530f3ef485bec904c19a0e6aa8034149f9 SHA512 c29802f4265a1cbdb05ee9154ce2c156136af258bc7283dd0fb1d1b2ce162b671553cab96484036d898e3ff7c26ab133f5c2e1ca88e9e48660b2faa139fd1f41
+EBUILD psmt2-frontend-0.2.ebuild 583 BLAKE2B 2fe5e7f7340ed763b2ef98042ac9b7365fb951bb031abe8758f4134a36469473b1d179650f21e79cf6c87f1d263f992cf188f278f605fcd04eac3d6daab12944 SHA512 38ab7dc0d8b7ce581363617f5a9eee3ba9b8f2e1d103909a17359bb194ba87882e222969b70df92ee85fe4b5ebd2266c1c33ef9be2866b9fa4eddf0961002dfd
+MISC metadata.xml 413 BLAKE2B 0f866e4371235aae4d041e7bd1ad4011e680ab501c764559d9d52fae48a2ace5825230a0b2fa8c411e9ae0d55d474fe63250de1bb9983acf328d6a4c2412802c SHA512 1a6fa4ac4c2615a491861c78d8fa5680c4de8fef1caa034601a8ffd75e0c714109d45af96c16348dc27bb3848863c18a28720a2e960219237eea4d3154cb17f3
diff --git a/sci-mathematics/psmt2-frontend/files/psmt2-frontend-0.2-gentoo.patch b/sci-mathematics/psmt2-frontend/files/psmt2-frontend-0.2-gentoo.patch
new file mode 100644
index 000000000000..74fbed08bf6b
--- /dev/null
+++ b/sci-mathematics/psmt2-frontend/files/psmt2-frontend-0.2-gentoo.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.in	2019-07-20 19:20:06.818740706 +0200
++++ b/Makefile.in	2019-07-20 19:21:33.437581073 +0200
+@@ -18,7 +18,7 @@
+ libdir=@libdir@
+ # exec_prefix=@exec_prefix@
+ # BINDIR=$(DESTDIR)@bindir@
+-LIBDIR=$(prefix)$(libdir)
++LIBDIR=$(libdir)
+ # DATADIR=$(DESTDIR)@datadir@/psmt2-frontend
+ 
+ # where to install the man page
+@@ -119,8 +119,8 @@
+ ##############
+ 
+ install: all META
+-	mkdir -p $(DESTDIR)$(LIBDIR)
+-	OCAMLFIND_DESTDIR=$(DESTDIR)$(LIBDIR) \
++	mkdir -p $(DESTDIR)$(OCAMLLIB)
++	OCAMLFIND_DESTDIR=$(DESTDIR)$(OCAMLLIB) \
+ 	  ocamlfind install psmt2-frontend src/$(LIBNAME).* src/*.mli META
+ 
+ 
diff --git a/sci-mathematics/psmt2-frontend/metadata.xml b/sci-mathematics/psmt2-frontend/metadata.xml
new file mode 100644
index 000000000000..53441a5497e7
--- /dev/null
+++ b/sci-mathematics/psmt2-frontend/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+			A library to parse and type-check a conservative extension of the
+			SMT-LIB 2 standard with prenex polymorphism.
+	</longdescription>
+</pkgmetadata>
diff --git a/sci-mathematics/psmt2-frontend/psmt2-frontend-0.2.ebuild b/sci-mathematics/psmt2-frontend/psmt2-frontend-0.2.ebuild
new file mode 100644
index 000000000000..4e0ada140fe7
--- /dev/null
+++ b/sci-mathematics/psmt2-frontend/psmt2-frontend-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit findlib autotools
+
+DESCRIPTION="Library to parse and type-check an extension of the SMT-LIB 2 standard"
+HOMEPAGE="https://github.com/OCamlPro-Coquera/psmt2-frontend"
+SRC_URI="https://github.com/OCamlPro-Coquera/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-ml/menhir-20181006"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index 16ebd0696f42..46f1c9f094e7 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -1,4 +1,7 @@
+AUX yacas-1.7.0-desktop.patch 716 BLAKE2B da20f28d890f0b436ca796779bd78baf1e4bfc5d6d3db4732a16178b4a68bbdace9d0122bdeba6c79bac369b7742d5d3504623bbccf988ecd96a2d2ab1997d39 SHA512 62723fbd948108b0b1d21b9a18a96a5d381ceaa9f8564f6391e9de1a6beabff46e75b60737b56c0541970f216f3e5f0f6ace3fd8e5ecb1a7e3f68cc744527248
 AUX yacas-1.7.0-gnuinstalldirs.patch 13706 BLAKE2B 67c024ecb5111ae0188140143c7d5a82119aac1aa653901dd787eb9a698828c46277aee2e15820e7902e8eb972b1011ab4a3250afb075734fd911257cecb70dd SHA512 5fdf24b613cccee2802f3047b80058d18fe707f82d94282d95d70c8f748a6f6ea75cf7760baf4b24ef29294038b2bc88c1975ee4516a5d953251f15f1f1f17f3
+AUX yacas-1.7.0-use-bundled-not-external.patch 7485 BLAKE2B 9f4653465fa7dcb21a915c67e138053296a8a0c446b198f1ab394c34223be3526b247a2de90a46bbc481d5cdeaac43711f979edada93fded89144ca21c4f34d8 SHA512 58e58aeae8a9b89ba7df18d3a9ed9168f4654d5501d3cc42ced9079c87b3177e7d57e9109729d57eb0441d9de40a5212573671bfd739916366957a3be659d3ba
 DIST yacas-1.7.0.tar.gz 2610016 BLAKE2B 62400d8aaba192a088bb48e0e12ff79e7e2d24af4825b2d53aeffa7aace011beb728118d56e5a9dd9e7dedba545706bbf77cb9ef27b5075e555fc5cc1983dc5e SHA512 6da7d454b3a74638d743c5e8168b27b9a8a71e2c41fe3f35bcb397fb80e866277ddb5b4e15167e2c0d11dd6033491ca72b560440fe2db6dc34b91b2ad047ca1d
-EBUILD yacas-1.7.0.ebuild 1173 BLAKE2B 3e10f5485c9e3f4f13665c631b5ab4bd44f393032c02732fe11929afba007f2bc091781750970a463d48e7ad7725136666164cc7bc07ac1cf3764f242ace5f90 SHA512 161961ea7962aece553b93413660bc3e770d73942538a27aadd7faff24914e85177ebb4f7c54ceaced7955b6d600e39d162e0042b516afc107a76f527dbc0bb1
+DIST yacas-bundled-1.7.0.tar.xz 4940180 BLAKE2B e191f3806df0c15149df053c47b1f11a5113ee3b55cbc9a78bfaec058fb5d783e4157687bf4ee9a953bcd23a4e3e49a59e6743e4471e31209a9e24e03ddc8ff5 SHA512 a9c519d0721df69ec81998a3ec17043b59230f5b0650fc2fd6555eccb5503460f387433c019ae15bbd0fd3ff11e697d6da56a3d08aac5fadf4ff023ca5d8691c
+EBUILD yacas-1.7.0-r1.ebuild 1389 BLAKE2B e46299ac3e3e7b79547173888dde4446846bb65298543d59b17eb32acdd81f9ef6fb68f2c63cac7faa60148ede3e559e89205b64bc8736a078a1d41e2f014116 SHA512 d3ac339c516b4ed4d09d88da840c73104236b07694285cec742cc7a322d87a866b164536e6c80b30217c98046b852ee6d2f84e3256638166f2735c8c635ecfd1
 MISC metadata.xml 945 BLAKE2B 63739d4c7d0e8fc17f107f94585355ff2e2cd6e68718008e0c0af862b5d66cd1518e036a2ee1357584e849cf510b9cbfeca6d04c1a97fa3d42ddcdae36fb19d4 SHA512 926b90c3c18ecc5401b56ea8b09914b785575c78dbef8cdc928240e4a54c42146feabfcf9ea3eb91c131c2af6dc6471f08ce57994d0ff6fcfbf027432d70c999
diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch b/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch
new file mode 100644
index 000000000000..b1ad58468e63
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch
@@ -0,0 +1,26 @@
+From ab5ba061c9beecb00064cb5698f1196d38cf0b6d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 24 Jul 2019 10:07:44 +0200
+Subject: [PATCH] Fix desktop icon name
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cyacas/yacas-gui/yacas-gui.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cyacas/yacas-gui/yacas-gui.desktop b/cyacas/yacas-gui/yacas-gui.desktop
+index b7d44574..ab509a2c 100644
+--- a/cyacas/yacas-gui/yacas-gui.desktop
++++ b/cyacas/yacas-gui/yacas-gui.desktop
+@@ -2,7 +2,7 @@
+ Name=yacas-gui
+ Comment=Yacas GUI
+ Exec=yacas-gui
+-Icon=yacas_gui
++Icon=yacas-gui
+ Terminal=false
+ Type=Application
+ Categories=Science;Math
+-- 
+2.22.0
+
diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch b/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch
new file mode 100644
index 000000000000..f66a62987e45
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch
@@ -0,0 +1,112 @@
+From deda267cd182e48c8af657c0d26dbeeb04879d6f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 24 Jul 2019 09:58:58 +0200
+Subject: [PATCH] Install bundled files from repacked tarball, disable external
+ downloads
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cyacas/yacas-gui/resources/CMakeLists.txt | 77 +++++------------------
+ 1 file changed, 17 insertions(+), 60 deletions(-)
+
+diff --git a/cyacas/yacas-gui/resources/CMakeLists.txt b/cyacas/yacas-gui/resources/CMakeLists.txt
+index ca3bf32..bae7076 100644
+--- a/cyacas/yacas-gui/resources/CMakeLists.txt
++++ b/cyacas/yacas-gui/resources/CMakeLists.txt
+@@ -1,49 +1,6 @@
+ include (ExternalProject)
+ 
+-ExternalProject_Add (yacas-gui_codemirror
+-    PREFIX external_packages
+-    URL https://github.com/codemirror/CodeMirror/archive/5.35.0.zip
+-    CONFIGURE_COMMAND npm install --no-progress
+-    BUILD_IN_SOURCE 1
+-    BUILD_COMMAND npm run-script build
+-    INSTALL_COMMAND "")
+-
+-ExternalProject_Add (yacas-gui_flot
+-    PREFIX external_packages
+-    URL https://github.com/flot/flot/archive/v0.8.3.zip
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND "")
+-
+-ExternalProject_Add (yacas-gui_three
+-    PREFIX external_packages
+-    URL https://github.com/mrdoob/three.js/archive/r90.zip
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND "")
+-
+-ExternalProject_Add (yacas-gui_vis
+-    PREFIX external_packages
+-    URL https://github.com/almende/vis/archive/v4.21.0.zip
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND "")
+-
+-ExternalProject_Add (yacas-gui_mathjax
+-    PREFIX external_packages
+-    URL https://github.com/mathjax/MathJax/archive/2.7.3.zip
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND "")
+-
+-ExternalProject_Add (yacas-gui_delanuay
+-    PREFIX external_packages
+-    URL https://github.com/ironwallaby/delaunay/archive/1.0.1.zip
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND "")
+-
+-install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
++install (FILES yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
+ 
+ if (NOT APPLE)
+     install (FILES plot3d/plot3d.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d)
+@@ -55,26 +12,26 @@ if (NOT APPLE)
+     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 ${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 (DIRECTORY yacas-gui_codemirror/lib DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror)
++    install (DIRECTORY yacas-gui_codemirror/mode/yacas DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/mode)
++    install (DIRECTORY yacas-gui_codemirror/addon/edit DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon)
++    install (DIRECTORY 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 ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/flot)
++    install (FILES yacas-gui_flot/jquery.flot.js 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
+-            ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/Detector.js
+-            ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/controls/TrackballControls.js
+-            ${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
++            yacas-gui_three/build/three.min.js
++            yacas-gui_three/examples/js/Detector.js
++            yacas-gui_three/examples/js/controls/TrackballControls.js
++            yacas-gui_three/examples/js/renderers/CanvasRenderer.js
++            yacas-gui_three/examples/js/renderers/Projector.js
++            yacas-gui_three/examples/js/utils/SceneUtils.js
+             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 ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/vis)
++    install (FILES yacas-gui_vis/dist/vis.min.css 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 ${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)
++    install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
++    install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web)
++    install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/TeX)
++    install (DIRECTORY yacas-gui_mathjax/unpacked DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax)
+ endif ()
+-- 
+2.22.0
+
diff --git a/sci-mathematics/yacas/yacas-1.7.0.ebuild b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
index 4e3f18521f97..fdba42ce0213 100644
--- a/sci-mathematics/yacas/yacas-1.7.0.ebuild
+++ b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake-utils desktop
 
 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"
+SRC_URI="https://codeload.github.com/grzegorzmazur/${PN}/tar.gz/v${PV} -> ${P}.tar.gz
+gui? ( https://dev.gentoo.org/~asturm/distfiles/${PN}-bundled-${PV}.tar.xz )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 gui? ( MIT Apache-2.0 OFL-1.1 )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
 IUSE="gui +jupyter static-libs test"
@@ -38,7 +39,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gnuinstalldirs.patch"
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-use-bundled-not-external.patch" # bug 690534
+)
 
 src_configure() {
 	local mycmakeargs=(