diff options
| -rw-r--r-- | x11-libs/qt-multimedia/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild | 11 | ||||
| -rw-r--r-- | x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild | 7 |
3 files changed, 15 insertions, 9 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/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}" |