Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
Date: Fri, 16 Feb 2018 10:31:09
Message-Id: 1518777051.ed16cc395de8f8d21f310d2f2792f8e82f9c2694.asturm@gentoo
1 commit: ed16cc395de8f8d21f310d2f2792f8e82f9c2694
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 16 10:28:58 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 16 10:30:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed16cc39
7
8 sci-geosciences/merkaartor: Switch to xdg-utils
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild | 6 +++---
13 sci-geosciences/merkaartor/merkaartor-9999.ebuild | 6 +++---
14 2 files changed, 6 insertions(+), 6 deletions(-)
15
16 diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
17 index 30f2f46f37e..9470b88ad6f 100644
18 --- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
19 +++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
20 @@ -5,7 +5,7 @@ EAPI=6
21
22 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
23
24 -inherit fdo-mime gnome2-utils l10n qmake-utils
25 +inherit gnome2-utils l10n qmake-utils xdg-utils
26
27 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
28 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
29 @@ -79,11 +79,11 @@ pkg_preinst() {
30 }
31
32 pkg_postinst() {
33 - fdo-mime_desktop_database_update
34 + xdg_desktop_database_update
35 gnome2_icon_cache_update
36 }
37
38 pkg_postrm() {
39 - fdo-mime_desktop_database_update
40 + xdg_desktop_database_update
41 gnome2_icon_cache_update
42 }
43
44 diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
45 index 15304170c5d..fa01cf15ac0 100644
46 --- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
47 +++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
48 @@ -5,7 +5,7 @@ EAPI=6
49
50 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
51
52 -inherit fdo-mime gnome2-utils git-r3 l10n qmake-utils
53 +inherit git-r3 gnome2-utils l10n qmake-utils xdg-utils
54
55 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
56 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
57 @@ -85,11 +85,11 @@ pkg_preinst() {
58 }
59
60 pkg_postinst() {
61 - fdo-mime_desktop_database_update
62 + xdg_desktop_database_update
63 gnome2_icon_cache_update
64 }
65
66 pkg_postrm() {
67 - fdo-mime_desktop_database_update
68 + xdg_desktop_database_update
69 gnome2_icon_cache_update
70 }