| 1 |
commit: 47de1d4c66517360f6330e2c6bc31b0254c9b4d2 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 13 01:21:35 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 7 12:59:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47de1d4c |
| 7 |
|
| 8 |
kde5.eclass: Limit use of gnome2-utils to EAPI-6 |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/kde5.eclass | 10 +++++----- |
| 13 |
1 file changed, 5 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 16 |
index 50fc23401b6..68bf7b6201b 100644 |
| 17 |
--- a/eclass/kde5.eclass |
| 18 |
+++ b/eclass/kde5.eclass |
| 19 |
@@ -31,10 +31,10 @@ _KDE5_ECLASS=1 |
| 20 |
# for tests you should proceed with setting VIRTUALX_REQUIRED=test. |
| 21 |
: ${VIRTUALX_REQUIRED:=manual} |
| 22 |
|
| 23 |
-inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg |
| 24 |
+inherit cmake-utils flag-o-matic kde5-functions virtualx xdg |
| 25 |
|
| 26 |
case ${EAPI} in |
| 27 |
- 6) inherit eapi7-ver eutils ;; |
| 28 |
+ 6) inherit eapi7-ver eutils gnome2-utils ;; |
| 29 |
esac |
| 30 |
|
| 31 |
if [[ ${KDE_BUILD_TYPE} = live ]]; then |
| 32 |
@@ -717,7 +717,7 @@ kde5_src_install() { |
| 33 |
kde5_pkg_preinst() { |
| 34 |
debug-print-function ${FUNCNAME} "$@" |
| 35 |
|
| 36 |
- gnome2_icon_savelist |
| 37 |
+ [[ ${EAPI} == 6 ]] && gnome2_icon_savelist |
| 38 |
xdg_pkg_preinst |
| 39 |
} |
| 40 |
|
| 41 |
@@ -727,7 +727,7 @@ kde5_pkg_preinst() { |
| 42 |
kde5_pkg_postinst() { |
| 43 |
debug-print-function ${FUNCNAME} "$@" |
| 44 |
|
| 45 |
- if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then |
| 46 |
+ if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then |
| 47 |
gnome2_icon_cache_update |
| 48 |
fi |
| 49 |
xdg_pkg_postinst |
| 50 |
@@ -748,7 +748,7 @@ kde5_pkg_postinst() { |
| 51 |
kde5_pkg_postrm() { |
| 52 |
debug-print-function ${FUNCNAME} "$@" |
| 53 |
|
| 54 |
- if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then |
| 55 |
+ if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then |
| 56 |
gnome2_icon_cache_update |
| 57 |
fi |
| 58 |
xdg_pkg_postrm |
Archives