gentoo christmass resync : 25.12.2020

4 files changed, 2 insertions, 122 deletions

diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index a4f2d963ecd9..649dab13c5e6 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,7 +1,3 @@
-DIST hevea-2.29.tar.gz 969599 BLAKE2B 88724c0a1a139d370fa852af473e4f21f7c1f8a8ed79cf0a59fa6098d63a3956423f7b1403316aa2e296b00d77ddc529938f98476243795b6a00971532918d90 SHA512 4ea2f3d60fd43d183712a868cb3894b38f6d9809ba7905d69123a7672faba0d6dfe73ad1379d7996ede98ceb645bba903e5b7550bdf92e7950ce69ba7f4f3994
-DIST hevea-2.30.tar.gz 965635 BLAKE2B 7f23c6f793be1515b689571f0ae25d76d45c7bd8df9cc6fe1f73697b34dec598f64b0ed30e4b2cd5e456990c80ac0bba50c60e0294a825c6a0af59b228456cbd SHA512 75c700e009070bff4845ccc6f984ade8068f90ea78630a2e6ab1d27618a225a4bbbb7c4aa07c08be03094ddad4aac5d0c9e83fa01d41ff501f5c1eed9f4428eb
 DIST hevea-2.31.tar.gz 965678 BLAKE2B 770a3ff5b3e209d1e34e68647baffc064cb78f63a610e6b81181a829837861984f22e381cc17c34a3b0b4643c260a5cb84841cd8e2038e40083bba7ffbdab929 SHA512 4b66030f69b8b60750f8e62a9d81240b0ba399af8af69df10b33742e10d23fe7aef3e7782265fac9705f27715e5964debd47b9da7a394f70fda947b5fcd2d6ea
-EBUILD hevea-2.29.ebuild 1399 BLAKE2B b292b879fffbb1bfcc25cd391948575dcf258138ac1894f3e667c77666bb87d966c87725b3f91e23814bd34914eb932edb0679a27a206fde62640d770e95f6c1 SHA512 0d234ea448643a386d84df7add23c65f8be2367bdb9b068aab4864ba5e300082419ab1356fd7eefeaf81b2f1bf6d8fa91a8117163d10599efa0bc0450312cf19
-EBUILD hevea-2.30.ebuild 1402 BLAKE2B a1c8918296823122ad0d80282305389e9b76f79d06e35d56be2ccb1448500f73ca58073a1915725d22d1aec97248a8fbb260025799e5d36579391a25617fbea7 SHA512 cab09c6eca6883ff939229219f99966e775d595405371eef40a1b7ca2706b97b88ed3414cd7a6e92a0a67ad1c03353c71583372a7f6fb310c8873c8da1418269
-EBUILD hevea-2.31.ebuild 1397 BLAKE2B 626d89eb778519de4a635fd04e1abb997299713e198f41f6094a88df55b53859a6d67fa97e5be711dee6132698dea797544a4a00f18b5eef36f9a5b8014b14d0 SHA512 5153ebeff752d7a2fd2308aadb0bd2d95f9ad3a0d261c359e41a983aa1f310dc48a4d4cb334d71d73bb59643dd8110d885ade96c6b010637f8815b651fda9f3c
+EBUILD hevea-2.31.ebuild 1396 BLAKE2B 79d87379ff6e312de88206d2e582e9311136ca43b8348a017364e2e4b021c2a5fe320488f764f7ecb8816843957c6540858478166b883a09110863afb5f9fbc8 SHA512 53c1281028ac03459b9993026f4c8ad42f54084cd58a4d83ac3da81dcf88513695dc8d8ed4cf5b683c7f78921d232f702bc1a9601e7aa66f69d3fe7259975de0
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
deleted file mode 100644
index 190fc255058d..000000000000
--- a/dev-tex/hevea/hevea-2.29.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="http://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
-	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
-	if use ocamlopt; then
-		emake PREFIX=/usr
-	else
-		emake PREFIX=/usr TARGET=byte
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install
-	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
-	fi
-
-	dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
-
-pkg_postrm() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
diff --git a/dev-tex/hevea/hevea-2.30.ebuild b/dev-tex/hevea/hevea-2.30.ebuild
deleted file mode 100644
index c5dfa8e05aaf..000000000000
--- a/dev-tex/hevea/hevea-2.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="http://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
-	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
-	if use ocamlopt; then
-		emake PREFIX=/usr
-	else
-		emake PREFIX=/usr TARGET=byte
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install
-	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
-	fi
-
-	dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
-
-pkg_postrm() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild
index 80046a30f85d..3c1e67628b19 100644
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ b/dev-tex/hevea/hevea-2.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 
 DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
 RDEPEND="${DEPEND}