Fixed the extraction of netpbms major verions number in config/config.pl, bug #122927

Package-Manager: portage-2.1_rc3-r5

4 files changed, 46 insertions, 23 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/Manifest b/dev-tex/latex2html/Manifest
index 6ca51ca0f0f2..98383f941687 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -1,33 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX latex2html-convert-length.patch 1150 RMD160 29e9c8addbc8afe3fe1409b7d74bb4d67f382c4c SHA1 9347ffb21e01d9661787f0959ccbef60e92c2dcf SHA256 f1d05a3770498237e57a22c0b7a9a1a3ef0461acd3fac26db5f1842d5b0678da size 1150
+AUX latex2html-convert-length.patch 1150 RMD160 29e9c8addbc8afe3fe1409b7d74bb4d67f382c4c SHA1 9347ffb21e01d9661787f0959ccbef60e92c2dcf SHA256 f1d05a3770498237e57a22c0b7a9a1a3ef0461acd3fac26db5f1842d5b0678da
 MD5 927d08ce301ae5a9ecc9fd04cd84bb07 files/latex2html-convert-length.patch 1150
 RMD160 29e9c8addbc8afe3fe1409b7d74bb4d67f382c4c files/latex2html-convert-length.patch 1150
 SHA256 f1d05a3770498237e57a22c0b7a9a1a3ef0461acd3fac26db5f1842d5b0678da files/latex2html-convert-length.patch 1150
-AUX latex2html-perl_name.patch 445 RMD160 6f93bdc394f8c240542cd6a224864c3b4b27420d SHA1 3fd8480e23e3c06b8cb9876cc82a42b61e21386b SHA256 41dcf9d9b46691c34bddbae39faccbfeadf6beb2e19a4ac18af4a186758289c9 size 445
+AUX latex2html-extract-major-version.patch 635 RMD160 5bfc884c149a19f9f3f3608b48e77c9106edd8e0 SHA1 8c3ff25c41f68e1cafe9ba580f3f38d8b1fa28f3 SHA256 265327a28fdbec750a32fc32999625ef254ec80736f170e645e1355d51df5c04
+MD5 4ad680f892b188dfc2e1edbfa5a298de files/latex2html-extract-major-version.patch 635
+RMD160 5bfc884c149a19f9f3f3608b48e77c9106edd8e0 files/latex2html-extract-major-version.patch 635
+SHA256 265327a28fdbec750a32fc32999625ef254ec80736f170e645e1355d51df5c04 files/latex2html-extract-major-version.patch 635
+AUX latex2html-perl_name.patch 445 RMD160 6f93bdc394f8c240542cd6a224864c3b4b27420d SHA1 3fd8480e23e3c06b8cb9876cc82a42b61e21386b SHA256 41dcf9d9b46691c34bddbae39faccbfeadf6beb2e19a4ac18af4a186758289c9
 MD5 5cc488131c048bf38a2761f5018e7507 files/latex2html-perl_name.patch 445
 RMD160 6f93bdc394f8c240542cd6a224864c3b4b27420d files/latex2html-perl_name.patch 445
 SHA256 41dcf9d9b46691c34bddbae39faccbfeadf6beb2e19a4ac18af4a186758289c9 files/latex2html-perl_name.patch 445
-DIST latex2html-2002-2-1+20041025.tar.gz 1124233 RMD160 3ee05b1016fe9aad0db45bbbda6bc76e58dc3c25 SHA256 5bb9204992d03562345a4c0371fd0f9e65e0ac0b133a91ddb4a6bdb011d2ecae size 1124233
-DIST latex2html-2002-2.tar.gz 1122586 RMD160 ad5e35c5f752b53396b041ba4454393250c05688 SHA256 ed7b1137e807d853c8e5e76fa65e00f85831ff42ca0797e3c43b42db455bd657 size 1122586
-EBUILD latex2html-2002.2.1_pre20041025-r1.ebuild 2816 RMD160 7487ee665f75832085744437936ccc1119a2f08f SHA1 40dfe77bc065b3a639ee06c42e1bedbf463ed054 SHA256 d4adddf57586226e9b2cf274193a954dfe311a62692603eff19e80b6182f8b56 size 2816
-MD5 6d8d1efccc36258a1b80c34354458f6d latex2html-2002.2.1_pre20041025-r1.ebuild 2816
-RMD160 7487ee665f75832085744437936ccc1119a2f08f latex2html-2002.2.1_pre20041025-r1.ebuild 2816
-SHA256 d4adddf57586226e9b2cf274193a954dfe311a62692603eff19e80b6182f8b56 latex2html-2002.2.1_pre20041025-r1.ebuild 2816
-EBUILD latex2html-2002.2.1_pre20041025.ebuild 2766 RMD160 d518570863d56e6fb856376f3a1c7ba2101a7ef7 SHA1 4e63f88071be5c3a04834192bcf7717c8a592875 SHA256 1247cb1df2dd862dee780874fbbe146d3a25b7782555c19a93db9b85c074442f size 2766
+DIST latex2html-2002-2-1+20041025.tar.gz 1124233 RMD160 3ee05b1016fe9aad0db45bbbda6bc76e58dc3c25 SHA1 386be87f40ccdd77d4ff9621e05551f00e4d16c8 SHA256 5bb9204992d03562345a4c0371fd0f9e65e0ac0b133a91ddb4a6bdb011d2ecae
+DIST latex2html-2002-2.tar.gz 1122586 RMD160 ad5e35c5f752b53396b041ba4454393250c05688 SHA256 ed7b1137e807d853c8e5e76fa65e00f85831ff42ca0797e3c43b42db455bd657
+EBUILD latex2html-2002.2.1_pre20041025-r1.ebuild 2895 RMD160 b3fecac9119503ec7655afa69f86fd7849cd821c SHA1 d7fd58b15118d5395526f3980324e2b731e398b9 SHA256 43f305262aee5d20d9e5a8f79402e83ecf5e1e6300d3ac65f36900c43b8f71e3
+MD5 a87012ca8f7ef919c7aa5d0abde1676a latex2html-2002.2.1_pre20041025-r1.ebuild 2895
+RMD160 b3fecac9119503ec7655afa69f86fd7849cd821c latex2html-2002.2.1_pre20041025-r1.ebuild 2895
+SHA256 43f305262aee5d20d9e5a8f79402e83ecf5e1e6300d3ac65f36900c43b8f71e3 latex2html-2002.2.1_pre20041025-r1.ebuild 2895
+EBUILD latex2html-2002.2.1_pre20041025.ebuild 2766 RMD160 d518570863d56e6fb856376f3a1c7ba2101a7ef7 SHA1 4e63f88071be5c3a04834192bcf7717c8a592875 SHA256 1247cb1df2dd862dee780874fbbe146d3a25b7782555c19a93db9b85c074442f
 MD5 a21a189155bd4363b1485ff4f58b37af latex2html-2002.2.1_pre20041025.ebuild 2766
 RMD160 d518570863d56e6fb856376f3a1c7ba2101a7ef7 latex2html-2002.2.1_pre20041025.ebuild 2766
 SHA256 1247cb1df2dd862dee780874fbbe146d3a25b7782555c19a93db9b85c074442f latex2html-2002.2.1_pre20041025.ebuild 2766
