Fixed gpg2 issue, bug#183075.

net-im/troll were unavailable.
CC crypto if you have any issue with this fix
(Portage version: 2.1.3_rc9)

4 files changed, 408 insertions, 1 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index ae4e0bc6e398..a60a9eae5ef2 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,14 @@
 # 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.116 2007/05/06 11:58:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.117 2007/07/27 05:37:33 alonbl Exp $
+
+*psi-0.10-r3 (27 Jul 2007)
+
+  27 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org> +files/psi-0.10-gpg2.patch,
+  +psi-0.10-r3.ebuild:
+  Fixed gpg2 issue, bug#183075.
+  net-im/troll were unavailable.
+  CC crypto if you have any issue with this fix
 
   06 May 2007; Marius Mauch <genone@gentoo.org> psi-0.10.ebuild,
   psi-0.10-r2.ebuild:
diff --git a/net-im/psi/files/digest-psi-0.10-r3 b/net-im/psi/files/digest-psi-0.10-r3
new file mode 100644
index 000000000000..ba371468277b
--- /dev/null
+++ b/net-im/psi/files/digest-psi-0.10-r3
@@ -0,0 +1,96 @@
+MD5 cc45686ae0cb30061e4a79767597dace gentoo-psi-0.10-r2.tar.bz2 36370
+RMD160 157b2f6fd4d1be8886572f10752a94b732cead8f gentoo-psi-0.10-r2.tar.bz2 36370
+SHA256 e450004e358e949113db1c298990a0d0514012f605ad1d7710b204eb82209a75 gentoo-psi-0.10-r2.tar.bz2 36370
+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 b19a3a6e253b2acd67c0401e2e9d7edb psi_bg-0.10-b-1.tar.bz2 34477
+RMD160 0a9b61207a8bf9d0b97ac9bed94aa5b47a1915a5 psi_bg-0.10-b-1.tar.bz2 34477
+SHA256 3418401beefdf694fa24178563558340e69e7a6f8ebde925d0aee5bd09316cf6 psi_bg-0.10-b-1.tar.bz2 34477
+MD5 a6fb07fa1ff3bede018da995d3899198 psi_ca-0.10-a-1.tar.bz2 33890
+RMD160 1047f532acb4a5f2bf6cc4f535821c5c115de6cd psi_ca-0.10-a-1.tar.bz2 33890
+SHA256 d5ed51ff94831712e9d7d93e557849a394ecb9cc96a43e115e099ae9c6ed0397 psi_ca-0.10-a-1.tar.bz2 33890
+MD5 01c5a4ba8399dd2a5d8656c558493875 psi_cs-0.10-a-1.tar.bz2 36257
+RMD160 cb5126f9a801a7b40e77db5dcc5c819180c6c3fb psi_cs-0.10-a-1.tar.bz2 36257
+SHA256 2f0fcdb647224844f09db8bd4ebf4b30e8b94f1641f5bbcdb18bd2f512745d59 psi_cs-0.10-a-1.tar.bz2 36257
+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 b18a7cd8a2d8e875f6dda686677cbade psi_de-0.10-a-1.tar.bz2 33694
+RMD160 445d145b972a6a180776583b080b0ff7fed12829 psi_de-0.10-a-1.tar.bz2 33694
+SHA256 3107a278cf5dfe0916e49542dcc7a7465c0d21ae5c0eba218b724439568b6a01 psi_de-0.10-a-1.tar.bz2 33694
+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 780f6d96f5498b30b4bd4b186d25250d psi_et-0.10-a-1.tar.bz2 32129
+RMD160 644d904215da17781fa1adf908894d887a7febb5 psi_et-0.10-a-1.tar.bz2 32129
+SHA256 c3bada5d8e38914a72b1dc00cb3e7fb6ae6309b7f3ffac90b370b39c8e5b3000 psi_et-0.10-a-1.tar.bz2 32129
+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 5a6a1c09e54a42d1657c1eeb1582de01 psi_fr-0.10-a-1.tar.bz2 35638
+RMD160 f4d21e2224bd490098dba77d9c226234544a5f0f psi_fr-0.10-a-1.tar.bz2 35638
+SHA256 426cdbd8431d9a8ccc3b3ebea7d6a460450cd72c6ee5328f61e3f650e2601380 psi_fr-0.10-a-1.tar.bz2 35638
+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 6c489185d3e950a8b62f49c8e7930198 psi_it-0.10-a-1.tar.bz2 35056
+RMD160 161b68c1f5e3aed7f80c20fffe9974c607f3ae35 psi_it-0.10-a-1.tar.bz2 35056
+SHA256 00e2a778eec4784b6270353d9509144b1910bed3d1e80c30d8840073e05b71aa psi_it-0.10-a-1.tar.bz2 35056
+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 69b4a108d4a23a9d48326b7d6cc9def4 psi_pt-0.10-a-1.tar.bz2 33214
+RMD160 ea35cdf927fc9e7832d02eb0df5d462045bf2563 psi_pt-0.10-a-1.tar.bz2 33214
+SHA256 5165ce404b74e7bedd0ef8011bbc8aa2ce98d990105a5566429e525846fb2933 psi_pt-0.10-a-1.tar.bz2 33214
+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 d2a06916aeb35ec86fd8cff8533e0b3c psi_se-0.9.3_rc1-1.tar.bz2 15739
+RMD160 333f15c615327fd314f77e66f0e3dbfe33a7aed4 psi_se-0.9.3_rc1-1.tar.bz2 15739
+SHA256 fc61a903e4ce8aaff58eea6b5d3df6407ac24755a9cbba2f41df87abc0d23beb psi_se-0.9.3_rc1-1.tar.bz2 15739
+MD5 6b06aec2406fd15a8beaaad16d8d4cdb psi_sk-0.10-a-1.tar.bz2 35660
+RMD160 235047edc0d334b27bbceb0eeb18b005f3af1cb5 psi_sk-0.10-a-1.tar.bz2 35660
+SHA256 25fab9526050565b13555de8873035b01afccb236b97090620d7d91dab065c9a psi_sk-0.10-a-1.tar.bz2 35660
+MD5 d709d8d0680a12babcff167f4cf10f27 psi_sl-0.10-b-1.tar.bz2 34013
+RMD160 1ce5ca0334c84d269a224d7591750c88dd195098 psi_sl-0.10-b-1.tar.bz2 34013
+SHA256 e8a9305fd92534a1b46006b4a730273ab39c1666c5d4735e1ab780c254ab704a psi_sl-0.10-b-1.tar.bz2 34013
+MD5 f2b95bddb3e2fe7419e86fc39d4bf14f psi_sr-0.10-a-1.tar.bz2 35257
+RMD160 6b9783f79046c350f179ef046f21ce7a349b5001 psi_sr-0.10-a-1.tar.bz2 35257
+SHA256 68e4786f52de010d5545e3706bd8165a12c7346dcf1a1280fa2914e9978344af psi_sr-0.10-a-1.tar.bz2 35257
+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 f58fefde629de6227621e45bb1d51569 psi_vi-0.10-b-1.tar.bz2 34255
+RMD160 e1d168e189a454d392473996e77dbcd8778fbe05 psi_vi-0.10-b-1.tar.bz2 34255
+SHA256 94ae3fe1f421132ce285e6246db9c0facbf1a6f472c870e28ee42993dbc98039 psi_vi-0.10-b-1.tar.bz2 34255
+MD5 d951d267125b89251afab06b2fce57a6 psi_zh-0.10-a-1.tar.bz2 32898
+RMD160 c0440dcb7763908354fc9c8f1d1b1873a00f7f75 psi_zh-0.10-a-1.tar.bz2 32898
+SHA256 747993fe4d9c9517d72360a8618c7c33600e2b870223fe69e107d64166d5a43a psi_zh-0.10-a-1.tar.bz2 32898
diff --git a/net-im/psi/files/psi-0.10-gpg2.patch b/net-im/psi/files/psi-0.10-gpg2.patch
new file mode 100644
index 000000000000..cd2b3a95fe45
--- /dev/null
+++ b/net-im/psi/files/psi-0.10-gpg2.patch
@@ -0,0 +1,12 @@
+diff -urNp psi-0.10.org/src/tools/openpgp/gpgop.cpp psi-0.10/src/tools/openpgp/gpgop.cpp
+--- psi-0.10.org/src/tools/openpgp/gpgop.cpp	2005-08-21 20:44:28.000000000 +0300
++++ psi-0.10/src/tools/openpgp/gpgop.cpp	2007-06-28 18:55:55.000000000 +0300
+@@ -377,7 +377,7 @@ void GpgOp::proc_statusLine(const QStrin
+ 		rest = str.mid(n+1);
+ 	}
+ 
+-	if(s == "NEED_PASSPHRASE") {
++	if(s == "GET_HIDDEN") {
+ 		if(!(d->tryAgent && getenv("GPG_AGENT_INFO"))) {
+ 			if(!d->didPassphrase) {
+ 				d->didPassphrase = true;
diff --git a/net-im/psi/psi-0.10-r3.ebuild b/net-im/psi/psi-0.10-r3.ebuild
new file mode 100644
index 000000000000..56001d4c1e1d
--- /dev/null
+++ b/net-im/psi/psi-0.10-r3.ebuild
@@ -0,0 +1,291 @@
+# 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-r3.ebuild,v 1.1 2007/07/27 05:37:33 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.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
+	epatch "${FILESDIR}/${P}-gpg2.patch"
+
+	if ! use extras; then
+		ewarn "You are going to install the original psi version. You might want to"
+		ewarn "try the version with extra unsuported patches by adding 'extras' to"
+		ewarn "your use flags."
+	else
+		ewarn "You are about to build a version of Psi with extra patches."
+		ewarn "Patched psi versions will not be supported by the psi development team,"
+		ewarn "but only (in limited scope) by the psi-gentoo patchset author."
+		ewarn "If you find any problem with patched psi, first contact with"
+		ewarn "troll@gentoo.org through the bugzilla or directly by email."
+		ewarn
+		ewarn "If you do not want patched psi version, please press Control-C now and"
+		ewarn "add '-extras' to your USE flags."
+		ebeep
+		epause 10
+
+		cd ${S}
+		# from http://norman.rasmussen.co.za/darcs/psi-muc/
+		epatch ${PATCHDIR}/psi-muc_support.patch
+		epatch ${PATCHDIR}/psi-muc_support-update-20051123.patch
+		epatch ${PATCHDIR}/psi-muc_support-update-20060114.patch
+
+		# roster-nr
+		epatch ${PATCHDIR}/psi-fix_popup_richtext.patch
+		epatch ${PATCHDIR}/psi-roster-nr-0.9.14.patch
+		epatch ${PATCHDIR}/psi-status_indicator++_add-on_roster-nr.patch
+		# indicator icon
+		cp ${FILESDIR}/psi-indicator.png ${S}/iconsets/roster/default/indicator.png
+
+		# from http://www.cs.kuleuven.ac.be/~remko/psi/
+		epatch ${PATCHDIR}/jep8-avatars_iris.diff
+		epatch ${PATCHDIR}/jep8-avatars_psi.diff
+
+		# from http://machekku.uaznia.net/jabber/psi/patches/
+		epatch ${PATCHDIR}/psi-machekku-smart_reply_and_forward-0.5_psi-gentoo.diff
+		epatch ${PATCHDIR}/psi-machekku-keep_message_in_auto_away_status.diff
+		epatch ${PATCHDIR}/psi-machekku-quote_emoticons.diff
+		epatch ${PATCHDIR}/psi-machekku-emoticons_advanced_toggle.diff
+		epatch ${PATCHDIR}/psi-machekku-linkify_fix.diff
+		epatch ${PATCHDIR}/psi-machekku-autostatus_while_dnd.diff
+		epatch ${PATCHDIR}/psi-machekku-visual_styles_manifest.diff
+		epatch ${PATCHDIR}/psi-machekku-tool_window_minimize_fix_for_windows.diff
+		epatch ${PATCHDIR}/psi-machekku-new_character_counter.diff
+
+		# from ftp://ftp.patryk.one.pl/pub/psi/skazi/patches/
+		epatch ${PATCHDIR}/psi-options_resize-fix.diff
+		epatch ${PATCHDIR}/psi-settoggles-fix.diff
+		epatch ${PATCHDIR}/psi-line_in_options-mod.diff
+		epatch ${PATCHDIR}/psi-empty_group-fix.diff
+		epatch ${PATCHDIR}/psi-no_online_status-mod.diff
+		epatch ${PATCHDIR}/psi-status_history-add-psi-gentoo.diff
+		epatch ${PATCHDIR}/psi-icon_buttons_big_return-mod.diff
+		epatch ${PATCHDIR}/psi-linkify-mod-rev-fix.diff
+		epatch ${PATCHDIR}/psi-save_profile-mod.diff
+		epatch ${PATCHDIR}/psi-url_emoticon-mod.diff
+		epatch ${PATCHDIR}/psi-thin_borders-mod.diff
+
+		# from http://www.uaznia.net/psi-daisy/patches/
+		epatch ${PATCHDIR}/filetransfer.diff
+		epatch ${PATCHDIR}/psi-emots-mod.diff
+		epatch ${PATCHDIR}/psi_michalj_statusicon_in_chatdlg_titlebar.diff
+		epatch ${PATCHDIR}/psi_michalj_custom_rostericons_in_tooltips.diff
+
+		# from ftp://ftp.patryk.one.pl/pub/psi/patches/
+		epatch ${PATCHDIR}/psi-psz-chatdlg_typed_msgs_history.diff
+
+		# from http://kg.alternatywa.info/psi/patche/
+		epatch ${PATCHDIR}/psi-status-timeout-kfix.diff
+		epatch ${PATCHDIR}/psi-kg-spoof.diff
+		epatch ${PATCHDIR}/psi-kg-individual_status_add.diff
+
+		# from pld-linux.org
+		epatch ${PATCHDIR}/psi-certs.patch
+
+		# upstream patches from psi-flyspray
+		epatch ${PATCHDIR}/psi-fix_groupsortingstyle_toggles.patch
+		epatch ${PATCHDIR}/psi-multiple_account_groups.diff
+
+		# from http://psi-pedrito.go.pl/
+		epatch ${PATCHDIR}/pedrito-null-key-string-fix.diff
+		epatch ${PATCHDIR}/pedrito-avatars-printf-off.diff
+		epatch ${PATCHDIR}/pedrito-linkify_and_wrap-client.diff
+		epatch ${PATCHDIR}/pedrito-group_menuitem_for_notinlist.diff
+
+		# from psi-devel mailing list
+		epatch ${PATCHDIR}/psi-history_lug.patch
+		epatch ${PATCHDIR}/psi-history-deletion-bugfix.patch
+		epatch ${PATCHDIR}/checkboxes-sound-options.diff
+
+		# from http://mircea.bardac.net/psi/patches/
+		epatch ${PATCHDIR}/psi-cli-v2.diff
+
+		# from ubuntu
+		epatch ${PATCHDIR}/psi-trayicon_ubuntu_fix.patch
+
+		# from http://home.unclassified.de/files/psi/patches/
+		epatch ${PATCHDIR}/statusdlg-enterkey.diff
+		epatch ${PATCHDIR}/fix-min-window-notify.diff
+		epatch ${PATCHDIR}/hide-no-resource-from-contextmenu.diff
+		epatch ${PATCHDIR}/custom-sound-popup.patch
+		epatch ${PATCHDIR}/offline-contact-animation.diff
+
+		# from bugs.gentoo.org
+		epatch ${PATCHDIR}/psi-add-status-history.patch
+
+		# from http://rydz.homedns.org
+		epatch ${PATCHDIR}/psi-filetransfer-finish-popup-qsorix.patch
+
+		# from http://k.uaznia.net/jabber/psi/patches/
+		epatch ${PATCHDIR}/a-psi-k-emergency_away_status_button.diff
+		epatch ${PATCHDIR}/psi-evil_message_support.patch
+		epatch ${PATCHDIR}/psi-auto_responder.patch
+		epatch ${PATCHDIR}/psi-auto_responder_gui.patch
+
+		# from http://www.cs.kuleuven.ac.be/~remko/psi/
+		epatch ${PATCHDIR}/rosteritems_iris.diff
+		# this one was chagned because of muc support
+		epatch ${PATCHDIR}/rosteritems_psi_with_muc.diff
+
+		# from http://delx.cjb.net/psi/
+		epatch ${PATCHDIR}/psi-nicknames.patch
+
+		# from http://norman.rasmussen.co.za/darcs/psi-rc/
+		epatch ${PATCHDIR}/norman-rc.diff
+		epatch ${PATCHDIR}/norman-darcs-20051129.diff
+		# from http://machekku.uaznia.net/jabber/psi/patches/
+		epatch ${PATCHDIR}/psi-machekku-rc_multiline_status_fix.diff
+		# from http://norman.rasmussen.co.za/darcs/psi-rc/
+		epatch ${PATCHDIR}/psi-dynamic-priority-rc-fix.diff
+		epatch ${PATCHDIR}/norman-darcs-20051231.patch
+
+		# created for psi-gentoo and roster-nr
+		epatch ${PATCHDIR}/psi-smile_icon_emoticonset.patch
+		epatch ${PATCHDIR}/psi-enable_avatars.patch
+		epatch ${PATCHDIR}/psi-transport_icons_and_avatars.patch
+		epatch ${PATCHDIR}/psi-client_avatars_icons.patch
+		epatch ${PATCHDIR}/psi-emoticons_advanced_toggle-add-roster-nr.patch
+		epatch ${PATCHDIR}/psi-chatdlg_messages_colors_distinguishes.patch
+		epatch ${PATCHDIR}/psi-messages_color_backgrounds_in_chat.patch
+		epatch ${PATCHDIR}/psi-sort-style-on-roster-nr.patch
+		epatch ${PATCHDIR}/psi-says_mod.patch
+		epatch ${PATCHDIR}/psi-muc_support_langpacks_fix.patch
+		epatch ${PATCHDIR}/psi-copy_jid_or_status_message_to_clipboard.patch
+		epatch ${PATCHDIR}/psi-timestamps_option_and_date_showing.patch
+		epatch ${PATCHDIR}/psi-avatars_graph_settings_filetypes.patch
+		epatch ${PATCHDIR}/psi-auto_responder_by_message.patch
+		epatch ${PATCHDIR}/psi-taskbar_flashing.patch
+		# by nelchael
+		epatch ${PATCHDIR}/psi-nelchael-exec_command.patch
+		epatch ${PATCHDIR}/psi-nelchael-disconnect-sleep.patch
+		use audacious && epatch ${PATCHDIR}/psi-nelchael-audacious-status-0.3.patch
+
+		if use insecure-patches; then
+			# from http://www.uni-bonn.de/~nieuwenh/
+			epatch ${PATCHDIR}/libTeXFormula.diff
+			# from pld-linux.org
+			epatch ${PATCHDIR}/psi-libTeXFormula-nicechats.patch
+		fi;
+
+		epatch ${PATCHDIR}/psi-gentoo-version.patch
+	fi
+}
+
+src_compile() {
+	# growl is mac osx extension only - maybe someday we will want this
+	local myconf="--disable-growl"
+	use xscreensaver || myconf="${myconf} --disable-xss"
+
+	./configure --prefix=/usr ${myconf} || die "Configure failed"
+
+	# fixes weird bugs : #150187 and #154556
+	cd ${S}/libpsi/psiwidgets
+	${QTDIR}/bin/qmake psiwidgets.pro \
+		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+		QMAKE=${QTDIR}/bin/qmake \
+		QMAKE_RPATH= \
+			|| die "Qmake failed"
+
+	# for CXXFLAGS from make.conf
+	cd ${S}/src
+	${QTDIR}/bin/qmake src.pro \
+		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+		QMAKE=${QTDIR}/bin/qmake \
+		QMAKE_RPATH= \
+			|| die "Qmake failed"
+	cd ${S}
+	${QTDIR}/bin/qmake psi.pro \
+		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+		QMAKE=${QTDIR}/bin/qmake \
+		QMAKE_RPATH= \
+		|| die "Qmake failed"
+
+	emake || die "Make failed"
+
+	einfo "Building language packs"
+	cd ${WORKDIR}/langs
+	for i in `ls -c1 | grep "\.ts$"` ; do
+		${QTDIR}/bin/lrelease $i
+	done;
+}
+
+src_install() {
+	einfo "Installing"
+	make INSTALL_ROOT="${D}" install || die "Make install failed"
+
+	#this way the docs will also be installed in the standard gentoo dir
+	for i in roster system emoticons; do
+		newdoc ${S}/iconsets/${i}/README README.${i}
+	done;
+	newdoc certs/README README.certs
+	dodoc README TODO
+
+	#Install language packs
+	cp ${WORKDIR}/langs/psi_*.qm ${D}/usr/share/psi/
+}