More cleanup

(Portage version: 2.2_rc98/cvs/Linux x86_64)

3 files changed, 5 insertions, 72 deletions

diff --git a/app-text/po4a/ChangeLog b/app-text/po4a/ChangeLog
index 4b6267605b39..2c5ce52e0424 100644
--- a/app-text/po4a/ChangeLog
+++ b/app-text/po4a/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/po4a
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/ChangeLog,v 1.50 2010/10/19 16:36:36 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/ChangeLog,v 1.51 2010/10/19 16:44:45 tove Exp $
+
+  19 Oct 2010; Torsten Veller <tove@gentoo.org>
+  -files/0.36-3-debian.patches, -files/po4a-fix-io-capture.patch:
+  Cleanup
 
   19 Oct 2010; Torsten Veller <tove@gentoo.org> -po4a-0.32-r1.ebuild,
   -po4a-0.34.ebuild, -po4a-0.36.ebuild, -po4a-0.36.4.ebuild,
diff --git a/app-text/po4a/files/0.36-3-debian.patches b/app-text/po4a/files/0.36-3-debian.patches
deleted file mode 100644
index 9e2274bb6dc3..000000000000
--- a/app-text/po4a/files/0.36-3-debian.patches
+++ /dev/null
@@ -1,50 +0,0 @@
-Patches from debian's po4a_0.36-3
-
---- po4a-0.36/lib/Locale/Po4a/LaTeX.pm
-+++ po4a-0.36/lib/Locale/Po4a/LaTeX.pm
-@@ -360,6 +360,7 @@
- }
- register_generic_environment("tabular,[]{}");
- register_generic_environment("tabular*,{}{}");
-+register_generic_environment("tabularx,{}{}");
- register_generic_environment("multicols,{}");
- register_generic_environment("list,{_}{}");
- register_generic_environment("array,[]{}");
-@@ -375,7 +376,8 @@
- # & is the cell separator, \\ is the line separator
- # '\' is escaped twice
- $env_separators{'array'} =
--  $env_separators{'tabular'} = "(?:&|\\\\\\\\)";
-+  $env_separators{'tabular'} =
-+  $env_separators{'tabularx'} = "(?:&|\\\\\\\\|\\\\hline)";
- 
- $env_separators{'trivlist'} =
-   $env_separators{'list'} =
-
---- po4a-0.36/lib/Locale/Po4a/TeX.pm
-+++ po4a-0.36/lib/Locale/Po4a/TeX.pm
-@@ -1079,9 +1079,9 @@
-         if ($line =~ m/^\s*((?:\{_?\}|\[_?\])*)\s*$/) {
-             register_generic_environment("$env,$1");
-         }
--    } elsif ($line =~ /^separator\s+(\w+(?:\[#[0-9]+\]))\s+\"(.*)\"\s*$/) {
-+    } elsif ($line =~ /^separator\s+(\w+(?:\[#[0-9]+\])?)\s+\"(.*)\"\s*$/) {
-         my $env = $1; # This is not necessarily an environment.
--                      # It can also be smth like 'title{#1}'.
-+                      # It can also be smth like 'title[#1]'.
-         $env_separators{$env} = $2;
-     } elsif ($line =~ /^verbatim\s+environment\s+(\w+)\s+$/) {
-         register_verbatim_environment($1);
-
---- po4a-0.36/lib/Locale/Po4a/Pod.pm
-+++ po4a-0.36/lib/Locale/Po4a/Pod.pm
-@@ -147,7 +147,7 @@
- sub docheader {
-     my $self=shift;
-     my $encoding = $self->{TT}{file_out_charset};
--    if (defined $encoding) {
-+    if (defined $encoding and length $encoding) {
-         $encoding = "\n=encoding $encoding\n";
-     } else {
-         $encoding = "";
-
diff --git a/app-text/po4a/files/po4a-fix-io-capture.patch b/app-text/po4a/files/po4a-fix-io-capture.patch
deleted file mode 100644
index 91cd9848021b..000000000000
--- a/app-text/po4a/files/po4a-fix-io-capture.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=269650#c7
-from Kent Fredric
---- po4a-0.36.4/Build.PL
-+++ po4a-0.36.4/Build.PL
-@@ -127,8 +127,14 @@
- 	    my %options;
- 	    $options{utf8} = 1;
- 	    my $parser = Pod::Man->new (%options);
--
--	    system("PERL5LIB=lib perl po4a --previous po/pod.cfg") and die;
-+     { # Fix for massive slowdown/Memory consumption
-+       local %ENV = %ENV;
-+       $ENV{PERL5LIB}='lib';
-+       open( my $fh, '-|', qw( perl po4a --previous po/pod.cfg ))  or die;
-+       while( defined ( my $line = <$fh> ) ){ 
-+          print $line;
-+       }
-+     }
- 	    system("mkdir -p blib/man/man7") and die;
- 	    system("mkdir -p blib/man/man1") and die;
- 	    system("cp doc/po4a.7.pod blib/man/man7") and die;