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

[Davide Pesavento]

commit:     2430d61f6f838448a63f8ab87b3243e8fab95acb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 20:20:18 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 20:20:18 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2430d61f

qmake-utils.eclass: sync with gentoo repo

 eclass/qmake-utils.eclass | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 916fcc92..f8981c75 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -27,6 +27,8 @@ inherit estack toolchain-funcs
 # Echoes the directory where Qt4 binaries are installed.
 # EPREFIX is already prepended to the returned path.
 qt4_get_bindir() {
+       [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
+
        local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
        if [[ -d ${qtbindir} ]]; then
                echo ${qtbindir}
@@ -39,6 +41,7 @@ qt4_get_bindir() {
 # @DESCRIPTION:
 # Echoes the directory where Qt4 headers are installed.
 qt4_get_headerdir() {
+       [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
        echo /usr/include/qt4
 }
 
@@ -46,6 +49,7 @@ qt4_get_headerdir() {
 # @DESCRIPTION:
 # Echoes the directory where Qt4 libraries are installed.
 qt4_get_libdir() {
+       [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
        echo /usr/$(get_libdir)/qt4
 }
 
@@ -53,6 +57,7 @@ qt4_get_libdir() {
 # @DESCRIPTION:
 # Echoes the directory where Qt4 mkspecs are installed.
 qt4_get_mkspecsdir() {
+       [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
        echo /usr/share/qt4/mkspecs
 }
 
@@ -60,6 +65,7 @@ qt4_get_mkspecsdir() {
 # @DESCRIPTION:
 # Echoes the directory where Qt4 plugins are installed.
 qt4_get_plugindir() {
+       [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
        echo $(qt4_get_libdir)/plugins
 }
 
@@ -159,6 +165,7 @@ qmake-utils_find_pro_file() {
 # specified inside the top-level project file.
 eqmake4() {
        debug-print-function ${FUNCNAME} "$@"
+       [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
 
        ebegin "Running qmake"