[proaudio] [2233] media-libs/libffado update thanks to all on list

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 2233
Author:   gavlee
Date:     2012-09-27 12:19:56 +0200 (Thu, 27 Sep 2012)
Log Message:
-----------
media-libs/libffado update thanks to all on list

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/libffado/ChangeLog
    trunk/overlays/proaudio/media-libs/libffado/Manifest
    trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild
    trunk/overlays/proaudio/media-libs/libffado/metadata.xml

Added Paths:
-----------
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/0001-honour-toolchain-env.patch
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/0002-remove-O2.patch
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/0001-honour-toolchain-env.patch
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/0003-remove-O2.patch
    trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.0_rc1-dbus_mainloop.patch
    trunk/overlays/proaudio/media-libs/libffado/libffado-2.0.0.ebuild
    trunk/overlays/proaudio/media-libs/libffado/libffado-2.0.1.ebuild

Modified: trunk/overlays/proaudio/media-libs/libffado/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/ChangeLog	2012-09-26 14:57:02 UTC (rev 2232)
+++ trunk/overlays/proaudio/media-libs/libffado/ChangeLog	2012-09-27 10:19:56 UTC (rev 2233)
@@ -2,6 +2,20 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*libffado-2.1.0 (27 Sep 2012)
+
+  27 Sep 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+  -files/libffado-2.0_rc1-dbus_mainloop.patch, -libffado-2.0.0.ebuild,
+  -libffado-2.0.1.ebuild, +libffado-2.1.0.ebuild,
+  +files/libffado-2.1.0/0001-honour-toolchain-env.patch,
+  +files/libffado-2.1.0/0002-remove-O2.patch, libffado-9999.ebuild,
+  +files/libffado-9999/0001-honour-toolchain-env.patch,
+  +files/libffado-9999/0003-remove-O2.patch, metadata.xml:
+  bump to 2.1.0 and sync live ebuild. add patches for honouring flags from
+  portage environment. tweak deps. set python version 2 and make use of eclass
+  features. remove old ebuilds and patches. Thanks to all on list for info and 
+  Sebastian Rose, Nedko Arnaudov for help.
+
   10 May 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> libffado-2.0.0.ebuild,
   libffado-2.0.1.ebuild, libffado-9999.ebuild:
   libffado: all ebuilds updated. Thanks to Natanael for fixing sandbox

