app-text/calibre: migrate from fdo-mime to xdg-utils

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild
index 0470a20521e0edec60563e033123e0f58aedf879..4925b5e794f0447f9bc08450fee6ec5bc2b1d0d7 100644 (file)
--- a/app-text/calibre/calibre-2.78.0.ebuild
+++ b/app-text/calibre/calibre-2.78.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,ssl"
 
-inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="http://calibre-ebook.com/"
@@ -60,6 +60,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-qt/qtcore:5
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5
+       dev-util/desktop-file-utils
+       dev-util/gtk-update-icon-cache
        media-fonts/liberation-fonts
        >=media-gfx/imagemagick-6.5.9[jpeg,png]
        media-libs/fontconfig
@@ -72,6 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
        x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXrender
+       x11-misc/shared-mime-info
        >=x11-misc/xdg-utils-1.0.2-r2
        udisks? ( virtual/libudev )"
 RDEPEND="${COMMON_DEPEND}
@@ -253,13 +256,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       fdo-mime_desktop_database_update
-       fdo-mime_mime_database_update
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-       fdo-mime_desktop_database_update
-       fdo-mime_mime_database_update
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        gnome2_icon_cache_update
 }

diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild
index c209a7863de23f4c7baf95c5a930a552afcb03f6..685494d3112a4a2d3dd196e0f8ebd38b04c8a658 100644 (file)
--- a/app-text/calibre/calibre-3.15.0.ebuild
+++ b/app-text/calibre/calibre-3.15.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,ssl"
 
-inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="http://calibre-ebook.com/"
@@ -68,6 +68,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-qt/qtdbus:5=
        dev-qt/qtgui:5=
        dev-qt/qtwidgets:5=
+       dev-util/desktop-file-utils
+       dev-util/gtk-update-icon-cache
        media-fonts/liberation-fonts
        media-libs/fontconfig:=
        >=media-libs/freetype-2:=
@@ -81,6 +83,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
        x11-libs/libX11:=
        x11-libs/libXext:=
        x11-libs/libXrender:=
+       x11-misc/shared-mime-info
        >=x11-misc/xdg-utils-1.0.2-r2
        ios? (
                >=app-pda/usbmuxd-1.0.8
@@ -278,13 +281,13 @@ pkg_postinst() {
                        rm -rf "${x}"
                fi
        done
-       fdo-mime_desktop_database_update
-       fdo-mime_mime_database_update
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-       fdo-mime_desktop_database_update
-       fdo-mime_mime_database_update
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        gnome2_icon_cache_update
 }

diff --git a/app-text/calibre/calibre-3.8.0.ebuild b/app-text/calibre/calibre-3.8.0.ebuild
index 09ba809e224b8da931504a692a3e52b57240bfbb..9c035ba938690a829e622b805a2362671583f81f 100644 (file)
--- a/app-text/calibre/calibre-3.8.0.ebuild
+++ b/app-text/calibre/calibre-3.8.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,ssl"
 
-inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="http://calibre-ebook.com/"
@@ -66,6 +66,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-qt/qtcore:5
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5
+       dev-util/desktop-file-utils
+       dev-util/gtk-update-icon-cache
        media-fonts/liberation-fonts
        >=media-gfx/imagemagick-6.5.9[jpeg,png]
        media-libs/fontconfig
@@ -79,6 +81,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
        x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXrender
+       x11-misc/shared-mime-info
        >=x11-misc/xdg-utils-1.0.2-r2
        ios? (
                >=app-pda/usbmuxd-1.0.8
@@ -276,13 +279,13 @@ pkg_postinst() {
                        rm -rf "${x}"
                fi
        done
-       fdo-mime_desktop_database_update
-       fdo-mime_mime_database_update
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-       fdo-mime_desktop_database_update
-       fdo-mime_mime_database_update
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
        gnome2_icon_cache_update
 }