[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     6b3873a9577b7b0f20736cb67260bffef83ac87d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 18:27:13 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 20:14:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6b3873a9

qmake-utils.eclass: Ban <EAPI-5 use

 eclass/qmake-utils.eclass | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 74ceca4a..916fcc92 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -6,6 +6,7 @@
 # q...@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <p...@gentoo.org>
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
@@ -16,7 +17,9 @@
 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+[[ ${EAPI:-0} == [01234] ]] && die "qmake-utils.eclass: unsupported 
EAPI=${EAPI:-0}"
+
+[[ ${EAPI:-0} == 5 ]] && inherit eutils multilib
 inherit estack toolchain-funcs
 
 # @FUNCTION: qt4_get_bindir
@@ -24,8 +27,6 @@ inherit estack toolchain-funcs
 # Echoes the directory where Qt4 binaries are installed.
 # EPREFIX is already prepended to the returned path.
 qt4_get_bindir() {
-       has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
        local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
        if [[ -d ${qtbindir} ]]; then
                echo ${qtbindir}
@@ -67,8 +68,6 @@ qt4_get_plugindir() {
 # Echoes the directory where Qt5 binaries are installed.
 # EPREFIX is already prepended to the returned path.
 qt5_get_bindir() {
-       has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
        echo ${EPREFIX}$(qt5_get_libdir)/qt5/bin
 }
 
@@ -161,8 +160,6 @@ qmake-utils_find_pro_file() {
 eqmake4() {
        debug-print-function ${FUNCNAME} "$@"
 
-       has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
        ebegin "Running qmake"
 
        local qmake_args=("$@")