Modified: trunk/overlays/proaudio/media-libs/libffado/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/Manifest	2012-09-26 14:57:02 UTC (rev 2232)
+++ trunk/overlays/proaudio/media-libs/libffado/Manifest	2012-09-27 10:19:56 UTC (rev 2233)
@@ -1,8 +1,9 @@
-AUX libffado-2.0_rc1-dbus_mainloop.patch 979 RMD160 6636780c24bf213e1871dbad9d67519c7152704d SHA1 8b4eaaa5c912ecff6a645ffadafb32cf13da3330 SHA256 86f0e0264817c1488e2c22c5bd23274f52b86c91e6d1d39cb5b9ef49237e1b56
-DIST libffado-2.0.0.tar.gz 778733 RMD160 dca255a68f67ae904b8a597669ff412d84d0b629 SHA1 474d41ad4e3e4bad952636fea47488fad3db0d93 SHA256 5d375246f7c269f21b6471cb23cc30a8886431b2b09e7cfbbcc085dba2a6d65b
-DIST libffado-2.0.1.tar.gz 777163 RMD160 c9fba20fa362923f01c226015124f42f8dbb850d SHA1 9e327cb5ad0f56e8cfa84ec2a5f3f261b57ca96a SHA256 fda254ecf9c8007374d6120cf1c3614c7758d90981bc73f494b58313da7d199c
-EBUILD libffado-2.0.0.ebuild 1538 RMD160 0f2444c7a9d819d00c123423da43222e17350739 SHA1 1cab374649964ccfdb9a9eb336b7051ddfabc83c SHA256 c6f8f014cfcde88eaa71168dd5a6fb9506868fa2641c266455f93aa9ae46ddfd
-EBUILD libffado-2.0.1.ebuild 1605 RMD160 c797be808cf24e7535ff03050b964f3a2f539f5d SHA1 371b44972ededec77151a93001da93046852b751 SHA256 47f3a3c4d99dc98563c1db16e684d209c8efb677b9e85628730967b11f094ac2
-EBUILD libffado-9999.ebuild 1519 RMD160 21baea97307c8072480aad0c834deb6841b90362 SHA1 27ae249a55cf45a26ff4c4c0b0ec7ee1bbed8b84 SHA256 5ea4329289ccd31908b58818fe6f4cac414696ca966ae082015fadd54401042f
-MISC ChangeLog 1548 RMD160 8a48c7e91c1d432f101116a7e86773913e657647 SHA1 018678975e48bbeaf265fb22f8b77de3fd6397e5 SHA256 7ba5c66328634db3d067f804444243c8864be857eeb6b1fbabb3fc1d07096b04
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX libffado-2.1.0/0001-honour-toolchain-env.patch 1306 SHA256 a9a83c2b15fe35eaa018fe58c240f8a8fa6644241163ee9455b9c2d772f93c11 SHA512 a96d8fbd54dac1a9ac2bb1ca16714c612267b431ea59d91e483f3b6df2ff42b174a22bc0aace54efd83ccb5eb07ed7632e6d49220f9beb0da266387f2181b6c3 WHIRLPOOL c443d68afe36e144bd577ef7a0d328c01dbf2cdf9de8b2e3a4311edcf6d293fc8c099de16033d15bf231b04b6409df2588e6bf6b33f7d1a9744366488d4e0491
+AUX libffado-2.1.0/0002-remove-O2.patch 639 SHA256 9e185836abe972dbeb250e9adf8878baf36d14bbce1c07fd173e7ec66cce5ccf SHA512 e31b376b8281703ccac8b4cb19a9f93f154c171b8b718aa722e2e9c0b534df24115658161ee41731559af0added7dd10895c79a1fbe68ea1c29109d42c3770df WHIRLPOOL 0e46ab21ba0f2f13004171b0a579c20d82963983f906efb982158a56fe6a8531cd2e0be935f34d8b6c96c3a3200892939f53cd710db7880053160e43006c39e0
+AUX libffado-9999/0001-honour-toolchain-env.patch 1306 SHA256 c8ae6927b896d570af7ef6c717339e64ed777ec3239f21d6b272d7b066aad141 SHA512 010b64d96dd2b802bcb5b78a38ed560af3c8fe0a4c0dc5eeb3c4d1dff94493f7fba176b0bebe5dcc18fe04e9688b2011970995f51a2eef217059e44f93f747ee WHIRLPOOL 04005043306b69216fe85ee3e2e2c6aafdf3b0876dec840b01c1623d25c810502406ed12c90c2f85ab2551e951ad9c7d48d4a46c611bba3b904bc56d8c3227b7
+AUX libffado-9999/0003-remove-O2.patch 638 SHA256 46c7906e3801dcbd24f43dc823f53c8f89f2160be0751c3fe134da7520dc5464 SHA512 b58aa81395b6a9818b45db06707122467542cf8ced487bd1b62536bdba748f6f4a3155485096c42d1bed07207bfdaabbcfdb73845a17fc9bae9bf4498cf89c91 WHIRLPOOL 35a21d38ef57653856763d3b37cfd79732305eb3b5ce8823323c8c8efebf79a8e7058cd4b698d50aac41465d747a1e19c8ce01469dee66911aa1500a01abbf7a
+DIST libffado-2.1.0.tgz 1153758 SHA256 dec0ea985e738be698c64fb3184844f4bc9bcb38349c20241027051686af9d85 SHA512 37179cb32920f16577e9f887cf90aca8d46081573080cbe408654c5234c7f45433521c977918057e330ddaa5fefa98c983ea7806d4f1f33c950112cbe66d013b WHIRLPOOL a4802d6a9318912f9d88fe17febdb05f0d990e124921b5d1d8c754ca1ca7d7457cf5aef8f662b074e0205df23b04fec0ad242640dff87903db32de0eccde9667
+EBUILD libffado-2.1.0.ebuild 2050 SHA256 d06b9e7f60c2291e96f3191ef923cea31f3d58a8a0c8ceef04a28521fa88e17b SHA512 f3e6be3a6e3e0c183dced1ae25d9f0d0189a48946a4f77589b798961fe30c04d7bf7bcd71619fcd2a079502e398c3e64af25eea7d6597b2d3d91348de16185de WHIRLPOOL a30fe16203009b4b6c98ba6275999761ca6deba367f8d9f521b0f45ff3e4b1eb1c80ffd2da2001b53d942c74dae79185fdc037ecf4f54598e593a00e1b521403
+EBUILD libffado-9999.ebuild 2056 SHA256 89d0a81dd2dcadf3b92812fcac813e3c57a06040c5d0f7e38365b858966d573b SHA512 a8481b1999f4aaa7e038d1a5c74081c209c0b51380e346f96b72473f27cbd8fd80d9e5ba01328ff9fecf6183ea3cccb8c660dafc6f3a5a863200d912239b843a WHIRLPOOL f4bf86bf34f30601e824f614f6362786bd454355e875aeb65e49d5f1096f71a95e860369623fef217396ee3ae5727ee52707fdef1314f3711b3a178ad7bb67cb
+MISC ChangeLog 2283 SHA256 e1b8fcae14a5145eb2e3963a2a5b9c908d33540f86fced72620e88f0d39701a3 SHA512 6888a9dbbe748d7586a891680f54700647c01b0035bab6f01aebcfa62f48deb9745bb75b44483441e1543271562e6c252ca7c8deeb2b3712330c856be5c44720 WHIRLPOOL c0b3fd26b02c76b6ab6b5448a0180fa8f476594873ae3a158316ad64f2ca5025eda7f7a39bf68126a938dd3ef23d43acf3f8f080d9b2203a5495e20b51106345
+MISC metadata.xml 353 SHA256 608a4a6b28282ff02bda855731c407ccec16d907de90968b75241be123780a64 SHA512 f0399d9fbe3ffcd86066d1442c7a9dd178ac7601dea53280b6bd570bc5a839f4e63051b6bdd04d38c58a5edd6a39dac33af90b82bf46c633516d9ec3a5ee78b9 WHIRLPOOL a75323edc62d5cc245791c7d0cd56d16827d8f8778932c862684cbe59295821339ada5a3ed8a26de27a61f7f7c8ab0df8391efc4c42c608406314d9c579fad72

