diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-10-26 04:04:26 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-26 04:04:26 +0100 |
commit | d0349ca0f4903608beca459a9db2068dab9fa6ea (patch) | |
tree | a69bc9c4a75f35ecabd3909a181128faf8c0e75b /app-misc/anki | |
parent | b11a5614cb96e70e116581c98abf286c2cf694ca (diff) |
gentoo auto-resync : 26:10:2024 - 04:04:26
Diffstat (limited to 'app-misc/anki')
-rw-r--r-- | app-misc/anki/Manifest | 2 | ||||
-rw-r--r-- | app-misc/anki/anki-24.06.3-r1.ebuild (renamed from app-misc/anki/anki-24.06.3.ebuild) | 67 |
2 files changed, 28 insertions, 41 deletions
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest index 74139a230a70..f21dd6bf6eec 100644 --- a/app-misc/anki/Manifest +++ b/app-misc/anki/Manifest @@ -677,5 +677,5 @@ DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff DIST zstd-safe-7.0.0.crate 20463 BLAKE2B 8c4cb034d1a12ae54abeeb8f12101f09ef82115ec26630103e7fad29ce1d0045e59dbd8ae301dbe8f47c90515ab9575288137ced98aea667a9cdd7ad0e2a6234 SHA512 2f0d66c874f7880d05fce39f4bdec5e217e8e18b44bfe97b4ea33c7d5c8719c5bd9615f7274f0b19734a465eb2477993fb8ae8d60abc7da36eac361e8fc4a437 DIST zstd-sys-2.0.9+zstd.1.5.5.crate 728791 BLAKE2B f08f8730d9cc1efc5520f223e9bfb0854b3a67a2907e47c38e0572d8eca688c1bae61560e11e664834dbff1bed3d40608b23d08f102ce6cd7f1af72b48446e4c SHA512 604c01eae4975745aca1dc1d351db98fec34f7036143e59dfeb4d36e6ee18ac9f3871a288557c8ebdc9e816967a008da43154dc9a0eb3cac85071ccb05bf58aa DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd -EBUILD anki-24.06.3.ebuild 22847 BLAKE2B 5407d5a45939ff89bf7bbc242181f4424fa4f50008189db8233c56a25ba591292f7509da36f43e395fb8655bc0fd6b1514062047bd79b4f8697cb7f08597113b SHA512 1be64e54784a360ff94f857f3e204cff98c2f69c6704c65cae0f0c51cac3ec2ea77302ee884fb4734cf4b13aa78d11b7b95603492c7aa5d3f4a5129fa61f8cc6 +EBUILD anki-24.06.3-r1.ebuild 22115 BLAKE2B 600212c8e1f082bb32c022b6261545905a740122a5989da65c2fb7d69b7e4b4748c32675949b925d4b98457723be3f6d8dc884ac310c27c9b10759658fd4514e SHA512 c2809f95d884e868fe4fc3172faecf2c88ebd95d35a8341c543c0dd03c97fe9dee5b0bbcea5e8ad67e66abe60914cfe998b77be9b7327675e3bcf295c29c7938 MISC metadata.xml 1165 BLAKE2B 0695da67a86533933fe1f11a83e0dc24282518ccec2b514aad08c82646266a4e1b42071ff4ebd4e113a7134cd8936539720acb5adc4d0e14e77eab07668e0e93 SHA512 99b566d1da1af7a305bb08cb9b30b86d963a7e61b520cb59ca256db8ae612948758959e0fbb6896070a42f679a6a9f9f411cd7694bd962ce30d744cbd1251385 diff --git a/app-misc/anki/anki-24.06.3.ebuild b/app-misc/anki/anki-24.06.3-r1.ebuild index 77c1754f1f9b..19438db1f49e 100644 --- a/app-misc/anki/anki-24.06.3.ebuild +++ b/app-misc/anki/anki-24.06.3-r1.ebuild @@ -728,7 +728,7 @@ LICENSE+=" Unicode-3.0 openssl" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc +gui qt6 test" +IUSE="doc +gui test" REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!gui? ( test ) !test? ( test )" @@ -741,11 +741,12 @@ RESTRICT="!gui? ( test ) !test? ( test )" # rustls-native-certs to use the native certificate store. DEPEND=" - dev-db/sqlite:3 >=app-arch/zstd-1.5.5:= + dev-db/sqlite:3 " GUI_RDEPEND=" ${PYTHON_DEPS} + dev-qt/qtsvg:6 $(python_gen_cond_dep ' dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] @@ -755,24 +756,13 @@ GUI_RDEPEND=" dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/markdown[${PYTHON_USEDEP}] dev-python/protobuf-python[${PYTHON_USEDEP}] + >=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}] + >=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}] + >=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/send2trash[${PYTHON_USEDEP}] - dev-python/waitress[${PYTHON_USEDEP}]') - qt6? ( - dev-qt/qtsvg:6 - $(python_gen_cond_dep ' - >=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}] - >=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}] - >=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}]') - ) - !qt6? ( - dev-qt/qtgui:5[jpeg,png] - dev-qt/qtsvg:5 - $(python_gen_cond_dep ' - >=dev-python/PyQt5-5.15.5[gui,network,webchannel,widgets,${PYTHON_USEDEP}] - >=dev-python/PyQt5-sip-12.9.0[${PYTHON_USEDEP}] - >=dev-python/PyQtWebEngine-5.15.5[${PYTHON_USEDEP}]') - ) + dev-python/waitress[${PYTHON_USEDEP}] + ') " RDEPEND=" ${DEPEND} @@ -788,8 +778,9 @@ BDEPEND=" doc? ( $(python_gen_cond_dep ' >=dev-python/sphinx-7.2.6[${PYTHON_USEDEP}] + dev-python/sphinx-autoapi[${PYTHON_USEDEP}] dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - dev-python/sphinx-autoapi[${PYTHON_USEDEP}]') + ') ) gui? ( ${PYTHON_DEPS} @@ -797,9 +788,10 @@ BDEPEND=" app-arch/unzip >=net-libs/nodejs-20.12.1 sys-apps/yarn - $(python_gen_cond_dep 'dev-python/wheel[${PYTHON_USEDEP}]') - qt6? ( $(python_gen_cond_dep 'dev-python/PyQt6[${PYTHON_USEDEP}]') ) - !qt6? ( $(python_gen_cond_dep 'dev-python/PyQt5[${PYTHON_USEDEP}]') ) + $(python_gen_cond_dep ' + dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ') ) test? ( ${RDEPEND} @@ -808,8 +800,9 @@ BDEPEND=" dev-libs/openssl dev-util/cargo-nextest $(python_gen_cond_dep ' + dev-python/mock[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}]') + ') ) " @@ -859,12 +852,6 @@ src_prepare() { ln -s "${BROOT}"/usr/bin/sphinx-build out/pyenv/bin || die fi - # Anki's Qt detection mechanism falls back to Qt5 Python bindings, if Qt6 - # Python bindings don't get imported successfully. - if ! use qt6; then - sed -i "s/import PyQt6/raise ImportError/" qt/aqt/qt/__init__.py || die - fi - # Fix hardcoded runner location export CARGO_TARGET_DIR="${S}"/out/rust cbuild_dir="$(CHOST=${CBUILD:-${CHOST}} cargo_target_dir)" @@ -929,13 +916,13 @@ src_test() { } src_install() { - local DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI can either - switch to ${CATEGORY}/${PN}[-qt6], or temporarily set the environment variable - ENABLE_QT5_COMPAT to 1 to have Anki install the previous compatibility code. - The latter option has additional runtime dependencies. Please take a look - at this package's optional runtime features for a complete listing. - \n\nIn an early 2024 update, ENABLE_QT5_COMPAT will be removed, so this is not - a long-term solution. + local DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI + can temporarily set the environment variable ENABLE_QT5_COMPAT to 1 to have + Anki install the previous compatibility code. This option has additional + runtime dependencies. Please take a look at this package's optional runtime + features for a complete listing. + \n\nENABLE_QT5_COMPAT may be removed in the future, so this is not a + long-term solution. \n\nAnki's user manual is located online at https://docs.ankiweb.net/ \nAnki's add-on developer manual is located online at https://addon-docs.ankiweb.net/" @@ -964,16 +951,16 @@ src_install() { } pkg_postinst() { - [[ "${REPLACING_VERSIONS%-r*}" = '2.1.15' ]] && local FORCE_PRINT_ELOG=1 + ver_test ${REPLACING_VERSIONS} -lt 24.06.3-r1 && local FORCE_PRINT_ELOG=1 readme.gentoo_print_elog if use gui; then xdg_pkg_postinst optfeature "LaTeX in cards" "app-text/texlive[extra] app-text/dvipng" optfeature "sound support" media-video/mpv media-video/mplayer - optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt$(usex qt6 6 5)[multimedia]" + optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt6[multimedia]" optfeature "faster database operations" dev-python/orjson - use qt6 && optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport] - use qt6 && optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase[vulkan] + optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport] + optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase:6[vulkan] dev-qt/qtdeclarative:6[vulkan] dev-qt/qtwebengine:6[vulkan]" einfo "You can customize the LaTeX header for your cards to fit your needs:" |