From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B6D57158086 for ; Wed, 13 Oct 2021 00:25:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B30BEE0839; Wed, 13 Oct 2021 00:25:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82A23E0839 for ; Wed, 13 Oct 2021 00:25:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D189342FFB for ; Wed, 13 Oct 2021 00:25:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7492EA for ; Wed, 13 Oct 2021 00:25:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1634084726.8a4f273e5c7e1c990b59954691b7f12d1c0d7f5c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/quassel/quassel-0.13.1-r2.ebuild net-irc/quassel/quassel-0.14_rc2.ebuild net-irc/quassel/quassel-9999.ebuild X-VCS-Directories: net-irc/quassel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8a4f273e5c7e1c990b59954691b7f12d1c0d7f5c X-VCS-Branch: master Date: Wed, 13 Oct 2021 00:25:41 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c0275530-4739-48dc-b053-2e9264ac0c21 X-Archives-Hash: 0029a3d528ae2f1a8b5b200c031816cf commit: 8a4f273e5c7e1c990b59954691b7f12d1c0d7f5c Author: Arthur Zamarin gentoo org> AuthorDate: Sat Oct 9 19:13:26 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 13 00:25:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4f273e net-irc/quassel: add spell support without full kde Add new use flag "spell" for enabling spell checking without full KDE integration. KF5Sonnet is categorized as "Optional KF5 tier1 component" and can be used without full KDE, if find_package finds it. Using this new USE flag we disable automagic dependency on KF5Sonnet if it is installed during build. Changed REQUIRED_USE so that kde depends on spell, and spell depends on some kind of gui. Signed-off-by: Arthur Zamarin gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22531 Signed-off-by: Sam James gentoo.org> net-irc/quassel/quassel-0.13.1-r2.ebuild | 8 +++++--- net-irc/quassel/quassel-0.14_rc2.ebuild | 8 +++++--- net-irc/quassel/quassel-9999.ebuild | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild index 5a78333a8ff..c51a64ccdef 100644 --- a/net-irc/quassel/quassel-0.13.1-r2.ebuild +++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/" LICENSE="GPL-3" SLOT="0" IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server -snorenotify +ssl syslog urlpreview X" +snorenotify spell +ssl syslog urlpreview X" SERVER_DEPEND=" acct-group/quassel @@ -53,9 +53,9 @@ GUI_DEPEND=" kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 - kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) + spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) " @@ -83,10 +83,11 @@ DOCS=( AUTHORS ChangeLog README.md ) REQUIRED_USE=" || ( X server monolithic ) crypt? ( || ( server monolithic ) ) - kde? ( || ( X monolithic ) dbus ) + kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) + spell? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) ) " @@ -109,6 +110,7 @@ src_configure() { -DWITH_OXYGEN_ICONS=$(usex oxygen) -DWANT_CORE=$(usex server) $(cmake_use_find_package snorenotify LibsnoreQt5) + $(cmake_use_find_package spell KF5Sonnet) -DWITH_WEBENGINE=$(usex urlpreview) -DWANT_QTCLIENT=$(usex X) ) diff --git a/net-irc/quassel/quassel-0.14_rc2.ebuild b/net-irc/quassel/quassel-0.14_rc2.ebuild index c8177a7e394..fce90ab6e53 100644 --- a/net-irc/quassel/quassel-0.14_rc2.ebuild +++ b/net-irc/quassel/quassel-0.14_rc2.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/" LICENSE="GPL-3" SLOT="0" -IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify syslog test urlpreview X" +IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X" # Can't seem to find itself (libraries) RESTRICT="!test? ( test ) test" @@ -55,9 +55,9 @@ GUI_DEPEND="dev-qt/qtgui:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 - kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) + spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] )" DEPEND=">=dev-libs/boost-1.54:= dev-qt/qtcore:5 @@ -79,10 +79,11 @@ DOCS=( AUTHORS ChangeLog README.md ) REQUIRED_USE="|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) - kde? ( || ( X monolithic ) dbus ) + kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) + spell? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )" src_configure() { @@ -101,6 +102,7 @@ src_configure() { -DWITH_OXYGEN_ICONS=$(usex oxygen) -DWANT_CORE=$(usex server) $(cmake_use_find_package snorenotify LibsnoreQt5) + $(cmake_use_find_package spell KF5Sonnet) -DWITH_WEBENGINE=$(usex urlpreview) -DWANT_QTCLIENT=$(usex X) ) diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index c8177a7e394..fce90ab6e53 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/" LICENSE="GPL-3" SLOT="0" -IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify syslog test urlpreview X" +IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X" # Can't seem to find itself (libraries) RESTRICT="!test? ( test ) test" @@ -55,9 +55,9 @@ GUI_DEPEND="dev-qt/qtgui:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 - kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) + spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] )" DEPEND=">=dev-libs/boost-1.54:= dev-qt/qtcore:5 @@ -79,10 +79,11 @@ DOCS=( AUTHORS ChangeLog README.md ) REQUIRED_USE="|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) - kde? ( || ( X monolithic ) dbus ) + kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) + spell? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )" src_configure() { @@ -101,6 +102,7 @@ src_configure() { -DWITH_OXYGEN_ICONS=$(usex oxygen) -DWANT_CORE=$(usex server) $(cmake_use_find_package snorenotify LibsnoreQt5) + $(cmake_use_find_package spell KF5Sonnet) -DWITH_WEBENGINE=$(usex urlpreview) -DWANT_QTCLIENT=$(usex X) )