updated to 0.10

(Portage version: 2.1_pre3-r1)

6 files changed, 394 insertions, 74 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..93a382a11ab7 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,4 +1,92 @@
 MD5 ce14718a3b99956e2c2c59c5dbdd141b ChangeLog 10053
+MD5 882dd9f653883ba30f4e3f3d867c6b25 files/0.10/a-psi-k-emergency_away_status_button.diff 17047
+MD5 6d77eb62804602d61b1e4b0c8062988e files/0.10/checkboxes-sound-options.diff 34056
+MD5 12ccb7417c271c8e1a27f25a8cb64362 files/0.10/custom-sound-popup.patch 21264
+MD5 0b3151c2b60c873ccbc2ff546b54972d files/0.10/filetransfer.diff 1314
+MD5 b1c993ad83f556c2ea82b670634f2e2e files/0.10/fix-min-window-notify.diff 915
+MD5 7316ef6414700046d5afab254fa3abd8 files/0.10/hide-no-resource-from-contextmenu.diff 3746
+MD5 6e0e35aadc148766a8789a1b6a010bc6 files/0.10/jep8-avatars_iris.diff 3575
+MD5 06fb7f449a1f13909b0f181bfe441a67 files/0.10/jep8-avatars_psi.diff 12005
+MD5 e89c83183e87bf1473df466fe9e42f1b files/0.10/libTeXFormula.diff 62946
+MD5 cb8acfef8b373b158bc3896e8d0805ff files/0.10/norman-darcs-20051129.diff 1624
+MD5 158cad581434526cb0eed2e9788e0597 files/0.10/norman-darcs-20051231.patch 3562
+MD5 886f8dd95047d6a1269ea4e861f37579 files/0.10/norman-rc.diff 84641
+MD5 fae759a55168ee71c15ea22a12226aa8 files/0.10/offline-contact-animation.diff 2311
+MD5 b4cf2f51e15b037cb7ca05dcd11837af files/0.10/pedrito-avatars-printf-off.diff 1316
+MD5 e3c99c74a7675d15e216be8fc4898279 files/0.10/pedrito-group_menuitem_for_notinlist.diff 611
+MD5 5346f6328ea185bb1f9afd7cb500ac19 files/0.10/pedrito-linkify_and_wrap-client.diff 535
+MD5 f7a9e94d799299902a94f10a2c373d2e files/0.10/pedrito-null-key-string-fix.diff 831
+MD5 1de2968852592e52f0d11d2a2fb91a55 files/0.10/psi-add-status-history.patch 13838
+MD5 1145ec98c8d773a1bb59a781d2c9a78e files/0.10/psi-auto_responder.patch 3912
+MD5 06d1ba7be6dae848cc7df2a5aed18b15 files/0.10/psi-auto_responder_by_message.patch 438
+MD5 1ddfa36716d50c6b222593e163574e8c files/0.10/psi-auto_responder_gui.patch 2728
+MD5 30626465518b61d4f5785afd6a0e72ef files/0.10/psi-avatars_graph_settings_filetypes.patch 1546
+MD5 a1562f785c811820fef9b0f5d632ff6e files/0.10/psi-certs.patch 543
+MD5 dd990769e4ebb9513b79de8df074b839 files/0.10/psi-chatdlg_messages_colors_distinguishes.patch 7287
+MD5 ff4126b0d9543dad0c985c1752b4c749 files/0.10/psi-cli-v2.diff 27426
+MD5 fe116aa46b5b6563073595cf42ae96c9 files/0.10/psi-client_avatars_icons.patch 22965
+MD5 79dc337c2d0a9f07c89f2e47fe6fc4bc files/0.10/psi-copy_jid_or_status_message_to_clipboard.patch 2666
+MD5 280ee52ed2c9b791d1a3b7984886cac8 files/0.10/psi-dynamic-priority-rc-fix.diff 5796
+MD5 1500e7d6a4bc60c4e062ce774a9d794b files/0.10/psi-emoticons_advanced_toggle-add-roster-nr.patch 4958
+MD5 391edd158b673ab8fdbcf463d9c0cea5 files/0.10/psi-emots-mod.diff 6988
+MD5 a18731b5a9aa3c14f30b2e89aff1f508 files/0.10/psi-empty_group-fix.diff 586
+MD5 f4e7809d6ae97bf613f12c046e73be14 files/0.10/psi-enable_avatars.patch 6698
+MD5 75a9c58787afe9c218f6e339dd7f3fb5 files/0.10/psi-evil_message_support.patch 1500
+MD5 e46e7f671cde9c32d5e9238e4200dde4 files/0.10/psi-filetransfer-finish-popup-qsorix.patch 8242
+MD5 453a0c82b1fa0812c9f8a3faae21a81e files/0.10/psi-fix_groupsortingstyle_toggles.patch 810
+MD5 b0b03bd664be63fcda744e18e5b4dc5c files/0.10/psi-fix_popup_richtext.patch 3903
+MD5 3f84d6634febb48c349ee28656f6e5b9 files/0.10/psi-gentoo-version.patch 461
+MD5 8b40fa634c6dcd2fe62d671c0b81d0bb files/0.10/psi-history-deletion-bugfix.patch 2859
+MD5 b840c978514055a02795e42a955c1d8e files/0.10/psi-history_lug.patch 390
+MD5 e62f9f81062e71867d8c7340ac13042d files/0.10/psi-icon_buttons_big_return-mod.diff 439
+MD5 a1b4775aa3b1bb470b241c4948c13903 files/0.10/psi-kg-individual_status_add.diff 6010
+MD5 9761e1d15212eea58f2f8bd2b8b7d068 files/0.10/psi-kg-spoof.diff 3953
+MD5 c3a71de0479ecee89de108360c52cd38 files/0.10/psi-libTeXFormula-nicechats.patch 3101
+MD5 ee2bb7ab193394af10c3e1c59b489970 files/0.10/psi-line_in_options-mod.diff 1287
+MD5 473f76db4e5f47f65a63f33d0311c98f files/0.10/psi-linkify-mod-rev-fix.diff 2078
+MD5 7e84621088b0f41ad60b1fdec2fa8426 files/0.10/psi-machekku-autostatus_while_dnd.diff 5007
+MD5 c7ce5926d46c103c90eb339dcf9739cb files/0.10/psi-machekku-emoticons_advanced_toggle.diff 11771
+MD5 5c398e4c9226d0dc3a3703f29383efa4 files/0.10/psi-machekku-enable_thread_in_messages.diff 359
+MD5 520cc1e4ff06a7ff98ccb2298d42a973 files/0.10/psi-machekku-keep_message_in_auto_away_status.diff 4634
+MD5 dbec45f6de50cc63be5db15a0279e465 files/0.10/psi-machekku-linkify_fix.diff 601
+MD5 33f145d24eaa485df163d656129c667e files/0.10/psi-machekku-new_character_counter.diff 4166
+MD5 a6bc3a45605b313e11dff1285b39e53c files/0.10/psi-machekku-quote_emoticons.diff 544
+MD5 6e7e9bda115be1f683b28608dbf36315 files/0.10/psi-machekku-rc_multiline_status_fix.diff 470
+MD5 404009db7e4e5d32df8f1fe89a43121a files/0.10/psi-machekku-smart_reply_and_forward-0.5_psi-gentoo.diff 125026
+MD5 97b71cb0940f0d00b56640867f918000 files/0.10/psi-machekku-tool_window_minimize_fix_for_windows.diff 1313
+MD5 67d6110ce466ce41cbf80778c56d92f5 files/0.10/psi-machekku-visual_styles_manifest.diff 1528
+MD5 057496bd4106af5d887730ba1aca2040 files/0.10/psi-messages_color_backgrounds_in_chat.patch 10094
+MD5 2a54cebc946e12aca4d25036e10584c9 files/0.10/psi-muc_support-update-20051123.patch 1825
+MD5 2b344717b77865923dd24b298c7ca01d files/0.10/psi-muc_support-update-20060114.patch 2803
+MD5 1c1bd93729d3a034cf18eb13fc382c42 files/0.10/psi-muc_support.patch 432780
+MD5 bc22c3761990c94236dabc0d3e6e737c files/0.10/psi-muc_support_langpacks_fix.patch 429
+MD5 99644cbed93bc2fdeb32b779d7d4fde9 files/0.10/psi-multiple_account_groups.diff 5498
+MD5 86ae7319ca079ac6823a083c6f6dc694 files/0.10/psi-nelchael-exec_command.patch 1419
+MD5 b8d4bd7772dc1034ed405c5a8844722f files/0.10/psi-nelchael-xmms-status.patch 6577
+MD5 fff37fef6e418228ab5a075b0600ca52 files/0.10/psi-nicknames.patch 3930
+MD5 0236b09a1de5e322b7ecd6f6a1818df7 files/0.10/psi-no_online_status-mod.diff 405
+MD5 d53d0c38ae98c3d03ad45e5271af0023 files/0.10/psi-options_resize-fix.diff 739
+MD5 8e00371590a3db76cc358391e61b2324 files/0.10/psi-psz-chatdlg_typed_msgs_history.diff 2509
+MD5 ba03d2f563b970b797737a9ef0b970d9 files/0.10/psi-roster-nr-0.9.14.patch 62972
+MD5 e65064edc2e6b3ea881aa85833476525 files/0.10/psi-save_profile-mod.diff 553
+MD5 9bb908df6558f4ccd63d458b83e79509 files/0.10/psi-says_mod.patch 7654
+MD5 f1a1b4659cfbda5fc5670eb77bf289db files/0.10/psi-settoggles-fix.diff 510
+MD5 4c0a358ad91a35140eabad46a923a3a0 files/0.10/psi-smile_icon_emoticonset.patch 825
+MD5 260047d46bf46426bb6e412c2972af90 files/0.10/psi-sort-style-on-roster-nr.patch 5667
+MD5 a6099069d640bfcd03b725121d2a4473 files/0.10/psi-status-timeout-kfix.diff 4513
+MD5 3780276043817d29b76b34c2e911c481 files/0.10/psi-status_history-add-psi-gentoo.diff 5662
+MD5 3a088dca5e4e22485b96173bfb22434c files/0.10/psi-status_indicator++_add-on_roster-nr.patch 10357
+MD5 93be6bcb96fa8636e83762518b04d6ac files/0.10/psi-thin_borders-mod.diff 1301
+MD5 1a64182d2587ea62dc441fa3fa335bd2 files/0.10/psi-timestamps_option_and_date_showing.patch 8460
+MD5 a58889a7e29eb6baee9fd66f3f383188 files/0.10/psi-transport_icons_and_avatars.patch 8280
+MD5 944b42e35323e9dd49538331cfa9fddd files/0.10/psi-trayicon_ubuntu_fix.patch 633
+MD5 f57ce93458b1bf7e267d6b30d9b31177 files/0.10/psi-url_emoticon-mod.diff 1441
+MD5 6a1401135a139890daf00ff9993a4b51 files/0.10/psi_michalj_custom_rostericons_in_tooltips.diff 1468
+MD5 04e442c28ebe02db8292daa17f6b0aad files/0.10/psi_michalj_statusicon_in_chatdlg_titlebar.diff 1336
+MD5 99315ef10a5ac1eff12f4ea6cf690e99 files/0.10/rosteritems_iris.diff 3929
+MD5 9b7f9ae9e147bafd2079d0741d17ded6 files/0.10/rosteritems_psi_with_muc.diff 12756
+MD5 a6aeb1b22241ad3d830313962510cb52 files/0.10/statusdlg-enterkey.diff 395
+MD5 f13f9686a5acb361193702deb53cb477 files/digest-psi-0.10 2087
 MD5 c1ccb520f5b861da2a97cf5a4c17cc20 files/digest-psi-0.10_rc2 1984
 MD5 fc8fae7a49b592b4f2c2914c21494c11 files/digest-psi-0.9.3-r1 1924
 MD5 db2a4c5b68dbb0147392a4657f2dbc92 files/digest-psi-0.9.3-r2 2132
@@ -6,8 +94,10 @@ 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,6 +106,7 @@ 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 fae7c4771a439741fad3847f21eacdd7 psi-0.10.ebuild 11019
 MD5 ce7a88f45be8a343a289726ec103db69 psi-0.10_rc2.ebuild 8842
 MD5 3c2b96d4564d64824c71f4bc8e35a873 psi-0.9.3-r1.ebuild 8177
 MD5 e526c4a46dc2ead569b41607c46ceb5f psi-0.9.3-r2.ebuild 9464
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/
 }
-