1 |
commit: e46db557f20fd55708967292a7ea54e2b0ef1e3b |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 5 17:06:00 2018 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 5 17:06:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46db557 |
7 |
|
8 |
dev-qt/qtwebkit: minor improvements |
9 |
|
10 |
* ensure USE=gles2 is enabled/disabled consistently |
11 |
* call the correct check-reqs eclass function |
12 |
|
13 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
14 |
|
15 |
.../qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 27 +++++++++++----------- |
16 |
1 file changed, 13 insertions(+), 14 deletions(-) |
17 |
|
18 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild |
19 |
index 731937dcc71..93dd7e443a4 100644 |
20 |
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild |
21 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild |
22 |
@@ -7,6 +7,7 @@ COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da |
23 |
CMAKE_MAKEFILE_GENERATOR="ninja" |
24 |
PYTHON_COMPAT=( python2_7 ) |
25 |
USE_RUBY="ruby23 ruby24 ruby25" |
26 |
+ |
27 |
inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs |
28 |
|
29 |
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" |
30 |
@@ -24,12 +25,12 @@ REQUIRED_USE=" |
31 |
?? ( gstreamer multimedia ) |
32 |
" |
33 |
|
34 |
-QT_MIN_VER="5.9.1:5" |
35 |
# Dependencies found at Source/cmake/OptionsQt.cmake |
36 |
+QT_MIN_VER="5.9.1:5" |
37 |
RDEPEND=" |
38 |
dev-db/sqlite:3 |
39 |
dev-libs/icu:= |
40 |
- dev-libs/libxml2:2 |
41 |
+ dev-libs/libxml2 |
42 |
dev-libs/libxslt |
43 |
>=dev-qt/qtcore-${QT_MIN_VER} |
44 |
>=dev-qt/qtgui-${QT_MIN_VER} |
45 |
@@ -48,7 +49,7 @@ RDEPEND=" |
46 |
multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) |
47 |
opengl? ( |
48 |
>=dev-qt/qtgui-${QT_MIN_VER}[gles2=] |
49 |
- >=dev-qt/qtopengl-${QT_MIN_VER} |
50 |
+ >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] |
51 |
) |
52 |
orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) |
53 |
printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) |
54 |
@@ -56,15 +57,13 @@ RDEPEND=" |
55 |
>=dev-qt/qtdeclarative-${QT_MIN_VER} |
56 |
>=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] |
57 |
) |
58 |
- webp? ( media-libs/libwebp:0= ) |
59 |
+ webp? ( media-libs/libwebp:= ) |
60 |
X? ( |
61 |
x11-libs/libX11 |
62 |
x11-libs/libXcomposite |
63 |
x11-libs/libXrender |
64 |
) |
65 |
" |
66 |
- |
67 |
-# Need real bison, not yacc |
68 |
DEPEND="${RDEPEND} |
69 |
${PYTHON_DEPS} |
70 |
${RUBY_DEPS} |
71 |
@@ -75,25 +74,25 @@ DEPEND="${RDEPEND} |
72 |
virtual/pkgconfig |
73 |
" |
74 |
|
75 |
-CHECKREQS_DISK_BUILD="16G" # Debug build requires much more see bug #417307 |
76 |
- |
77 |
-S="${WORKDIR}/${COMMIT}" |
78 |
+S=${WORKDIR}/${COMMIT} |
79 |
|
80 |
PATCHES=( "${FILESDIR}/${P}-functional.patch" ) |
81 |
|
82 |
+CHECKREQS_DISK_BUILD="16G" # bug 417307 |
83 |
+ |
84 |
_check_reqs() { |
85 |
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
86 |
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
87 |
- check-reqs_pkg_pretend |
88 |
+ if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then |
89 |
+ einfo "Checking for sufficient disk space to build ${PN} with debugging flags" |
90 |
+ check-reqs_$1 |
91 |
fi |
92 |
} |
93 |
|
94 |
pkg_pretend() { |
95 |
- _check_reqs |
96 |
+ _check_reqs pkg_pretend |
97 |
} |
98 |
|
99 |
pkg_setup() { |
100 |
- _check_reqs |
101 |
+ _check_reqs pkg_setup |
102 |
python-any-r1_pkg_setup |
103 |
} |