Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Fri, 29 Jan 2016 10:34:05
Message-Id: 1454061864.82b1bdcc1fe9c333b7cf2e3990badb4ee5229c22.kensington@gentoo
1 commit: 82b1bdcc1fe9c333b7cf2e3990badb4ee5229c22
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 29 10:04:24 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 29 10:04:24 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=82b1bdcc
7
8 kde5.eclass: port from fdo-mime to xdg
9
10 This will ensure that both the desktop database and the mime database will
11 always be updated, with the added benefit that the update will only be
12 triggered if the relevant files are installed.
13
14 eclass/kde5.eclass | 7 ++++---
15 1 file changed, 4 insertions(+), 3 deletions(-)
16
17 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
18 index 2218212..70437b1 100644
19 --- a/eclass/kde5.eclass
20 +++ b/eclass/kde5.eclass
21 @@ -19,7 +19,7 @@ _KDE5_ECLASS=1
22 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
23 : ${VIRTUALX_REQUIRED:=manual}
24
25 -inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx
26 +inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg
27
28 if [[ ${KDE_BUILD_TYPE} = live ]]; then
29 case ${KDE_SCM} in
30 @@ -627,6 +627,7 @@ kde5_pkg_preinst() {
31 debug-print-function ${FUNCNAME} "$@"
32
33 gnome2_icon_savelist
34 + xdg_pkg_preinst
35 }
36
37 # @FUNCTION: kde5_pkg_postinst
38 @@ -636,7 +637,7 @@ kde5_pkg_postinst() {
39 debug-print-function ${FUNCNAME} "$@"
40
41 gnome2_icon_cache_update
42 - fdo-mime_desktop_database_update
43 + xdg_pkg_postinst
44 }
45
46 # @FUNCTION: kde5_pkg_postrm
47 @@ -646,7 +647,7 @@ kde5_pkg_postrm() {
48 debug-print-function ${FUNCNAME} "$@"
49
50 gnome2_icon_cache_update
51 - fdo-mime_desktop_database_update
52 + xdg_pkg_postrm
53 }
54
55 fi