[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     47de1d4c66517360f6330e2c6bc31b0254c9b4d2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 01:21:35 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 12:59:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47de1d4c

kde5.eclass: Limit use of gnome2-utils to EAPI-6

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 50fc23401b6..68bf7b6201b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -31,10 +31,10 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg
+inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
 
 case ${EAPI} in
-       6) inherit eapi7-ver eutils ;;
+       6) inherit eapi7-ver eutils gnome2-utils ;;
 esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
@@ -717,7 +717,7 @@ kde5_src_install() {
 kde5_pkg_preinst() {
        debug-print-function ${FUNCNAME} "$@"
 
-       gnome2_icon_savelist
+       [[ ${EAPI} == 6 ]] && gnome2_icon_savelist
        xdg_pkg_preinst
 }
 
@@ -727,7 +727,7 @@ kde5_pkg_preinst() {
 kde5_pkg_postinst() {
        debug-print-function ${FUNCNAME} "$@"
 
-       if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+       if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then
                gnome2_icon_cache_update
        fi
        xdg_pkg_postinst
@@ -748,7 +748,7 @@ kde5_pkg_postinst() {
 kde5_pkg_postrm() {
        debug-print-function ${FUNCNAME} "$@"
 
-       if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+       if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then
                gnome2_icon_cache_update
        fi
        xdg_pkg_postrm