From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C2011581E7 for ; Fri, 26 Apr 2024 12:50:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AB85E2A1D; Fri, 26 Apr 2024 12:50:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D413E2A1D for ; Fri, 26 Apr 2024 12:50:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28FD1343135 for ; Fri, 26 Apr 2024 12:50:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85AE21764 for ; Fri, 26 Apr 2024 12:50:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1714135737.c2061f7eba375146c4279ade89914ce0d35cda2a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/Manifest app-text/calibre/calibre-7.5.0.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c2061f7eba375146c4279ade89914ce0d35cda2a X-VCS-Branch: master Date: Fri, 26 Apr 2024 12:50:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9258c867-c3d5-4461-b31a-7641f2d450f1 X-Archives-Hash: 7064cd40b5a8b4a3eee25a1e75d3f081 commit: c2061f7eba375146c4279ade89914ce0d35cda2a Author: Eli Schwartz gmail com> AuthorDate: Fri Apr 26 06:15:54 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 26 12:48:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2061f7e app-text/calibre: drop old Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> app-text/calibre/Manifest | 2 - app-text/calibre/calibre-7.5.0.ebuild | 242 ---------------------------------- 2 files changed, 244 deletions(-) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 9bae2c8125c3..e9a9b08d7298 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,7 +1,5 @@ DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b382b7687c92ecb039b078fd4828de0529380093e4ab33f77d78aa54a59758c1620cf8f918937a9a64f13decdf77ee SHA512 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230 DIST calibre-5.44.0.tar.xz.sig 566 BLAKE2B 413b95855d79bdb5b17ca5d760f834006797b4d3e413604f27d351a3392e16d647e772dc063306bf973e1156c34f68cb38152a66164bca849ebed5484e7f6065 SHA512 59957bf35a73f218241bf76cc86994d5af87cea11d3b0800e83f157bf0b2cfcaf4b6c1314562e74a1141d0c167fdb1619cb9a90e93b67f55dd55ceed77045059 -DIST calibre-7.5.0.tar.xz 43270664 BLAKE2B ff23027bb5d026b77dffa11a4192436270acb52fbfddd941958eb07f70eed181c555f1c25f22da17ce96004fd45b4c27c8ccfbb2db8f68cd021d538b5dcf76d1 SHA512 e59e5908af484d428eb7fe2d8d3b32f7254070b64214fe3d43310ff944d304bb95dc69a73763f6406eda27b0db7a8de604c4868f5ff2f7cfb4953319f188a764 -DIST calibre-7.5.0.tar.xz.sig 566 BLAKE2B 3fed90c450c3c4838d92e0b2d3f25c0f90cac50bd397dac2631a288f25c938761942dfb3ee67d73dc5e7fe52644912765db41a895b2558fae59948d05a7e09d0 SHA512 6525d46798237830ca84100ff0b9a4d3ab608207a14013e4f546abc744c7262678fe24f86ff58e3c72a601bb70fb71f952beb38f27fdeff58c3ce857ce101137 DIST calibre-7.6.0.tar.xz 43929700 BLAKE2B a529bf32511f8927683d6b89962a2e0e1ca6fb6bf798d9906ae6cf56c4611be21d89c49812c3b3cef02e333b20b4fd00a0b19c5e867c735022a45bafd9991203 SHA512 7bc43fff44d9ec7c5955f2176f0923af08cd7ba9930a49b76ba64808c18a468b005c231bc21c0a9e3758977c1ff9a1a6f7724333b87ae81e32461807976f5488 DIST calibre-7.6.0.tar.xz.sig 566 BLAKE2B c7fac255eb3ea49aead5780cc8089be253e551d729bb80c3f59bdb269e05e603557dbe8967175a6bb49e88d30673c89b2217c18757b718dba8e5b7d3eb21330c SHA512 a9af6200b27263333e2d3c54e4aea7f7664b6c4d3ba8cdd5958c9eeaf0c7ee4ba7465df57fd526064c44a9d093b246a64ab94819c6235030162f30f7f570b403 DIST calibre-7.7.0.tar.xz 44006620 BLAKE2B f29dcf4c6550c7649dfddcaa4f5390ebf23ae7ef8d8103c9d001c9fcb8ca4a120c7cc8d5c2c36acced6672d78e45b6a93c6c505482f78e21ecc170c56c2641b3 SHA512 8444811e63be007e075b716c70c7df989408b8a323068fb763a07b27a2c52557e5625f311ac7672d5367df9dd3d071354cf3dd1102a0aa057e5cbbdc09ed24df diff --git a/app-text/calibre/calibre-7.5.0.ebuild b/app-text/calibre/calibre-7.5.0.ebuild deleted file mode 100644 index d0df8273c381..000000000000 --- a/app-text/calibre/calibre-7.5.0.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="sqlite,ssl" - -inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg - -DESCRIPTION="Ebook management application" -HOMEPAGE="https://calibre-ebook.com/" -SRC_URI=" - https://download.calibre-ebook.com/${PV}/${P}.tar.xz - verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig ) -" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg - -LICENSE=" - GPL-3+ - GPL-3 - GPL-2+ - GPL-2 - GPL-1+ - LGPL-3+ - LGPL-2.1+ - LGPL-2.1 - BSD - MIT - Old-MIT - Apache-2.0 - public-domain - || ( Artistic GPL-1+ ) - CC-BY-3.0 - OFL-1.1 - PSF-2 -" -KEYWORDS="amd64 ~arm64" -SLOT="0" -IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Qt slotted dependencies are used because the libheadless.so plugin links to -# QT_*_PRIVATE_ABI. It only uses core/gui/dbus. -COMMON_DEPEND="${PYTHON_DEPS} - app-i18n/uchardet - >=app-text/hunspell-1.7:= - >=app-text/podofo-0.10.0:= - app-text/poppler[utils] - dev-libs/hyphen:= - >=dev-libs/icu-57.1:= - dev-libs/openssl:= - dev-libs/snowball-stemmer:= - $(python_gen_cond_dep ' - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] - >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] - >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] - dev-python/jeepney[${PYTHON_USEDEP}] - >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] - >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] - >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] - >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}] - >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] - >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] - >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] - dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/xxhash[${PYTHON_USEDEP}] - >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}] - ') - dev-qt/qtbase:6=[gui,widgets] - dev-qt/qtimageformats:6 - dev-util/desktop-file-utils - dev-util/gtk-update-icon-cache - media-fonts/liberation-fonts - media-libs/fontconfig:= - >=media-libs/freetype-2:= - >=media-libs/libmtp-1.1.11:= - >=media-gfx/optipng-0.7.6 - virtual/libusb:1= - x11-misc/shared-mime-info - >=x11-misc/xdg-utils-1.0.2-r2 - font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') ) - ios? ( - >=app-pda/usbmuxd-1.0.8 - >=app-pda/libimobiledevice-1.2.0 - ) - speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) - system-mathjax? ( >=dev-libs/mathjax-3:= ) - udisks? ( virtual/libudev ) - unrar? ( dev-python/unrardll ) -" -RDEPEND="${COMMON_DEPEND} - udisks? ( sys-fs/udisks:2 )" -DEPEND="${COMMON_DEPEND} - test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) -" -BDEPEND="$(python_gen_cond_dep ' - >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] - >=dev-python/sip-5[${PYTHON_USEDEP}] - ') - virtual/pkgconfig - system-mathjax? ( dev-lang/rapydscript-ng ) - verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) -" - -PATCHES=( - # Skip calling a binary (JxrDecApp) from libjxr which is used for tests - # We don't (yet?) package libjxr and it seems to be dead upstream - # (last commit in 2017) - "${FILESDIR}/${PN}-7.0.0-jxr-test.patch" -) - -src_prepare() { - default - - # Warning: - # - # While it might be rather tempting to add yet another sed here, - # please don't. There have been several bugs in Gentoo's packaging - # of calibre from seds-which-become-stale. Please consider - # creating a patch instead, but in any case, run the test suite - # and ensure it passes. - # - # If in doubt about a problem, checking Fedora's packaging is recommended. - - # Disable unnecessary privilege dropping for bug #287067. - sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ - -i setup/install.py || die "sed failed to patch install.py" - - # This is only ever used at build time. It contains a small embedded copy - # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't - # have rapydscript-ng (a nodejs package) itself installed. Its only purpose - # is to build some resources that come bundled in dist tarballs already... - # and which we may also need to regenerate e.g. to use system-mathjax. - # - # However, running qtwebengine violates the portage sandbox (among other - # things, it tries to create directories in /usr! amazing) so this is a - # wash anyway. The only real solution here is to package rapydscript-ng. - # - # We do not need it at build time, and *no one* needs it at install time. - # Delete the cruft. - rm -r resources/rapydscript/ || die -} - -src_compile() { - # TODO: get qmake called by setup.py to respect CC and CXX too - tc-export CC CXX - - # bug 821871 - local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" - export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" - export QMAKE="$(qt6_get_bindir)/qmake" - - edo ${EPYTHON} setup.py build - edo ${EPYTHON} setup.py gui - - # A few different resources are bundled in the distfile by default, because - # not all systems necessarily have them. We un-vendor them, using the - # upstream integrated approach if possible. See setup/revendor.py and - # consider migrating other resources to this if they do not use it, in - # *preference* over manual rm'ing. - edo ${EPYTHON} setup.py liberation_fonts \ - --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ - --system-liberation_fonts - if use system-mathjax; then - edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax - edo ${EPYTHON} setup.py rapydscript - fi -} - -src_test() { - # Skipped tests: - local _test_excludes=( - # unpackaged Python dependency: py7zr - 7z - # unpackaged Python dependency: pyzstd - test_zstd - # tests if a completely unused module is bundled - pycryptodome - - $(usev !speech speech_dispatcher) - $(usev !unrar test_unrar) - - # undocumented reasons - test_mem_leaks - test_searching - ) - - edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" -} - -src_install() { - # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: - # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale - # return _parse_localename(localename) - # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename - # raise ValueError, 'unknown locale: %s' % localename - #ValueError: unknown locale: 46 - export -n LANG LANGUAGE ${!LC_*} - export LC_ALL=C.utf8 # bug #709682 - - # Bug #295672 - Avoid sandbox violation in ~/.config by forcing - # variables to point to our fake temporary $HOME. - export HOME="${T}/fake_homedir" - export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" - mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die - - addpredict /dev/dri #665310 - - # If this directory doesn't exist, zsh completion won't install - dodir /usr/share/zsh/site-functions - - edo "${PYTHON}" setup.py install \ - --staging-root="${ED}/usr" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --staging-libdir="${ED}/usr/$(get_libdir)" \ - --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" - - cp -r man-pages/ "${ED}"/usr/share/man || die - - find "${ED}"/usr/share -type d -empty -delete || die - - python_fix_shebang "${ED}/usr/bin" - - python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)" - - newinitd "${FILESDIR}"/calibre-server-3.init calibre-server - newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server -}