Deleted: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.0_rc1-dbus_mainloop.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.0_rc1-dbus_mainloop.patch	2012-09-26 14:57:02 UTC (rev 2232)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.0_rc1-dbus_mainloop.patch	2012-09-27 10:19:56 UTC (rev 2233)
@@ -1,31 +0,0 @@
-Index: /branches/libffado-2.0/SConstruct
-===================================================================
---- /branches/libffado-2.0/SConstruct (revision 1473)
-+++ /branches/libffado-2.0/SConstruct (revision 1476)
-@@ -153,23 +153,7 @@
- def CheckForPyModule( context, module ):
- 	context.Message( "Checking for the python module '" + module + "' " )
--	ret = True
--	path = None
--	while module.count(".") > 0 and ret:
--		thismod = module.split(".")[0]
--		try:
--			modinfo = imp.find_module( thismod, path )
--		except ImportError:
--			ret = False
--		else:
--			newmod = imp.load_module( thismod, modinfo[0], modinfo[1], modinfo[2] )
--			path = newmod.__path__
--		module = ".".join( module.split(".")[1:] )
--	if ret:
--		try:
--			imp.find_module( module )
--		except ImportError:
--			ret = False
--	context.Result( ret )
--	return ret
-+	ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" )
-+	context.Result( ret[0] )
-+	return ret[0]
- 
- def CompilerCheck( context ):

Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/0001-honour-toolchain-env.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/0001-honour-toolchain-env.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/0001-honour-toolchain-env.patch	2012-09-27 10:19:56 UTC (rev 2233)
@@ -0,0 +1,39 @@
+From 1dc8c363d1b312f99d6cb4512727ba6f6e0b2b9f Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Fri, 7 Sep 2012 17:13:31 +0100
+Subject: [PATCH 1/4] honour toolchain env
+
+---
+ SConstruct |   16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 0e40c7c..b816115 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -481,6 +481,22 @@ env['REGISTRATION_URL'] = "http://ffado.org/deviceregistration/register.php?acti
+ #
+ env['top_srcdir'] = env.Dir( "." ).abspath
+ 
++# Respect toolchain settings from environment
++# code found on http://http://dev.gentoo.org/~vapier/scons-blows.txt
++# and modified to strip the double quotes, this should allows setting CFLAGS
++# containing things like --param l1-cache-line-size=64
++import SCons.Util
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++        env.Append(CFLAGS = str(os.environ['CFLAGS']).replace('\"', ''))
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++        env.Append(CXXFLAGS = str(os.environ['CXXFLAGS'].replace('\"', '')))
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+ #
+ # Start building
+ #
+-- 
+1.7.8.6
+

Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/0002-remove-O2.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/0002-remove-O2.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.1.0/0002-remove-O2.patch	2012-09-27 10:19:56 UTC (rev 2233)
@@ -0,0 +1,25 @@
+From d176b5d168ff7fd016fd83c7fadde843c2e29a45 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Wed, 26 Sep 2012 16:19:56 +0100
+Subject: [PATCH 2/4] remove -O2
+
+---
+ SConstruct |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 0798516..b3a4182 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -410,7 +410,7 @@ if env['DEBUG']:
+     print "Doing a DEBUG build"
+     env.MergeFlags( "-DDEBUG -Wall -g" )
+ else:
+-    env.MergeFlags( "-O2 -DNDEBUG" )
++    env.MergeFlags( "-DNDEBUG" )
+ 
+ if env['PROFILE']:
+     print "Doing a PROFILE build"
+-- 
+1.7.8.6
+

Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/0001-honour-toolchain-env.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/0001-honour-toolchain-env.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/0001-honour-toolchain-env.patch	2012-09-27 10:19:56 UTC (rev 2233)
@@ -0,0 +1,39 @@
+From 8b6da1dc378e6eb95c73f63a08a7ed3492cc6992 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Sat, 8 Sep 2012 00:57:49 +0100
+Subject: [PATCH 1/4] honour toolchain env
+
+---
+ SConstruct |   16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index d969f6b..749ae51 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -629,6 +629,22 @@ env['REGISTRATION_URL'] = "http://ffado.org/deviceregistration/register.php?acti
+ #
+ env['top_srcdir'] = env.Dir( "." ).abspath
+ 
++# Respect toolchain settings from environment
++# code found on http://http://dev.gentoo.org/~vapier/scons-blows.txt
++# and modified to strip the double quotes, this should allows setting CFLAGS
++# containing things like --param l1-cache-line-size=64
++import SCons.Util
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++        env.Append(CFLAGS = str(os.environ['CFLAGS']).replace('\"', ''))
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++        env.Append(CXXFLAGS = str(os.environ['CXXFLAGS'].replace('\"', '')))
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+ #
+ # Start building
+ #
+-- 
+1.7.8.6
+

Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/0003-remove-O2.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/0003-remove-O2.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-9999/0003-remove-O2.patch	2012-09-27 10:19:56 UTC (rev 2233)
@@ -0,0 +1,25 @@
+From ba280ef176ca6abed986a925f25b4374796f6fa9 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Sat, 8 Sep 2012 00:58:34 +0100
+Subject: [PATCH 3/4] remove -O2
+
+---
+ SConstruct |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index a150e1c..98dd87d 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -410,7 +410,7 @@ if env['DEBUG']:
+     print "Doing a DEBUG build"
+     env.MergeFlags( "-DDEBUG -Wall -g" )
+ else:
+-    env.MergeFlags( "-O2 -DNDEBUG" )
++    env.MergeFlags( "-DNDEBUG" )
+ 
+ if env['PROFILE']:
+     print "Doing a PROFILE build"
+-- 
+1.7.8.6
+

