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 6AF3859CA3 for ; Sat, 12 Mar 2016 13:17:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B5BC21C00A; Sat, 12 Mar 2016 13:17:23 +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 A83A621C00A for ; Sat, 12 Mar 2016 13:17:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 89622340AE4 for ; Sat, 12 Mar 2016 13:17:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B107C15F5 for ; Sat, 12 Mar 2016 13:17:18 +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: <1457788615.8e969381dec835a6c6b75fa80bba1eef93957bf4.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/quassel/metadata.xml net-irc/quassel/quassel-0.12.2-r3.ebuild net-irc/quassel/quassel-0.12.3-r1.ebuild net-irc/quassel/quassel-0.12.3.ebuild 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: 8e969381dec835a6c6b75fa80bba1eef93957bf4 X-VCS-Branch: master Date: Sat, 12 Mar 2016 13:17:18 +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: 152d17a1-c01f-471c-8be6-3258daf83384 X-Archives-Hash: 83ad21ccce0eb212c9c64f452e6e3380 commit: 8e969381dec835a6c6b75fa80bba1eef93957bf4 Author: Johannes Huber gentoo org> AuthorDate: Sat Mar 12 13:16:32 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Mar 12 13:16:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e969381 net-irc/quassel: Add use flag snorenotify Gentoo-bug: 574496 Reported-by: Michael Palimaka gentoo.org> Package-Manager: portage-2.2.28 net-irc/quassel/metadata.xml | 3 +++ net-irc/quassel/quassel-0.12.2-r3.ebuild | 2 +- ...{quassel-0.12.2-r3.ebuild => quassel-0.12.3-r1.ebuild} | 15 +++++++-------- net-irc/quassel/quassel-0.12.3.ebuild | 2 +- net-irc/quassel/quassel-9999.ebuild | 10 +++++++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml index f6e13ea..096fe54 100644 --- a/net-irc/quassel/metadata.xml +++ b/net-irc/quassel/metadata.xml @@ -26,6 +26,9 @@ used. You need this enabled on the server, but you might want to disable it on the client. + + Support for snore notification framework. + Use qt-webkit rendering engine for showing URL thumbnails and for other things that need web browser integration. diff --git a/net-irc/quassel/quassel-0.12.2-r3.ebuild b/net-irc/quassel/quassel-0.12.2-r3.ebuild index a11aa28..a3f5744 100644 --- a/net-irc/quassel/quassel-0.12.2-r3.ebuild +++ b/net-irc/quassel/quassel-0.12.2-r3.ebuild @@ -63,7 +63,7 @@ GUI_RDEPEND=" dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 - kde-frameworks/oxygen-icons + kde-frameworks/oxygen-icons:* ayatana? ( kde-misc/plasma-widget-message-indicator ) ) ) diff --git a/net-irc/quassel/quassel-0.12.2-r3.ebuild b/net-irc/quassel/quassel-0.12.3-r1.ebuild similarity index 95% copy from net-irc/quassel/quassel-0.12.2-r3.ebuild copy to net-irc/quassel/quassel-0.12.3-r1.ebuild index a11aa28..82a7f06 100644 --- a/net-irc/quassel/quassel-0.12.2-r3.ebuild +++ b/net-irc/quassel/quassel-0.12.3-r1.ebuild @@ -14,9 +14,10 @@ HOMEPAGE="http://quassel-irc.org/" [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2" LICENSE="GPL-3" -KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris" +KEYWORDS="~amd64 ~amd64-linux ~sparc-solaris" SLOT="0" -IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X" +IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +snorenotify +ssl syslog webkit X" SERVER_RDEPEND=" qt5? ( @@ -53,6 +54,7 @@ GUI_RDEPEND=" kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5] ) + snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) !qt5? ( @@ -63,7 +65,7 @@ GUI_RDEPEND=" dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 - kde-frameworks/oxygen-icons + kde-frameworks/oxygen-icons:* ayatana? ( kde-misc/plasma-widget-message-indicator ) ) ) @@ -97,11 +99,6 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog README ) -PATCHES=( - "${FILESDIR}/${P}-qt55.patch" - "${FILESDIR}/${P}-CVE-2015-8547.patch" -) - REQUIRED_USE=" || ( X server monolithic ) ayatana? ( || ( X monolithic ) ) @@ -111,6 +108,7 @@ REQUIRED_USE=" phonon? ( || ( X monolithic ) ) postgres? ( || ( server monolithic ) ) qt5? ( !ayatana ) + snorenotify? ( qt5 || ( X monolithic ) ) syslog? ( || ( server monolithic ) ) webkit? ( || ( X monolithic ) ) " @@ -139,6 +137,7 @@ src_configure() { $(cmake-utils_use_find_package phonon Phonon4Qt5) $(cmake-utils_use_use qt5) $(cmake-utils_use_want server CORE) + $(cmake-utils_use_find_package snorenotify LibsnoreQt5) $(cmake-utils_use_with webkit) $(cmake-utils_use_want X QTCLIENT) -DEMBED_DATA=OFF diff --git a/net-irc/quassel/quassel-0.12.3.ebuild b/net-irc/quassel/quassel-0.12.3.ebuild index ffede26..793d905 100644 --- a/net-irc/quassel/quassel-0.12.3.ebuild +++ b/net-irc/quassel/quassel-0.12.3.ebuild @@ -63,7 +63,7 @@ GUI_RDEPEND=" dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 - kde-frameworks/oxygen-icons + kde-frameworks/oxygen-icons:* ayatana? ( kde-misc/plasma-widget-message-indicator ) ) ) diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index d55c1a8..cdca48c 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,8 @@ HOMEPAGE="http://quassel-irc.org/" LICENSE="GPL-3" KEYWORDS="" SLOT="0" -IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X" +IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +snorenotify +ssl syslog webkit X" SERVER_RDEPEND=" qt5? ( @@ -53,6 +54,7 @@ GUI_RDEPEND=" kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5] ) + snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) webkit? ( dev-qt/qtwebkit:5 ) ) !qt5? ( @@ -63,7 +65,7 @@ GUI_RDEPEND=" dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 - kde-frameworks/oxygen-icons + kde-frameworks/oxygen-icons:* ayatana? ( kde-misc/plasma-widget-message-indicator ) ) ) @@ -106,6 +108,7 @@ REQUIRED_USE=" phonon? ( || ( X monolithic ) ) postgres? ( || ( server monolithic ) ) qt5? ( !ayatana ) + snorenotify? ( qt5 || ( X monolithic ) ) syslog? ( || ( server monolithic ) ) webkit? ( || ( X monolithic ) ) " @@ -134,6 +137,7 @@ src_configure() { $(cmake-utils_use_find_package phonon Phonon4Qt5) $(cmake-utils_use_use qt5) $(cmake-utils_use_want server CORE) + $(cmake-utils_use_find_package snorenotify LibsnoreQt5) $(cmake-utils_use_with webkit) $(cmake-utils_use_want X QTCLIENT) -DEMBED_DATA=OFF