From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1136210-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2BC7B138346
for <garchives@archives.gentoo.org>; Sun, 5 Jan 2020 15:24:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 57619E0A10;
Sun, 5 Jan 2020 15:24:16 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 84341E0A03
for <gentoo-commits@lists.gentoo.org>; Sun, 5 Jan 2020 15:24:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C81DB34DDBF
for <gentoo-commits@lists.gentoo.org>; Sun, 5 Jan 2020 15:24:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5593B3D
for <gentoo-commits@lists.gentoo.org>; Sun, 5 Jan 2020 15:24:12 +0000 (UTC)
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" <johu@gentoo.org>
Message-ID: <1578237829.98e9711e2c6f9b3734a7f94a0e948e8c8437b103.johu@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-irc/quassel/quassel-9999.ebuild
X-VCS-Directories: net-irc/quassel/
X-VCS-Committer: johu
X-VCS-Committer-Name: Johannes Huber
X-VCS-Revision: 98e9711e2c6f9b3734a7f94a0e948e8c8437b103
X-VCS-Branch: master
Date: Sun, 5 Jan 2020 15:24:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a83ec220-f0a2-4e1a-b2c8-556c6e5adc9b
X-Archives-Hash: 5af9149d73ad6c811fe1c3d1266dbda0
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