From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1121692-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 E6D2013997D for <garchives@archives.gentoo.org>; Mon, 11 Nov 2019 00:19:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F81AE0A59; Mon, 11 Nov 2019 00:19:23 +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 11D23E0A59 for <gentoo-commits@lists.gentoo.org>; Mon, 11 Nov 2019 00:19:23 +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 70B8C34CB72 for <gentoo-commits@lists.gentoo.org>; Mon, 11 Nov 2019 00:19:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E89858B0 for <gentoo-commits@lists.gentoo.org>; Mon, 11 Nov 2019 00:19:19 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@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, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1573430881.8a7dd6726545d948e44c705c23f0fef16bc262d2.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: www-client/falkon/ X-VCS-Repository: proj/kde X-VCS-Files: www-client/falkon/falkon-9999.ebuild X-VCS-Directories: www-client/falkon/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8a7dd6726545d948e44c705c23f0fef16bc262d2 X-VCS-Branch: master Date: Mon, 11 Nov 2019 00:19:19 +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: 16cb1e53-b2dc-4c59-a1d0-d7c3be18f650 X-Archives-Hash: 87973ca6587ec53b7286561fa4035b08 commit: 8a7dd6726545d948e44c705c23f0fef16bc262d2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Nov 11 00:08:01 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Nov 11 00:08:01 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a7dd672 www-client/falkon: Port to ecm.eclass and kde.org.eclass Package-Manager: Portage-2.3.78, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> www-client/falkon/falkon-9999.ebuild | 48 +++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/www-client/falkon/falkon-9999.ebuild b/www-client/falkon/falkon-9999.ebuild index 17895772d6..ac245bef15 100644 --- a/www-client/falkon/falkon-9999.ebuild +++ b/www-client/falkon/falkon-9999.ebuild @@ -3,9 +3,11 @@ EAPI=7 -KDE_TEST="true" +ECM_TEST="true" +KFMIN=5.60.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit kde5 +inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/${P}.tar.xz" @@ -20,42 +22,42 @@ SLOT="0" IUSE="dbus kde libressl +X" COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork 'ssl') - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql 'sqlite') - $(add_qt_dep qtwebchannel) - $(add_qt_dep qtwebengine 'widgets' '' '5=') - $(add_qt_dep qtwidgets) + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl] + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[sqlite] + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5=[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 virtual/libintl - dbus? ( $(add_qt_dep qtdbus) ) + dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) kde? ( - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kio) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep purpose) + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/purpose-${KFMIN}:5 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( - $(add_qt_dep qtx11extras) + >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libxcb:= x11-libs/xcb-util ) " DEPEND="${COMMON_DEPEND} - $(add_qt_dep linguist-tools) - $(add_qt_dep qtconcurrent) + >=dev-qt/linguist-tools-${QTMIN}:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 " if [[ ${KDE_BUILD_TYPE} != live ]]; then - DEPEND+=" $(add_frameworks_dep ki18n)" + DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:5" fi RDEPEND="${COMMON_DEPEND} !www-client/qupzilla - $(add_qt_dep qtsvg) + >=dev-qt/qtsvg-${QTMIN}:5 " src_configure() { @@ -65,5 +67,5 @@ src_configure() { $(cmake-utils_use_find_package kde KF5KIO) -DNO_X11=$(usex !X) ) - kde5_src_configure + ecm_src_configure }