commit:     71e50ca9750a01ae4342693b495eaa18f4723d0f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 07:28:12 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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

Reply via email to