Version bump, thank Rion and Vadim Efimov for report.

(Portage version: 2.2_rc51/cvs/Linux i686)
author: Peter Volkov <pva@gentoo.org> 2009-12-04 09:44:02 +0000
committer: Peter Volkov <pva@gentoo.org> 2009-12-04 09:44:02 +0000
commit: 9667e7c2130936c8a599192a1bfc25ce7393112e (patch)
tree: db9f95fc61550da79f7573c765ae92d57d30790f
parent: Version Bump. (diff)
download: gentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.tar.gz
gentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.tar.bz2
gentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.zip
13 files changed, 30 insertions, 754 deletions
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index dd3a1bdf4acd..a52ad9fe6bf2 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,16 @@
 # 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.179 2009/11/26 19:15:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.180 2009/12/04 09:44:02 pva Exp $
+
+*psi-0.14 (04 Dec 2009)
+
+  04 Dec 2009; Peter Volkov <pva@gentoo.org> -files/psi-0.10-gpg2.patch,
+  -files/psi-desktop2.patch, -files/psi-echoplugin.patch,
+  -files/psi-indicator.png, -files/psi-jingle-gcc4.patch,
+  -files/psi-pathfix2.patch, -files/psi-ptr_64bit_fix.patch,
+  -files/psi-reverse_trayicon2.patch, -psi-0.10-r3.ebuild,
+  -psi-0.10-r4.ebuild, -psi-0.14_rc3.ebuild, +psi-0.14.ebuild, metadata.xml:
+  Version bump, thank Rion and Vadim Efimov for report.
 
 *psi-0.14_rc3 (26 Nov 2009)
 
