gentoo resync : 03.07.2021

6 files changed, 48 insertions, 107 deletions

diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index e9394b82c8e8..fa2df6462248 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -2,15 +2,14 @@ AUX latex2html-2017.2-brace-2.patch 561 BLAKE2B a7e3a26af1e3ebdf0f564cc0f0047f56
 AUX latex2html-2017.2-brace.patch 1402 BLAKE2B 30142f799ba70526f1e46ba5b3ee1c201aa4a36ba76d83c48102d255481f2eba10e9156e1ec992a1dc75d334220e3dd1d0a3fcf56b280246d3ceb3bc1cc2799e SHA512 f138757d62cd047452377f67276bb385c37636352db575ae8da8debd0586d6f9620902505dba2809d77eb28eef670f463b38d7450f63cdc19711090487cbd2f7
 AUX latex2html-2017.2-dotinc-2.patch 499 BLAKE2B 54e08cb79ff1eba0382f1d7c4b01e733e1c447b2fbd315782d4a6a38e1822a5798b355534e7bc5d1cff9e7591de498a5815c74456f44191cf3fd7632f3955382 SHA512 370511bbfbb1c62f0b18d73129b51a726c29e79793aea0324f27a1ddd5ced00df0b6e2799a70f7b31b8b7939bf00b81c0f1d57605ecddf4d02f8c186748ac666
 AUX latex2html-2017.2-dotinc.patch 1130 BLAKE2B 0587124ff83a8ab9a360d490da31f031b9ac5ccfdf67194a718110dd63a2e4e8bcfa30b53deb4248dcd5dd2f48e231734462e5b69d7c69e37876bc9ab5f39ed4 SHA512 a9dfcbe11501cc6a1d61eb435a690c9c06ab200dcccf55477d35f76614a0a1c7da713664408b9c06a49c44f46a7f80eaad385cb8fb1f4135172157fac9de5ae6
+AUX latex2html-2021.2-respect-DESTDIR.patch 759 BLAKE2B e44fa0a31c248a55a1da9d266be58ebf3f5397eb94010ed0b983948bdb1c621b876e30563ca620bacc396fdfd13a9887eded024e66ce48943e229a34bd45f126 SHA512 4cee9df8f8e796901aeb4d240c7631a3b5bd74b65abf5f39e44778474e656f580877766220eb67165cd9358ba701acb51d94de17cc7946b833128c1447956e98
 AUX latex2html-convert-length.patch 1148 BLAKE2B 1cea0bbb84ca6729ece192491997a146183cadd77b90b5520c4ff3a4eed96f6694f627dcf48965740b5bad3f9724428987662ef212fb0b1ed31c1f91d675c028 SHA512 f5bb3c29006e783728915d0761cbae4b0fddd65aa323749f9459ccf439d6896fd96c3608c2984868bb82be2ff390a6fe39933f01d3b12c94d50d61824f6368e1
 AUX latex2html-destdir.patch 703 BLAKE2B 47693763782d056eef223856a679112fe0989379e589f0b9d891f7dcd6b2b316de7a5d631c0b089709122d844f08ae268cb496055726abcee01ffece268640e8 SHA512 dbc4e9272ed54949fa34da8fd4b0e15db646461ef564e65d7b4a20dd89425227b93987a2a214ec57984b200135085b6456d758efd2faffd89c16d305d315d744
 AUX latex2html-extract-major-version-2.patch 640 BLAKE2B 2a839b05f7c7c0035b69d439e8818aea9c63f741e3d49b4a366c32b3999af70c689ffcb378d2daee99ad0cd922ab316e87220eabe217e897e1579edd29c4a506 SHA512 924fc8212250b20a4dea15e9588376d067740966174268e10922edb59da8be6f5095411570f06610593e5c0ffe54d3340e10a6f8050f4966ba29dbf5c12f3dc9
 AUX latex2html-perl_name.patch 445 BLAKE2B 5393870cd3c090c03c790235e36a255cf4d066a2a941500fa971f09403e02af4e2fcedb217aaf0bf42f1fbc8c46c72067e805e9debd81176dab3a7ad255337e1 SHA512 2f20147e0c4c5818f1e3843e3f7176ce84d332d2b3f3266cf86e4b4432c72ce626110805613b5f8f9f72b44332a532a203d1e4b091f9b447ec1bfda23585b6db
 AUX latex2html-tests.patch 1052 BLAKE2B 7f8e2f08d0f0dc102a08837333bfef91610075c316831721ea97f1efa3c65649c2efc61c071560621efe93e2789b5b9ee6b28080b56278a83c5dcd7f1dc106fe SHA512 b3c17ded5c45526f114c8bfdc9bc348e41d3297da377b99af2d0507f953b828d362ec9bdcf166677646b6350a7900f073ea7896dcdd7d3e6f7b265274ffaaeda
