[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d94b36341a3a637744579b04180bddaf62d838a9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 31 16:37:42 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 19:00:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94b3634

qmake-utils.eclass: Ban Qt4-support in EAPI >=7

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

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 74ceca4aadd..67e13d7006b 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -24,6 +24,7 @@ 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"
        has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
 
        local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
@@ -38,6 +39,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
 }
 
@@ -45,6 +47,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
 }
 
@@ -52,6 +55,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
 }
 
@@ -59,6 +63,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
 }
 
@@ -161,6 +166,7 @@ qmake-utils_find_pro_file() {
 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"