Pull in a small i18n fix from upstream.

Package-Manager: portage-2.1.2-r4

4 files changed, 37 insertions, 14 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 7f668f688469..ac8ad51ae17c 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.223 2007/01/06 10:28:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.224 2007/01/28 17:17:59 swegener Exp $
+
+  28 Jan 2007; Sven Wegener <swegener@gentoo.org> +files/xc280-fix-ja.diff,
+  xchat-2.8.0.ebuild:
+  Pull in a small i18n fix from upstream.
 
   06 Jan 2007; Sven Wegener <swegener@gentoo.org> xchat-2.8.0.ebuild:
   Add postinst message about integrated systray icon.
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 814c474ac7b5..be69eaff1c2c 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -25,6 +25,10 @@ AUX xc280-fix-back.diff 417 RMD160 4ad490abfb3a215509359b1e911557486ca29a98 SHA1
 MD5 f41792f986d2b916630cb7de4bab0bfc files/xc280-fix-back.diff 417
 RMD160 4ad490abfb3a215509359b1e911557486ca29a98 files/xc280-fix-back.diff 417
 SHA256 00c05695b8e486adef4b1749e79f6f9e6e012f3682fc2f64aff0fe8b1600ebcb files/xc280-fix-back.diff 417
+AUX xc280-fix-ja.diff 408 RMD160 92117513969886c5b882cea7594f09bb789cfd33 SHA1 1bca14e6e22acfbceedd1ebcd6c0ae0260589dad SHA256 3d7728fb3913a12765de778fe1f7db065f6a310c35c290d1c10439f7108fe771
+MD5 e6795d111f0185592da8b0f3eafc305b files/xc280-fix-ja.diff 408
+RMD160 92117513969886c5b882cea7594f09bb789cfd33 files/xc280-fix-ja.diff 408
+SHA256 3d7728fb3913a12765de778fe1f7db065f6a310c35c290d1c10439f7108fe771 files/xc280-fix-ja.diff 408
 AUX xchat-2.6.4-fix-cursor.patch 573 RMD160 c34576decb09cd2d830364f9596aabb987a59632 SHA1 a91ee61344786514d371d01375a4231e895d0d69 SHA256 11d8772c68e31d9abab9d7de5440ab8db81e2a2dc1e87f525fa0a0c5518e636b
 MD5 2e88d0e5c2d41b8e04e93d41b4dcfa00 files/xchat-2.6.4-fix-cursor.patch 573
 RMD160 c34576decb09cd2d830364f9596aabb987a59632 files/xchat-2.6.4-fix-cursor.patch 573
@@ -71,14 +75,14 @@ EBUILD xchat-2.6.8.ebuild 2517 RMD160 a22456b158d74ccfc926230e1c0c39e922297416 S
 MD5 38a0255435c4dee30b10ef63d4791755 xchat-2.6.8.ebuild 2517
 RMD160 a22456b158d74ccfc926230e1c0c39e922297416 xchat-2.6.8.ebuild 2517
 SHA256 290539940dd8e3a665d9e02502fc6f642cedf0494b53fc59097e6e7c073ab6b3 xchat-2.6.8.ebuild 2517
