iconsets were renamed to resources/iconsets, thank Rion for report.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 14 insertions, 11 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/Manifest b/net-im/psi/Manifest
index 17ff40f14cd7..0d3d25a37480 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -5,6 +5,6 @@ DIST psi-extra-iconsets-r1428.tar.bz2 3214991 RMD160 5aba49e65ca39209a4791c6e5eb
 DIST psi-extra-patches-r1428.tar.bz2 131700 RMD160 071eadf3a174f392cfb7202a85d2082b3256c76e SHA1 78cfe1f6b8a15852b9ed72c0dd569c9b4e6d9fac SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48
 EBUILD psi-0.14-r1.ebuild 4674 RMD160 9adb8a3f9037b4d1fc1b3191b2cfd3f6ad5d8399 SHA1 37f1d157e8062a218acaf69605e521dbf8efc649 SHA256 b8a329157a633de17275eefb708b3782ed726dabd20f722de53032e8caffbcb9
 EBUILD psi-0.14-r2.ebuild 4723 RMD160 b79070de568bf2c86e1c3b2389d92fbba3233fdd SHA1 5846e66e05d08787078df0c8b5f4aaa45f8a9cd1 SHA256 e13f62b4296ace509d9ccf5d8e7edf3155dfc3b17923c929f383cf059ae9751c
-EBUILD psi-9999.ebuild 6242 RMD160 d5933a264a8ff9d153c836e6de81ec8fafbf35a6 SHA1 644d440ce69233bef69abcb05697c66f1c01ed8e SHA256 5ea5506885e98be981ed8c524dcada2e0fe5e5287b7852273503a2a1e23a1da6
-MISC ChangeLog 30450 RMD160 1eab321c69f76b20c4f32061aa57339ba2502fad SHA1 e1ab14037b8b7e73171f2554f6e109d792fb2154 SHA256 b78ef39368e3be28b356a25125992273c7391a7ba4638a7f3793982243814502
+EBUILD psi-9999.ebuild 6274 RMD160 4990e95378f6436e54381205ada5a12c7cb5a028 SHA1 f585c22d9434ea63cb6e2355f736a0ab5dcfd175 SHA256 ce57eabc0adf28ef23d2cf77b2e0c6efa8fb9ffe84a97918611954e561cdfedd
+MISC ChangeLog 30583 RMD160 69af6976b7c4becedc4b256bb4c37a43483b46d6 SHA1 af8f7dd92ac4d298282daa6f046a44306c4c209b SHA256 da8289779b23f9dd5f5d0bb41b0328fb3e9d35ebc387c30161a808c65e7b8252
 MISC metadata.xml 1045 RMD160 41a67d4b456737917e90945bfd1ca1798603b7dd SHA1 38066b4c6e461321d33471202cc212d56aa8f463 SHA256 2d2db4b3989de29ab27080da8e7d4301b4b6a85a1f55a405a17de10d93a92be2
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