Version bump: this release fixes security issue, bug #252830, thank Alex Legler for report. Added support for localizations, #222385, thank Davide Pesavento and Tomáš Chvátal for the work. Fixed compatibility issue with qt-4.5, #258992, thank Azamat H. Hackimov for report and digging patch. In psi-0.10-r4 updated paths as reported in bug #207169, thank Boris Petersen.

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

7 files changed, 129 insertions, 78 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 5819b4312688..a13728984776 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-im/psi
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.148 2008/09/20 10:05:57 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.149 2009/02/18 14:35:44 pva Exp $
+
+*psi-0.12.1 (18 Feb 2009)
+
+  18 Feb 2009; Peter Volkov <pva@gentoo.org>
+  +files/psi-0.12.1-qt-4.5-compatibility.patch, metadata.xml,
+  psi-0.10-r4.ebuild, -psi-0.11.ebuild, +psi-0.12.1.ebuild:
+  Version bump: this release fixes security issue, bug #252830, thank Alex
+  Legler for report. Added support for localizations, #222385, thank Davide
+  Pesavento and Tomáš Chvátal for the work. Fixed compatibility issue
+  with qt-4.5, #258992, thank Azamat H. Hackimov for report and digging
+  patch. In psi-0.10-r4 updated paths as reported in bug #207169, thank
+  Boris Petersen.
 
   20 Sep 2008; Raúl Porcel <armin76@gentoo.org> psi-0.12.ebuild:
   x86 stable wrt #236497
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index ba875d1de21f..9f09873671a0 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,4 +1,5 @@
 AUX psi-0.10-gpg2.patch 505 RMD160 bfccc6ee984fac7b93ef0343a16c84bd6653d60d SHA1 b9d79a567cbbca837fb69a05ea8e59e07fdadf36 SHA256 cedeef3a18d0f7c4d50d1d86d9de88cceddf352977b2ae7df72451f3ba188348
+AUX psi-0.12.1-qt-4.5-compatibility.patch 524 RMD160 c68887a6bc31ad20cd42c427769ecd3cfed53280 SHA1 5afbaa1474eec179a6c3ce1f1ea2deafd0a22369 SHA256 5e5c3d8089092c7b81eb6295a701c634ebd223ee6791f36ed56d83d72374ac13
 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
@@ -9,9 +10,10 @@ AUX psi-reverse_trayicon2.patch 937 RMD160 bbf8ba2c512ceab7b3fe82af12ff9b647d6b3
 DIST gentoo-psi-0.10-r2.tar.bz2 36370 RMD160 157b2f6fd4d1be8886572f10752a94b732cead8f SHA1 67004e3e70ab30129d174567b0332f0577a19dd9 SHA256 e450004e358e949113db1c298990a0d0514012f605ad1d7710b204eb82209a75
 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.11.tar.bz2 2000216 RMD160 0e4ce707d7659e02d29b16d6d95a4c4c8ba9850a SHA1 834fac4b51d92e2502cb08d01d40f05ffcdce4a2 SHA256 be37b7b8d86e965362512f47bf68af2b21d35e5c886a9e0eccf1c9bc519706b3
+DIST psi-0.12.1.tar.bz2 2112404 RMD160 a5fc850796b0078bc1a03f4ff93a03611ee11e80 SHA1 6fdcea3a072b40333faecc37acdb925f9bf8c5c3 SHA256 a8022faadbbe15bc4691338b1d83400adf069f773b7fa3b462552515990b277e
 DIST psi-0.12.tar.bz2 2122406 RMD160 be5922ef84040113b257aaf99ac9bd350b69349c SHA1 2927497a53d1eb00720718ec41cf61a911914922 SHA256 0309d48891ab18cb8afc15416db2e9db979bc66f5cd879b382de226043e91e6c
 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
 DIST psi_bg-0.10-b-1.tar.bz2 34477 RMD160 0a9b61207a8bf9d0b97ac9bed94aa5b47a1915a5 SHA1 f114dbb802b0f640e52dae1a2dcc0796fd7ea58f SHA256 3418401beefdf694fa24178563558340e69e7a6f8ebde925d0aee5bd09316cf6
 DIST psi_ca-0.10-a-1.tar.bz2 33890 RMD160 1047f532acb4a5f2bf6cc4f535821c5c115de6cd SHA1 57e132d148f057b7b29c4fcafb4d534e5016c2ad SHA256 d5ed51ff94831712e9d7d93e557849a394ecb9cc96a43e115e099ae9c6ed0397
