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

[Michael Palimaka]

commit:     9ae3ab41ae0eb1dec69b28e034ac731828c07e18
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 10:04:24 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:45:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae3ab41

kde5.eclass: port from fdo-mime to xdg

This will ensure that both the desktop database and the mime database will
always be updated, with the added benefit that the update will only be
triggered if the relevant files are installed.

 eclass/kde5.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2f60d44..1caeb38 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -19,7 +19,7 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions 
versionator virtualx
+inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions 
versionator virtualx xdg
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
        case ${KDE_SCM} in
@@ -574,6 +574,7 @@ kde5_pkg_preinst() {
        debug-print-function ${FUNCNAME} "$@"
 
        gnome2_icon_savelist
+       xdg_pkg_preinst
 }
 
 # @FUNCTION: kde5_pkg_postinst
@@ -583,7 +584,7 @@ kde5_pkg_postinst() {
        debug-print-function ${FUNCNAME} "$@"
 
        gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
+       xdg_pkg_postinst
 }
 
 # @FUNCTION: kde5_pkg_postrm
@@ -593,7 +594,7 @@ kde5_pkg_postrm() {
        debug-print-function ${FUNCNAME} "$@"
 
        gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
+       xdg_pkg_postrm
 }
 
 fi