Fix build problem with specific USE flag combinations, thank Nikoli 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 175d64ef705193d1ece78ffddc57151f423998ca..7ac1c600ce5e319cbfdbfbc44300f57a78c1464b 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.190 2010/06/01 10:42:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.191 2010/06/02 07:46:30 pva Exp $
+
+  02 Jun 2010; Peter Volkov <pva@gentoo.org> psi-9999.ebuild:
+  Fix build problem with specific USE flag combinations, thank Nikoli for
+  this job.
 
 *psi-9999 (01 Jun 2010)
 

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index c9d5855dba891d8e41114f327513ea04bf602e34..2bf6ddbcdd2cdbb61f4ccd2444a563ee7f531ef1 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 bf365bdf62b71bb3b333bb1627675aa9b82a5301 SHA1 244e0f4b88d81ab1266c02c30c7c6e6427968b97 SHA256 707fe1b1d1bbc92704b060b72a4aead2fa1e9052e57eabc5273a50215f0c855b
-EBUILD psi-9999.ebuild 5887 RMD160 343f1c851a8765520c15f3bf7c4c171a333904cd SHA1 1846af78a68e228a7b145826f08702645e476850 SHA256 639f14990def6fb767cec2f5afdaaf999751e8bb88c038f86f055a6aa8188294
-MISC ChangeLog 28094 RMD160 6971c3c4d1313047db3078dacf618d41dd202890 SHA1 48c4819cf82e9efdc49e0002c0b70c1b9615e4b8 SHA256 5e975b0b4033fe8e7e330caee2e6c3ce7e9f7e17f279477ca1d5a6254c8d905f
+EBUILD psi-9999.ebuild 5836 RMD160 5c8640ac84dcc55d1a296ba4bd6af754166efbf1 SHA1 ac3528f87fb1ab6e0555ed82a5a06482396c9cbb SHA256 a6a28ee587e33a446b1ce5805000a86ca607d439225e4fd24f72dfa64c20f339
+MISC ChangeLog 28243 RMD160 91e5ea09612a3370d7a9cf970a19146042c22d2a SHA1 e657a8c5ebfb390942e4f7b82eda313805ac49e2 SHA256 9b8f68442c67df760e3d9def9d9aca479373459648345555197ca75af9d5c5a2
 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 b5f620e82119a3f27a739fafe2cca42bd6017b02..1ff7967d6485b5a8f62f13109df2877a886813ad 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.1 2010/06/01 10:42:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.2 2010/06/02 07:46:30 pva Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ EGIT_HAS_SUBMODULES="true"
 LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n"
 
 ESVN_DISABLE_DEPENDENCIES="true"
-BASE_URI="http://psi-dev.googlecode.com/svn/trunk"
+ESVN_REPO_URI="http://psi-dev.googlecode.com/svn/trunk"
 ESVN_PROJECT="psiplus"
 
 inherit eutils qt4-r2 multilib git subversion
@@ -91,28 +91,23 @@ src_unpack() {
                        EGIT_PROJECT="psi-l10n/${x}"
                        S="${WORKDIR}/psi-l10n/${x}"
                        git_fetch
+                       S="${WORKDIR}/${P}"
                fi
        done
 
        if use extras; then
                S="${WORKDIR}/patches"
-               ESVN_REPO_URI="${BASE_URI}/patches"
-               subversion_fetch
+               subversion_fetch "${ESVN_REPO_URI}/patches"
+               S="${WORKDIR}/${P}"
                if use iconsets; then
-                       S="${WORKDIR}/${P}/iconsets"
-                       ESVN_REPO_URI="${BASE_URI}/iconsets"
-                       subversion_fetch
+                       subversion_fetch "${ESVN_REPO_URI}/iconsets" "iconsets"
                else
                        for x in clients moods activities system; do
-                               S="${WORKDIR}/${P}/iconsets/${x}/default"
-                               ESVN_REPO_URI="${BASE_URI}/iconsets/${x}/default"
                                ESVN_PROJECT="psiplus/${x}"
-                               subversion_fetch
+                               subversion_fetch "${ESVN_REPO_URI}/iconsets/${x}/default" "iconsets/${x}/default"
                        done
                fi
        fi
-
-       S="${WORKDIR}/${P}"
 }
 
 src_prepare() {