commit: 4b0b0f8883499f60fa7bb0b21b9d00518a2d9644 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jun 18 08:57:01 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jul 6 10:22:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0b0f88
qt5-build.eclass: EAPI-7 bump Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/qt5-build.eclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0e16983478a..b22124100d3 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qt5-build.eclass @@ -6,7 +6,7 @@ # [email protected] # @AUTHOR: # Davide Pesavento <[email protected]> -# @SUPPORTED_EAPIS: 6 +# @SUPPORTED_EAPIS: 6 7 # @BLURB: Eclass for Qt5 split ebuilds. # @DESCRIPTION: # This eclass contains various functions that are used when building Qt5. @@ -17,7 +17,8 @@ if [[ ${CATEGORY} != dev-qt ]]; then fi case ${EAPI} in - 6) : ;; + 6) inherit eapi7-ver ;; + 7) : ;; *) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;; esac @@ -57,7 +58,7 @@ esac # for tests you should proceed with setting VIRTUALX_REQUIRED=test. : ${VIRTUALX_REQUIRED:=manual} -inherit eapi7-ver estack flag-o-matic toolchain-funcs virtualx +inherit estack flag-o-matic toolchain-funcs virtualx HOMEPAGE="https://www.qt.io/"; LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" @@ -113,10 +114,13 @@ IUSE="debug test" [[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182 -DEPEND=" +BDEPEND=" dev-lang/perl virtual/pkgconfig " +case ${EAPI} in + 6) DEPEND+=" ${BDEPEND}" ;; +esac if [[ ${PN} != qttest ]]; then DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" fi
