Fix h2ph to handle system headers with quotes

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 84 insertions, 4 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index d599619e39cb..7b08613a2a1d 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/perl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.278 2009/04/26 11:19:56 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.279 2009/05/08 05:46:34 tove Exp $
+
+  08 May 2009; Torsten Veller <tove@gentoo.org>
+  +files/perl-fix_h2ph_include_quote.patch, perl-5.8.8-r6.ebuild:
+  Fix h2ph to handle system headers with quotes
 
   26 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
   +files/perl-5.8.8-lib32.patch, files/perl-5.8.8-lib64.patch,
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index bc7576f90d99..3ea98d71bb7d 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX perl-5.8.7-MakeMaker-RUNPATH.patch 859 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 SHA1 1e7c2f05ffaf8f6aee753ab106a9798e6920ff06 SHA256 3d327c525e0cf57899eca48d417fa4363f40da9b0d6b70b61e951521749047ab
 AUX perl-5.8.8-CAN-2005-0448-rmtree-2.patch 8187 RMD160 db38f78ef5de917719c810595072929ecb11c93a SHA1 da502e4a524b4c86e24ad5e5a027657ebecb9bd5 SHA256 def78de69a0ef27204dfc1f5f39fcd4da1b38327f446e4dca1d37b9890b338e4
 AUX perl-5.8.8-CAN-2005-0448-rmtree.patch 6961 RMD160 bf242f32c1e1450a7d4d252cdc54cace36b50c62 SHA1 97d1f3a3b2d75b7a82983b1f98d4445ff82d2c19 SHA256 d6565afabbc35e0e1aeecfb469eaf037f892834312a7c2616357a309cd56e3f1
@@ -16,6 +19,7 @@ AUX perl-5.8.8-makedepend-syntax.patch 341 RMD160 8d0ee189b86c7c3b6467512a7be25c
 AUX perl-5.8.8-perlcc.patch 559 RMD160 cedf2f1666b4add3ef6baed214e31d76b4b6731d SHA1 1104b880d9570599308609fd793ded5bd2f450db SHA256 7c212d320ec34cf8d0d5443ce5fad5c94a9fa9075462d54ddd8cc5716a2f2aa9
 AUX perl-5.8.8-reorder-INC.patch 3046 RMD160 73bc824bebee8889073656a7b547dc63b35696dc SHA1 ec56010c38cbadce6fccf7ba314cfc7f42f470c6 SHA256 136ca6c6cfaa3467f6a164f26b34ff06cc55823ca5723118764589cc15d37aed
 AUX perl-5.8.8-utf8-boundary.patch 1866 RMD160 c65ee9df8b9f71504420b905be2067220ef9daaa SHA1 38eb633f427bf7cd843843bff525dbc50116df8b SHA256 62848b35ed88c7d3a1a836903707b467e421321810e18792da41b28f9e7124a1
+AUX perl-fix_h2ph_include_quote.patch 2462 RMD160 d38aef789a45483a99ae6302cbce9c5fd9cc3635 SHA1 42489f2c7849195e14ac3bb2cb22b666260fe9fb SHA256 bfe3ebd7e119ebf5e11dc00e55773732f483e740e153dff267dd5ca12affc432
 AUX perl-h2ph-ansi-header.patch 446 RMD160 8baf89df0d3f916a8c4f437444fa1af01f5fa8b0 SHA1 31f0a7e7444e914bec2a0a3e41838eb82e038e6f SHA256 dc28a8ccba56e0aa5e01b0ecf68a163ebfb9460917d201f1f6d9a1efef06c788
 AUX perl-hppa-pa7200-configure.patch 446 RMD160 ab902e2b5cf7f96023e0e267f170401b036dd4f5 SHA1 fcb7e61cdf1ce1c9993f257507b3289ce45382d7 SHA256 4fe6a010dbdc39325f4003e7ccd02cb7996b4a99b64ab0fa8b12d6fe67f87a31
 AUX perl-noksh.patch 611 RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc SHA1 61bf5bb0955bd04a758d1381fa4260ed9fdbb1d1 SHA256 0861f7f54c184e99a0ffeebeab9420d969d2002f921bc3fb14841a1e24be1f5e
@@ -28,6 +32,13 @@ EBUILD perl-5.8.8-r2.ebuild 18896 RMD160 50dea3ec5837278cae6a39da93f489e8044a278
 EBUILD perl-5.8.8-r3.ebuild 19135 RMD160 ca0b9eb44dc513f36d5c5f3e5737bb905302aa4e SHA1 89ad554b2a3b1d8ef68ab613a6f58879cece5615 SHA256 accc5dfa49afc829439d6a9bd4b1cb4de6752f4bada5800555c2f3511d782b09
 EBUILD perl-5.8.8-r4.ebuild 19134 RMD160 3e9ce03261a16fe7b7bf1a5f1d60e2b327baa47b SHA1 76c394bed4e3cecd186cb79e7e11d0bd07860705 SHA256 32664950c3a585ac8f3ab91df8528b9d8cb4974112df39123218960b68a03b95
 EBUILD perl-5.8.8-r5.ebuild 19295 RMD160 246aa81b035712c86bebbf1a436b03ddea56648e SHA1 e9f175ef668a6516d27bd08eddae743c8036c9f1 SHA256 9f169c6d160430d08c99effc8ef70cf28f0b03193daba5c60a828e4ded28c900
