net-irc/quassel: EAPI 6

Package-Manager: portage-2.2.28

diff --git a/net-irc/quassel/quassel-0.12.3-r1.ebuild b/net-irc/quassel/quassel-0.12.3-r1.ebuild
index e264d6a77286d63b2767d369db8cb1c853288542..858a026586b6798578049e8cc07af4692d341cd5 100644 (file)
--- a/net-irc/quassel/quassel-0.12.3-r1.ebuild
+++ b/net-irc/quassel/quassel-0.12.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils eutils pax-utils systemd user versionator
 
@@ -130,16 +130,16 @@ src_configure() {
                $(cmake-utils_use_find_package crypt QCA2-QT5)
                $(cmake-utils_use_find_package dbus dbusmenu-qt)
                $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-               $(cmake-utils_use_with kde)
-               $(cmake-utils_use_with !kde OXYGEN)
-               $(cmake-utils_use_want monolithic MONO)
-               $(cmake-utils_use_find_package phonon)
+               -DWITH_KDE=$(usex kde)
+               -DWITH_OXYGEN=$(usex !kde)
+               -DWANT_MONO=$(usex monolithic)
+               $(cmake-utils_use_find_package phonon Phonon)
                $(cmake-utils_use_find_package phonon Phonon4Qt5)
-               $(cmake-utils_use_use qt5)
-               $(cmake-utils_use_want server CORE)
+               -DUSE_QT5=$(usex qt5)
+               -DWANT_CORE=$(usex server)
                $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-               $(cmake-utils_use_with webkit)
-               $(cmake-utils_use_want X QTCLIENT)
+               -DWITH_WEBKIT=$(usex webkit)
+               -DWANT_QTCLIENT=$(usex X)
                -DEMBED_DATA=OFF
                -DCMAKE_SKIP_RPATH=ON
        )

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index cdca48ca19d96f7aa95b16bf55ea45d4c93ee554..ddd1feab05851235ed3c9b284bb2d65d907a6a55 100644 (file)
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils eutils pax-utils systemd user versionator
 
@@ -130,16 +130,16 @@ src_configure() {
                $(cmake-utils_use_find_package crypt QCA2-QT5)
                $(cmake-utils_use_find_package dbus dbusmenu-qt)
                $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-               $(cmake-utils_use_with kde)
-               $(cmake-utils_use_with !kde OXYGEN)
-               $(cmake-utils_use_want monolithic MONO)
-               $(cmake-utils_use_find_package phonon)
+               -DWITH_KDE=$(usex kde)
+               -DWITH_OXYGEN=$(usex !kde)
+               -DWANT_MONO=$(usex monolithic)
+               $(cmake-utils_use_find_package phonon Phonon)
                $(cmake-utils_use_find_package phonon Phonon4Qt5)
-               $(cmake-utils_use_use qt5)
-               $(cmake-utils_use_want server CORE)
+               -DUSE_QT5=$(usex qt5)
+               -DWANT_CORE=$(usex server)
                $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-               $(cmake-utils_use_with webkit)
-               $(cmake-utils_use_want X QTCLIENT)
+               -DWITH_WEBKIT=$(usex webkit)
+               -DWANT_QTCLIENT=$(usex X)
                -DEMBED_DATA=OFF
                -DCMAKE_SKIP_RPATH=ON
        )