gentoo resync : 22.01.2021

6 files changed, 75 insertions, 3 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index d74d2c75c137..6b22a8979160 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index 649dab13c5e6..52d73b7b1a36 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,3 +1,5 @@
 DIST hevea-2.31.tar.gz 965678 BLAKE2B 770a3ff5b3e209d1e34e68647baffc064cb78f63a610e6b81181a829837861984f22e381cc17c34a3b0b4643c260a5cb84841cd8e2038e40083bba7ffbdab929 SHA512 4b66030f69b8b60750f8e62a9d81240b0ba399af8af69df10b33742e10d23fe7aef3e7782265fac9705f27715e5964debd47b9da7a394f70fda947b5fcd2d6ea
+DIST hevea-2.35.tar.gz 1006773 BLAKE2B 80a8f80955a4eee641c53784cbe4543072062d0bf4d757fe0c8270d6370d54495eeab3a9279bd992dc45b80b23de0438ee4fe6fa932981c777b25782c42ca4a8 SHA512 dc1a5179489626176b1fcae47a9c7eb4cf9c1c6127c749cb938808697ccd6179277089fb20f4d5da7b82056d15b1d64acd9ba9884d1950a74d98c98864b4180a
 EBUILD hevea-2.31.ebuild 1396 BLAKE2B 79d87379ff6e312de88206d2e582e9311136ca43b8348a017364e2e4b021c2a5fe320488f764f7ecb8816843957c6540858478166b883a09110863afb5f9fbc8 SHA512 53c1281028ac03459b9993026f4c8ad42f54084cd58a4d83ac3da81dcf88513695dc8d8ed4cf5b683c7f78921d232f702bc1a9601e7aa66f69d3fe7259975de0
-MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
+EBUILD hevea-2.35.ebuild 1593 BLAKE2B 81d85c70692a5817acf6e5e5b36181d655c74d5ff15f4c111f98b824c7c024a3ad81f2a99c384349565dcf448f7a9ecc2b46933a85723a5a708c7ad19f5d6035 SHA512 4dcba80b5436226bebbadf6dd32f371d50fd512ec0242e972713824b8be38e26fee06f281d0deb0c0562df5e916472284bb3d3a5b03e175ce24d35a6c9bcefcd
+MISC metadata.xml 328 BLAKE2B e975d349093a2f893f0af0fc0dee56ec632e0beec6b0faf037b42ccbb21c7be7b530a6d8bdcb07d90c432f5f4f59eda56afcfccf7b54bab65b5c0d311aa658de SHA512 eac0fd6c81b46dd79a5b56e31103a4ba20ae40ac06a2941a5f11d8543c2358782882172e3fda1e2713846470f5bb1f5ed69b5bded0a60dde235a82158b399f83
diff --git a/dev-tex/hevea/hevea-2.35.ebuild b/dev-tex/hevea/hevea-2.35.ebuild
new file mode 100644
index 000000000000..d5790789e792
--- /dev/null
+++ b/dev-tex/hevea/hevea-2.35.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt=]"
+RDEPEND="
+	${DEPEND}
+	dev-texlive/texlive-latexextra
+"
+BDEPEND="dev-ml/ocamlbuild"
+
+# bug #734350
+QA_FLAGS_IGNORED=(
+	/usr/bin/bibhva
+	/usr/bin/hevea
+	/usr/bin/esponja
+	/usr/bin/hacha
+)
+
+src_compile() {
+	rm -f config.sh || die
+
+	emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
+
+	if use ocamlopt; then
+		emake PREFIX="${EPREFIX}"/usr
+	else
+		emake PREFIX="${EPREFIX}"/usr TARGET=byte
+	fi
+}
+
+src_install() {
+	if use ocamlopt; then
+		emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	else
+		emake DESTDIR="${D}" PREFIX="${EPREFIX}"/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 [[ -z "${ROOT}" ]] && [[ -x "${EPREFIX}"/usr/sbin/texmf-update ]] ; then
+		"${EPREFIX}"/usr/sbin/texmf-update
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EPREFIX}"/usr/sbin/texmf-update ]] ; then
+		"${EPREFIX}"/usr/sbin/texmf-update
+	fi
+}
diff --git a/dev-tex/hevea/metadata.xml b/dev-tex/hevea/metadata.xml
index 7b4a61aab741..f94dff6b30ab 100644
--- a/dev-tex/hevea/metadata.xml
+++ b/dev-tex/hevea/metadata.xml
@@ -5,4 +5,7 @@
 		<email>tex@gentoo.org</email>
 		<name>Gentoo TeX Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">maranget/hevea</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 3164a2f11ae7..b660eadda890 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -10,7 +10,7 @@ AUX latex2html-tests.patch 1052 BLAKE2B 7f8e2f08d0f0dc102a08837333bfef91610075c3
 DIST latex2html-2015.tar.gz 1217699 BLAKE2B e9daea005b7674ebb6a8c5902b77b609a633515b4127a2b3fe4d1b15bc2428c02ccc024df62545d5fe63e7034ad4b1532905fee97057d49730ec27f12913c55e SHA512 dd031944250efd28691edeba5e83b4c5c0deec3a2e7c2ab2a9bd285a911f6ab21a02cd0ef697bebc2c7c7c0ebd285493c1d6b01b0db9355fc7f3316a2af65e2c
 DIST latex2html-2017.2.tar.gz 1131438 BLAKE2B 0a13cca95e1f7d8a9fd7d6b077726e083a6d33fbc712b883be46d57fbdea91d1d02a2a2f1990c5827cf2a4b9db18033f41f326af0a69770988bf4ff5e53a010a SHA512 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473
 DIST latex2html-2021.tar.gz 1130224 BLAKE2B c3775b2546a866834c0ed94362a428f2cfe48e8fe7337261993fe1f473350ddb778c50cc4393fe33c9f3829e5dc6f5c0ef43ae6a4c21481746023ef5939308da SHA512 f1f087a58911410b3ca9f4b60149b66d17608a9a56d0e8f74f08e6d6595e3e9c4f5378a7ab5cfc7488cd182a0dc3d4c151283b57636a70271c7f734e69ed0608
