Fixed cleanup patch for LINGUAS="ja", bug #335803.

Package-Manager: portage-2.1.9.22/cvs/Linux x86_64

4 files changed, 158 insertions, 7 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 93a3d08eb404..3f7f342f41e0 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/a2ps
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.95 2010/09/27 20:24:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.96 2010/11/04 12:25:30 matsuu Exp $
+
+  04 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> a2ps-4.14-r1.ebuild,
+  +files/a2ps-4.14-ja-cleanup.patch:
+  Fixed cleanup patch for LINGUAS="ja", bug #335803.
 
   27 Sep 2010; Jeroen Roovers <jer@gentoo.org> a2ps-4.14-r1.ebuild:
   Stable for HPPA (bug #322867).
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 06fa45a845ae..a9b520836d6a 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4.13c-gcc34.patch 348 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf SHA1 2904d6dc351347984ad85181c497c2f6f2f21e5c SHA256 0e4ab84eed2dc0b73a5c393f16dea4687d4cc1d649186c2d2e8ccb7585f96159
 AUX 50a2ps-gentoo.el 253 RMD160 4e98bec1dd60efb072e7cf7b6e6e3f58d53a4ead SHA1 210038d9f7e39a14fa8639aa02cb7c81945883b1 SHA256 3d114d11eca3eb4f96e656d188e90082432a1206f39fd471d72c0d4e392d7615
 AUX a2ps-4.13-fixcachecheck.patch 444 RMD160 6a26c535b9af9be96d5a2ac32689b19daacc83f9 SHA1 64dadd08f018a65e380fd798157ce04af3a8f6b2 SHA256 d7f37d72ed46d73e26261c3473c738174ef8156f8a1dd9355850fcaa9befd622
@@ -14,6 +17,7 @@ AUX a2ps-4.13c-stdarg.patch 1505 RMD160 5e46f07ec9d37ab53262f9611397f19bf3bd0b6e
 AUX a2ps-4.14-check-mempcpy.patch 514 RMD160 b61b89124a6f8e810ee2ace6a042d0e8981cb7c2 SHA1 6aed29c1399e79f3914b408059610f9e7c0fc38e SHA256 7ec2164888d1621a8406d431ed3accd137ec8f92e0ca885175bc1c17010519a1
 AUX a2ps-4.14-cleanup.patch 2633 RMD160 bf24bdb82af32d0629b6dd7c52eebb88921c2138 SHA1 f28c1c30ae0ea86f0f0dc17ffa9a6afa9194cd57 SHA256 5c9285a014a8e57066978b93afbdafdd47d11ed01afaa7c15af4f20c8d2b991c
 AUX a2ps-4.14-fix-stpcpy-proto.patch 436 RMD160 4bb4768497ddde06486a0c22842010145660c97d SHA1 58fa90134f1027e3f05aeb08212cbcc10f420738 SHA256 3707120fbbbd8306f01fec785c18b9fa2eee02ec689cde5ad251a9337af6573e
+AUX a2ps-4.14-ja-cleanup.patch 3210 RMD160 1de85bd7ce534cf97d330336e910c63c553c2a08 SHA1 38c37116c09c803afa18719554f1633217746fb0 SHA256 f2d4ff66d3d908d65a2ce4dd69bceb933d6b02a6141996eae80f00dad389e68b
 AUX a2ps-4.14-psset.patch 616 RMD160 631a3750f41d61a03c49055592ff53f22d009fae SHA1 3b3a87084f67dd8348ad13fd4e01ebf5bef055ca SHA256 8525836efb9ba5db025b013e0262912ccabc77773307a8b79da6ec1f7444a9e3
 AUX a2ps-4.14-ptrdiff_t.patch 367 RMD160 5732e9b036abc697ab971f1efc88fd05119f5c19 SHA1 6c055c615d949971b6272b8f455d8e4c86317dd3 SHA256 09fa3327d064f3246103894b8abbbea2c7b0d2446080a4b5c9cd0510b9efd6d0
 DIST a2ps-4.13c-ja_nls.patch.gz 38189 RMD160 932f430064f77d65768d2d1701ea650ae1103bb0 SHA1 7eeb2c85697b5eff13701b7b600e4a959b12f134 SHA256 8bc15ae152205b184a609777ac29430780eadacba2fd90bfa1fe318e43bd781f
@@ -21,6 +25,23 @@ DIST a2ps-4.13c.tar.gz 2395885 RMD160 d6464e88236a4efa8377e37e29e548411cd9c863 S
 DIST a2ps-4.14-ja_nls.patch.gz 27576 RMD160 0e67be153e5bd87cbba2c615bc4ea76e72a800cb SHA1 fc939288580a1fcc1c3596ec4e77b049eab5d357 SHA256 90b2a4caf680f04ac8c325a4bc7434edf038ef7059003179b7fa65a5bafdecdc
 DIST a2ps-4.14.tar.gz 2552507 RMD160 a5105d6256a809483e099519325979aaaff7219e SHA1 365abbbe4b7128bf70dad16d06e23c5701874852 SHA256 f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4
 EBUILD a2ps-4.13c-r6.ebuild 3607 RMD160 73a39cf0ca753f9b8f1617d6019d275e5eeed6c4 SHA1 36f5fe7ef5ae605451e1819410aa5ead8f3213eb SHA256 a950bcd0453b54ece00dfbeea5c028fd36f82ac5c482edcfaf41590f9ef1faae
-EBUILD a2ps-4.14-r1.ebuild 2892 RMD160 8dff7dcab5db2363a24406cae24716bd319b1298 SHA1 056a0a71570934463a38aebf641837ea2d1658e7 SHA256 ef1f2d709d99b48611d9f737d868335bcb1258d0108c3b4ae2bc54c1aa27d535
-MISC ChangeLog 13958 RMD160 aa7e57d0fad39ae296ba55dd98f2b153b8276058 SHA1 7ca36a4047ca2ed02fbeb794988e60a8b0e52589 SHA256 1e6a3b2e235c5b1a93364aae010dfe73e7ba2b3f1278f903f902c8a4372330e0
+EBUILD a2ps-4.14-r1.ebuild 2976 RMD160 f3ad05fc8e1ea224728ccaad06fd3c78cba9f6c7 SHA1 eb16fa9a553fd29d073f270f9a93dcde4c6e1a00 SHA256 a6fea45fc75883bf5aac61f561a67c8fbd37fee681fe45e87010a652e30d54e8
+MISC ChangeLog 14122 RMD160 d8cef617dadc43be6f8864c35bfac8a43172c8ba SHA1 92b1645538d2d12095c55ff68f6cee2151bee74f SHA256 71f855893bb78e759e142e33405847a6803bd4ca5a4df015303ff0a13bd73d58
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJM0qZWAAoJECaGw+YFKA1pHEEQAJX4/9YZwmgQVAGdmNkNZJ4X
+ZKJmyIH3Om7Rk6MVot0KoCxfXbcBXW6OamQmd9VAqXnib9wuo+g4SzqFbVIKc9Ps
+l7d0Lo1+I2OzVhWhVAN7Sbhl9jG+XtokGzw/RKY/1h3FySLXSpj98l5VBKS5HI6M
+Lmi8yvXtLaTknevL9grVHgvcGFynBPcDdpqKbzrwjF2NRxSScf39XRSspBdw3GB7
+fsl2jobVXUKV36OMhF9M+cT7ucroocKsE/W4CJxq1ucnqoH/53RM/CzBVffYxIk9
+yqnTvPkIK3oW36fx86GaOtl1u2ZRJYGWsqrp1f7smc42s523fe+zLQwmFD9T15zE
+29Mz7H1+SWEKaLeAIWQIZfbZmEkNcLfXBUcpW06I7225zsdeTg3V9hD6SoJMhsFw
+CBmtbCSbeTV+C7Hfzdg+KQsrFN/Zz6O/+1hdfW63gg42vbR1C71TQl+NOKjPUowP
+xazCc9kjkf/rt2KEJk6DTTAFI+nhzDbyPEApyIfHKuDZu0Kw+JWnuLNUXEcJBY2u
+ch9bFI1Kbt0llT5oRzsoVSpnmJONCXV+tJr1QvqF9iymSgeqVkQelbBdq1TRCFDr
+OFUZa+txGYSR8jTr2BE7voa7y567dxC5eC6XQyfKurL9aodsnEjSeVz6gsnYlWAJ
+GF1i0GXi6rwjEJhgH8Un
+=tKLj
+-----END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.14-r1.ebuild b/app-text/a2ps/a2ps-4.14-r1.ebuild
index 8d89d2170118..6f6d16218bf5 100644
--- a/app-text/a2ps/a2ps-4.14-r1.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r1.ebuild,v 1.9 2010/09/27 20:24:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r1.ebuild,v 1.10 2010/11/04 12:25:30 matsuu Exp $
 
 inherit eutils autotools elisp-common
 
@@ -44,7 +44,13 @@ src_unpack() {
 	# this will break
 	#epatch "${FILESDIR}/${PN}-4.13c-stdarg.patch"
 	use vanilla || epatch "${FILESDIR}/${PN}-4.13-stdout.diff"
-	use linguas_ja && epatch "${DISTDIR}/${P}-ja_nls.patch.gz"
+	if use linguas_ja ; then
+		epatch "${DISTDIR}/${P}-ja_nls.patch.gz"
+		# bug #335803
+		epatch "${FILESDIR}/${P}-ja-cleanup.patch"
+	else
+		epatch "${FILESDIR}/${P}-cleanup.patch"
+	fi
 
 	# fix fnmatch replacement, bug #134546
 	epatch "${FILESDIR}/${PN}-4.13c-fnmatch-replacement.patch"
@@ -67,8 +73,6 @@ src_unpack() {
 	# fix compilation error due to obstack.h issue, bug 269638
 	epatch "${FILESDIR}/${P}-ptrdiff_t.patch"
 
-	epatch "${FILESDIR}"/${P}-cleanup.patch
-
 	eautoreconf
 }
 
diff --git a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch
new file mode 100644
index 000000000000..16271b3ec674
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch
@@ -0,0 +1,122 @@
+diff --git lib/argmatch.c lib/argmatch.c
+index f983e9d..eadc7ea 100644
+--- lib/argmatch.c
++++ lib/argmatch.c
+@@ -21,6 +21,7 @@
+ #include "argmatch.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #ifdef STDC_HEADERS
+ # include <string.h>
+ #endif
+diff --git lib/encoding.c lib/encoding.c
+index 9bd9f2a..f554a6d 100644
+--- lib/encoding.c
++++ lib/encoding.c
+@@ -989,7 +989,7 @@ dump_encoding_setup (FILE * stream,
+   /* Create the dictionary and fill it */
+   fprintf (stream, "%% Dictionary for %s support\n",
+ 	  encoding->name);
+-  fprintf (stream, "/%sdict %d dict begin\n", encoding->key,
++  fprintf (stream, "/%sdict %zu dict begin\n", encoding->key,
+ 	   (encoding->composite_flag == true)? nb+nb+ns:nb+ns);
+   for (i = 0 ; i < nb ; i++)
+     fprintf (stream, "  /f%s %sEncoding /%s reencode_font\n",
+diff --git lib/output.c lib/output.c
+index b5fc37d..5f67676 100644
+--- lib/output.c
++++ lib/output.c
+@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type)
+ static void
+ derivation_self_print (struct derivation * derivation, FILE * stream)
+ {
+-  fprintf (stream, "At %x: ", (int) derivation);
++  fprintf (stream, "At %p: ", derivation);
+   switch (derivation->type)
+     {
+     case nothing:
+@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job,
+ 		     expand_user_string (job, FIRST_FILE (job),
+ 					 (const uchar *) "Expand: requirement",
+ 					 (const uchar *) token));
+-	output (dest, expansion);
++	output (dest, "%s", expansion);
+ 	continue;
+       }
+ 
+diff --git lib/parseppd.y lib/parseppd.y
+index a7558ba..c89d188 100644
+--- lib/parseppd.y
++++ lib/parseppd.y
+@@ -154,7 +154,7 @@ font_clause :
+ void
+ yyerror (const char *msg)
+ {
+-  error_at_line (1, 0, ppdfilename, ppdlineno, msg);
++  error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg);
+ }
+ 
+ /*
+diff --git lib/psgen.c lib/psgen.c
+index 9eeef74..9d7a27d 100644
+--- lib/psgen.c
++++ lib/psgen.c
+@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker)
+     default:
+       *buf = '\0';
+       ps_escape_char (job, cp[i], buf);
+-      output (jdiv, (char *) buf);
++      output (jdiv, "%s", buf);
+       break;
+     }
+   }
+diff --git lib/quotearg.c lib/quotearg.c
+index 16d0b91..89db991 100644
+--- lib/quotearg.c
++++ lib/quotearg.c
+@@ -60,6 +60,7 @@
+ 
+ #if HAVE_MBRTOWC && HAVE_WCHAR_H
+ # include <wchar.h>
++# include <wctype.h>
+ #else
+ # define iswprint(wc) 1
+ # define mbrtowc(pwc, s, n, ps) 1
+diff --git lib/title.c lib/title.c
+index cf4a34b..7a3e87b 100644
+--- lib/title.c
++++ lib/title.c
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
+ # if __STDC__
+diff --git src/long-options.c src/long-options.c
+index fb40cd9..7bd77b0 100644
+--- src/long-options.c
++++ src/long-options.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <getopt.h>
+ #include "closeout.h"
+ #include "long-options.h"
+diff --git src/parsessh.y src/parsessh.y
+index 21e9559..569fdb6 100644
+--- src/parsessh.y
++++ src/parsessh.y
+@@ -740,7 +740,7 @@ exception_def_opt:
+ void
+ yyerror (const char *msg)
+ {
+-  error_at_line (1, 0, sshfilename, sshlineno, msg);
++  error_at_line (1, 0, sshfilename, sshlineno, "%s", msg);
+ }
+ 
+ /*