-DIST latex2html-2015.tar.gz 1217699 BLAKE2B e9daea005b7674ebb6a8c5902b77b609a633515b4127a2b3fe4d1b15bc2428c02ccc024df62545d5fe63e7034ad4b1532905fee97057d49730ec27f12913c55e SHA512 dd031944250efd28691edeba5e83b4c5c0deec3a2e7c2ab2a9bd285a911f6ab21a02cd0ef697bebc2c7c7c0ebd285493c1d6b01b0db9355fc7f3316a2af65e2c
-DIST latex2html-2017.2.tar.gz 1131438 BLAKE2B 0a13cca95e1f7d8a9fd7d6b077726e083a6d33fbc712b883be46d57fbdea91d1d02a2a2f1990c5827cf2a4b9db18033f41f326af0a69770988bf4ff5e53a010a SHA512 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473
+DIST latex2html-2021.2.tar.gz 1139791 BLAKE2B 4fa9b45a33dbfb5c9e3bb45ebab19edb5d7a1d9c882ab30e75afbda7ad902cf519403b685f1f30b69b3d6ec976aa72b3065851b6d24b00c2e626e496ea8afd79 SHA512 b8d742b427e833f732457194cc60c043f750d202c46fb0d1d4e46df8e6d4dabacb5b474084aec46aa4eed68ee0249f3c0b053b5446401d09034e7f59148ad18a
 DIST latex2html-2021.tar.gz 1130224 BLAKE2B c3775b2546a866834c0ed94362a428f2cfe48e8fe7337261993fe1f473350ddb778c50cc4393fe33c9f3829e5dc6f5c0ef43ae6a4c21481746023ef5939308da SHA512 f1f087a58911410b3ca9f4b60149b66d17608a9a56d0e8f74f08e6d6595e3e9c4f5378a7ab5cfc7488cd182a0dc3d4c151283b57636a70271c7f734e69ed0608
