Version bump (#338520). Tests work with gettext-0.18.1.1 (#341073)

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

4 files changed, 86 insertions, 2 deletions

diff --git a/app-text/po4a/ChangeLog b/app-text/po4a/ChangeLog
index 62b10e04aac6..801531b496c8 100644
--- a/app-text/po4a/ChangeLog
+++ b/app-text/po4a/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2010/05/08 18:02:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/ChangeLog,v 1.49 2010/10/19 16:18:04 tove Exp $
+
+*po4a-0.40.1 (19 Oct 2010)
+
+  19 Oct 2010; Torsten Veller <tove@gentoo.org> +po4a-0.40.1.ebuild,
+  +files/compare-po.pl:
+  Version bump (#338520). Tests work with gettext-0.18.1.1 (#341073)
 
   08 May 2010; Raúl Porcel <armin76@gentoo.org> po4a-0.38.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #312979
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index b0e313a93552..8b2f4985e21c 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,4 +1,5 @@
 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.32.tar.gz 882223 RMD160 da70a5914f9a7a9fb80fb92a19e73d11eb3cff74 SHA1 890ccfd513530f5cfda3efd5d33aab9874f7104a SHA256 aab81329a73ea92b3a46c0a489017cc793b89b4c8beed84210253a35675c533e
 DIST po4a_0.34.orig.tar.gz 1054313 RMD160 acf9a16d4a4d3cdda3a83a4d9aa8c353d48d8400 SHA1 4fa7fd6dfe208db53c237a4fe0ed17040d7e1351 SHA256 0f717e109e2ebec5a3977316e943f651e9cf86d77a10fb269d9aeba5b244779e
@@ -7,6 +8,7 @@ DIST po4a_0.36.orig.tar.gz 1110698 RMD160 afb1f37c8a6e85f45717a011fc84cc1952316f
 DIST po4a_0.37.1.orig.tar.gz 1612236 RMD160 187532e0596ba5daa31fb10d2d1087797927e8b7 SHA1 f53c10c3da61c60bfa738c64dee14911b922effa SHA256 146a749737fab5c583abe71b358dc9346312c6e5e85591a6bfa9af9ba613e340
 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.32-r1.ebuild 865 RMD160 8cb6ad78d581999a597f9fb93f8455d66d30cdf6 SHA1 7c575c588ed68d1de964bc652a66078e7c23fc4b SHA256 443e0a8bd29347f61dcab6dc0593cc56d913bbf903d1e52ad40ffde904485985
 EBUILD po4a-0.34.ebuild 864 RMD160 611042294a93478b6f3274b4db85c41e372bf996 SHA1 c7aa267dffd7cac3ca30d4f4dc499d6a3e4c80ed SHA256 294c67dcf441f41efd7dc4ccd4fdedf4e501c28651320c573b4a432c44073c7b
 EBUILD po4a-0.36.4.ebuild 1057 RMD160 b6344b77a136627088896281beb153644d683a09 SHA1 806d01cd4f3f7db742f6d2db0a8217c2eec75d03 SHA256 b2030c686568415083e48a1a21cbf86b2bafdb0d7e59d5993bf32a995ee8c020
@@ -14,5 +16,6 @@ EBUILD po4a-0.36.ebuild 997 RMD160 f8ef49ac7cc1de5f7caa3194bf5afb22d430c372 SHA1
 EBUILD po4a-0.37.1.ebuild 1079 RMD160 7896d562c11a54547c71af98f07826a8551b4a10 SHA1 70db4a31c19b5dc538dc1d82eb1a25892d990fe5 SHA256 30e1441eba6c743c16e7e3d4621cd5be60b43b73553762f1a706958dad2293ff
 EBUILD po4a-0.38.ebuild 1028 RMD160 a7f62b8aa85d20877673996bb657234857f4c6e4 SHA1 e3b13ef856ce931aa5bda625eccd3ecf8e5d781b SHA256 d85b339b9f0e1b9b969456ec0dfdb9cfc609cb589cf5a60b2ba7b7cb23a9e5bd
 EBUILD po4a-0.39.ebuild 1036 RMD160 6b69d8c3e3a695de8f9eb520f69ff12050fccb6c SHA1 b31925deabcba147b3dca41d40ad2a211d49fa0b SHA256 b9f36d6a2b36f7961742629997e6d9e1c97730ffe695776624eee23eb8743a4d
-MISC ChangeLog 6224 RMD160 f5ffb5f62c7bdd46cf06c1d89dc1ec65d28fc459 SHA1 aeae8e94bcf39d3f512e00db415c1d239b84ab33 SHA256 97141eb5056f76481f53bb9bf9d1d3cdd64cbfe930f478865aa80b713d550a4b
+EBUILD po4a-0.40.1.ebuild 1098 RMD160 c52df5edbc31b7f133a3ee83f6b6a98f5d19c222 SHA1 fe69f02275a5d2d3b36f37f4918fca8910b885c5 SHA256 b0da26644798f0d977c6ab8084681924cacff650cfaab80599a19d0945ee2462
+MISC ChangeLog 6412 RMD160 37b8d4c8c842685fde8531817a1389f16631098f SHA1 021cf1bd4e93ed4f289dfb369edb0813f88e5c88 SHA256 a185b089589e78eccfe0687939e8dde7d915e0331ccf7ee3d9e8a99546abb268
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
diff --git a/app-text/po4a/files/compare-po.pl b/app-text/po4a/files/compare-po.pl
new file mode 100644
index 000000000000..c01b9b8f31ee
--- /dev/null
+++ b/app-text/po4a/files/compare-po.pl
@@ -0,0 +1,37 @@
+#! /usr/bin/perl
+#  Remove header entry of two PO files and compare them
+
+my $f1 = shift(@ARGV);
+my $f2 = shift(@ARGV);
+
+open IN1, "<", $f1 or die "Unable to read 1st file: $!\n";
+open IN2, "<", $f2 or die "Unable to read 2nd file: $!\n";
+my $inMsgstr = 0;
+my $lineno = 0;
+while (<IN1>) {
+	$lineno ++;
+	if (m/^msgstr/) {
+		$inMsgstr = 1;
+	} elsif ($inMsgstr == 1 && $_ !~ /^"/) {
+		last;
+	}
+}
+$inMsgstr = 0;
+while (<IN2>) {
+	if (m/^msgstr/) {
+		$inMsgstr = 1;
+	} elsif ($inMsgstr == 1 && $_ !~ /^"/) {
+		last;
+	}
+}
+
+# Now compare lines
+while (<IN1>) {
+	$lineno ++;
+	my $l2 = <IN2> or die "Unexpected EOF found when reading $f2\n";
+	$_ eq $l2 or die "Files $f1 and $f2 differ at line $lineno:\n-$_+$l2\n";
+}
+close IN1;
+die "EOF expected at 2nd file\n" unless eof(IN2);
+close IN2;
+exit 0;
diff --git a/app-text/po4a/po4a-0.40.1.ebuild b/app-text/po4a/po4a-0.40.1.ebuild
new file mode 100644
index 000000000000..afdc1c979873
--- /dev/null
+++ b/app-text/po4a/po4a-0.40.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.40.1.ebuild,v 1.1 2010/10/19 16:18:04 tove Exp $
+
+EAPI=2
+
+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 ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+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"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.34.0201
+	test? ( app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+		virtual/tex-base )"
+
+SRC_TEST="do"
+S=${WORKDIR}/${PN}-v${PV}
+
+src_prepare() {
+	cp "${FILESDIR}"/compare-po.pl "${S}"/t/ || die
+	rm "${S}"/Makefile || die
+	sed -i '/^Makefile$/d' "${S}"/MANIFEST || die
+	perl-module_src_prepare
+}