gentoo resync : 25.03.2022

8 files changed, 225 insertions, 7 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index d202799f5804..d71de5d07d91 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 029952d813a5..18b6c753679e 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -2,8 +2,10 @@ DIST coq-8.11.2.tar.gz 6564523 BLAKE2B 37ae7a1f899b8ce662d5c21542b2bec0e2e8f25e9
 DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
 DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252afc05e046267cae4265c1be71f89d0345f9e40ab3a93f5063080fd0224502cc0de808c7a0ddbb0edacab5fca SHA512 c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e
 DIST coq-8.15.0.tar.gz 7215106 BLAKE2B 512fde593f6e7fb8b410b5debf5a78bc5d0d181ed7207c00669fc33fa39c2d7e57860f3afbcfc9defd2093115242ad176a5451d9bb309483ba2172e2b0521d02 SHA512 be6c799b6635875255f7288b9bae5f9108660308f299823155d41353e96fbed4e41e1fc8896fe9653c095da740a80dbf5a1add6b28d279eb7b65365eeaff54ab
+DIST coq-8.15.1.tar.gz 7221470 BLAKE2B 6783ceb1ae6bcc7107b7bd1b61ab4566da9e24b8c87966cf1b64004fa19b92a5324d317f3002f30dd4c724bc5b27109c507dfb8e3ee64a9ace28bdb83b0a25e2 SHA512 8ae7bde19b4c098c0fad4206a349c50c7fc2537cbeae68e03d38020fd73f15df46e248b1e7cbbf297c1ccf44f9dd62b1179148588fcb5d397e30141cca954a3c
 EBUILD coq-8.11.2-r1.ebuild 1845 BLAKE2B 2d6bbe0787ce45b4e5130d3e9d3ec61f527fc72f2f9dfef15180ca3dbc1f46f34e7cd847c580df16a8affa97e9430e1fd045a14c4dd3bd02bc52c67d1211c55f SHA512 b39833afcbb6e33a7917f949258e91a1a11229ed68427644f80ce84a00b7254a17d8e6e41c6d778184e54c6d8928ff62cc840eee77239feea5cbc12dd3731972
 EBUILD coq-8.12.0-r2.ebuild 1847 BLAKE2B 57496afca08cfde63635e873dc6d59d32356daa211d8a140820e07398f54bb38c114ac5ae5ad7ad101a6514117dc469783d3964aae18b27a54b18330087e5f49 SHA512 84fee1004970f88cfccc28717d75fad765dbe8b27ac7dae964e5729e47727f846ac69417bb5c585a68668396896c52a5f8421dbf77e73065d8ac7b9793f4900f
 EBUILD coq-8.13.0-r1.ebuild 1821 BLAKE2B 785a17783ee06916fa171449aebc1e54437f878656862e3cec93f1499097e80b57994e37dc597ff571dbe5d45fc19b984e1d10baf8b0b61e2a7c8cfd6b851d35 SHA512 e35a981b036d089afe934a9bcfc96da2d965fa17b8c90e38b8fe2194f9aaf1b693ceead2b26e77c1e4ee4ae23124bcba9aafdb6f17c5fa5ba0fa955b16c1fda5
 EBUILD coq-8.15.0-r2.ebuild 2396 BLAKE2B 5648c9ffb0d8986ef485feef651526473552d38101cfc9692cf05dac8d5721af92d5ffacb19e29ec741b2b2804c9f49b8b08b64e605a7b03b51abc51593bad23 SHA512 ec43c43e0d0569c47bb938a4468b4a248c5243ddfcfbc04bac8301ae37fdcef51e48799c8437b3301daebcd074743f7289f1ea54eae6cf44446eb164d6abda5a
