Updated qca version dependency as some psi bugs were fixed in 2.0.2 only, thank Rion for report. Added notion about psimedia, thank Petr Moravek for report in bug #271091. Dropped duplicate iconsets, thank Dennis Schridde for report in bug #271091.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 22 insertions, 17 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index e29bfb8734c0..0300a86c8cba 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.158 2009/05/29 07:57:50 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.159 2009/06/01 11:31:37 pva Exp $
+
+  01 Jun 2009; Peter Volkov <pva@gentoo.org> psi-0.13_rc1.ebuild:
+  Updated qca version dependency as some psi bugs were fixed in 2.0.2 only,
+  thank Rion for report. Added notion about psimedia, thank Petr Moravek for
+  report in bug #271091. Dropped duplicate iconsets, thank Dennis Schridde
+  for report in bug #271091.
 
 *psi-0.13_rc1 (29 May 2009)
 
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index dd08fd9c5d7a..1c93cba30a86 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -13,8 +13,8 @@ DIST gentoo-psi-0.10.tar.bz2 211538 RMD160 35b7c7c45420ee18917f3b073e063ef3b046e
 DIST psi-0.10.tar.bz2 1430929 RMD160 b8be1490cd02f61cf86f09f2dc9f29716ea4c186 SHA1 f1687f8b93338f47cb1c8fa363e4b4f58628f167 SHA256 e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1
 DIST psi-0.12.1.tar.bz2 2112404 RMD160 a5fc850796b0078bc1a03f4ff93a03611ee11e80 SHA1 6fdcea3a072b40333faecc37acdb925f9bf8c5c3 SHA256 a8022faadbbe15bc4691338b1d83400adf069f773b7fa3b462552515990b277e
 DIST psi-0.13-rc1.tar.bz2 3011018 RMD160 12dc6edd39216c04f7bea1c56bf9c35523a6072a SHA1 f77f014a7ff6155aa213c5c00cc39b62c96d2d2b SHA256 ca882b14cc5666f6ea09e4bcf3b99a0286e64fc31e76a87ee63397c044f31743
-DIST psi-extra-iconsets-r504.tar.bz2 2758164 RMD160 fa6c6f6efb5928113b2477e7c84e04e82da517af SHA1 15069375cb50562be6a9d52cb129f96c37c6d9a0 SHA256 2797adbcdf46ef845dff2609bb25bcf0de9bc5451e8bca4cc39d4783ac0f759e
-DIST psi-extra-patches-r504.tar.bz2 66012 RMD160 748232b4320c8e1027967f6f890c444d57797ae3 SHA1 0164ae39dfb87d227036eaedb1258efdd65a9897 SHA256 2fdcc04c35f110bdbc150971185f95ff3e6860c22dbc858ece9f9552c60f34f1
+DIST psi-extra-iconsets-r515.tar.bz2 2588478 RMD160 d1fe2d584414d7aa6602bc79fb992cb878afb378 SHA1 4c7d2962bec88a560b01ee961ce238c5dee3271c SHA256 42d822087ad7669e9e0cd33c9380f683bb189e57a6e1f51ad5bcf55fc359d6f2
+DIST psi-extra-patches-r515.tar.bz2 69536 RMD160 c6c89cb0e392a8d837511a0eb6d15942ac837aae SHA1 dc9e0bced4d7e8c90441dcb6e9201d5c7a7c45ec SHA256 72f44d9302cbf3753b70f1ba2dc2749bba7d46396576be50149beed2230cc7ed
 DIST psi-extras-insecure.tar.bz2 15914 RMD160 a61d51cbc9280677f62d3121eada4981573842fa SHA1 22c8da902f00ae401df756b0d4195dc70083a9ff SHA256 44ac11a3f1a3280a2dc613dc3719a4750f30aadd4516bee61942409d648c4740
 DIST psi-langs-20090217.tar.bz2 641414 RMD160 03e95fc690aa0e1ea49b7ac277ef0ecea91285f8 SHA1 de5e149d6fc55a464af6e614121b8c228b6e1432 SHA256 59f17d6547e4c911e83199fcd3908fa1bf4db312ae25d2c14e27d4c536915f9c
 DIST psi_ar-0.9.3.tar.bz2 31466 RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 SHA1 8aedb3f8cfdda29ccf5a59c9b0f84462fcd3b649 SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9
@@ -48,6 +48,6 @@ DIST psi_zh-0.10-a-1.tar.bz2 32898 RMD160 c0440dcb7763908354fc9c8f1d1b1873a00f7f
 EBUILD psi-0.10-r3.ebuild 11114 RMD160 976ca5966451c160c5b9d1a3b807e448e3806cba SHA1 82482330f1eee7e663616a4372760bad6b3b07eb SHA256 95f5a8ec32f1f24468960fef8f617fb69b743978b19432ed61d208e3dd6c1cc8
 EBUILD psi-0.10-r4.ebuild 11397 RMD160 c20c4f836a46adad23327029605818104441d98e SHA1 256af111995319422ffa88a61f600acce60ffb97 SHA256 0ecdf57a7ead4808dcddd572a88d8c103e127af35eb0a75973330629f41dc5e8
 EBUILD psi-0.12.1.ebuild 2522 RMD160 45ce61c682c2c67b0494f2540d96c4e00d4387ca SHA1 bea59266a7c381fea331200aa1e1681ec2b64eea SHA256 87eba6ba85ae6065239a3d13a73c54661d417ded2c5d3957837db1907cd0e337
