pesa 15/06/02 12:17:50 Modified: qtdemo-4.8.7.ebuild ChangeLog Log: media-libs/phonon is multilib now. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.2 dev-qt/qtdemo/qtdemo-4.8.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.7.ebuild?r1=1.1&r2=1.2 Index: qtdemo-4.8.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qtdemo-4.8.7.ebuild 26 May 2015 18:16:23 -0000 1.1 +++ qtdemo-4.8.7.ebuild 2 Jun 2015 12:17:50 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.7.ebuild,v 1.1 2015/05/26 18:16:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.7.ebuild,v 1.2 2015/06/02 12:17:50 pesa Exp $ EAPI=5 inherit qt4-build-multilib @@ -28,8 +28,11 @@ opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) phonon? ( - kde? ( media-libs/phonon[aqua=,qt4] ) - !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=,qt4] ) ) + kde? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] ) + !kde? ( || ( + ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] + >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] + ) ) ) webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) @@ -86,7 +89,7 @@ $(qt_use multimedia) -no-audio-backend $(qt_use opengl) $(qt_use openvg) - $(qt_native_use phonon) -no-phonon-backend + $(qt_use phonon) -no-phonon-backend $(qt_use webkit) $(qt_use xmlpatterns) ) 1.22 dev-qt/qtdemo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/ChangeLog?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/ChangeLog?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtdemo/ChangeLog?r1=1.21&r2=1.22 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ChangeLog 30 May 2015 11:07:30 -0000 1.21 +++ ChangeLog 2 Jun 2015 12:17:50 -0000 1.22 @@ -1,6 +1,9 @@ # ChangeLog for dev-qt/qtdemo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.21 2015/05/30 11:07:30 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.22 2015/06/02 12:17:50 pesa Exp $ + + 02 Jun 2015; Davide Pesavento <[email protected]> qtdemo-4.8.7.ebuild: + media-libs/phonon is multilib now. 30 May 2015; Markus Meier <[email protected]> qtdemo-4.8.6-r1.ebuild: arm stable, bug #530238
