--- /usr/portage/net-im/psimedia/psimedia-1.0.3.ebuild	2010-11-06 22:07:18.000000000 +0300
+++ psimedia-1.0.3.ebuild	2011-01-25 18:41:22.000000000 +0300
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3.ebuild,v 1.10 2010/11/06 19:04:49 halcy0n Exp $
 
-EAPI="2"
+EAPI=2
 
-inherit eutils qt4 multilib
+inherit qt4-r2 multilib eutils
 
 DESCRIPTION="Psi plugin for voice/video calls"
 HOMEPAGE="http://delta.affinix.com/psimedia/"
@@ -15,16 +15,16 @@
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
 IUSE="demo"
 
-DEPEND=">=dev-libs/glib-2.18
+COMMON_DEPEND="
+	>=dev-libs/glib-2.18
 	>=media-libs/gstreamer-0.10.22
 	>=media-libs/gst-plugins-base-0.10.22
 	media-libs/gst-plugins-good
 	>=dev-libs/liboil-0.3
-	x11-libs/qt-core
-	x11-libs/qt-gui
-	>=media-libs/speex-1.2_rc1"
-
-RDEPEND="${DEPEND}
+	>=x11-libs/qt-gui-4.4:4
+	>=media-libs/speex-1.2_rc1
+"
+RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-speex
 	>=media-plugins/gst-plugins-vorbis-0.10.22
 	>=media-plugins/gst-plugins-theora-0.10.22
@@ -35,16 +35,24 @@
 	media-plugins/gst-plugins-jpeg
 	!<net-im/psi-0.13_rc1
 "
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+"
 
 src_prepare() {
 	sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die
 	# Don't build demo if we don't need that.
-	use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; }
+	if use !demo; then
+		sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' \
+			-i psimedia.pro || die
+	fi
 }
 
 src_configure() {
 	# qconf generaged configure script...
 	./configure || die
+
+	eqmake4
 }
 
 src_install() {