Use more up-to-date Russian translation, thank Nikoli and Rion for this job.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

2 files changed, 24 insertions, 18 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 2b6878bba25b..2b062d5269b7 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.194 2010/06/26 15:24:43 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.195 2010/06/29 13:21:24 pva Exp $
+
+  29 Jun 2010; Peter Volkov <pva@gentoo.org> psi-9999.ebuild:
+  Use more up-to-date Russian translation, thank Nikoli and Rion for this
+  job.
 
   26 Jun 2010; <nixnut@gentoo.org> psi-0.14-r1.ebuild:
   ppc stable #322353
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 1ff7967d6485..82eb7ef4c0b3 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.2 2010/06/02 07:46:30 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.3 2010/06/29 13:21:24 pva Exp $
 
 EAPI="2"
 
@@ -87,8 +87,13 @@ src_unpack() {
 	mkdir "${WORKDIR}/psi-l10n"
 	for x in ${LANGS}; do
 		if use linguas_${x}; then
-			EGIT_REPO_URI="${LANGS_URI}-${x}"
-			EGIT_PROJECT="psi-l10n/${x}"
+			if use extras && [ "${x}" = "ru" ]; then
+				EGIT_REPO_URI="git://mva.name/psi-l10n-${x}"
+				EGIT_PROJECT="psiplus-l10n/${x}"
+			else
+				EGIT_REPO_URI="${LANGS_URI}-${x}"
+				EGIT_PROJECT="psi-l10n/${x}"
+			fi
 			S="${WORKDIR}/psi-l10n/${x}"
 			git_fetch
 			S="${WORKDIR}/${P}"
@@ -174,7 +179,7 @@ src_compile() {
 
 src_install() {
 	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	rm "${D}"/usr/share/psi/{COPYING,README}
+	rm -f "${D}"/usr/share/psi/{COPYING,README}
 
 	# this way the docs will be installed in the standard gentoo dir
 	newdoc iconsets/roster/README README.roster || die
@@ -182,6 +187,16 @@ src_install() {
 	newdoc certs/README README.certs || die
 	dodoc README || die
 
+	if use extras && use plugins; then
+		insinto /usr/share/psi/plugins
+		doins src/plugins/plugins.pri || die
+		doins src/plugins/psiplugin.pri || die
+		doins -r src/plugins/include || die
+		dosed "s:target.path.*:target.path = /usr/$(get_libdir)/psi/plugins:" \
+			/usr/share/psi/plugins/psiplugin.pri \
+			|| die "sed failed"
+	fi
+
 	if use doc; then
 		cd doc
 		dohtml -r api || die "dohtml failed"
@@ -197,17 +212,4 @@ src_install() {
 			newins "${x}/INFO" "INFO.${x}" || die
 		fi
 	done
-
-	if use extras; then
-		if use plugins; then
-			cd "${S}"
-			insinto /usr/share/psi/plugins
-			doins src/plugins/plugins.pri || die
-			doins src/plugins/psiplugin.pri || die
-			doins -r src/plugins/include || die
-			dosed "s:target.path.*:target.path = /usr/$(get_libdir)/psi/plugins:" \
-				/usr/share/psi/plugins/psiplugin.pri \
-				|| die "sed failed"
-		fi
-	fi
 }