From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1364484-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 227C4158087 for <garchives@archives.gentoo.org>; Fri, 4 Feb 2022 14:11:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 376732BC001; Fri, 4 Feb 2022 14:11:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AC812BC001 for <gentoo-commits@lists.gentoo.org>; Fri, 4 Feb 2022 14:11:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8397D342EF3 for <gentoo-commits@lists.gentoo.org>; Fri, 4 Feb 2022 14:11:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C63891EF for <gentoo-commits@lists.gentoo.org>; Fri, 4 Feb 2022 14:11:30 +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: <1643982725.d32281081a4be1697c7e5635f60b340dfab6dbe4.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: d32281081a4be1697c7e5635f60b340dfab6dbe4 X-VCS-Branch: master Date: Fri, 4 Feb 2022 14:11:30 +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: 1f566031-7ca3-42cc-85b5-3111e8206c1f X-Archives-Hash: 0879341490803d54f9031b8e83d89017 commit: d32281081a4be1697c7e5635f60b340dfab6dbe4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Feb 4 13:46:46 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Feb 4 13:52:05 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d3228108 www-client/falkon: Add IUSE=python - Move dev-qt/linguist-tools to BDEPEND where it belongs - Set BUILD_KEYRING=OFF as was done in Gentoo ebuild repo - Fix SRC_URI for latest release Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> www-client/falkon/falkon-9999.ebuild | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/www-client/falkon/falkon-9999.ebuild b/www-client/falkon/falkon-9999.ebuild index 5f9f42b041..702af5b75a 100644 --- a/www-client/falkon/falkon-9999.ebuild +++ b/www-client/falkon/falkon-9999.ebuild @@ -4,23 +4,25 @@ EAPI=8 ECM_TEST="true" -KFMIN=5.82.0 +KFMIN=5.88.0 QTMIN=5.15.2 +PYTHON_COMPAT=( python3_{8..10} ) VIRTUALX_REQUIRED="test" -inherit ecm kde.org +inherit ecm kde.org python-single-r1 DESCRIPTION="Cross-platform web browser using QtWebEngine" HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/" if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~x86" fi LICENSE="GPL-3" SLOT="0" -IUSE="dbus kde +X" +IUSE="dbus kde python +X" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="test" # bug 653046 COMMON_DEPEND=" @@ -43,6 +45,13 @@ COMMON_DEPEND=" >=kde-frameworks/kwallet-${KFMIN}:5 >=kde-frameworks/purpose-${KFMIN}:5 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pyside2[designer,gui,widgets,${PYTHON_USEDEP}] + dev-python/shiboken2[${PYTHON_USEDEP}] + ') + ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libxcb:= @@ -50,7 +59,6 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/linguist-tools-${QTMIN}:5 >=dev-qt/qtconcurrent-${QTMIN}:5 " if [[ ${KDE_BUILD_TYPE} != live ]]; then @@ -59,12 +67,24 @@ fi RDEPEND="${COMMON_DEPEND} >=dev-qt/qtsvg-${QTMIN}:5 " +BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 +" + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} src_configure() { local mycmakeargs=( + -DBUILD_KEYRING=OFF -DDISABLE_DBUS=$(usex !dbus) $(cmake_use_find_package kde KF5Wallet) $(cmake_use_find_package kde KF5KIO) + $(cmake_use_find_package python PySide2) + $(cmake_use_find_package python Shiboken2) + $(cmake_use_find_package python Python3) -DNO_X11=$(usex !X) ) ecm_src_configure