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 0349D158008 for ; Tue, 13 Jun 2023 21:29:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24007E08CA; Tue, 13 Jun 2023 21:29:44 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0712E08CA for ; Tue, 13 Jun 2023 21:29:43 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97C273413AB for ; Tue, 13 Jun 2023 21:29:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B50ACA85 for ; Tue, 13 Jun 2023 21:29:40 +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: <1686691767.5bd2f4e45cae5ffb8cdab1f2942312b49497e24a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/anki/files/, app-misc/anki/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/anki/anki-2.1.15-r2.ebuild app-misc/anki/files/anki-2.1.15-fix-prefs.patch X-VCS-Directories: app-misc/anki/files/ app-misc/anki/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5bd2f4e45cae5ffb8cdab1f2942312b49497e24a X-VCS-Branch: master Date: Tue, 13 Jun 2023 21:29:40 +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: 5cede3dd-baef-47d3-8c24-f60b620cdad3 X-Archives-Hash: 242b1d420105d3670e7596e9f312d19c commit: 5bd2f4e45cae5ffb8cdab1f2942312b49497e24a Author: Sam James gentoo org> AuthorDate: Tue Jun 13 21:28:53 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 13 21:29:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd2f4e4 app-misc/anki: update EAPI 7 -> 8, enable py3.11, fix prefs Thanks to WGH for the backport of the pref fix. Closes: https://bugs.gentoo.org/869917 Closes: https://bugs.gentoo.org/896566 Signed-off-by: Sam James gentoo.org> app-misc/anki/anki-2.1.15-r2.ebuild | 95 +++++++++++++++++++++++++ app-misc/anki/files/anki-2.1.15-fix-prefs.patch | 17 +++++ 2 files changed, 112 insertions(+) diff --git a/app-misc/anki/anki-2.1.15-r2.ebuild b/app-misc/anki/anki-2.1.15-r2.ebuild new file mode 100644 index 000000000000..ddd50dba0c10 --- /dev/null +++ b/app-misc/anki/anki-2.1.15-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite" + +inherit desktop optfeature python-single-r1 xdg + +DESCRIPTION="A spaced-repetition memory training program (flash cards)" +HOMEPAGE="https://apps.ankiweb.net" +SRC_URI="https://apps.ankiweb.net/downloads/archive/${P}-source.tgz -> ${P}.tgz" + +LICENSE="AGPL-3+ BSD MIT GPL-3+ CC-BY-SA-3.0 Apache-2.0 CC-BY-2.5" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + ') +" +BDEPEND="test? ( + ${RDEPEND} + $(python_gen_cond_dep ' + dev-python/nose[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch + "${FILESDIR}"/${PN}-2.1.15-mpv-args.patch + "${FILESDIR}"/${PN}-2.1.15-unescape.patch + "${FILESDIR}"/${PN}-2.1.15-fix-prefs.patch +) + +src_prepare() { + default + sed -i -e "s/updates=True/updates=False/" \ + aqt/profiles.py || die +} + +src_compile() { + :; +} + +src_test() { + sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${BROOT}/usr/bin/nosetests\":" \ + -i tools/tests.sh || die + sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${BROOT}/usr/bin/nosetests3\":" \ + -i tools/tests.sh || die + sed -e "s:which nosetests3:which ${BROOT}/usr/bin/nosetests3:" \ + -i tools/tests.sh || die + ./tools/tests.sh || die +} + +src_install() { + doicon ${PN}.png + domenu ${PN}.desktop + doman ${PN}.1 + + dodoc README.md README.development + python_domodule aqt anki + python_newscript runanki anki + + # Localization files go into the anki directory: + python_moduleinto anki + python_domodule locale + + # not sure if this is correct, but + # site-packages/aqt/mediasrv.py wants the directory + insinto /usr/share/anki + doins -r web +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "LaTeX in cards" "app-text/texlive app-text/dvipng" + optfeature "Record sound" "dev-python/pyaudio media-sound/lame" + optfeature "Playback sound" media-video/mpv media-video/mplayer +} diff --git a/app-misc/anki/files/anki-2.1.15-fix-prefs.patch b/app-misc/anki/files/anki-2.1.15-fix-prefs.patch new file mode 100644 index 000000000000..4f0bb2457dac --- /dev/null +++ b/app-misc/anki/files/anki-2.1.15-fix-prefs.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/869917#c3 +https://github.com/ankitects/anki/commit/d2ae874d9e1615d09afc912275cc3b27776a1392 + +--- a/aqt/preferences.py ++++ b/aqt/preferences.py +@@ -77,8 +77,8 @@ class Preferences(QDialog): + f.hwAccel.setVisible(False) + else: + f.hwAccel.setChecked(self.mw.pm.glMode() != "software") +- f.lrnCutoff.setValue(qc['collapseTime']/60.0) +- f.timeLimit.setValue(qc['timeLim']/60.0) ++ f.lrnCutoff.setValue(int(qc['collapseTime']/60.0)) ++ f.timeLimit.setValue(int(qc['timeLim']/60.0)) + f.showEstimates.setChecked(qc['estTimes']) + f.showProgress.setChecked(qc['dueCounts']) + f.nightMode.setChecked(qc.get("nightMode", False)) +