-EBUILD latex2html-2002.2.ebuild 2219 RMD160 126722b931059383ebd09fd31a830d57a28b5bca SHA1 e61faf2d3c5d59cb105a2bbf449bf8dc481f8037 SHA256 82fa14e239dc62abca97515d9ed34ce29adcb54c70b867db4ef811c0dc82e57b size 2219
+EBUILD latex2html-2002.2.ebuild 2219 RMD160 126722b931059383ebd09fd31a830d57a28b5bca SHA1 e61faf2d3c5d59cb105a2bbf449bf8dc481f8037 SHA256 82fa14e239dc62abca97515d9ed34ce29adcb54c70b867db4ef811c0dc82e57b
 MD5 a4be24c80dde51dd27280edf4e3f197d latex2html-2002.2.ebuild 2219
 RMD160 126722b931059383ebd09fd31a830d57a28b5bca latex2html-2002.2.ebuild 2219
 SHA256 82fa14e239dc62abca97515d9ed34ce29adcb54c70b867db4ef811c0dc82e57b latex2html-2002.2.ebuild 2219
-MISC ChangeLog 5895 RMD160 3ab1ee14c59165c46b5354a174c72eae7935f0f9 SHA1 105ce1bf6290c2fe8d8690bb00c26dd913b0e237 SHA256 6f3345f58d830298aeac5053bfa4f85a6750c95917f5a42fd5b375fda74f1f32 size 5895
-MD5 42f74a0905e32153f15b9d1b6fb068af ChangeLog 5895
-RMD160 3ab1ee14c59165c46b5354a174c72eae7935f0f9 ChangeLog 5895
-SHA256 6f3345f58d830298aeac5053bfa4f85a6750c95917f5a42fd5b375fda74f1f32 ChangeLog 5895
-MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f size 164
+MISC ChangeLog 6128 RMD160 6937d2e91a1496696c9329c7d1bb19b23c680c76 SHA1 d2b14f909c901be2ca6b041fb6dfb249c64ff12c SHA256 a93d31c8a0930d6b1111a57e23c24398b3040987c0a170256665a64f13936620
+MD5 49812c7ec44e251c46c1bca14b8c507f ChangeLog 6128
+RMD160 6937d2e91a1496696c9329c7d1bb19b23c680c76 ChangeLog 6128
+SHA256 a93d31c8a0930d6b1111a57e23c24398b3040987c0a170256665a64f13936620 ChangeLog 6128
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
@@ -41,9 +45,9 @@ MD5 f3494534f6b053d7cb76b50bda928892 files/digest-latex2html-2002.2.1_pre2004102
 RMD160 8a07874abf4feb0aed8e5d5b0587bfe4cbb479df files/digest-latex2html-2002.2.1_pre20041025-r1 289
 SHA256 a09a68eaf0aeb211e9b394580f022c8da59a083fd1669a11bb2e2d1bdcf145f9 files/digest-latex2html-2002.2.1_pre20041025-r1 289
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEctlUwx9vvAARv2sRAv7AAJ0YqRPFTZKX3ChtziCZOwnLDIc7CQCgwr6L
-ojBoW3h3x4oTlY58o+VkgPo=
-=O9rT
+iD8DBQFEgIo6zxUa4FWw6mwRAnZHAJ9uhIkwwqN3uQmsoYB2cQ3eoc32+QCfdF8p
+4tBj5g5TTVxvuzy8T+FkuDc=
+=jDM9
 -----END PGP SIGNATURE-----
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() {