Add match-multiline patch from Debian (author: Roland Stigge <stigge@antcom.de>) to support newer perl versions; fix Netpbm version detection

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

4 files changed, 124 insertions, 7 deletions

diff --git a/dev-tex/latex2html/ChangeLog b/dev-tex/latex2html/ChangeLog
index b0efd1004fd5..4645c0a62b78 100644
--- a/dev-tex/latex2html/ChangeLog
+++ b/dev-tex/latex2html/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-tex/latex2html
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/ChangeLog,v 1.52 2010/06/12 12:31:43 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/ChangeLog,v 1.53 2011/02/25 13:56:46 dilfridge Exp $
+
+*latex2html-2008-r1 (25 Feb 2011)
+
+  25 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/latex2html-extract-major-version-2.patch,
+  +latex2html-2008-r1.ebuild:
+  Add match-multiline patch from Debian (author: Roland Stigge
+  <stigge@antcom.de>) to support newer perl versions; fix Netpbm version
+  detection
 
   12 Jun 2010; Alexis Ballier <aballier@gentoo.org> latex2html-2008.ebuild:
   do not try to sed a file that does not exist when use=-gif -png is used,
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index a15ceb9d1318..9f1dcbf98b32 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -3,16 +3,29 @@ Hash: SHA1
 
 AUX latex2html-convert-length.patch 1148 RMD160 0f73d986180941697e4ee18d85b586247fc2d7e1 SHA1 67436ec0f2b7d3cca6312c00e4808907701ab5ee SHA256 aaf0e7b7ef3e37790da12fac5e92d87323c6f8041d7fd3c205ee3c96df83401e
 AUX latex2html-destdir.patch 703 RMD160 2b08bb440c4aacd3b23a05cb34d56597de8fd2a5 SHA1 eae4695aa812c927060004db9fd958c7a0d0d0b8 SHA256 e2dad7784064b12c17ba9530eb54f706d057c5b399538ee1928ca38005f860e1
+AUX latex2html-extract-major-version-2.patch 640 RMD160 4387f8be95b66cd11adde6df7d1be9597653047f SHA1 fd991e937ed2de9ada9aa056422ed001caecdad0 SHA256 2853223713f4c4f3b3497cbee98904299442947ede5c35d9cdffe43b1fb6e12f
 AUX latex2html-extract-major-version.patch 635 RMD160 5bfc884c149a19f9f3f3608b48e77c9106edd8e0 SHA1 8c3ff25c41f68e1cafe9ba580f3f38d8b1fa28f3 SHA256 265327a28fdbec750a32fc32999625ef254ec80736f170e645e1355d51df5c04
 AUX latex2html-perl_name.patch 445 RMD160 6f93bdc394f8c240542cd6a224864c3b4b27420d SHA1 3fd8480e23e3c06b8cb9876cc82a42b61e21386b SHA256 41dcf9d9b46691c34bddbae39faccbfeadf6beb2e19a4ac18af4a186758289c9
 DIST latex2html-2008.tar.gz 1133054 RMD160 a95f06253d6fc8808ffedcad7edf8235194d7756 SHA1 5e0aa47572e0c13a4c5da51e963d5496be3f86e7 SHA256 59456815a3984250c295d3d5c46b85646038db8db2735cdc0d3780cf4da337ad
+DIST latex2html-match-multiline.patch.bz2 8147 RMD160 5fcde7efd354356b8eee907393ff949b393b38ba SHA1 dfcb4520ea7318409b2130192822a437818fe9cc SHA256 fa4c74b1e6ef3fc337485b7940922aaa1aed0c33a533e75f4a97503547f4570e
+EBUILD latex2html-2008-r1.ebuild 2574 RMD160 c37bdfbc2c9a0b69303903e93e3a580292f836ab SHA1 5e18c87954667940553d1bcfc974570c65e84a0c SHA256 752963dc96ad7a1ecb7b1560f4e297e48a58a4e306e3a84c8045888da09b3bbb
 EBUILD latex2html-2008.ebuild 2487 RMD160 ec0f095141a9039a46a47cd68a9dc3462c8ca4ac SHA1 e04e85ca9c485121ff90a3c069f69384fc01cb84 SHA256 0035339821254b0418e9daeb10c38bcedbd1570a5ae355828d747e2adad2c1b3
