gentoo resync : 20.03.2022

3 files changed, 25 insertions, 18 deletions

diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 848d8d08a6eb..029952d813a5 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -5,5 +5,5 @@ DIST coq-8.15.0.tar.gz 7215106 BLAKE2B 512fde593f6e7fb8b410b5debf5a78bc5d0d181ed
 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.ebuild 2371 BLAKE2B be3296b09cdb60c1408d3562ce96c810b43193c386bea72b50fa604fd93d08b9267074c082b40f7d20649122968b9775a5d0477509c504cb76d91a24c5dbac4d SHA512 63666fd745f6f39c97e3f69b250a8cd7528ba3d78a303652f358e238317087c3cf4851a574cbd477193c097a5da6da85965832e8c19897c4e94d1fc4660f3578
-MISC metadata.xml 939 BLAKE2B e8da08122c0821621a51c3d0fee7d62302a7e0f2f5c37d5787ce2ee613df299a1256f78bbb1d1c6d045076055aad6a25849a02000b97be619b9e984694315ac3 SHA512 98ae3bfb70f27c4b5e5cb18ebe0b9b93ddbb855e426eb54d019957253b3077fc32f0810aae4049f1fcd53209da863addb4b1e88b21ea7422515ce387bfdbdf43
+EBUILD coq-8.15.0-r2.ebuild 2396 BLAKE2B 5648c9ffb0d8986ef485feef651526473552d38101cfc9692cf05dac8d5721af92d5ffacb19e29ec741b2b2804c9f49b8b08b64e605a7b03b51abc51593bad23 SHA512 ec43c43e0d0569c47bb938a4468b4a248c5243ddfcfbc04bac8301ae37fdcef51e48799c8437b3301daebcd074743f7289f1ea54eae6cf44446eb164d6abda5a
+MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.15.0.ebuild b/sci-mathematics/coq/coq-8.15.0-r2.ebuild
index b02fe03c702c..fc4bad973709 100644
--- a/sci-mathematics/coq/coq-8.15.0.ebuild
+++ b/sci-mathematics/coq/coq-8.15.0-r2.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit desktop dune
-
 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"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk debug +ocamlopt"  # doc add when antlr & antlr-python are ready
+IUSE="doc gtk debug +ocamlopt"
 RESTRICT="test"  # fails
 
 RDEPEND="
@@ -31,15 +31,21 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-# to build docs we needantlr >=4.7, not yet in the tree
-# BDEPEND="doc? (
-#	>=dev-java/antlr-4.7:4
-#	dev-python/antlr-python:4
-#	dev-python/beautifulsoup4
-#	dev-python/pexpect
-#	dev-python/sphinx_rtd_theme
-#	dev-python/sphinxcontrib-bibtex
-# )"
+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 )
 
@@ -51,8 +57,7 @@ src_configure() {
 		-docdir /usr/share/doc/${PF}
 		-datadir /usr/share/coq
 		-configdir /etc/xdg/${PN}
-		# -with-doc $(usex doc)
-		-with-doc no
+		-with-doc $(usex doc)
 	)
 
 	use debug && myconf+=( -debug )
@@ -95,7 +100,7 @@ src_install() {
 		syms+=( coqide )
 	fi
 
-	# use doc && emake DESTDIR="${D}" install-doc-all
+	use doc && emake DESTDIR="${D}" install-doc-all
 	einstalldocs
 
 	# Dune installs into /usr/<libdir>/ocaml/<coq> but
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index 3a90dda7ec2e..bb29aa903edb 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -5,7 +5,7 @@
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
-	<longdescription lang="en">
+	<longdescription>
 	Developed in the LogiCal project, the Coq tool is a formal proof
 	management system: a proof done with Coq is mechanically checked
 	by the machine.
@@ -21,6 +21,8 @@
 	theories.
 	</longdescription>
 	<upstream>
+		<changelog>https://github.com/coq/coq/releases/</changelog>
+		<bugs-to>https://github.com/coq/coq/issues/</bugs-to>
 		<remote-id type="github">coq/coq</remote-id>
 	</upstream>
 </pkgmetadata>