Fixing making of lgeneral.po. Bug #146602

Package-Manager: portage-2.1.1

4 files changed, 39 insertions, 15 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index e1304bb9a638..5cb4cdf42fd9 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/lgeneral
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.21 2006/08/26 20:38:33 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.22 2006/10/09 21:46:05 tupone Exp $
+
+  09 Oct 2006; <tupone@gentoo.org> +files/lgeneral-1.2_beta12-gettext.patch,
+  lgeneral-1.2_beta12-r1.ebuild:
+  Fixing making of lgeneral.po. Bug #146602 by Sascha Geschwandtner
 
 *lgeneral-1.2_beta12-r1 (26 Aug 2006)
 
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index b150a4c9a978..c128d2aa8d25 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -9,6 +9,10 @@ AUX lgeneral-1.2_beta12-gentoo-path.patch 2393 RMD160 8bf62ea88afb1e0e480436eb29
 MD5 9b7e601212e846db45e03c487205f0c4 files/lgeneral-1.2_beta12-gentoo-path.patch 2393
 RMD160 8bf62ea88afb1e0e480436eb298aa1f0abc3f07e files/lgeneral-1.2_beta12-gentoo-path.patch 2393
 SHA256 199427f23522583fa6a97776bb0710841f961d3528afb8cc3c610e7eed082933 files/lgeneral-1.2_beta12-gentoo-path.patch 2393
+AUX lgeneral-1.2_beta12-gettext.patch 755 RMD160 9103c135e84058c68a70bc2813a4dad6bb62794f SHA1 4ffa9488e0e8c734984a9092422fa834d3cab366 SHA256 f224293c35f694e0c19c7ecd37298b7edd04cf681f3bf6150645db18c8812441
+MD5 2057faa05ce9d4b4efa85ff0aab3d6ca files/lgeneral-1.2_beta12-gettext.patch 755
+RMD160 9103c135e84058c68a70bc2813a4dad6bb62794f files/lgeneral-1.2_beta12-gettext.patch 755
+SHA256 f224293c35f694e0c19c7ecd37298b7edd04cf681f3bf6150645db18c8812441 files/lgeneral-1.2_beta12-gettext.patch 755
 DIST lgeneral-1.1.1.tar.gz 588698
 DIST lgeneral-1.2beta-12.tar.gz 1428381 RMD160 a7a08d50fb400389078ba7716460fce24e750b97 SHA1 ed4ea01ee36a47bb78221862978addf36de580d3 SHA256 ea737943bfc6738a3535dab16d7081f9ad1263fa8b2d747466d3f2e2cc2e3d80
 DIST lgeneral-1.2beta-2.tar.gz 878853 RMD160 fde81c42bc3370bc22ef577c56fb78c9b7b64092 SHA1 fb208bfca3e463c7b30ede2ec20b8baa10729c36 SHA256 e816752800a94ae5dbb5f1f44458ffd58105e1cdaaa57c5e9e0727c6106a0c9e
@@ -20,10 +24,10 @@ EBUILD lgeneral-1.1.1-r1.ebuild 1113 RMD160 fa9072a0e18021d179659a830298034d3116
 MD5 128afa83e71a3141c957a56313b92000 lgeneral-1.1.1-r1.ebuild 1113
 RMD160 fa9072a0e18021d179659a830298034d311696ed lgeneral-1.1.1-r1.ebuild 1113
 SHA256 9c48b6f1099eb7b91f72921f31a6f0c22b9d509aea6db19c57a0a10bf47a60b7 lgeneral-1.1.1-r1.ebuild 1113
-EBUILD lgeneral-1.2_beta12-r1.ebuild 1951 RMD160 0787f70e68dc1c11256e6ed8f52082bba7d37c00 SHA1 64596c80420455810fa4029ff0087bd82c0a83c2 SHA256 a4ecdbdf1b5ea1cb164b04275cc98ab753c951aa2f3945c019e580538dbea18f
-MD5 eeefccf9906dbc7f6f5bf91b1fb0b255 lgeneral-1.2_beta12-r1.ebuild 1951
-RMD160 0787f70e68dc1c11256e6ed8f52082bba7d37c00 lgeneral-1.2_beta12-r1.ebuild 1951
-SHA256 a4ecdbdf1b5ea1cb164b04275cc98ab753c951aa2f3945c019e580538dbea18f lgeneral-1.2_beta12-r1.ebuild 1951
+EBUILD lgeneral-1.2_beta12-r1.ebuild 1956 RMD160 f17937fda5ff43dbef7a2d744353d86e6d50bfaf SHA1 6aebe53e9eb6dc375a851911041e96bf9c5531fc SHA256 64c5fbfd6c6f7f5292175455a8038106ffbd81de1a0aed65d977d55da169888b
+MD5 bb3670775628f9857456bf43abe3988b lgeneral-1.2_beta12-r1.ebuild 1956
+RMD160 f17937fda5ff43dbef7a2d744353d86e6d50bfaf lgeneral-1.2_beta12-r1.ebuild 1956
+SHA256 64c5fbfd6c6f7f5292175455a8038106ffbd81de1a0aed65d977d55da169888b lgeneral-1.2_beta12-r1.ebuild 1956
 EBUILD lgeneral-1.2_beta2.ebuild 1481 RMD160 bcdc7fb57f619db9eab7f9eb2df50b5ee0dd6c3a SHA1 7fc4964bc271095f1853e45854b5133f1b70caf2 SHA256 eb2f0c178f72ac9d14259066b689dafd1ab134c040c8aae5cd8a5ca6000eb698
 MD5 cca6898907a4441d1f2c7e1a76b6b585 lgeneral-1.2_beta2.ebuild 1481
 RMD160 bcdc7fb57f619db9eab7f9eb2df50b5ee0dd6c3a lgeneral-1.2_beta2.ebuild 1481
