Added a patch to fix Russian translations. Fixes bugs 211050 and 211069 (the latter being fixed by a change in kde.eclass).

(Portage version: 2.1.4.4)

3 files changed, 46 insertions, 4 deletions

diff --git a/kde-base/kde-i18n/ChangeLog b/kde-base/kde-i18n/ChangeLog
index 7e883c5fd9c4..4806c467a4fd 100644
--- a/kde-base/kde-i18n/ChangeLog
+++ b/kde-base/kde-i18n/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kde-i18n
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.152 2008/02/20 22:41:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.153 2008/02/23 23:04:14 philantrop Exp $
+
+  23 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kde-i18n-3.5.9-russian.patch, kde-i18n-3.5.9.ebuild:
+  Added a patch to fix Russian translations. Fixes bugs 211050 and 211069 (the
+  latter being fixed by a change in kde.eclass).
 
 *kde-i18n-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kde-i18n/files/kde-i18n-3.5.9-russian.patch b/kde-base/kde-i18n/files/kde-i18n-3.5.9-russian.patch
new file mode 100644
index 000000000000..febcdd50801d
--- /dev/null
+++ b/kde-base/kde-i18n/files/kde-i18n-3.5.9-russian.patch
@@ -0,0 +1,33 @@
+diff -Naur kde-i18n-ru-3.5.9.orig/data/kdeedu/kturtle/Makefile.in kde-i18n-ru-3.5.9/data/kdeedu/kturtle/Makefile.in
+--- kde-i18n-ru-3.5.9.orig/data/kdeedu/kturtle/Makefile.in	2008-02-13 15:26:23.000000000 +0100
++++ kde-i18n-ru-3.5.9/data/kdeedu/kturtle/Makefile.in	2008-02-23 17:18:30.000000000 +0100
+@@ -215,7 +215,7 @@
+ 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/kdeedu/kturtle/Makefile'; \
+ 	cd $(top_srcdir) && \
+ 	  $(AUTOMAKE) --gnu  data/kdeedu/kturtle/Makefile
+-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin data/kdeedu/kturtle/Makefile.in
++#	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin data/kdeedu/kturtle/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -444,7 +444,7 @@
+ 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/kdeedu/kturtle/Makefile'; \
+ 	cd $(top_srcdir) && \
+ 	  $(AUTOMAKE) --gnu  data/kdeedu/kturtle/Makefile
+-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin data/kdeedu/kturtle/Makefile.in
++#	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin data/kdeedu/kturtle/Makefile.in
+ 
+ 
+ #>+ 21
+diff -Naur kde-i18n-ru-3.5.9.orig/data/kdeedu/kturtle/Makefile.in kde-i18n-ru-3.5.9/data/kdeedu/kturtle/Makefile.in
+--- kde-i18n-ru-3.5.9.orig/data/kdeedu/kturtle/Makefile.in	2008-02-23 17:35:21.000000000 +0100
++++ kde-i18n-ru-3.5.9/data/kdeedu/kturtle/Makefile.in	2008-02-23 17:38:50.000000000 +0100
+@@ -178,7 +178,7 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ txt_DATA = curly.logo square.logo triangle.logo \
+-flower.logo arrow.logo example2.logo example3.logo
++flower.logo arrow.logo 
+ 
+ txtdir = $(kde_datadir)/kturtle/examples/ru
+ xml_DATA = logohighlightstyle.ru.xml
diff --git a/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild b/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild
index 8a4a3b54e94c..ae9237e21d0c 100644
--- a/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild,v 1.1 2008/02/20 22:41:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild,v 1.2 2008/02/23 23:04:14 philantrop Exp $
 
 EAPI="1"
-inherit kde eutils
+WANT_AUTOMAKE="1.10.1"
+
+inherit kde eutils autotools
 
 DESCRIPTION="KDE internationalization package"
 HOMEPAGE="http://www.kde.org/"
@@ -25,7 +27,7 @@ for X in ${LANGS} ; do
 done
 
 src_unpack() {
-	if [[ -z "${LINGUAS}" ]] || [[ -z "${A}" &&	 "${LINGUAS}" != "en" ]]; then
+	if [[ -z ${LINGUAS} ]] || [[ -z ${A} && "${LINGUAS}" != "en" ]]; then
 		echo
 		ewarn "You either have the LINGUAS environment variable unset or it"
 		ewarn "contains languages not supported by kde-base/kde-i18n."
@@ -49,6 +51,8 @@ src_unpack() {
 		sed -e "s:\$(KDE_LANG)/${lang}/:\$(KDE_LANG)/:g" \
 			-i "${WORKDIR}/${dir}/docs/common/Makefile.in" || die "Failed to fix ${lang}."
 	done
+
+	use linguas_ru && epatch "${FILESDIR}/${P}-russian.patch"
 }
 
 src_compile() {