diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-06-02 07:46:30 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-06-02 07:46:30 +0000 |
| commit | 328adf128b82f90d68f1dd7315676ec77ffbd636 (patch) | |
| tree | 05aa351a3530698ce74009f75dad913a3e3b8926 /net-im/psi | |
| parent | Version bump. (diff) | |
| download | gentoo-2-328adf128b82f90d68f1dd7315676ec77ffbd636.tar.gz gentoo-2-328adf128b82f90d68f1dd7315676ec77ffbd636.tar.bz2 gentoo-2-328adf128b82f90d68f1dd7315676ec77ffbd636.zip | |
Fix build problem with specific USE flag combinations, thank Nikoli for this job.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'net-im/psi')
| -rw-r--r-- | net-im/psi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/psi/psi-9999.ebuild | 19 |
2 files changed, 12 insertions, 13 deletions
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index 175d64ef7051..7ac1c600ce5e 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.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/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index b5f620e82119..1ff7967d6485 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.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() { |