gentoo auto-resync : 09:09:2024 - 12:30:03

7 files changed, 240 insertions, 8 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 28faa857b011..a5da9bc5633c 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest
index 9acd15d4684e..b5943328f02f 100644
--- a/sci-mathematics/coq-serapi/Manifest
+++ b/sci-mathematics/coq-serapi/Manifest
@@ -1,5 +1,7 @@
 AUX 50sertop-gentoo.el 85 BLAKE2B d06e7c0823a3bedbf5f9c91ea8ea26bc9ed9d2ea44030316a1f3d65c19e51d874f03c845af5ae8237a9562cff7c81e24196c5ae29e54d79d1ba322f51904ba5d SHA512 42e61d798800d2e4c7e0702bdff53401a06ff6def54a1c7c0a8a6fd3e6a2f502c48bc84a04356818aa2ec5241bdd63b407837df123bfad76fafb78cf8a5a6cca
 AUX coq-serapi-0.19.0-sertop-el.patch 303 BLAKE2B 106d44d3dc7e0e6400861382e582734111a2e64ab018d78722214d2858a0449e9f519fc7119893a78615e2d9afb5f481446141714a6f288cda6236f0d1156b01 SHA512 038508239e54194ff70207611c517c5f46ecb323f0492c3cd901492bc717995753dea6dd003228de7d2ccde2aaf8d87033cb5fd4271fd6f1504a00ea7de0eb82
 DIST coq-serapi-0.19.0.tar.gz 180779 BLAKE2B 27083a851139e983158b4cb251d37971d0eec61dd91303a0d09512e690c56a75624dab8c5120eebaed1e7bb168d0b2b889d538854812506c4d0a804f7bee7423 SHA512 e01706beb957315011682f2f74448e66c7a8a077418eeaf7d3fa21414bdf88950b75adbfe2392656e4d6036ce6585d4d53b1dadfd8379249b2943ea389c9c83e
+DIST coq-serapi-0.20.0.tar.gz 182481 BLAKE2B 0483eb7023c67b42def13d23ceec7375d4a575f58ef0b6ed39cbcf8c8f76633c74c83bdebff18b7a777d90beeb20d03c38f20cff525afd1822db31c4a168d413 SHA512 00f8ff851c1b99f45761d098af51949f9a6844d05e23b2cede795bb4f93a9a0a753b45c38271537b257f0ec9cd7538be251174eff483a89cd57889f40a358c27
 EBUILD coq-serapi-0.19.0.ebuild 1506 BLAKE2B 3d4fa121e18fce87c36d18c07fb74e3b476923f70297a9379ec33cf8226c784ed701de068d73739437fed6efc669f49ee71efcb869d7f249fa97b70df4f78f25 SHA512 d7b63c62d34855d298f6129dff53ca46bb805a0714719111d95611bc39d6c2db77db9d0404edc50145ae14beebe53a7acd214be42ba62720c8e3d6d2d78bf818
+EBUILD coq-serapi-0.20.0.ebuild 1631 BLAKE2B a55991677a6b688de88659d22920ad87d0941c6cdc9f80337af1aba008a7defa9435b49ae6879ff26c352211fc7528ad2ab023b2d4e7bcab3426d0219d50de64 SHA512 3619ab65129df0f07d1aeb54349f03c1b44dd1c13f43a87ff0834a6b599bbdad481c0c91954935d03e7dd4bec22a62aa09d3288509840bbf27bd801997b98cfa
 MISC metadata.xml 935 BLAKE2B e1444df414ce499df466597f5e0949e8ebf2d6da23d77028546324109659f58c5f0284a315ea062410a2f2e4631aac8d3564664719e89d76ad6ded9bb8ba7a5f SHA512 172fedbb2aa42e2be9aff426d64fcd69d2dfa206bb0e6072c6ecdc14a1923a2f0676303d8d8aebfe9a3e96e0a1e89185d2d4952bdb9ba1fff44b3891f26d6bf7
diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.20.0.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.20.0.ebuild
new file mode 100644
index 000000000000..2a430ae8faf5
--- /dev/null
+++ b/sci-mathematics/coq-serapi/coq-serapi-0.20.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COQ_MIN_V="8.20.0"
+COQ_MAX_V="8.21.0"
+
+inherit dune elisp-common
+
+DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant"
+HOMEPAGE="https://github.com/ejgallego/coq-serapi/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ejgallego/${PN}.git"
+else
+	# The tarball in SRC_URI is comprised of <supported coq>+<package version>
+	SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQ_MIN_V}+${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COQ_MIN_V}-${PV}"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sci-mathematics/coq-${COQ_MIN_V}:= <sci-mathematics/coq-${COQ_MAX_V}:=
+	>=dev-ml/ppx_sexp_conv-0.13.0:=
+	dev-ml/cmdliner:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppx_deriving_yojson:=
+	dev-ml/ppx_hash:=
+	dev-ml/ppx_import:=
+	dev-ml/sexplib:=
+	dev-ml/yojson:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	emacs? (
+		>=app-editors/emacs-23.1:*
+	)
+	test? (
+		sci-mathematics/coq-mathcomp
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.19.0-sertop-el.patch" )
+
+SITEFILE="50sertop-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs && elisp-compile sertop/*.el
+}
+
+src_install() {
+	dune_src_install
+
+	rm -r "${ED}/usr/share/emacs" || die
+
+	if use emacs ; then
+		elisp-install "${PN}" sertop/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 2f46c0eaff51..c46153b0b628 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,7 +1,9 @@
 DIST coq-8.19.0.tar.gz 7674352 BLAKE2B 195040c01797ac9ce67611e0c96a4601e0a48966e094e868b9f3644aa9f75fa85adf0e2e6340a14ae0a0598b746f5ad989d8f10736cd2d3852a449f6f79d2c93 SHA512 02fb5b4fb575af79e092492cbec6dc0d15a1d74a07f827f657a72d4e6066532630e5a6d15be4acdb73314bd40b9a321f9ea0584e0ccfe51fd3a56353bd30db9b
 DIST coq-8.19.1.tar.gz 7675945 BLAKE2B 62ee346f50d0a22ab217a8e689c3078347519d159619b75f20a8decace356b49c60bcd5b2cec5fbcaffc758a8944f8a7940298df1c0ddddfbd858ed9269c12f3 SHA512 ec8379df34ba6e72bcf0218c66fef248b0e4c5c436fb3f2d7dd83a2c5f349dd0874a67484fcf9c0df3e5d5937d7ae2b2a79274725595b4b0065a381f70769b42
 DIST coq-8.19.2.tar.gz 7678311 BLAKE2B 5f9617fbe0127b0c8357c63f331ba3e9fb5a931be9a4a8e8de2e27820a0d986bf99ed9a512740a0f721c742504225ae56e240af893510aa0e449931499d10aab SHA512 91bc81530fa4f6498961583ad51eac5001f139881788b88e360a866ad8e2a6e2c5bce86d1a580ab4cd4782bf49d48318767df82471ce33ba3ac143e5569ad33c
+DIST coq-8.20.0.tar.gz 7839432 BLAKE2B 9b489db0cc6874b0a629f3bdb4b503201005ec95a3375441538cd7e51d371a39561b9d0ab23ac485652782fdc7ae8d90c97ca1ff4d9a85fb8727a39ed4a6f48c SHA512 1a7eac6e2f58724a3f9d68bbb321e4cfe963ba1a5551b9b011db4b3f559c79be433d810ff262593d753770ee41ea68fbd6a60daa1e2319ea00dff64c8851d70b
 EBUILD coq-8.19.0.ebuild 2491 BLAKE2B ee610273d5294b25e7aa48cfb048b99af86aef21fb8d3c21019da509c82912b4f6624ae5076a694d98eb3679e9eba7ef138cb12a8ba0f938ce7ecbe4aacf6027 SHA512 498a461e9bc69016aab3abc5578bbd2367322dc14f8c2db9293a246022a4d8065dd06966741db3ae45365b3c1049703f85a9cef42416a8be3ed469dc4d80233e
 EBUILD coq-8.19.1.ebuild 2492 BLAKE2B 1c1d296a61f57bf8e5120aa8e70dce382548cc55a8c1365c1e85b33080e3fd346ea1b904e9440af465c67416b83f4b4e538ec558ce0b8c10ec42a94efee7e0f8 SHA512 9783ef6098d6028dd207a239796916ed90d8eab01429c4fded5e25f0a1c776f1c9dc0bac9f15e4d0847ad5d915bb69760937347cb6f295806f61af95cec2199b
 EBUILD coq-8.19.2.ebuild 2484 BLAKE2B 54de05ac84bb2df76e6defa2f96014d3488a78129a6e1b480857ea04ccf1ca1d0c96deacbe544aec0dfffd53c51fc490bef2c9d22c64fdbe7cddd99833f63f75 SHA512 5a236fd48123fd32fe3f13ce964f0effca8ab3ef8a27d025c75bcdd10d7afd511cd506347eb889c59b3ac3fbe8838d6a3757f4c0fa82c277d6669cb926a2bdc4
+EBUILD coq-8.20.0.ebuild 2896 BLAKE2B 0b241fec6dd165b83fa07c0708b03461ceebbf800fd6501936c8c36e7c9a0f42c6c01594c1ee48903b535dbd65a2fc389bd4bdb66e98ffe926a78fe302e4acec SHA512 5d4d0a01cf012f142cb341d63c2c19ea05be45c2605ca2a2ebe92a9773703d046927318371afc5804187546e0a60daa225b20df05428f721dd04e964a4dc1378
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.20.0.ebuild b/sci-mathematics/coq/coq-8.20.0.ebuild
new file mode 100644
index 000000000000..7446a497d097
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.20.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs desktop dune edo
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="https://coq.inria.fr/
+	https://github.com/coq/coq/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/coq/coq.git"
+else
+	SRC_URI="https://github.com/coq/coq/archive/V${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="debug doc gui +ocamlopt test"
+
+# TODO: Lots of failing tests. Maybe investigate later.
+# RESTRICT="!test? ( test )"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/num:=
+	dev-ml/zarith:=
+	gui? (
+		>=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?]
+		>=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-ml/findlib
+	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
+	)
+	test? (
+		dev-ml/ounit2
+	)
+"
+
+CHECKREQS_DISK_BUILD="2G"
+
+DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
+DUNE_PACKAGES=()
+
+src_prepare() {
+	# Remove bad tests (recursive).
+	local -a bad_tests=(
+		coq-makefile/timing-aggregate
+		coq-makefile/timing-error
+		coq-makefile/timing-per-file
+		coq-makefile/timing-per-line
+		coq-makefile/timing-template
+	)
+	local bad_test=""
+	for bad_test in "${bad_tests[@]}" ; do
+		if [[ -e "test-suite/${bad_test}" ]] ; then
+			rm -r "test-suite/${bad_test}" || die "failed to remove test ${bad_test}"
+		else
+			ewarn "Test file ${bad_test} does not exist"
+		fi
+	done
+
+	default
+}
+
+src_configure() {
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+
+	DUNE_PACKAGES=(
+		coq-core
+		coq-stdlib
+		coqide-server
+		coq
+	)
+	use gui && DUNE_PACKAGES+=( coqide )
+
+	emake clean
+
+	local -a 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}"
+		-native-compiler "$(usex ocamlopt yes no)"
+	)
+	use debug && myconf+=( -debug )
+	edo sh ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	emake DUNEOPT="--display=short --profile release" VERBOSE="1" dunestrap
+
+	dune-compile "${DUNE_PACKAGES[@]}"
+
+	use doc && emake refman-html
+}
+
+src_install() {
+	dune-install "${DUNE_PACKAGES[@]}"
+
+	if use gui ; then
+		make_desktop_entry coqide "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+	fi
+
+	local ocamlc_where="$(ocamlc -where)"
+
+	# Dune installs into /usr/<libdir>/ocaml/<coq> but
+	# Coq wants /usr/<libdir>/<coq> ; symlink those directories
+	local sym=""
+	for sym in "${DUNE_PACKAGES[@]}" ; do
+		dosym "${ocamlc_where}/${sym}" "/usr/$(get_libdir)/${sym}"
+	done
+
+	einstalldocs
+}
diff --git a/sci-mathematics/dunshire/Manifest b/sci-mathematics/dunshire/Manifest
index 9e62571841e5..65ae812ea476 100644
--- a/sci-mathematics/dunshire/Manifest
+++ b/sci-mathematics/dunshire/Manifest
@@ -1,3 +1,3 @@
 DIST dunshire-0.1.3.tar.gz 52450 BLAKE2B 047f732daa7f2a53b8d24ea0aafdad3234aa5ee151a66f776ba22746d58b4b91a5047ba615978d4017e56345ac608fd1f537adef06f38b5a429276e284a88d02 SHA512 227d142347ad7b7eb5b283aaa94f457b20b686f40aa86b2a74057eed00d3d90e87fb4a0f32071db3bd73412489794a0b398a557f8194931a6e7d51ff442aa2b0
-EBUILD dunshire-0.1.3-r1.ebuild 851 BLAKE2B 15c1f147cb48bb4d9f8e09e2adf048c0db373f33f7df40596c22ab8a90418b0874daa9fde7931000e68c7e1953306deeb8e55b99a8973f29439fdf6314bf73e0 SHA512 fa54d4226d1f8078eee90b371611821eb02aca8cfa183c41871a36aac10d62eaf1b86bd4c25b8b963f63b48eda5a0dd6d41b169c5e3e7b9f54dc1fbd54303bbc
+EBUILD dunshire-0.1.3-r1.ebuild 719 BLAKE2B 679250a87250bc36635f7df83d877af9d5726bed7b310fcc40aaf4e08ba236f5d76bb04451da248aaef1c79472e13d381a8c392e75a3a04dee254b2c6d69edcb SHA512 e85fb5dcd889e617269d54629a46c7f814e4c2e42c1986828a0a0af4cd520031159ba77c176589df30879b63aa9f83185e24c1ecfd9b40a4d6d1a8c67edce81c
 MISC metadata.xml 329 BLAKE2B e9cf64a4fd7f360e350a97ca0a9efe8e64ce485f2b025e456271c8e3d8bbf3f6950750a157eaa66e0639a800285351f84abd07789697acfbaf5422b9cb725ec6 SHA512 f8f757c9f662dfba3c0717720a7d2fe6e2c2bea517d6811cf9785d39cef92714c0ddddf3c56eecb6be37fc97fcd6ebdeba0412108b41ffc0c9cdde34c3e8a74a
diff --git a/sci-mathematics/dunshire/dunshire-0.1.3-r1.ebuild b/sci-mathematics/dunshire/dunshire-0.1.3-r1.ebuild
index c98c5b6bf51d..348bf1942132 100644
--- a/sci-mathematics/dunshire/dunshire-0.1.3-r1.ebuild
+++ b/sci-mathematics/dunshire/dunshire-0.1.3-r1.ebuild
@@ -5,26 +5,32 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1
 
 DESCRIPTION="Python library to solve linear games over symmetric cones"
 HOMEPAGE="https://michael.orlitzky.com/code/dunshire/"
 SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz"
+
 LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/cvxopt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
 
-RDEPEND="dev-python/cvxopt[${PYTHON_USEDEP}]"
 DOCS=( doc/README.rst )
 
 distutils_enable_sphinx doc/source
 
-# There are no additional dependencies even though we're not really
-# using setup.py to run the test suite any more. The __main__.py
-# runner has its own exit code handling.
-distutils_enable_tests setup.py
-
 python_test() {
 	PYTHONPATH="." "${EPYTHON}" test/__main__.py --verbose || die
 }