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.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 71 insertions, 90 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/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