Deleted: trunk/overlays/proaudio/media-libs/libffado/libffado-2.0.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.0.0.ebuild	2012-09-26 14:57:02 UTC (rev 2232)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.0.0.ebuild	2012-09-27 10:19:56 UTC (rev 2233)
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib scons-utils
-RESTRICT="mirror"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
-HOMEPAGE="http://www.ffado.org";
-SRC_URI="http://www.ffado.org/files/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug qt4"
-
-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
-	qt4? (
-		|| ( ( x11-libs/qt-core x11-libs/qt-gui )
-				>=x11-libs/qt-4.0:4 )
-		dev-python/PyQt4
-		>=dev-python/dbus-python-0.83.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/scons"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_configure () {
-	local myconf=""
-
-	use debug \
-		&& myconf="${myconf} DEBUG=True ENABLE_OPTIMIZATIONS=False" \
-		|| myconf="${myconf} DEBUG=False ENABLE_OPTIMIZATIONS=True"
-}
-
-src_compile () {
-	addpredict /dev/snd # workaround because jackd --version is called after
-						# compilation, that tries to use /dev/snd/control*
-	escons \
-		PREFIX=/usr \
-		LIBDIR=/usr/$(get_libdir) \
-		${myconf} || die
-}
-
-src_install () {
-	escons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	if use qt4; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}

