[gentoo-commits] repo/gentoo:master commit in: net-print/cups/

[Lars Wendler]

commit:     9d14f6c49aec215e26c6e1f5f0ac858edfc833c6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 09:07:26 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 09:07:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d14f6c4

net-print/cups: Replaced fdo-mime with xdg-utils eclass.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 net-print/cups/cups-2.2.4.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-print/cups/cups-2.2.4.ebuild b/net-print/cups/cups-2.2.4.ebuild
index 1022bea6f56..af840a3d0aa 100644
--- a/net-print/cups/cups-2.2.4.ebuild
+++ b/net-print/cups/cups-2.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
        multilib multilib-minimal pam python-single-r1 user versionator \
        java-pkg-opt-2 systemd toolchain-funcs
 
@@ -88,7 +88,7 @@ RESTRICT="test"
 # systemd-socket.patch from Fedora
 PATCHES=(
        "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
-       "${FILESDIR}/${PN}-2.2.4-fix-install-perms.patch"
+       "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
        "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
        "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
@@ -318,7 +318,7 @@ pkg_preinst() {
 pkg_postinst() {
        # Update desktop file database and gtk icon cache (bug 370059)
        gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
+       xdg_desktop_database_update
 
        local v
 
@@ -345,5 +345,5 @@ pkg_postinst() {
 pkg_postrm() {
        # Update desktop file database and gtk icon cache (bug 370059)
        gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
+       xdg_desktop_database_update
 }