gentoo resync : 13.11.2021

6 files changed, 120 insertions, 9 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index c5af064164bd..41532776888f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/ivritex/Manifest b/dev-tex/ivritex/Manifest
index 29ea353e255c..feacb955da58 100644
--- a/dev-tex/ivritex/Manifest
+++ b/dev-tex/ivritex/Manifest
@@ -1,3 +1,3 @@
 DIST ivritex-1.1.2.tar.gz 578083 BLAKE2B 84169306b840990176fc868c99bdbc0ca4066e0d1d7b36e6f224d13b446dc5cda7be3af515866f9a739187f581c2392cf651aa5ce2ad36793efebe2c18c7f3fd SHA512 12550ad35bd4a6742159c2e3c8810f3b3f5ab6d93e3b454a028b3cce1a5c3c8a74f53af95df2932f60f2de2573c51895ceaa574f3d4a6301f844008247ea26be
-EBUILD ivritex-1.1.2.ebuild 510 BLAKE2B d22c5a50be5fd9201c1ebe2099ba3ca0ca6fa110c5cecdce0c2c18ca2900062f110893787e91728fb5bc1a0b6f164559c2b28f7ed18e2f0368706d88881cfa2a SHA512 f63fa2d489fd9e66f13336a3278f99c524e05c62e106053f5c7ad0e8714d1a16b851d186b118e06cc59c131750d0f6d3c5718786d374f3325724c78de0a5d9fc
+EBUILD ivritex-1.1.2.ebuild 470 BLAKE2B b16a9ef252aed511ac8db6e4ae1483b042b7d5f0e84732300e0b53e74a98ba41419d5e281166910c1b0aa8c9825eb94384eb14a4deb16013f5981a67706774f5 SHA512 01e2b43588c6289429864ea643c35d17b2755dc887a7341fd5bb0733aaa84a1f6d3a910e6685f39d8260798f0fc617587c2f7ef011283b447161fa8a1ab14fbb
 MISC metadata.xml 327 BLAKE2B 1202e6b94e9305acffe4304a3a2834edb30da4547af21159573ce4b393e8c53df1726b7c14b775cb3dc6c7511e0ebbf98f180d8c1d1694e5ab9586f74eeeea62 SHA512 179d41b9c8854ade0ac272fd0c08d3c7d7bf78dcf6a32d652d73d90f26232206dc515172dcfbf50afda0bc380829a77013e4681f4b2fc13f5a8674d2527b26d4
diff --git a/dev-tex/ivritex/ivritex-1.1.2.ebuild b/dev-tex/ivritex/ivritex-1.1.2.ebuild
index 7556a29e83f2..6b51f262a846 100644
--- a/dev-tex/ivritex/ivritex-1.1.2.ebuild
+++ b/dev-tex/ivritex/ivritex-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,17 +9,13 @@ DESCRIPTION="Hebrew support for TeX"
 HOMEPAGE="http://ivritex.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ivritex/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-RESTRICT="mirror"
-
 LICENSE="LPPL-1.2"
 SLOT="0"
-IUSE=""
-DEPEND=""
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+RESTRICT="mirror"
 
 src_install() {
 	export VARTEXFONTS="${T}/fonts"
 
-	make TEX_ROOT="${D}"/usr/share/texmf install || die "make failed"
+	emake TEX_ROOT="${D}"/usr/share/texmf install
 }
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 7f1239bb0667..54109749dadf 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -1,7 +1,9 @@
+AUX latex2html-2021.2-fix-PNMCROPOPT.patch 1013 BLAKE2B 5c8f19d04bc08eced98c02811dbab0db4401415f48b44ce95f13e1a2ecb21557fca21c840e7f9285a0f7f50a1cd1e117d0e0ebf749c7c1d60a42f75d06b3eb5b SHA512 a2240315404fb29817ef7d1b6545cc9c4540d470e60f287cf82eca08517b8e5a59f4a433ddb472809b2016847158c786037c9b3cbc2725cc10ae88d3b594f593
 AUX latex2html-2021.2-respect-DESTDIR.patch 759 BLAKE2B e44fa0a31c248a55a1da9d266be58ebf3f5397eb94010ed0b983948bdb1c621b876e30563ca620bacc396fdfd13a9887eded024e66ce48943e229a34bd45f126 SHA512 4cee9df8f8e796901aeb4d240c7631a3b5bd74b65abf5f39e44778474e656f580877766220eb67165cd9358ba701acb51d94de17cc7946b833128c1447956e98
 AUX latex2html-destdir.patch 703 BLAKE2B 47693763782d056eef223856a679112fe0989379e589f0b9d891f7dcd6b2b316de7a5d631c0b089709122d844f08ae268cb496055726abcee01ffece268640e8 SHA512 dbc4e9272ed54949fa34da8fd4b0e15db646461ef564e65d7b4a20dd89425227b93987a2a214ec57984b200135085b6456d758efd2faffd89c16d305d315d744
 DIST latex2html-2021.2.tar.gz 1139791 BLAKE2B 4fa9b45a33dbfb5c9e3bb45ebab19edb5d7a1d9c882ab30e75afbda7ad902cf519403b685f1f30b69b3d6ec976aa72b3065851b6d24b00c2e626e496ea8afd79 SHA512 b8d742b427e833f732457194cc60c043f750d202c46fb0d1d4e46df8e6d4dabacb5b474084aec46aa4eed68ee0249f3c0b053b5446401d09034e7f59148ad18a
 DIST latex2html-2021.tar.gz 1130224 BLAKE2B c3775b2546a866834c0ed94362a428f2cfe48e8fe7337261993fe1f473350ddb778c50cc4393fe33c9f3829e5dc6f5c0ef43ae6a4c21481746023ef5939308da SHA512 f1f087a58911410b3ca9f4b60149b66d17608a9a56d0e8f74f08e6d6595e3e9c4f5378a7ab5cfc7488cd182a0dc3d4c151283b57636a70271c7f734e69ed0608
+EBUILD latex2html-2021.2-r2.ebuild 2095 BLAKE2B 9ef98b91a4669087491f2e993ddd43f74317113b99dcdd2fa83dc1e99728f27d212b2d0629564af36748d7eca534a55d0f6b7a46ffaf0bbecce929bf8a406d60 SHA512 33dec060bc6e50225e7a3e8c7528b91be00b8f4669e67c344e2fec0969d8efee6b1dc47f5095ae1a870b5a3b698d56e21a3fcb1b0fd8c41e82b397412cd85a90
 EBUILD latex2html-2021.2.ebuild 2028 BLAKE2B 9aa1e238f2e40d53f09f8091e10a6e6957f52a9f54e9f3c6139f96fefe44bda754800da8b155f2e2afa6090869ff28ea2e806d73bc345197fb426bd2e116d184 SHA512 874fa5347f8b4358d8fb41e7b7360fe6b5919389e8a6b10bed06fbf4db6f1e876edd4275a3db610d85c73fbac0a6dbbbb96d0d3c66332f677fa76cfc7131fb5f
 EBUILD latex2html-2021.ebuild 2018 BLAKE2B ab991b45083b57b126b6a02ee68c6ff631466e223502b9135e0e55abf87eed4772ecdb5686b0184e46629c30e96e0bf374b520d159b98c91fa0b7fc4b6f444a2 SHA512 396be78bd9ff43572f806cd2cd3f0ae7ab6eeca3eb4c1513c8ff35c480f5701a2733ef6f4a80cd0b506c845f45e3fe575cf53196469d42ec9de9b6f6b0b43e0d
 MISC metadata.xml 343 BLAKE2B 558686c939b58e821fcda11117e4f65bfc6965642528ec3cf7b4e86ade37730ee8aa2ef00902893ad82c47eaeefdf5a30d96f760e21a99bc701cd1c4e83c1e15 SHA512 fb0a0f1b8f96781f5e188f9d6f1662597f3b2c3a81d1130b35790bbb5358afcf6ee7f71832ba97265220e760bca98d4c3395c1e24b7354170d22ae1f46970330
diff --git a/dev-tex/latex2html/files/latex2html-2021.2-fix-PNMCROPOPT.patch b/dev-tex/latex2html/files/latex2html-2021.2-fix-PNMCROPOPT.patch
new file mode 100644
index 000000000000..78d7bab3eeb4
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-2021.2-fix-PNMCROPOPT.patch
@@ -0,0 +1,31 @@
+From ea0ae1cf6789cf8f29bf07406ef6e91918b6bfc3 Mon Sep 17 00:00:00 2001
+From: Matthew White <mehw.is.me@inventati.org>
+Date: Wed, 10 Nov 2021 00:32:14 +0000
+Subject: [PATCH] fix pnmcrop duplicated -sides option (aka PNMCROPOPT)
+
+If the variable PNMCROPOPT is defined as "-sides" via config/config.pl
+in pstoimg.bin, calling `pnmcrop -bot -sides $PNMCROPOPT` will give an
+error, due to the duplicated option.
+---
+ pstoimg.pin | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pstoimg.pin b/pstoimg.pin
+index 2c4f3e4..588b987 100755
+--- a/pstoimg.pin
++++ b/pstoimg.pin
+@@ -1300,9 +1300,9 @@ sub crop_scale_etc {
+     my $edge = $1;
+     my $croparg = '';
+     if($edge =~ /b/i) {
+-      $croparg = "-bot -sides $PNMCROPOPT ";
++      $croparg = "-bot -sides ";
+     } elsif($edge =~ /[tlr]/i) {
+-      $croparg = "-$edge -sides $PNMCROPOPT ";
++      $croparg = "-$edge -sides ";
+     } elsif($edge =~ /s/i) {
+       #RRM: shave at most 1-2 rows of white from the bottom
+ #if @pipes@
+-- 
+2.32.0
+
diff --git a/dev-tex/latex2html/latex2html-2021.2-r2.ebuild b/dev-tex/latex2html/latex2html-2021.2-r2.ebuild
new file mode 100644
index 000000000000..cc156bda5203
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2021.2-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Convertor written in Perl that converts LaTeX documents to HTML"
+HOMEPAGE="https://www.latex2html.org/"
+SRC_URI="https://github.com/latex2html/latex2html/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="gif png"
+
+DEPEND="
+	app-text/ghostscript-gpl
+	virtual/latex-base
+	>=media-libs/netpbm-10.86.24
+	dev-lang/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng:0 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2021.2-fix-PNMCROPOPT.patch
+	"${FILESDIR}"/${PN}-2021.2-respect-DESTDIR.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
+}
+
+src_configure() {
+	local myconf
+
+	use gif || use png || myconf+=" --disable-images"
+
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	local dir="${ED}/usr/$(get_libdir)/latex2html"
+	if use png || use gif; then
+		# pstoimg isn't built unless gif or png useflags are enabled
+		sed -i -e "s:${T}:/tmp:g" "${dir}"/pstoimg.pl || die
+	fi
+
+	sed -i -e "s:${S}::g" "${dir}"/latex2html.pl || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/cfgcache.pm || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/l2hconf.pm || die
+
+	dodoc BUGS Changes FAQ MANIFEST README.md TODO
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	"${EROOT}"/usr/bin/mktexlsr
+}