diff options
| author |   Peter Volkov <pva@gentoo.org> | 2011-06-30 09:23:16 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2011-06-30 09:23:16 +0000 |
| commit | 2ca0fecd0647927ee876ddff4ef4109e087adf5f (patch) | |
| tree | fe3a3fe37df77decee98d0435b8a1e776789014b /net-im/psi | |
| parent | Stable on amd64 wrt bug #373357 (diff) | |
| download | gentoo-2-2ca0fecd0647927ee876ddff4ef4109e087adf5f.tar.gz gentoo-2-2ca0fecd0647927ee876ddff4ef4109e087adf5f.tar.bz2 gentoo-2-2ca0fecd0647927ee876ddff4ef4109e087adf5f.zip | |
iconsets were renamed to resources/iconsets, thank Rion for report.
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'net-im/psi')
| -rw-r--r-- | net-im/psi/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/psi/psi-9999.ebuild | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index b0a30e3acc58..652497b539a1 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/psi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.206 2011/06/29 05:23:31 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.207 2011/06/30 09:23:16 pva Exp $ + + 30 Jun 2011; Peter Volkov <pva@gentoo.org> psi-9999.ebuild: + iconsets were renamed to resources/iconsets, thank Rion for report. 29 Jun 2011; Peter Volkov <pva@gentoo.org> -psi-0.12.1.ebuild, -files/psi-0.12.1-build-error.patch, diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index 75d57ede7518..99745830c952 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.11 2011/06/29 05:23:31 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.12 2011/06/30 09:23:16 pva Exp $ EAPI="4" @@ -11,7 +11,7 @@ EGIT_HAS_SUBMODULES=1 LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n" PSI_PLUS_URI="git://github.com/psi-plus/main.git" -PSI_PLUS_ICONSETS_URI="git://github.com/psi-plus/iconsets.git" +PSI_PLUS_RESOURCES_URI="git://github.com/psi-plus/resources.git" inherit eutils qt4-r2 multilib git-2 subversion @@ -114,9 +114,9 @@ src_unpack() { EGIT_SOURCEDIR="${WORKDIR}/psi-plus" \ EGIT_REPO_URI="${PSI_PLUS_URI}" git-2_src_unpack if use iconsets; then - EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/iconsets" \ - EGIT_SOURCEDIR="${WORKDIR}/iconsets" \ - EGIT_REPO_URI="${PSI_PLUS_ICONSETS_URI}" git-2_src_unpack + EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/resources" \ + EGIT_SOURCEDIR="${WORKDIR}/resources" \ + EGIT_REPO_URI="${PSI_PLUS_RESOURCES_URI}" git-2_src_unpack fi fi } @@ -124,15 +124,15 @@ src_unpack() { src_prepare() { if use extras; then cp -a "${WORKDIR}/psi-plus/iconsets" "${S}" || die "failed to copy iconsets" - use iconsets && { cp -a "${WORKDIR}/iconsets" "${S}" || \ + use iconsets && { cp -a "${WORKDIR}/resources/iconsets" "${S}" || \ die "failed to copy additional iconsets"; } EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} " \ EPATCH_SOURCE="${WORKDIR}/psi-plus/patches/" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch use powersave && epatch "${WORKDIR}/psi-plus/patches/dev/psi-reduce-power-consumption.patch" - sed -e "s/.xxx/.$(cd "${WORKDIR}/psi-plus"; git describe --tags | cut -d - -f 2)/" \ - -i src/applicationinfo.cpp || die "sed failed" + sed -e "s/.xxx/.$(cd "${WORKDIR}/psi-plus"; echo $((`git describe --tags | \ + cut -d - -f 2`+5000)))/" -i src/applicationinfo.cpp || die "sed failed" qconf || die "Failed to create ./configure." fi |