-EBUILD latex2html-2015.ebuild 2191 BLAKE2B bcbb054bb568d025458f35ba6c5a505bbb4bad6e351b3ec4eab6d794118e225183385659ea9e440309c1e7b0175183ad3d873056fa385bfdb59dba032c28a3ab SHA512 0c242512bc4b6d7e72f918470e2fa37ba1a6e4637395a14dd3e85e1af0f242d6fe8d3d2b2051953d130659a45f93c00252c5f2942d76692568df918a9f083c43
+EBUILD latex2html-2015.ebuild 2180 BLAKE2B 6e01142231ae58d41ce5b8e73f7d205f49a0831f77575d34030dd231ac859cb195ff0d1fbd9ea07cd633f5b00fb0d37860940037082da613d91e27ebf63ce76f SHA512 c2ce7f612ef5c58d7a1a4c8c7f052ce81a0682a2978e5246b1e8ee89839616d4acabc58f5f08b30bba86f1b4a9955e02f9a4113aa93d7480fdeb17bccba62b5c
 EBUILD latex2html-2017.2-r2.ebuild 2126 BLAKE2B 309ff6abdc1f001dad9e49a03c97e71ff9c8bc1e69f8c060aee29b0e6c575f50409631ad8e8529d031baea0e01752e4d7918c7ffe82eb4e8a1dbc22bee53d59d SHA512 5d160dafdfec73df53da68b25c780259b0023005c92293f740712b2edac4f4cad504a435346251865933c9504b911bb25015f2697e0d25229a8ce7f914119b56
 EBUILD latex2html-2021.ebuild 2025 BLAKE2B 1ae3c0f4ca12654a56c22954d7ee2052a23468d0d3e9ba58192f9c8cbba107d9e0694c8d1482fbc7b7438d16fb6f2a873562f882cc6f36da12315c80fd1b52a6 SHA512 76b157a9ba2c9d39feb8cf8c0afe2abfe499eb64024f14294ff9365f0d46060a1270ac1b1fe057a1d9c9721f24e0cf917d72acdd63af6b9156d510418ea796a2
 MISC metadata.xml 328 BLAKE2B 9e4f1e2f4b841d112f97c6ee05a9587aa7af8903565e43fbe93ea9eda6982a73e7f7b3b0d44b7708e07cbfd68acdfc44747a7d0b51dd4dcfdb9e24af55fdefe6 SHA512 fa38452beaf2043aae5e55611cc1e119589ae9245ab0e13e6e71c542b14cf9573f5ed4f1def242651e95e76aa2d5706b1a0115c2957f0642e4cfc113f443a26b
diff --git a/dev-tex/latex2html/latex2html-2015.ebuild b/dev-tex/latex2html/latex2html-2015.ebuild
index e6720670d2f2..f1632d9a8e92 100644
--- a/dev-tex/latex2html/latex2html-2015.ebuild
+++ b/dev-tex/latex2html/latex2html-2015.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
 HOMEPAGE="https://www.latex2html.org/"
-SRC_URI="http://mirrors.ctan.org/support/latex2html/latex2html-2015.tar.gz"
+SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"