-EBUILD latex2html-2015.ebuild 2180 BLAKE2B 6e01142231ae58d41ce5b8e73f7d205f49a0831f77575d34030dd231ac859cb195ff0d1fbd9ea07cd633f5b00fb0d37860940037082da613d91e27ebf63ce76f SHA512 c2ce7f612ef5c58d7a1a4c8c7f052ce81a0682a2978e5246b1e8ee89839616d4acabc58f5f08b30bba86f1b4a9955e02f9a4113aa93d7480fdeb17bccba62b5c
-EBUILD latex2html-2017.2-r2.ebuild 2126 BLAKE2B 309ff6abdc1f001dad9e49a03c97e71ff9c8bc1e69f8c060aee29b0e6c575f50409631ad8e8529d031baea0e01752e4d7918c7ffe82eb4e8a1dbc22bee53d59d SHA512 5d160dafdfec73df53da68b25c780259b0023005c92293f740712b2edac4f4cad504a435346251865933c9504b911bb25015f2697e0d25229a8ce7f914119b56
-EBUILD latex2html-2021.ebuild 2018 BLAKE2B e0719f87e4dc281e624244d86451819abd74043ec40ac0886e70690a9fb0c4bdd1f2efa81c5a651ef67517884ba9515fc7184c5a4884680229672b36c5108dc9 SHA512 7183307a2639ec03c0d1853d3b45349bf9b85d2d9fdbfc50e68857d672ae8115f061e63c54894712bc53e4e0790f2fb5a9c236ea9d26e8b714478c51ec05ceec
-MISC metadata.xml 328 BLAKE2B 9e4f1e2f4b841d112f97c6ee05a9587aa7af8903565e43fbe93ea9eda6982a73e7f7b3b0d44b7708e07cbfd68acdfc44747a7d0b51dd4dcfdb9e24af55fdefe6 SHA512 fa38452beaf2043aae5e55611cc1e119589ae9245ab0e13e6e71c542b14cf9573f5ed4f1def242651e95e76aa2d5706b1a0115c2957f0642e4cfc113f443a26b
+EBUILD latex2html-2021.2.ebuild 2028 BLAKE2B 2190991b5f9532e99f38907cf49f0162d67bece52c2adbc5bae7ee5676d321e9a866ccd57997a77b4f1842d51647b9671517108c64f553f3e192e2d0f0344d9a SHA512 9f447df22f2bf15f6d14de7ba234ff508a07dc1434aeaaa77d6b4c8a4842a96603ce78b7b0567cc2a56451e15fda13267f4b5b1cbdeb346ad359cd395c5649e7
+EBUILD latex2html-2021.ebuild 2018 BLAKE2B ab991b45083b57b126b6a02ee68c6ff631466e223502b9135e0e55abf87eed4772ecdb5686b0184e46629c30e96e0bf374b520d159b98c91fa0b7fc4b6f444a2 SHA512 396be78bd9ff43572f806cd2cd3f0ae7ab6eeca3eb4c1513c8ff35c480f5701a2733ef6f4a80cd0b506c845f45e3fe575cf53196469d42ec9de9b6f6b0b43e0d
+MISC metadata.xml 342 BLAKE2B 284d5c6f1d83f7613d37e72bf380f958fb448da239b0959f832a65810aa17b04e97477dccbda4328be970b5cc4c53653fcc971b4f99a09c80ff16d3ea1cb1a0c SHA512 4ce21b15cba1eae5e358022b19426e04a7e92b4185f19a95834f398cf107ee6a27f87f8b1ceccd38463dab6257a38ceac2232bbcff2d6ed95b5ecf71ec6841a4
diff --git a/dev-tex/latex2html/files/latex2html-2021.2-respect-DESTDIR.patch b/dev-tex/latex2html/files/latex2html-2021.2-respect-DESTDIR.patch
new file mode 100644
index 000000000000..8ddd83d594df
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-2021.2-respect-DESTDIR.patch
@@ -0,0 +1,24 @@
+From 263eb47193ff9b0bd987b7f72eb7b331b96f9f96 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 3 Jul 2021 02:50:53 +0100
+Subject: [PATCH] Respect DESTDIR
+
+---
+ config/install.pl | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/install.pl b/config/install.pl
+index d732176..678eaa6 100755
+--- a/config/install.pl
++++ b/config/install.pl
+@@ -376,6 +376,7 @@ if($cfg{TEXPATH}) {
+     print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n     ($cfg{TEXPATH})\n";
+     my $dir = 'texinputs';
+     my $dest = $cfg{TEXPATH};
++    $dest = $ENV{'DESTDIR'}.$dest if($ENV{'DESTDIR'});
+     unless(opendir(DIR,$dir)) {
+       print STDERR qq{Error: Could not read directory "$dir": $!\n};
+     } else {
+-- 
+2.32.0
+
diff --git a/dev-tex/latex2html/latex2html-2015.ebuild b/dev-tex/latex2html/latex2html-2015.ebuild
deleted file mode 100644
index f1632d9a8e92..000000000000
--- a/dev-tex/latex2html/latex2html-2015.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~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
-	dev-lang/perl
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng:0 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-{convert-length,perl_name,extract-major-version-2,destdir}.patch )
-
-src_prepare() {
-	default
-
-	# Dont install old url.sty and other files
-	# Bug #240980
-	rm texinputs/url.sty texinputs/latin9.def \
-		|| die "failed to remove duplicate latex files"
-
-	sed -i -e 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
-}
-
-src_configure() {
-	local myconf
-
-	use gif || use png || myconf="${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 TODO
-}
-
-pkg_postinst() {
-	"${EROOT}"/usr/bin/mktexlsr
-}
-
-pkg_postrm() {
-	"${EROOT}"/usr/bin/mktexlsr
-}
diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2021.2.ebuild
index e1f125f80d8f..1751e8b25cae 100644
--- a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2021.2.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
+DESCRIPTION="Convertor written in Perl that converts LaTeX documents to HTML"
 HOMEPAGE="https://www.latex2html.org/"
-SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
+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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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
+DEPEND="
+	app-text/ghostscript-gpl
 	virtual/latex-base
 	media-libs/netpbm
 	dev-lang/perl
@@ -21,11 +22,7 @@ DEPEND="app-text/ghostscript-gpl
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}"-{destdir,tests}.patch
-	"${FILESDIR}/${P}"-dotinc.patch
-	"${FILESDIR}/${P}"-dotinc-2.patch
-	"${FILESDIR}/${P}"-brace.patch
-	"${FILESDIR}/${P}"-brace-2.patch
+	"${FILESDIR}"/${PN}-2021.2-respect-DESTDIR.patch
 )
 
 src_prepare() {
@@ -37,9 +34,10 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	use gif || use png || myconf="${myconf} --disable-images"
+	use gif || use png || myconf+=" --disable-images"
 
-	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
 		--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
 		--enable-pk \
 		--enable-eps \
@@ -66,6 +64,7 @@ src_install() {
 		# 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
diff --git a/dev-tex/latex2html/latex2html-2021.ebuild b/dev-tex/latex2html/latex2html-2021.ebuild
index 14c4026ae554..8822f882bc9d 100644
--- a/dev-tex/latex2html/latex2html-2021.ebuild
+++ b/dev-tex/latex2html/latex2html-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
+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"
 
diff --git a/dev-tex/latex2html/metadata.xml b/dev-tex/latex2html/metadata.xml
index a48e54dd0e00..3c572e23aaba 100644
--- a/dev-tex/latex2html/metadata.xml
+++ b/dev-tex/latex2html/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">latex2html/latex2html</remote-id>
-</upstream>
+		<maintainer type="project">
+			<email>tex@gentoo.org</email>
+			<name>Gentoo TeX Project</name>
+		</maintainer>
+		<upstream>
+			<remote-id type="github">latex2html/latex2html</remote-id>
+		</upstream>
 </pkgmetadata>