[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/

[Mike Gilbert]

commit:     c0b128f42da22b0fe7ae81e521aaee72d60cefac
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Sep 11 17:47:25 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 18:39:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b128f4

app-i18n/fcitx: Use xdg-utils.eclass directly instead of xdg.eclass.

 app-i18n/fcitx/fcitx-4.2.9.1.ebuild | 13 +++++--------
 app-i18n/fcitx/fcitx-9999.ebuild    | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild 
b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
index 3f8c5d9bced..9a08d662655 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils multilib xdg
+inherit cmake-utils gnome2-utils xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
        inherit git-r3
@@ -121,21 +121,18 @@ src_install() {
        rm -r "${ED}usr/share/doc/${PN}"
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-       xdg_pkg_preinst
-}
-
 pkg_postinst() {
        gnome2_icon_cache_update
-       xdg_pkg_postinst
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        use gtk2 && gnome2_query_immodules_gtk2
        use gtk3 && gnome2_query_immodules_gtk3
 }
 
 pkg_postrm() {
        gnome2_icon_cache_update
-       xdg_pkg_postrm
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        use gtk2 && gnome2_query_immodules_gtk2
        use gtk3 && gnome2_query_immodules_gtk3
 }

diff --git a/app-i18n/fcitx/fcitx-9999.ebuild b/app-i18n/fcitx/fcitx-9999.ebuild
index 73c258d323b..f4297bdcc05 100644
--- a/app-i18n/fcitx/fcitx-9999.ebuild
+++ b/app-i18n/fcitx/fcitx-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils multilib xdg
+inherit cmake-utils gnome2-utils xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
        inherit git-r3
@@ -116,21 +116,18 @@ src_install() {
        rm -r "${ED}usr/share/doc/${PN}"
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-       xdg_pkg_preinst
-}
-
 pkg_postinst() {
        gnome2_icon_cache_update
-       xdg_pkg_postinst
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        use gtk2 && gnome2_query_immodules_gtk2
        use gtk3 && gnome2_query_immodules_gtk3
 }
 
 pkg_postrm() {
        gnome2_icon_cache_update
-       xdg_pkg_postrm
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        use gtk2 && gnome2_query_immodules_gtk2
        use gtk3 && gnome2_query_immodules_gtk3
 }