summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-12-06 09:54:12 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-12-06 10:04:25 +0100
commit8c03b0cc0933cb00fc044558db2bc8295e93d293 (patch)
treebd5cc13581036a42b3b38b206e7310cd4ec9ac28 /eclass
parentkde-frameworks/kdelibs: 4.14.38 version bump w/ openssl-1.1 fix (diff)
downloadkde-sunset-8c03b0cc0933cb00fc044558db2bc8295e93d293.tar.gz
kde-sunset-8c03b0cc0933cb00fc044558db2bc8295e93d293.tar.bz2
kde-sunset-8c03b0cc0933cb00fc044558db2bc8295e93d293.zip
qmake-utils.eclass: Unbreak qt_4*() functions with EAPI-7
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qmake-utils.eclass8
1 files changed, 1 insertions, 7 deletions
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 0ebd7329..65f87e8e 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: qmake-utils.eclass
@@ -22,7 +22,6 @@ 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
@@ -37,7 +36,6 @@ 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,7 +43,6 @@ 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,7 +50,6 @@ 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
}
@@ -61,7 +57,6 @@ 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
}
@@ -164,7 +159,6 @@ 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"