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

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

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 2b6878bba25b5f36d8354d536001ad5ebafcfbc0..2b062d5269b70ef2c4d78e5ad946720c6c77c320 100644 (file)
--- 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/Manifest b/net-im/psi/Manifest
index 1bf82892a90faaf432cfde4bf568fc525178c982..b3f299023db80632bae8eacb0f5308f02d480bdf 100644 (file)
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -15,6 +15,6 @@ DIST psi-langs-20090217.tar.bz2 641414 RMD160 03e95fc690aa0e1ea49b7ac277ef0ecea9
 EBUILD psi-0.12.1.ebuild 2540 RMD160 f2172d73dfa757827ae488ca1e29c8a5ef9dd806 SHA1 3b9cfb761279c1edcc2964e5c3229b4206131c42 SHA256 02542f49f8e819b74b5589a11a74bd296c594b7f9d55a9633d97512ad55751ac
 EBUILD psi-0.13-r1.ebuild 3894 RMD160 68e199a2c2706b513e8616eafb0f072e596b8fab SHA1 adbd81c7fd3de58a4ab756e463f2c31f621f75e4 SHA256 c5ac2c01f93c73a0072c9580b88f89d95263768d59256dc92a1f9ab2aa67703a
 EBUILD psi-0.14-r1.ebuild 4643 RMD160 b85600673f9ac5b7d42996a5f39e20599af119a4 SHA1 8e55b01788e09edd370164434e039ec6f8e77570 SHA256 0aba927d61eb4786bf1b97aaee7911245b570be27dafbc97d6b1d779a32c4e89
-EBUILD psi-9999.ebuild 5836 RMD160 5c8640ac84dcc55d1a296ba4bd6af754166efbf1 SHA1 ac3528f87fb1ab6e0555ed82a5a06482396c9cbb SHA256 a6a28ee587e33a446b1ce5805000a86ca607d439225e4fd24f72dfa64c20f339
-MISC ChangeLog 28525 RMD160 c76d7888d8dbb713461014f9d51072b5d5419064 SHA1 609c2ebcdc6caab80cf0665a870f0a24c7fe6752 SHA256 f104d845de519f3c63b58bd3144d776c1495494adf4a42566d741664869d631e
+EBUILD psi-9999.ebuild 5952 RMD160 d951f819fe21582bfa0227a2304503d894461029 SHA1 c78add0448358fed2efce461b7c67453e5e4ccbf SHA256 3d770a1a6e701198123553258d3ad86c0bc7659f9d7e0364f41238e64684530e
+MISC ChangeLog 28666 RMD160 a9057adf4731d65989e4cfcd003fe08ffc35d6bf SHA1 ac61313d99e82a6d6ce36be6e2e5108cd087233e SHA256 2a03af675bea961c8fd6d1bf052e8cfe55c5302d68b31dfa32c9e92aa28b1a06
 MISC metadata.xml 828 RMD160 de45bfad6451302291b2e9d98dedf8f5b4ef5739 SHA1 a0af07fc8398913b1e07e1d995ccfdbaa95bc2ee SHA256 241d6e4d478091b7cfd4341152386d54e227eb6faf9a51c388f8be047a231268

diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 1ff7967d6485b5a8f62f13109df2877a886813ad..82eb7ef4c0b33eba982a375ac2efc5e220518a25 100644 (file)
--- 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
 }