updated to 0.10

Package-Manager: portage-2.1_pre3-r1

6 files changed, 318 insertions, 77 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index a0e40bea8d88..8cd9b628f399 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/psi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.82 2006/01/03 02:16:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.83 2006/01/21 21:12:44 humpback Exp $
+
+*psi-0.10 (21 Jan 2006)
+
+  21 Jan 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/psi-desktop2.patch, +files/psi-fix_popup_richtext.patch,
+  -psi-0.10_rc2.ebuild, +psi-0.10.ebuild:
+  Removing thr 0.10 rc and adding the final 0.10 with all our juicy patches.
+  Thanks to all the work in bug #118743 p_maciag@wp.pl did a great work here.
 
   03 Jan 2006; Caleb Tennis <caleb@gentoo.org> psi-0.9.3-r1.ebuild,
   psi-0.9.3-r2.ebuild, psi-0.9.3-r3.ebuild, psi-0.9.3-r4.ebuild,
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 49ae1c5e92c3..dd974d29df56 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,13 +1,18 @@
-MD5 ce14718a3b99956e2c2c59c5dbdd141b ChangeLog 10053
-MD5 c1ccb520f5b861da2a97cf5a4c17cc20 files/digest-psi-0.10_rc2 1984
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 343a6d22852649be1b667c1b635319a0 ChangeLog 10402
+MD5 f13f9686a5acb361193702deb53cb477 files/digest-psi-0.10 2087
 MD5 fc8fae7a49b592b4f2c2914c21494c11 files/digest-psi-0.9.3-r1 1924
 MD5 db2a4c5b68dbb0147392a4657f2dbc92 files/digest-psi-0.9.3-r2 2132
 MD5 839e6fa5502e1f03a660918bc30e48b5 files/digest-psi-0.9.3-r3 2211
 MD5 beb3eefd03626a48e73775691c6c794b files/digest-psi-0.9.3-r4 1975
 MD5 b35105d488f11cae19484290159023b1 files/psi-add-status-history.patch 13703
 MD5 1c741813b6d820d43475058dbfab3100 files/psi-desktop.patch 492
+MD5 7440595a3fc9d3c73f203443a1014352 files/psi-desktop2.patch 591
 MD5 4195bf9d000383fae25545249a3f8709 files/psi-desktop_file_and_icons_directories.patch 1454
 MD5 5fa629c5177a7b1c5090428e22b7ec30 files/psi-emergency.png 295
+MD5 b0b03bd664be63fcda744e18e5b4dc5c files/psi-fix_popup_richtext.patch 3903
 MD5 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300
 MD5 76f5cc28b75698adddaa068e5f4593f5 files/psi-pathfix.patch 462
 MD5 0dacabdec9ce29cc56faadeeff01ec3b files/psi-pathfix2.patch 364
@@ -16,8 +21,15 @@ MD5 c2528c15be8277434647506d791663d8 files/psi-reverse_trayicon2.patch 937
 MD5 18253b59a4622a06bc3a17a4eef93d22 files/psi-status_indicator++_add-on_roster-nr.patch 9821
 MD5 0250867fe42d1dc91e798336869a09d6 files/vcard-photo-interface.patch 32494
 MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
-MD5 ce7a88f45be8a343a289726ec103db69 psi-0.10_rc2.ebuild 8842
+MD5 34aa34a26b781d61097b4d5daeab60f8 psi-0.10.ebuild 11112
 MD5 3c2b96d4564d64824c71f4bc8e35a873 psi-0.9.3-r1.ebuild 8177
 MD5 e526c4a46dc2ead569b41607c46ceb5f psi-0.9.3-r2.ebuild 9464
 MD5 9cc6eb11ab3f94a5ebc0506bf57838aa psi-0.9.3-r3.ebuild 9862
 MD5 0c6d6cce6f4af4a0160f4f31c407c237 psi-0.9.3-r4.ebuild 9160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD0qQC8zY1VwezZiERAj5eAKCc/vsi9mxr+bIgzCqRYdcAj/2RBwCgnblm
+v8apaWgFJf9H9JvCWSc1Uo4=
+=tqig
+-----END PGP SIGNATURE-----
diff --git a/net-im/psi/files/digest-psi-0.10_rc2 b/net-im/psi/files/digest-psi-0.10
index f9097c85f935..05859c79be25 100644
--- a/net-im/psi/files/digest-psi-0.10_rc2
+++ b/net-im/psi/files/digest-psi-0.10
@@ -1,30 +1,32 @@
-MD5 9f1e556e83a9927eb4ad2fefb5b224ef psi-0.10-test2.tar.bz2 1455921
-MD5 62dbb5c0be98ceed7a19a908439d9d67 psi-0.10-test2-gentoo-extras-0.1.tar.bz2 91673
+MD5 4aacc2de659a5a551e9b47382af83c35 gentoo-psi-0.10.tar.bz2 211538
+MD5 f0fd4ccf077f7b24e236f71c22649b7b psi-0.10.tar.bz2 1430929
 MD5 2885ffd0943e95edc0b8521309b01d32 psi_ar-0.9.3.tar.bz2 31466
+MD5 ece0116f75b70592c5d858d7f705ca17 psi_bg-0.10-a.tar.bz2 33464
 MD5 874f8f0aebcdc1294748546a59ddaefb psi_ca-0.9.3.tar.bz2 15750
 MD5 990dea4e96f093d07c5d5523c9875c6a psi_cs-0.9.3-a.tar.bz2 35212
 MD5 208ed7a4f2c8b0aa870beb806c025b6e psi_da-0.9.3.tar.bz2 30325
 MD5 b3bd808955398db752759d92186704f4 psi_de-0.9.3-c.tar.bz2 33169
 MD5 15446ce6e4e0ea87f92b06cd523ff0c9 psi_ee-0.9.3_rc1.tar.bz2 30213
 MD5 8a659618968a698ba7a5cd76b46be6f2 psi_el-0.9.3-a.tar.bz2 34891
-MD5 620bc429c65c223b886ed90f7f7b7bbb psi_eo-0.9.3-c.tar.bz2 32457
-MD5 e55e63f3230e2373c502ced04299b918 psi_es-0.9.3-a.tar.bz2 32347
+MD5 7a8c32d1881f61b5dc3d2243a55034a1 psi_eo-0.10-a.tar.bz2 33751
+MD5 a0565b1d496baa34a433c1b42f04ac6d psi_es-0.10-a.tar.bz2 33686
 MD5 ef5f0d73b59d65fb1edcb42d698f64a9 psi_et-0.9.3-a.tar.bz2 30124
 MD5 d41e102a476ed319f0bcca4c516b4938 psi_fi-0.9.3.tar.bz2 23718
 MD5 22c3fe13e5c0fdaa33d8ef1fc2a2d560 psi_fr-0.9.3-a.tar.bz2 34898
+MD5 b5bfba7b5d74fd32e226456e9c1cb581 psi_hu-0.10-a.tar.bz2 33578
 MD5 e7aeef2ed3f743a2937599e1f123adc6 psi_it-0.9.3.tar.bz2 15759
 MD5 6be3b0fc9ed02ef7f8cef70852ee1369 psi_jp-0.9.3.tar.bz2 25159
-MD5 9491e2c753cec234a99dd8ab4752bbcd psi_mk-0.9.3-a.tar.bz2 32472
-MD5 1e136c01250d3d52e888cdd5d6fe4c15 psi_nl-0.9.3-b.tar.bz2 33224
+MD5 e2163b47140c617881141ed2e3d9dbbe psi_mk-0.10-a.tar.bz2 33739
+MD5 b29b85674c0d233960240930a6d6067a psi_nl-0.10-a.tar.bz2 34353
 MD5 f270e6ed02653bcf9c638b273b50a7cb psi_pl-0.9.3-1.tar.bz2 36619
 MD5 9246dadd5a8481d060c1336ffabf3ef7 psi_pt-0.9.3.tar.bz2 15746
