gentoo resync : 20.03.2021

4 files changed, 1 insertions, 185 deletions

diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 1bb483d5dc00..e8bc753d85c7 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,11 +1,7 @@
 DIST coq-8.11.2.tar.gz 6564523 BLAKE2B 37ae7a1f899b8ce662d5c21542b2bec0e2e8f25e976fb46689e0eae182fa4ec571524ae9f4f1a5ebbd44966fbdc4ee10cffda59c287d51ab48df4ac0e5e6844c SHA512 f8ab307b8e39ffda5f6984e187c1f8de1cb6dec5c322726dbbe535ee611683cfeeb9cee3e11ad83f5e44e843fc51e7e2d50b4ea69ab42fde38aaf3d0cf2dea3c
 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.6.1.tar.gz 5588811 BLAKE2B 1016e54ef9b42a8534add55ab057454fad35b3fe103ba877689489c7d9cf43d76c1fbee123801d91035d353a882120650f94c433d9ee1daa878b8c819609c949 SHA512 814ab76a06ca15f927081428da74add4bc67290199fa011853b9c68a00cdefaf813b10fbac18a434f4504fce8f2173eb544080bf6f50d62caa41bb8724b13083
-DIST coq-8.9.1.tar.gz 6001970 BLAKE2B f65498e2485c59f4f95d2afeac35750ebf85b5af6db7c269a11635f2414df483d4cb159557060c9118de25f4922176f54d2e5c6f12174599371348341cb4d80f SHA512 66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983
 EBUILD coq-8.11.2.ebuild 1828 BLAKE2B d07bc2a17b827c6e063e45b8f025b492405d30ce6e1a5e8e297bdc4395da7a3d2f7bf8f5ad25e6258aad3a386f5cbf22bae5a75c442539ba88845e52b151f3f1 SHA512 f1b63d03e3e0a22c6491171ea481f44bbb178783ad7d8dff90e96dca6aa3b28392e4d05366f6bbfd6fcc7417f4a01349f206a994c5eef3b07adb64b3deb43184
 EBUILD coq-8.12.0-r1.ebuild 1826 BLAKE2B a19aefc94ef90a5bbefad421a64ce70d67f4300f565b3a3bc26ecee6388a753f3e711ab738effdc9a9afa26b65fa608a2e938b8299d1ce10502fc9275caa84d9 SHA512 6f25da4262d515986f1f1c8535e8cd0b4b4d539bc4ce1d8afc4dd43710b15db8ce7db8b59a6699c0d816356f3a2ca87ac91eb57ae57bc709a545403fb6868158
 EBUILD coq-8.13.0.ebuild 1800 BLAKE2B 62589bd54d8387dd7b6edc0a04708c2288b35c470dbffdb97046eee76d5e1c870616c6695179b3c5aef83da39eb125886e3645a51ad9124afe5ccc527f6de577 SHA512 e02446464e6d91f599168329238e9f51e79c0b3400864e8e2a64fff90616c2df44f490a2b3a7a3d12d9b2394397614fdf36ce52158c1ed5a5e4e85eed894b9ae
-EBUILD coq-8.6.1-r1.ebuild 2007 BLAKE2B e11542ca13987c776b7dd4b181a4e369381d5b4bf16d61e2ba06b77d7c26e93295a18040ca757b02df492fb034f8852e9d340f52dbd22e7dde8cefaf60fe14f8 SHA512 b26850dc5f062a938a6974c1b49eb6f09645c75cdbac945262919be3d13c46e897d839ea063258868c6e6785cdeb31fc41152c2ffc0b412ca3b152e5ea89ffbc
-EBUILD coq-8.9.1-r1.ebuild 1884 BLAKE2B d060bd67a71bbe9cfc8c73ec578ca19565f88b671f667305ffbf7a911f46de8040918848321cbebee6c7957d566638007b634a0909ff8603497ca2ef71607a7f SHA512 76d68162cfc431547f5c499d1ffa80c1446a95e2f96c414830a93d4d91ed65143eb0c8bf3b12ed27d3d1b4bd302e498ea1ebf783b37a8576c7c009d4681a83ef
-MISC metadata.xml 1052 BLAKE2B c753067972f26a5be88afddf96eea063047e03aff71acc4b69a20d8b9d2b4124ac5fc8f2a84f66ff60281de288baa4c9b473738f87225db16ca4c69430174f7d SHA512 8811ecdefbfda7d1f41ecf10578b77e7c821956b0ec9267c4bdf44bb8f6adedd6b1031ca9deea0b1a8595a3dcab530c8fa07d6046fcd82d142ce510cdfdaeabb
+MISC metadata.xml 938 BLAKE2B ddeb43293328ab548a13f28c10bf9c0980f88a8f3652002c85171b0e9671873f820eebf6802cc55561cfc032f067555a9d7bb249780015f1786030e6cb4e52d4 SHA512 940564ff79f4165412e85cb2eeb3bfeb86447de012c1d4d78d01c1a52bd4272a78253bd4fe2208ed2ba62cf2141758a9411c9d81a4122bb9457b7091ba3e4ae8
diff --git a/sci-mathematics/coq/coq-8.6.1-r1.ebuild b/sci-mathematics/coq/coq-8.6.1-r1.ebuild
deleted file mode 100644
index 955cc400bc20..000000000000
--- a/sci-mathematics/coq/coq-8.6.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="http://${PN}.inria.fr/distrib/V${MY_PV}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk debug +ocamlopt doc camlp5"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-	camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
-	!camlp5? ( dev-ml/camlp4:= )
-	gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] )"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ocaml_lib=$(ocamlc -where)
-	local myconf=(
-		-prefix /usr
-		-bindir /usr/bin
-		-libdir /usr/$(get_libdir)/coq
-		-mandir /usr/share/man
-		-emacslib /usr/share/emacs/site-lisp
-		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		-docdir /usr/share/doc/${PF}
-		-configdir /etc/xdg/${PN}
-		-lablgtkdir ${ocaml_lib}/lablgtk2
-		)
-
-	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 )
-
-	if use camlp5; then
-		myconf+=( -usecamlp5 -camlp5dir ${ocaml_lib}/camlp5 )
-	else
-		myconf+=( -usecamlp4 )
-	fi
-
-	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 VERBOSE=1
-	dodoc README.md CREDITS CHANGES
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/coq-8.9.1-r1.ebuild b/sci-mathematics/coq/coq-8.9.1-r1.ebuild
deleted file mode 100644
index 5392c5dee7b0..000000000000
--- a/sci-mathematics/coq/coq-8.9.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop multilib
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RESTRICT=test
-
-# Note: RDEPEND will require dev-ml/num:= for >=dev-lang/ocaml-4.0.7
-RDEPEND="
-	>=dev-lang/ocaml-4.0.5:=[ocamlopt?]
-	dev-ml/camlp5:=[ocamlopt?]
-	gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] )"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	doc? (
-		media-libs/netpbm[png,zlib]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-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}
-		-lablgtkdir ${ocaml_lib}/lablgtk2
-		)
-
-	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 VERBOSE=1
-	dodoc README.md CREDITS CHANGES.md
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index c08f4cb96842..739db8fc01fe 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -20,9 +20,6 @@
 	Constructions" extended by a modular development system for
 	theories.
 	</longdescription>
-	<use>
-		<flag name="camlp5">Build using camlp5. This is required for some plugins like Ssreflect.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">coq/coq</remote-id>
 	</upstream>