[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/ - 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:	Wed, 13 Oct 2021 00:25:46
Message-Id:	`1634084726.8a4f273e5c7e1c990b59954691b7f12d1c0d7f5c.sam@gentoo`

1

commit:     8a4f273e5c7e1c990b59954691b7f12d1c0d7f5c

2

Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>

3

AuthorDate: Sat Oct  9 19:13:26 2021 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Wed Oct 13 00:25:26 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4f273e

7

8

net-irc/quassel: add spell support without full kde

9

10

Add new use flag "spell" for enabling spell checking without full

11

KDE integration. KF5Sonnet is categorized as "Optional KF5 tier1

12

component" and can be used without full KDE, if find_package finds

13

it.

14

Using this new USE flag we disable automagic dependency on KF5Sonnet

15

if it is installed during build.

16

17

Changed REQUIRED_USE so that kde depends on spell, and spell depends

18

on some kind of gui.

19

20

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

21

Closes: https://github.com/gentoo/gentoo/pull/22531

22

Signed-off-by: Sam James <sam <AT> gentoo.org>

23

24

 net-irc/quassel/quassel-0.13.1-r2.ebuild | 8 +++++---

25

 net-irc/quassel/quassel-0.14_rc2.ebuild  | 8 +++++---

26

 net-irc/quassel/quassel-9999.ebuild      | 8 +++++---

27

 3 files changed, 15 insertions(+), 9 deletions(-)

28

29

diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild

30

index 5a78333a8ff..c51a64ccdef 100644

31

--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild

32

+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild

33

@@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/"

34

 LICENSE="GPL-3"

35

 SLOT="0"

36

 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server

37

-snorenotify +ssl syslog urlpreview X"

38

+snorenotify spell +ssl syslog urlpreview X"

39

40

 SERVER_DEPEND="

41

 	acct-group/quassel

42

@@ -53,9 +53,9 @@ GUI_DEPEND="

43

 		kde-frameworks/ktextwidgets:5

44

 		kde-frameworks/kwidgetsaddons:5

45

 		kde-frameworks/kxmlgui:5

46

-		kde-frameworks/sonnet:5

47

)

48

 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )

49

+	spell? ( kde-frameworks/sonnet:5 )

50

 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )

51

"

52

53

@@ -83,10 +83,11 @@ DOCS=( AUTHORS ChangeLog README.md )

54

 REQUIRED_USE="

55

 	|| ( X server monolithic )

56

 	crypt? ( || ( server monolithic ) )

57

-	kde? ( || ( X monolithic ) dbus )

58

+	kde? ( dbus spell )

59

 	ldap? ( || ( server monolithic ) )

60

 	postgres? ( || ( server monolithic ) )

61

 	snorenotify? ( || ( X monolithic ) )

62

+	spell? ( || ( X monolithic ) )

63

 	syslog? ( || ( server monolithic ) )

64

"

65

66

@@ -109,6 +110,7 @@ src_configure() {

67

 		-DWITH_OXYGEN_ICONS=$(usex oxygen)

68

 		-DWANT_CORE=$(usex server)

69

 		$(cmake_use_find_package snorenotify LibsnoreQt5)

70

+		$(cmake_use_find_package spell KF5Sonnet)

71

 		-DWITH_WEBENGINE=$(usex urlpreview)

72

 		-DWANT_QTCLIENT=$(usex X)

73

)

74

75

diff --git a/net-irc/quassel/quassel-0.14_rc2.ebuild b/net-irc/quassel/quassel-0.14_rc2.ebuild

76

index c8177a7e394..fce90ab6e53 100644

77

--- a/net-irc/quassel/quassel-0.14_rc2.ebuild

78

+++ b/net-irc/quassel/quassel-0.14_rc2.ebuild

79

@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"

80

81

 LICENSE="GPL-3"

82

 SLOT="0"

83

-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify syslog test urlpreview X"

84

+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"

85

 # Can't seem to find itself (libraries)

86

 RESTRICT="!test? ( test ) test"

87

88

@@ -55,9 +55,9 @@ GUI_DEPEND="dev-qt/qtgui:5

89

 		kde-frameworks/ktextwidgets:5

90

 		kde-frameworks/kwidgetsaddons:5

91

 		kde-frameworks/kxmlgui:5

92

-		kde-frameworks/sonnet:5

93

)

94

 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )

95

+	spell? ( kde-frameworks/sonnet:5 )

96

 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )"

97

 DEPEND=">=dev-libs/boost-1.54:=

98

 	dev-qt/qtcore:5

99

@@ -79,10 +79,11 @@ DOCS=( AUTHORS ChangeLog README.md )

100

101

 REQUIRED_USE="|| ( X server monolithic )

102

 	crypt? ( || ( server monolithic ) )

103

-	kde? ( || ( X monolithic ) dbus )

104

+	kde? ( dbus spell )

105

 	ldap? ( || ( server monolithic ) )

106

 	postgres? ( || ( server monolithic ) )

107

 	snorenotify? ( || ( X monolithic ) )

108

+	spell? ( || ( X monolithic ) )

