public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/
Date: Sat,  6 Jun 2015 23:48:44 +0000 (UTC)	[thread overview]
Message-ID: <1433634512.26bbc1a9ef749caab0c31682651f5462817bae5d.pesa@gentoo> (raw)

commit:     26bbc1a9ef749caab0c31682651f5462817bae5d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 23:48:32 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 23:48:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=26bbc1a9

[dev-qt/qtdemo] Sync.

Package-Manager: portage-2.2.20

 dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 49f9617..b612789 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -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}] )


             reply	other threads:[~2015-06-06 23:48 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-06 23:48 Davide Pesavento [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-12-31 13:06 [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/ Michael Palimaka
2014-07-08 19:33 Davide Pesavento
2014-05-27 22:59 Davide Pesavento
2013-07-25  9:13 Davide Pesavento

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1433634512.26bbc1a9ef749caab0c31682651f5462817bae5d.pesa@gentoo \
    --to=pesa@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox