[dev-tex/latex2html] Fix netpbm version detection

(Portage version: 2.1.9.41/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

4 files changed, 34 insertions, 16 deletions

diff --git a/dev-tex/latex2html/ChangeLog b/dev-tex/latex2html/ChangeLog
index 38201c2..55e71cb 100644
--- a/dev-tex/latex2html/ChangeLog
+++ b/dev-tex/latex2html/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 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 $
 
+  25 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/latex2html-extract-major-version-2.patch,
+  latex2html-2008-r1.ebuild:
+  Fix Netpbm version detection
+
 *latex2html-2008-r1 (25 Feb 2011)
 
   25 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index f7b02af..cec764f 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -3,28 +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 2570 RMD160 91592af55cfc006d55f082d9a39e78944be653e5 SHA1 d5b396135a1bbacaede5447487851b999e3c3da9 SHA256 556eef1ca0fd528cfad7228258734ea391f64a74e3096e716fa78283dc15989c
+EBUILD latex2html-2008-r1.ebuild 2572 RMD160 089cbdc6438f0b5ad34ae8141fe086a4b55ed416 SHA1 b263a6a9b7919c7c68f7d915f680b800d34ef45c SHA256 982ae0c7a4fdaca47986751146120fa9446139725cc77d5c955096d5d16d7513
 EBUILD latex2html-2008.ebuild 2487 RMD160 ec0f095141a9039a46a47cd68a9dc3462c8ca4ac SHA1 e04e85ca9c485121ff90a3c069f69384fc01cb84 SHA256 0035339821254b0418e9daeb10c38bcedbd1570a5ae355828d747e2adad2c1b3
-MISC ChangeLog 9445 RMD160 045ee462864de5389608b7914f9c433af1851716 SHA1 2d2fecffbf2914b28792ed89319b958f2e4a8998 SHA256 c01e90243e20798cea74bbd6be0923f2eb7a6d35468ea1fac0c005532bb536b3
+MISC ChangeLog 9614 RMD160 b843eb82740515b909a8507c35df19cdbf221216 SHA1 ed5f696aace1dfe2310e7c1a7de88d9c16a5f705 SHA256 9fb6875b5675d60b012f348bc14c57f79b3734a895438d81a23e66e4ec053a7f
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNZ3C7AAoJENwGBM22xffeCd0P/3kBHXxDZ+4OZlVlTKB1Dk7X
-upMev3TL6zFPaP1L+FRMpEM73SC0jZwyEgN44jILdVD1eyQ7J8FCDFXAOWG65Sby
-xiaxrzkIshxj4P8enDlE+AfTvzMrR5WVOht2xbZoft/yJdFpeG6f0gPf4UdDs76Y
-HU2ayfvpZ4fu1sspe+V8o/VRxRjeLCkzFnhJVOE3ZIe1A5vfsriPWleHC4LXc6GC
-HOo9ej/J8wDih8bQDZn7BEiMkGyPyvX47YnV+unSDH1gVAds4VRjGnTXbdlIisUj
-hYGcM1gFjeZ0b2bJ2FNXcnd5WrhmRLmVMGfJYoXNlF+f6tNLSt3DDmEqcRTAL6SB
-9omwoH9rjGJ07REdaUUP9mOdAhMG5wwYiVyEXjXmci3teavUE7u1ee0HOmhdKbOw
-PcmZs80g1IouWz0Ab/yClGOQtqcb6P3WbxbpP5iq2MJPVJrAsgAvu6sStXYVpfCR
-YYMw+yPZW1rl5lzDUQSMWrQuSk0a7vaw+FiZ1r5wFejgPMjYzTquGUal/dCeJ2tQ
-4+hvvNZjFIJiZAj8YjVxY3GcFMV7iWnOcoD0XmJMMM2UizxUGZ2PuFys0i9F4bS9
-epndp6whYBM0OlKtUzEV5pAa5Tgi4m+rBw2J1nkpP+oMr4VrAT++QMiNy9h52T7E
-vR2ovtYy+0D9oxF+sIMR
-=2TDw
+iQIcBAEBAgAGBQJNZ7ORAAoJENwGBM22xffelrUP/jkpWW3ZfEw2OB2wCRuIrDKW
+X7IkTTfhwsN6is5uBDdnJc+OSUkb7v+wUA8C1TS6+udK58LksSQgfjfOXDKWme5R
+nmArh+EcIWxY0KC155WgyrQ7yXoRa0WISgltJe/c3nljOYPdI2FqpZuGyVkKpRDV
+kANX+fNypCwmXsl5IK4jaXpX10pLZkXrI/2c5UBSd0W03pDVqE2Ss2h/tT4F0ooZ
+8ytYoS0/ekjBHweSkbTfgF0yEBiboH63FhFd9GjZatW8vmbZEFKAprkAGKf4xGSa
+vIyXoOx15hk5E/J3XoEersQyoy6zDOE55Zlu1bdhNca3SNq0COLijmKIUxeXCgko
+bcBi4YW+zvFBy2PGnHG/TZTwEn5MyR4QENmmCUjIKLFmoa3v4E4ZUlxu0ZNoDomL
+2hzTh9ah1afR8t/M/RB3AHztnECG7MGsVjd8ACamRhDAU2fH+vd2M527BEtjeGkA
+gofO5AFAp5Nu9vm74DcFgsvfWqB3hOJl1lDegZjVIctqMHYn3BEsUYGjqYVU51Bd
+9ZsQgI89iS0hh4RHPE23GSZAHL45+nEgG6GYMErcv6f1SfEMSQsj3BPj5SKok8yy
+J6lXPsRjgWFkDAv8k3iuVIYQbH/RYgXWqBqICk2HQXJIyLQ/lW9Ont2ic4+H40GP
+PiGoOtb6alO88sEQNjFo
+=qTWI
 -----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 0000000..11b6685
--- /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
index 77b5f41..7ec921d 100644
--- a/dev-tex/latex2html/latex2html-2008-r1.ebuild
+++ b/dev-tex/latex2html/latex2html-2008-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="app-text/ghostscript-gpl
 	png? ( media-libs/libpng )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}"-{convert-length,perl_name,extract-major-version,destdir}.patch 
+PATCHES=( "${FILESDIR}/${PN}"-{convert-length,perl_name,extract-major-version-2,destdir}.patch 
 	"${DISTDIR}/${PN}"-match-multiline.patch.bz2 )
 
 src_prepare() {