--- traverso-0.49.2.ebuild
+++ traverso-0.49.2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.49.2.ebuild,v 1.1 2010/08/15 11:22:34 aballier Exp $
 
-EAPI=1
+EAPI=4
 
-inherit eutils qt4 cmake-utils
+inherit eutils cmake-utils
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://traverso-daw.org/"
@@ -16,43 +16,45 @@
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9 )
-	>=dev-libs/glib-2.8
 	>=media-libs/libsndfile-1.0.12
 	media-libs/libsamplerate
 	>=sci-libs/fftw-3
 	>=media-sound/wavpack-4.40.0
+	>=media-libs/libogg-1.1.2
 	>=media-libs/libvorbis-1.1.2
 	>=media-libs/flac-1.1.2
 	lv2? ( >=media-libs/slv2-0.6.1 )
 	mad? ( >=media-libs/libmad-0.15.0 )
 	lame? ( media-sound/lame )"
-#	opengl? ( x11-libs/qt-opengl )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.49.1-slv2.patch"
-}
+DOCS=( AUTHORS ChangeLog README resources/help.text )
 
-src_compile() {
-	local mycmakeargs="$(cmake-utils_use_want jack JACK) $(cmake-utils_use_want alsa ALSA) \
-		$(cmake-utils_use_want pulseaudio PULSEAUDIO) \
-		$(cmake-utils_use_want lv2 LV2) -DUSE_SYSTEM_SLV2_LIBRARY=ON \
-		$(cmake-utils_use_want mad MP3_DECODE) $(cmake-utils_use_want lame MP3_ENCODE) \
-		$(cmake-utils_use_want debug TRAVERSO_DEBUG)"
-	cmake-utils_src_compile
+PATCHES=(
+	"${FILESDIR}/${PN}-0.49.1-slv2.patch"
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-gold.patch"
+	)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_want jack JACK) $(cmake-utils_use_want alsa ALSA)
+		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_want lv2 LV2) -DUSE_SYSTEM_SLV2_LIBRARY=ON
+		$(cmake-utils_use_want mad MP3_DECODE) $(cmake-utils_use_want lame MP3_ENCODE)
+		$(cmake-utils_use_want debug TRAVERSO_DEBUG)
+	)
+	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README resources/help.text
 	doicon resources/freedesktop/icons/128x128/apps/traverso.png
 	domenu resources/traverso.desktop
 	insinto /usr/share/${PN}