-MD5 788ef1ad0f1212836865033e35ec917a psi_ptbr-0.9.3.tar.bz2 35934
+MD5 8bd6ff47cc42fd3e5664fbb961dd17f3 psi_ptBR-0.10-a.tar.bz2 34206
 MD5 5e20def73cdfdee2b9af6798fa75417b psi_ru-0.9.3-a.tar.bz2 33201
 MD5 01bf0c623a576e2d9f4ff30942c50a29 psi_se-0.9.3_rc1.tar.bz2 15726
 MD5 f3bdd1aafbc7690628cf9df4214b5af3 psi_sk-0.9.3-a.tar.bz2 34654
-MD5 eccc3cb77801eb36208765325e8977cd psi_sl-0.9.3-a.tar.bz2 32850
+MD5 6abe0bc7370e9058358e01b09a2a8c7e psi_sl-0.10-a.tar.bz2 34002
 MD5 1857fe75dd81c85db90fb195b32c8bd0 psi_sr-0.9.3.tar.bz2 15754
 MD5 2773bbf4585e054e7c0ca472b5723014 psi_sv-0.9.3.tar.bz2 35122
 MD5 df93122447366aef362bafde0ed67618 psi_sw-0.9.3.tar.bz2 32917
-MD5 1dcc37d4fd5c598f269fffc3b04bde6a psi_vi-0.9.3-a.tar.bz2 34188
+MD5 89bf836fa741e77cfa3358ec3d4ed266 psi_vi-0.10-a.tar.bz2 34178
 MD5 6ef95100b9ff08b86f4404f32694d451 psi_zh-0.9.3-a.tar.bz2 31925
