1 |
commit: 5d630a1920cb8dabde85828f8b7731373a49ce96 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 8 07:08:51 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 8 07:10:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d630a19 |
7 |
|
8 |
app-text/calibre: migrate from fdo-mime to xdg-utils |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
app-text/calibre/calibre-2.78.0.ebuild | 13 ++++++++----- |
13 |
app-text/calibre/calibre-3.15.0.ebuild | 13 ++++++++----- |
14 |
app-text/calibre/calibre-3.8.0.ebuild | 13 ++++++++----- |
15 |
3 files changed, 24 insertions(+), 15 deletions(-) |
16 |
|
17 |
diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild |
18 |
index 0470a20521e..4925b5e794f 100644 |
19 |
--- a/app-text/calibre/calibre-2.78.0.ebuild |
20 |
+++ b/app-text/calibre/calibre-2.78.0.ebuild |
21 |
@@ -6,7 +6,7 @@ EAPI=6 |
22 |
PYTHON_COMPAT=( python2_7 ) |
23 |
PYTHON_REQ_USE="sqlite,ssl" |
24 |
|
25 |
-inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 |
26 |
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils |
27 |
|
28 |
DESCRIPTION="Ebook management application" |
29 |
HOMEPAGE="http://calibre-ebook.com/" |
30 |
@@ -60,6 +60,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
31 |
dev-qt/qtcore:5 |
32 |
dev-qt/qtgui:5 |
33 |
dev-qt/qtwidgets:5 |
34 |
+ dev-util/desktop-file-utils |
35 |
+ dev-util/gtk-update-icon-cache |
36 |
media-fonts/liberation-fonts |
37 |
>=media-gfx/imagemagick-6.5.9[jpeg,png] |
38 |
media-libs/fontconfig |
39 |
@@ -72,6 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
40 |
x11-libs/libX11 |
41 |
x11-libs/libXext |
42 |
x11-libs/libXrender |
43 |
+ x11-misc/shared-mime-info |
44 |
>=x11-misc/xdg-utils-1.0.2-r2 |
45 |
udisks? ( virtual/libudev )" |
46 |
RDEPEND="${COMMON_DEPEND} |
47 |
@@ -253,13 +256,13 @@ pkg_preinst() { |
48 |
} |
49 |
|
50 |
pkg_postinst() { |
51 |
- fdo-mime_desktop_database_update |
52 |
- fdo-mime_mime_database_update |
53 |
+ xdg_desktop_database_update |
54 |
+ xdg_mimeinfo_database_update |
55 |
gnome2_icon_cache_update |
56 |
} |
57 |
|
58 |
pkg_postrm() { |
59 |
- fdo-mime_desktop_database_update |
60 |
- fdo-mime_mime_database_update |
61 |
+ xdg_desktop_database_update |
62 |
+ xdg_mimeinfo_database_update |
63 |
gnome2_icon_cache_update |
64 |
} |
65 |
|
66 |
diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild |
67 |
index c209a7863de..685494d3112 100644 |
68 |
--- a/app-text/calibre/calibre-3.15.0.ebuild |
69 |
+++ b/app-text/calibre/calibre-3.15.0.ebuild |
70 |
@@ -6,7 +6,7 @@ EAPI=6 |
71 |
PYTHON_COMPAT=( python2_7 ) |
72 |
PYTHON_REQ_USE="sqlite,ssl" |
73 |
|
74 |
-inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 |
75 |
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils |
76 |
|
77 |
DESCRIPTION="Ebook management application" |
78 |
HOMEPAGE="http://calibre-ebook.com/" |
79 |
@@ -68,6 +68,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
80 |
dev-qt/qtdbus:5= |
81 |
dev-qt/qtgui:5= |
82 |
dev-qt/qtwidgets:5= |
83 |
+ dev-util/desktop-file-utils |
84 |
+ dev-util/gtk-update-icon-cache |
85 |
media-fonts/liberation-fonts |
86 |
media-libs/fontconfig:= |
87 |
>=media-libs/freetype-2:= |
88 |
@@ -81,6 +83,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
89 |
x11-libs/libX11:= |
90 |
x11-libs/libXext:= |
91 |
x11-libs/libXrender:= |
92 |
+ x11-misc/shared-mime-info |
93 |
>=x11-misc/xdg-utils-1.0.2-r2 |
94 |
ios? ( |
95 |
>=app-pda/usbmuxd-1.0.8 |
96 |
@@ -278,13 +281,13 @@ pkg_postinst() { |
97 |
rm -rf "${x}" |
98 |
fi |
99 |
done |
100 |
- fdo-mime_desktop_database_update |
101 |
- fdo-mime_mime_database_update |
102 |
+ xdg_desktop_database_update |
103 |
+ xdg_mimeinfo_database_update |
104 |
gnome2_icon_cache_update |
105 |
} |
106 |
|
107 |
pkg_postrm() { |
108 |
- fdo-mime_desktop_database_update |
109 |
- fdo-mime_mime_database_update |
110 |
+ xdg_desktop_database_update |
111 |
+ xdg_mimeinfo_database_update |
112 |
gnome2_icon_cache_update |
113 |
} |
114 |
|
115 |
diff --git a/app-text/calibre/calibre-3.8.0.ebuild b/app-text/calibre/calibre-3.8.0.ebuild |
116 |
index 09ba809e224..9c035ba9386 100644 |
117 |
--- a/app-text/calibre/calibre-3.8.0.ebuild |
118 |
+++ b/app-text/calibre/calibre-3.8.0.ebuild |
119 |
@@ -6,7 +6,7 @@ EAPI=6 |
120 |
PYTHON_COMPAT=( python2_7 ) |
121 |
PYTHON_REQ_USE="sqlite,ssl" |
122 |
|
123 |
-inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 |
124 |
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils |
125 |
|
126 |
DESCRIPTION="Ebook management application" |
127 |
HOMEPAGE="http://calibre-ebook.com/" |
128 |
@@ -66,6 +66,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
129 |
dev-qt/qtcore:5 |
130 |
dev-qt/qtgui:5 |
131 |
dev-qt/qtwidgets:5 |
132 |
+ dev-util/desktop-file-utils |
133 |
+ dev-util/gtk-update-icon-cache |
134 |
media-fonts/liberation-fonts |
135 |
>=media-gfx/imagemagick-6.5.9[jpeg,png] |
136 |
media-libs/fontconfig |
137 |
@@ -79,6 +81,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
138 |
x11-libs/libX11 |
139 |
x11-libs/libXext |
140 |
x11-libs/libXrender |
141 |
+ x11-misc/shared-mime-info |
142 |
>=x11-misc/xdg-utils-1.0.2-r2 |
143 |
ios? ( |
144 |
>=app-pda/usbmuxd-1.0.8 |
145 |
@@ -276,13 +279,13 @@ pkg_postinst() { |
146 |
rm -rf "${x}" |
147 |
fi |
148 |
done |
149 |
- fdo-mime_desktop_database_update |
150 |
- fdo-mime_mime_database_update |
151 |
+ xdg_desktop_database_update |
152 |
+ xdg_mimeinfo_database_update |
153 |
gnome2_icon_cache_update |
154 |
} |
155 |
|
156 |
pkg_postrm() { |
157 |
- fdo-mime_desktop_database_update |
158 |
- fdo-mime_mime_database_update |
159 |
+ xdg_desktop_database_update |
160 |
+ xdg_mimeinfo_database_update |
161 |
gnome2_icon_cache_update |
162 |
} |