[gentoo-commits] repo/gentoo:master commit in: eclass/

[Davide Pesavento]

commit:     1540a058f26a43425e3b66c626f823f251763821
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:48:15 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 18:34:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1540a058

qt5-build.eclass: add initial EAPI 6 support

(cherry picked from proj/qt commit 80b046cd0e1b639559e7344f9fdba75352f429f3)

 eclass/qt5-build.eclass | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 26dd217..19c2fb5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -13,11 +13,15 @@
 # Requires EAPI 5.
 
 case ${EAPI} in
-       5)      : ;;
+       5|6)    : ;;
        *)      die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs versionator virtualx
+inherit eutils flag-o-matic toolchain-funcs versionator virtualx
+
+if [[ ${EAPI} == 5 ]] ; then
+       inherit multilib
+fi
 
 HOMEPAGE="https://www.qt.io/";
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
@@ -197,9 +201,13 @@ qt5-build_src_prepare() {
                        src/{corelib/corelib,gui/gui}.pro || die "sed failed 
(optimize_full)"
        fi
 
-       # apply patches
-       [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-       epatch_user
+       if [[ ${EAPI} == 5 ]]; then
+               # apply patches
+               [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+               epatch_user
+       else
+               default_src_prepare
+       fi
 }
 
 # @FUNCTION: qt5-build_src_configure