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 6DAAF15814C for ; Wed, 18 Oct 2023 04:26:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68B402BC133; Wed, 18 Oct 2023 04:26:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 4BA5C2BC133 for ; Wed, 18 Oct 2023 04:26:19 +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 6489D335CA6 for ; Wed, 18 Oct 2023 04:26:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1DBF1299 for ; Wed, 18 Oct 2023 04:26:14 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1697603164.13bd01105a6cfe4c33e75299ddd85585e7399acd.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/calibre-5.44.0-r2.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 13bd01105a6cfe4c33e75299ddd85585e7399acd X-VCS-Branch: master Date: Wed, 18 Oct 2023 04:26:14 +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: de52f638-74ba-4fee-b580-5b02c7b3e046 X-Archives-Hash: 0e8086e937710558fbce86cfb583a8df commit: 13bd01105a6cfe4c33e75299ddd85585e7399acd Author: Eli Schwartz gmail com> AuthorDate: Tue Oct 3 01:53:35 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 18 04:26:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bd0110 app-text/calibre: various cleanups for out of date dependencies Of note: - dbus-python was deprecated and removed by the addition of jeepney - cssselect was deprecated and removed by the addition of css-parser The glib and libX* dependencies are an interesting bit of history. As far as calibre is concerned, these have never been required (they are not directly used). But the libheadless.so plugin which uses Qt private APIs ends up inheriting a bunch of dependencies from Qt itself, depending on whatever Qt internals get exposed by that private API. This results in symbols inside libheadless.so linking to libraries that QtCore also links to. We still have to rebuild libheadless.so on ever update to Qt because private API, though. And the really fun bit is that the dependencies do, of course, change over time. :) Currently libX* is not actually used anymore, for example. dbus-glib *looks* like it may have been superficially a recursive dep of something else? libwmf had extremely extremely old code in the calibre source tree which could have compiled against it, but never really did so. There's a custom encoder/decoder written in pure python. zlib is not directly depended on by calibre, though some dependencies do have to be built with USE=zlib which doesn't really help. For all direct uses of zlib, calibre simply uses the python stdlib "zlib" module, which is not optional anyway. calibre has never been setuptools software, so that can be dropped. There are two chardet modules of relevance: chardet and cchardet. At runtime, calibre only uses the latter. The tests use both of them due to reasons. We can avoid installing it except when USE=test. PyQt-builder is used in the build system (and as the name implies, it is a module for building code). It can be dropped to a build dependency. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-5.44.0-r2.ebuild | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/app-text/calibre/calibre-5.44.0-r2.ebuild b/app-text/calibre/calibre-5.44.0-r2.ebuild index 1688bc6f62df..2e49cf2a9179 100644 --- a/app-text/calibre/calibre-5.44.0-r2.ebuild +++ b/app-text/calibre/calibre-5.44.0-r2.ebuild @@ -37,7 +37,9 @@ LICENSE=" " KEYWORDS="~amd64 ~arm ~x86" SLOT="0" -IUSE="ios +udisks" +IUSE="ios test +udisks" + +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -48,23 +50,16 @@ COMMON_DEPEND="${PYTHON_DEPS} >=app-text/podofo-0.9.6_pre20171027:= =dev-libs/icu-57.1:= - dev-libs/libinput:= - >=dev-libs/dbus-glib-0.106 dev-libs/openssl:= dev-libs/snowball-stemmer:= - >=sys-apps/dbus-1.10.8 $(python_gen_cond_dep ' app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}] >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/cchardet[${PYTHON_USEDEP}] - >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}] - >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] - >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}] dev-python/dnspython[${PYTHON_USEDEP}] >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] @@ -83,7 +78,6 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] dev-python/zeroconf[${PYTHON_USEDEP}] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}] - >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] ') @@ -98,14 +92,8 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= - >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 - >=sys-libs/zlib-1.2.11:= virtual/libusb:1= - x11-libs/libxkbcommon:= - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( @@ -115,9 +103,11 @@ COMMON_DEPEND="${PYTHON_DEPS} udisks? ( virtual/libudev )" RDEPEND="${COMMON_DEPEND} udisks? ( sys-fs/udisks:2 )" -DEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) +" BDEPEND="$(python_gen_cond_dep ' - >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] + >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] >=dev-python/sip-5[${PYTHON_USEDEP}] ') >=virtual/podofo-build-0.9.6_pre20171027