[proaudio] [1395] fix even more..

[subversion@xxxxxxxxxxxxx]

Revision: 1395
Author:   gimpel
Date:     2008-12-16 01:17:26 +0100 (Tue, 16 Dec 2008)

Log Message:
-----------
fix even more..

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/libffado/Manifest
    trunk/overlays/proaudio/media-libs/libffado/libffado-2.0_rc1.ebuild


Modified: trunk/overlays/proaudio/media-libs/libffado/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/Manifest	2008-12-16 00:00:52 UTC (rev 1394)
+++ trunk/overlays/proaudio/media-libs/libffado/Manifest	2008-12-16 00:17:26 UTC (rev 1395)
@@ -1,5 +1,5 @@
 DIST libffado-2.0-rc1.tar.gz 765589 RMD160 2ada5e508e61e940c37ccdb85372323cba5cc975 SHA1 891507b71f7c654d0af9c87036e22877291eab40 SHA256 76dae9c5e342d5496513c203f2625a549ad58467fc353be75e6a5ff5f66f1817
-EBUILD libffado-2.0_rc1.ebuild 887 RMD160 29a3bdbdbc00a06111584a203598f1fcf3dde33f SHA1 05339ba3633579a0f9e0dc7b1c1fada194312191 SHA256 4999fcde67eedd6a4718f57a7281988001e9f0748b3062f63802bf48f836753a
+EBUILD libffado-2.0_rc1.ebuild 1106 RMD160 e6c30a8387c968ee5eea94193f19d033444502e3 SHA1 85f25d8ee667be825ea704237a5e58594b60b90e SHA256 e3a057bdc1a26e2d5b1d47a08d533e23d7e0ef7081e96df06799ce4226805412
 EBUILD libffado-9999.ebuild 1025 RMD160 f23837d18f2fe59845056fa936698c52e41c2d7e SHA1 4c036be80b7d0ffe93202550a7c65829e4828d36 SHA256 313184f37071f9fb56e9b95b1aea8b88c777d154e91504f8dcaeb99999c0d439
 MISC ChangeLog 365 RMD160 8ce5a0a6e7a616660f22d91d1dafea51e854013b SHA1 5b76bb717bdd74c40a1a2f9df2faae253f0d80f8 SHA256 bfef0a667c2d22ff0fb76c41fc1b5bfb47d6143f9286aaaca7a0ba0d7aa3090b
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-libs/libffado/libffado-2.0_rc1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.0_rc1.ebuild	2008-12-16 00:00:52 UTC (rev 1394)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.0_rc1.ebuild	2008-12-16 00:17:26 UTC (rev 1395)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+inherit multilib
 
 MY_P="${P/_/-}"
 
@@ -13,14 +13,18 @@
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="debug profile"
+IUSE="debug mixer optimization"
 
 RDEPEND=">=media-libs/alsa-lib-1.0.0
 	>=dev-cpp/libxmlpp-2.13.0
 	>=sys-libs/libraw1394-1.3.0
 	>=media-libs/libiec61883-1.1.0
 	>=sys-libs/libavc1394-0.5.3
-	>=sys-apps/dbus-1.0"
+	>=sys-apps/dbus-1.0
+	mixer? ( x11-libs/qt-core
+			x11-libs/qt-gui
+			dev-python/PyQt4
+			>=dev-python/dbus-python-0.83.0 )"
 
 DEPEND="${RDEPEND}
 	dev-util/scons"
@@ -28,16 +32,19 @@
 S="${WORKDIR}/${MY_P}"
 
 src_compile () {
-	cd "$PN"
-	scons \
-		$(scons_use_enable debug DEBUG) \
-		$(scons_use_enable profile PROFILE) \
-		CFLAGS="${CFLAGS}" \
-		PREFIX="/usr/"
+	local myconf="PREFIX=/usr LIBDIR=/usr/$(get_libdir)"
+
+	use debug \
+		&& myconf="${myconf} DEBUG=True" \
+		|| myconf="${myconf} DEBUG=False"
+
+	use optimization && myconf="${myconf} ENABLE_OPTIMIZATIONS=True"
+
+	scons ${myconf} || die
 }
 
 src_install () {
 	cd "$PN"
-	escons DESTDIR="${D}" install || die
+	scons DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }