diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /eclass/kde5.eclass | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'eclass/kde5.eclass')
| -rw-r--r-- | eclass/kde5.eclass | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index db9fc4427c71..ee1d3b35aa8c 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -4,7 +4,7 @@ # @ECLASS: kde5.eclass # @MAINTAINER: # kde@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 @@ -207,10 +203,10 @@ case ${KDE_DESIGNERPLUGIN} in false) ;; *) IUSE+=" designer" - if [[ ${CATEGORY} = kde-frameworks ]]; then - BDEPEND+=" designer? ( $(add_qt_dep designer) )" - else + if [[ ${CATEGORY} = kde-apps && ${PV} = 19.0[48]* ]]; then BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" + else + BDEPEND+=" designer? ( $(add_qt_dep designer) )" fi esac @@ -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 |