[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ed16cc395de8f8d21f310d2f2792f8e82f9c2694
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 10:28:58 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 10:30:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed16cc39

sci-geosciences/merkaartor: Switch to xdg-utils

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild | 6 +++---
 sci-geosciences/merkaartor/merkaartor-9999.ebuild      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
index 30f2f46f37e..9470b88ad6f 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 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"
 
-inherit fdo-mime gnome2-utils l10n qmake-utils
+inherit gnome2-utils l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -79,11 +79,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 15304170c5d..fa01cf15ac0 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 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"
 
-inherit fdo-mime gnome2-utils git-r3 l10n qmake-utils
+inherit git-r3 gnome2-utils l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -85,11 +85,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }