| 1 |
pva 10/06/02 07:46:30 |
| 2 |
|
| 3 |
Modified: psi-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix build problem with specific USE flag combinations, thank Nikoli for this job. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-im/psi/psi-9999.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: psi-9999.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- psi-9999.ebuild 1 Jun 2010 10:42:11 -0000 1.1 |
| 22 |
+++ psi-9999.ebuild 2 Jun 2010 07:46:30 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.1 2010/06/01 10:42:11 pva Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.2 2010/06/02 07:46:30 pva Exp $ |
| 28 |
|
| 29 |
EAPI="2" |
| 30 |
|
| 31 |
@@ -11,7 +11,7 @@ |
| 32 |
LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n" |
| 33 |
|
| 34 |
ESVN_DISABLE_DEPENDENCIES="true" |
| 35 |
-BASE_URI="http://psi-dev.googlecode.com/svn/trunk" |
| 36 |
+ESVN_REPO_URI="http://psi-dev.googlecode.com/svn/trunk" |
| 37 |
ESVN_PROJECT="psiplus" |
| 38 |
|
| 39 |
inherit eutils qt4-r2 multilib git subversion |
| 40 |
@@ -91,28 +91,23 @@ |
| 41 |
EGIT_PROJECT="psi-l10n/${x}" |
| 42 |
S="${WORKDIR}/psi-l10n/${x}" |
| 43 |
git_fetch |
| 44 |
+ S="${WORKDIR}/${P}" |
| 45 |
fi |
| 46 |
done |
| 47 |
|
| 48 |
if use extras; then |
| 49 |
S="${WORKDIR}/patches" |
| 50 |
- ESVN_REPO_URI="${BASE_URI}/patches" |
| 51 |
- subversion_fetch |
| 52 |
+ subversion_fetch "${ESVN_REPO_URI}/patches" |
| 53 |
+ S="${WORKDIR}/${P}" |
| 54 |
if use iconsets; then |
| 55 |
- S="${WORKDIR}/${P}/iconsets" |
| 56 |
- ESVN_REPO_URI="${BASE_URI}/iconsets" |
| 57 |
- subversion_fetch |
| 58 |
+ subversion_fetch "${ESVN_REPO_URI}/iconsets" "iconsets" |
| 59 |
else |
| 60 |
for x in clients moods activities system; do |
| 61 |
- S="${WORKDIR}/${P}/iconsets/${x}/default" |
| 62 |
- ESVN_REPO_URI="${BASE_URI}/iconsets/${x}/default" |
| 63 |
ESVN_PROJECT="psiplus/${x}" |
| 64 |
- subversion_fetch |
| 65 |
+ subversion_fetch "${ESVN_REPO_URI}/iconsets/${x}/default" "iconsets/${x}/default" |
| 66 |
done |
| 67 |
fi |
| 68 |
fi |
| 69 |
- |
| 70 |
- S="${WORKDIR}/${P}" |
| 71 |
} |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.191 net-im/psi/ChangeLog |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.191&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.191&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.190&r2=1.191 |
| 82 |
|
| 83 |
Index: ChangeLog |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v |
| 86 |
retrieving revision 1.190 |
| 87 |
retrieving revision 1.191 |
| 88 |
diff -u -r1.190 -r1.191 |
| 89 |
--- ChangeLog 1 Jun 2010 10:42:11 -0000 1.190 |
| 90 |
+++ ChangeLog 2 Jun 2010 07:46:30 -0000 1.191 |
| 91 |
@@ -1,6 +1,10 @@ |
| 92 |
# ChangeLog for net-im/psi |
| 93 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.190 2010/06/01 10:42:11 pva Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.191 2010/06/02 07:46:30 pva Exp $ |
| 96 |
+ |
| 97 |
+ 02 Jun 2010; Peter Volkov <pva@g.o> psi-9999.ebuild: |
| 98 |
+ Fix build problem with specific USE flag combinations, thank Nikoli for |
| 99 |
+ this job. |
| 100 |
|
| 101 |
*psi-9999 (01 Jun 2010) |
Archives