Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sun, 01 Oct 2017 18:09:42
Message-Id: 1506881100.c6c821d0284913abd562055d59683fb33d0a13f1.asturm@gentoo
1 commit: c6c821d0284913abd562055d59683fb33d0a13f1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 1 18:05:00 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 1 18:05:00 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6c821d0
7
8 kde4-base.eclass: Switch from fdo-mime to xdg-utils
9
10 eclass/kde4-base.eclass | 10 +++++-----
11 1 file changed, 5 insertions(+), 5 deletions(-)
12
13 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
14 index 0348a5f80f..bac6a24fc1 100644
15 --- a/eclass/kde4-base.eclass
16 +++ b/eclass/kde4-base.eclass
17 @@ -33,7 +33,7 @@ _KDE4_BASE_ECLASS=1
18 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
19 : ${VIRTUALX_REQUIRED:=manual}
20
21 -inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils virtualx versionator eutils multilib
22 +inherit kde4-functions toolchain-funcs flag-o-matic gnome2-utils virtualx versionator eutils multilib xdg-utils
23
24 if [[ ${KDE_BUILD_TYPE} = live ]]; then
25 case ${KDE_SCM} in
26 @@ -982,8 +982,8 @@ kde4-base_pkg_postinst() {
27 if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
28 gnome2_icon_cache_update
29 fi
30 - fdo-mime_desktop_database_update
31 - fdo-mime_mime_database_update
32 + xdg_desktop_database_update
33 + xdg_mimeinfo_database_update
34 buildsycoca
35
36 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
37 @@ -1016,8 +1016,8 @@ kde4-base_pkg_postrm() {
38 if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
39 gnome2_icon_cache_update
40 fi
41 - fdo-mime_desktop_database_update
42 - fdo-mime_mime_database_update
43 + xdg_desktop_database_update
44 + xdg_mimeinfo_database_update
45 buildsycoca
46 }