| 1 |
commit: 532f4bc2737531af5f11e4f63f3ebd90854c63c9 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 8 08:16:56 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 13 09:31:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532f4bc2 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: Switch from ~QTVER to =QT5_PV* version deps |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../qtwebengine-5.15.2_p20210824.ebuild | 27 +++++++++++----------- |
| 14 |
1 file changed, 13 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild |
| 17 |
index 223cd21ff67..a8e5942a0be 100644 |
| 18 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild |
| 19 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild |
| 20 |
@@ -4,7 +4,6 @@ |
| 21 |
EAPI=8 |
| 22 |
|
| 23 |
PYTHON_COMPAT=( python2_7 ) |
| 24 |
-QTVER=$(ver_cut 1-3) |
| 25 |
inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build |
| 26 |
|
| 27 |
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
| 28 |
@@ -12,7 +11,7 @@ HOMEPAGE="https://www.qt.io/" |
| 29 |
|
| 30 |
if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 31 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
| 32 |
- if [[ ${PV} == ${QTVER}_p* ]]; then |
| 33 |
+ if [[ ${PV} == ${QT5_PV}_p* ]]; then |
| 34 |
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" |
| 35 |
S="${WORKDIR}/${P}" |
| 36 |
QT5_BUILD_DIR="${S}_build" |
| 37 |
@@ -42,12 +41,12 @@ RDEPEND=" |
| 38 |
dev-libs/libxml2[icu] |
| 39 |
dev-libs/libxslt |
| 40 |
dev-libs/re2:= |
| 41 |
- ~dev-qt/qtcore-${QTVER} |
| 42 |
- ~dev-qt/qtdeclarative-${QTVER} |
| 43 |
- ~dev-qt/qtgui-${QTVER} |
| 44 |
- ~dev-qt/qtnetwork-${QTVER} |
| 45 |
- ~dev-qt/qtprintsupport-${QTVER} |
| 46 |
- ~dev-qt/qtwebchannel-${QTVER}[qml] |
| 47 |
+ =dev-qt/qtcore-${QT5_PV}* |
| 48 |
+ =dev-qt/qtdeclarative-${QT5_PV}* |
| 49 |
+ =dev-qt/qtgui-${QT5_PV}* |
| 50 |
+ =dev-qt/qtnetwork-${QT5_PV}* |
| 51 |
+ =dev-qt/qtprintsupport-${QT5_PV}* |
| 52 |
+ =dev-qt/qtwebchannel-${QT5_PV}*[qml] |
| 53 |
media-libs/fontconfig |
| 54 |
media-libs/freetype |
| 55 |
media-libs/harfbuzz:= |
| 56 |
@@ -76,15 +75,15 @@ RDEPEND=" |
| 57 |
x11-libs/libXScrnSaver |
| 58 |
x11-libs/libXtst |
| 59 |
alsa? ( media-libs/alsa-lib ) |
| 60 |
- designer? ( ~dev-qt/designer-${QTVER} ) |
| 61 |
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} ) |
| 62 |
+ designer? ( =dev-qt/designer-${QT5_PV}* ) |
| 63 |
+ geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* ) |
| 64 |
kerberos? ( virtual/krb5 ) |
| 65 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 66 |
system-ffmpeg? ( media-video/ffmpeg:0= ) |
| 67 |
system-icu? ( >=dev-libs/icu-69.1:= ) |
| 68 |
widgets? ( |
| 69 |
- ~dev-qt/qtdeclarative-${QTVER}[widgets] |
| 70 |
- ~dev-qt/qtwidgets-${QTVER} |
| 71 |
+ =dev-qt/qtdeclarative-${QT5_PV}*[widgets] |
| 72 |
+ =dev-qt/qtwidgets-${QT5_PV}* |
| 73 |
) |
| 74 |
" |
| 75 |
DEPEND="${RDEPEND}" |
| 76 |
@@ -137,13 +136,13 @@ src_unpack() { |
| 77 |
} |
| 78 |
|
| 79 |
src_prepare() { |
| 80 |
- if [[ ${PV} == ${QTVER}_p* ]]; then |
| 81 |
+ if [[ ${PV} == ${QT5_PV}_p* ]]; then |
| 82 |
# This is made from git, and for some reason will fail w/o .git directories. |
| 83 |
mkdir -p .git src/3rdparty/chromium/.git || die |
| 84 |
|
| 85 |
# We need to make sure this integrates well into Qt 5.15.2 installation. |
| 86 |
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. |
| 87 |
- sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die |
| 88 |
+ sed -e "/^MODULE_VERSION/s/5.*/${QT5_PV}*/" -i .qmake.conf || die |
| 89 |
fi |
| 90 |
|
| 91 |
# QTBUG-88657 - jumbo-build could still make trouble |
Archives