commit: dcb2e45071f536a5d21796a155766b316cf4dc4b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jun 12 18:27:13 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 2 23:34:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb2e450
qmake-utils.eclass: Drop obsolete EAPI-5 support Last consumer in Gentoo ebuild repository was dropped. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/qmake-utils.eclass | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 67e13d7006b..cf287ee8d7e 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qmake-utils.eclass @@ -6,6 +6,7 @@ # [email protected] # @AUTHOR: # Davide Pesavento <[email protected]> +# @SUPPORTED_EAPIS: 6 7 # @BLURB: Common functions for qmake-based packages. # @DESCRIPTION: # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake. @@ -16,7 +17,8 @@ if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then _QMAKE_UTILS_ECLASS=1 -[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib +[[ ${EAPI:-0} == [012345] ]] && die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}" + inherit estack toolchain-funcs # @FUNCTION: qt4_get_bindir @@ -25,7 +27,6 @@ inherit estack toolchain-funcs # EPREFIX is already prepended to the returned path. qt4_get_bindir() { [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" - has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin if [[ -d ${qtbindir} ]]; then @@ -72,8 +73,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 } @@ -167,7 +166,6 @@ eqmake4() { debug-print-function ${FUNCNAME} "$@" [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" - has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= ebegin "Running qmake"