@@ -36,10 +40,10 @@ EBUILD lgeneral-1.2_beta9.ebuild 1616 RMD160 fc57396f243ff24c0b96ba44b168ce5c8f7
 MD5 c92bcf37b49f4d6be349583487e658df lgeneral-1.2_beta9.ebuild 1616
 RMD160 fc57396f243ff24c0b96ba44b168ce5c8f7b2751 lgeneral-1.2_beta9.ebuild 1616
 SHA256 374f330bdc705fefb97423e406524213f677e6b6c87ef9a04d2ac9a4e5a43ac1 lgeneral-1.2_beta9.ebuild 1616
-MISC ChangeLog 4293 RMD160 09d0c8d13c8dc335ed9e78d57d79517a59c15179 SHA1 ab4e283ae7ea4ce1f750582e8aeba95e4d384459 SHA256 f564b6cab7fc248fdee143372ee438f6211cf687e12370112630ba334c9dabd3
-MD5 8fa7d3a3b46c50433e6525dd088868d3 ChangeLog 4293
-RMD160 09d0c8d13c8dc335ed9e78d57d79517a59c15179 ChangeLog 4293
-SHA256 f564b6cab7fc248fdee143372ee438f6211cf687e12370112630ba334c9dabd3 ChangeLog 4293
+MISC ChangeLog 4472 RMD160 b3a1f19fa870df864265274b2785392c4677d866 SHA1 735fa53c34f8f3527fe24215f9a6bc1d3adaf572 SHA256 abeeaf82469fb925d82f837626130f61b0bc8248603fca2ec83f7d08342dd7f5
+MD5 bd53e53dbffec5442ad2afa25352164c ChangeLog 4472
+RMD160 b3a1f19fa870df864265274b2785392c4677d866 ChangeLog 4472
+SHA256 abeeaf82469fb925d82f837626130f61b0bc8248603fca2ec83f7d08342dd7f5 ChangeLog 4472
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -62,7 +66,7 @@ SHA256 f3be033e02b51f16a1346507a242bb2111a7efcdb850c3aac095f02881cfc319 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE8LFU2CTtIKiFlQIRAvY9AKCvLMZtme2Ohz5ZBbQntkjYlDAs3gCeO1FZ
-MAgdCazcgtZBTufdmFwXUbE=
-=2J74
+iD8DBQFFKsMsbfN2jvlVAhwRAtJnAJ9HuhOxCyoantytjX/BD4UiVpS32ACePu9h
+2chde+aaR4jMDYsC4W333/Y=
+=Btqy
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gettext.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gettext.patch
new file mode 100644
index 000000000000..c5eebe7ce71f
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-gettext.patch
@@ -0,0 +1,16 @@
+--- po/lgeneral/Makefile.in.in.old	2006-10-09 22:55:07.000000000 +0200
++++ po/lgeneral/Makefile.in.in	2006-10-09 22:57:28.000000000 +0200
+@@ -99,11 +99,8 @@
+ 	$(XGETTEXT) $(XGETTEXTFLAGS) --default-domain=$(PACKAGE) \
+ 	  --directory=$(top_srcdir) --add-comments \
+ 	  --keyword=tr --keyword=TR_NOOP \
+-	  --files-from=$(srcdir)/POTFILES.in \
+-	&& test ! -f $(PACKAGE).po \
+-	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
+-		&& $(MSGCONV) $(MSGCONVFLAGS) $(PACKAGE).po > $(srcdir)/$(PACKAGE).pot 2> /dev/null \
+-		&& rm -f $(PACKAGE).po )
++	  --files-from=$(srcdir)/POTFILES.in
++	$(MSGCONV) $(MSGCONVFLAGS) $(PACKAGE).po > $(srcdir)/$(PACKAGE).pot || true
+ 
+ $(srcdir)/cat-id-tbl.c: $(srcdir)/stamp-cat-id; @:
+ $(srcdir)/stamp-cat-id: $(srcdir)/$(PACKAGE).pot
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
index 73f47ff4b38c..766733df92cc 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.1 2006/08/26 20:38:33 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.2 2006/10/09 21:46:05 tupone Exp $
 
 inherit eutils autotools games
 
@@ -25,9 +25,9 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}"-gentoo-path.patch
+	epatch "${FILESDIR}/${P}"-gentoo-path.patch \
+		"${FILESDIR}"/${P}-gettext.patch
 	eautoreconf
-	touch po/lgeneral/lgeneral.pot
 	# Build a temporary lgc-pg that knows about /var/tmp/portage in work/lgc-pg:
 	cp -pPR "${S}" "${WORKDIR}/lgc-pg" || die "cp failed."
 	sed -i \