From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DDEF31382BE for ; Tue, 21 Jun 2016 19:45:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48820E08BD; Tue, 21 Jun 2016 19:44:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA3D3E08BD for ; Tue, 21 Jun 2016 19:44:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 905AE3406F2 for ; Tue, 21 Jun 2016 19:44:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40E9A241D for ; Tue, 21 Jun 2016 19:44:53 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1466538254.f0610279bd96a389ca77792ea7b504fa97f3b326.johu@gentoo> Subject: [gentoo-commits] dev/johu:master commit in: net-irc/quassel/ X-VCS-Repository: dev/johu X-VCS-Files: net-irc/quassel/quassel-9999.ebuild X-VCS-Directories: net-irc/quassel/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: f0610279bd96a389ca77792ea7b504fa97f3b326 X-VCS-Branch: master Date: Tue, 21 Jun 2016 19:44:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c94a7614-0426-41ee-9d0c-0a3f89c00cf3 X-Archives-Hash: 280b2709732376e82135eca6bcb299d6 commit: f0610279bd96a389ca77792ea7b504fa97f3b326 Author: Johannes Huber gentoo org> AuthorDate: Tue Jun 21 19:44:14 2016 +0000 Commit: Johannes Huber gentoo 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)