--- /usr/portage/net-im/psi/psi-0.13_rc1.ebuild	2009-06-02 02:07:56.000000000 +0200
+++ psi-0.13_rc1.ebuild	2009-06-02 22:07:56.000000000 +0200
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils qt4 multilib
+inherit eutils multilib qt4
 
 MY_P="${P/_rc/-rc}"
 
@@ -20,7 +20,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crypt dbus debug doc spell ssl xscreensaver extras"
+IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver"
 RESTRICT="test"
 
 LANGS="cs de eo es_ES fr it mk pl pt_BR ru uk ur_PK vi zh zh_TW"
@@ -29,19 +29,17 @@
 	#SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
 done
 
-COMMON_DEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
+RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
 	>=app-crypt/qca-2.0.2:2
 	spell? ( app-text/aspell )
 	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
+PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
+	jingle? ( net-libs/psimedia )
+	ssl? ( app-crypt/qca-ossl:2 )"
 
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( >=app-crypt/qca-gnupg-2.0.0_beta2 )
-	ssl? ( >=app-crypt/qca-ossl-2.0.0_beta2 )"
-
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
 	if use extras; then
@@ -60,27 +58,29 @@
 			-e 's:\(^#define PROG_NAME "Psi\):\1+:' \
 				-i src/applicationinfo.cpp || die
 	fi
-	rm -rf third-party/qca # We use system libraries.
-
 }
 
 src_configure() {
+	# cannot use econf because of non-standard configure script
 	# disable growl as it is a MacOS X extension only
-	local myconf="--prefix=/usr --qtdir=/usr"
-	myconf="${myconf} --disable-growl --disable-bundled-qca"
-	use debug && myconf="${myconf} --enable-debug"
-	use dbus || myconf="${myconf} --disable-qdbus"
-	use spell || myconf="${myconf} --disable-aspell"
-	use xscreensaver || myconf="${myconf} --disable-xss"
+	local confcmd="./configure
+			--prefix=/usr
+			--qtdir=/usr
+			--disable-bundled-qca
+			--disable-growl
+			$(use dbus || echo '--disable-qdbus')
+			$(use debug && echo '--enable-debug')
+			$(use spell || echo '--disable-aspell')
+			$(use xscreensaver || echo '--disable-xss')"
 
-	# cannot use econf because of non-standard configure script
-	./configure ${myconf} || die "configure failed"
+	echo ${confcmd}
+	${confcmd} || die "configure failed"
+
+	eqmake4
 }
 
 src_compile() {
-	eqmake4 ${PN}.pro
-
-	SUBLIBS="-L/usr/${get_libdir}/qca2" emake || die "emake failed"
+	SUBLIBS="-L/usr/$(get_libdir)/qca2" emake || die "emake failed"
 
 	if use doc; then
 		cd doc