@@ -41,8 +43,8 @@ DIST psi_sw-0.9.3.tar.bz2 32917 RMD160 da126fa3e5c27a1ab5f3c69f9f10e04d164e7744
 DIST psi_vi-0.10-b-1.tar.bz2 34255 RMD160 e1d168e189a454d392473996e77dbcd8778fbe05 SHA1 f2c894a60f8a385f8eb94cceeace1a120535d02a SHA256 94ae3fe1f421132ce285e6246db9c0facbf1a6f472c870e28ee42993dbc98039
 DIST psi_zh-0.10-a-1.tar.bz2 32898 RMD160 c0440dcb7763908354fc9c8f1d1b1873a00f7f75 SHA1 fa859645d2fb7da6a94c028c9413da18abd12b3c SHA256 747993fe4d9c9517d72360a8618c7c33600e2b870223fe69e107d64166d5a43a
 EBUILD psi-0.10-r3.ebuild 11114 RMD160 976ca5966451c160c5b9d1a3b807e448e3806cba SHA1 82482330f1eee7e663616a4372760bad6b3b07eb SHA256 95f5a8ec32f1f24468960fef8f617fb69b743978b19432ed61d208e3dd6c1cc8
-EBUILD psi-0.10-r4.ebuild 11389 RMD160 d393d04a7fb5e10e6c46abac2e4f28b803e32942 SHA1 9d90108f34b0ca189f9c798726b4b15b47cf5e48 SHA256 582ee499893d4e8a5f7fe9b3eeb7881349e8bfd43dc2abd2b0b6cb5dfe00f09e
-EBUILD psi-0.11.ebuild 1875 RMD160 6357d1a70745373e20dbcbae44ea7f8d610d17ad SHA1 bf7d48d2914545c5fd78e651a85332cc5ff5877f SHA256 12120dfbe6cea1aff0d8575d4ebc8b9bb03f19440d888ab29bb61b97f023433b
+EBUILD psi-0.10-r4.ebuild 11397 RMD160 c20c4f836a46adad23327029605818104441d98e SHA1 256af111995319422ffa88a61f600acce60ffb97 SHA256 0ecdf57a7ead4808dcddd572a88d8c103e127af35eb0a75973330629f41dc5e8
+EBUILD psi-0.12.1.ebuild 2425 RMD160 d52997313c108ba912fb3a5fd99db2449d00619d SHA1 f8c3e60a119f7126ada051788c111476234c1491 SHA256 0f38d573a00a5ca029c1d3875e0d86a12f345c286ad859fbb8b2d5d77c47d2aa
 EBUILD psi-0.12.ebuild 2436 RMD160 6f001f3847d7a3b783bd1e86b9cbeda24dcbf79d SHA1 de306dfd2af759f833489c4c8012178872b0c06e SHA256 deceb3083b22e7384a09df0d1ef937602207ef6d3cd0a305b4ab21dc29990f2a
