diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-06-02 12:17:50 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-06-02 12:17:50 +0000 |
| commit | d78130d263ec5b87162f3cf3862cdba1a138b423 (patch) | |
| tree | 25732c436fdb02d4d56e49be6db838eba437f67f | |
| parent | Drop blockers for packages treecleaned more than 4 years ago. (diff) | |
| download | gentoo-2-d78130d263ec5b87162f3cf3862cdba1a138b423.tar.gz gentoo-2-d78130d263ec5b87162f3cf3862cdba1a138b423.tar.bz2 gentoo-2-d78130d263ec5b87162f3cf3862cdba1a138b423.zip | |
media-libs/phonon is multilib now.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
| -rw-r--r-- | dev-qt/qtdemo/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-qt/qtdemo/qtdemo-4.8.7.ebuild | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog index 615766616a9f..3847eb5d05b8 100644 --- a/dev-qt/qtdemo/ChangeLog +++ b/dev-qt/qtdemo/ChangeLog @@ -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 <pesa@gentoo.org> qtdemo-4.8.7.ebuild: + media-libs/phonon is multilib now. 30 May 2015; Markus Meier <maekke@gentoo.org> qtdemo-4.8.6-r1.ebuild: arm stable, bug #530238 diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild index 4486380733ac..c44214b8621a 100644 --- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild +++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild @@ -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 @@ DEPEND=" 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 @@ multilib_src_configure() { $(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) ) |