Restore macos keywords, make alsa dep required only for linux, bug 293671.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 18 insertions, 12 deletions

diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog
index af1a4544b157..5431f16ff8c3 100644
--- a/x11-libs/qt-multimedia/ChangeLog
+++ b/x11-libs/qt-multimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-multimedia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.7 2010/01/19 14:51:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.8 2010/01/20 12:05:47 yngwin Exp $
+
+  20 Jan 2010; Ben de Groot <yngwin@gentoo.org>
+  qt-multimedia-4.6.0-r1.ebuild, qt-multimedia-4.6.1.ebuild:
+  Restore macos keywords, make alsa dep required only for linux, bug 293671.
 
 *qt-multimedia-4.6.1 (19 Jan 2010)
 
diff --git a/x11-libs/qt-multimedia/Manifest b/x11-libs/qt-multimedia/Manifest
index 5885753e47b3..7dea07131243 100644
--- a/x11-libs/qt-multimedia/Manifest
+++ b/x11-libs/qt-multimedia/Manifest
@@ -1,6 +1,6 @@
 DIST qt-everywhere-opensource-src-4.6.0.tar.gz 155679111 RMD160 7842b9f4a5364016677fc2162dfd31f1440bb05d SHA1 c2cbbde83f1ebac3b8dd13a112fcad757d395041 SHA256 55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
 DIST qt-everywhere-opensource-src-4.6.1.tar.gz 160197277 RMD160 7365dfe3c688df36002d2c9aaef6b79ba8175402 SHA1 d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 SHA256 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
-EBUILD qt-multimedia-4.6.0-r1.ebuild 1340 RMD160 3ddba69be2f7ef5e9b8f621e555da097a5ab4603 SHA1 9b49143b97a608cd54dae5a7c8027f647a08eb12 SHA256 abf2ca1b73c2ab4c4dccf580ea3f813653cfd4986c68bff31e039be932ee1fbb
-EBUILD qt-multimedia-4.6.1.ebuild 1337 RMD160 09de68bac612e6ac8e2799b4c37962103f75e37d SHA1 0ccc7c4e4176e448761ddb8e31435c3e330a9563 SHA256 e8e842b0286434e326dcf30ef24f3baea9f484f34018ca1fccc91db71939cf71
-MISC ChangeLog 1377 RMD160 59e23cd5e5d30440e87601907374689214351ca4 SHA1 24bba6ac9e7895cef84f13413e5367f87b70c7c4 SHA256 80f43bae8cb1c799adc5d3f6d28ef64113546ac9872a4eb53cda760c51a2c4bf
+EBUILD qt-multimedia-4.6.0-r1.ebuild 1432 RMD160 fbf6cfe111307b6b0ff71f6dcda31fc0b5458ba1 SHA1 da24bf76705c3a19324c64b388c6880fcc90c8f5 SHA256 4f653cb9be38afcfbf5f52cd343de3d53bb02ef15905648617bc8304038facb5
+EBUILD qt-multimedia-4.6.1.ebuild 1429 RMD160 1695238f0c8f8a02863a6e2721ca0d188a91b31e SHA1 6f6dc16e2ae5b899d492663dbf475f7db45139f2 SHA256 33c56d5df6bdba4062527680b0f0f2a12f1ad3ea073f3ef16907a59a440261a2
+MISC ChangeLog 1564 RMD160 90cd0eba7099b92680a9be0d5e92fc7dba56cb4f SHA1 bf56142083ae77bc49c33d9af82f5d3da12038bd SHA256 3d7d4e9ebeccfa43b6618f52fb983afdf8d7d515b255dcc9430aa8ee7e61b57f
 MISC metadata.xml 157 RMD160 26da5ad9d79f9c34cb5dc38bf9a9e194fcc14e67 SHA1 51a9aef22dbfaef0f17aed42fa2c7dc895d2a3b5 SHA256 8417491ad7d39dff202c22d0df65ca1a7675a670193ed7056c234fa83478dc31
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild
index 025c3e872ae9..fdce57a7723f 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild,v 1.2 2010/01/16 17:35:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild,v 1.3 2010/01/20 12:05:47 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build
 
 DESCRIPTION="The Qt multimedia module"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="iconv"
 
-DEPEND="media-libs/alsa-lib
+# currently supported audio backends are: alsa, mac, win32
+DEPEND="!aqua? ( media-libs/alsa-lib )
 	~x11-libs/qt-core-${PV}[aqua=,debug=]
 	~x11-libs/qt-gui-${PV}[aqua=,debug=]"
 RDEPEND="${DEPEND}"
@@ -35,8 +36,8 @@ src_configure() {
 		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
 		-no-xmlpatterns -no-freetype -no-libtiff  -no-accessibility -no-fontconfig
 		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
-		-no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle -no-phonon-backend -no-script
-		-no-scripttools -no-cups -no-xsync -no-xinput"
+		-no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle -no-phonon-backend
+		-no-script -no-scripttools -no-cups -no-xsync -no-xinput"
 
 	qt4-build_src_configure
 }
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild
index fdb00dbf9202..9902c13f3f99 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild,v 1.1 2010/01/19 14:51:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild,v 1.2 2010/01/20 12:05:47 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build
 
 DESCRIPTION="The Qt multimedia module"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="iconv"
 
-DEPEND="media-libs/alsa-lib
+# currently supported audio backends are: alsa, mac, win32
+DEPEND="!aqua? ( media-libs/alsa-lib )
 	~x11-libs/qt-core-${PV}[aqua=,debug=]
 	~x11-libs/qt-gui-${PV}[aqua=,debug=]"
 RDEPEND="${DEPEND}"