diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-26 17:30:18 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-26 19:23:01 +0100 |
| commit | ffb0c22e668a43a12d27ffe002bf278eb7183191 (patch) | |
| tree | 7f82382b5153ccf644ab5c1307d7aa8ab908ede8 /eclass/kde5.eclass | |
| parent | 31ce5ad28f909fc3a080d72d41dd00ee44993412 (diff) | |
| download | kde-ffb0c22e668a43a12d27ffe002bf278eb7183191.tar.gz kde-ffb0c22e668a43a12d27ffe002bf278eb7183191.tar.bz2 kde-ffb0c22e668a43a12d27ffe002bf278eb7183191.zip | |
kde5.eclass: Revert "Fix KDE_INSTALL_LIBEXECDIR for EAPI-7 ebuilds"
No revdeps ported to EAPI-7 yet, so we are safe.
This reverts commit 16496a605e81e56500375918a02ca4b8f1c6fedf.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass/kde5.eclass')
| -rw-r--r-- | eclass/kde5.eclass | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 1c705c03f95..612d6345a60 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -51,8 +51,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_ # @DESCRIPTION: # If set to "false", do nothing. # For any other value, assume the package is using KDEInstallDirs macro and switch -# KDE_INSTALL_USE_QT_SYS_PATHS to ON. For EAPI-7 and above, fix KDE_INSTALL_LIBEXECDIR -# to use the correct location. +# KDE_INSTALL_USE_QT_SYS_PATHS to ON. : ${ECM_KDEINSTALLDIRS:=true} # @ECLASS-VARIABLE: KDE_AUTODEPS @@ -637,12 +636,6 @@ kde5_src_configure() { # install mkspecs in the same directory as qt stuff -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ) - if [[ ${EAPI} != 6 ]] ; then - cmakeargs+=( - # install to correct libexec location - -DKDE_INSTALL_LIBEXECDIR=${EPREFIX}/usr/libexec - ) - fi fi # allow the ebuild to override what we set here |