public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
Date: Tue, 21 Jun 2016 19:44:53 +0000 (UTC)	[thread overview]
Message-ID: <1466538254.f0610279bd96a389ca77792ea7b504fa97f3b326.johu@gentoo> (raw)

commit:     f0610279bd96a389ca77792ea7b504fa97f3b326
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 19:44:14 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 19:44:14 2016 +0000
URL:        https://gitweb.gentoo.org/dev/johu.git/commit/?id=f0610279

net-irc/quassel: Update use phonon

Upstream commit 680565f39c50f27cc339cb3e96bbd0abc6f47144

Package-Manager: portage-2.3.0_rc1

 net-irc/quassel/quassel-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index ddd1fea..1638c24 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -54,6 +54,7 @@ GUI_RDEPEND="
 			kde-frameworks/sonnet:5
 		)
 		phonon? ( media-libs/phonon[qt5] )
+		!phonon? ( dev-qt/qtmultimedia:5 )
 		snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
 		webkit? ( dev-qt/qtwebkit:5 )
 	)
@@ -104,7 +105,7 @@ REQUIRED_USE="
 	ayatana? ( || ( X monolithic ) )
 	crypt? ( || ( server monolithic ) )
 	dbus? ( || ( X monolithic ) )
-	kde? ( || ( X monolithic ) phonon )
+	kde? ( || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	qt5? ( !ayatana )
@@ -135,6 +136,7 @@ src_configure() {
 		-DWANT_MONO=$(usex monolithic)
 		$(cmake-utils_use_find_package phonon Phonon)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package !phonon Qt5Multimedia)
 		-DUSE_QT5=$(usex qt5)
 		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)


             reply	other threads:[~2016-06-21 19:45 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-21 19:44 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-10-12 19:33 [gentoo-commits] dev/johu:master commit in: net-irc/quassel/ Johannes Huber
2016-07-24  9:48 Johannes Huber
2016-03-28 16:03 Johannes Huber
2016-03-12 13:36 Johannes Huber
2016-03-09 22:39 Johannes Huber
2015-08-25 19:06 Johannes Huber
2015-08-16 21:30 Johannes Huber
2015-06-19 22:33 Johannes Huber
2015-02-22 21:59 Johannes Huber
2015-02-16 22:02 Johannes Huber
2015-02-15 22:05 Johannes Huber
2015-02-11 21:13 Johannes Huber
2015-01-24 19:36 Johannes Huber
2014-09-13 14:45 Johannes Huber
2014-04-02 17:25 Johannes Huber
2014-04-01  9:24 Johannes Huber
2014-04-01  9:21 Johannes Huber
2014-04-01  9:18 Johannes Huber
2014-04-01  9:15 Johannes Huber
2014-04-01  9:11 Johannes Huber

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=1466538254.f0610279bd96a389ca77792ea7b504fa97f3b326.johu@gentoo \
    --to=johu@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