Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: gnome@g.o, kde@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH] *.eclass: Include GNOME2_ECLASS_ICONS condition in postrm as well
Date: Sat, 08 Jul 2017 19:49:36
Message-Id: 20170708194911.3887-1-mgorny@gentoo.org
1 The original GNOME2_ECLASS_ICONS patch has moved the condition from
2 gnome2_icon_cache_update to postinst phases of functions using
3 the preinst/postinst logic but accidentally omitted postrm. Include it
4 there as well to restore the old behavior.
5 ---
6 eclass/gnome2.eclass | 4 +++-
7 eclass/kde4-base.eclass | 4 +++-
8 eclass/kde5.eclass | 4 +++-
9 eclass/xfconf.eclass | 4 +++-
10 4 files changed, 12 insertions(+), 4 deletions(-)
11
12 diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
13 index feb6301221ea..cb233e747605 100644
14 --- a/eclass/gnome2.eclass
15 +++ b/eclass/gnome2.eclass
16 @@ -359,7 +359,9 @@ gnome2_pkg_postinst() {
17 # Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
18 gnome2_pkg_postrm() {
19 xdg_pkg_postrm
20 - gnome2_icon_cache_update
21 + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
22 + gnome2_icon_cache_update
23 + fi
24 gnome2_schemas_update
25 gnome2_scrollkeeper_update
26
27 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
28 index bbdcf8db20f4..494e79518da9 100644
29 --- a/eclass/kde4-base.eclass
30 +++ b/eclass/kde4-base.eclass
31 @@ -936,7 +936,9 @@ kde4-base_pkg_postinst() {
32 kde4-base_pkg_postrm() {
33 debug-print-function ${FUNCNAME} "$@"
34
35 - gnome2_icon_cache_update
36 + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
37 + gnome2_icon_cache_update
38 + fi
39 fdo-mime_desktop_database_update
40 fdo-mime_mime_database_update
41 buildsycoca
42 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
43 index 3b6810526a0a..7843f5eace78 100644
44 --- a/eclass/kde5.eclass
45 +++ b/eclass/kde5.eclass
46 @@ -748,7 +748,9 @@ kde5_pkg_postinst() {
47 kde5_pkg_postrm() {
48 debug-print-function ${FUNCNAME} "$@"
49
50 - gnome2_icon_cache_update
51 + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
52 + gnome2_icon_cache_update
53 + fi
54 xdg_pkg_postrm
55 }
56
57 diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
58 index b91d0fe1eda3..4cbcb8fa9a4e 100644
59 --- a/eclass/xfconf.eclass
60 +++ b/eclass/xfconf.eclass
61 @@ -151,5 +151,7 @@ xfconf_pkg_postrm() {
62 debug-print-function ${FUNCNAME} "$@"
63 fdo-mime_desktop_database_update
64 fdo-mime_mime_database_update
65 - gnome2_icon_cache_update
66 + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
67 + gnome2_icon_cache_update
68 + fi
69 }
70 --
71 2.13.2