Support slotted qca, bug#129536, many QA issues.

(Portage version: 2.1.4)

6 files changed, 303 insertions, 673 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index d2ffb799fa99..0fd5bcd5ea7c 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/psi
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.122 2007/09/27 13:50:50 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.123 2008/01/22 10:11:25 alonbl Exp $
+
+*psi-0.10-r4 (22 Jan 2008)
+
+  22 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> -psi-0.10.ebuild,
+  -psi-0.10-r2.ebuild, +psi-0.10-r4.ebuild:
+  Support slotted qca, bug#129536, many QA issues.
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> psi-0.10-r3.ebuild:
   sparc stable wrt #188439
diff --git a/net-im/psi/files/digest-psi-0.10 b/net-im/psi/files/digest-psi-0.10
deleted file mode 100644
index 29d3bafc9c9d..000000000000
--- a/net-im/psi/files/digest-psi-0.10
+++ /dev/null
@@ -1,93 +0,0 @@
-MD5 4aacc2de659a5a551e9b47382af83c35 gentoo-psi-0.10.tar.bz2 211538
-RMD160 35b7c7c45420ee18917f3b073e063ef3b046ef3a gentoo-psi-0.10.tar.bz2 211538
-SHA256 1d499ecb693401a69600d48c62bc3cbd3f4eed7605729655959d13af981d72bd gentoo-psi-0.10.tar.bz2 211538
-MD5 f0fd4ccf077f7b24e236f71c22649b7b psi-0.10.tar.bz2 1430929
-RMD160 b8be1490cd02f61cf86f09f2dc9f29716ea4c186 psi-0.10.tar.bz2 1430929
-SHA256 e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1 psi-0.10.tar.bz2 1430929
-MD5 2ac2b969d03bb2fe0d0c2f1518debcf1 psi-extras-insecure.tar.bz2 15914
-RMD160 a61d51cbc9280677f62d3121eada4981573842fa psi-extras-insecure.tar.bz2 15914
-SHA256 44ac11a3f1a3280a2dc613dc3719a4750f30aadd4516bee61942409d648c4740 psi-extras-insecure.tar.bz2 15914
-MD5 2885ffd0943e95edc0b8521309b01d32 psi_ar-0.9.3.tar.bz2 31466
-RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 psi_ar-0.9.3.tar.bz2 31466
-SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9 psi_ar-0.9.3.tar.bz2 31466
-MD5 ece0116f75b70592c5d858d7f705ca17 psi_bg-0.10-a.tar.bz2 33464
-RMD160 7d01bdf8776a86a23443309755ae51648387f289 psi_bg-0.10-a.tar.bz2 33464
-SHA256 b1b090af4286aabb9343373add9c33799452bd36435f4c5f97b2960d723a04cf psi_bg-0.10-a.tar.bz2 33464
-MD5 874f8f0aebcdc1294748546a59ddaefb psi_ca-0.9.3.tar.bz2 15750
-RMD160 112620891ee33ef417e55e9f66aaf7af381d4e45 psi_ca-0.9.3.tar.bz2 15750
-SHA256 105d5366390c2de50005883fe3f6ad2dd7873150f775ac95189df6d0b1153f6e psi_ca-0.9.3.tar.bz2 15750
-MD5 990dea4e96f093d07c5d5523c9875c6a psi_cs-0.9.3-a.tar.bz2 35212
-RMD160 8e4b73c0b4daefd1fb0102225adbd4a4f11bf4ff psi_cs-0.9.3-a.tar.bz2 35212
-SHA256 a9434be2b92cc0a05c3ed54cadc8f4c33f03deab76a61191996e90f54f5ec65b psi_cs-0.9.3-a.tar.bz2 35212
-MD5 208ed7a4f2c8b0aa870beb806c025b6e psi_da-0.9.3.tar.bz2 30325
-RMD160 0d833e0540f90ee60aa09544d1bf828d76f4efe6 psi_da-0.9.3.tar.bz2 30325
-SHA256 12700c28ed73b87bf28e4eb7c350011bd38f5143c50dcebf7c60056bfdad5d35 psi_da-0.9.3.tar.bz2 30325
-MD5 b3bd808955398db752759d92186704f4 psi_de-0.9.3-c.tar.bz2 33169
-RMD160 d721dab2b4b4a02defc580e79152ba1e44211bce psi_de-0.9.3-c.tar.bz2 33169
-SHA256 018dd7ac4e8cedcb68873ae6669df98a2f8271d6ef25b6278e7c7a17bd9d3f89 psi_de-0.9.3-c.tar.bz2 33169
-MD5 8a659618968a698ba7a5cd76b46be6f2 psi_el-0.9.3-a.tar.bz2 34891
-RMD160 ca2aeaaa5035d7ebc203994bc76f6e4f41358b15 psi_el-0.9.3-a.tar.bz2 34891
-SHA256 feb3628bbcf5fc282ba888bbaf85682639ff286f4acb2738b2026ff5fbaa5d63 psi_el-0.9.3-a.tar.bz2 34891
-MD5 7a8c32d1881f61b5dc3d2243a55034a1 psi_eo-0.10-a.tar.bz2 33751
-RMD160 97ed29f43f7b3910d17119dbba36b223ae933447 psi_eo-0.10-a.tar.bz2 33751
-SHA256 c88c25b548d0a6c0c85691916423bd7dae24465e216ff6193dc296dd04663114 psi_eo-0.10-a.tar.bz2 33751
-MD5 a0565b1d496baa34a433c1b42f04ac6d psi_es-0.10-a.tar.bz2 33686
-RMD160 e0155c338a547bb76400ef102bb5dd4a2d2be99b psi_es-0.10-a.tar.bz2 33686
-SHA256 e513906d05267c21bf6791d808632e7811882bff0b440b2c52a95e3032b42113 psi_es-0.10-a.tar.bz2 33686
-MD5 ef5f0d73b59d65fb1edcb42d698f64a9 psi_et-0.9.3-a.tar.bz2 30124
-RMD160 8cab7c9ab114dffb3265141e244075f0fb584664 psi_et-0.9.3-a.tar.bz2 30124
-SHA256 db1a32a04c76231df67786298c48da4ce275c35eae37df6f25ae92126477df1e psi_et-0.9.3-a.tar.bz2 30124
-MD5 d41e102a476ed319f0bcca4c516b4938 psi_fi-0.9.3.tar.bz2 23718
-RMD160 3544990eec2f645d1dd9958741eafe3b72984285 psi_fi-0.9.3.tar.bz2 23718
-SHA256 ac58365b157f4f9420b4ca76f24d43ba63ceda7e53dae66347b248c1bde384ae psi_fi-0.9.3.tar.bz2 23718
-MD5 22c3fe13e5c0fdaa33d8ef1fc2a2d560 psi_fr-0.9.3-a.tar.bz2 34898
-RMD160 cdd9cab47a840a9edc4289d5e04d6c6e5f83d94b psi_fr-0.9.3-a.tar.bz2 34898
-SHA256 d9741c88f28b64a79a36a191304834fa0de0de967d4e224a4a42db0bb03c47f4 psi_fr-0.9.3-a.tar.bz2 34898
-MD5 b5bfba7b5d74fd32e226456e9c1cb581 psi_hu-0.10-a.tar.bz2 33578
-RMD160 828ec1e570ab7f53e1cfd94c1d80756ae8b9e4c3 psi_hu-0.10-a.tar.bz2 33578
-SHA256 00dcc95225f581da306a3a53c9a90c4deb83da161435ab24622e4b64f7829df6 psi_hu-0.10-a.tar.bz2 33578
-MD5 e7aeef2ed3f743a2937599e1f123adc6 psi_it-0.9.3.tar.bz2 15759
-RMD160 4226090253697b258575cf6df42ae525beb513ec psi_it-0.9.3.tar.bz2 15759
-SHA256 cf5eb3cebe268675db8261da15738fa6d650e64c5fbe575516e64fd349dc25f5 psi_it-0.9.3.tar.bz2 15759
-MD5 e2163b47140c617881141ed2e3d9dbbe psi_mk-0.10-a.tar.bz2 33739
-RMD160 d5c09521d68cd71458e7b935fa53ccbf2782ca5e psi_mk-0.10-a.tar.bz2 33739
-SHA256 b0829b3fb3381f5204412206572612cdb04052f87181007bd3a40e6de4ce5957 psi_mk-0.10-a.tar.bz2 33739
-MD5 b29b85674c0d233960240930a6d6067a psi_nl-0.10-a.tar.bz2 34353
-RMD160 02f7afdfb76004c54f2942a748733eddaf936809 psi_nl-0.10-a.tar.bz2 34353
-SHA256 974882df2ba07bfc4e6528c172f4f586c049c421483da45c58767ba53aacfa7a psi_nl-0.10-a.tar.bz2 34353
-MD5 f270e6ed02653bcf9c638b273b50a7cb psi_pl-0.9.3-1.tar.bz2 36619
-RMD160 b7dd19cc5694e7c1a1bb249e6c06a4d9710d90dd psi_pl-0.9.3-1.tar.bz2 36619
-SHA256 cabc951788405f7f067c9aeba3bfe9f4b7a475ab7590bb971a62ae0afa68be8c psi_pl-0.9.3-1.tar.bz2 36619
-MD5 9246dadd5a8481d060c1336ffabf3ef7 psi_pt-0.9.3.tar.bz2 15746
-RMD160 d91092544c25335bcddfd85a36d8701635a551c0 psi_pt-0.9.3.tar.bz2 15746
-SHA256 4eb2824b9b42082d08ff245e93ef79671d4cde793ad28a6a610e24571a64b3f2 psi_pt-0.9.3.tar.bz2 15746
-MD5 8bd6ff47cc42fd3e5664fbb961dd17f3 psi_ptBR-0.10-a.tar.bz2 34206
-RMD160 7fdb8b2c8ec96081ef0c44070db2bb9d272415ff psi_ptBR-0.10-a.tar.bz2 34206
-SHA256 c65d62f29db06e36de987a78961da878c3cb5343f70c61082a08b5572d59cd3d psi_ptBR-0.10-a.tar.bz2 34206
-MD5 5e20def73cdfdee2b9af6798fa75417b psi_ru-0.9.3-a.tar.bz2 33201
-RMD160 67d50a071cd3271866f1bc50af7cfcd5e788a691 psi_ru-0.9.3-a.tar.bz2 33201
-SHA256 84abfb915cb027a2afbd85232ce2a4da1e2066ca9eb7e4a3c88b6ff45c66ddce psi_ru-0.9.3-a.tar.bz2 33201
-MD5 01bf0c623a576e2d9f4ff30942c50a29 psi_se-0.9.3_rc1.tar.bz2 15726
-RMD160 7a7bcb502314e86548fde646a1623146f4dae715 psi_se-0.9.3_rc1.tar.bz2 15726
-SHA256 3008138f07575f60476c00a93589279fca2ab53d4763acffdb49a3bddee19cd5 psi_se-0.9.3_rc1.tar.bz2 15726
-MD5 f3bdd1aafbc7690628cf9df4214b5af3 psi_sk-0.9.3-a.tar.bz2 34654
-RMD160 12d9e871d2c359d659f03f4cf422093b50d56faa psi_sk-0.9.3-a.tar.bz2 34654
-SHA256 e4ccb5be904951426822ecc7934ab90e85d3e1a54cb7e3ee8db997501cd013ae psi_sk-0.9.3-a.tar.bz2 34654
-MD5 6abe0bc7370e9058358e01b09a2a8c7e psi_sl-0.10-a.tar.bz2 34002
-RMD160 aae40e5099bcba54dc6bd9891dba4ad3ede05766 psi_sl-0.10-a.tar.bz2 34002
-SHA256 e15f3712a6af0bcba4ebd0703882335f5ae82ec4563ff9046f07aa23248a7446 psi_sl-0.10-a.tar.bz2 34002
-MD5 1857fe75dd81c85db90fb195b32c8bd0 psi_sr-0.9.3.tar.bz2 15754
-RMD160 423de4855715c86fdbe93da3251afc14870f5842 psi_sr-0.9.3.tar.bz2 15754
-SHA256 f9f0e66bce8c2034ddf48485af75cff05c23a18304e21162400513af0df4eda8 psi_sr-0.9.3.tar.bz2 15754
-MD5 2773bbf4585e054e7c0ca472b5723014 psi_sv-0.9.3.tar.bz2 35122
-RMD160 a8a28d3a5de1814b2e5cc2767b27dc92fcb86519 psi_sv-0.9.3.tar.bz2 35122
-SHA256 97347269e00d9ce53c56f0c6e510fec873d3d37798a6f2a9ecce4d35824a5098 psi_sv-0.9.3.tar.bz2 35122
-MD5 df93122447366aef362bafde0ed67618 psi_sw-0.9.3.tar.bz2 32917
-RMD160 da126fa3e5c27a1ab5f3c69f9f10e04d164e7744 psi_sw-0.9.3.tar.bz2 32917
-SHA256 452b1d0d1d1357844c3405f8975e82213cf4bd05ac3585662c41956bd04e9348 psi_sw-0.9.3.tar.bz2 32917
-MD5 89bf836fa741e77cfa3358ec3d4ed266 psi_vi-0.10-a.tar.bz2 34178
-RMD160 3b39e29ffe0c31f2fea1bd6a59773b131999904f psi_vi-0.10-a.tar.bz2 34178
-SHA256 1358c16c895c744cb93ec1fd486af260c7815c0d32d2d39cfec3fea846b0d3aa psi_vi-0.10-a.tar.bz2 34178
-MD5 6ef95100b9ff08b86f4404f32694d451 psi_zh-0.9.3-a.tar.bz2 31925
-RMD160 3e9ff4622de47c0029bc6c2e497e530498729bc0 psi_zh-0.9.3-a.tar.bz2 31925
-SHA256 ef85eb3a85119f0e038ae021a5c84d1e3294635bfcda854fd759283267eb5aea psi_zh-0.9.3-a.tar.bz2 31925
diff --git a/net-im/psi/files/digest-psi-0.10-r2 b/net-im/psi/files/digest-psi-0.10-r4
index ba371468277b..ba371468277b 100644
--- a/net-im/psi/files/digest-psi-0.10-r2
+++ b/net-im/psi/files/digest-psi-0.10-r4
diff --git a/net-im/psi/psi-0.10-r2.ebuild b/net-im/psi/psi-0.10-r2.ebuild
deleted file mode 100644
index fc492a1371c6..000000000000
--- a/net-im/psi/psi-0.10-r2.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.10-r2.ebuild,v 1.4 2007/05/06 11:58:57 genone Exp $
-
-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
-	$(qt_min_version 3.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
-
-	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
new file mode 100644
index 000000000000..ac4c73f52133
--- /dev/null
+++ b/net-im/psi/psi-0.10-r4.ebuild
@@ -0,0 +1,295 @@
+# 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-r4.ebuild,v 1.1 2008/01/22 10:11:25 alonbl Exp $
+
+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*
+	$(qt_min_version 3.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.10.ebuild b/net-im/psi/psi-0.10.ebuild
deleted file mode 100644
index 7facbd5fda1d..000000000000
--- a/net-im/psi/psi-0.10.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.10.ebuild,v 1.15 2007/05/06 11:58:57 genone Exp $
-
-inherit eutils qt3
-
-IUSE="ssl crypt xscreensaver extras 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-psi-0.10.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-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_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.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_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_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.tar.bz2 )
-		linguas_sk? ( ${HTTPMIRR}/psi_sk-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_TZ? ( ${HTTPMIRR}/psi_sw-0.9.3.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"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-
-DEPEND=">=app-crypt/qca-1.0-r2
-	$(qt_min_version 3.3)
-	xscreensaver? ( x11-misc/xscreensaver )"
-
-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
-
-		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 unsuported patches."
-			ewarn "Patched psi versions will not be supported by the Gentoo devs or the psi"
-			ewarn "development team."
-			ewarn "If you do not want that please press Control-C now and add '-extras' to "
-			ewarn "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
-			sed -i ${S}/src/options/opt_messages-ui.ui -e 's#<includehint>fortuneslistbox.h</includehint>##'
-			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-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
-			# by nelchael
-			epatch ${PATCHDIR}/psi-nelchael-exec_command.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
-		elog
-		elog "Unpacking language files, you must have linguas_* in USE where"
-		elog "'*' is the language files you wish. English is always available"
-		elog
-		cd ${WORKDIR}
-		if ! [ -d langs ] ; then
-			mkdir langs
-		fi
-		local i
-		for i in  `ls -c1 | grep "\.{ts,qm}$"` ; do
-			mv $i langs
-		done
-}
-
-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"
-
-	# 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/
-}