summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ehmsen <ehmsen@gentoo.org>2006-06-02 18:57:50 +0000
committerMartin Ehmsen <ehmsen@gentoo.org>2006-06-02 18:57:50 +0000
commit976b9eb77f8a20ee7cc06f25b32e27e571e72849 (patch)
tree5cbf585c61a9d76dffcedd92860386f841a26c4e /dev-tex/latex2html
parentVersion bump. (diff)
downloadgentoo-2-976b9eb77f8a20ee7cc06f25b32e27e571e72849.tar.gz
gentoo-2-976b9eb77f8a20ee7cc06f25b32e27e571e72849.tar.bz2
gentoo-2-976b9eb77f8a20ee7cc06f25b32e27e571e72849.zip
Fixed the extraction of netpbms major verions number in config/config.pl, bug #122927
(Portage version: 2.1_rc3-r5)
Diffstat (limited to 'dev-tex/latex2html')
-rw-r--r--dev-tex/latex2html/ChangeLog8
-rw-r--r--dev-tex/latex2html/files/latex2html-extract-major-version.patch12
-rw-r--r--dev-tex/latex2html/latex2html-2002.2.1_pre20041025-r1.ebuild7
3 files changed, 23 insertions, 4 deletions
diff --git a/dev-tex/latex2html/ChangeLog b/dev-tex/latex2html/ChangeLog
index eb6abdc3d44b..9a2ef0dc295b 100644
--- a/dev-tex/latex2html/ChangeLog
+++ b/dev-tex/latex2html/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-tex/latex2html
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/ChangeLog,v 1.28 2006/05/23 07:40:01 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/ChangeLog,v 1.29 2006/06/02 18:57:50 ehmsen Exp $
+
+ 02 Jun 2006; Martin Ehmsen <ehmsen@gentoo.org>
+ +files/latex2html-extract-major-version.patch,
+ latex2html-2002.2.1_pre20041025-r1.ebuild:
+ Fixed the extraction of netpbms major verions number in config/config.pl,
+ bug #122927.
*latex2html-2002.2.1_pre20041025-r1 (23 May 2006)
diff --git a/dev-tex/latex2html/files/latex2html-extract-major-version.patch b/dev-tex/latex2html/files/latex2html-extract-major-version.patch
new file mode 100644
index 000000000000..7340754e5b41
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-extract-major-version.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.*\s(\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-2002.2.1_pre20041025-r1.ebuild b/dev-tex/latex2html/latex2html-2002.2.1_pre20041025-r1.ebuild
index e12baa659f96..6e346a4303c2 100644
--- a/dev-tex/latex2html/latex2html-2002.2.1_pre20041025-r1.ebuild
+++ b/dev-tex/latex2html/latex2html-2002.2.1_pre20041025-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/latex2html-2002.2.1_pre20041025-r1.ebuild,v 1.1 2006/05/23 07:40:01 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2html/latex2html-2002.2.1_pre20041025-r1.ebuild,v 1.2 2006/06/02 18:57:50 ehmsen Exp $
inherit eutils
@@ -35,8 +35,9 @@ DEPEND="virtual/ghostscript
src_unpack() {
unpack ${A}
cd ${S}
- epatch ${FILESDIR}/${PN}-convert-length.patch
- epatch ${FILESDIR}/${PN}-perl_name.patch
+ epatch "${FILESDIR}/${PN}-convert-length.patch" || die
+ epatch "${FILESDIR}/${PN}-perl_name.patch" || die
+ epatch "${FILESDIR}/${PN}-extract-major-version.patch" || die
}
src_compile() {