109

 	syslog? ( || ( server monolithic ) )"

110

111

 src_configure() {

112

@@ -101,6 +102,7 @@ src_configure() {

113

 		-DWITH_OXYGEN_ICONS=$(usex oxygen)

114

 		-DWANT_CORE=$(usex server)

115

 		$(cmake_use_find_package snorenotify LibsnoreQt5)

116

+		$(cmake_use_find_package spell KF5Sonnet)

117

 		-DWITH_WEBENGINE=$(usex urlpreview)

118

 		-DWANT_QTCLIENT=$(usex X)

119

)

120

121

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild

122

index c8177a7e394..fce90ab6e53 100644

123

--- a/net-irc/quassel/quassel-9999.ebuild

124

+++ b/net-irc/quassel/quassel-9999.ebuild

125

@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"

126

127

 LICENSE="GPL-3"

128

 SLOT="0"

129

-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify syslog test urlpreview X"

130

+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"

131

 # Can't seem to find itself (libraries)

132

 RESTRICT="!test? ( test ) test"

133

134

@@ -55,9 +55,9 @@ GUI_DEPEND="dev-qt/qtgui:5

135

 		kde-frameworks/ktextwidgets:5

136

 		kde-frameworks/kwidgetsaddons:5

137

 		kde-frameworks/kxmlgui:5

138

-		kde-frameworks/sonnet:5

139

)

140

 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )

141

+	spell? ( kde-frameworks/sonnet:5 )

142

 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )"

143

 DEPEND=">=dev-libs/boost-1.54:=

144

 	dev-qt/qtcore:5

145

@@ -79,10 +79,11 @@ DOCS=( AUTHORS ChangeLog README.md )

146

147

 REQUIRED_USE="|| ( X server monolithic )

148

 	crypt? ( || ( server monolithic ) )

149

-	kde? ( || ( X monolithic ) dbus )

150

+	kde? ( dbus spell )

151

 	ldap? ( || ( server monolithic ) )

152

 	postgres? ( || ( server monolithic ) )

153

 	snorenotify? ( || ( X monolithic ) )

154

+	spell? ( || ( X monolithic ) )

155

 	syslog? ( || ( server monolithic ) )"

156