-EBUILD perl-5.8.8-r6.ebuild 19366 RMD160 9b15dff8a856155a32fe8cc13021ee98d120ddad SHA1 568bba2a508054a1210f142711233f37a22bf21b SHA256 ce867cfcc9f21cb70e665835f49e1cac6891a7d38923904aec44546b459e96b3
-MISC ChangeLog 60005 RMD160 a992c3374927d8ac3569f731a01f8047a2dbc0db SHA1 be3cdce1fe03e87b8f3f8f90853cdddd139999e7 SHA256 f80969ed47e6ab2a0362a9e37ed958b080016dc317d6ea8cea8184fc0e4d5605
+EBUILD perl-5.8.8-r6.ebuild 19568 RMD160 b859dd07c8c017e0b4fb85ec72dc6d211baac6c2 SHA1 82bbc546e54ba21beb322e55f07f4f8d4f028f08 SHA256 5ba1eeea7d5f2fc9b2f3f42bc355f7ed1a9cf3d492a19b3b795fe3af597027b7
+MISC ChangeLog 60164 RMD160 34afe26b1792c7e6017cfd996325494aaaff1733 SHA1 f529e83f5c7bd3d7cec336aeb4fd96829c24e8da SHA256 d68bee83ac698a285ec37efdba3647c6e5c158cb370684c28f043ba46a0f3d9c
 MISC metadata.xml 451 RMD160 8424230d79d13df7462c454050058b3526a78e92 SHA1 1ae85db5c1c1fc6413ca324ebc93b6894831b437 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6ae3a5dfff587c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoDx0EACgkQV3J2n04EauwRHwCgwtXca5dEHwLKLNA4AZGG23SA
+HpoAni7GZqqu5JCaGMTRNSYRwZe9V6bO
+=ERu5
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch b/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch
new file mode 100644
index 000000000000..a71fbe6e293b
--- /dev/null
+++ b/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch
@@ -0,0 +1,61 @@
+Subject: Fix h2ph with double-quote-delimited #include directives.
+
+Allow the quote mark delimiter also for those #include directives chased with "h2ph -a".
+
+Debian bug #479762.
+
+Also add the directory prefix of the current file when the quote syntax is
+used; 'require' will only look in @INC, not the current directory.
+
+Upstream change 33835.
+--- a/utils/h2ph.PL
++++ b/utils/h2ph.PL
+@@ -85,7 +85,7 @@ sub reindent($) {
+ }
+ 
+ my ($t, $tab, %curargs, $new, $eval_index, $dir, $name, $args, $outfile);
+-my ($incl, $incl_type, $next);
++my ($incl, $incl_type, $incl_quote, $next);
+ while (defined (my $file = next_file())) {
+     if (-l $file and -d $file) {
+         link_if_possible($file) if ($opt_l);
+@@ -186,9 +186,10 @@ while (defined (my $file = next_file())) {
+                       print OUT $t,"unless(defined(\&$name)) {\n    sub $name () {\t",$new,";}\n}\n";
+ 		    }
+ 		}
+-	    } elsif (/^(include|import|include_next)\s*[<\"](.*)[>\"]/) {
++	    } elsif (/^(include|import|include_next)\s*([<\"])(.*)[>\"]/) {
+                 $incl_type = $1;
+-                $incl = $2;
++                $incl_quote = $2;
++                $incl = $3;
+                 if (($incl_type eq 'include_next') ||
+                     ($opt_e && exists($bad_file{$incl}))) {
+                     $incl =~ s/\.h$/.ph/;
+@@ -221,6 +222,10 @@ while (defined (my $file = next_file())) {
+ 			   "warn(\$\@) if \$\@;\n");
+                 } else {
+                     $incl =~ s/\.h$/.ph/;
++                    # copy the prefix in the quote syntax (#include "x.h") case
++                    if ($incl !~ m|/| && $incl_quote eq q{"} && $file =~ m|^(.*)/|) {
++                        $incl = "$1/$incl";
++                    }
+ 		    print OUT $t,"require '$incl';\n";
+                 }
+ 	    } elsif (/^ifdef\s+(\w+)/) {
+@@ -724,8 +729,13 @@ sub queue_includes_from
+                 $line .= <HEADER>;
+             }
+ 
+-            if ($line =~ /^#\s*include\s+<(.*?)>/) {
+-                push(@ARGV, $1) unless $Is_converted{$1};
++            if ($line =~ /^#\s*include\s+([<"])(.*?)[>"]/) {
++                my ($delimiter, $new_file) = ($1, $2);
++                # copy the prefix in the quote syntax (#include "x.h") case
++                if ($delimiter eq q{"} && $file =~ m|^(.*)/|) {
++                    $new_file = "$1/$new_file";
++                }
++                push(@ARGV, $new_file) unless $Is_converted{$new_file};
+             }
+         }
+     close HEADER;
diff --git a/dev-lang/perl/perl-5.8.8-r6.ebuild b/dev-lang/perl/perl-5.8.8-r6.ebuild
index 4907b07a8989..0f6d73dd8507 100644
--- a/dev-lang/perl/perl-5.8.8-r6.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r6.ebuild,v 1.3 2009/04/26 11:19:56 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r6.ebuild,v 1.4 2009/05/08 05:46:34 tove Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -143,6 +143,10 @@ src_unpack() {
 	# Patch from bug 168312, thanks Peter!
 	has_version '>sys-kernel/linux-headers-2.6.20' && epatch "${FILESDIR}"/${P}-asm-page-h-compile-failure.patch
 
+	# Also add the directory prefix of the current file when the quote syntax is
+	# used; 'require' will only look in @INC, not the current directory.
+	epatch "${FILESDIR}"/${PN}-fix_h2ph_include_quote.patch
+
 	# perlcc fix patch - bug #181229
 	epatch "${FILESDIR}"/${P}-perlcc.patch