Fix bug #289361

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

5 files changed, 46 insertions, 6 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 6cde80b87334..22d5e89542e8 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.214 2010/04/26 19:43:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.215 2010/04/30 07:21:30 pacho Exp $
+
+  30 Apr 2010; Pacho Ramos <pacho@gentoo.org>
+  gnome-terminal-2.26.3.1-r2.ebuild,
+  +files/gnome-terminal-2.26.3.1-en_GB.patch, gnome-terminal-2.28.2.ebuild:
+  Fix British English documentation translation. Thanks to Daniel Schömer
+  for pointing to the issue and Markus Meier for reporting bug #289361. This
+  is solved by upstream in >2.30.1
 
   26 Apr 2010; Pacho Ramos <pacho@gentoo.org>
   gnome-terminal-2.26.3.1-r2.ebuild,
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 2d713134ec27..6baae10d38de 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-terminal-2.13.90-TERM-gnome.patch 413 RMD160 d2dd09acd8ac4b185316a09727cc5e3ebee100c3 SHA1 b83a85153e2c29fd287f97e873d1a851e57aac9a SHA256 812ffb7e6966b6ba813223af276c95d3a6efddceddc24b5637b085d4695dcd62
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
 AUX gnome-terminal-2.24.2-restore-switch-to-tab.patch 15041 RMD160 5860f46b1379dd40cd8ca9c9e23b30be5ef3e7cb SHA1 3ab937c566c401ad1ee82313cc6989338209fc47 SHA256 7edf095b8e037bcb2d41807eb3d26a6d4c9413088e1c9b58e4ef5eebf4c3a36e
 AUX gnome-terminal-2.26.3.1-cwd-on-new-tab.patch 7074 RMD160 36deb7b2808fe5db59fa3f3ae75c141d02d8c511 SHA1 64ac74d3eecff49416f93f02dc957b7fc00a91ce SHA256 7603ff478f8882816cc26f401f5dceca160bdab99878aa615eee34259efb93dd
+AUX gnome-terminal-2.26.3.1-en_GB.patch 697 RMD160 c51011605f1af753ffde6e146071cc81c2f87124 SHA1 d1a69db6616aa39c6921fa30fcb85e7fac2d0688 SHA256 a795069430962a1d53d111bc345297289c06d44fc391e3408d0bb2c67c5d3e62
 AUX gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch 2667 RMD160 b1f3ce54c8a90a54d1c2e5f1f87195c8d3c7f8fa SHA1 6c0b4d0a35c04b88b7219cd09f246fd489ec4808 SHA256 6b3fd92d3dced996fe09718873b007335fac14171fb667e7c04c9dc883d121a7
 AUX gnome-terminal-2.26.3.1-remove-plural.patch 624 RMD160 5b260d0407b8824aed762af5d387ac3532431355 SHA1 2f2386bb930b3cc61a7a99990996c12a2c1a2ab8 SHA256 3adfefbe62233b37c373fd49e5ab0c58055d25ff4b937f386f994240b2d7894c
 DIST gnome-terminal-2.26.3.1.tar.bz2 2176049 RMD160 db6b5ba601c3c74e3424e88119501b9414e1f37d SHA1 68dc9739b4d35c0647596b1773c5da76782f1164 SHA256 40d97f983363002d6da574b35f3e4d44d4e8db38b776b226626f1e83d6fde1dc
 DIST gnome-terminal-2.28.2.tar.bz2 2194820 RMD160 10b3cea1f57d7775c1209103cdf88e738ea4ac28 SHA1 d5437aa0cb8e30315f18a4f8b694fa21387cfe3a SHA256 ccf2547c579755ec9b6f727add6bb327bbda95ac621aa6e0738fbd37ab6c9c78
