1 |
commit: b70549449af165b9f2473c2bee1b2b2d3af7e798 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 14 14:47:17 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 16 14:51:46 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b7054944 |
7 |
|
8 |
kde5.eclass: Drop EAPI-6 support |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
eclass/kde5.eclass | 25 +++---------------------- |
13 |
1 file changed, 3 insertions(+), 22 deletions(-) |
14 |
|
15 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
16 |
index a67836b251..281399ac6d 100644 |
17 |
--- a/eclass/kde5.eclass |
18 |
+++ b/eclass/kde5.eclass |
19 |
@@ -33,10 +33,6 @@ _KDE5_ECLASS=1 |
20 |
|
21 |
inherit cmake-utils flag-o-matic kde5-functions virtualx xdg |
22 |
|
23 |
-case ${EAPI} in |
24 |
- 6) inherit eapi7-ver eutils gnome2-utils ;; |
25 |
-esac |
26 |
- |
27 |
if [[ ${KDE_BUILD_TYPE} = live ]]; then |
28 |
inherit git-r3 |
29 |
fi |
30 |
@@ -261,10 +257,6 @@ case ${KDE_SELINUX_MODULE} in |
31 |
;; |
32 |
esac |
33 |
|
34 |
-case ${EAPI} in |
35 |
- 6) DEPEND+=" ${BDEPEND}" ;; |
36 |
-esac |
37 |
- |
38 |
DEPEND+=" ${COMMONDEPEND}" |
39 |
RDEPEND+=" ${COMMONDEPEND}" |
40 |
unset COMMONDEPEND |
41 |
@@ -624,9 +616,9 @@ kde5_src_configure() { |
42 |
cmakeargs+=( |
43 |
# install mkspecs in the same directory as qt stuff |
44 |
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
45 |
+ # move handbook outside of doc dir, bug 667138 |
46 |
+ -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" |
47 |
) |
48 |
- # move handbook outside of doc dir for at least two QA warnings, bug 667138 |
49 |
- [[ ${EAPI} != 6 ]] && cmakeargs+=( -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" ) |
50 |
fi |
51 |
|
52 |
# allow the ebuild to override what we set here |
53 |
@@ -679,22 +671,11 @@ kde5_src_test() { |
54 |
|
55 |
# @FUNCTION: kde5_src_install |
56 |
# @DESCRIPTION: |
57 |
-# Wrapper for cmake-utils_src_install with extra logic to avoid compressing |
58 |
-# certain types of files. For example, khelpcenter is not able to read |
59 |
-# compressed handbooks. |
60 |
+# Wrapper for cmake-utils_src_install. Currently doesn't do anything extra. |
61 |
kde5_src_install() { |
62 |
debug-print-function ${FUNCNAME} "$@" |
63 |
|
64 |
cmake-utils_src_install |
65 |
- |
66 |
- if [[ ${EAPI} = 6 ]]; then |
67 |
- # We don't want /usr/share/doc/HTML to be compressed, |
68 |
- # because then khelpcenter can't find the docs |
69 |
- #todo: clean up trailing slash check when EAPI <7 is removed |
70 |
- if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then |
71 |
- docompress -x /usr/share/doc/HTML |
72 |
- fi |
73 |
- fi |
74 |
} |
75 |
|
76 |
# @FUNCTION: kde5_pkg_preinst |