Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/
Date: Mon, 08 Jan 2018 02:16:55
Message-Id: 1515377797.ca867bcc34fa438c48e0632de7fe07db7c986fb8.zmedico@gentoo
1 commit: ca867bcc34fa438c48e0632de7fe07db7c986fb8
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 8 02:04:57 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 8 02:16:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca867bcc
7
8 app-text/calibre: call gnome2_icon_cache_update
9
10 Closes: https://bugs.gentoo.org/643832
11 Package-Manager: Portage-2.3.19, Repoman-2.3.6
12
13 app-text/calibre/calibre-2.78.0.ebuild | 10 ++++++++--
14 app-text/calibre/calibre-3.15.0.ebuild | 5 ++++-
15 app-text/calibre/calibre-3.3.0.ebuild | 7 +++++--
16 app-text/calibre/calibre-3.8.0.ebuild | 7 +++++--
17 4 files changed, 22 insertions(+), 7 deletions(-)
18
19 diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild
20 index b2d45db79e7..1e03a38661b 100644
21 --- a/app-text/calibre/calibre-2.78.0.ebuild
22 +++ b/app-text/calibre/calibre-2.78.0.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2017 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -6,7 +6,7 @@ EAPI=6
30 PYTHON_COMPAT=( python2_7 )
31 PYTHON_REQ_USE="sqlite,ssl"
32
33 -inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
34 +inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1
35
36 DESCRIPTION="Ebook management application"
37 HOMEPAGE="http://calibre-ebook.com/"
38 @@ -240,12 +240,18 @@ src_install() {
39
40 }
41
42 +pkg_preinst() {
43 + gnome2_icon_savelist
44 +}
45 +
46 pkg_postinst() {
47 fdo-mime_desktop_database_update
48 fdo-mime_mime_database_update
49 + gnome2_icon_cache_update
50 }
51
52 pkg_postrm() {
53 fdo-mime_desktop_database_update
54 fdo-mime_mime_database_update
55 + gnome2_icon_cache_update
56 }
57
58 diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild
59 index ec7d26d1453..87d9fc99591 100644
60 --- a/app-text/calibre/calibre-3.15.0.ebuild
61 +++ b/app-text/calibre/calibre-3.15.0.ebuild
62 @@ -6,7 +6,7 @@ EAPI=6
63 PYTHON_COMPAT=( python2_7 )
64 PYTHON_REQ_USE="sqlite,ssl"
65
66 -inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
67 +inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1
68
69 DESCRIPTION="Ebook management application"
70 HOMEPAGE="http://calibre-ebook.com/"
71 @@ -253,6 +253,7 @@ src_install() {
72 }
73
74 pkg_preinst() {
75 + gnome2_icon_savelist
76 # Indentify stray directories from upstream's "Binary install"
77 # method (see bug 622728).
78 CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
79 @@ -271,9 +272,11 @@ pkg_postinst() {
80 done
81 fdo-mime_desktop_database_update
82 fdo-mime_mime_database_update
83 + gnome2_icon_cache_update
84 }
85
86 pkg_postrm() {
87 fdo-mime_desktop_database_update
88 fdo-mime_mime_database_update
89 + gnome2_icon_cache_update
90 }
91
92 diff --git a/app-text/calibre/calibre-3.3.0.ebuild b/app-text/calibre/calibre-3.3.0.ebuild
93 index 46710a8a845..8cf13775969 100644
94 --- a/app-text/calibre/calibre-3.3.0.ebuild
95 +++ b/app-text/calibre/calibre-3.3.0.ebuild
96 @@ -1,4 +1,4 @@
97 -# Copyright 1999-2017 Gentoo Foundation
98 +# Copyright 1999-2018 Gentoo Foundation
99 # Distributed under the terms of the GNU General Public License v2
100
101 EAPI=6
102 @@ -6,7 +6,7 @@ EAPI=6
103 PYTHON_COMPAT=( python2_7 )
104 PYTHON_REQ_USE="sqlite,ssl"
105
106 -inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
107 +inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1
108
109 DESCRIPTION="Ebook management application"
110 HOMEPAGE="http://calibre-ebook.com/"
111 @@ -250,6 +250,7 @@ src_install() {
112 }
113
114 pkg_preinst() {
115 + gnome2_icon_savelist
116 # Indentify stray directories from upstream's "Binary install"
117 # method (see bug 622728).
118 CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
119 @@ -268,9 +269,11 @@ pkg_postinst() {
120 done
121 fdo-mime_desktop_database_update
122 fdo-mime_mime_database_update
123 + gnome2_icon_cache_update
124 }
125
126 pkg_postrm() {
127 fdo-mime_desktop_database_update
128 fdo-mime_mime_database_update
129 + gnome2_icon_cache_update
130 }
131
132 diff --git a/app-text/calibre/calibre-3.8.0.ebuild b/app-text/calibre/calibre-3.8.0.ebuild
133 index e18eb11846b..f57de91b600 100644
134 --- a/app-text/calibre/calibre-3.8.0.ebuild
135 +++ b/app-text/calibre/calibre-3.8.0.ebuild
136 @@ -1,4 +1,4 @@
137 -# Copyright 1999-2017 Gentoo Foundation
138 +# Copyright 1999-2018 Gentoo Foundation
139 # Distributed under the terms of the GNU General Public License v2
140
141 EAPI=6
142 @@ -6,7 +6,7 @@ EAPI=6
143 PYTHON_COMPAT=( python2_7 )
144 PYTHON_REQ_USE="sqlite,ssl"
145
146 -inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
147 +inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1
148
149 DESCRIPTION="Ebook management application"
150 HOMEPAGE="http://calibre-ebook.com/"
151 @@ -251,6 +251,7 @@ src_install() {
152 }
153
154 pkg_preinst() {
155 + gnome2_icon_savelist
156 # Indentify stray directories from upstream's "Binary install"
157 # method (see bug 622728).
158 CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
159 @@ -269,9 +270,11 @@ pkg_postinst() {
160 done
161 fdo-mime_desktop_database_update
162 fdo-mime_mime_database_update
163 + gnome2_icon_cache_update
164 }
165
166 pkg_postrm() {
167 fdo-mime_desktop_database_update
168 fdo-mime_mime_database_update
169 + gnome2_icon_cache_update
170 }
Report Message
Find on MARC Find on Google Groups