-MISC ChangeLog 20639 RMD160 1da5b73963b9ad5185433e398402fba5e61507b6 SHA1 18033b6df3d299904da29cf51009e2f6d2c0433f SHA256 016d070ce4e7b4b76ac26759e7ec2f73d44d2eee99d6d930309d4c8240bb478c
-MISC metadata.xml 598 RMD160 0745e608729d8d57e0655eba52d6122a019fbe8a SHA1 805e02b2b5da37fa30a07cad8d7d196ea4ac5051 SHA256 58abf1bd951a67c7c3cf7de9c712798664171f739f1372e7b27ca1b63d5e33ca
+MISC ChangeLog 21216 RMD160 54ac501993f29a76c5d5465452ef2d4921dcbd5a SHA1 f574b6ba03863b72c165149ef8bdb0609181441f SHA256 e42a9898cd391ab5eba410bfcdff15103b470b9912f67fa0a2f3e7f72e8507f4
+MISC metadata.xml 657 RMD160 023b0019db1f817210d34984e84707b61f6bbcc8 SHA1 211eafaca6d54acdddac70381bd630a67896d11b SHA256 758f7d2a69a9f3f3a49a7bec2c866f19fc416a45fd1fd0bebfe8a4fd1a2dfa2e
diff --git a/net-im/psi/files/psi-0.12.1-qt-4.5-compatibility.patch b/net-im/psi/files/psi-0.12.1-qt-4.5-compatibility.patch
new file mode 100644
index 000000000000..203ba6e8a6b0
--- /dev/null
+++ b/net-im/psi/files/psi-0.12.1-qt-4.5-compatibility.patch
@@ -0,0 +1,13 @@
+--- src/main.cpp.old	2009-02-14 21:52:12.000000000 +0500
++++ src/main.cpp	2009-02-14 21:54:42.000000000 +0500
+@@ -274,9 +274,9 @@
+ 
+ int main(int argc, char *argv[])
+ {
++	PsiApplication app(argc, argv);
+ 	// it must be initialized first in order for ApplicationInfo::resourcesDir() to work
+ 	QCA::Initializer init;
+-	PsiApplication app(argc, argv);
+ 	QApplication::addLibraryPath(ApplicationInfo::resourcesDir());
+ 	QApplication::addLibraryPath(ApplicationInfo::homeDir());
+ 	QApplication::setQuitOnLastWindowClosed(false);
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 28f6e9c3dd70..e6e8e55c663e 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -5,6 +5,9 @@
 <maintainer>
   <email>welp@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>pva@gentoo.org</email>
+</maintainer>
 <longdescription>Psi is a very good jabber client that uses QT</longdescription>
 <use>
 	<flag name='audacious'>Enable monitoring of audio tracks that are played in
diff --git a/net-im/psi/psi-0.10-r4.ebuild b/net-im/psi/psi-0.10-r4.ebuild
index 2e6372089f69..188c561345fe 100644
--- a/net-im/psi/psi-0.10-r4.ebuild
+++ b/net-im/psi/psi-0.10-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.10-r4.ebuild,v 1.3 2008/07/27 22:00:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.10-r4.ebuild,v 1.4 2009/02/18 14:35:44 pva Exp $
 
 EAPI=1
 
@@ -245,8 +245,8 @@ src_compile() {
 
 	./configure \
 		--prefix=/usr \
-		--with-qca-inc=/usr/include \
-		--with-qca-lib=/usr/lib \
+		--with-qca-inc=/usr/include/qca1 \
+		--with-qca-lib=/usr/lib/qca1 \
 		${myconf} \
 		|| die "Configure failed"
 
diff --git a/net-im/psi/psi-0.11.ebuild b/net-im/psi/psi-0.11.ebuild
deleted file mode 100644
index d8beb2bf6490..000000000000
--- a/net-im/psi/psi-0.11.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11.ebuild,v 1.10 2008/08/11 17:52:44 yngwin Exp $
-
-EAPI=1
-
-inherit eutils qt4 multilib
-
-DESCRIPTION="QT 4.x Jabber Client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-IUSE="crypt doc kernel_linux spell ssl xscreensaver"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-RESTRICT="test"
-
-COMMON_DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
-	=app-crypt/qca-2*
-	spell? ( app-text/aspell )
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-DEPEND="${COMMON_DEPEND}
-	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 )"
-
-QT4_BUILT_WITH_USE_CHECK="qt3support png"
-
-src_compile() {
-	# disable growl as it is a mac osx extension only
-	local myconf="--prefix=/usr --qtdir=/usr"
-	myconf="${myconf} --disable-growl --disable-bundled-qca"
-	use kernel_linux || myconf="${myconf} --disable-dnotify"
-	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"
-
-	eqmake4 ${PN}.pro
-
-	SUBLIBS="-L/usr/${get_libdir}/qca2" emake || die "emake failed"
-
-	if use doc; then
-		cd doc
-		make api_public || die "make api_public failed"
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-
-	# this way the docs will be installed in the standard gentoo dir
-	newdoc iconsets/roster/README README.roster
-	newdoc iconsets/system/README README.system
-	newdoc certs/README README.certs
-	dodoc README
-
-	if use doc; then
-		cd doc
-		dohtml -r api || die "dohtml failed"
-	fi
-}
diff --git a/net-im/psi/psi-0.12.1.ebuild b/net-im/psi/psi-0.12.1.ebuild
new file mode 100644
index 000000000000..d5578c0a294e
--- /dev/null
+++ b/net-im/psi/psi-0.12.1.ebuild
@@ -0,0 +1,88 @@
+# 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.12.1.ebuild,v 1.1 2009/02/18 14:35:44 pva Exp $
+
+EAPI="2"
+
+inherit eutils qt4 multilib
+
+LANGPACK_VER="20090217"
+
+DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
+HOMEPAGE="http://psi-im.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-langs-${LANGPACK_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt dbus debug doc 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"
+for LNG in ${LANGS}; do
+	IUSE="${IUSE} linguas_${LNG}"
+	#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?]
+	app-crypt/qca:2
+	spell? ( app-text/aspell )
+	xscreensaver? ( x11-libs/libXScrnSaver )"
+
+DEPEND="${COMMON_DEPEND}
+	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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-qt-4.5-compatibility.patch"
+}
+
+src_configure() {
+	# 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"
+}
+
+src_compile() {
+	eqmake4 ${PN}.pro
+
+	SUBLIBS="-L/usr/${get_libdir}/qca2" emake || die "emake failed"
+
+	if use doc; then
+		cd doc
+		make api_public || die "make api_public failed"
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+
+	# this way the docs will be installed in the standard gentoo dir
+	newdoc iconsets/roster/README README.roster || die
+	newdoc iconsets/system/README README.system || die
+	newdoc certs/README README.certs || die
+	dodoc README || die
+
+	if use doc; then
+		cd doc
+		dohtml -r api || die "dohtml failed"
+	fi
+
+	# install translations
+	cd "${WORKDIR}/${PN}-langs"
+	insinto /usr/share/${PN}/
+	for LNG in ${LINGUAS}; do
+		doins ${PN}_${LNG/ur_PK/ur_pk}.qm || die
+	done
+}