diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-08-14 16:47:17 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-08-16 16:51:46 +0200 |
| commit | b70549449af165b9f2473c2bee1b2b2d3af7e798 (patch) | |
| tree | 98474a5701e1de751228fc450560767112e0dfd3 | |
| parent | app-office/calligraplan: Set KDE_APPS_MINIMAL=19.08.0 (diff) | |
| download | kde-b7054944.tar.gz kde-b7054944.tar.bz2 kde-b7054944.zip | |
kde5.eclass: Drop EAPI-6 support
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/kde5.eclass | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index a67836b251..281399ac6d 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -33,10 +33,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 @@ -261,10 +257,6 @@ case ${KDE_SELINUX_MODULE} in ;; esac -case ${EAPI} in - 6) DEPEND+=" ${BDEPEND}" ;; -esac - DEPEND+=" ${COMMONDEPEND}" RDEPEND+=" ${COMMONDEPEND}" unset COMMONDEPEND @@ -624,9 +616,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 @@ -679,22 +671,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 |