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

Package-Manager: portage-2.1.4.4

4 files changed, 49 insertions, 16 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/Manifest b/kde-base/kde-i18n/Manifest
index 76a3146cb7c4..2c2e10b42ba6 100644
--- a/kde-base/kde-i18n/Manifest
+++ b/kde-base/kde-i18n/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kde-i18n-3.5.8-farsi.patch 9710 RMD160 b69dfc5f8b13f3060e9e446fb1c8a30de292dd1e SHA1 779acda3f0b3c2ab948b1507283b0175348c8df7 SHA256 98c95e5b5cc0cf9c12d4745d15501945eafdebfc8f535d92995a2481dbe167ef
 AUX kde-i18n-3.5.8-korean.patch 4156 RMD160 5b234f5133f611c9f4e0d56983a87afc99899b52 SHA1 819f3841c3cc383ec6d3ac8a847ed4d9a67d4c21 SHA256 6412a41224910f7aafce0eb0bf709f11f614fa4c440797afd5c095beea0837c3
+AUX kde-i18n-3.5.9-russian.patch 1785 RMD160 8bd06df1ce4011a62fdcc2767632a1753f3d50a1 SHA1 5771c5b494df66b93aa46983fb66bcea6f9a6b1b SHA256 55faa5c258d4e7d2c3a2e6c463b123b59ac8d5155b45f325a80aafdea66a2b52
 DIST kde-i18n-af-3.5.8.tar.bz2 1569745 RMD160 97f6f8f9f5c4f3f991342950e05b060e1b9257f9 SHA1 d15a5ea04c4862be969dcb717ce51d53cc2b08ea SHA256 9f996c6e699e5155b2d83820ab0637122c1eeb623e728fd4ccd1bb3d1b896d8e
 DIST kde-i18n-af-3.5.9.tar.bz2 1574051 RMD160 af8d37caf938d23440fd6689c8b66b42f760ddcb SHA1 3b4bf6d85763c7b75291c1b55f5b82d678af044b SHA256 9015a94f289e296000a84467af2ed66a1ab7aa3b8c8c4203156c14784e9e59e2
 DIST kde-i18n-ar-3.5.8.tar.bz2 1889501 RMD160 6411f04f98a8aab26b10089998f18db4218be3ba SHA1 ac0778f9193084a4383fe798c2da40edca9e0fc2 SHA256 6445f6b48206d81a38f13117cba7980d2780593fc222fb28fb2b56a339341a33
@@ -142,13 +140,6 @@ DIST kde-i18n-zh_CN-3.5.9.tar.bz2 2028125 RMD160 735aa0c60f173d6e878ce822384cc89
 DIST kde-i18n-zh_TW-3.5.8.tar.bz2 2271900 RMD160 1596fecc228e54251040c66e2a79d0986fca9834 SHA1 1fdd21e4f2f324d016e237f69ef16dd82e985747 SHA256 0c0cc5df518a9560e2e87258a5d506943c2442be308e14367bc6bb0e8b98d415
 DIST kde-i18n-zh_TW-3.5.9.tar.bz2 2271063 RMD160 59708f296e6e845e1e7ab0e6ca342f4cc2b0fe16 SHA1 744d12a370bb2de5c0680d8096555e21f48c9e26 SHA256 fa1eacbe73252bb33db60bd57be5e62f5195ca57e52ece3b496d1e72f233804f
 EBUILD kde-i18n-3.5.8.ebuild 2117 RMD160 16fea9c683fe87acce99ec7643e6e4f19be2074b SHA1 8f49d233e92dcf10c20b07eff5ec7a5fc3bbb15c SHA256 46137b3bb0ae981aaf7f7e93286dcd8f3b5d796f0becd838b742fd20c438e010
-EBUILD kde-i18n-3.5.9.ebuild 2034 RMD160 082952dcc897c000371867104bc732563dcc09a5 SHA1 393c9dd9f2a58716a5d0cda750635e615b281931 SHA256 c9cccc5d569ef868e253bc1a570ba9058146359834e96e36e32a9578723365c6
-MISC ChangeLog 18307 RMD160 2a86aa3ba21b8770ce54a0e54f530e8415516427 SHA1 97773c69e3142e0a0db1b13249e4ff60b30a21b9 SHA256 c193c7d4386c00c6daa9c8fef1db3f26a26186a053c26bb9ff977efd2c3c37f5
+EBUILD kde-i18n-3.5.9.ebuild 2123 RMD160 a694b25022e05c66c84e79b62b41d88a4b56e681 SHA1 68356aea2b81cae96160ff9b984444d4f66da27a SHA256 b868b90467b8bdd460c02df2b7b13d6ee72dca4200da6130e08eb605ba6cd0e2
+MISC ChangeLog 18553 RMD160 0478368dae9ea342df122788bf5668f8a4456372 SHA1 45fd1d8556711292aeecdb6c661782aaea5fee0c SHA256 89dfc3f89189a65e0121b0b0033651e992a1a66a897668796e275fc9feb3da38
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHvKyzCkvF58q80IkRAuJPAJ9ggQONmoBJFh8kQj315efLpHA6igCgnJ+w
-t0mgfms9zNc2JX0pstmZXsk=
-=ju4k
------END PGP SIGNATURE-----
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() {