gentoo auto-resync : 11:04:2023 - 17:39:25

7 files changed, 14 insertions, 125 deletions

diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 470ae352b193..01adb3c5c501 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,13 +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.0.tar.gz 7397421 BLAKE2B 25b94002c4d1d1266ef948f0276df74d6a60c5b5100c7126232e0e33642be3ec14f33acfff5d0d5c17681676338374f694ca7c8c35200e522e480c3791f69dd8 SHA512 f324b68efcec0680a52c92d6e2fdd340a0e360e7d56d7fc3b4b781af3bec923d2fa2fdbb139b07d2253568a657a09c0d3da4cd5bdf984a6ab913e606056df4b3
 DIST coq-8.16.1.tar.gz 7401345 BLAKE2B fa6bbcd6b4ee29feaf7475f58193209afeae0bf8b6e3640f2f1cf40dfcee7d7f1fb3f371e8790b8d11c993b5f234e9175f1f5036a7286b7c6569720ddd3985f7 SHA512 e9c82f1a180c2e3946628e8e039999a1841397a5b4cd77f158de69876fa43b5c0f61ce76c510cc2b2f646a489110aea59da452b88ddd7850d1eab4105f1382f5
 DIST coq-8.17.0.tar.gz 7504612 BLAKE2B 90ff0e187e13a6501580733f0e92dbaba0ddc520b418246c743f0c282e74cee3e1d69ad0249cddfd5b8f3ba363bc58cb91aad33d0936ae38afde0f4c97d47a72 SHA512 2f77bcb5211018b5d46320fd39fd34450eeb654aca44551b28bb50a2364398c4b34587630b6558db867ecfb63b246fd3e29dc2375f99967ff62bc002db9c3250
-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.2.ebuild 2396 BLAKE2B ab3d17a65d8b2433bf22dc78c5f6612064dee6b438b6c9d307fb4c3699f5ff876fc7ee1410681b64eebd09a806d0c31edd41914deed6778c59db97b9404be117 SHA512 247f3b614b470d567f957a7ad3cca79dbbe17578d6f9ec3382c2a3315a2c05be639c992ed6335c3ea13697822d8acdee5b9301df47c177cac2770e986f453817
-EBUILD coq-8.16.0.ebuild 2412 BLAKE2B 1bafcb550666d84c80a36fe90e2fc127bf023e711a7ba5cad21e20406253253ae5bd43315c6619665c1cd34a76b0793c26e0519031bf252b491335bd41020acb SHA512 8d4c2fe2e6a48e3fa4ce3ebaffd3b20bb43dfc1a7ba364ea8f20a7d71dacae15d7298e86c42a09dacc6599980dde7cb760172ccfe63e72fe55d3bcc11c3963d1
-EBUILD coq-8.16.1.ebuild 2412 BLAKE2B 1bafcb550666d84c80a36fe90e2fc127bf023e711a7ba5cad21e20406253253ae5bd43315c6619665c1cd34a76b0793c26e0519031bf252b491335bd41020acb SHA512 8d4c2fe2e6a48e3fa4ce3ebaffd3b20bb43dfc1a7ba364ea8f20a7d71dacae15d7298e86c42a09dacc6599980dde7cb760172ccfe63e72fe55d3bcc11c3963d1
-EBUILD coq-8.17.0.ebuild 2150 BLAKE2B 229bb427e956cba5ea77d8f305cbd39d98800bdb7d0257b1ab8b78adae218f79314f40752128c2c7df1fbf36b3db89a0eb4dead11ae6e2c2b11d2e2b7cd8c4e6 SHA512 e3c06b7bc539ffd12c2f185a38f9ae83dc486e12438153ec19c884d078a93d8bb258ce9169bc128f01197382beafc2a254c22f6f0b1301e55f635c83bc8616d9
+EBUILD coq-8.12.0-r2.ebuild 1853 BLAKE2B 2a34013702abba1c9e1116397822684fcfd09065b0cf254d4fb495ed8b222b6c900a4d73d529ed07020b001c215abc1cc686dc06b2c199591e6b7cb27ecf388e SHA512 36c78c06dd77e1935c843b66d73ffc85d00bf0c6a72d3167145352f526e44913bcbf220bbaf7e42771251d4041d98a82cef567d965c15a39b0f24083625b6b27
+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 2207 BLAKE2B e664529b791384a0afae297df3c9457a1d8659e07a8f6b710a0e8328913ed13c63664ceda6bbc314f43cd161b1f70d61d6cfbba8535e27cfefdb004b350a2be8 SHA512 74010ab80f6f8a1a961630776b729132d9a9cac53e82ef1bd357ba0efb9ddafa2d9e31fadb77e5e09031cd2cd5161cbe7c40a3ee4bce3c7d030856940920a934
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.12.0-r2.ebuild b/sci-mathematics/coq/coq-8.12.0-r2.ebuild
index 71295a252044..8ccc4c7a73ef 100644
--- a/sci-mathematics/coq/coq-8.12.0-r2.ebuild
+++ b/sci-mathematics/coq/coq-8.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="http://coq.inria.fr/"
 SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="gtk debug +ocamlopt doc"
 
diff --git a/sci-mathematics/coq/coq-8.13.0-r1.ebuild b/sci-mathematics/coq/coq-8.13.0-r1.ebuild
index 2ce871790746..51731bcf5803 100644
--- a/sci-mathematics/coq/coq-8.13.0-r1.ebuild
+++ b/sci-mathematics/coq/coq-8.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 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"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk debug +ocamlopt doc"
 
diff --git a/sci-mathematics/coq/coq-8.15.2.ebuild b/sci-mathematics/coq/coq-8.15.2.ebuild
index 1cabd5cce240..c94ce21f129a 100644
--- a/sci-mathematics/coq/coq-8.15.2.ebuild
+++ b/sci-mathematics/coq/coq-8.15.2.ebuild
@@ -14,7 +14,7 @@ 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"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc gtk debug +ocamlopt"
 RESTRICT="test"  # fails
diff --git a/sci-mathematics/coq/coq-8.16.0.ebuild b/sci-mathematics/coq/coq-8.16.0.ebuild
deleted file mode 100644
index bc5f5a596041..000000000000
--- a/sci-mathematics/coq/coq-8.16.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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
-
-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.1.2:3=[sourceview,ocamlopt?]
-		>=dev-ml/lablgtk-sourceview-3.1.2: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/coq/coq-8.16.1.ebuild b/sci-mathematics/coq/coq-8.16.1.ebuild
index bc5f5a596041..a8dc37656492 100644
--- a/sci-mathematics/coq/coq-8.16.1.ebuild
+++ b/sci-mathematics/coq/coq-8.16.1.ebuild
@@ -14,7 +14,7 @@ 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"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc gtk debug +ocamlopt"
 RESTRICT="test"  # fails
diff --git a/sci-mathematics/coq/coq-8.17.0.ebuild b/sci-mathematics/coq/coq-8.17.0.ebuild
index baa5f98e70ae..19df902424b8 100644
--- a/sci-mathematics/coq/coq-8.17.0.ebuild
+++ b/sci-mathematics/coq/coq-8.17.0.ebuild
@@ -18,7 +18,8 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gui +ocamlopt"
+IUSE="debug doc gui +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/zarith:=
@@ -47,6 +48,7 @@ BDEPEND="
 		dev-texlive/texlive-xetex
 		media-fonts/freefont
 	)
+	test? ( dev-ml/ounit2 )
 "
 
 DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )