1 |
commit: c96e81087ffa6f944548d2279c822f825065f220 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 3 16:43:32 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 3 17:01:39 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96e8108 |
7 |
|
8 |
net-irc/quassel: Drop USE=qt5, build with Qt5 unconditionally |
9 |
|
10 |
Acked-by: Patrick Lauer <patrick <AT> gentoo.org> |
11 |
Closes: https://bugs.gentoo.org/639608 |
12 |
Closes: https://bugs.gentoo.org/603074 |
13 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
14 |
|
15 |
net-irc/quassel/Manifest | 2 +- |
16 |
net-irc/quassel/quassel-0.12.4.ebuild | 92 +++++++++++------------------------ |
17 |
2 files changed, 30 insertions(+), 64 deletions(-) |
18 |
|
19 |
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest |
20 |
index 9b785e5065a..06198ad4ee5 100644 |
21 |
--- a/net-irc/quassel/Manifest |
22 |
+++ b/net-irc/quassel/Manifest |
23 |
@@ -1 +1 @@ |
24 |
-DIST quassel-0.12.4.tar.bz2 3742639 SHA256 93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92 WHIRLPOOL 13a6078aa8f0a3d039e9c240c870a13744b3eb3324f45508f62a37aa8da13c0b00f94f53fe2602762503459a1110e3796673c104397b37297390cc406f2eaa66 |
25 |
+DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2 SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92 |
26 |
|
27 |
diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild |
28 |
index 4b8e4eb39be..fea12b014b0 100644 |
29 |
--- a/net-irc/quassel/quassel-0.12.4.ebuild |
30 |
+++ b/net-irc/quassel/quassel-0.12.4.ebuild |
31 |
@@ -15,69 +15,43 @@ HOMEPAGE="http://quassel-irc.org/" |
32 |
LICENSE="GPL-3" |
33 |
KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris" |
34 |
SLOT="0" |
35 |
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server |
36 |
+IUSE="crypt dbus debug kde monolithic phonon postgres +server |
37 |
snorenotify +ssl syslog webkit X" |
38 |
|
39 |
SERVER_RDEPEND=" |
40 |
- qt5? ( |
41 |
- dev-qt/qtscript:5 |
42 |
- crypt? ( app-crypt/qca:2[qt5,ssl] ) |
43 |
- postgres? ( dev-qt/qtsql:5[postgres] ) |
44 |
- !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
45 |
- ) |
46 |
- !qt5? ( |
47 |
- dev-qt/qtscript:4 |
48 |
- crypt? ( app-crypt/qca:2[qt4,ssl] ) |
49 |
- postgres? ( dev-qt/qtsql:4[postgres] ) |
50 |
- !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
51 |
- ) |
52 |
+ dev-qt/qtscript:5 |
53 |
+ crypt? ( app-crypt/qca:2[qt5(+),ssl] ) |
54 |
+ postgres? ( dev-qt/qtsql:5[postgres] ) |
55 |
+ !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) |
56 |
syslog? ( virtual/logger ) |
57 |
" |
58 |
|
59 |
GUI_RDEPEND=" |
60 |
- qt5? ( |
61 |
- dev-qt/qtgui:5 |
62 |
- dev-qt/qtwidgets:5 |
63 |
- dbus? ( |
64 |
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] |
65 |
- dev-qt/qtdbus:5 |
66 |
- ) |
67 |
- kde? ( |
68 |
- kde-frameworks/kconfigwidgets:5 |
69 |
- kde-frameworks/kcoreaddons:5 |
70 |
- kde-frameworks/knotifications:5 |
71 |
- kde-frameworks/knotifyconfig:5 |
72 |
- kde-frameworks/ktextwidgets:5 |
73 |
- kde-frameworks/kwidgetsaddons:5 |
74 |
- kde-frameworks/kxmlgui:5 |
75 |
- kde-frameworks/sonnet:5 |
76 |
- ) |
77 |
- phonon? ( media-libs/phonon[qt5(+)] ) |
78 |
- snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) |
79 |
- webkit? ( dev-qt/qtwebkit:5 ) |
80 |
+ dev-qt/qtgui:5 |
81 |
+ dev-qt/qtwidgets:5 |
82 |
+ dbus? ( |
83 |
+ >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] |
84 |
+ dev-qt/qtdbus:5 |
85 |
) |
86 |
- !qt5? ( |
87 |
- dev-qt/qtgui:4 |
88 |
- ayatana? ( dev-libs/libindicate-qt ) |
89 |
- dbus? ( |
90 |
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4] |
91 |
- dev-qt/qtdbus:4 |
92 |
- kde? ( |
93 |
- kde-frameworks/kdelibs:4 |
94 |
- kde-frameworks/oxygen-icons:* |
95 |
- ) |
96 |
- ) |
97 |
- phonon? ( media-libs/phonon[qt4] ) |
98 |
+ kde? ( |
99 |
+ kde-frameworks/kconfigwidgets:5 |
100 |
+ kde-frameworks/kcoreaddons:5 |
101 |
+ kde-frameworks/knotifications:5 |
102 |
+ kde-frameworks/knotifyconfig:5 |
103 |
+ kde-frameworks/ktextwidgets:5 |
104 |
+ kde-frameworks/kwidgetsaddons:5 |
105 |
+ kde-frameworks/kxmlgui:5 |
106 |
+ kde-frameworks/sonnet:5 |
107 |
) |
108 |
+ phonon? ( media-libs/phonon[qt5(+)] ) |
109 |
+ snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) |
110 |
+ webkit? ( dev-qt/qtwebkit:5 ) |
111 |
" |
112 |
|
113 |
RDEPEND=" |
114 |
+ dev-qt/qtcore:5 |
115 |
+ dev-qt/qtnetwork:5[ssl?] |
116 |
sys-libs/zlib |
117 |
- qt5? ( |
118 |
- dev-qt/qtcore:5 |
119 |
- dev-qt/qtnetwork:5[ssl?] |
120 |
- ) |
121 |
- !qt5? ( dev-qt/qtcore:4[ssl?] ) |
122 |
monolithic? ( |
123 |
${SERVER_RDEPEND} |
124 |
${GUI_RDEPEND} |
125 |
@@ -88,26 +62,22 @@ RDEPEND=" |
126 |
) |
127 |
" |
128 |
DEPEND="${RDEPEND} |
129 |
- qt5? ( |
130 |
- dev-qt/linguist-tools:5 |
131 |
- kde-frameworks/extra-cmake-modules |
132 |
- ) |
133 |
+ dev-qt/linguist-tools:5 |
134 |
+ kde-frameworks/extra-cmake-modules |
135 |
" |
136 |
|
137 |
DOCS=( AUTHORS ChangeLog README ) |
138 |
|
139 |
REQUIRED_USE=" |
140 |
|| ( X server monolithic ) |
141 |
- ayatana? ( || ( X monolithic ) ) |
142 |
crypt? ( || ( server monolithic ) ) |
143 |
dbus? ( || ( X monolithic ) ) |
144 |
kde? ( || ( X monolithic ) phonon ) |
145 |
phonon? ( || ( X monolithic ) ) |
146 |
postgres? ( || ( server monolithic ) ) |
147 |
- qt5? ( !ayatana ) |
148 |
- snorenotify? ( qt5 || ( X monolithic ) ) |
149 |
+ snorenotify? ( || ( X monolithic ) ) |
150 |
syslog? ( || ( server monolithic ) ) |
151 |
- webkit? ( qt5 || ( X monolithic ) ) |
152 |
+ webkit? ( || ( X monolithic ) ) |
153 |
" |
154 |
|
155 |
pkg_setup() { |
156 |
@@ -122,17 +92,13 @@ pkg_setup() { |
157 |
|
158 |
src_configure() { |
159 |
local mycmakeargs=( |
160 |
- $(cmake-utils_use_find_package ayatana IndicateQt) |
161 |
- $(cmake-utils_use_find_package crypt QCA2) |
162 |
$(cmake-utils_use_find_package crypt QCA2-QT5) |
163 |
- $(cmake-utils_use_find_package dbus dbusmenu-qt) |
164 |
$(cmake-utils_use_find_package dbus dbusmenu-qt5) |
165 |
-DWITH_KDE=$(usex kde) |
166 |
-DWITH_OXYGEN=$(usex !kde) |
167 |
-DWANT_MONO=$(usex monolithic) |
168 |
- $(cmake-utils_use_find_package phonon Phonon) |
169 |
$(cmake-utils_use_find_package phonon Phonon4Qt5) |
170 |
- -DUSE_QT5=$(usex qt5) |
171 |
+ -DUSE_QT5=ON |
172 |
-DWANT_CORE=$(usex server) |
173 |
$(cmake-utils_use_find_package snorenotify LibsnoreQt5) |
174 |
-DWITH_WEBKIT=$(usex webkit) |