Fix test failure on perl-5.10.1 (#300013). Thanks to David Abbott

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 89 insertions, 9 deletions

diff --git a/dev-perl/HTML-TableContentParser/ChangeLog b/dev-perl/HTML-TableContentParser/ChangeLog
index 1e65b99598fc..c3bd59e3debd 100644
--- a/dev-perl/HTML-TableContentParser/ChangeLog
+++ b/dev-perl/HTML-TableContentParser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/HTML-TableContentParser
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-TableContentParser/ChangeLog,v 1.5 2009/12/07 12:38:43 tove Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-TableContentParser/ChangeLog,v 1.6 2010/01/07 14:12:41 tove Exp $
+
+  07 Jan 2010; Torsten Veller <tove@gentoo.org> +files/0.13-test.patch,
+  HTML-TableContentParser-0.13.ebuild:
+  Fix test failure on perl-5.10.1 (#300013). Thanks to David Abbott
 
   07 Dec 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
   Add perl herd
diff --git a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.13.ebuild b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.13.ebuild
index caf880df6f7d..229e6b1d2576 100644
--- a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.13.ebuild
+++ b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.13.ebuild,v 1.5 2009/06/23 10:53:41 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.13.ebuild,v 1.6 2010/01/07 14:12:41 tove Exp $
 
 EAPI=2
 
@@ -17,3 +17,4 @@ RDEPEND="dev-perl/HTML-Parser"
 DEPEND="${RDEPEND}"
 
 SRC_TEST=do
+PATCHES=( "${FILESDIR}"/0.13-test.patch )
diff --git a/dev-perl/HTML-TableContentParser/Manifest b/dev-perl/HTML-TableContentParser/Manifest
index be67efb57efe..c779968f63d9 100644
--- a/dev-perl/HTML-TableContentParser/Manifest
+++ b/dev-perl/HTML-TableContentParser/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.13-test.patch 2076 RMD160 55dd1d4b78e3766804112cecc3b42491dbcad153 SHA1 e56cc638fffe80dc094fec850ebf594771f76a28 SHA256 c17971f5b04398590928b1927809b36b8db90a7aea7c980751fd57b281a005ca
 DIST HTML-TableContentParser-0.13.tar.gz 4664 RMD160 3c1739d70fd833e06cf7e57d6565de9bf65ab062 SHA1 7a48b175a8ce603b36b62841db84571657cbdb5d SHA256 3eb9c80f65adf508300a95f591d8c58dcb7d74e90b1b7e5d4d9908599c5b5568
-EBUILD HTML-TableContentParser-0.13.ebuild 456 RMD160 edd34aea9cd47a6eb505102e1842c6f66427e7cf SHA1 c9dc3a425b53c70d5bde666b67f6be3a3f8eb21f SHA256 91dc85f2ff15ea25c89ef92ab5d45fe1476a586353e3376d49542f1de3c2de9d
-MISC ChangeLog 979 RMD160 2414ee0470bf362eb9f94fdc38096f8e894218c9 SHA1 fa1a57e02a30af6ad369fbe6d330e44c249b81ee SHA256 69a8bcc66d5cdd5ff8ad75945ce8b6b64db0639e4a461b0e4f624c8f4c892b52
+EBUILD HTML-TableContentParser-0.13.ebuild 498 RMD160 b8c84e54e2657e64a65b1ec73d03037cc1ab02ed SHA1 deaa2c84ac096fb2eed3dc4b6e9528455bfc8a80 SHA256 cd74e114c837c14df7da857658b125e77f0758aa56f3228d15a626adb8babd71
+MISC ChangeLog 1159 RMD160 fdb650ce80500434aa6a2302eb9dd7a2395eb1d6 SHA1 cbca96f2e505fe649c3d845f06f6bb5d62adafe2 SHA256 ef75ad8646abd12d3e86079d1f65adfac945ad5a88101e3a0d6058ce5157b646
 MISC metadata.xml 276 RMD160 284305f6c8ee6e409b9928d5bc5601977f3a2bf1 SHA1 d4cbbb1577f18efde19d58aaaffb194f905b4ff9 SHA256 580004aff039a1cd1ed23e3fa6ff802f4dc8ea6983a50f47e78fad86656eb2c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksc91kACgkQV3J2n04EauwidQCfTlEckrDUd+uw4as1PGj7IQjE
-NB8AmwYte93FfEhTYGckQTG/63K3aOZE
-=7qoR
+iEYEARECAAYFAktF698ACgkQV3J2n04Eauw/6gCg14vnQM5UBfhbUwqfPWGRl+s6
+MVkAni/fluxF/ErCxMslaeQEl/mnBRZI
+=Wyes
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/HTML-TableContentParser/files/0.13-test.patch b/dev-perl/HTML-TableContentParser/files/0.13-test.patch
new file mode 100644
index 000000000000..79916acc1e1c
--- /dev/null
+++ b/dev-perl/HTML-TableContentParser/files/0.13-test.patch
@@ -0,0 +1,74 @@
+--- t/1.t
++++ t/1.t
+@@ -2,6 +2,8 @@
+ 
+ 
+ use Test;
++use strict;
++use warnings;
+ 
+ BEGIN { plan tests => 34 }
+ 
+@@ -20,7 +22,7 @@
+ 
+ ## Test object creation
+ 
+-$obj = HTML::TableContentParser->new();
++my $obj = HTML::TableContentParser->new();
+ ok(defined $obj, 1, $@);
+ 
+ 
+@@ -29,14 +31,14 @@
+ ## the correct values to the callback.
+ 
+ 
+-$table_caption  = 'This is a caption';
+-$table_content1 = 'This is table cell content 1';
+-$table_content2 = 'This is table cell content 2';
+-$table_content3 = '<a href="SomeLink">This is table cell content 3, a link</a>';
+-$table_content4 = 'Some more text wrapping <a href="SomeLink">This is table cell content 4</a> a link.';
+-$header_text = 'Header text';
++my $table_caption  = 'This is a caption';
++my $table_content1 = 'This is table cell content 1';
++my $table_content2 = 'This is table cell content 2';
++my $table_content3 = '<a href="SomeLink">This is table cell content 3, a link</a>';
++my $table_content4 = 'Some more text wrapping <a href="SomeLink">This is table cell content 4</a> a link.';
++my $header_text = 'Header text';
+ 
+-$html = qq{
++my $html = qq{
+ <html>
+ <head>
+ </head>
+@@ -59,7 +61,7 @@
+ 
+ 
+ $HTML::TableContentParser::DEBUG = 0;
+-$tables = $obj->parse($html);
++my $tables = $obj->parse($html);
+ ok($tables->[0]->{caption}->{data}, $table_caption, $@);
+ ok($tables->[0]->{rows}->[0]->{cells}->[0]->{data}, $table_content1, $@);
+ ok($tables->[0]->{rows}->[1]->{cells}->[0]->{data}, $table_content2, $@);
+@@ -124,16 +126,17 @@
+ ok(@$tables, 2, @_);
+ 
+ ## and three headers for each table
+-for $t (0..$#{@$tables}) {
+-	for (0..$#hdrs) {
+-		ok($tables->[$t]->{headers}->[$_]->{data}, $hdrs[$_], $@);
++for my $t (0..(@$tables-1)) {
++	for (0..2) {
++        # ok($t, $t);
++        ok($tables->[$t]->{headers}->[$_]->{data}, $hdrs[$_], $@);
+ 	}
+ }
+ 
+ 
+ ## and three rows of three cells each, for each table.. (18 total).
+-for $t (0..$#{@$tables}) {
+-	for $r (0..$#rows) {
++for my $t (0..1) {
++	for my $r (0..$#rows) {
+ 		for (0..2) {
+ 			ok($tables->[$t]->{rows}->[$r]->{cells}->[$_]->{data}, $rows[$r]->[$_], $@);
+ 		}