Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/
Date: Mon, 28 Mar 2016 16:06:59
Message-Id: 1459181203.180772083a41f0bdf986bd64832320e5f567e603.johu@gentoo
1 commit: 180772083a41f0bdf986bd64832320e5f567e603
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 16:06:34 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 16:06:43 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18077208
7
8 net-irc/quassel: EAPI 6
9
10 Package-Manager: portage-2.2.28
11
12 net-irc/quassel/quassel-0.12.3-r1.ebuild | 18 +++++++++---------
13 net-irc/quassel/quassel-9999.ebuild | 18 +++++++++---------
14 2 files changed, 18 insertions(+), 18 deletions(-)
15
16 diff --git a/net-irc/quassel/quassel-0.12.3-r1.ebuild b/net-irc/quassel/quassel-0.12.3-r1.ebuild
17 index e264d6a..858a026 100644
18 --- a/net-irc/quassel/quassel-0.12.3-r1.ebuild
19 +++ b/net-irc/quassel/quassel-0.12.3-r1.ebuild
20 @@ -2,7 +2,7 @@
21 # Distributed under the terms of the GNU General Public License v2
22 # $Id$
23
24 -EAPI=5
25 +EAPI=6
26
27 inherit cmake-utils eutils pax-utils systemd user versionator
28
29 @@ -130,16 +130,16 @@ src_configure() {
30 $(cmake-utils_use_find_package crypt QCA2-QT5)
31 $(cmake-utils_use_find_package dbus dbusmenu-qt)
32 $(cmake-utils_use_find_package dbus dbusmenu-qt5)
33 - $(cmake-utils_use_with kde)
34 - $(cmake-utils_use_with !kde OXYGEN)
35 - $(cmake-utils_use_want monolithic MONO)
36 - $(cmake-utils_use_find_package phonon)
37 + -DWITH_KDE=$(usex kde)
38 + -DWITH_OXYGEN=$(usex !kde)
39 + -DWANT_MONO=$(usex monolithic)
40 + $(cmake-utils_use_find_package phonon Phonon)
41 $(cmake-utils_use_find_package phonon Phonon4Qt5)
42 - $(cmake-utils_use_use qt5)
43 - $(cmake-utils_use_want server CORE)
44 + -DUSE_QT5=$(usex qt5)
45 + -DWANT_CORE=$(usex server)
46 $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
47 - $(cmake-utils_use_with webkit)
48 - $(cmake-utils_use_want X QTCLIENT)
49 + -DWITH_WEBKIT=$(usex webkit)
50 + -DWANT_QTCLIENT=$(usex X)
51 -DEMBED_DATA=OFF
52 -DCMAKE_SKIP_RPATH=ON
53 )
54
55 diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
56 index cdca48c..ddd1fea 100644
57 --- a/net-irc/quassel/quassel-9999.ebuild
58 +++ b/net-irc/quassel/quassel-9999.ebuild
59 @@ -2,7 +2,7 @@
60 # Distributed under the terms of the GNU General Public License v2
61 # $Id$
62
63 -EAPI=5
64 +EAPI=6
65
66 inherit cmake-utils eutils pax-utils systemd user versionator
67
68 @@ -130,16 +130,16 @@ src_configure() {
69 $(cmake-utils_use_find_package crypt QCA2-QT5)
70 $(cmake-utils_use_find_package dbus dbusmenu-qt)
71 $(cmake-utils_use_find_package dbus dbusmenu-qt5)
72 - $(cmake-utils_use_with kde)
73 - $(cmake-utils_use_with !kde OXYGEN)
74 - $(cmake-utils_use_want monolithic MONO)
75 - $(cmake-utils_use_find_package phonon)
76 + -DWITH_KDE=$(usex kde)
77 + -DWITH_OXYGEN=$(usex !kde)
78 + -DWANT_MONO=$(usex monolithic)
79 + $(cmake-utils_use_find_package phonon Phonon)
80 $(cmake-utils_use_find_package phonon Phonon4Qt5)
81 - $(cmake-utils_use_use qt5)
82 - $(cmake-utils_use_want server CORE)
83 + -DUSE_QT5=$(usex qt5)
84 + -DWANT_CORE=$(usex server)
85 $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
86 - $(cmake-utils_use_with webkit)
87 - $(cmake-utils_use_want X QTCLIENT)
88 + -DWITH_WEBKIT=$(usex webkit)
89 + -DWANT_QTCLIENT=$(usex X)
90 -DEMBED_DATA=OFF
91 -DCMAKE_SKIP_RPATH=ON
92 )