commit: 5d630a1920cb8dabde85828f8b7731373a49ce96 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Jan 8 07:08:51 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Jan 8 07:10:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d630a19
app-text/calibre: migrate from fdo-mime to xdg-utils Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-text/calibre/calibre-2.78.0.ebuild | 13 ++++++++----- app-text/calibre/calibre-3.15.0.ebuild | 13 ++++++++----- app-text/calibre/calibre-3.8.0.ebuild | 13 ++++++++----- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild index 0470a20521e..4925b5e794f 100644 --- 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 c209a7863de..685494d3112 100644 --- 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 09ba809e224..9c035ba9386 100644 --- 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 }
