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 A4BAD158092 for ; Wed, 15 Sep 2021 07:29:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E97EAE0809; Wed, 15 Sep 2021 07:29:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 970E8E0809 for ; Wed, 15 Sep 2021 07:29:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 704873430FC for ; Wed, 15 Sep 2021 07:29:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9BF955 for ; Wed, 15 Sep 2021 07:29:00 +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: <1631690928.71e50ca9750a01ae4342693b495eaa18f4723d0f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 71e50ca9750a01ae4342693b495eaa18f4723d0f X-VCS-Branch: master Date: Wed, 15 Sep 2021 07:29:00 +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: da88bf52-e2e8-477c-a9a3-5785b9d2dc70 X-Archives-Hash: 0de356010cf28b2ca795ca5dd967cbcc commit: 71e50ca9750a01ae4342693b495eaa18f4723d0f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 15 07:28:12 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 15 07:28:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e50ca9 dev-qt/qtwebengine: Fix .qmake.conf Bug: https://bugs.gentoo.org/811441 Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...5.2_p20210824.ebuild => qtwebengine-5.15.2_p20210824-r1.ebuild} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild similarity index 96% rename from dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild rename to dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild index 303ae1fe054..b1b5dd8a07c 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild @@ -141,11 +141,10 @@ src_prepare() { if [[ ${PV} == ${QT5_PV}_p* ]]; then # This is made from git, and for some reason will fail w/o .git directories. mkdir -p .git src/3rdparty/chromium/.git || die - - # We need to make sure this integrates well into Qt 5.15.2 installation. - # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. - sed -e "/^MODULE_VERSION/s/5.*/${QT5_PV}*/" -i .qmake.conf || die fi + # We need to make sure this integrates well into Qt 5.15.2 installation. + # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. + sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die # QTBUG-88657 - jumbo-build could still make trouble if ! use jumbo-build; then