Fix bug #232081, gcc-4.3 compat. Thanks to Magnus Granberg <zorry@ume.nu>.

Package-Manager: portage-2.2_rc10/cvs/Linux 2.6.25.8 i686

4 files changed, 35 insertions, 4 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 0d46e2002d08..0b6bdab189d6 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.165 2008/08/02 12:04:24 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.166 2008/09/26 22:31:33 loki_val Exp $
+
+  26 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/gettext-0.17-open-args.patch, gettext-0.17.ebuild:
+  Fix bug #232081, gcc-4.3 compat. Thanks to Magnus Granberg <zorry@ume.nu>.
 
   02 Aug 2008; Panagiotis Christopoulos <pchrist@gentoo.org> metadata.xml:
   Update metadata.xml to include USE flag descriptions. Entries taken from
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index da82e976b2c5..efb4aff17eac 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,9 +1,10 @@
 AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
 AUX gettext-0.14.2-fix-race.patch 372 RMD160 133c369283a0cc8ab2a9ab4423703aabcffdd282 SHA1 c8e41675adc04647daae48477c1116a71544d09c SHA256 40495c22d86688d1862742ef11a8c9dc5ffddb4e91070d365e6b9639c105c298
 AUX gettext-0.15-expat-no-dlopen.patch 585 RMD160 7e41b0b5b1f9a8eb220a445fde835c3a7a3f3ade SHA1 941da91b9e83eb137a222546e9d83777926ed46f SHA256 dc5d9adff87b786ec753b1251c135355daeb185ab275ee40d165031e56c5f539
+AUX gettext-0.17-open-args.patch 1015 RMD160 11e344dcfa926fefe8045a08e97933722f47da31 SHA1 357ebe671577c4a78b2abee5228866e01dd804f8 SHA256 6409b1adbddbdb96d682ddb973e54f37d5e253b5b226e74b50b8d0874b553638
 DIST gettext-0.16.1.tar.gz 8539634 RMD160 0fa96b2d005e2490e8603a0a3612041086d5aea1 SHA1 8642f4346dfd6a18ecd883329e150bfe9e0886c3 SHA256 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d
 DIST gettext-0.17.tar.gz 11640890 RMD160 36df9d4ad2848ec26729781e0d7e25b419e7d261 SHA1 c51803d9f745f6ace36bd09c0486d5735ce399cf SHA256 209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
 EBUILD gettext-0.16.1-r1.ebuild 3223 RMD160 195f67381b0b0ecfa82dd167b7f5959834661804 SHA1 a6bd8330bb6ac55bbfa3299f7eb00cec05229cef SHA256 86f6086696d72b8e0d2774383f93647275e45c2af96d018336fa598c82931de8
-EBUILD gettext-0.17.ebuild 3566 RMD160 ddab230cb0ca9e1e93ba9806921d1ab97f280f39 SHA1 924d638b10ad4146c211816e5856b3c19099abdd SHA256 a1145a5bff8ce40be0d168e43e311eac61681ecf8693504ac633722dafc2092e
-MISC ChangeLog 21041 RMD160 9fbe3201867645f93dbd0809638489d4c7cf23c1 SHA1 8908db9f192e3e1275cfef84c793ac1c11cb1273 SHA256 29c614259eb05b10f7608f7c0bc52af9ea7dda9ec8f2cd4cabbc6ab086b21647
+EBUILD gettext-0.17.ebuild 3623 RMD160 58fd224bbed36fe676281fac0e6c472a4a12fc08 SHA1 3962dbd080cff6edff1e3461214f78dd39ca81f3 SHA256 a980cb5833bd91dc6688ac1c570e6dffdf49d95f22c6a32218064999e5a3514b
+MISC ChangeLog 21233 RMD160 e507bb541d1c50a478e30f8cd399d3df836db2a0 SHA1 4ae7b84585107454ab4beaabcd05c50fcbe90235 SHA256 9924db599e5e7bf675d40479401709eca87018ae721c893dbae005e9f2ea96a2
 MISC metadata.xml 258 RMD160 f35ba24ca6c7d1c5620a5a7596839fa45c4184a1 SHA1 e468fcf9c945339ed3e2e056e78ca4d4a8e54767 SHA256 b60f1091b1c8bf5d06708114f676be0e01eebda5e0f5223925e859619f829021
diff --git a/sys-devel/gettext/files/gettext-0.17-open-args.patch b/sys-devel/gettext/files/gettext-0.17-open-args.patch
new file mode 100644
index 000000000000..330cbf614631
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.17-open-args.patch
@@ -0,0 +1,25 @@
+2007-11-07  Jim Meyering  <meyering@redhat.com>
+            Bruno Haible  <bruno@clisp.org>
+
+	* write-catalog.c (msgdomain_list_print): Fix open() call.
+
+--- gettext-tools/src/write-catalog.c	7 Oct 2007 19:35:31 -0000	1.4
++++ gettext-tools/src/write-catalog.c	7 Nov 2007 11:43:15 -0000
+@@ -1,5 +1,5 @@
+ /* GNU gettext - internationalization aids
+-   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
++   Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -220,7 +220,9 @@
+       /* Open the output file.  */
+       if (!to_stdout)
+ 	{
+-	  fd = open (filename, O_WRONLY | O_CREAT);
++	  fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC,
++		     /* 0666 in portable POSIX notation: */
++		     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+ 	  if (fd < 0)
+ 	    {
+ 	      const char *errno_description = strerror (errno);
diff --git a/sys-devel/gettext/gettext-0.17.ebuild b/sys-devel/gettext/gettext-0.17.ebuild
index 8ff4e4868110..3da6cb4f0973 100644
--- a/sys-devel/gettext/gettext-0.17.ebuild
+++ b/sys-devel/gettext/gettext-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.12 2008/07/02 20:39:13 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.13 2008/09/26 22:31:33 loki_val Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.14.1-lib-path-tests.patch #81628
 	epatch "${FILESDIR}"/${PN}-0.14.2-fix-race.patch #85054
 	epatch "${FILESDIR}"/${PN}-0.15-expat-no-dlopen.patch #146211
+	epatch "${FILESDIR}"/${PN}-0.17-open-args.patch #232081
 
 	# bundled libtool seems to be broken so skip certain rpath tests
 	# http://lists.gnu.org/archive/html/bug-libtool/2005-03/msg00070.html