diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-06 10:02:08 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-06 10:04:25 +0100 |
| commit | 03686e9498c9c8dc381fe12c13010dd8640d2b66 (patch) | |
| tree | 43c13d658717f8b6ee3b48dbde4b5a724209192d | |
| parent | qmake-utils.eclass: Unbreak qt_4*() functions with EAPI-7 (diff) | |
| download | kde-sunset-03686e9498c9c8dc381fe12c13010dd8640d2b66.tar.gz kde-sunset-03686e9498c9c8dc381fe12c13010dd8640d2b66.tar.bz2 kde-sunset-03686e9498c9c8dc381fe12c13010dd8640d2b66.zip | |
qmake-utils.eclass: Drop EAPI-[01234] support
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/qmake-utils.eclass | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 65f87e8e..d4385090 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -4,6 +4,7 @@ # @ECLASS: qmake-utils.eclass # @AUTHOR: # Davide Pesavento <pesa@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. @@ -14,7 +15,8 @@ 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 @@ -22,8 +24,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} @@ -65,8 +65,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 } @@ -159,8 +157,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=("$@") |