+EBUILD coq-8.15.1.ebuild 2396 BLAKE2B 5648c9ffb0d8986ef485feef651526473552d38101cfc9692cf05dac8d5721af92d5ffacb19e29ec741b2b2804c9f49b8b08b64e605a7b03b51abc51593bad23 SHA512 ec43c43e0d0569c47bb938a4468b4a248c5243ddfcfbc04bac8301ae37fdcef51e48799c8437b3301daebcd074743f7289f1ea54eae6cf44446eb164d6abda5a
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.15.1.ebuild b/sci-mathematics/coq/coq-8.15.1.ebuild
new file mode 100644
index 000000000000..fc4bad973709
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.15.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+inherit desktop dune
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk debug +ocamlopt"
+RESTRICT="test"  # fails
+
+RDEPEND="
+	dev-ml/zarith:=
+	|| (
+		dev-ml/num
+		<dev-lang/ocaml-4.09.0[ocamlopt?]
+	)
+	gtk? (
+		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
+		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		>=dev-java/antlr-4.7:4
+		dev-python/antlr4-python3-runtime
+		dev-python/beautifulsoup4
+		dev-python/pexpect
+		dev-python/sphinx_rtd_theme
+		dev-python/sphinxcontrib-bibtex
+		dev-tex/latexmk
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+		media-fonts/freefont
+	)
+"
+
+DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
+
+src_configure() {
+	local myconf=(
+		-prefix /usr
+		-libdir /usr/$(get_libdir)/coq
+		-mandir /usr/share/man
+		-docdir /usr/share/doc/${PF}
+		-datadir /usr/share/coq
+		-configdir /etc/xdg/${PN}
+		-with-doc $(usex doc)
+	)
+
+	use debug && myconf+=( -debug )
+	use ocamlopt || myconf+=( -byte-only )
+
+	if use gtk ; then
+		if use ocamlopt ; then
+			myconf+=( -coqide opt )
+		else
+			myconf+=( -coqide byte )
+		fi
+	else
+		myconf+=( -coqide no )
+	fi
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+
+	echo "Configure options: ${myconf[@]}"
+	sh ./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" world
+}
+
+src_test() {
+	emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" check
+}
+
+src_install() {
+	local sym
+	local syms=( coq-core coqide-server )
+
+	emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" DESTDIR="${D}" install-library
+	dune-install coq-core coqide-server
+
+	if use gtk ; then
+		dune-install coqide
+		make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+		syms+=( coqide )
+	fi
+
+	use doc && emake DESTDIR="${D}" install-doc-all
+	einstalldocs
+
+	# Dune installs into /usr/<libdir>/ocaml/<coq> but
+	# Coq wants /usr/<libdir>/<coq> ; symlink those directories
+	for sym in ${syms[@]} ; do
+		dosym $(ocamlc -where)/${sym} /usr/$(get_libdir)/${sym}
+	done
+}
diff --git a/sci-mathematics/mathomatic/Manifest b/sci-mathematics/mathomatic/Manifest
index 39df3c99fe6c..1f1485b99787 100644
--- a/sci-mathematics/mathomatic/Manifest
+++ b/sci-mathematics/mathomatic/Manifest
@@ -1,3 +1,3 @@
 DIST mathomatic-16.0.5.tar.gz 381466 BLAKE2B 31dde337646d39faad3bcda6b72e316de4febfaf8c825320c70d69fdd55bb377948ec9e8b5ad855dc0a5b9be0f50b19387a595dfee7299e71fbf19c4f2bae979 SHA512 0d98cf7ad707d6536731c98dd253f4cce30243e9eefe9912b8fec3ad4ac4261e324b93b4f0113789ce17fd0b2e3d75f7b258be7905d8e3c7bb4b756627b75950
-EBUILD mathomatic-16.0.5.ebuild 1068 BLAKE2B e944b4f462169b3a47d80f31805b352ac56c5f82f1e9c5f6a9f15d282e40efc83d46401e840d5ebc0b5909d4569aae45fe29c58bfbd4e62374bf3e4b57c0df9d SHA512 d44c8476d22f39e1d3be7a9523d078e74bd436af907568ca756865db11afda8d6c3f6a8d6a6a84c4ba98dddef615faa504eef85e73c173353d1d8cf84f541407
+EBUILD mathomatic-16.0.5.ebuild 1072 BLAKE2B cee593b0af21efc48dffe3859b5cef3f3a34ad1aff940045ee75edf7c15458db2087b8e4dd50a085f665e720dc57feb0ece9763f920ca27d8b84781b6fd03487 SHA512 4daabed31e871d45c81941c9fe3992d075104e7e97b4a3a5d3489239dea143175bc147f7b4642d1f30c2bd5f6da208a96b01f2e251929fd6bcc89f82f07baf3f
 MISC metadata.xml 620 BLAKE2B 6e940ef7cff9245d2c53d222b811dbfb9802599ddf4a057678c0e69389f872052819b4b395c40d38ee7ebb3fc6e156628c95cd1a3466a034fb0febabf1c725b9 SHA512 89d1fce50b1f404956e1174cf63e1db2e66bf9ed42f636ad607c63723707b366a19446429f9f51efe83d7fc4e716d42c5590f1a6ed405dc8c229f10e80247e04
