| 1 |
pva 11/06/30 09:23:16 |
| 2 |
|
| 3 |
Modified: psi-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
iconsets were renamed to resources/iconsets, thank Rion for report. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 net-im/psi/psi-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: psi-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- psi-9999.ebuild 29 Jun 2011 05:23:31 -0000 1.11 |
| 23 |
+++ psi-9999.ebuild 30 Jun 2011 09:23:16 -0000 1.12 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.11 2011/06/29 05:23:31 pva Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.12 2011/06/30 09:23:16 pva Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -11,7 +11,7 @@ |
| 33 |
LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n" |
| 34 |
|
| 35 |
PSI_PLUS_URI="git://github.com/psi-plus/main.git" |
| 36 |
-PSI_PLUS_ICONSETS_URI="git://github.com/psi-plus/iconsets.git" |
| 37 |
+PSI_PLUS_RESOURCES_URI="git://github.com/psi-plus/resources.git" |
| 38 |
|
| 39 |
inherit eutils qt4-r2 multilib git-2 subversion |
| 40 |
|
| 41 |
@@ -114,9 +114,9 @@ |
| 42 |
EGIT_SOURCEDIR="${WORKDIR}/psi-plus" \ |
| 43 |
EGIT_REPO_URI="${PSI_PLUS_URI}" git-2_src_unpack |
| 44 |
if use iconsets; then |
| 45 |
- EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/iconsets" \ |
| 46 |
- EGIT_SOURCEDIR="${WORKDIR}/iconsets" \ |
| 47 |
- EGIT_REPO_URI="${PSI_PLUS_ICONSETS_URI}" git-2_src_unpack |
| 48 |
+ EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/resources" \ |
| 49 |
+ EGIT_SOURCEDIR="${WORKDIR}/resources" \ |
| 50 |
+ EGIT_REPO_URI="${PSI_PLUS_RESOURCES_URI}" git-2_src_unpack |
| 51 |
fi |
| 52 |
fi |
| 53 |
} |
| 54 |
@@ -124,15 +124,15 @@ |
| 55 |
src_prepare() { |
| 56 |
if use extras; then |
| 57 |
cp -a "${WORKDIR}/psi-plus/iconsets" "${S}" || die "failed to copy iconsets" |
| 58 |
- use iconsets && { cp -a "${WORKDIR}/iconsets" "${S}" || \ |
| 59 |
+ use iconsets && { cp -a "${WORKDIR}/resources/iconsets" "${S}" || \ |
| 60 |
die "failed to copy additional iconsets"; } |
| 61 |
EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} " \ |
| 62 |
EPATCH_SOURCE="${WORKDIR}/psi-plus/patches/" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch |
| 63 |
|
| 64 |
use powersave && epatch "${WORKDIR}/psi-plus/patches/dev/psi-reduce-power-consumption.patch" |
| 65 |
|
| 66 |
- sed -e "s/.xxx/.$(cd "${WORKDIR}/psi-plus"; git describe --tags | cut -d - -f 2)/" \ |
| 67 |
- -i src/applicationinfo.cpp || die "sed failed" |
| 68 |
+ sed -e "s/.xxx/.$(cd "${WORKDIR}/psi-plus"; echo $((`git describe --tags | \ |
| 69 |
+ cut -d - -f 2`+5000)))/" -i src/applicationinfo.cpp || die "sed failed" |
| 70 |
|
| 71 |
qconf || die "Failed to create ./configure." |
| 72 |
fi |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.207 net-im/psi/ChangeLog |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.207&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.207&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.206&r2=1.207 |
| 81 |
|
| 82 |
Index: ChangeLog |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v |
| 85 |
retrieving revision 1.206 |
| 86 |
retrieving revision 1.207 |
| 87 |
diff -u -r1.206 -r1.207 |
| 88 |
--- ChangeLog 29 Jun 2011 05:23:31 -0000 1.206 |
| 89 |
+++ ChangeLog 30 Jun 2011 09:23:16 -0000 1.207 |
| 90 |
@@ -1,6 +1,9 @@ |
| 91 |
# ChangeLog for net-im/psi |
| 92 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 93 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.206 2011/06/29 05:23:31 pva Exp $ |
| 94 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.207 2011/06/30 09:23:16 pva Exp $ |
| 95 |
+ |
| 96 |
+ 30 Jun 2011; Peter Volkov <pva@g.o> psi-9999.ebuild: |
| 97 |
+ iconsets were renamed to resources/iconsets, thank Rion for report. |
| 98 |
|
| 99 |
29 Jun 2011; Peter Volkov <pva@g.o> -psi-0.12.1.ebuild, |
| 100 |
-files/psi-0.12.1-build-error.patch, |
Archives