Fix XML syntax error in French translation (bug #326739 by Neil Leathers).

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

4 files changed, 44 insertions, 8 deletions

diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index 6025dc65e1af..e36c6ff7dc4c 100644
--- a/gnome-extra/gnome-user-docs/ChangeLog
+++ b/gnome-extra/gnome-user-docs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-user-docs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.36 2010/06/13 22:05:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.37 2010/07/05 11:54:26 pacho Exp $
+
+  05 Jul 2010; Pacho Ramos <pacho@gentoo.org> gnome-user-docs-2.30.1.ebuild,
+  +files/gnome-user-docs-2.30.1-fr_FR.patch:
+  Fix XML syntax error in French translation (bug #326739 by Neil Leathers).
 
 *gnome-user-docs-2.30.1 (13 Jun 2010)
 
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index c1518c5f1d97..4db3813dd61a 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX gnome-user-docs-2.24.2-parallel-make-gdu.patch 1280 RMD160 3a20cdca51cb0c7792f968955dbd48743e78536e SHA1 d7eb1ef27cf446d0ceed1e90f68e6291b0b90a01 SHA256 5c5bb2a29a17a4a55014e1d89e141248f0b542e2f2b78d827dfbaa26b2fefd8b
 AUX gnome-user-docs-2.24.2-parallel-make.patch 1207 RMD160 9d319f5c749178eee42f35d7a71d8c0c9c979be8 SHA1 70f4357a0abd931d6b1a826e9f932098923abfab SHA256 6c602de1cd1cb19166ddce932b1d89af4cae5246bcf1654066ecc52bacbabe79
+AUX gnome-user-docs-2.30.1-fr_FR.patch 852 RMD160 f82c4279f0ffdc0b6796d89ed3329b89d08862ac SHA1 c3f9dfdfbc9872288f78e517dcbf4743e75ad6ef SHA256 80e47d1906f9cf8e70ccf97e1874bb8c4e9ddd2775e4ce8522ccc606e4af4507
 DIST gnome-user-docs-2.24.2.tar.bz2 13192540 RMD160 a44435f1d4cda5e10ee77c4352e55d5584970111 SHA1 ecefc0f91837bea39108a4ed6f345357f9fa2c5a SHA256 c8e05a98d723356fa72681bf90f7a27a666ff6468a9489d7f6ea682a0390ab3a
 DIST gnome-user-docs-2.26.2.tar.bz2 15332554 RMD160 ee43875a78186d21031079efd9f9fa7beff373c5 SHA1 95c66b850e52300f4ed0d3769e0b04cb91d21c31 SHA256 2feb6430305b0cdc55ef48a3e93c79033e6b76334a980cc1ec6963f977221a98
 DIST gnome-user-docs-2.28.0.tar.bz2 17522300 RMD160 85c6f3f878960fcb33a3ef23ed4958f15ee02584 SHA1 6a31476c1eba0c98472c60442f320ae2a9bb7bfc SHA256 d35be6e255a58025efb9a152ab126663e099f414afcc313bcf97ce82b32fc562
@@ -14,13 +15,13 @@ EBUILD gnome-user-docs-2.26.2.ebuild 1121 RMD160 f0229e2ac635cc35f057afbe00b97ce
 EBUILD gnome-user-docs-2.28.0.ebuild 838 RMD160 97712e0f5ee71acd4145bd22e0d681eb9ae43fc1 SHA1 244b1c19eab15ae9493fba21940fc0148eb48934 SHA256 544ef8f1b8cfe41b777e246e51efe71c3aaef79de042d6da5f85e36282ea641c
 EBUILD gnome-user-docs-2.28.1.ebuild 833 RMD160 6e6125a960dec0002ab99c672b52f879cdfe039d SHA1 929a91186ac487e85df9c125448a8ab16fc15ee6 SHA256 f84655328a15cdac5ada0ceb3c2614ac39a7754978111087c8bc73c8549d6d2b
 EBUILD gnome-user-docs-2.28.2.ebuild 835 RMD160 e1c3e6d568df2eb7d7aff17055f6dd724bbbeea6 SHA1 6f76eb2dc578f6f51c6d6ddc2b9e3a99af1e220f SHA256 95fa63a1330f1224c4cbdc52952f3b9800ba34b254163a7fa4f6598df25748d7
-EBUILD gnome-user-docs-2.30.1.ebuild 836 RMD160 45c5cc4a702733ebf4fe651de7a36c14fd49ebc7 SHA1 8c0dfd67c5d92bb110fa3c7cd294ec418efa4d7e SHA256 0ebd7d0a77c5271c1e49e02dfee246e23d9aa7e9fc18eb2f971a946ad73a14f9
-MISC ChangeLog 17652 RMD160 06793165e466dfd0dafb9823ece7d9b8dde6cdab SHA1 bf04aefba0d0ba5ccb4d293aa64be9fd197397ef SHA256 bc21a08013ff119bfc4d70486ad74324e80b77cc2724d6fc5c721d0dedbe54e1
+EBUILD gnome-user-docs-2.30.1.ebuild 976 RMD160 a46817c5de37ec7ada6ddd02dc733dec6489f261 SHA1 a519f9070a05876f40d2d5c4a76ff1258e3ac36c SHA256 b821641ac0dc96781e13b3ed53c68d97d6886ad064af40dc805a49fde7c415f8
+MISC ChangeLog 17852 RMD160 b6e3d84811cf30f8c31e3c273e1c8074678b69ca SHA1 37c8f0e9b1bd4ae6be7d1873c6a9b460b3ec10bf SHA256 0d2fca0aba2ea9767cd0c360574bfbb07e10ebdc433f33e9ba5f9fb9bb0762a9
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwVVioACgkQCaWpQKGI+9QjggCggyozgTM9ZUm9aHJ5a/iHVhdG
-IA4AnApYpVNPJrsOThonPTLuvemx/tUT
-=G65I
+iEYEARECAAYFAkwxx/gACgkQCaWpQKGI+9S+vwCfaDn0a53eWWiMUMjB29nIH5nS
+upkAn0D8H2srOz+IQxoYKtqiZwb8xPiF
+=fZSV
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.30.1-fr_FR.patch b/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.30.1-fr_FR.patch
new file mode 100644
index 000000000000..b0e423b3e97e
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.30.1-fr_FR.patch
@@ -0,0 +1,22 @@
+From cfc31a3dc7924286e60246399957732baf1691b6 Mon Sep 17 00:00:00 2001
+From: Claude Paroz <claude@2xlibre.net>
+Date: Sat, 03 Jul 2010 20:44:08 +0000
+Subject: Fix XML syntax error in French translation
+
+Fixes bug #623477
+---
+diff --git a/gnome2-accessibility-guide/fr/fr.po b/gnome2-accessibility-guide/fr/fr.po
+index a914b7b..32d955e 100644
+--- a/gnome2-accessibility-guide/fr/fr.po
++++ b/gnome2-accessibility-guide/fr/fr.po
+@@ -8809,7 +8809,7 @@ msgid ""
+ "\"Say all\" command; reads from the current position of the caret to the end "
+ "of the document."
+ msgstr ""
+-"<keycombo><keycap>Verr. Maj</keycap><keycap>point-virgule<keycap> </"
++"<keycombo><keycap>Verr. Maj</keycap><keycap>point-virgule</keycap> </"
+ "keycombo> : commande « Tout lire », lit depuis la position actuelle du "
+ "curseur jusqu'à la fin du document."
+ 
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.30.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.30.1.ebuild
index b2fa135427cf..1eb3caa6f250 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.30.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-2.30.1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.30.1.ebuild,v 1.1 2010/06/13 22:05:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.30.1.ebuild,v 1.2 2010/07/05 11:54:26 pacho Exp $
+
+EAPI=2
 
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="GNOME end user documentation"
 HOMEPAGE="http://www.gnome.org/"
@@ -30,3 +32,10 @@ DOCS="AUTHORS ChangeLog NEWS README"
 pkg_setup() {
 	G2CONF="${G2CONF} --disable-scrollkeeper"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix XML syntax error in French translation
+	epatch "${FILESDIR}/${P}-fr_FR.patch"
+}