From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BAE641396D0 for ; Sat, 23 Sep 2017 13:54:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE1321FC172; Sat, 23 Sep 2017 13:54:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE7AC1FC172 for ; Sat, 23 Sep 2017 13:54:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 823A633C1EB for ; Sat, 23 Sep 2017 13:54:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C87DA906C for ; Sat, 23 Sep 2017 13:53:59 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1506174819.8eb4f778e7bd246e0afcd2b3b51ba4fea03c1ab2.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/latex2html/files/, dev-tex/latex2html/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch dev-tex/latex2html/latex2html-2017.2-r2.ebuild X-VCS-Directories: dev-tex/latex2html/files/ dev-tex/latex2html/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 8eb4f778e7bd246e0afcd2b3b51ba4fea03c1ab2 X-VCS-Branch: master Date: Sat, 23 Sep 2017 13:53:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6cc2d870-65dd-4256-8b8d-f0bdc20df29f X-Archives-Hash: dbeedcb5b2cd34871a40c2a49bd056f0 commit: 8eb4f778e7bd246e0afcd2b3b51ba4fea03c1ab2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Sep 23 13:53:05 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 23 13:53:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb4f778 dev-tex/latex2html: Found and fixed the last unescaped left brace. Bug 617760. Closes: https://bugs.gentoo.org/617760 Package-Manager: Portage-2.3.10, Repoman-2.3.3 .../files/latex2html-2017.2-brace-2.patch | 12 ++++ dev-tex/latex2html/latex2html-2017.2-r2.ebuild | 82 ++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch b/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch new file mode 100644 index 00000000000..533cbc0c75c --- /dev/null +++ b/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch @@ -0,0 +1,12 @@ +diff -ruN latex2html-2017.2.orig/styles/frames.perl latex2html-2017.2/styles/frames.perl +--- latex2html-2017.2.orig/styles/frames.perl 2017-01-23 18:14:25.000000000 +0100 ++++ latex2html-2017.2/styles/frames.perl 2017-09-23 15:49:27.184088195 +0200 +@@ -706,7 +706,7 @@ + $_[0] =~ s/<(META NAME|LINK)[^>]*>\s*//g; + $_[0] =~ s/$more_links_mark/$NO_ROBOTS\n$LATEX2HTML_META/g; + local($savedRS)=$/; $/ = ''; +- $_[0] =~ s/\n{2;}/\n/sg; ++ $_[0] =~ s/\n\{2;}/\n/sg; + $_[0] =~ s/\s$//s; + $_[0] =~ s!\s*(\n\n)\s*!$1!s; + $/ = $savedRS; diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild new file mode 100644 index 00000000000..68f635740cb --- /dev/null +++ b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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="http://www.latex2html.org/" +SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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}"-{destdir,tests}.patch + "${FILESDIR}/${P}"-dotinc.patch + "${FILESDIR}/${P}"-dotinc-2.patch + "${FILESDIR}/${P}"-brace.patch + "${FILESDIR}/${P}"-brace-2.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="${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 +}