gentoo auto-resync : 16:07:2023 - 04:41:57

5 files changed, 20 insertions, 228 deletions

diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 39975aa757ac..4db5821070a8 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,11 +1,7 @@
 DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
-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.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 2317 BLAKE2B ff2958b7e82400115ab634dd00bac13df99ba088d8d2ec48ad61663ba0aa3690e3cad26badedad5fd12958df4c7a343b5c9d2d827a2a7aac3ba35e9ddfe3f222 SHA512 4c04bb4aa2d97dfa21868e6246d8a35d96b55e80c7bf6206ce1c67f46102c449cad25f7062c93c7defdb0e118be57c8f86d3c3323df53ce3c794617a7d4ed6d5
-EBUILD coq-8.17.1.ebuild 2318 BLAKE2B 43895300c1c9b754f5c1d1cfc2140318f8ef32014bcfa59e47e21931efe8d9d115637791b0ddad99c6ecea9fefc172bfddaaef048cffe99ae769fdb807cef8eb SHA512 6f9149a727109283ec4f4ca883016478f0e77464542ca3798e068d3eea2d682eba1b226b37bdc1bc9e4c35c8c19997e1720f3abf2d42c6fc790d148137e0f8a4
+EBUILD coq-8.17.0.ebuild 2557 BLAKE2B 33c12f0cb8461ebe6489b4e28fb5816dfe7a879404c0de24ff9f151872c7c1838c58536302589d86efe50a200dae3495d5c816aa95936cadf59ee0dea778a83e SHA512 d8384bf764906ff5f621cd0fc5380d34ecbfdc2f801b0ffd152ffd67621e7f80af5cf4c4637dcdceb1e34e38cda979316c2e0f5ca2c059e316deabf266207c01
+EBUILD coq-8.17.1.ebuild 2558 BLAKE2B 9a66cc04a21af88972bfdcbd11af4e469a929a62d488ca3c18cbde8d31b23ee55c95a424032ce0060bd3eac3101d9541c7fb765b15364f85cf863ba793716c53 SHA512 b71e8e58c91f2dfb937b2e70637181ebcca2f3c255f216f27482eb863ab123b33eb887b105e57d04a8b18413b9b129f54bf475775f4cbf6e6074599eda164981
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.15.2.ebuild b/sci-mathematics/coq/coq-8.15.2.ebuild
deleted file mode 100644
index c94ce21f129a..000000000000
--- a/sci-mathematics/coq/coq-8.15.2.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/${PV}"
-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/coq/coq-8.16.1.ebuild b/sci-mathematics/coq/coq-8.16.1.ebuild
deleted file mode 100644
index a8dc37656492..000000000000
--- a/sci-mathematics/coq/coq-8.16.1.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/${PV}"
-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.17.0.ebuild b/sci-mathematics/coq/coq-8.17.0.ebuild
index 495f48055a82..45b99385ac67 100644
--- a/sci-mathematics/coq/coq-8.17.0.ebuild
+++ b/sci-mathematics/coq/coq-8.17.0.ebuild
@@ -110,3 +110,12 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_preinst() {
+	# bug https://bugs.gentoo.org/910236
+	if has_version "sci-mathematics/coq:0/8.12.0" && [[ ! -L /usr/lib64/coq ]]
+	then
+		einfo "Removing colliding directory from version 8.12: /usr/lib64/coq"
+		rm -rf /usr/lib64/coq
+	fi
+}
diff --git a/sci-mathematics/coq/coq-8.17.1.ebuild b/sci-mathematics/coq/coq-8.17.1.ebuild
index f634026e1cda..fb5c53f57eed 100644
--- a/sci-mathematics/coq/coq-8.17.1.ebuild
+++ b/sci-mathematics/coq/coq-8.17.1.ebuild
@@ -110,3 +110,12 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_preinst() {
+	# bug https://bugs.gentoo.org/910236
+	if has_version "sci-mathematics/coq:0/8.12.0" && [[ ! -L /usr/lib64/coq ]]
+	then
+		einfo "Removing colliding directory from version 8.12: /usr/lib64/coq"
+		rm -rf /usr/lib64/coq
+	fi
+}