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