Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
Date: Wed, 02 Apr 2014 17:26:02
Message-Id: 1396459547.d35b5a988f24b95d045fd7fba49b407a9f7e72de.johu@gentoo
1 commit: d35b5a988f24b95d045fd7fba49b407a9f7e72de
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 2 17:25:47 2014 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 2 17:25:47 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=d35b5a98
7
8 [net-irc/quassel] Add qt5 USE flag
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 net-irc/quassel/quassel-9999.ebuild | 99 +++++++++++++++++++++++--------------
14 1 file changed, 63 insertions(+), 36 deletions(-)
15
16 diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
17 index 797ee43..006e4d4 100644
18 --- a/net-irc/quassel/quassel-9999.ebuild
19 +++ b/net-irc/quassel/quassel-9999.ebuild
20 @@ -16,37 +16,61 @@ HOMEPAGE="http://quassel-irc.org/"
21 LICENSE="GPL-3"
22 KEYWORDS=""
23 SLOT="0"
24 -IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X"
25 +IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X"
26
27 SERVER_RDEPEND="
28 - dev-qt/qtscript:4
29 - crypt? (
30 - app-crypt/qca:2
31 - app-crypt/qca-ossl
32 + qt5? (
33 + dev-qt/qtscript:5
34 + postgres? ( dev-qt/qtsql:5[postgres] )
35 + !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
36 + )
37 + !qt5? (
38 + dev-qt/qtscript:4
39 + crypt? (
40 + app-crypt/qca:2
41 + app-crypt/qca-ossl
42 + )
43 + postgres? ( dev-qt/qtsql:4[postgres] )
44 + !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
45 )
46 - !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
47 - postgres? ( dev-qt/qtsql:4[postgres] )
48 syslog? ( virtual/logger )
49 "
50
51 GUI_RDEPEND="
52 - dev-qt/qtgui:4
53 - ayatana? ( dev-libs/libindicate-qt )
54 - dbus? (
55 - dev-qt/qtdbus:4
56 - dev-libs/libdbusmenu-qt
57 + qt5? (
58 + dev-qt/qtgui:5
59 + dev-qt/qtwidgets:5
60 + dbus? (
61 + dev-libs/libdbusmenu-qt[qt5(+)]
62 + dev-qt/qtdbus:5
63 + )
64 + phonon? ( media-libs/phonon[qt5] )
65 + webkit? ( dev-qt/qtwebkit:5[widgets] )
66 )
67 - kde? (
68 - kde-base/kdelibs:4
69 - kde-base/oxygen-icons:4
70 - ayatana? ( kde-misc/plasma-widget-message-indicator )
71 + !qt5? (
72 + dev-qt/qtgui:5
73 + ayatana? ( dev-libs/libindicate-qt )
74 + dbus? (
75 + dev-libs/libdbusmenu-qt[qt4(+)]
76 + dev-qt/qtdbus:4
77 + kde? (
78 + kde-base/kdelibs:4
79 + kde-base/oxygen-icons:4
80 + ayatana? ( kde-misc/plasma-widget-message-indicator )
81 + )
82 + )
83 + phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
84 + webkit? ( dev-qt/qtwebkit:4 )
85 )
86 - phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
87 - webkit? ( dev-qt/qtwebkit:4 )
88 "
89
90 RDEPEND="
91 - dev-qt/qtcore:4[ssl?]
92 + sys-libs/zlib
93 + qt5? (
94 + dev-qt/qtcore:5
95 + dev-qt/qtnetwork:5[ssl?]
96 + )
97 + !qt5? ( dev-qt/qtcore:4[ssl?] )
98 monolithic? (
99 ${SERVER_RDEPEND}
100 ${GUI_RDEPEND}
101 @@ -55,23 +79,25 @@ RDEPEND="
102 server? ( ${SERVER_RDEPEND} )
103 X? ( ${GUI_RDEPEND} )
104 )
105 - "
106 +"
107 DEPEND="${RDEPEND}
108 - kde? ( dev-util/automoc )"
109 + qt5? ( dev-qt/linguist-tools:5 )
110 +"
111
112 -DOCS="AUTHORS ChangeLog README"
113 +DOCS=( AUTHORS ChangeLog README )
114
115 S="${WORKDIR}/${P/_/-}"
116
117 REQUIRED_USE="
118 || ( X server monolithic )
119 + ayatana? ( || ( X monolithic ) )
120 crypt? ( || ( server monolithic ) )
121 - postgres? ( || ( server monolithic ) )
122 - syslog? ( || ( server monolithic ) )
123 + dbus? ( || ( X monolithic ) )
124 kde? ( || ( X monolithic ) )
125 phonon? ( || ( X monolithic ) )
126 - dbus? ( || ( X monolithic ) )
127 - ayatana? ( || ( X monolithic ) )
128 + postgres? ( || ( server monolithic ) )
129 + qt5? ( !ayatana !crypt !kde phonon )
130 + syslog? ( || ( server monolithic ) )
131 webkit? ( || ( X monolithic ) )
132 "
133
134 @@ -87,18 +113,19 @@ pkg_setup() {
135
136 src_configure() {
137 local mycmakeargs=(
138 - $(cmake-utils_use_with ayatana LIBINDICATE)
139 - $(cmake-utils_use_want X QTCLIENT)
140 - $(cmake-utils_use_want server CORE)
141 - $(cmake-utils_use_want monolithic MONO)
142 - $(cmake-utils_use_with webkit)
143 - $(cmake-utils_use_with phonon)
144 + $(cmake-utils_use_find_package ayatana IndicateQt)
145 + $(cmake-utils_use_find_package crypt QCA2)
146 + $(cmake-utils_use_find_package dbus dbusmenu-qt)
147 + $(cmake-utils_use_find_package dbus dbusmenu-qt5)
148 $(cmake-utils_use_with kde)
149 - $(cmake-utils_use_with dbus)
150 - $(cmake-utils_use_with ssl OPENSSL)
151 - $(cmake-utils_use_with syslog)
152 $(cmake-utils_use_with !kde OXYGEN)
153 - $(cmake-utils_use_with crypt)
154 + $(cmake-utils_use_want monolithic MONO)
155 + $(cmake-utils_use_find_package phonon)
156 + $(cmake-utils_use_find_package phonon Phonon4Qt5)
157 + $(cmake-utils_use_use qt5)
158 + $(cmake-utils_use_want server CORE)
159 + $(cmake-utils_use_with webkit)
160 + $(cmake-utils_use_want X QTCLIENT)
161 "-DEMBED_DATA=OFF"
162 )