diff --git a/net-im/psi/files/psi-desktop2.patch b/net-im/psi/files/psi-desktop2.patch
new file mode 100644
index 000000000000..deb0f4ea9d70
--- /dev/null
+++ b/net-im/psi/files/psi-desktop2.patch
@@ -0,0 +1,17 @@
+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,8 +1,12 @@
+ Encoding=UTF-8
+ Name=Psi
+ GenericName=Jabber Client
++GenericName[pl]=Klient Jabbera
++GenericName[fr]=Client Jabber
+ Comment=Communicate over the Jabber network
+-Icon=psi
++Comment[pl]=Komunikator sieci Jabber
++Comment[fr]=Communiquer sur le réseau Jabber
++Icon=../icons/hicolor/48x48/apps/psi.png
+ Exec=psi
+ Terminal=false
+ Categories=Qt;Network;InstantMessaging;
diff --git a/net-im/psi/files/psi-fix_popup_richtext.patch b/net-im/psi/files/psi-fix_popup_richtext.patch
new file mode 100644
index 000000000000..d25b02b32956
--- /dev/null
+++ b/net-im/psi/files/psi-fix_popup_richtext.patch
@@ -0,0 +1,142 @@
+Created by Przemysław 'Trol' Maciąg <pmaciag (at) gmail (dot) com>
+
+Just truncating a popup message text can cause situations like this:
+* text will be trancated 'inside' icon tag
+* text will be trancated 'inside' a tag
+both situations will give a bad string to show. Patch add a simple
+function to correct this situations (and similar ones).
+
+diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/common.cpp psi-0.10-test3/src/common.cpp
+--- psi-0.10-test3-orig/src/common.cpp	2005-11-01 18:10:29.000000000 +0100
++++ psi-0.10-test3/src/common.cpp	2005-12-23 12:11:08.000000000 +0100
+@@ -314,6 +314,83 @@
+ 	return out;
+ }
+ 
++QString truncateRichText (const QString & intext, int textlen)
++{
++	QString outtext;
++
++	int i, j, k;
++	int tag;
++	int opentags;
++	char c;
++	bool atag;
++
++	k = intext.length ();
++	// do we have to truncate it at all?
++	if (k <= textlen)
++		return intext;
++
++	tag = -1;
++	atag = false;
++	j = 0;
++	opentags = 0;
++
++	for (i = 0; i < k; i++)
++	{
++		c = intext.at(i);
++		// opening tag
++		if (c == QChar ('<'))
++		{
++			if (opentags == 0)
++			{
++				tag = i;
++				if (atag)
++					atag = false;
++			}
++			opentags++;
++		}
++		// closing tag
++		else if (c == QChar ('>'))
++		{
++			if (opentags == 1)
++			{
++				if (atag)
++					// don't count a tag - only letters 'inside'
++					j--;
++				else
++					j++;
++				tag = -1;
++			}
++			opentags--;
++		}
++		// normal character?
++		else if (opentags == 0)
++		{
++			j++;
++		}
++		// a tag?
++		else if (i == (tag + 1) && c == QChar ( 'a' ) && k > (i + 1))
++		{
++			c = intext.at((i + 1));
++			// next character has to be a whitespace
++			if (c == QChar ( (char)32 ) || c == QChar ( '\t' ))
++			{
++				atag = true;
++				// we don't need to check this character ones more
++				i++;
++			}
++		}
++
++		if (opentags == 0 && j >= textlen)
++			break;
++	}
++
++	outtext = intext.left (i);
++	// unclosed 'a' tag?
++	if (atag)
++		outtext += "</a>";
++
++	return outtext;
++}
+ 
+ // clips plain text
+ QString clipStatus(const QString &str, int width, int height)
+diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/common.h psi-0.10-test3/src/common.h
+--- psi-0.10-test3-orig/src/common.h	2005-10-06 15:50:35.000000000 +0200
++++ psi-0.10-test3/src/common.h	2005-12-23 12:11:08.000000000 +0100
+@@ -238,6 +238,7 @@
+ QString qstrquote(const QString &, int width=60, bool quoteEmpty=FALSE);
+ QString plain2rich(const QString &);
+ QString rich2plain(const QString &);
++QString truncateRichText (const QString & intext, int textlen);
+ QString clipStatus(const QString &str, int width, int height);
+ QString expandEntities(const QString &in);
+ QString resolveEntities(const QString &);
+diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/psipopup.cpp psi-0.10-test3/src/psipopup.cpp
+--- psi-0.10-test3-orig/src/psipopup.cpp	2005-10-14 02:36:14.000000000 +0200
++++ psi-0.10-test3/src/psipopup.cpp	2005-12-23 12:17:56.000000000 +0100
+@@ -207,17 +207,9 @@
+ {
+ 	if ( option.ppTextClip > 0 ) {
+ 		// richtext will give us trouble here
+-		if ( ((int)text.length()) > option.ppTextClip ) {
+-			text = text.left( option.ppTextClip );
+-
+-			// delete last unclosed tag
+-			/*if ( text.find("</") > text.find(">") ) {
+-
+-				text = text.left( text.find("</") );
+-			}*/
+-
+-			text += "...";
+-		}
++		QString popuptext = truncateRichText (text, option.ppTextClip);
++		if (text.length () != popuptext.length ()) 
++			text = popuptext + "...";
+ 	}
+ 
+ 	return text;
+diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/psi_profiles.cpp psi-0.10-test3/src/psi_profiles.cpp
+--- psi-0.10-test3-orig/src/psi_profiles.cpp	2005-11-01 17:50:16.000000000 +0100
++++ psi-0.10-test3/src/psi_profiles.cpp	2005-12-23 12:11:08.000000000 +0100
+@@ -548,7 +548,7 @@
+ 	prefs.ppFile        = true;
+ 	prefs.ppJidClip     = 25;
+ 	prefs.ppStatusClip  = -1;
+-	prefs.ppTextClip    = 300;
++	prefs.ppTextClip    = 200;
+ 	prefs.ppHideTime    = 10000; // 10 sec
+ 	prefs.ppBorderColor = QColor (0x52, 0x97, 0xF9);
+ 
diff --git a/net-im/psi/psi-0.10_rc2.ebuild b/net-im/psi/psi-0.10.ebuild
index f9720ef98422..97ced67b4aa1 100644
--- a/net-im/psi/psi-0.10_rc2.ebuild
+++ b/net-im/psi/psi-0.10.ebuild
@@ -1,49 +1,53 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.10_rc2.ebuild,v 1.2 2006/01/03 02:16:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.10.ebuild,v 1.1 2006/01/21 21:12:44 humpback Exp $
 
-inherit eutils
+inherit eutils qt3
 
-VER="${PV/_rc/-test}"
-MY_PV="${VER}"
+# usefull for test/rc releases
+MY_PV="${PV/_rc/-test}"
 MY_P="${PN}-${MY_PV}"
-HTTPMIRR="http://gentoo-pt.org/~humpback/psi"
-IUSE="kde ssl crypt extras"
+
+HTTPMIRR="http://vivid.dat.pl/psi"
+IUSE="ssl crypt xscreensaver extras xmms insecure-patches"
 QV="2.0"
+
 DESCRIPTION="QT 3.x Jabber Client, with Licq-like interface"
-HOMEPAGE="http://psi.affinix.com"
+HOMEPAGE="http:/psi-im.org/"
 # translations from http://tanoshi.net/language.html
 # polish translation contains special texts for patches from extras-version
 #		extras? ( ${HTTPMIRR}/${PN}-${VER}-gentoo-extras-0.5.tar.bz2  )
 SRC_URI="mirror://sourceforge/psi/${MY_P}.tar.bz2
-		extras? ( ${HTTPMIRR}/${PN}-${VER}-gentoo-extras-0.1.tar.bz2 )
+		extras? ( http://felisberto.net/~humpback/psi/gentoo-psi-0.10.tar.bz2 )
 		linguas_ar? ( ${HTTPMIRR}/psi_ar-0.9.3.tar.bz2 )
+		linguas_bg? ( ${HTTPMIRR}/psi_bg-0.10-a.tar.bz2 )
 		linguas_ca? ( ${HTTPMIRR}/psi_ca-0.9.3.tar.bz2 )
 		linguas_cs? ( ${HTTPMIRR}/psi_cs-0.9.3-a.tar.bz2 )
 		linguas_da? ( ${HTTPMIRR}/psi_da-0.9.3.tar.bz2 )
 		linguas_de? ( ${HTTPMIRR}/psi_de-0.9.3-c.tar.bz2 )
 		linguas_ee? ( ${HTTPMIRR}/psi_ee-0.9.3_rc1.tar.bz2 )
 		linguas_el? ( ${HTTPMIRR}/psi_el-0.9.3-a.tar.bz2 )
-		linguas_eo? ( ${HTTPMIRR}/psi_eo-0.9.3-c.tar.bz2 )
-		linguas_es? ( ${HTTPMIRR}/psi_es-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.9.3-a.tar.bz2 )
 		linguas_fi? ( ${HTTPMIRR}/psi_fi-0.9.3.tar.bz2 )
 		linguas_fr? ( ${HTTPMIRR}/psi_fr-0.9.3-a.tar.bz2 )
 		linguas_it? ( ${HTTPMIRR}/psi_it-0.9.3.tar.bz2 )
 		linguas_jp? ( ${HTTPMIRR}/psi_jp-0.9.3.tar.bz2 )
-		linguas_mk? ( ${HTTPMIRR}/psi_mk-0.9.3-a.tar.bz2 )
-		linguas_nl? ( ${HTTPMIRR}/psi_nl-0.9.3-b.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.9.3.tar.bz2 )
-		linguas_ptBR? ( ${HTTPMIRR}/psi_ptbr-0.9.3.tar.bz2 )
+		linguas_ptBR? ( ${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.tar.bz2 )
 		linguas_sk? ( ${HTTPMIRR}/psi_sk-0.9.3-a.tar.bz2 )
-		linguas_sl? ( ${HTTPMIRR}/psi_sl-0.9.3-a.tar.bz2 )
+		linguas_sl? ( ${HTTPMIRR}/psi_sl-0.10-a.tar.bz2 )
 		linguas_sr? ( ${HTTPMIRR}/psi_sr-0.9.3.tar.bz2 )
 		linguas_sv? ( ${HTTPMIRR}/psi_sv-0.9.3.tar.bz2 )
 		linguas_sw? ( ${HTTPMIRR}/psi_sw-0.9.3.tar.bz2 )
-		linguas_vi? ( ${HTTPMIRR}/psi_vi-0.9.3-a.tar.bz2 )
+		linguas_vi? ( ${HTTPMIRR}/psi_vi-0.10-a.tar.bz2 )
 		linguas_zh? ( ${HTTPMIRR}/psi_zh-0.9.3-a.tar.bz2 )"
 
 SLOT="0"
@@ -54,12 +58,15 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 S="${WORKDIR}/${MY_P}"
 
 DEPEND=">=app-crypt/qca-1.0-r2
-	>=x11-libs/qt-3.3.1"
+	$(qt_min_version 3.3)
+	xscreensaver? ( x11-misc/xscreensaver )
+	extras? ( xmms? ( media-sound/xmms ) )"
 
-RDEPEND="ssl? ( >=app-crypt/qca-tls-1.0-r2 )
-		crypt? ( >=app-crypt/gnupg-1.2.2 )"
+RDEPEND="${DEPEND}
+	ssl? ( >=app-crypt/qca-tls-1.0-r2 )
+	crypt? ( >=app-crypt/gnupg-1.2.2 )"
 
-PATCHBASE="${WORKDIR}"
+PATCHBASE="${FILESDIR}"
 PATCHDIR="${PATCHBASE}/${PV}"
 
 src_unpack() {
@@ -67,11 +74,10 @@ src_unpack() {
 
 		cd ${S}
 		epatch ${FILESDIR}/psi-pathfix2.patch
-		epatch ${FILESDIR}/psi-desktop.patch
-		epatch ${FILESDIR}/psi-desktop_file_and_icons_directories.patch
+		epatch ${FILESDIR}/psi-desktop2.patch
 		epatch ${FILESDIR}/psi-reverse_trayicon2.patch
 
-		if !(use extras); then
+		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."
@@ -85,27 +91,29 @@ src_unpack() {
 			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-roster-nr-0.8.patch
+			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}/rosteritems_iris.diff
-			epatch ${PATCHDIR}/rosteritems_psi.diff
 			epatch ${PATCHDIR}/jep8-avatars_iris.diff
 			epatch ${PATCHDIR}/jep8-avatars_psi.diff
-			epatch ${PATCHDIR}/caps_broadcast.diff
 
 			# from http://machekku.uaznia.net/jabber/psi/patches/
-			epatch ${PATCHDIR}/psi-machekku-smart_reply_and_forward-0.5.diff
+			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-enable_thread_in_messages.diff
 			epatch ${PATCHDIR}/psi-machekku-linkify_fix.diff
-			epatch ${PATCHDIR}/psi-machekku-new_headings_gui_resurrection.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
@@ -117,22 +125,18 @@ src_unpack() {
 			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.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-subs_reason-recv.diff
-			epatch ${PATCHDIR}/psi-subs_reason-send.diff
 			epatch ${PATCHDIR}/psi-thin_borders-mod.diff
 
 			# from http://www.uaznia.net/psi-daisy/patches/
 			epatch ${PATCHDIR}/filetransfer.diff
-			epatch ${PATCHDIR}/emergency_button.diff
 			epatch ${PATCHDIR}/psi-emots-mod.diff
 			epatch ${PATCHDIR}/psi_michalj_statusicon_in_chatdlg_titlebar.diff
-			# emergency icon
-			cp ${FILESDIR}/psi-emergency.png ${S}/iconsets/system/default/emergency.png
+			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
@@ -141,21 +145,6 @@ src_unpack() {
 			epatch ${PATCHDIR}/psi-status-timeout-kfix.diff
 			epatch ${PATCHDIR}/psi-kg-spoof.diff
 			epatch ${PATCHDIR}/psi-kg-individual_status_add.diff
-			epatch ${PATCHDIR}/psi-apa-invite_reason2-add.diff
-			epatch ${PATCHDIR}/psi-kg-hide-disabled-emottoolbutton.diff
-
-			# from http://home.unclassified.de/files/psi/patches/
-			epatch ${PATCHDIR}/statusdlg-enterkey.diff
-			epatch ${PATCHDIR}/fix-min-window-notify.diff
-			epatch ${PATCHDIR}/offline-contact-animation.diff
-			epatch ${PATCHDIR}/hide-no-resource-from-contextmenu.diff
-			epatch ${PATCHDIR}/custom-sound-popup.diff
-
-			# from bugs.gentoo.org
-			epatch ${PATCHDIR}/psi-add-status-history.patch
-
-			# from http://www.uni-bonn.de/~nieuwenh/
-			epatch ${PATCHDIR}/libTeXFormula.diff
 
 			# from pld-linux.org
 			epatch ${PATCHDIR}/psi-certs.patch
@@ -164,7 +153,13 @@ src_unpack() {
 			epatch ${PATCHDIR}/psi-fix_groupsortingstyle_toggles.patch
 			epatch ${PATCHDIR}/psi-multiple_account_groups.diff
 
-			# psi-devel mailing list
+			# 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
@@ -172,20 +167,76 @@ src_unpack() {
 			# 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-roster_right_align_group_names.patch
 			epatch ${PATCHDIR}/psi-chatdlg_messages_colors_distinguishes.patch
 			epatch ${PATCHDIR}/psi-messages_color_backgrounds_in_chat.patch
-			epatch ${PATCHDIR}/psi-sort-contacts-style-on-roster-nr.patch
+			epatch ${PATCHDIR}/psi-sort-style-on-roster-nr.patch
 			epatch ${PATCHDIR}/psi-says_mod.patch
-			epatch ${PATCHDIR}/psi-enable_avatars.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
+			# by nelchael
+			epatch ${PATCHDIR}/psi-nelchael-exec_command.patch
+			use xmms && epatch ${PATCHDIR}/psi-nelchael-xmms-status.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
 		einfo ""
 		einfo "Unpacking language files, you must have linguas_* in USE where"
-		einfo "* is the language files you wish. English is always available"
+		einfo "'*' is the language files you wish. English is always available"
 		einfo ""
 		cd ${WORKDIR}
 		if ! [ -d langs ] ; then
@@ -198,17 +249,26 @@ src_unpack() {
 }
 
 src_compile() {
-	use kde || myconf="${myconf} --disable-kde"
-	./configure --prefix=/usr $myconf || die "Configure failed"
-
-	${QTDIR}/bin/qmake psi.pro \
-			QMAKE=${QTDIR}/bin/qmake \
-			QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS} ${extras}" \
-			QMAKE_RPATH= \
+	# 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"
+
+	# 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"
 
-	addwrite "$HOME/.qt"
-	addwrite "$QTDIR/etc/settings"
 	emake || die "Make failed"
 
 	einfo "Building language packs"
@@ -219,6 +279,7 @@ src_compile() {
 }
 
 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
@@ -231,4 +292,3 @@ src_install() {
 	#Install language packs
 	cp ${WORKDIR}/langs/psi_*.qm ${D}/usr/share/psi/
 }
-