-EBUILD xchat-2.8.0.ebuild 2627 RMD160 a3243ce3f65ef3dfcaf4ce64e82c0ae8d5b8cd07 SHA1 414082585cd7bc635db1bdb08b7f76ca221146b8 SHA256 9039200cbde8bcfd4f3570839301bbdee631ec0bb163abe1d164a5e8869fb385
-MD5 8ec1aaea5b799ae9805470a5c2c02144 xchat-2.8.0.ebuild 2627
-RMD160 a3243ce3f65ef3dfcaf4ce64e82c0ae8d5b8cd07 xchat-2.8.0.ebuild 2627
-SHA256 9039200cbde8bcfd4f3570839301bbdee631ec0bb163abe1d164a5e8869fb385 xchat-2.8.0.ebuild 2627
-MISC ChangeLog 33141 RMD160 cc24f14773fe9715db6dd25e810c1fbfd55c7ca4 SHA1 28c834eb55729c610b7509e467c2ee6931424da8 SHA256 e3e809504a713a229547bb78aca75a83746c169410c1b799d6eba5d66ca71d83
-MD5 9c91a6b314d2cf18a89a7ea88f931d24 ChangeLog 33141
-RMD160 cc24f14773fe9715db6dd25e810c1fbfd55c7ca4 ChangeLog 33141
-SHA256 e3e809504a713a229547bb78aca75a83746c169410c1b799d6eba5d66ca71d83 ChangeLog 33141
+EBUILD xchat-2.8.0.ebuild 2667 RMD160 8fc0583674cd652b50e03f2062aa56fe5f408c76 SHA1 d514acc75e5a1ae13b157fdc0a423f59aba87601 SHA256 37112ef413503f425a639e9c5af14815c870812cde2dc00a2ba35b4775e3d237
+MD5 b136c436358f407eec448d64c9ce56a0 xchat-2.8.0.ebuild 2667
+RMD160 8fc0583674cd652b50e03f2062aa56fe5f408c76 xchat-2.8.0.ebuild 2667
+SHA256 37112ef413503f425a639e9c5af14815c870812cde2dc00a2ba35b4775e3d237 xchat-2.8.0.ebuild 2667
+MISC ChangeLog 33282 RMD160 b741ca0cd3b21805c0c04010afc2521a03a5a224 SHA1 936a9e3dc00cd34025178ad25c4433af4149abba SHA256 2c7c0d57edd55e0301ddc76055f83784f24635620d722178b5ba1d2bd6bf35b9
+MD5 55ad8fbad559ea1211fb8225e7ffba6b ChangeLog 33282
+RMD160 b741ca0cd3b21805c0c04010afc2521a03a5a224 ChangeLog 33282
+SHA256 2c7c0d57edd55e0301ddc76055f83784f24635620d722178b5ba1d2bd6bf35b9 ChangeLog 33282
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -105,9 +109,9 @@ MD5 b3e2949a39f06e663eeef05700d5907e files/digest-xchat-2.8.0 506
 RMD160 ae3ec7e73f9b27754b76e4ee9a07ea10398bda4e files/digest-xchat-2.8.0 506
 SHA256 bdf80ad286d8c86f7ffe7e19a3576f52cd37a6c68d69f6b5e3c50dc8ab441820 files/digest-xchat-2.8.0 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFn3nMI1lqEGTUzyQRAscPAJ9p2lOVFXi8vNC1j7CQ1n5V/fI1OwCff+iR
-DJvFB7yCg6X+Esd4ne0Aj4M=
-=n+3q
+iD8DBQFFvNrQI1lqEGTUzyQRArNDAJ9IVvJ0tv+34xuvtgjHXdwhDgoW+QCbBmXe
+ilIEmDDe2y9Bo398ZcubDiY=
+=ZoYR
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/xc280-fix-ja.diff b/net-irc/xchat/files/xc280-fix-ja.diff
new file mode 100644
index 000000000000..737a5457fcef
--- /dev/null
+++ b/net-irc/xchat/files/xc280-fix-ja.diff
@@ -0,0 +1,14 @@
+#
+# Japanese translation error in 2.6.8 and 2.8.0 causes xchat NOT to run!
+#
+--- xchat-2.6.8/po/ja.po	8 Aug 2006 14:39:41 -0000	1.16
++++ xchat-2.6.8p1/po/ja.po	15 Nov 2006 00:59:59 -0000
+@@ -1082,7 +1176,7 @@
+ 
+ #: src/common/textevents.h:318
+ msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+-msgstr "%C28-%C29$1/Wallops%C28-%O$t$"
++msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+ 
+ #: src/common/textevents.h:321
+ #, fuzzy
diff --git a/net-irc/xchat/xchat-2.8.0.ebuild b/net-irc/xchat/xchat-2.8.0.ebuild
index 5fa40d15c028..6e771f277c48 100644
--- a/net-irc/xchat/xchat-2.8.0.ebuild
+++ b/net-irc/xchat/xchat-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.0.ebuild,v 1.3 2007/01/06 10:28:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.0.ebuild,v 1.4 2007/01/28 17:17:59 swegener Exp $
 
 inherit eutils versionator gnome2
 
@@ -37,6 +37,7 @@ src_unpack() {
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
 
 	epatch "${FILESDIR}"/xc280-fix-back.diff
+	epatch "${FILESDIR}"/xc280-fix-ja.diff
 
 	# use libdir/xchat/plugins as the plugin directory
 	if [ $(get_libdir) != "lib" ] ; then