Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/
Date: Mon, 04 Apr 2022 20:51:10
Message-Id: 1649105450.fdcf296d108e3bfa43a8aff8b8bad4eb13fff277.sam@gentoo
1 commit: fdcf296d108e3bfa43a8aff8b8bad4eb13fff277
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 4 20:50:39 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 4 20:50:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdcf296d
7
8 net-irc/quassel: switch to USE=gui
9
10 As per QA policy.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 net-irc/quassel/quassel-0.14.0-r1.ebuild | 14 +++++++-------
15 net-irc/quassel/quassel-9999.ebuild | 14 +++++++-------
16 2 files changed, 14 insertions(+), 14 deletions(-)
17
18 diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild b/net-irc/quassel/quassel-0.14.0-r1.ebuild
19 index d6aa1c14902d..41f4015cd383 100644
20 --- a/net-irc/quassel/quassel-0.14.0-r1.ebuild
21 +++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild
22 @@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"
23
24 LICENSE="GPL-3"
25 SLOT="0"
26 -IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
27 +IUSE="bundled-icons crypt +dbus debug gui kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview"
28 RESTRICT="!test? ( test )"
29
30 SERVER_DEPEND="acct-group/quassel
31 @@ -68,7 +68,7 @@ DEPEND=">=dev-libs/boost-1.54:=
32 )
33 !monolithic? (
34 server? ( ${SERVER_DEPEND} )
35 - X? ( ${GUI_DEPEND} )
36 + gui? ( ${GUI_DEPEND} )
37 )"
38 RDEPEND="${DEPEND}"
39 BDEPEND="dev-qt/linguist-tools:5
40 @@ -78,13 +78,13 @@ DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"
41
42 DOCS=( AUTHORS ChangeLog README.md )
43
44 -REQUIRED_USE="|| ( X server monolithic )
45 +REQUIRED_USE="|| ( gui server monolithic )
46 crypt? ( || ( server monolithic ) )
47 kde? ( dbus spell )
48 ldap? ( || ( server monolithic ) )
49 postgres? ( || ( server monolithic ) )
50 - snorenotify? ( || ( X monolithic ) )
51 - spell? ( || ( X monolithic ) )
52 + snorenotify? ( || ( gui monolithic ) )
53 + spell? ( || ( gui monolithic ) )
54 syslog? ( || ( server monolithic ) )"
55
56 PATCHES=(
57 @@ -105,10 +105,10 @@ src_configure() {
58 -DWITH_OXYGEN_ICONS=$(usex oxygen)
59 -DWANT_CORE=$(usex server)
60 -DWITH_WEBENGINE=$(usex urlpreview)
61 - -DWANT_QTCLIENT=$(usex X)
62 + -DWANT_QTCLIENT=$(usex gui)
63 )
64
65 - if use X || use monolithic ; then
66 + if use gui || use monolithic ; then
67 # We can't always pass these (avoid "unused" warning)
68 # bug #830708
69 mycmakeargs+=(
70
71 diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
72 index b00f930b98b5..ebbf78af53cb 100644
73 --- a/net-irc/quassel/quassel-9999.ebuild
74 +++ b/net-irc/quassel/quassel-9999.ebuild
75 @@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"
76
77 LICENSE="GPL-3"
78 SLOT="0"
79 -IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
80 +IUSE="bundled-icons crypt +dbus debug gui kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview"
81 RESTRICT="!test? ( test )"
82
83 SERVER_DEPEND="acct-group/quassel
84 @@ -68,7 +68,7 @@ DEPEND=">=dev-libs/boost-1.54:=
85 )
86 !monolithic? (
87 server? ( ${SERVER_DEPEND} )
88 - X? ( ${GUI_DEPEND} )
89 + gui? ( ${GUI_DEPEND} )
90 )"
91 RDEPEND="${DEPEND}"
92 BDEPEND="dev-qt/linguist-tools:5
93 @@ -78,13 +78,13 @@ DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"
94
95 DOCS=( AUTHORS ChangeLog README.md )
96
97 -REQUIRED_USE="|| ( X server monolithic )
98 +REQUIRED_USE="|| ( gui server monolithic )
99 crypt? ( || ( server monolithic ) )
100 kde? ( dbus spell )
101 ldap? ( || ( server monolithic ) )
102 postgres? ( || ( server monolithic ) )
103 - snorenotify? ( || ( X monolithic ) )
104 - spell? ( || ( X monolithic ) )
105 + snorenotify? ( || ( gui monolithic ) )
106 + spell? ( || ( gui monolithic ) )
107 syslog? ( || ( server monolithic ) )"
108
109 src_configure() {
110 @@ -101,10 +101,10 @@ src_configure() {
111 -DWITH_OXYGEN_ICONS=$(usex oxygen)
112 -DWANT_CORE=$(usex server)
113 -DWITH_WEBENGINE=$(usex urlpreview)
114 - -DWANT_QTCLIENT=$(usex X)
115 + -DWANT_QTCLIENT=$(usex gui)
116 )
117
118 - if use X || use monolithic ; then
119 + if use gui || use monolithic ; then
120 # We can't always pass these (avoid "unused" warning)
121 # bug #830708
122 mycmakeargs+=(