Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 08 Apr 2018 08:06:45
Message-Id: 1523174526.94d87dea13094c1683d50be97c9c5607c8393baa.perfinion@gentoo
1 commit: 94d87dea13094c1683d50be97c9c5607c8393baa
2 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
3 AuthorDate: Sat Apr 7 14:45:37 2018 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 08:02:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d87dea
7
8 eclass/xfconf: fdo-mime->xdg-utils
9
10 A very simple change, just replace the eclass and functions.
11 Mostly to just get the ebuilds using this eclass out of the qa-report:
12 https://qa-reports.gentoo.org/output/eclass-usage/fdo-mime.txt
13
14 Package-Manager: Portage-2.3.28, Repoman-2.3.9
15
16 eclass/xfconf.eclass | 14 +++++++-------
17 1 file changed, 7 insertions(+), 7 deletions(-)
18
19 diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
20 index 4cbcb8fa9a4..496c42d5cf1 100644
21 --- a/eclass/xfconf.eclass
22 +++ b/eclass/xfconf.eclass
23 @@ -25,7 +25,7 @@ fi
24 unset _xfconf_live
25 [[ $PV == *9999* ]] && _xfconf_live=git-2
26
27 -inherit ${_xfconf_live} autotools eutils fdo-mime gnome2-utils libtool
28 +inherit ${_xfconf_live} autotools eutils gnome2-utils libtool xdg-utils
29
30 EGIT_BOOTSTRAP=autogen.sh
31 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
32 @@ -134,11 +134,11 @@ xfconf_pkg_preinst() {
33
34 # @FUNCTION: xfconf_pkg_postinst
35 # @DESCRIPTION:
36 -# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
37 +# Run xdg_{desktop,mimeinfo}_database_update and gnome2_icon_cache_update
38 xfconf_pkg_postinst() {
39 debug-print-function ${FUNCNAME} "$@"
40 - fdo-mime_desktop_database_update
41 - fdo-mime_mime_database_update
42 + xdg_desktop_database_update
43 + xdg_mimeinfo_database_update
44 if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
45 gnome2_icon_cache_update
46 fi
47 @@ -146,11 +146,11 @@ xfconf_pkg_postinst() {
48
49 # @FUNCTION: xfconf_pkg_postrm
50 # @DESCRIPTION:
51 -# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
52 +# Run xdg_{desktop,mimeinfo}_database_update and gnome2_icon_cache_update
53 xfconf_pkg_postrm() {
54 debug-print-function ${FUNCNAME} "$@"
55 - fdo-mime_desktop_database_update
56 - fdo-mime_mime_database_update
57 + xdg_desktop_database_update
58 + xdg_mimeinfo_database_update
59 if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
60 gnome2_icon_cache_update
61 fi