Drop unnecessary qt4.eclass usage, fixes bug 410107. Add gold linking patch and .desktop file patch (from kensington in the same bug). Remove old.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

5 files changed, 58 insertions, 83 deletions

diff --git a/media-sound/traverso/ChangeLog b/media-sound/traverso/ChangeLog
index 8866f55fd0f0..f345ab1e38cc 100644
--- a/media-sound/traverso/ChangeLog
+++ b/media-sound/traverso/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/traverso
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.28 2012/05/05 08:53:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.29 2012/05/07 11:33:18 yngwin Exp $
+
+*traverso-0.49.2-r1 (07 May 2012)
+
+  07 May 2012; Ben de Groot <yngwin@gentoo.org>
+  +files/traverso-0.49.2-desktop.patch, +files/traverso-0.49.2-gold.patch,
+  +traverso-0.49.2-r1.ebuild, -traverso-0.49.1.ebuild, -traverso-0.49.2.ebuild:
+  Drop unnecessary qt4.eclass usage, fixes bug 410107. Add gold linking patch
+  and .desktop file patch (from kensington in the same bug). Remove old.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> traverso-0.49.1.ebuild,
   traverso-0.49.2.ebuild:
diff --git a/media-sound/traverso/files/traverso-0.49.2-desktop.patch b/media-sound/traverso/files/traverso-0.49.2-desktop.patch
new file mode 100644
index 000000000000..5e2f54303ee3
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.2-desktop.patch
@@ -0,0 +1,16 @@
+--- resources/traverso.desktop
++++ resources/traverso.desktop
+@@ -1,12 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-MimeType=text/plain
++MimeType=text/plain;
+ GenericName=Multitrack Recorder
+ GenericName[de]=Multitrack Recorder
+ GenericName[ru]=Многодорожечная запись и сведение
+ Exec=traverso
+ Icon=traverso
+-Path=
+ Type=Application
+ Terminal=false
+ Name=Traverso
diff --git a/media-sound/traverso/files/traverso-0.49.2-gold.patch b/media-sound/traverso/files/traverso-0.49.2-gold.patch
new file mode 100644
index 000000000000..6dcf978a407b
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.2-gold.patch
@@ -0,0 +1,10 @@
+--- src/engine/CMakeLists.txt
++++ src/engine/CMakeLists.txt
+@@ -68,3 +68,7 @@
+ IF(USE_PCH)
+     ADD_DEPENDENCIES(traversoaudiobackend precompiled_headers)
+ ENDIF(USE_PCH)
++
++TARGET_LINK_LIBRARIES(traversoaudiobackend
++	-ldl
++)
diff --git a/media-sound/traverso/traverso-0.49.1.ebuild b/media-sound/traverso/traverso-0.49.1.ebuild
deleted file mode 100644
index 03c1ec609270..000000000000
--- a/media-sound/traverso/traverso-0.49.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.49.1.ebuild,v 1.3 2012/05/05 08:53:52 mgorny Exp $
-
-EAPI=1
-
-inherit eutils qt4 cmake-utils
-
-DESCRIPTION="Professional Audio Tools for GNU/Linux"
-HOMEPAGE="http://traverso-daw.org/"
-SRC_URI="http://traverso-daw.org/download/releases/current/${P}.tar.gz"
-
-IUSE="alsa debug jack lame lv2 mad pulseaudio"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui
-	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/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}
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-slv2.patch"
-	epatch "${FILESDIR}/${P}-cmake.patch"
-}
-
-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
-}
-
-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}
-	doins -r resources/themes
-}
diff --git a/media-sound/traverso/traverso-0.49.2.ebuild b/media-sound/traverso/traverso-0.49.2-r1.ebuild
index bf1cc2c2af58..78e346fa6084 100644
--- a/media-sound/traverso/traverso-0.49.2.ebuild
+++ b/media-sound/traverso/traverso-0.49.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # 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.2 2012/05/05 08:53:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.49.2-r1.ebuild,v 1.1 2012/05/07 11:33:18 yngwin 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 @@ LICENSE="GPL-2"
 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}
 	virtual/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.49.1-slv2.patch"
-}
-
-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
+DOCS=( AUTHORS ChangeLog README resources/help.text )
+
+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}