-EBUILD gnome-terminal-2.26.3.1-r2.ebuild 1829 RMD160 0be6b7b95cbf82b81b91b13d8674b5f1b7c2207c SHA1 fd0df83edd4d57723f23deec7aeaed922122dfb1 SHA256 ea8f8fc4913371216f806b12eecdc47398487dd2c59703796c732e3645b72f66
-EBUILD gnome-terminal-2.28.2.ebuild 1320 RMD160 f28e674b7e072594f63805355d0f437e77c6ba19 SHA1 895dda1ff25e52213698846fd68ccdf5f1de8c06 SHA256 2842068a8ea6425400770b2600930b19e99aa46c2c1170f6318bfcc0306bdb42
-MISC ChangeLog 29892 RMD160 9eeb1a059adcbbb71a4023ab6e7d29411e19b77d SHA1 15f59ed677cfdc36e042a7fc54b6d8e6330b8138 SHA256 fbdc621f7ccb694fd91fb48fa40f4905bc42bf6f90650c414f7c836e520c30ba
+EBUILD gnome-terminal-2.26.3.1-r2.ebuild 1938 RMD160 42016ef23be172e82c8d10aeba6af8890078efb5 SHA1 3ba88d3b521bf4039436c7e9fe97ba3bc35bbc42 SHA256 bfdb274d06b0fd6507212f0fddaca4005b7f502506cfe1bb8b1f06b28ca1a718
+EBUILD gnome-terminal-2.28.2.ebuild 1433 RMD160 6e5fe3240fd43dc91848dd909e97b5a35cd526de SHA1 90ddf38e13fd7bbc071441d582aba14121be8a49 SHA256 8af9a75bf45221aa021b1839167464d60ae727c42d7ed19c9216292ccef49545
+MISC ChangeLog 30239 RMD160 a1e8fb371dbbe7d130e95c47dcc2cbebd9171659 SHA1 566967d161096563d132a6e00f9884b0b1d2a997 SHA256 f093a14f918f5f1fa46f497a83d58df2bcc552c09181e92fb7a1c7b805c538b9
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvahQMACgkQCaWpQKGI+9RqVQCfQvx/rOrsmg6wMoynBn6wGGIe
+LSoAnAkz5RTAvjWggvQrqqhl1w4X8j60
+=ePYu
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch
new file mode 100644
index 000000000000..5e7e8b4a71cd
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch
@@ -0,0 +1,16 @@
+Fixing bug #289361 with a patch based in Daniel Schömer one and upstream
+commit 712fd4ab3056439a553dd650153a382b94073fac by Philip Withnall
+This is solved by upstream in gnome-terminal > 2.30.1
+http://bugs.gentoo.org/show_bug.cgi?id=289361
+https://bugzilla.gnome.org/show_bug.cgi?id=617206
+--- help/en_GB/en_GB.po~	2009-12-14 21:26:09.000000000 +0100
++++ help/en_GB/en_GB.po	2010-04-30 09:02:08.000000000 +0200
+@@ -1167,7 +1167,7 @@
+ 
+ #: C/gnome-terminal.xml:670(guilabel)
+ msgid "Disable menu shortcut key (F10 by default)"
+-msgstr "Disable menu shortcut key (<keycap>F10</keycap> by default)"
++msgstr "Disable menu shortcut key (F10 by default)"
+ 
+ #: C/gnome-terminal.xml:672(para)
+ msgid ""
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild
index cadc20690825..ad9a861c1009 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.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/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v 1.11 2010/04/27 04:50:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v 1.12 2010/04/30 07:21:30 pacho Exp $
 
 inherit eutils gnome2
 
@@ -53,6 +53,9 @@ src_unpack() {
 	# gnome-doc-utils. See bug #304091
 	epatch "${FILESDIR}"/${P}-remove-plural.patch
 
+	# Fix British English documentation translation (bug #289361)
+	epatch "${FILESDIR}"/${PN}-2.26.3.1-en_GB.patch
+
 	# patch gnome terminal to report as GNOME rather than xterm
 	# This needs to resolve a few bugs (#120294,)
 	# Leave out for now; causing too many problems
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild
index 2c6c83b509cc..0209c798bbba 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.28.2.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/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild,v 1.2 2010/01/06 19:24:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild,v 1.3 2010/04/30 07:21:30 pacho Exp $
 
 GCONF_DEBUG="no"
 
@@ -38,6 +38,9 @@ src_unpack() {
 	# Use login shell by default (#12900)
 	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
 
+	# Fix British English documentation translation (bug #289361)
+	epatch "${FILESDIR}"/${PN}-2.26.3.1-en_GB.patch
+
 	# patch gnome terminal to report as GNOME rather than xterm
 	# This needs to resolve a few bugs (#120294,)
 	# Leave out for now; causing too many problems