Fix XML syntax in po files for de, fi, and hu (bug #262325). Thanks a lot to Dustin Polke for the patch. Remove old testing version that won't be stabilized ever.

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

5 files changed, 77 insertions, 97 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 8d6d33924658..d2625322f6f5 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.300 2010/05/04 16:21:35 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.301 2010/05/08 10:40:59 pacho Exp $
+
+  08 May 2010; Pacho Ramos <pacho@gentoo.org> -gedit-2.28.3.ebuild,
+  gedit-2.28.4.ebuild, +files/gedit-2.28.4-xml-syntax.patch:
+  Fix XML syntax in po files for de, fi, and hu (bug #262325). Thanks a lot
+  to Dustin Polke for the patch. Remove old testing version that won't be
+  stabilized ever.
 
   03 May 2010; Olivier Crête <tester@gentoo.org> gedit-2.28.4.ebuild:
   amd64 stable, bug #314899
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index cd464f21300c..1b06677c52f7 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -4,19 +4,18 @@ Hash: SHA1
 AUX gedit-2.16.2-no_python_module_docs.patch 730 RMD160 81afcad6cca9d0be7311fca0da788d93368beef4 SHA1 70f11ceb222c58a85f5ce4d08474dbc70b3abfe5 SHA256 7cff8d687f0def86ccabd6bc584e9a57de23e48e9b8fb7d5f241f60ac7c3b38c
 AUX gedit-2.22.1-fix-libtool-2.2.patch 250 RMD160 26f257916aaa2bc99bc54be02f60ee57129825a6 SHA1 a6df9ba1042e8001548c9e89f1e1f3cfbda0df31 SHA256 091fe2c54d41032f5f4857787e1235709349215db44060a3d07545aaacbfb0b9
 AUX gedit-2.26.3-external_tools_config.patch 1389 RMD160 3709a253e35bce544493232f6faa4982e537f366 SHA1 c64c30defa6bbb2101849bb74874ebaf98f9ed4b SHA256 c690607e75553d9a93cfd9b397c68247c7b4cfc804103b9240be108d519e7eb8
+AUX gedit-2.28.4-xml-syntax.patch 2427 RMD160 75a63fc542b5ae59c488808049e206d4a17e646b SHA1 2253c5d32d5eccc574c48ce58e49de936cf8ee4b SHA256 e99c38e7294e66e35664fc55419c909a3920593c47275b5524e40b6f35253b45
 DIST gedit-2.26.3.tar.bz2 4527425 RMD160 4248dbbaad3df23203654e8c3a70198bd25a5f3e SHA1 57ee9519a1c28195fb5b5bafa06308d816246c53 SHA256 955be93a9c5d01849ab1e723c7bc6c25474a8ca5997396bae6fa0feb2bbdcb53
-DIST gedit-2.28.3.tar.bz2 4605020 RMD160 b063a9e6346a17e81b149fb935c14514279c7c9b SHA1 d8e561f6598fae766c17cd385171246b9041a50e SHA256 59458f21850eaaf72d26d957735e728f9e9b197ca7070a1ca096d8b66313b51d
 DIST gedit-2.28.4.tar.bz2 4597928 RMD160 3bd518f8e91d04fcb6b7e06e59f27185a735aded SHA1 5f28f25c8b86cc8a5ba875121124099b94681d48 SHA256 56e72b15ecc2f27cb35c636f0efe2b78eaf463264d06d7bb33de830f38247932
 EBUILD gedit-2.26.3-r1.ebuild 2053 RMD160 96920fad96420cf5a90107ea1ebeaa9ecaca9c8a SHA1 c7a2adebd7bf0fe067a177918577b2eaff2927d2 SHA256 54743c9392d090d1c01254d601cc5cf61b7fd5584496ff42bd2ec9cc1acbf380
 EBUILD gedit-2.26.3.ebuild 1900 RMD160 56c186a81bfe3d238ac923a2203496dd9795d1c6 SHA1 2912b6f7ddf06ec99eff7914355c33d98f53efda SHA256 32fde97ad815e0337dcf888e68cdce51dfa38a7a0bf61c5439f14e20bbddf5c6
-EBUILD gedit-2.28.3.ebuild 2157 RMD160 2f8e5466fe802e5073ce24110d1f934971c411ff SHA1 0a7d6b07d82f90ebd70129c747d3fe5dae2b943d SHA256 56e3dbb4773433270272a2ce42a686e770f569e219547f2655c43899bb275421
-EBUILD gedit-2.28.4.ebuild 2158 RMD160 7e6fd26d3ce7ff9c66ef0b70cf7d41c89339a2eb SHA1 a2235c19c3ecb3e0e41131b33ce50e7f725d35e5 SHA256 0b1c555b810de9aa86b571daabd9b4023defe632ca33f32a4a9d82935cb8c7fa
-MISC ChangeLog 37069 RMD160 f901206bad82158b5c6af7dbc861bcda9c9cfd91 SHA1 bb7530a3982cd226eb7766659c6db334b855c52a SHA256 0d030d67d522eefde90e2b24238bba8c6ee99a9bcc4f03491a761ff11b0752c3
+EBUILD gedit-2.28.4.ebuild 2251 RMD160 546a77e645cb0e303e66f7c56cd35cd36fb371a1 SHA1 2e2c17a027f3afa2f09fbb54b5f01d41ca62af9c SHA256 c074be727604a84117195c7d671043043f199a5677d3f08d89a5186796fdbe05
+MISC ChangeLog 37367 RMD160 1c4d44985ba69fc9ac3601327fec1dd9f88eb13b SHA1 d35d1e9dacc9f28c7180f5dfa13b7bbd367b8b66 SHA256 c26322951d4b518dc25ab03a5181be5c42c6f73d1478f8a15ff0c99c5402fcf3
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvgSZkACgkQmOfEJZHYOKdmcACgvKJoxdNLK1iVqUwokFZ2LVlo
-j4sAn2O6H0Jwszi+toCg7tZhHF3/WXPv
-=RZbR
+iEYEARECAAYFAkvlP8UACgkQCaWpQKGI+9SizQCfcJQvGmg5bSyFRY2vkzcMk0rr
+VssAnj3tOLyRNTsvls5AkqxQ4n1TglGP
+=zELU
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/files/gedit-2.28.4-xml-syntax.patch b/app-editors/gedit/files/gedit-2.28.4-xml-syntax.patch
new file mode 100644
index 000000000000..a63fac8acb65
--- /dev/null
+++ b/app-editors/gedit/files/gedit-2.28.4-xml-syntax.patch
@@ -0,0 +1,60 @@
+From 9b2d27fd959e336a51a7f7ca5efaab46dfeb946f Mon Sep 17 00:00:00 2001
+From: Dustin Polke <dustin.polke@uni-siegen.de>
+Date: Mon, 19 Apr 2010 13:42:34 +0000
+Subject: Fix XML syntax in po files for de, fi, and hu.
+
+---
+diff --git a/help/de/de.po b/help/de/de.po
+index ab25e26..56d5e53 100644
+--- a/help/de/de.po
++++ b/help/de/de.po
+@@ -1046,7 +1046,7 @@ msgid ""
+ "guimenu><guimenuitem>Clear Highlight</guimenuitem></menuchoice>."
+ msgstr ""
+ "Um die Syntax-Hervorhebung aus dem Text zu entfernen, wählen Sie "
+-"<menuchoice>Suchen<guimenu>Bearbeiten</guimenu><guimenuitem>Hervorhebung "
++"<menuchoice><guimenu>Suchen</guimenu><guimenuitem>Hervorhebung "
+ "zurücksetzen</guimenuitem></menuchoice>."
+ 
+ #: C/gedit.xml:458(title)
+diff --git a/help/fi/fi.po b/help/fi/fi.po
+index 234bba5..f4c5d4f 100644
+--- a/help/fi/fi.po
++++ b/help/fi/fi.po
+@@ -1019,8 +1019,8 @@ msgid ""
+ "search box appears at the top of the display area."
+ msgstr ""
+ "Aloittaaksesi tarkentavan haun, valitse <menuchoice><guimenu>Etsi</"
+-"guimenu><guimenuitem>Tarkentava haku</guimenuitem>. Hakukenttä ilmestyy "
+-"näyttöalueen yläosaan."
++"guimenu><guimenuitem>Tarkentava haku</guimenuitem></menuchoice>. "
++"Hakukenttä ilmestyy näyttöalueen yläosaan."
+ 
+ #: C/gedit.xml:462(para)
+ msgid ""
+@@ -3243,8 +3243,8 @@ msgid ""
+ "To indent the text, choose <menuchoice><guimenu>Edit</"
+ "guimenu><guimenuitem>Indent</guimenuitem></menuchoice>."
+ msgstr ""
+-"Sisentääksesi tekstin, valitse <menuchoice><guimenu>Muokkaa</guimenu></"
+-"guimenuitem>Sisennä</guimenuitem></menuchoice>."
++"Sisentääksesi tekstin, valitse <menuchoice><guimenu>Muokkaa</guimenu>"
++"<guimenuitem>Sisennä</guimenuitem></menuchoice>."
+ 
+ #: C/gedit.xml:1612(para)
+ msgid ""
+diff --git a/help/hu/hu.po b/help/hu/hu.po
+index 80d881e..0d12961 100644
+--- a/help/hu/hu.po
++++ b/help/hu/hu.po
+@@ -3895,7 +3895,7 @@ msgid ""
+ "there are no more tab placeholders moves the cursor to the end of the "
+ "snippet text, or to the end placeholder if it exists."
+ msgstr ""
+-"A <keycombo>Shift<keycap></keycap><keycap>Tab</keycap></keycombo> "
++"A <keycombo><keycap>Shift</keycap><keycap>Tab</keycap></keycombo> "
+ "billentyűkombinációval visszafele léphet a helykitöltők között. Az utolsó "
+ "tab helykitöltő kitöltése után a <keycap>Tab</keycap> billentyűt megnyomva a "
+ "töredék végére vagy, ha létezik, a záró helykitöltőre kerül a kurzor."
+--
+cgit v0.8.3.1
diff --git a/app-editors/gedit/gedit-2.28.3.ebuild b/app-editors/gedit/gedit-2.28.3.ebuild
deleted file mode 100644
index ac476758e854..000000000000
--- a/app-editors/gedit/gedit-2.28.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.28.3.ebuild,v 1.2 2010/02/19 23:42:21 abcd Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2 python
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc python spell xattr"
-
-RDEPEND=">=gnome-base/gconf-2
-	xattr? ( sys-apps/attr )
-	>=x11-libs/libSM-1.0
-	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2.17.1
-	>=x11-libs/gtksourceview-2.5
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35
-	)
-	python? (
-		>=dev-python/pygobject-2.15.4
-		>=dev-python/pygtk-2.12
-		>=dev-python/pygtksourceview-2.2
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-# gnome-common and gtk-doc-am needed to eautoreconf
-
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-if [[ "${ARCH}" == "PPC" ]] ; then
-	# HACK HACK HACK: someone fix this garbage
-	MAKEOPTS="${MAKEOPTS} -j1"
-fi
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-updater
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable xattr attr)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "intltool rules fix failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Installed for plugins, but they're dlopen()-ed
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
-}
diff --git a/app-editors/gedit/gedit-2.28.4.ebuild b/app-editors/gedit/gedit-2.28.4.ebuild
index 9494811ea960..4a045ddf6254 100644
--- a/app-editors/gedit/gedit-2.28.4.ebuild
+++ b/app-editors/gedit/gedit-2.28.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.28.4.ebuild,v 1.2 2010/05/04 16:21:35 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.28.4.ebuild,v 1.3 2010/05/08 10:40:59 pacho Exp $
 
 GCONF_DEBUG="no"
 
-inherit gnome2 python
+inherit gnome2 python eutils
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -60,6 +60,8 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
+	# Fix XML syntax in po files, bug #262325
+	epatch "${FILESDIR}/${P}-xml-syntax.patch"
 	# disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile