gentoo auto-resync : 28:06:2023 - 07:37:01

3 files changed, 114 insertions, 90 deletions

diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 4f1dc626dcff..69165c7e6f30 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,11 +1,11 @@
 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.2.tar.gz 7222794 BLAKE2B 2f187982a56cb0a512af838ee321b245f9a44b0c32f5413aafcef8e5b7f933e9b05ba521c3e681a6c6973ca2b7ec5965a8b69b2febb978ce7cf246755187f656 SHA512 6a5487912dedb6e54145bf3f177a091cffe13429ba2f73db7c1cc241fe10e86340c968e19cefba7d680facce55f4e914cbd16a317264b109a6f9a01ec822a8c5
 DIST coq-8.16.1.tar.gz 7401345 BLAKE2B fa6bbcd6b4ee29feaf7475f58193209afeae0bf8b6e3640f2f1cf40dfcee7d7f1fb3f371e8790b8d11c993b5f234e9175f1f5036a7286b7c6569720ddd3985f7 SHA512 e9c82f1a180c2e3946628e8e039999a1841397a5b4cd77f158de69876fa43b5c0f61ce76c510cc2b2f646a489110aea59da452b88ddd7850d1eab4105f1382f5
 DIST coq-8.17.0.tar.gz 7504612 BLAKE2B 90ff0e187e13a6501580733f0e92dbaba0ddc520b418246c743f0c282e74cee3e1d69ad0249cddfd5b8f3ba363bc58cb91aad33d0936ae38afde0f4c97d47a72 SHA512 2f77bcb5211018b5d46320fd39fd34450eeb654aca44551b28bb50a2364398c4b34587630b6558db867ecfb63b246fd3e29dc2375f99967ff62bc002db9c3250
+DIST coq-8.17.1.tar.gz 7506035 BLAKE2B 29b5b11666185ec293f50264f5a8ad66433c3ce05d74128b524f6fc3c6810551fe76d11d6f9db7d3741b829ac8bacb66948aad522d0cd2c487692c3df8b563ff SHA512 9a35311acec2a806730b94ac7dceabc88837f235c52a14c026827d9b89433bd7fa9555a9fc6829aa49edfedb24c8bbaf1411ebf463b74a50aeb17cba47745b6b
 EBUILD coq-8.12.0-r2.ebuild 1854 BLAKE2B 96a5bc026d7cef8218fa0f10401c697df908487a2a510f349a57d080e2c59c6fc6237223fbe82f5114c6ee70ebdfd9fffc9812bc2e8981febac635efd94b3035 SHA512 3936eafb537044833b310fafc9ba4595bb6deba71679177fbb807c59e3bfcd44f8a98c26077fda791619479b5efdefd64f6235ce2ae7c599489c4f0e8f8e003b
-EBUILD coq-8.13.0-r1.ebuild 1827 BLAKE2B c14222f64269417e09c02f581a281a5328cb71e203d365019a939846bd2c2d61c8a059e64f3df0027472927b8e36aea6b2b998de86799cd1c425481a3d98e3d3 SHA512 faad0043cabc4f2d2fa129878a233ba11d0ced13fbd2c0f947c6ee380a5a1efceb65bcc0ee8e84f4116a9c3b78beb940865c07aafd22816911a39a69f9b23138
 EBUILD coq-8.15.2.ebuild 2402 BLAKE2B a1f9f44c17ea51c1a0536d02eaddbeba7eb5e441ec8562da3b9776dbafafbd30c50beb821d248e0a51dc56b3a5bec7feb36811d92277609d405b01229bdda17f SHA512 45c64aa13323c97c29dd4eeccc5b4e228b6abf51a3717bf62dee0c102df13c9a809073150d82be8ae7a07d43f62f52b4b7d2a69908f0ffed646b64a44d46c7e3
 EBUILD coq-8.16.1.ebuild 2418 BLAKE2B 09538efce3b1ba1b96141fe56b4328ed5fdd9a2c3aeeabb94ab35af59027748e4e75f456edd6ea81d97f8a7cd2ace7c6a89af1c815139168bd2728ad8ceafc7e SHA512 37dd16c4b7d7ebb9c380f47e24c25bbdf361db401d593f1a0d21cd0842dc4a1c6ebfd1bafd1d6c661885811f2b00c3d1665e78efcc385c478216b832e7889a51
 EBUILD coq-8.17.0.ebuild 2318 BLAKE2B 43895300c1c9b754f5c1d1cfc2140318f8ef32014bcfa59e47e21931efe8d9d115637791b0ddad99c6ecea9fefc172bfddaaef048cffe99ae769fdb807cef8eb SHA512 6f9149a727109283ec4f4ca883016478f0e77464542ca3798e068d3eea2d682eba1b226b37bdc1bc9e4c35c8c19997e1720f3abf2d42c6fc790d148137e0f8a4
+EBUILD coq-8.17.1.ebuild 2318 BLAKE2B 43895300c1c9b754f5c1d1cfc2140318f8ef32014bcfa59e47e21931efe8d9d115637791b0ddad99c6ecea9fefc172bfddaaef048cffe99ae769fdb807cef8eb SHA512 6f9149a727109283ec4f4ca883016478f0e77464542ca3798e068d3eea2d682eba1b226b37bdc1bc9e4c35c8c19997e1720f3abf2d42c6fc790d148137e0f8a4
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.13.0-r1.ebuild b/sci-mathematics/coq/coq-8.13.0-r1.ebuild
deleted file mode 100644
index 51731bcf5803..000000000000
--- a/sci-mathematics/coq/coq-8.13.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop findlib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-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/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RESTRICT="test"
-
-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}
-	doc? (
-		media-libs/netpbm[png,postscript(+),zlib(+)]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-latexextra
-		)"
-
-src_configure() {
-	ocaml_lib=$(ocamlc -where)
-	local myconf=(
-		-prefix /usr
-		-bindir /usr/bin
-		-libdir /usr/$(get_libdir)/coq
-		-mandir /usr/share/man
-		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		-docdir /usr/share/doc/${PF}
-		-configdir /etc/xdg/${PN}
-	)
-
-	use debug && myconf+=( -debug )
-	use doc || myconf+=( -with-doc no )
-
-	if use gtk; then
-		if use ocamlopt; then
-			myconf+=( -coqide opt )
-		else
-			myconf+=( -coqide byte )
-		fi
-	else
-		myconf+=( -coqide no )
-	fi
-
-	use ocamlopt || myconf+=( -byte-only )
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 world VERBOSE=1
-}
-
-src_test() {
-	emake STRIP="true" check VERBOSE=1
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install -j1 VERBOSE=1
-	dodoc README.md CREDITS
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/coq-8.17.1.ebuild b/sci-mathematics/coq/coq-8.17.1.ebuild
new file mode 100644
index 000000000000..f634026e1cda
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.17.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 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 edo
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/
+	https://github.com/coq/coq/"
+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/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc gui +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/zarith:=
+	|| (
+		dev-ml/num
+		<dev-lang/ocaml-4.09.0[ocamlopt?]
+	)
+	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 )
+"
+
+DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
+
+src_prepare() {
+	# Remove failing tests. bug #904186
+	rm -r test-suite/coq-makefile/timing || die
+
+	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 )
+	edob 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
+
+	# 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
+}