diff options
author | Michael Palimaka <kensington@gentoo.org> | 2015-11-20 02:48:15 +1100 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2016-02-02 19:34:43 +0100 |
commit | 1540a058f26a43425e3b66c626f823f251763821 (patch) | |
tree | 7eba2dba7353c2b09beacd0598c6e12b8188fc63 /eclass/qt5-build.eclass | |
parent | qt5-build.eclass: use versionator.eclass to construct QT5_MINOR_VERSION (diff) | |
download | gentoo-1540a058f26a43425e3b66c626f823f251763821.tar.gz gentoo-1540a058f26a43425e3b66c626f823f251763821.tar.bz2 gentoo-1540a058f26a43425e3b66c626f823f251763821.zip |
qt5-build.eclass: add initial EAPI 6 support
(cherry picked from proj/qt commit 80b046cd0e1b639559e7344f9fdba75352f429f3)
Diffstat (limited to 'eclass/qt5-build.eclass')
-rw-r--r-- | eclass/qt5-build.eclass | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 26dd217d1287..19c2fb57af3f 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 |