--- sqlitebrowser-2.0_beta1-r1.ebuild
+++ sqlitebrowser-2.0_beta1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-2.0_beta1-r1.ebuild,v 1.1 2010/11/07 15:20:42 xmw Exp $
 
-EAPI=2
+EAPI=4
 
-inherit eutils qt4
+inherit qt4-r2
 
 DESCRIPTION="SQLite Database Browser"
 HOMEPAGE="http://sqlitebrowser.sourceforge.net/"
@@ -15,20 +15,20 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-gui-4.6:4[qt3support]"
+DEPEND=">=x11-libs/qt-core-4.6:4[qt3support]
+	>=x11-libs/qt-gui-4.6:4[qt3support]
+	>=x11-libs/qt-qt3support-4.6:4"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/trunk/${PN}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt-4.7.0.patch
-}
-
-src_configure() {
-	eqmake4 sqlitedbbrowser.pro
-}
+PATCHES=(
+	"${FILESDIR}/${P}-qt-4.7.0.patch"
+	"${FILESDIR}/${P}-gold.patch"
+	)
 
 src_install() {
-	dobin ${PN}/${PN} || die
+	dobin ${PN}/${PN}
 	newicon ${PN}/images/128.png ${PN}.png
 	make_desktop_entry ${PN} "SQLite Database Browser"
 }