Version bump. Added jingle USE flag. Incorporated improvements as suggested by Davide Pesavento in bug #271091. and... missed archs back.

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

4 files changed, 39 insertions, 55 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 819553bfd135..d30006b47ea6 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.160 2009/06/02 17:04:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.161 2009/07/08 10:44:52 pva Exp $
+
+*psi-0.13_rc2 (08 Jul 2009)
+
+  08 Jul 2009; Peter Volkov <pva@gentoo.org> -psi-0.13_rc1-r1.ebuild,
+  +psi-0.13_rc2.ebuild, -files/psi-0.13_rc1-dialog-show.patch:
+  Version bump. Added jingle USE flag. Incorporated improvements as
+  suggested by Davide Pesavento in bug #271091. and... missed archs back.
 
 *psi-0.13_rc1-r1 (02 Jun 2009)
 
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 5abfb7c68d3a..3c39cc301810 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,7 +1,6 @@
 AUX psi-0.10-gpg2.patch 505 RMD160 bfccc6ee984fac7b93ef0343a16c84bd6653d60d SHA1 b9d79a567cbbca837fb69a05ea8e59e07fdadf36 SHA256 cedeef3a18d0f7c4d50d1d86d9de88cceddf352977b2ae7df72451f3ba188348
 AUX psi-0.12.1-build-error.patch 719 RMD160 401d3d17d9617ead7a78d78431a19c65c21b5667 SHA1 f47f6365c04872ba0a977241ee9d756eee640f0b SHA256 8daaf3e27d153b0c3e97b203adfc081fa06dd0d46a85a219baac9b181d0c51bb
 AUX psi-0.12.1-qt-4.5-compatibility.patch 524 RMD160 c68887a6bc31ad20cd42c427769ecd3cfed53280 SHA1 5afbaa1474eec179a6c3ce1f1ea2deafd0a22369 SHA256 5e5c3d8089092c7b81eb6295a701c634ebd223ee6791f36ed56d83d72374ac13
-AUX psi-0.13_rc1-dialog-show.patch 505 RMD160 78d6ceff3903e340eb76d4abd9f068a1bc6c1aa3 SHA1 61918024c38eec7c9384cf4f809b98c357cf929a SHA256 53ac7ea8a915029ed2354bd668bbcb3dffc33252f1bea8f43eafd4c690379e3d
 AUX psi-desktop2.patch 508 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 SHA1 71ddba6d8cafa8b7de218620dd7373758cc064d9 SHA256 b4045dafc0bc00b0167449693fc3e9b2f53041a070a93954f8939ee0866efa8e
 AUX psi-echoplugin.patch 785 RMD160 eba6e881b251062d5f102d0a9450239eb778cf75 SHA1 1ba5d83ce9cf517e13eb6510ea16b62641c276f1 SHA256 9476e8de292427a7c3e209a72cd2ee5663bfe76e88b89618414adde84991c8ff
 AUX psi-indicator.png 300 RMD160 507ab090f82276492bbf6af23eab78e2f8c8ccf2 SHA1 2adcd9b63b2f0ba98415c8bb526d1a57c24d88f4 SHA256 a0e9adcd0409d23c9033170ceb8f22980ba6d5e14f19234630f9986bfb94bce2
@@ -13,9 +12,9 @@ DIST gentoo-psi-0.10-r2.tar.bz2 36370 RMD160 157b2f6fd4d1be8886572f10752a94b732c
 DIST gentoo-psi-0.10.tar.bz2 211538 RMD160 35b7c7c45420ee18917f3b073e063ef3b046ef3a SHA1 96723e8172c581c5e21f5e245658382ded49e6f1 SHA256 1d499ecb693401a69600d48c62bc3cbd3f4eed7605729655959d13af981d72bd
 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-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-0.13-rc2.tar.bz2 3017075 RMD160 b896d8cc69b0c382e8f19cc3f47d3936f40880d5 SHA1 ab9d7f071e1a31d510c16281e946a9bb7e35fc04 SHA256 21572616cf1eeaf7099e25da381b24e4ee2e911a28000ec9a0a7474f73494635
+DIST psi-extra-iconsets-r654.tar.bz2 2607330 RMD160 8f3412db6b0573bab10c755b5faf21f79e0873f8 SHA1 ec2a8d1cdd0eed954d69eb50015ab7d93ac15e72 SHA256 13df0760fbe138a9ca1b528c4964f16fde3b0acb8b0ee4bb2c6ca96d0ad8ddc9
+DIST psi-extra-patches-r654.tar.bz2 76371 RMD160 5265b181b5a141701d0fed04aa81bc2a0b1e0f33 SHA1 ab59dd9d3e3c579e9d7add01cab1e538cbeffd35 SHA256 5b2501cef22417ee92a27e959f284f0ad358cfa3f102702ec66a5353ec904f8e
 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
@@ -49,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-r1.ebuild 3677 RMD160 07d513a9c7c69f8797874e57de62f8daf8c6638f SHA1 4a2cb7e09fb78d13be0cfa91621e85662eed61e5 SHA256 379c299e3911e77f89d9f113d382f1789fcde174e8f162637d8c7b44227d9b25
-MISC ChangeLog 23155 RMD160 e0faf754379fd7c4c754405493f650c76b4cc1cd SHA1 c5bcb5c95eb58ee237ef4d5db362898c1ac26b65 SHA256 044902f4e37f51ce3798cd47b491c8289d566cbe9ce4fad1f96524046e75ccfe
+EBUILD psi-0.13_rc2.ebuild 3464 RMD160 f2b2cbd4e42050ad62067367023571ee2112a609 SHA1 c59a5ae60703582fc427c0e388ba73d03e2848f2 SHA256 15e04e2f1d84c86e66b509c148d590955e25ff6e751126ccc8385ee18aab7522
+MISC ChangeLog 23460 RMD160 6eda3dfaf804519da12aa83dbe04cab3dfbdef5f SHA1 19394afa10aa3fd2cec1d5e8661f92e9e657af32 SHA256 7b73f572199a906bbc73b1e39adb3ff79968e5bab38dfda31e5d25760922dff0
 MISC metadata.xml 657 RMD160 023b0019db1f817210d34984e84707b61f6bbcc8 SHA1 211eafaca6d54acdddac70381bd630a67896d11b SHA256 758f7d2a69a9f3f3a49a7bec2c866f19fc416a45fd1fd0bebfe8a4fd1a2dfa2e
