1 |
commit: d94b36341a3a637744579b04180bddaf62d838a9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 31 16:37:42 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 27 19:00:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94b3634 |
7 |
|
8 |
qmake-utils.eclass: Ban Qt4-support in EAPI >=7 |
9 |
|
10 |
eclass/qmake-utils.eclass | 6 ++++++ |
11 |
1 file changed, 6 insertions(+) |
12 |
|
13 |
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass |
14 |
index 74ceca4aadd..67e13d7006b 100644 |
15 |
--- a/eclass/qmake-utils.eclass |
16 |
+++ b/eclass/qmake-utils.eclass |
17 |
@@ -24,6 +24,7 @@ inherit estack toolchain-funcs |
18 |
# Echoes the directory where Qt4 binaries are installed. |
19 |
# EPREFIX is already prepended to the returned path. |
20 |
qt4_get_bindir() { |
21 |
+ [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" |
22 |
has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= |
23 |
|
24 |
local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin |
25 |
@@ -38,6 +39,7 @@ qt4_get_bindir() { |
26 |
# @DESCRIPTION: |
27 |
# Echoes the directory where Qt4 headers are installed. |
28 |
qt4_get_headerdir() { |
29 |
+ [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" |
30 |
echo /usr/include/qt4 |
31 |
} |
32 |
|
33 |
@@ -45,6 +47,7 @@ qt4_get_headerdir() { |
34 |
# @DESCRIPTION: |
35 |
# Echoes the directory where Qt4 libraries are installed. |
36 |
qt4_get_libdir() { |
37 |
+ [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" |
38 |
echo /usr/$(get_libdir)/qt4 |
39 |
} |
40 |
|
41 |
@@ -52,6 +55,7 @@ qt4_get_libdir() { |
42 |
# @DESCRIPTION: |
43 |
# Echoes the directory where Qt4 mkspecs are installed. |
44 |
qt4_get_mkspecsdir() { |
45 |
+ [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" |
46 |
echo /usr/share/qt4/mkspecs |
47 |
} |
48 |
|
49 |
@@ -59,6 +63,7 @@ qt4_get_mkspecsdir() { |
50 |
# @DESCRIPTION: |
51 |
# Echoes the directory where Qt4 plugins are installed. |
52 |
qt4_get_plugindir() { |
53 |
+ [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" |
54 |
echo $(qt4_get_libdir)/plugins |
55 |
} |
56 |
|
57 |
@@ -161,6 +166,7 @@ qmake-utils_find_pro_file() { |
58 |
eqmake4() { |
59 |
debug-print-function ${FUNCNAME} "$@" |
60 |
|
61 |
+ [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" |
62 |
has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= |
63 |
|
64 |
ebegin "Running qmake" |