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: Sat, 31 Oct 2020 22:00:26
Message-Id: 1604181615.d74e998d50080bf540ea722e68c20216772c9447.zmedico@gentoo
1 commit: d74e998d50080bf540ea722e68c20216772c9447
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 31 21:47:48 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 31 22:00:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74e998d
7
8 app-text/calibre: Bump to version 5.4.2
9
10 Closes: https://bugs.gentoo.org/744961
11 Package-Manager: Portage-3.0.8, Repoman-3.0.2
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 app-text/calibre/Manifest | 2 +
15 app-text/calibre/calibre-5.4.2.ebuild | 263 ++++++++++++++++++++++++++++++++++
16 2 files changed, 265 insertions(+)
17
18 diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
19 index 69fe6680f2a..14eb9b5daaf 100644
20 --- a/app-text/calibre/Manifest
21 +++ b/app-text/calibre/Manifest
22 @@ -3,3 +3,5 @@ DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b67
23 DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
24 DIST calibre-4.9.1-bug-731786.patch 1069 BLAKE2B 8b57fb89c9ec2d3a435fbc90f514d45468ceb96b46428efd5d2084cc9bb6137b49dd90dc2f7e574b6d8b8d536728392863046b068c39c8f9bcc3ae23678ac590 SHA512 acd158923bb369270155b3032b033a8387bcb53d1b0ea3e2c0724a40ec0cff6add5fca85649caaf37db0a0878fc3dafacc98b2b641cf10a8d58dc719642c6be5
25 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
26 +DIST calibre-5.4.2-SIP-v4.patch.xz 4640 BLAKE2B e8d20d9e23922885ecc3d24b7dd83579911dc83520037bad4e9323725c3127d348dc745dc725d137a3172e8891764355d3fcdee640a26cd6b142a2c26d00da0b SHA512 e79ee69ba0ca7e44c10c6670743889d0391d708e75c798e345e6228f483347f72b070e01e2a258590420a1eea6313d88d816817886747c699e6783bd965ab557
27 +DIST calibre-5.4.2.tar.xz 36596800 BLAKE2B 00373cdc9af56a8dacc70096d1e7925f8d3da4eaf37727ad58c211d18e6c593a21c3ad0f283048ae28b1bb83889c8c801baaa5e240eb65d972ebc78a79922ec1 SHA512 ef3839f5ff4ceecb3bbd6c84819d6f57cc4bb2a1ae789a9dcf8f029680bc778ef86f9c2eb01832c4990f68c2de892eedafa449205470cec4d86a3bbe9d4b4527
28
29 diff --git a/app-text/calibre/calibre-5.4.2.ebuild b/app-text/calibre/calibre-5.4.2.ebuild
30 new file mode 100644
31 index 00000000000..5f6bcd52277
32 --- /dev/null
33 +++ b/app-text/calibre/calibre-5.4.2.ebuild
34 @@ -0,0 +1,263 @@
35 +# Copyright 1999-2020 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +PYTHON_COMPAT=( python3_{6..8} )
41 +PYTHON_REQ_USE="sqlite,ssl"
42 +
43 +inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
44 +
45 +DESCRIPTION="Ebook management application"
46 +HOMEPAGE="https://calibre-ebook.com/"
47 +SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
48 + https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4.patch.xz"
49 +
50 +LICENSE="
51 + GPL-3+
52 + GPL-3
53 + GPL-2+
54 + GPL-2
55 + GPL-1+
56 + LGPL-3+
57 + LGPL-2.1+
58 + LGPL-2.1
59 + BSD
60 + MIT
61 + Old-MIT
62 + Apache-2.0
63 + public-domain
64 + || ( Artistic GPL-1+ )
65 + CC-BY-3.0
66 + OFL-1.1
67 + PSF-2
68 +"
69 +KEYWORDS="~amd64 ~arm ~x86"
70 +SLOT="0"
71 +IUSE="ios +udisks"
72 +
73 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
74 +
75 +COMMON_DEPEND="${PYTHON_DEPS}
76 + >=app-text/hunspell-1.7:=
77 + >=app-text/podofo-0.9.6_pre20171027:=
78 + >=app-text/poppler-0.26.5[qt5]
79 + >=dev-libs/chmlib-0.40:=
80 + dev-libs/glib:2=
81 + dev-libs/hyphen:=
82 + >=dev-libs/icu-57.1:=
83 + dev-libs/libinput:=
84 + >=dev-libs/dbus-glib-0.106
85 + >=sys-apps/dbus-1.10.8
86 + $(python_gen_cond_dep '
87 + >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
88 + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
89 + >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
90 + >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
91 + >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
92 + >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
93 + dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
94 + >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
95 + >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
96 + >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
97 + >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
98 + >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
99 + >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
100 + >=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
101 + >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
102 + >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
103 + >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
104 + >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
105 + >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
106 + >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
107 + >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
108 + dev-python/regex[${PYTHON_MULTI_USEDEP}]
109 + dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
110 + ')
111 + dev-qt/qtcore:5=
112 + dev-qt/qtdbus:5=
113 + dev-qt/qtgui:5=[jpeg]
114 + >=dev-qt/qtwebengine-5.12
115 + dev-qt/qtwidgets:5=
116 + dev-util/desktop-file-utils
117 + dev-util/gtk-update-icon-cache
118 + media-fonts/liberation-fonts
119 + media-libs/fontconfig:=
120 + >=media-libs/freetype-2:=
121 + >=media-libs/libmtp-1.1.11:=
122 + >=media-libs/libwmf-0.2.8
123 + >=media-gfx/optipng-0.7.6
124 + >=sys-libs/zlib-1.2.11:=
125 + virtual/libusb:1=
126 + x11-libs/libxkbcommon:=
127 + x11-libs/libX11:=
128 + x11-libs/libXext:=
129 + x11-libs/libXrender:=
130 + x11-misc/shared-mime-info
131 + >=x11-misc/xdg-utils-1.0.2-r2
132 + ios? (
133 + >=app-pda/usbmuxd-1.0.8
134 + >=app-pda/libimobiledevice-1.2.0
135 + )
136 + udisks? ( virtual/libudev )"
137 +RDEPEND="${COMMON_DEPEND}
138 + udisks? ( sys-fs/udisks:2 )"
139 +DEPEND="${COMMON_DEPEND}
140 + $(python_gen_cond_dep '
141 + >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
142 + dev-python/sip[${PYTHON_MULTI_USEDEP}]
143 + ')
144 + >=virtual/podofo-build-0.9.6_pre20171027
145 + virtual/pkgconfig"
146 +
147 +pkg_pretend() {
148 + if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
149 + eerror "Calibre cannot be built with this version of gcc."
150 + eerror "You need at least gcc-6.0"
151 + die "Your C compiler is too old for this package."
152 + fi
153 +}
154 +
155 +src_prepare() {
156 + # no_updates: do not annoy user with "new version is availible all the time
157 + # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
158 + eapply \
159 + "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
160 + "${FILESDIR}/${PN}-disable_plugins.patch" \
161 + "${WORKDIR}/${PN}-5.4.2-SIP-v4.patch"
162 +
163 + eapply_user
164 +
165 + # Fix outdated version constant.
166 + #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
167 + # -i src/calibre/constants.py || \
168 + # die "sed failed to patch constants.py"
169 +
170 + # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
171 + # calls xdg-* (bug #258938).
172 + sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
173 + -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
174 + -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
175 + -e "s|, PreserveMIMEDefaults():|:|" \
176 + -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
177 + -e "s|cmd\[2\]|cmd[4]|" \
178 + -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
179 + -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
180 + -i src/calibre/linux.py || die "sed failed to patch linux.py"
181 +
182 + # Disable unnecessary privilege dropping for bug #287067.
183 + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
184 + -i setup/install.py || die "sed failed to patch install.py"
185 +
186 + sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
187 +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
188 +'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
189 +'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
190 +'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
191 +'-i', 'Makefile'])" \
192 + -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
193 + -i setup/build.py || die "sed failed to patch build.py"
194 +}
195 +
196 +src_install() {
197 + # calibre works with python 3, so remove the python 2 constraint
198 + export CALIBRE_PY3_PORT=1
199 +
200 + # Bypass kbuildsycoca and update-mime-database in order to
201 + # avoid sandbox violations if xdg-mime tries to call them.
202 + mkdir "${T}/bin" || die
203 + cat - > "${T}/bin/kbuildsycoca" <<-EOF
204 + #!${BASH}
205 + echo $0 : $@
206 + exit 0
207 + EOF
208 +
209 + cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
210 + chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
211 +
212 + export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
213 +
214 + # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
215 + # violation with kbuildsycoca as in bug #287067, comment #13.
216 + export -n DISPLAY
217 +
218 + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
219 + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
220 + # return _parse_localename(localename)
221 + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
222 + # raise ValueError, 'unknown locale: %s' % localename
223 + #ValueError: unknown locale: 46
224 + export -n LANG LANGUAGE ${!LC_*}
225 + export LC_ALL=C.utf8 #709682
226 +
227 + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
228 + # variables to point to our fake temporary $HOME.
229 + export HOME="${T}/fake_homedir"
230 + export XDG_CONFIG_HOME="${HOME}/.config"
231 + export XDG_DATA_HOME="${HOME}/.local/share"
232 + export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
233 + mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
234 +
235 + tc-export CC CXX
236 + # Bug #334243 - respect LDFLAGS when building extensions
237 + export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
238 + local libdir=$(get_libdir)
239 + [[ -n $libdir ]] || die "get_libdir returned an empty string"
240 +
241 + addpredict /dev/dri #665310
242 +
243 + PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
244 + "${PYTHON}" setup.py install \
245 + --root="${D}" \
246 + --prefix="${EPREFIX}/usr" \
247 + --libdir="${EPREFIX}/usr/${libdir}" \
248 + --staging-root="${ED}/usr" \
249 + --staging-libdir="${ED}/usr/${libdir}" || die
250 +
251 + rm "${ED}/usr/share/applications/defaults.list" || die
252 + find "${ED}"/usr/share -type d -empty -delete
253 +
254 + cd "${ED}"/usr/share/calibre/fonts/liberation || die
255 + local x
256 + for x in * ; do
257 + [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
258 + ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
259 + done
260 +
261 + einfo "Converting python shebangs"
262 + python_fix_shebang --force "${ED}"
263 +
264 + einfo "Compiling python modules"
265 + python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
266 +
267 + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
268 + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
269 +}
270 +
271 +pkg_preinst() {
272 + # Indentify stray directories from upstream's "Binary install"
273 + # method (see bug 622728).
274 + CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
275 + CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
276 + printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
277 +}
278 +
279 +pkg_postinst() {
280 + [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
281 + local x
282 + for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
283 + if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
284 + elog "Purging '${x}'"
285 + rm -rf "${x}"
286 + fi
287 + done
288 + xdg_desktop_database_update
289 + xdg_mimeinfo_database_update
290 + xdg_icon_cache_update
291 +}
292 +
293 +pkg_postrm() {
294 + xdg_desktop_database_update
295 + xdg_mimeinfo_database_update
296 + xdg_icon_cache_update
297 +}