diff --git a/net-im/psi/files/psi-0.13_rc1-dialog-show.patch b/net-im/psi/files/psi-0.13_rc1-dialog-show.patch
deleted file mode 100644
index 13896365bd06..000000000000
--- a/net-im/psi/files/psi-0.13_rc1-dialog-show.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 21278511d08c42fe82db751c3749bb8ae7f5adb6
-Author: Justin Karneges <justin@affinix.com>
-Date:   Mon Jun 1 11:23:51 2009 -0700
-
-    fix bug where calldlg might not display
-
-diff --git a/src/avcall/calldlg.cpp b/src/avcall/calldlg.cpp
-index 424e627..36504f2 100644
---- a/src/avcall/calldlg.cpp
-+++ b/src/avcall/calldlg.cpp
-@@ -87,7 +87,7 @@ public:
- 		ui.pb_accept->setDefault(true);
- 		ui.pb_accept->setFocus();
- 
--		q->resize(q->minimumSize());
-+		q->resize(q->minimumSizeHint());
- 	}
- 
- 	~Private()
diff --git a/net-im/psi/psi-0.13_rc1-r1.ebuild b/net-im/psi/psi-0.13_rc2.ebuild
index e31db8abe906..9ed18fffdb0c 100644
--- a/net-im/psi/psi-0.13_rc1-r1.ebuild
+++ b/net-im/psi/psi-0.13_rc2.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-r1.ebuild,v 1.1 2009/06/02 17:04:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.13_rc2.ebuild,v 1.1 2009/07/08 10:44:52 pva Exp $
 
 EAPI="2"
 
@@ -14,13 +14,13 @@ 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-r515.tar.bz2
-		mirror://gentoo/${PN}-extra-iconsets-r515.tar.bz2 )"
+	extras? ( mirror://gentoo/${PN}-extra-patches-r654.tar.bz2
+		mirror://gentoo/${PN}-extra-iconsets-r654.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt dbus debug doc spell ssl xscreensaver extras"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver"
 RESTRICT="test"
 
 LANGS="cs de eo es_ES fr it mk pl pt_BR ru uk ur_PK vi zh zh_TW"
@@ -29,17 +29,17 @@ for LNG in ${LANGS}; do
 	#SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
 done
 
-COMMON_DEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
+RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
 	>=app-crypt/qca-2.0.2:2
 	spell? ( app-text/aspell )
 	xscreensaver? ( x11-libs/libXScrnSaver )"
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( >=app-crypt/qca-gnupg-2.0.0_beta2 )
-	ssl? ( >=app-crypt/qca-ossl-2.0.0_beta2 )"
+PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
+	jingle? ( net-im/psimedia )
+	ssl? ( app-crypt/qca-ossl:2 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -54,7 +54,7 @@ src_prepare() {
 		ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
 		ebeep
 
-		EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} 280-psi-application-info.diff" \
+		EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} 270-psi-application-info.diff" \
 		EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
 		sed -e 's/\(^#define PROG_CAPS_NODE	\).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
 			-e 's:\(^#define PROG_NAME "Psi\):\1+:' \
@@ -62,27 +62,29 @@ src_prepare() {
 	fi
 
 	rm -rf third-party/qca # We use system libraries.
-
-	epatch "${FILESDIR}/${P}-dialog-show.patch"
 }
 
 src_configure() {
+	# unable to use econf because of non-standard configure script
 	# disable growl as it is a MacOS X extension only
-	local myconf="--prefix=/usr --qtdir=/usr"
-	myconf="${myconf} --disable-growl --disable-bundled-qca"
-	use debug && myconf="${myconf} --enable-debug"
-	use dbus || myconf="${myconf} --disable-qdbus"
-	use spell || myconf="${myconf} --disable-aspell"
-	use xscreensaver || myconf="${myconf} --disable-xss"
-
-	# cannot use econf because of non-standard configure script
-	./configure ${myconf} || die "configure failed"
+	local confcmd="./configure
+			--prefix=/usr
+			--qtdir=/usr
+			--disable-bundled-qca
+			--disable-growl
+			$(use dbus || echo '--disable-qdbus')
+			$(use debug && echo '--enable-debug')
+			$(use spell || echo '--disable-aspell')
+			$(use xscreensaver || echo '--disable-xss')"
+
+	echo ${confcmd}
+	${confcmd} || die "configure failed"
 }
 
 src_compile() {
-	eqmake4 ${PN}.pro
+	eqmake4
 
-	SUBLIBS="-L/usr/${get_libdir}/qca2" emake || die "emake failed"
+	emake || die "emake failed"
 
 	if use doc; then
 		cd doc
@@ -118,8 +120,3 @@ src_install() {
 		cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die
 	fi
 }
-
-pkg_postinst() {
-	elog "If you wish to try voice (and video) chat in psi, don't forget to"
-	elog " # emerge psimedia"
-}