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.

(Portage version: 2.2_rc23/cvs/Linux i686)

6 files changed, 122 insertions, 73 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/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
+}