summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-03-13 10:49:58 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2011-03-13 10:50:15 +0100
commite4fd3de61b2d4f02c0de6afd63b9dee8811a36ee (patch)
tree7f0a8f08ba9bffee073c1dca3da0dcd30a974a20
parent79c3e51fee5bb6e5c9614bf4a8fb2dc431c7815b (diff)
downloadkde-e4fd3de61b2d4f02c0de6afd63b9dee8811a36ee.tar.gz
kde-e4fd3de61b2d4f02c0de6afd63b9dee8811a36ee.tar.bz2
kde-e4fd3de61b2d4f02c0de6afd63b9dee8811a36ee.zip
[eclasses] Store gtk icon caches.
-rw-r--r--eclass/kde4-base.eclass15
-rw-r--r--eclass/kde4-meta.eclass13
2 files changed, 24 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b2a6658d340..d8197d314e6 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -20,7 +20,7 @@
# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
: ${VIRTUALX_REQUIRED:=manual}
-inherit kde4-functions base virtualx eutils
+inherit kde4-functions gnome2-utils base virtualx eutils
if [[ ${BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
@@ -111,7 +111,7 @@ esac
inherit ${buildsystem_eclass}
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare ${export_fns} pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare ${export_fns} pkg_preinst pkg_postinst pkg_postrm
unset buildsystem_eclass
unset export_fns
@@ -925,12 +925,22 @@ kde4-base_src_install() {
cmake-utils_src_install
}
+# @FUNCTION: kde4-base_pkg_preinst
+# @DESCRIPTION:
+# Function storing icon caches
+kde4-base_pkg_preinst() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ gnome2_icon_savelist
+}
+
# @FUNCTION: kde4-base_pkg_postinst
# @DESCRIPTION:
# Function to rebuild the KDE System Configuration Cache after an application has been installed.
kde4-base_pkg_postinst() {
debug-print-function ${FUNCNAME} "$@"
+ gnome2_icon_cache_update
buildsycoca
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
@@ -980,5 +990,6 @@ kde4-base_pkg_postinst() {
kde4-base_pkg_postrm() {
debug-print-function ${FUNCNAME} "$@"
+ gnome2_icon_cache_update
buildsycoca
}
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 82173d31bae..5d91beeb762 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -18,10 +18,10 @@ inherit kde4-base toolchain-funcs versionator
case ${EAPI:-0} in
3)
- KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm"
+ KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
;;
*)
- KDEMETA_EXPF="pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm"
+ KDEMETA_EXPF="pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
;;
esac
EXPORT_FUNCTIONS ${KDEMETA_EXPF}
@@ -723,6 +723,15 @@ kde4-meta_src_install() {
kde4-base_src_install
}
+# @FUNCTION: kde4-meta_pkg_preinst
+# @DESCRIPTION:
+# Invoke its equivalent in kde4-base.eclass.
+kde4-meta_pkg_preinst() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ kde4-base_pkg_preinst
+}
+
# @FUNCTION: kde4-meta_pkg_postinst
# @DESCRIPTION:
# Invoke kbuildsycoca4.