diff --git a/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild b/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild
index 949045b8228a..62548fef00cb 100644
--- a/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,8 +22,8 @@ S="${WORKDIR}/${PN}-${P}"
 
 src_compile() {
 	append-cflags -DBOLD_COLOR=1
-	emake READLINE=1 CC=$(tc-getCC)
-	emake CC=$(tc-getCC) -C primes
+	emake READLINE=1 CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" -C primes
 }
 
 src_test() {
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 8c68b03ce2ad..13db113caa3e 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,4 +1,6 @@
 AUX z3-4.8.14-libatomic.patch 2063 BLAKE2B b2cb8232817ccbff2b1a26897b81e50bf3fc4110924642735858d854f57bf625c2463fa23285e1bf6f3f8cedf544adb580d0a64ee15f4810eb2f95451aecad7e SHA512 56864d3be7b891bfce49855d457b22c9ba9e047c710da1856cffacf3b2e88a6429d07e604c948210a983ab1bd1f785e7de906828eeaf534851ddfc63f36632b2
 DIST z3-4.8.14.tar.gz 5113598 BLAKE2B c6a82cec33e879123c33506897ac02be682d08a6432da0b11c6918f2664fd7249d8874ccb6f543907f789cc3b40b126465548abeabf4ac16d2ee791ce179742a SHA512 10170516ca472258d2f9df28cd036e43023a76a25f1e1670290c62f3890d935bf82770970054a5fd3a0f02559409e7ed4b18fb08347c040ff2f9e0918e152aab
-EBUILD z3-4.8.14.ebuild 2655 BLAKE2B a8814dc067dc38a5b3bd8f1c0821f5e02a3e9324fab5b934ad5d0dc7723b800972923b9f1a640337e8c0c89dd1261ded27e24673f6477181e2619d7aef2587da SHA512 361c243eac4cf1a9123e85927f5f939d7428da702ded6a82d1672dcc67a93c495a57915e032b27230a4bcf31d6854c52a8c61f110ea7f048f806eecf4541033d
+DIST z3-4.8.15.tar.gz 5213633 BLAKE2B 6ca07309370f891f6ca5fa114721cb5df96e726687bf3c2310ba4963b1d1dfeec6ede62fd7a960e17e824ab8ff1e17d2af2a90d8156245ba048b04045c8f0531 SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c
+EBUILD z3-4.8.14-r1.ebuild 2661 BLAKE2B db8be08d461a83b79fd81e424dfa22510d1d6aa0df6d01f6d07efb34c22c608f6fcb84e3f7d65dc6cae8778528bb820daa333caa03aa5ea4b30e45298a467c7a SHA512 555eaec25e7fa285d3916e56138d8d966b1b722e759d8da6e5151fa6d4bb89515a027bbd0e831d594d087cad333fda287b14c8691a678e8a215b216c6b5b2fdf
+EBUILD z3-4.8.15-r1.ebuild 2605 BLAKE2B a3fe5a3d3164c6233098836c9d0db48c76425783c45987836795b84ed4645f15c70fbbd3df0566eb6afdad3596595dff9a9f3a523b5dadb5db0b391adc8fd5e6 SHA512 b17422c6d03d33e5840215333180e3af4293f078eab93f6806ab11626f74bd5686620fd42b53c5c92f3fa85e99b46a5da39ad69b1833e71543e70c25cdf09930
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/z3-4.8.14.ebuild b/sci-mathematics/z3/z3-4.8.14-r1.ebuild
index 513000b5c713..9789ce8a98e1 100644
--- a/sci-mathematics/z3/z3-4.8.14.ebuild
+++ b/sci-mathematics/z3/z3-4.8.14-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.8 )"
 BDEPEND="
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen[dot] )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-libatomic.patch" #bug 835003
@@ -39,7 +39,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DZ3_USE_LIB_GMP=$(usex gmp)
 		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
 		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
diff --git a/sci-mathematics/z3/z3-4.8.15-r1.ebuild b/sci-mathematics/z3/z3-4.8.15-r1.ebuild
new file mode 100644
index 000000000000..04689aa94acc
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.15-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake-multilib java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+S=${WORKDIR}/z3-${P}
+
+SLOT="0/4.8"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DZ3_USE_LIB_GMP=$(usex gmp)
+		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
+		-DZ3_INCLUDE_GIT_HASH=OFF
+	)
+
+	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md RELEASE_NOTES
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}