[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

[Johannes Huber]

commit:     98e9711e2c6f9b3734a7f94a0e948e8c8437b103
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 14:29:37 2020 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 15:23:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e9711e

net-irc/quassel: Migrate to cmake eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 net-irc/quassel/quassel-9999.ebuild | 41 +++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index fa495dec64e..9d41834c0c2 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils pax-utils systemd user
+inherit cmake gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != *9999* ]]; then
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
@@ -22,15 +22,15 @@ SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
 snorenotify +ssl syslog urlpreview X"
 
-SERVER_RDEPEND="
-	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+SERVER_DEPEND="
+	crypt? ( app-crypt/qca:2[ssl] )
 	ldap? ( net-nds/openldap )
 	postgres? ( dev-qt/qtsql:5[postgres] )
 	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
 "
 
-GUI_RDEPEND="
+GUI_DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
@@ -39,7 +39,7 @@ GUI_RDEPEND="
 		oxygen? ( kde-frameworks/oxygen-icons:5 )
 	)
 	dbus? (
-		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
 		dev-qt/qtdbus:5
 	)
 	kde? (
@@ -56,20 +56,21 @@ GUI_RDEPEND="
 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
-RDEPEND="
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl?]
 	sys-libs/zlib
 	monolithic? (
-		${SERVER_RDEPEND}
-		${GUI_RDEPEND}
+		${SERVER_DEPEND}
+		${GUI_DEPEND}
 	)
 	!monolithic? (
-		server? ( ${SERVER_RDEPEND} )
-		X? ( ${GUI_RDEPEND} )
+		server? ( ${SERVER_DEPEND} )
+		X? ( ${GUI_DEPEND} )
 	)
 "
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	kde-frameworks/extra-cmake-modules
 "
@@ -105,27 +106,27 @@ src_configure() {
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package dbus Qt5DBus)
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
 		-DWITH_LDAP=$(usex ldap)
 		-DWANT_MONO=$(usex monolithic)
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
-		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package snorenotify LibsnoreQt5)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
 	if use server || use monolithic; then
-		mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+		mycmakeargs+=(  $(cmake_use_find_package crypt QCA2-QT5) )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use server ; then
 		# needs PAX marking wrt bug#346255