Deleted: trunk/overlays/proaudio/media-libs/libffado/libffado-2.0.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.0.1.ebuild	2012-09-26 14:57:02 UTC (rev 2232)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.0.1.ebuild	2012-09-27 10:19:56 UTC (rev 2233)
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib scons-utils
-RESTRICT="mirror"
-
-DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
-HOMEPAGE="http://www.ffado.org";
-SRC_URI="http://www.ffado.org/files/${P}.tar.gz";
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug qt4"
-
-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
-	qt4? (
-		|| ( ( x11-libs/qt-core x11-libs/qt-gui )
-				>=x11-libs/qt-4.0:4 )
-		dev-python/PyQt4
-		>=dev-python/dbus-python-0.83.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/scons"
-
-src_configure () {
-	local myconf=""
-
-	use debug \
-		&& myconf="${myconf} DEBUG=True ENABLE_OPTIMIZATIONS=False" \
-		|| myconf="${myconf} DEBUG=False ENABLE_OPTIMIZATIONS=True"
-}
-
-src_compile () {
-	addpredict /dev/snd # workaround because jackd --version is called after
-						# compilation, that tries to use /dev/snd/control*
-	escons \
-		PREFIX=/usr \
-		LIBDIR=/usr/$(get_libdir) \
-		${myconf} || die
-}
-
-src_install () {
-	escons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install || die
-	dodoc AUTHORS ChangeLog README
-
-	if use qt4; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Important: This version of FFADO works on the new firewire-stack,"
-	ewarn "and no longer needs the raw1394/ohci1394/ieee1394 modules."
-}

Added: trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.1.0.ebuild	2012-09-27 10:19:56 UTC (rev 2233)
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3.*"
+inherit scons-utils eutils toolchain-funcs flag-o-matic multilib python
+
+DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
+HOMEPAGE="http://www.ffado.org";
+SRC_URI="http://www.ffado.org/files/${P}.tgz";
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug qt4 +test-programs"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.6.13
+	>=dev-libs/dbus-c++-0.9.0
+	>=dev-libs/libconfig-1.4.8
+	>=media-libs/alsa-lib-1.0.0
+	>=media-libs/libiec61883-1.1.0
+	>=sys-apps/dbus-1.0
+	>=sys-libs/libraw1394-2.0.7
+	>=sys-libs/libavc1394-0.5.3
+	qt4? ( dev-python/PyQt4
+		   >=dev-python/dbus-python-0.83.0 )"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	virtual/pkgconfig"
+
+RESTRICT="mirror"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}/*.patch
+	python_convert_shebangs -r 2 .
+}
+
+src_configure() {
+	myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		$(use_scons debug DEBUG)
+		$(use_scons test-programs BUILD_TESTS)
+		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
+		# -fomit-frame-pointer is added also which can cripple debugging.
+		# we set flags from portage instead
+		ENABLE_OPTIMIZATIONS=False
+	)
+}
+
+src_compile () {
+	# workaround because jackd --version is called that tries to use
+	# /dev/snd/control*
+	addpredict /dev/snd
+
+	tc-export CC CXX
+	escons
+}
+
+src_install () {
+	escons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
+	dodoc AUTHORS ChangeLog README
+
+	if use qt4; then
+		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
+		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize ffado
+	python_mod_optimize "${EPREFIX}/usr/share/${PN}/python"
+}
+
+pkg_postrm() {
+	python_mod_cleanup ffado
+	python_mod_cleanup "${EPREFIX}/usr/share/${PN}/python"
+}

Modified: trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild	2012-09-26 14:57:02 UTC (rev 2232)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild	2012-09-27 10:19:56 UTC (rev 2233)
@@ -3,59 +3,84 @@
 # $Header: $
 
 EAPI=4
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3.*"
+inherit scons-utils eutils toolchain-funcs multilib python subversion
 
-inherit eutils multilib scons-utils subversion
-
 DESCRIPTION="Successor for freebob: Library for accessing BeBoB IEEE1394 devices"
 HOMEPAGE="http://www.ffado.org";
-
 ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/libffado";
 
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="debug qt4 dbus-server"
+IUSE="debug qt4 +test-programs"
 
-RDEPEND=">=media-libs/alsa-lib-1.0.0
-	>=dev-cpp/libxmlpp-2.13.0
-	>=sys-libs/libraw1394-1.3.0
+RESTRICT="mirror"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.6.13
+	>=dev-libs/dbus-c++-0.9.0
+	>=dev-libs/libconfig-1.4.8
+	>=media-libs/alsa-lib-1.0.0
 	>=media-libs/libiec61883-1.1.0
+	>=sys-apps/dbus-1.0
+	>=sys-libs/libraw1394-2.0.7
 	>=sys-libs/libavc1394-0.5.3
-	>=sys-apps/dbus-1.0
-	dbus-server? ( dev-libs/dbus-c++ )
-	dev-libs/libconfig
-	qt4? (
-		|| ( ( x11-libs/qt-core x11-libs/qt-gui )
-				>=x11-libs/qt-4.0:4 )
-		dev-python/PyQt4
-		>=dev-python/dbus-python-0.83.0 )"
-
+	qt4? ( dev-python/PyQt4
+		   >=dev-python/dbus-python-0.83.0 )"
 DEPEND="${RDEPEND}
-	dev-util/scons"
+	dev-util/scons
+	virtual/pkgconfig"
 
-src_configure () {
-	local myconf=""
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
-	use debug \
-		&& myconf="${myconf} DEBUG=True ENABLE_OPTIMIZATIONS=False" \
-		|| myconf="${myconf} DEBUG=False ENABLE_OPTIMIZATIONS=True"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}/*.patch
+	python_convert_shebangs -r 2 .
 }
 
+src_configure() {
+	myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		$(use_scons debug DEBUG)
+		$(use_scons test-programs BUILD_TESTS)
+		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
+		# -fomit-frame-pointer is added also which can cripple debugging.
+		# we set flags from portage instead
+		ENABLE_OPTIMIZATIONS=False
+	)
+}
+
 src_compile () {
-	addpredict /dev/snd # workaround because jackd --version is called after
-						# compilation, that tries to use /dev/snd/control*
-	escons \
-		PREFIX=/usr \
-		LIBDIR=/usr/$(get_libdir) \
-		${myconf} || die
+	# workaround because jackd --version is called that tries to use
+	# /dev/snd/control*
+	addpredict /dev/snd
+
+	tc-export CC CXX
+	escons
 }
 
 src_install () {
-	escons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	escons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
+	dodoc AUTHORS ChangeLog README
 
 	if use qt4; then
 		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
 		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
 	fi
 }
+
+pkg_postinst() {
+	python_mod_optimize ffado
+	python_mod_optimize "${EPREFIX}/usr/share/${PN}/python"
+}
+
+pkg_postrm() {
+	python_mod_cleanup ffado
+	python_mod_cleanup "${EPREFIX}/usr/share/${PN}/python"
+}

Modified: trunk/overlays/proaudio/media-libs/libffado/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/metadata.xml	2012-09-26 14:57:02 UTC (rev 2232)
+++ trunk/overlays/proaudio/media-libs/libffado/metadata.xml	2012-09-27 10:19:56 UTC (rev 2233)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>
 	</maintainer>
+	<use>
+		<flag name="test-programs">Install programs for testing of various ffado functions</flag>
+	</use>
 </pkgmetadata>


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/