From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 A50C713835D for ; Mon, 12 Oct 2020 16:15:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9124E08FF; Mon, 12 Oct 2020 16:15:36 +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 CBD63E08FF for ; Mon, 12 Oct 2020 16:15:36 +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 255E4335D29 for ; Mon, 12 Oct 2020 16:15:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DDD53A5 for ; Mon, 12 Oct 2020 16:15:31 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1602519320.b50cd8e2f5c04e20f0bb070bc2b072e8e375d3f6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/cb2bib/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/cb2bib/cb2bib-2.0.0.ebuild app-text/cb2bib/metadata.xml X-VCS-Directories: app-text/cb2bib/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b50cd8e2f5c04e20f0bb070bc2b072e8e375d3f6 X-VCS-Branch: master Date: Mon, 12 Oct 2020 16:15:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee33c83c-6581-45fc-98ec-3f1e16208519 X-Archives-Hash: 895ea30f190dd2f3c120e914f3a893e6 commit: b50cd8e2f5c04e20f0bb070bc2b072e8e375d3f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 12 15:21:19 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 12 16:15:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50cd8e2 app-text/cb2bib: Drop useless REQUIRED_USE, drop IUSE="webengine" - Non-deprecated QtWebEngine is default now - IUSE=webkit alone checks preference Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/cb2bib/cb2bib-2.0.0.ebuild | 16 +++++++++------- app-text/cb2bib/metadata.xml | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app-text/cb2bib/cb2bib-2.0.0.ebuild b/app-text/cb2bib/cb2bib-2.0.0.ebuild index 3eb3286f590..da1a1c1f278 100644 --- a/app-text/cb2bib/cb2bib-2.0.0.ebuild +++ b/app-text/cb2bib/cb2bib-2.0.0.ebuild @@ -12,9 +12,7 @@ SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="+lzo webengine +webkit" - -REQUIRED_USE="?? ( webkit webengine )" +IUSE="+lzo webkit" DEPEND=" dev-qt/qtcore:5 @@ -22,7 +20,7 @@ DEPEND=" dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) + !webkit? ( dev-qt/qtwebengine:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 ) " RDEPEND="${DEPEND}" @@ -32,10 +30,14 @@ DOCS=( AUTHORS CHANGELOG COPYRIGHT ) src_prepare() { default - sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die + sed -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" \ + -i src/src.pro || die - use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die - use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die + if use webkit; then + sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die + else + sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die + fi } src_configure() { diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml index dca6445c892..bb01d3fe4e6 100644 --- a/app-text/cb2bib/metadata.xml +++ b/app-text/cb2bib/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Use dev-qt/qtwebengine instead of dev-qt/qtwebkit + Use dev-qt/qtwebkit instead of dev-qt/qtwebengine mailto:webmaster@molspaces.com