Version bump (#264474)

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

4 files changed, 102 insertions, 7 deletions

diff --git a/app-text/po4a/ChangeLog b/app-text/po4a/ChangeLog
index 0c41d9b51f89..388442a37c04 100644
--- a/app-text/po4a/ChangeLog
+++ b/app-text/po4a/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/po4a
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/ChangeLog,v 1.35 2008/11/19 13:26:08 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/ChangeLog,v 1.36 2009/04/03 12:25:44 tove Exp $
+
+*po4a-0.36 (03 Apr 2009)
+
+  03 Apr 2009; Torsten Veller <tove@gentoo.org>
+  +files/0.36-3-debian.patches, +po4a-0.36.ebuild:
+  Version bump (#264474)
 
   19 Nov 2008; Torsten Veller <tove@gentoo.org> -po4a-0.21.ebuild,
   -po4a-0.25.ebuild, -po4a-0.29.ebuild, -po4a-0.30.ebuild,
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 62532b110284..117edbe30e97 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.36-3-debian.patches 1809 RMD160 c07380f5b26d324b927bc89c4288bcdea2ee0006 SHA1 68c22cc61077df644006aed31e5849229dfe2da7 SHA256 fd5592262a1750afaea475d94682ce00a55229ba8bbf71097e33541c3ada5fb5
 DIST po4a-0.32.tar.gz 882223 RMD160 da70a5914f9a7a9fb80fb92a19e73d11eb3cff74 SHA1 890ccfd513530f5cfda3efd5d33aab9874f7104a SHA256 aab81329a73ea92b3a46c0a489017cc793b89b4c8beed84210253a35675c533e
 DIST po4a_0.34.orig.tar.gz 1054313 RMD160 acf9a16d4a4d3cdda3a83a4d9aa8c353d48d8400 SHA1 4fa7fd6dfe208db53c237a4fe0ed17040d7e1351 SHA256 0f717e109e2ebec5a3977316e943f651e9cf86d77a10fb269d9aeba5b244779e
+DIST po4a_0.36.orig.tar.gz 1110698 RMD160 afb1f37c8a6e85f45717a011fc84cc1952316f1e SHA1 2ae636a02a591660c652569529f176d6d7288508 SHA256 bfec45e27cd4a940b1fe07cd75ba104049e098adde304caa23396640a7a661bf
 EBUILD po4a-0.32-r1.ebuild 865 RMD160 8cb6ad78d581999a597f9fb93f8455d66d30cdf6 SHA1 7c575c588ed68d1de964bc652a66078e7c23fc4b SHA256 443e0a8bd29347f61dcab6dc0593cc56d913bbf903d1e52ad40ffde904485985
 EBUILD po4a-0.34.ebuild 864 RMD160 611042294a93478b6f3274b4db85c41e372bf996 SHA1 c7aa267dffd7cac3ca30d4f4dc499d6a3e4c80ed SHA256 294c67dcf441f41efd7dc4ccd4fdedf4e501c28651320c573b4a432c44073c7b
-MISC ChangeLog 4681 RMD160 161e97fc37d21a8a1a5a17dafe1af7bb0a4ee73c SHA1 39cc6a2aa5ff5e43de75c97d7c25cc8c47ce246e SHA256 8168c3b94e39d3f139b74ee3c8983e8610422f2aff30991323053f3c2a5b5b2a
+EBUILD po4a-0.36.ebuild 988 RMD160 e0d0ddd17a7a6675e995caec691e0b989cb2bfc6 SHA1 ef19655f7eaac93b39b4206b4289b5fe07bbbcc1 SHA256 31732fa8faa140f78422d15687e486b5888c7e27ebe1d81adedc0765ccc49a36
+MISC ChangeLog 4832 RMD160 ffbd4b445039f1ac7261f9435174b8f49674fb06 SHA1 dcb0d2afe267fb91ba131ab336d4ace781db63a8 SHA256 6f513c8fd393f36bfa3e82c425a82beef2262bb51d91cb51a435912133c60c7b
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkkkE+AACgkQV3J2n04EauxJOwCgxSFIolE7hH9JrmJxZS9Mao19
-AzYAni0Zohr0QN6FAJfbZfzLP+NlJX8t
-=9niH
+iEYEARECAAYFAknWAE8ACgkQV3J2n04EauxYrgCfdkre4nnBCSGWIGg2hcArjdiK
++TIAniFEMgStt5EOdIjS/tY3xSUvYGKU
+=H/tJ
 -----END PGP SIGNATURE-----
diff --git a/app-text/po4a/files/0.36-3-debian.patches b/app-text/po4a/files/0.36-3-debian.patches
new file mode 100644
index 000000000000..9e2274bb6dc3
--- /dev/null
+++ b/app-text/po4a/files/0.36-3-debian.patches
@@ -0,0 +1,50 @@
+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/po4a-0.36.ebuild b/app-text/po4a/po4a-0.36.ebuild
new file mode 100644
index 000000000000..9618c4f2fd9f
--- /dev/null
+++ b/app-text/po4a/po4a-0.36.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.36.ebuild,v 1.1 2009/04/03 12:25:44 tove Exp $
+
+inherit perl-app
+
+DESCRIPTION="Tools for helping translation of documentation"
+HOMEPAGE="http://po4a.alioth.debian.org"
+SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="dev-perl/SGMLSpm
+	>=sys-devel/gettext-0.13
+	app-text/openjade
+	dev-perl/Locale-gettext
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-lang/perl"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.28
+	test? ( app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+		virtual/tex-base )"
+
+PATCHES=( "${FILESDIR}/0.36-3-debian.patches" )
+SRC_TEST="do"
+
+src_compile() {
+	rm "${S}"/Makefile || die
+	sed -i '/^Makefile$/d' "${S}"/MANIFEST || die
+	perl-app_src_compile
+}