| 1 |
commit: 88a80f7fd189ed9ef81c6da078ae4e214ba6623e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 4 23:52:07 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 8 20:07:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a80f7f |
| 7 |
|
| 8 |
qt5-build.eclass: Drop obsolete qtwebkit quirks |
| 9 |
|
| 10 |
Remaining qtwebkit ebuild uses CMake. |
| 11 |
|
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/qt5-build.eclass | 5 ++--- |
| 15 |
1 file changed, 2 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 18 |
index ee4875deaad..70f2bed9e4e 100644 |
| 19 |
--- a/eclass/qt5-build.eclass |
| 20 |
+++ b/eclass/qt5-build.eclass |
| 21 |
@@ -123,14 +123,13 @@ esac |
| 22 |
|
| 23 |
IUSE="debug test" |
| 24 |
|
| 25 |
-[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584 |
| 26 |
[[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182 |
| 27 |
|
| 28 |
DEPEND=" |
| 29 |
dev-lang/perl |
| 30 |
virtual/pkgconfig |
| 31 |
" |
| 32 |
-if [[ (${PN} != qttest && ${PN} != qtwebkit) || (${PN} == qtwebkit && ${QT5_MINOR_VERSION} -lt 9) ]]; then |
| 33 |
+if [[ ${PN} != qttest ]]; then |
| 34 |
DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" |
| 35 |
fi |
| 36 |
RDEPEND=" |
| 37 |
@@ -147,7 +146,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr |
| 38 |
# Unpacks the sources. |
| 39 |
qt5-build_src_unpack() { |
| 40 |
# bug 307861 |
| 41 |
- if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then |
| 42 |
+ if [[ ${PN} == qtwebengine ]]; then |
| 43 |
eshopts_push -s extglob |
| 44 |
if is-flagq '-g?(gdb)?([1-9])'; then |
| 45 |
ewarn |
Archives