-EBUILD psi-0.13_rc1.ebuild 3701 RMD160 da524779d08dcd69f9350957c77b7f5d5fc0dbb6 SHA1 97eb283cb95d3e88e76bc1efe026fee3f341a2f1 SHA256 ef0d5a7398e09e84eb8e7fdd1bef8ef00a3182e630630a9f8f91c31a8e8578c8
-MISC ChangeLog 22571 RMD160 31a9c4eaa08629e79aa7fd6e83b7fc76a0c8537b SHA1 cb95e588ff0f324869a4d37b49e61226cd58aa5c SHA256 b5e55f97e3e29434b69e0a0aeb4ed74e30b30239c1b6e041caf68915abfbb64b
+EBUILD psi-0.13_rc1.ebuild 3629 RMD160 312664f4aa128e5d0699c6ae1cabf5f6e8cf845a SHA1 cf6e90a4b88310f2fd52aabab968139b563701aa SHA256 d39197bae53891590aa5e62a4e0d94dc93f6d5b8f3157598eb33efa66bf27fab
+MISC ChangeLog 22895 RMD160 8c9cf8733fb2e2123d1d0618de8a7eb1c721b8de SHA1 c898b45885857e63edb4dc84e684191cf766876c SHA256 5a7280f7b1857481de63655cc0b64814dd96ef6db8949be3959e6d59ac69c5ca
 MISC metadata.xml 657 RMD160 023b0019db1f817210d34984e84707b61f6bbcc8 SHA1 211eafaca6d54acdddac70381bd630a67896d11b SHA256 758f7d2a69a9f3f3a49a7bec2c866f19fc416a45fd1fd0bebfe8a4fd1a2dfa2e
diff --git a/net-im/psi/psi-0.13_rc1.ebuild b/net-im/psi/psi-0.13_rc1.ebuild
index 408c0524b2ae..4f340798a497 100644
--- a/net-im/psi/psi-0.13_rc1.ebuild
+++ b/net-im/psi/psi-0.13_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.13_rc1.ebuild,v 1.1 2009/05/29 07:57:50 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.13_rc1.ebuild,v 1.2 2009/06/01 11:31:38 pva Exp $
 
 EAPI="2"
 
@@ -14,12 +14,12 @@ DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
 HOMEPAGE="http://psi-im.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	mirror://gentoo/${PN}-langs-${LANGPACK_VER}.tar.bz2
-	extras? ( mirror://gentoo/${PN}-extra-patches-r504.tar.bz2
-		mirror://gentoo/${PN}-extra-iconsets-r504.tar.bz2 )"
+	extras? ( mirror://gentoo/${PN}-extra-patches-r515.tar.bz2 
+		mirror://gentoo/${PN}-extra-iconsets-r515.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="crypt dbus debug doc spell ssl xscreensaver extras"
 RESTRICT="test"
 
@@ -30,7 +30,7 @@ for LNG in ${LANGS}; do
 done
 
 COMMON_DEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
-	app-crypt/qca:2
+	>=app-crypt/qca-2.0.2:2
 	spell? ( app-text/aspell )
 	xscreensaver? ( x11-libs/libXScrnSaver )"
 
@@ -60,6 +60,8 @@ src_prepare() {
 			-e 's:\(^#define PROG_NAME "Psi\):\1+:' \
 				-i src/applicationinfo.cpp || die
 	fi
+	rm -rf third-party/qca # We use system libraries.
+
 }
 
 src_configure() {
@@ -116,9 +118,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use extras; then
-		ewarn "You've built Psi+ version of Psi (USE=extras)."
-		ewarn "Do not report any bugs upstream, until you manage"
-		ewarn "to reproduce them with USE=-extras. Thank you."
-	fi
+	elog "If you wish to try voice (and video) chat in psi, don't forget to"
+	elog " # emerge psimedia"
 }
diff --git a/net-im/psimedia/Manifest b/net-im/psimedia/Manifest
index fab8e2c7c5a2..efa60dd400d6 100644
--- a/net-im/psimedia/Manifest
+++ b/net-im/psimedia/Manifest
@@ -1,4 +1,4 @@
 DIST psimedia-1.0.2.tar.bz2 232779 RMD160 d1bb783b11913964ce2d9fd3997c79222a8caf08 SHA1 efb9840c30ea623b321dc3797eab95a22ecb3542 SHA256 6f2dc0e26e2896a362dcb8fbb372e3dc1c8a500fdec4cb7df19667ff2ba3cbbd
-EBUILD psimedia-1.0.2.ebuild 1746 RMD160 244b3a12786309f5fdf67ba7163900386b46c3e6 SHA1 6cd271900ecfeb86e65f9e1e99f2ea0db92d9b85 SHA256 a7afff28ea4e8b8987dc9403984b1b0dda14bdd2769e2b01f2f1d4008f7bfcfc
-MISC ChangeLog 367 RMD160 e313781438b24c70956b6171274a188801629be4 SHA1 70480aa47815e621ddc2350941b8cabe732d2338 SHA256 c958186ffb4a0bad67db6627852f2c2a626f35cf79abc5d49a0ca0ee8073c6f2
+EBUILD psimedia-1.0.2.ebuild 1769 RMD160 3bac5ddeccf12c2b84dd8602a489c8f5b1e32234 SHA1 29320d9386416a388f44923211fa33308f17e2ba SHA256 4b25072c507f0aa574106066f8c690d460c307c1754bc2666c55b799bfcdf98a
+MISC ChangeLog 529 RMD160 e235ee607ee40a144e13256d5b12a2cec1a50778 SHA1 e7a83b2a733c53e1409bbb140c4d3d5dc42580a4 SHA256 4b689a7d27a451542caa3abd66b4740c96ca25f2d0603baa6c1fd57c41e90641
 MISC metadata.xml 307 RMD160 e7f5752ad0c0709821be712f0b21591e818988c4 SHA1 73a47010989b8484041e3dee6cae919a9842e7c3 SHA256 56c28e7c14331d3aed6dac022a112a6133df208f5f51ad5dbde9f3e65c937d0a