commit: 6e81cf122526cf466ae853c041c8bc00e4d651d3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 14:47:17 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 09:23:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e81cf12
kde5.eclass: Drop EAPI-6 support
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/kde5.eclass | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index db9fc4427c7..e446e02592b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -4,7 +4,7 @@
# @ECLASS: kde5.eclass
# @MAINTAINER:
# k...@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
# @BLURB: Support eclass for packages that follow KDE packaging conventions.
# @DESCRIPTION:
# This eclass is intended to streamline the creation of ebuilds for packages
@@ -34,10 +34,6 @@ _KDE5_ECLASS=1
inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
-case ${EAPI} in
- 6) inherit eapi7-ver eutils gnome2-utils ;;
-esac
-
if [[ ${KDE_BUILD_TYPE} = live ]]; then
inherit git-r3
fi
@@ -257,10 +253,6 @@ case ${KDE_SELINUX_MODULE} in
;;
esac
-case ${EAPI} in
- 6) DEPEND+=" ${BDEPEND}" ;;
-esac
-
DEPEND+=" ${COMMONDEPEND}"
RDEPEND+=" ${COMMONDEPEND}"
unset COMMONDEPEND
@@ -619,9 +611,9 @@ kde5_src_configure() {
cmakeargs+=(
# install mkspecs in the same directory as qt stuff
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ # move handbook outside of doc dir, bug 667138
+ -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help"
)
- # move handbook outside of doc dir for at least two QA
warnings, bug 667138
- [[ ${EAPI} != 6 ]] && cmakeargs+=(
-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" )
fi
# allow the ebuild to override what we set here
@@ -674,22 +666,11 @@ kde5_src_test() {
# @FUNCTION: kde5_src_install
# @DESCRIPTION:
-# Wrapper for cmake-utils_src_install with extra logic to avoid compressing
-# certain types of files. For example, khelpcenter is not able to read
-# compressed handbooks.
+# Wrapper for cmake-utils_src_install. Currently doesn't do anything extra.
kde5_src_install() {
debug-print-function ${FUNCNAME} "$@"
cmake-utils_src_install
-
- if [[ ${EAPI} = 6 ]]; then
- # We don't want /usr/share/doc/HTML to be compressed,
- # because then khelpcenter can't find the docs
- #todo: clean up trailing slash check when EAPI <7 is removed
- if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
- docompress -x /usr/share/doc/HTML
- fi
- fi
}
# @FUNCTION: kde5_pkg_preinst