diff --git a/net-im/psi/files/psi-0.10-gpg2.patch b/net-im/psi/files/psi-0.10-gpg2.patch
deleted file mode 100644
index cd2b3a95fe45..000000000000
--- a/net-im/psi/files/psi-0.10-gpg2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp psi-0.10.org/src/tools/openpgp/gpgop.cpp psi-0.10/src/tools/openpgp/gpgop.cpp
---- psi-0.10.org/src/tools/openpgp/gpgop.cpp	2005-08-21 20:44:28.000000000 +0300
-+++ psi-0.10/src/tools/openpgp/gpgop.cpp	2007-06-28 18:55:55.000000000 +0300
-@@ -377,7 +377,7 @@ void GpgOp::proc_statusLine(const QStrin
- 		rest = str.mid(n+1);
- 	}
- 
--	if(s == "NEED_PASSPHRASE") {
-+	if(s == "GET_HIDDEN") {
- 		if(!(d->tryAgent && getenv("GPG_AGENT_INFO"))) {
- 			if(!d->didPassphrase) {
- 				d->didPassphrase = true;
diff --git a/net-im/psi/files/psi-desktop2.patch b/net-im/psi/files/psi-desktop2.patch
deleted file mode 100644
index 119a0dd2e7d0..000000000000
--- a/net-im/psi/files/psi-desktop2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur psi-0.10-test3-orig/psi.desktop psi-0.10-test3/psi.desktop
---- psi-0.10-test3-orig/psi.desktop	2005-11-07 00:39:22.000000000 +0000
-+++ psi-0.10-test3/psi.desktop	2005-11-07 01:16:22.000000000 +0000
-@@ -1,7 +1,11 @@
- Encoding=UTF-8
- Name=Psi
- GenericName=Jabber Client
-+GenericName[pl]=Klient Jabbera
-+GenericName[fr]=Client Jabber
- Comment=Communicate over the Jabber network
-+Comment[pl]=Komunikator sieci Jabber
-+Comment[fr]=Communiquer sur le réseau Jabber
- Icon=psi
- Exec=psi
- Terminal=false
diff --git a/net-im/psi/files/psi-echoplugin.patch b/net-im/psi/files/psi-echoplugin.patch
deleted file mode 100644
index 47f0e5220d79..000000000000
--- a/net-im/psi/files/psi-echoplugin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru psi-dev-snapshot-2007-02-04-orig/src/plugins/generic/echo/echoplugin.cpp psi-dev-snapshot-2007-02-04/src/plugins/generic/echo/echoplugin.cpp
---- psi-dev-snapshot-2007-02-04-orig/src/plugins/generic/echo/echoplugin.cpp	2007-02-04 06:30:25.000000000 +0100
-+++ psi-dev-snapshot-2007-02-04/src/plugins/generic/echo/echoplugin.cpp	2007-02-05 02:29:04.000000000 +0100
-@@ -60,7 +60,7 @@
- {
- 	qWarning(qPrintable(QString("Received message '%1', echoing back to %2").arg(message).arg(fromDisplay)));
- 	QVariant option;
--	emit getGlobalOption(message, &option);
-+	emit getGlobalOption(message, option);
- 	QString reply;
- 	if (option.isValid())
- 		reply=QString("<message to=\"%1\" type=\"chat\"><body>Option %2 = %3 </body></message>").arg(fromJid).arg(message).arg(option.toString());
diff --git a/net-im/psi/files/psi-indicator.png b/net-im/psi/files/psi-indicator.png
deleted file mode 100644
index b349dc364b7b..000000000000
--- a/net-im/psi/files/psi-indicator.png
+++ /dev/null
diff --git a/net-im/psi/files/psi-jingle-gcc4.patch b/net-im/psi/files/psi-jingle-gcc4.patch
deleted file mode 100644
index c2c50e48b64c..000000000000
--- a/net-im/psi/files/psi-jingle-gcc4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Nur in psi-dev-snapshot-2006-10-16.fixed: conf.log.
-Nur in psi-dev-snapshot-2006-10-16.fixed: conf.pri.
-Nur in psi-dev-snapshot-2006-10-16.fixed: Makefile.
-Nur in psi-dev-snapshot-2006-10-16.fixed: psi.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: config.h.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: Makefile.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: .moc.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: .obj.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: psi.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: .rcc.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: .ui.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: liblibjingle.a.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: Makefile.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: .obj.
-diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/base64.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/base64.h
---- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/base64.h	2006-10-16 06:30:14.000000000 +0200
-+++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/base64.h	2006-10-16 20:44:28.000000000 +0200
-@@ -22,8 +22,8 @@ public:
-   static string decode(const string & data);
-   static string encodeFromArray(const char * data, size_t len);
- private:
--  static const string Base64::Base64Table;
--  static const string::size_type Base64::DecodeTable[];
-+  static const string Base64Table;
-+  static const string::size_type DecodeTable[];
- };
- 
- #endif
-diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/stringutils.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/stringutils.h
---- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/stringutils.h	2006-10-16 06:30:14.000000000 +0200
-+++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/stringutils.h	2006-10-16 20:45:25.000000000 +0200
-@@ -255,7 +255,7 @@ size_t asccpyn(wchar_t* buffer, size_t b
- template<>
- struct Traits<char> {
-   typedef std::string string;
--  inline static const char* Traits<char>::empty_str() { return ""; }
-+  inline static const char* empty_str() { return ""; }
- };
- 
- ///////////////////////////////////////////////////////////////////////////////
-diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/xmpp/xmppclient.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/xmpp/xmppclient.h
---- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/xmpp/xmppclient.h	2006-10-16 06:30:14.000000000 +0200
-+++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/xmpp/xmppclient.h	2006-10-16 21:12:38.000000000 +0200
-@@ -133,7 +133,7 @@ private:
-     }
-   }
- 
--  std::string XmppClient::GetStateName(int state) const {
-+  std::string GetStateName(int state) const {
-     switch (state) {
-       case STATE_PRE_XMPP_LOGIN:      return "PRE_XMPP_LOGIN";
-       case STATE_START_XMPP_LOGIN:  return "START_XMPP_LOGIN";
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: libqca.a.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: Makefile.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: .moc.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: .obj.
diff --git a/net-im/psi/files/psi-pathfix2.patch b/net-im/psi/files/psi-pathfix2.patch
deleted file mode 100644
index fe4ca3831a78..000000000000
--- a/net-im/psi/files/psi-pathfix2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur psi-0.10-test1-orig/src/src.pro psi-0.10-test1/src/src.pro
---- psi-0.10-test1-orig/src/src.pro	2005-08-21 17:44:36.000000000 +0000
-+++ psi-0.10-test1/src/src.pro	2005-08-24 22:19:38.000000000 +0000
-@@ -4,7 +4,7 @@
- 
- # Configuration
- TEMPLATE = app
--CONFIG  += qt thread x11
-+CONFIG  += qt thread x11 no_fixpath
- 
- CONFIG += debug
- #CONFIG += use_crash
diff --git a/net-im/psi/files/psi-ptr_64bit_fix.patch b/net-im/psi/files/psi-ptr_64bit_fix.patch
deleted file mode 100644
index ab428fc32886..000000000000
--- a/net-im/psi/files/psi-ptr_64bit_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur psi-dev-snapshot-2007-01-12-orig/src/pluginmanager.cpp psi-dev-snapshot-2007-01-12/src/pluginmanager.cpp
---- psi-dev-snapshot-2007-01-12-orig/src/pluginmanager.cpp	2007-01-12 06:30:08.000000000 +0100
-+++ psi-dev-snapshot-2007-01-12/src/pluginmanager.cpp	2007-01-13 01:54:03.000000000 +0100
-@@ -422,7 +422,6 @@
-  */ 
- void PluginManager::sendStanza( const PsiAccount* account, const QString& stanza)
- {
--	qDebug(qPrintable(QString("Want to send stanza  to account %2").arg((int)account)));
- 	if (!clients_.contains(account) || !verifyStanza(stanza))
- 		return;
- 	clients_[account]->send(stanza);
diff --git a/net-im/psi/files/psi-reverse_trayicon2.patch b/net-im/psi/files/psi-reverse_trayicon2.patch
deleted file mode 100644
index d23d4d63e2aa..000000000000
--- a/net-im/psi/files/psi-reverse_trayicon2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-Created by Przemysław 'Troll' Maciąg <pmaciag (at) gmail (dot) com>
-
-In cvs for 0.9.3 version somebody broke's trayicon...
-This patch restores ability to show proper trayicon
-in FVWM and few others (light) WM's.
-
-diff -u -p -r1.24 -r1.26
---- src/tools/trayicon/trayicon_x11.cpp	2004/02/28 16:52:39	1.24
-+++ src/tools/trayicon/trayicon_x11.cpp	2004/08/20 03:22:01	1.26
-@@ -251,11 +261,6 @@ TrayIconFreeDesktop::TrayIconFreeDesktop
- 
- 	if ( manager_window != None )
- 		send_message(dsp, manager_window, SYSTEM_TRAY_REQUEST_DOCK, winId(), 0, 0);
--	else
--	{
--		object->hide();
--		return;
--	}
- 
- 	// some KDE mumbo-jumbo... why is it there? anybody?
- 	Atom kwm_dockwindow_atom = XInternAtom(dsp, "KWM_DOCKWINDOW", false);
-@@ -345,9 +371,7 @@ void TrayIcon::sysInstall()
- 		d = (TrayIconPrivate *)(new TrayIconFreeDesktop(this, pm));
- 
- 	sysUpdateToolTip();
-+	d->show();
--
--	if ( v_isWMDock )
--		d->show();
- }
- 
- void TrayIcon::sysRemove()
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 56d5d7439511..75eb0d242515 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -7,12 +7,7 @@
 </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
-		(media-sound/audacious)
-	</flag>
 	<flag name='extras'>Enables extra non official patches</flag>
-	<flag name='insecure-patches'>Enables extra non official patches that may
-		pose as a security risk
-	</flag>
+	<flag name='webkit'>Enable chatlog rendering using webkit</flag>
 </use>
 </pkgmetadata>
diff --git a/net-im/psi/psi-0.10-r3.ebuild b/net-im/psi/psi-0.10-r3.ebuild
deleted file mode 100644
index c91392ccfa53..000000000000
--- a/net-im/psi/psi-0.10-r3.ebuild
+++ /dev/null
@@ -1,293 +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.10-r3.ebuild,v 1.7 2008/07/27 22:00:56 carlo Exp $
-
-EAPI=1
-
-inherit eutils qt3
-
-IUSE="ssl crypt xscreensaver extras audacious insecure-patches"
-LANGS="ar bg ca cs da de el eo es et fi fr it hu mk nl pl pt pt_BR ru se sk sl
-sr sr sw_TZ vi zh"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="QT 3.x Jabber Client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-# translations from http://tanoshi.net/language.html
-# polish translation contains special texts for patches from extras-version
-HTTPMIRR="http://vivid.dat.pl/psi"
-SRC_URI="mirror://sourceforge/psi/${P}.tar.bz2
-		extras? ( ${HTTPMIRR}/gentoo-${P}.tar.bz2
-			${HTTPMIRR}/gentoo-${P}-r2.tar.bz2
-			insecure-patches? ( ${HTTPMIRR}/psi-extras-insecure.tar.bz2 ) )
-		linguas_ar? ( ${HTTPMIRR}/psi_ar-0.9.3.tar.bz2 )
-		linguas_bg? ( ${HTTPMIRR}/psi_bg-0.10-b-1.tar.bz2 )
-		linguas_ca? ( ${HTTPMIRR}/psi_ca-0.10-a-1.tar.bz2 )
-		linguas_cs? ( ${HTTPMIRR}/psi_cs-0.10-a-1.tar.bz2 )
-		linguas_da? ( ${HTTPMIRR}/psi_da-0.9.3.tar.bz2 )
-		linguas_de? ( ${HTTPMIRR}/psi_de-0.10-a-1.tar.bz2 )
-		linguas_el? ( ${HTTPMIRR}/psi_el-0.9.3-a.tar.bz2 )
-		linguas_eo? ( ${HTTPMIRR}/psi_eo-0.10-a.tar.bz2 )
-		linguas_es? ( ${HTTPMIRR}/psi_es-0.10-a.tar.bz2 )
-		linguas_et? ( ${HTTPMIRR}/psi_et-0.10-a-1.tar.bz2 )
-		linguas_fi? ( ${HTTPMIRR}/psi_fi-0.9.3.tar.bz2 )
-		linguas_fr? ( ${HTTPMIRR}/psi_fr-0.10-a-1.tar.bz2 )
-		linguas_it? ( ${HTTPMIRR}/psi_it-0.10-a-1.tar.bz2 )
-		linguas_hu? ( ${HTTPMIRR}/psi_hu-0.10-a.tar.bz2 )
-		linguas_mk? ( ${HTTPMIRR}/psi_mk-0.10-a.tar.bz2 )
-		linguas_nl? ( ${HTTPMIRR}/psi_nl-0.10-a.tar.bz2 )
-		linguas_pl? ( ${HTTPMIRR}/psi_pl-0.9.3-1.tar.bz2 )
-		linguas_pt? ( ${HTTPMIRR}/psi_pt-0.10-a-1.tar.bz2 )
-		linguas_pt_BR? ( ${HTTPMIRR}/psi_ptBR-0.10-a.tar.bz2 )
-		linguas_ru? ( ${HTTPMIRR}/psi_ru-0.9.3-a.tar.bz2 )
-		linguas_se? ( ${HTTPMIRR}/psi_se-0.9.3_rc1-1.tar.bz2 )
-		linguas_sk? ( ${HTTPMIRR}/psi_sk-0.10-a-1.tar.bz2 )
-		linguas_sl? ( ${HTTPMIRR}/psi_sl-0.10-b-1.tar.bz2 )
-		linguas_sr? ( ${HTTPMIRR}/psi_sr-0.10-a-1.tar.bz2 )
-		linguas_sv? ( ${HTTPMIRR}/psi_sv-0.9.3.tar.bz2 )
-		linguas_sw_TZ? ( ${HTTPMIRR}/psi_sw-0.9.3.tar.bz2 )
-		linguas_vi? ( ${HTTPMIRR}/psi_vi-0.10-b-1.tar.bz2 )
-		linguas_zh? ( ${HTTPMIRR}/psi_zh-0.10-a-1.tar.bz2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-
-DEPEND=">=app-crypt/qca-1.0-r2
-	x11-libs/qt:3
-	xscreensaver? ( x11-misc/xscreensaver )
-	extras? ( audacious? ( media-sound/audacious ) )"
-
-RDEPEND="${DEPEND}
-	ssl? ( >=app-crypt/qca-tls-1.0-r2 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )"
-
-PATCHBASE="${WORKDIR}"
-PATCHDIR="${PATCHBASE}/${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/psi-pathfix2.patch
-	epatch ${FILESDIR}/psi-desktop2.patch
-	epatch ${FILESDIR}/psi-reverse_trayicon2.patch
-	epatch "${FILESDIR}/${P}-gpg2.patch"
-
-	if ! use extras; then
-		ewarn "You are going to install the original psi version. You might want to"
-		ewarn "try the version with extra unsuported patches by adding 'extras' to"
-		ewarn "your use flags."
-	else
-		ewarn "You are about to build a version of Psi with extra patches."
-		ewarn "Patched psi versions will not be supported by the psi development team,"
-		ewarn "but only (in limited scope) by the psi-gentoo patchset author."
-		ewarn "If you find any problem with patched psi, first contact with"
-		ewarn "troll@gentoo.org through the bugzilla or directly by email."
-		ewarn
-		ewarn "If you do not want patched psi version, please press Control-C now and"
-		ewarn "add '-extras' to your USE flags."
-		ebeep
-		epause 10
-
-		cd ${S}
-		# from http://norman.rasmussen.co.za/darcs/psi-muc/
-		epatch ${PATCHDIR}/psi-muc_support.patch
-		epatch ${PATCHDIR}/psi-muc_support-update-20051123.patch
-		epatch ${PATCHDIR}/psi-muc_support-update-20060114.patch
-
-		# roster-nr
-		epatch ${PATCHDIR}/psi-fix_popup_richtext.patch
-		epatch ${PATCHDIR}/psi-roster-nr-0.9.14.patch
-		epatch ${PATCHDIR}/psi-status_indicator++_add-on_roster-nr.patch
-		# indicator icon
-		cp ${FILESDIR}/psi-indicator.png ${S}/iconsets/roster/default/indicator.png
-
-		# from http://www.cs.kuleuven.ac.be/~remko/psi/
-		epatch ${PATCHDIR}/jep8-avatars_iris.diff
-		epatch ${PATCHDIR}/jep8-avatars_psi.diff
-
-		# from http://machekku.uaznia.net/jabber/psi/patches/
-		epatch ${PATCHDIR}/psi-machekku-smart_reply_and_forward-0.5_psi-gentoo.diff
-		epatch ${PATCHDIR}/psi-machekku-keep_message_in_auto_away_status.diff
-		epatch ${PATCHDIR}/psi-machekku-quote_emoticons.diff
-		epatch ${PATCHDIR}/psi-machekku-emoticons_advanced_toggle.diff
-		epatch ${PATCHDIR}/psi-machekku-linkify_fix.diff
-		epatch ${PATCHDIR}/psi-machekku-autostatus_while_dnd.diff
-		epatch ${PATCHDIR}/psi-machekku-visual_styles_manifest.diff
-		epatch ${PATCHDIR}/psi-machekku-tool_window_minimize_fix_for_windows.diff
-		epatch ${PATCHDIR}/psi-machekku-new_character_counter.diff
-
-		# from ftp://ftp.patryk.one.pl/pub/psi/skazi/patches/
-		epatch ${PATCHDIR}/psi-options_resize-fix.diff
-		epatch ${PATCHDIR}/psi-settoggles-fix.diff
-		epatch ${PATCHDIR}/psi-line_in_options-mod.diff
-		epatch ${PATCHDIR}/psi-empty_group-fix.diff
-		epatch ${PATCHDIR}/psi-no_online_status-mod.diff
-		epatch ${PATCHDIR}/psi-status_history-add-psi-gentoo.diff
-		epatch ${PATCHDIR}/psi-icon_buttons_big_return-mod.diff
-		epatch ${PATCHDIR}/psi-linkify-mod-rev-fix.diff
-		epatch ${PATCHDIR}/psi-save_profile-mod.diff
-		epatch ${PATCHDIR}/psi-url_emoticon-mod.diff
-		epatch ${PATCHDIR}/psi-thin_borders-mod.diff
-
-		# from http://www.uaznia.net/psi-daisy/patches/
-		epatch ${PATCHDIR}/filetransfer.diff
-		epatch ${PATCHDIR}/psi-emots-mod.diff
-		epatch ${PATCHDIR}/psi_michalj_statusicon_in_chatdlg_titlebar.diff
-		epatch ${PATCHDIR}/psi_michalj_custom_rostericons_in_tooltips.diff
-
-		# from ftp://ftp.patryk.one.pl/pub/psi/patches/
-		epatch ${PATCHDIR}/psi-psz-chatdlg_typed_msgs_history.diff
-
-		# from http://kg.alternatywa.info/psi/patche/
-		epatch ${PATCHDIR}/psi-status-timeout-kfix.diff
-		epatch ${PATCHDIR}/psi-kg-spoof.diff
-		epatch ${PATCHDIR}/psi-kg-individual_status_add.diff
-
-		# from pld-linux.org
-		epatch ${PATCHDIR}/psi-certs.patch
-
-		# upstream patches from psi-flyspray
-		epatch ${PATCHDIR}/psi-fix_groupsortingstyle_toggles.patch
-		epatch ${PATCHDIR}/psi-multiple_account_groups.diff
-
-		# from http://psi-pedrito.go.pl/
-		epatch ${PATCHDIR}/pedrito-null-key-string-fix.diff
-		epatch ${PATCHDIR}/pedrito-avatars-printf-off.diff
-		epatch ${PATCHDIR}/pedrito-linkify_and_wrap-client.diff
-		epatch ${PATCHDIR}/pedrito-group_menuitem_for_notinlist.diff
-
-		# from psi-devel mailing list
-		epatch ${PATCHDIR}/psi-history_lug.patch
-		epatch ${PATCHDIR}/psi-history-deletion-bugfix.patch
-		epatch ${PATCHDIR}/checkboxes-sound-options.diff
-
-		# from http://mircea.bardac.net/psi/patches/
-		epatch ${PATCHDIR}/psi-cli-v2.diff
-
-		# from ubuntu
-		epatch ${PATCHDIR}/psi-trayicon_ubuntu_fix.patch
-
-		# from http://home.unclassified.de/files/psi/patches/
-		epatch ${PATCHDIR}/statusdlg-enterkey.diff
-		epatch ${PATCHDIR}/fix-min-window-notify.diff
-		epatch ${PATCHDIR}/hide-no-resource-from-contextmenu.diff
-		epatch ${PATCHDIR}/custom-sound-popup.patch
-		epatch ${PATCHDIR}/offline-contact-animation.diff
-
-		# from bugs.gentoo.org
-		epatch ${PATCHDIR}/psi-add-status-history.patch
-
-		# from http://rydz.homedns.org
-		epatch ${PATCHDIR}/psi-filetransfer-finish-popup-qsorix.patch
-
-		# from http://k.uaznia.net/jabber/psi/patches/
-		epatch ${PATCHDIR}/a-psi-k-emergency_away_status_button.diff
-		epatch ${PATCHDIR}/psi-evil_message_support.patch
-		epatch ${PATCHDIR}/psi-auto_responder.patch
-		epatch ${PATCHDIR}/psi-auto_responder_gui.patch
-
-		# from http://www.cs.kuleuven.ac.be/~remko/psi/
-		epatch ${PATCHDIR}/rosteritems_iris.diff
-		# this one was chagned because of muc support
-		epatch ${PATCHDIR}/rosteritems_psi_with_muc.diff
-
-		# from http://delx.cjb.net/psi/
-		epatch ${PATCHDIR}/psi-nicknames.patch
-
-		# from http://norman.rasmussen.co.za/darcs/psi-rc/
-		epatch ${PATCHDIR}/norman-rc.diff
-		epatch ${PATCHDIR}/norman-darcs-20051129.diff
-		# from http://machekku.uaznia.net/jabber/psi/patches/
-		epatch ${PATCHDIR}/psi-machekku-rc_multiline_status_fix.diff
-		# from http://norman.rasmussen.co.za/darcs/psi-rc/
-		epatch ${PATCHDIR}/psi-dynamic-priority-rc-fix.diff
-		epatch ${PATCHDIR}/norman-darcs-20051231.patch
-
-		# created for psi-gentoo and roster-nr
-		epatch ${PATCHDIR}/psi-smile_icon_emoticonset.patch
-		epatch ${PATCHDIR}/psi-enable_avatars.patch
-		epatch ${PATCHDIR}/psi-transport_icons_and_avatars.patch
-		epatch ${PATCHDIR}/psi-client_avatars_icons.patch
-		epatch ${PATCHDIR}/psi-emoticons_advanced_toggle-add-roster-nr.patch
-		epatch ${PATCHDIR}/psi-chatdlg_messages_colors_distinguishes.patch
-		epatch ${PATCHDIR}/psi-messages_color_backgrounds_in_chat.patch
-		epatch ${PATCHDIR}/psi-sort-style-on-roster-nr.patch
-		epatch ${PATCHDIR}/psi-says_mod.patch
-		epatch ${PATCHDIR}/psi-muc_support_langpacks_fix.patch
-		epatch ${PATCHDIR}/psi-copy_jid_or_status_message_to_clipboard.patch
-		epatch ${PATCHDIR}/psi-timestamps_option_and_date_showing.patch
-		epatch ${PATCHDIR}/psi-avatars_graph_settings_filetypes.patch
-		epatch ${PATCHDIR}/psi-auto_responder_by_message.patch
-		epatch ${PATCHDIR}/psi-taskbar_flashing.patch
-		# by nelchael
-		epatch ${PATCHDIR}/psi-nelchael-exec_command.patch
-		epatch ${PATCHDIR}/psi-nelchael-disconnect-sleep.patch
-		use audacious && epatch ${PATCHDIR}/psi-nelchael-audacious-status-0.3.patch
-
-		if use insecure-patches; then
-			# from http://www.uni-bonn.de/~nieuwenh/
-			epatch ${PATCHDIR}/libTeXFormula.diff
-			# from pld-linux.org
-			epatch ${PATCHDIR}/psi-libTeXFormula-nicechats.patch
-		fi;
-
-		epatch ${PATCHDIR}/psi-gentoo-version.patch
-	fi
-}
-
-src_compile() {
-	# growl is mac osx extension only - maybe someday we will want this
-	local myconf="--disable-growl"
-	use xscreensaver || myconf="${myconf} --disable-xss"
-
-	./configure --prefix=/usr ${myconf} || die "Configure failed"
-
-	# fixes weird bugs : #150187 and #154556
-	cd ${S}/libpsi/psiwidgets
-	${QTDIR}/bin/qmake psiwidgets.pro \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE=${QTDIR}/bin/qmake \
-		QMAKE_RPATH= \
-			|| die "Qmake failed"
-
-	# for CXXFLAGS from make.conf
-	cd ${S}/src
-	${QTDIR}/bin/qmake src.pro \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE=${QTDIR}/bin/qmake \
-		QMAKE_RPATH= \
-			|| die "Qmake failed"
-	cd ${S}
-	${QTDIR}/bin/qmake psi.pro \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE=${QTDIR}/bin/qmake \
-		QMAKE_RPATH= \
-		|| die "Qmake failed"
-
-	emake || die "Make failed"
-
-	einfo "Building language packs"
-	cd ${WORKDIR}/langs
-	for i in `ls -c1 | grep "\.ts$"` ; do
-		${QTDIR}/bin/lrelease $i
-	done;
-}
-
-src_install() {
-	einfo "Installing"
-	make INSTALL_ROOT="${D}" install || die "Make install failed"
-
-	#this way the docs will also be installed in the standard gentoo dir
-	for i in roster system emoticons; do
-		newdoc ${S}/iconsets/${i}/README README.${i}
-	done;
-	newdoc certs/README README.certs
-	dodoc README TODO
-
-	#Install language packs
-	cp ${WORKDIR}/langs/psi_*.qm ${D}/usr/share/psi/
-}
diff --git a/net-im/psi/psi-0.10-r4.ebuild b/net-im/psi/psi-0.10-r4.ebuild
deleted file mode 100644
index 188c561345fe..000000000000
--- a/net-im/psi/psi-0.10-r4.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# 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.4 2009/02/18 14:35:44 pva Exp $
-
-EAPI=1
-
-inherit eutils qt3
-
-IUSE="ssl crypt xscreensaver extras audacious insecure-patches"
-LANGS="ar bg ca cs da de el eo es et fi fr it hu mk nl pl pt pt_BR ru se sk sl
-sr sr sw_TZ vi zh"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="QT 3.x Jabber Client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-# translations from http://tanoshi.net/language.html
-# polish translation contains special texts for patches from extras-version
-HTTPMIRR="http://vivid.dat.pl/psi"
-SRC_URI="mirror://sourceforge/psi/${P}.tar.bz2
-		extras? ( ${HTTPMIRR}/gentoo-${P}.tar.bz2
-			${HTTPMIRR}/gentoo-${P}-r2.tar.bz2
-			insecure-patches? ( ${HTTPMIRR}/psi-extras-insecure.tar.bz2 ) )
-		linguas_ar? ( ${HTTPMIRR}/psi_ar-0.9.3.tar.bz2 )
-		linguas_bg? ( ${HTTPMIRR}/psi_bg-0.10-b-1.tar.bz2 )
-		linguas_ca? ( ${HTTPMIRR}/psi_ca-0.10-a-1.tar.bz2 )
-		linguas_cs? ( ${HTTPMIRR}/psi_cs-0.10-a-1.tar.bz2 )
-		linguas_da? ( ${HTTPMIRR}/psi_da-0.9.3.tar.bz2 )
-		linguas_de? ( ${HTTPMIRR}/psi_de-0.10-a-1.tar.bz2 )
-		linguas_el? ( ${HTTPMIRR}/psi_el-0.9.3-a.tar.bz2 )
-		linguas_eo? ( ${HTTPMIRR}/psi_eo-0.10-a.tar.bz2 )
-		linguas_es? ( ${HTTPMIRR}/psi_es-0.10-a.tar.bz2 )
-		linguas_et? ( ${HTTPMIRR}/psi_et-0.10-a-1.tar.bz2 )
-		linguas_fi? ( ${HTTPMIRR}/psi_fi-0.9.3.tar.bz2 )
-		linguas_fr? ( ${HTTPMIRR}/psi_fr-0.10-a-1.tar.bz2 )
-		linguas_it? ( ${HTTPMIRR}/psi_it-0.10-a-1.tar.bz2 )
-		linguas_hu? ( ${HTTPMIRR}/psi_hu-0.10-a.tar.bz2 )
-		linguas_mk? ( ${HTTPMIRR}/psi_mk-0.10-a.tar.bz2 )
-		linguas_nl? ( ${HTTPMIRR}/psi_nl-0.10-a.tar.bz2 )
-		linguas_pl? ( ${HTTPMIRR}/psi_pl-0.9.3-1.tar.bz2 )
-		linguas_pt? ( ${HTTPMIRR}/psi_pt-0.10-a-1.tar.bz2 )
-		linguas_pt_BR? ( ${HTTPMIRR}/psi_ptBR-0.10-a.tar.bz2 )
-		linguas_ru? ( ${HTTPMIRR}/psi_ru-0.9.3-a.tar.bz2 )
-		linguas_se? ( ${HTTPMIRR}/psi_se-0.9.3_rc1-1.tar.bz2 )
-		linguas_sk? ( ${HTTPMIRR}/psi_sk-0.10-a-1.tar.bz2 )
-		linguas_sl? ( ${HTTPMIRR}/psi_sl-0.10-b-1.tar.bz2 )
-		linguas_sr? ( ${HTTPMIRR}/psi_sr-0.10-a-1.tar.bz2 )
-		linguas_sv? ( ${HTTPMIRR}/psi_sv-0.9.3.tar.bz2 )
-		linguas_sw_TZ? ( ${HTTPMIRR}/psi_sw-0.9.3.tar.bz2 )
-		linguas_vi? ( ${HTTPMIRR}/psi_vi-0.10-b-1.tar.bz2 )
-		linguas_zh? ( ${HTTPMIRR}/psi_zh-0.10-a-1.tar.bz2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="=app-crypt/qca-1*
-	x11-libs/qt:3
-	xscreensaver? ( x11-misc/xscreensaver )
-	extras? ( audacious? ( media-sound/audacious ) )"
-
-RDEPEND="${DEPEND}
-	ssl? ( =app-crypt/qca-tls-1* )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )"
-
-PATCHBASE="${WORKDIR}"
-PATCHDIR="${PATCHBASE}/${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/psi-pathfix2.patch"
-	epatch "${FILESDIR}/psi-desktop2.patch"
-	epatch "${FILESDIR}/psi-reverse_trayicon2.patch"
-	epatch "${FILESDIR}/${P}-gpg2.patch"
-
-	if ! use extras; then
-		ewarn "You are going to install the original psi version. You might want to"
-		ewarn "try the version with extra unsuported patches by adding 'extras' to"
-		ewarn "your use flags."
-	else
-		ewarn "You are about to build a version of Psi with extra patches."
-		ewarn "Patched psi versions will not be supported by the psi development team,"
-		ewarn "but only (in limited scope) by the psi-gentoo patchset author."
-		ewarn "If you find any problem with patched psi, first contact with"
-		ewarn "troll@gentoo.org through the bugzilla or directly by email."
-		ewarn
-		ewarn "If you do not want patched psi version, please press Control-C now and"
-		ewarn "add '-extras' to your USE flags."
-		ebeep
-		epause 10
-
-		cd "${S}"
-		# from http://norman.rasmussen.co.za/darcs/psi-muc/
-		epatch "${PATCHDIR}/psi-muc_support.patch"
-		epatch "${PATCHDIR}/psi-muc_support-update-20051123.patch"
-		epatch "${PATCHDIR}/psi-muc_support-update-20060114.patch"
-
-		# roster-nr
-		epatch "${PATCHDIR}/psi-fix_popup_richtext.patch"
-		epatch "${PATCHDIR}/psi-roster-nr-0.9.14.patch"
-		epatch "${PATCHDIR}/psi-status_indicator++_add-on_roster-nr.patch"
-		# indicator icon
-		cp "${FILESDIR}/psi-indicator.png" "${S}/iconsets/roster/default/indicator.png"
-
-		# from http://www.cs.kuleuven.ac.be/~remko/psi/
-		epatch "${PATCHDIR}/jep8-avatars_iris.diff"
-		epatch "${PATCHDIR}/jep8-avatars_psi.diff"
-
-		# from http://machekku.uaznia.net/jabber/psi/patches/
-		epatch "${PATCHDIR}/psi-machekku-smart_reply_and_forward-0.5_psi-gentoo.diff"
-		epatch "${PATCHDIR}/psi-machekku-keep_message_in_auto_away_status.diff"
-		epatch "${PATCHDIR}/psi-machekku-quote_emoticons.diff"
-		epatch "${PATCHDIR}/psi-machekku-emoticons_advanced_toggle.diff"
-		epatch "${PATCHDIR}/psi-machekku-linkify_fix.diff"
-		epatch "${PATCHDIR}/psi-machekku-autostatus_while_dnd.diff"
-		epatch "${PATCHDIR}/psi-machekku-visual_styles_manifest.diff"
-		epatch "${PATCHDIR}/psi-machekku-tool_window_minimize_fix_for_windows.diff"
-		epatch "${PATCHDIR}/psi-machekku-new_character_counter.diff"
-
-		# from ftp://ftp.patryk.one.pl/pub/psi/skazi/patches/
-		epatch "${PATCHDIR}/psi-options_resize-fix.diff"
-		epatch "${PATCHDIR}/psi-settoggles-fix.diff"
-		epatch "${PATCHDIR}/psi-line_in_options-mod.diff"
-		epatch "${PATCHDIR}/psi-empty_group-fix.diff"
-		epatch "${PATCHDIR}/psi-no_online_status-mod.diff"
-		epatch "${PATCHDIR}/psi-status_history-add-psi-gentoo.diff"
-		epatch "${PATCHDIR}/psi-icon_buttons_big_return-mod.diff"
-		epatch "${PATCHDIR}/psi-linkify-mod-rev-fix.diff"
-		epatch "${PATCHDIR}/psi-save_profile-mod.diff"
-		epatch "${PATCHDIR}/psi-url_emoticon-mod.diff"
-		epatch "${PATCHDIR}/psi-thin_borders-mod.diff"
-
-		# from http://www.uaznia.net/psi-daisy/patches/
-		epatch "${PATCHDIR}/filetransfer.diff"
-		epatch "${PATCHDIR}/psi-emots-mod.diff"
-		epatch "${PATCHDIR}/psi_michalj_statusicon_in_chatdlg_titlebar.diff"
-		epatch "${PATCHDIR}/psi_michalj_custom_rostericons_in_tooltips.diff"
-
-		# from ftp://ftp.patryk.one.pl/pub/psi/patches/
-		epatch "${PATCHDIR}/psi-psz-chatdlg_typed_msgs_history.diff"
-
-		# from http://kg.alternatywa.info/psi/patche/
-		epatch "${PATCHDIR}/psi-status-timeout-kfix.diff"
-		epatch "${PATCHDIR}/psi-kg-spoof.diff"
-		epatch "${PATCHDIR}/psi-kg-individual_status_add.diff"
-
-		# from pld-linux.org
-		epatch "${PATCHDIR}/psi-certs.patch"
-
-		# upstream patches from psi-flyspray
-		epatch "${PATCHDIR}/psi-fix_groupsortingstyle_toggles.patch"
-		epatch "${PATCHDIR}/psi-multiple_account_groups.diff"
-
-		# from http://psi-pedrito.go.pl/
-		epatch "${PATCHDIR}/pedrito-null-key-string-fix.diff"
-		epatch "${PATCHDIR}/pedrito-avatars-printf-off.diff"
-		epatch "${PATCHDIR}/pedrito-linkify_and_wrap-client.diff"
-		epatch "${PATCHDIR}/pedrito-group_menuitem_for_notinlist.diff"
-
-		# from psi-devel mailing list
-		epatch "${PATCHDIR}/psi-history_lug.patch"
-		epatch "${PATCHDIR}/psi-history-deletion-bugfix.patch"
-		epatch "${PATCHDIR}/checkboxes-sound-options.diff"
-
-		# from http://mircea.bardac.net/psi/patches/
-		epatch "${PATCHDIR}/psi-cli-v2.diff"
-
-		# from ubuntu
-		epatch "${PATCHDIR}/psi-trayicon_ubuntu_fix.patch"
-
-		# from http://home.unclassified.de/files/psi/patches/
-		epatch "${PATCHDIR}/statusdlg-enterkey.diff"
-		epatch "${PATCHDIR}/fix-min-window-notify.diff"
-		epatch "${PATCHDIR}/hide-no-resource-from-contextmenu.diff"
-		epatch "${PATCHDIR}/custom-sound-popup.patch"
-		epatch "${PATCHDIR}/offline-contact-animation.diff"
-
-		# from bugs.gentoo.org
-		epatch "${PATCHDIR}/psi-add-status-history.patch"
-
-		# from http://rydz.homedns.org
-		epatch "${PATCHDIR}/psi-filetransfer-finish-popup-qsorix.patch"
-
-		# from http://k.uaznia.net/jabber/psi/patches/
-		epatch "${PATCHDIR}/a-psi-k-emergency_away_status_button.diff"
-		epatch "${PATCHDIR}/psi-evil_message_support.patch"
-		epatch "${PATCHDIR}/psi-auto_responder.patch"
-		epatch "${PATCHDIR}/psi-auto_responder_gui.patch"
-
-		# from http://www.cs.kuleuven.ac.be/~remko/psi/
-		epatch "${PATCHDIR}/rosteritems_iris.diff"
-		# this one was chagned because of muc support
-		epatch "${PATCHDIR}/rosteritems_psi_with_muc.diff"
-
-		# from http://delx.cjb.net/psi/
-		epatch "${PATCHDIR}/psi-nicknames.patch"
-
-		# from http://norman.rasmussen.co.za/darcs/psi-rc/
-		epatch "${PATCHDIR}/norman-rc.diff"
-		epatch "${PATCHDIR}/norman-darcs-20051129.diff"
-		# from http://machekku.uaznia.net/jabber/psi/patches/
-		epatch "${PATCHDIR}/psi-machekku-rc_multiline_status_fix.diff"
-		# from http://norman.rasmussen.co.za/darcs/psi-rc/
-		epatch "${PATCHDIR}/psi-dynamic-priority-rc-fix.diff"
-		epatch "${PATCHDIR}/norman-darcs-20051231.patch"
-
-		# created for psi-gentoo and roster-nr
-		epatch "${PATCHDIR}/psi-smile_icon_emoticonset.patch"
-		epatch "${PATCHDIR}/psi-enable_avatars.patch"
-		epatch "${PATCHDIR}/psi-transport_icons_and_avatars.patch"
-		epatch "${PATCHDIR}/psi-client_avatars_icons.patch"
-		epatch "${PATCHDIR}/psi-emoticons_advanced_toggle-add-roster-nr.patch"
-		epatch "${PATCHDIR}/psi-chatdlg_messages_colors_distinguishes.patch"
-		epatch "${PATCHDIR}/psi-messages_color_backgrounds_in_chat.patch"
-		epatch "${PATCHDIR}/psi-sort-style-on-roster-nr.patch"
-		epatch "${PATCHDIR}/psi-says_mod.patch"
-		epatch "${PATCHDIR}/psi-muc_support_langpacks_fix.patch"
-		epatch "${PATCHDIR}/psi-copy_jid_or_status_message_to_clipboard.patch"
-		epatch "${PATCHDIR}/psi-timestamps_option_and_date_showing.patch"
-		epatch "${PATCHDIR}/psi-avatars_graph_settings_filetypes.patch"
-		epatch "${PATCHDIR}/psi-auto_responder_by_message.patch"
-		epatch "${PATCHDIR}/psi-taskbar_flashing.patch"
-		# by nelchael
-		epatch "${PATCHDIR}/psi-nelchael-exec_command.patch"
-		epatch "${PATCHDIR}/psi-nelchael-disconnect-sleep.patch"
-		use audacious && epatch "${PATCHDIR}/psi-nelchael-audacious-status-0.3.patch"
-
-		if use insecure-patches; then
-			# from http://www.uni-bonn.de/~nieuwenh/
-			epatch "${PATCHDIR}/libTeXFormula.diff"
-			# from pld-linux.org
-			epatch "${PATCHDIR}/psi-libTeXFormula-nicechats.patch"
-		fi;
-
-		epatch "${PATCHDIR}/psi-gentoo-version.patch"
-	fi
-}
-
-src_compile() {
-	# growl is mac osx extension only - maybe someday we will want this
-	local myconf="--disable-growl"
-	use xscreensaver || myconf="${myconf} --disable-xss"
-
-	./configure \
-		--prefix=/usr \
-		--with-qca-inc=/usr/include/qca1 \
-		--with-qca-lib=/usr/lib/qca1 \
-		${myconf} \
-		|| die "Configure failed"
-
-	# fixes weird bugs : #150187 and #154556
-	cd "${S}/libpsi/psiwidgets"
-	${QTDIR}/bin/qmake psiwidgets.pro \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE=${QTDIR}/bin/qmake \
-		QMAKE_RPATH= \
-			|| die "Qmake failed"
-
-	# for CXXFLAGS from make.conf
-	cd "${S}/src"
-	${QTDIR}/bin/qmake src.pro \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE=${QTDIR}/bin/qmake \
-		QMAKE_RPATH= \
-			|| die "Qmake failed"
-	cd "${S}"
-	${QTDIR}/bin/qmake psi.pro \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE=${QTDIR}/bin/qmake \
-		QMAKE_RPATH= \
-		|| die "Qmake failed"
-
-	emake || die "Make failed"
-
-	einfo "Building language packs"
-	cd "${WORKDIR}/langs"
-	for i in `ls -c1 | grep "\.ts$"` ; do
-		"${QTDIR}/bin/lrelease" $i
-	done;
-}
-
-src_install() {
-	einfo "Installing"
-	make INSTALL_ROOT="${D}" install || die "Make install failed"
-
-	#this way the docs will also be installed in the standard gentoo dir
-	for i in roster system emoticons; do
-		newdoc "${S}/iconsets/${i}/README" "README.${i}"
-	done;
-	newdoc certs/README README.certs
-	dodoc README TODO
-
-	#Install language packs
-	cp "${WORKDIR}/langs/"psi_*.qm "${D}/usr/share/psi/"
-}
diff --git a/net-im/psi/psi-0.14_rc3.ebuild b/net-im/psi/psi-0.14.ebuild
index 4652785bf765..8e418aa21cb5 100644
--- a/net-im/psi/psi-0.14_rc3.ebuild
+++ b/net-im/psi/psi-0.14.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.14_rc3.ebuild,v 1.1 2009/11/26 19:15:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14.ebuild,v 1.1 2009/12/04 09:44:02 pva Exp $
 
 EAPI="2"
 
@@ -14,13 +14,13 @@ HOMEPAGE="http://psi-im.org/"
 # http://lists.affinix.com/pipermail/psi-devel-affinix.com/2009-August/008798.html
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	mirror://gentoo/${PN}-0.13-20090817_langpack_for_packagers.zip
-	extras? ( mirror://gentoo/${PN}-extra-patches-r1398.tar.bz2
-		mirror://gentoo/${PN}-extra-iconsets-r1398.tar.bz2 )"
+	extras? ( mirror://gentoo/${PN}-extra-patches-r1428.tar.bz2
+		mirror://gentoo/${PN}-extra-iconsets-r1428.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver webkit"
 RESTRICT="test"
 
 LANGS="de es fr it mk pl pt_BR ru sv ur_PK zh_TW"
@@ -33,9 +33,11 @@ RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
 	>=app-crypt/qca-2.0.2:2
 	spell? ( >=app-text/enchant-1.3.0 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
+	extras? ( webkit? ( x11-libs/qt-webkit ) )
 	app-arch/unzip"
 
 DEPEND="${RDEPEND}
+	extras? ( sys-devel/qconf )
 	doc? ( app-doc/doxygen )"
 
 PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
@@ -69,6 +71,13 @@ src_prepare() {
 		sed -e 's/\(^#define PROG_CAPS_NODE	\).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
 			-e 's:\(^#define PROG_NAME "Psi\):\1+:' \
 				-i src/applicationinfo.cpp || die
+
+		qconf || die "Failed to create ./configure."
+	else
+		if use webkit; then
+			ewarn "Webkit support disabled as it is only availalable in Psi+"
+			ewarn "(USE='extras' enabled)."
+		fi
 	fi
 
 	rm -rf third-party/qca # We use system libraries.
@@ -86,10 +95,13 @@ src_configure() {
 			$(use debug && echo '--enable-debug')
 			$(use spell || echo '--disable-aspell')
 			$(use spell || echo '--disable-enchant')
-			$(use xscreensaver || echo '--disable-xss')"
+			$(use xscreensaver || echo '--disable-xss')
+			$(use extras && { use webkit || echo '--enable-qtwebkit';} )"
 
 	echo ${confcmd}
 	${confcmd} || die "configure failed"
+	# Makefile is not always created...
+	[[ ! -f Makefile ]] && die "configure failed"
 }
 
 src_compile() {
author	Peter Volkov <pva@gentoo.org>	2009-12-04 09:44:02 +0000
committer	Peter Volkov <pva@gentoo.org>	2009-12-04 09:44:02 +0000
commit	9667e7c2130936c8a599192a1bfc25ce7393112e (patch)
tree	db9f95fc61550da79f7573c765ae92d57d30790f
parent	Version Bump. (diff)
download	gentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.tar.gz gentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.tar.bz2 gentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.zip