| 1 |
commit: 1540a058f26a43425e3b66c626f823f251763821 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 19 15:48:15 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 2 18:34:43 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1540a058 |
| 7 |
|
| 8 |
qt5-build.eclass: add initial EAPI 6 support |
| 9 |
|
| 10 |
(cherry picked from proj/qt commit 80b046cd0e1b639559e7344f9fdba75352f429f3) |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 18 +++++++++++++----- |
| 13 |
1 file changed, 13 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index 26dd217..19c2fb5 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -13,11 +13,15 @@ |
| 20 |
# Requires EAPI 5. |
| 21 |
|
| 22 |
case ${EAPI} in |
| 23 |
- 5) : ;; |
| 24 |
+ 5|6) : ;; |
| 25 |
*) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;; |
| 26 |
esac |
| 27 |
|
| 28 |
-inherit eutils flag-o-matic multilib toolchain-funcs versionator virtualx |
| 29 |
+inherit eutils flag-o-matic toolchain-funcs versionator virtualx |
| 30 |
+ |
| 31 |
+if [[ ${EAPI} == 5 ]] ; then |
| 32 |
+ inherit multilib |
| 33 |
+fi |
| 34 |
|
| 35 |
HOMEPAGE="https://www.qt.io/" |
| 36 |
LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" |
| 37 |
@@ -197,9 +201,13 @@ qt5-build_src_prepare() { |
| 38 |
src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" |
| 39 |
fi |
| 40 |
|
| 41 |
- # apply patches |
| 42 |
- [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" |
| 43 |
- epatch_user |
| 44 |
+ if [[ ${EAPI} == 5 ]]; then |
| 45 |
+ # apply patches |
| 46 |
+ [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" |
| 47 |
+ epatch_user |
| 48 |
+ else |
| 49 |
+ default_src_prepare |
| 50 |
+ fi |
| 51 |
} |
| 52 |
|
| 53 |
# @FUNCTION: qt5-build_src_configure |
Archives