updated to 0.10

(Portage version: 2.1_pre3-r1)

3 files changed, 170 insertions, 9 deletions

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);
+