157

 src_configure() {

158

@@ -101,6 +102,7 @@ src_configure() {

159

 		-DWITH_OXYGEN_ICONS=$(usex oxygen)

160

 		-DWANT_CORE=$(usex server)

161

 		$(cmake_use_find_package snorenotify LibsnoreQt5)

162

+		$(cmake_use_find_package spell KF5Sonnet)

163

 		-DWITH_WEBENGINE=$(usex urlpreview)

164

 		-DWANT_QTCLIENT=$(usex X)

165

)

1	commit: 8a4f273e5c7e1c990b59954691b7f12d1c0d7f5c
2	Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3	AuthorDate: Sat Oct 9 19:13:26 2021 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Wed Oct 13 00:25:26 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4f273e
7
8	net-irc/quassel: add spell support without full kde
9
10	Add new use flag "spell" for enabling spell checking without full
11	KDE integration. KF5Sonnet is categorized as "Optional KF5 tier1
12	component" and can be used without full KDE, if find_package finds
13	it.
14	Using this new USE flag we disable automagic dependency on KF5Sonnet
15	if it is installed during build.
16
17	Changed REQUIRED_USE so that kde depends on spell, and spell depends
18	on some kind of gui.
19
20	Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
21	Closes: https://github.com/gentoo/gentoo/pull/22531
22	Signed-off-by: Sam James <sam <AT> gentoo.org>
23
24	net-irc/quassel/quassel-0.13.1-r2.ebuild \| 8 +++++---
25	net-irc/quassel/quassel-0.14_rc2.ebuild \| 8 +++++---
26	net-irc/quassel/quassel-9999.ebuild \| 8 +++++---
27	3 files changed, 15 insertions(+), 9 deletions(-)
28
29	diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild
30	index 5a78333a8ff..c51a64ccdef 100644
31	--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
32	+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
33	@@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/"
34	LICENSE="GPL-3"
35	SLOT="0"
36	IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
37	-snorenotify +ssl syslog urlpreview X"
38	+snorenotify spell +ssl syslog urlpreview X"
39
40	SERVER_DEPEND="
41	acct-group/quassel
42	@@ -53,9 +53,9 @@ GUI_DEPEND="
43	kde-frameworks/ktextwidgets:5
44	kde-frameworks/kwidgetsaddons:5
45	kde-frameworks/kxmlgui:5
46	- kde-frameworks/sonnet:5
47	)
48	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
49	+ spell? ( kde-frameworks/sonnet:5 )
50	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
51	"
52
53	@@ -83,10 +83,11 @@ DOCS=( AUTHORS ChangeLog README.md )
54	REQUIRED_USE="
55	\|\| ( X server monolithic )
56	crypt? ( \|\| ( server monolithic ) )
57	- kde? ( \|\| ( X monolithic ) dbus )
58	+ kde? ( dbus spell )
59	ldap? ( \|\| ( server monolithic ) )
60	postgres? ( \|\| ( server monolithic ) )
61	snorenotify? ( \|\| ( X monolithic ) )
62	+ spell? ( \|\| ( X monolithic ) )
63	syslog? ( \|\| ( server monolithic ) )
64	"
65
66	@@ -109,6 +110,7 @@ src_configure() {
67	-DWITH_OXYGEN_ICONS=$(usex oxygen)
68	-DWANT_CORE=$(usex server)
69	$(cmake_use_find_package snorenotify LibsnoreQt5)
70	+ $(cmake_use_find_package spell KF5Sonnet)
71	-DWITH_WEBENGINE=$(usex urlpreview)
72	-DWANT_QTCLIENT=$(usex X)
73	)
74
75	diff --git a/net-irc/quassel/quassel-0.14_rc2.ebuild b/net-irc/quassel/quassel-0.14_rc2.ebuild
76	index c8177a7e394..fce90ab6e53 100644
77	--- a/net-irc/quassel/quassel-0.14_rc2.ebuild
78	+++ b/net-irc/quassel/quassel-0.14_rc2.ebuild
79	@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"
80
81	LICENSE="GPL-3"
82	SLOT="0"
83	-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify syslog test urlpreview X"
84	+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
85	# Can't seem to find itself (libraries)
86	RESTRICT="!test? ( test ) test"
87
88	@@ -55,9 +55,9 @@ GUI_DEPEND="dev-qt/qtgui:5
89	kde-frameworks/ktextwidgets:5
90	kde-frameworks/kwidgetsaddons:5
91	kde-frameworks/kxmlgui:5
92	- kde-frameworks/sonnet:5
93	)
94	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
95	+ spell? ( kde-frameworks/sonnet:5 )
96	urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
97	DEPEND=">=dev-libs/boost-1.54:=
98	dev-qt/qtcore:5
99	@@ -79,10 +79,11 @@ DOCS=( AUTHORS ChangeLog README.md )
100
101	REQUIRED_USE="\|\| ( X server monolithic )
102	crypt? ( \|\| ( server monolithic ) )
103	- kde? ( \|\| ( X monolithic ) dbus )
104	+ kde? ( dbus spell )
105	ldap? ( \|\| ( server monolithic ) )
106	postgres? ( \|\| ( server monolithic ) )
107	snorenotify? ( \|\| ( X monolithic ) )
108	+ spell? ( \|\| ( X monolithic ) )
109	syslog? ( \|\| ( server monolithic ) )"
110
111	src_configure() {
112	@@ -101,6 +102,7 @@ src_configure() {
113	-DWITH_OXYGEN_ICONS=$(usex oxygen)
114	-DWANT_CORE=$(usex server)
115	$(cmake_use_find_package snorenotify LibsnoreQt5)
116	+ $(cmake_use_find_package spell KF5Sonnet)
117	-DWITH_WEBENGINE=$(usex urlpreview)
118	-DWANT_QTCLIENT=$(usex X)
119	)
120
121	diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
122	index c8177a7e394..fce90ab6e53 100644
123	--- a/net-irc/quassel/quassel-9999.ebuild
124	+++ b/net-irc/quassel/quassel-9999.ebuild
125	@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"
126
127	LICENSE="GPL-3"
128	SLOT="0"
129	-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify syslog test urlpreview X"
130	+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
131	# Can't seem to find itself (libraries)
132	RESTRICT="!test? ( test ) test"
133
134	@@ -55,9 +55,9 @@ GUI_DEPEND="dev-qt/qtgui:5
135	kde-frameworks/ktextwidgets:5
136	kde-frameworks/kwidgetsaddons:5
137	kde-frameworks/kxmlgui:5
138	- kde-frameworks/sonnet:5
139	)
140	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
141	+ spell? ( kde-frameworks/sonnet:5 )
142	urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
143	DEPEND=">=dev-libs/boost-1.54:=
144	dev-qt/qtcore:5
145	@@ -79,10 +79,11 @@ DOCS=( AUTHORS ChangeLog README.md )
146
147	REQUIRED_USE="\|\| ( X server monolithic )
148	crypt? ( \|\| ( server monolithic ) )
149	- kde? ( \|\| ( X monolithic ) dbus )
150	+ kde? ( dbus spell )
151	ldap? ( \|\| ( server monolithic ) )
152	postgres? ( \|\| ( server monolithic ) )
153	snorenotify? ( \|\| ( X monolithic ) )
154	+ spell? ( \|\| ( X monolithic ) )
155	syslog? ( \|\| ( server monolithic ) )"
156
157	src_configure() {
158	@@ -101,6 +102,7 @@ src_configure() {
159	-DWITH_OXYGEN_ICONS=$(usex oxygen)
160	-DWANT_CORE=$(usex server)
161	$(cmake_use_find_package snorenotify LibsnoreQt5)
162	+ $(cmake_use_find_package spell KF5Sonnet)
163	-DWITH_WEBENGINE=$(usex urlpreview)
164	-DWANT_QTCLIENT=$(usex X)
165	)

Gentoo Archives: gentoo-commits