More cleanup

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

4 files changed, 6 insertions, 75 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/Manifest b/app-text/po4a/Manifest
index 3d1e3ac9fbe6..a2aa55d86a0b 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,11 +1,9 @@
-AUX 0.36-3-debian.patches 1809 RMD160 c07380f5b26d324b927bc89c4288bcdea2ee0006 SHA1 68c22cc61077df644006aed31e5849229dfe2da7 SHA256 fd5592262a1750afaea475d94682ce00a55229ba8bbf71097e33541c3ada5fb5
 AUX compare-po.pl 787 RMD160 6d3b960f3d7bc7fb8198d2f4b11d670c6610f565 SHA1 7dd76f6b79b077708ac9e3b9de72bbfc83bb651d SHA256 6111bffd2dc6cd7411df82387ecbfa8b3efdc46b90e3571560a770f876fb51d0
-AUX po4a-fix-io-capture.patch 730 RMD160 a7dfc984a523655de6fc9fef8db17e147c946085 SHA1 ac468214599ffc79e13b5b9063a346cad4990cac SHA256 cde8dc95e5eee02dd2ef2c3624c2283f9d6592db1aef515fdfde279da054964f
 DIST po4a_0.38.orig.tar.gz 1627655 RMD160 522bde07978dfc05a69335e4218cdd6e21c67526 SHA1 e3baa4ec3472dd77296105ca14447ed5f39af584 SHA256 81425b4c6ce35e337ea1496eed0f2ca041a2b78a4a7aa5bef7bb14b3928cae87
 DIST po4a_0.39.orig.tar.gz 1626342 RMD160 ff960bce2829c1273c82304539065e68c95543db SHA1 9eef319009e8b1d663f39c651e2b5a78ba037714 SHA256 91f758bc64bd85e20dbee2d39b569a11f1927f06aa6cfdcb86b6c3dfdc823e8e
 DIST po4a_0.40.1.orig.tar.gz 1801072 RMD160 d2852d9266351786d0f6a7359f0b08b406176369 SHA1 f4132ac32dadc4d4d14cafa00d05788aad1ef0d1 SHA256 141e6d0cf37950e043a21ef4a22be1d9620bdcd8af9143bb64217ff6176ab930
 EBUILD po4a-0.38.ebuild 1026 RMD160 ba75de7ebeded0c21cb6c8ca43f9a9b4dddd4a17 SHA1 073ea32e57cfa7ddabbe6eb9da1d08c3eaf94384 SHA256 ec5b7e957b29146b566cb440ebf55a2cf4b9744d2a9daeac05df206c8fbc2a72
 EBUILD po4a-0.39.ebuild 1037 RMD160 8056ed591a51387b4bd5129989074a718bff2583 SHA1 c58ffd6dfe8ebbd6a11510c7c9c03770e49048fa SHA256 adf82d2490e139449baefe83e86144aab7e99567bb881684d71b756e25b64c2d
 EBUILD po4a-0.40.1.ebuild 1098 RMD160 c52df5edbc31b7f133a3ee83f6b6a98f5d19c222 SHA1 fe69f02275a5d2d3b36f37f4918fca8910b885c5 SHA256 b0da26644798f0d977c6ab8084681924cacff650cfaab80599a19d0945ee2462
-MISC ChangeLog 6668 RMD160 9870d668306baa4a41fac8d03550c696b797932c SHA1 3527f0cceebc218650115c76c9bce90e30d78838 SHA256 719c4e6fbfc6ab60911fec971e4937ee2560aefb40d0c447405c878bb7021e3f
+MISC ChangeLog 6793 RMD160 7d2eaf4bfe642579714fbe111acc9328794858b0 SHA1 5c2f4d1bde593887b8d088f64cd5e989e05b3a48 SHA256 ee4194906702caec356eac7ee27102c3d4c508514da3f38db4a1ebf816d14ec4
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
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;