-MISC ChangeLog 9206 RMD160 192628105b51b16f370efe9426c71b823def19bc SHA1 50d50c96fc0f1583c240bfd2c1cd68e991a63f84 SHA256 6b57516b1df4927b538cd65dfb405c59aef8560d14189a1a4cc5a56bcf8546be
+MISC ChangeLog 9529 RMD160 aa41b3a900c64ed66c954038b940493f26332d01 SHA1 4a8048d3063f15267b24ee0f0c6add93fbea6db2 SHA256 0024e89c46c60e6708336aaeda41378837018c92c85d1add63e8e5669e80c999
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkwTfjQACgkQvFcC4BYPU0rU8ACeL6tE4Ra7dZj2j/elnnW9Fnpe
-1cAAn1N6jaAkeYV58IeSaLPSQGZGxnta
-=8OLF
+iQIcBAEBAgAGBQJNZ7VeAAoJENwGBM22xffeNkIQAKMs5ZJRd1tmZhGByxmxwznQ
+1XYYr7cAiPQ54C9BVIxgnVkgEsKsX1G20sp4H8gKDQD0obcqpSqFx3yCkZ54lt5/
+N0hQfi/cvm8rUkFsVz5CRb1TWMclhfzczPRyWMh1ONycv2ynNVgmTtovyh1qzuva
+d3KU4tB0JfW3F5QozzkEErUET7+Z4kB48WBrzvS6Twj6FWSG8gR+28RtPjF2OqPA
+TK6ySnp72Bhap6ExHX76LaWZZzmBVYd+CE0bX22QBwriaCJRcl5OR3xo5QcLGUPt
+KeNNnhNIlb/e71ZWdd8N2SLZ6Nn1jSa+1WsP5UGVBhzynVyJfQ9DA/xepGwncPL6
+4WyQrwkpNBp+KHFj/fYCA8GUl6zgsn69ftXo5cjh015doz5qEVERvXZFbWIO5jvn
+SPEL+B+uXhZbFFqp3T41q0VM0ksl5pt1redTyyJTFXNeDKQDREJo/j9CSkDdiliL
+pV0Y5A5JRT9sqT3/14aYnqX5+81Cn3Oja4pIoUMOwscw7Hn4mM5/2ZFk2EPsB+gE
+ZfQK9Nyf5oTgWp9FcAoyobmB95APzVLoLsIVI4xJlCyRpr5A5l7LZ04PTnDOokRY
+pLaSXO65zf8fclBvnLFOn7ZaBhk3Hjs/CJXd8D7sJ7902WIO50zEjUWe9YX1pAUW
+AS0+cofdJImdAcYI2j3B
+=WJSI
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/latex2html/files/latex2html-extract-major-version-2.patch b/dev-tex/latex2html/files/latex2html-extract-major-version-2.patch
new file mode 100644
index 000000000000..11b6685385ec
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-extract-major-version-2.patch
@@ -0,0 +1,12 @@
+diff -urN latex2html-2002-2-1.orig/config/config.pl latex2html-2002-2-1/config/config.pl
+--- latex2html-2002-2-1.orig/config/config.pl	2006-06-02 20:41:18.000000000 +0200
++++ latex2html-2002-2-1/config/config.pl	2006-06-02 20:42:07.000000000 +0200
+@@ -1275,7 +1275,7 @@
+     ($stat,$msg,$err) = &get_out_err("$pnmcrop -version");
+     my $vers = '';
+     $msg = $msg || $err;
+-    if ($msg =~ /(^|\s*)Version.*\s([\d\.]+)\s*([\n\r]|$)/is) { $vers = $2; }
++    if ($msg =~ /(^|\s*)Version: Netpbm (\d+)\..*\s*([\n\r]|$)/is) { $vers = $2; }
+     if ($vers =~ /^199/) {
+ 	# try left crop
+ 	&checking('if pnmcrop can crop from one direction');
diff --git a/dev-tex/latex2html/latex2html-2008-r1.ebuild b/dev-tex/latex2html/latex2html-2008-r1.ebuild
new file mode 100644
index 000000000000..3098d8265833
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2008-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/latex2html-2008-r1.ebuild,v 1.1 2011/02/25 13:56:46 dilfridge Exp $
+
+EAPI=4
+
+inherit base eutils multilib
+
+DESCRIPTION="convertor written in Perl that converts LATEX documents to HTML"
+SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${P}.tar.gz
+	http://dev.gentoo.org/~dilfridge/distfiles/${PN}-match-multiline.patch.bz2"
+HOMEPAGE="http://www.latex2html.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+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 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-{convert-length,perl_name,extract-major-version-2,destdir}.patch
+	"${DISTDIR}/${PN}"-match-multiline.patch.bz2 )
+
+src_prepare() {
+	base_src_prepare
+
+	# Dont install old url.sty and other files
+	# Bug #240980
+	rm -f texinputs/url.sty texinputs/latin9.def || die "failed to remove duplicate latex files"
+}
+
+src_configure() {
+	local myconf
+
+	use gif || use png || myconf="${myconf} --disable-images"
+
+	econf --libdir=/usr/$(get_libdir)/latex2html \
+		--shlibdir=/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath=/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc BUGS Changes FAQ LICENSE.orig MANIFEST README* TODO
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	einfo "fixing sandbox references"
+	# pstoimg isn't built unless gif or png useflags are enabled
+	{ use png || use gif ; } && sed -i -e "s:${T}:/tmp:g" "${D}/usr/$(get_libdir)/latex2html/pstoimg.pl"
+	sed -i -e "s:${S}::g" "${D}/usr/$(get_libdir)/latex2html/latex2html.pl" || die
+	sed -i -e "s:${T}:/tmp:g" "${D}/usr/$(get_libdir)/latex2html/cfgcache.pm" || die
+	sed -i -e "s:${T}:/tmp:g" "${D}/usr/$(get_libdir)/latex2html/l2hconf.pm" || die
+}
+
+pkg_postinst() {
+	einfo "Running ${ROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${ROOT}"usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	einfo "Running ${ROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${ROOT}"usr/bin/mktexlsr
+}