qt5-build.eclass: EAPI-7 bump
authorAndreas Sturmlechner <asturm@gentoo.org>
Tue, 18 Jun 2019 08:57:01 +0000 (10:57 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sat, 6 Jul 2019 10:22:48 +0000 (12:22 +0200)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
eclass/qt5-build.eclass

index 0e16983478ab6893bfd97b1044a12a1deffe5ea0..b22124100d3ef2a368fd0b5cc5fee22c39c5f9a3 100644 (file)
@@ -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 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @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