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 8B884158013 for ; Mon, 11 Dec 2023 13:28:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D06A42BC02D; Mon, 11 Dec 2023 13:28: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 3296E2BC02D for ; Mon, 11 Dec 2023 13:28: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 12E49335D7B for ; Mon, 11 Dec 2023 13:28:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A7C9ACA for ; Mon, 11 Dec 2023 13:28:16 +0000 (UTC) From: "Lucio Sauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lucio Sauer" Message-ID: <1702301163.de148e5714e6c52f5b08e25e9c7c1fda822927c3.watermanpaint@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/anki-bin/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-misc/anki-bin/anki-bin-23.10.1-r1.ebuild app-misc/anki-bin/anki-bin-23.10.1.ebuild X-VCS-Directories: app-misc/anki-bin/ X-VCS-Committer: watermanpaint X-VCS-Committer-Name: Lucio Sauer X-VCS-Revision: de148e5714e6c52f5b08e25e9c7c1fda822927c3 X-VCS-Branch: dev Date: Mon, 11 Dec 2023 13:28:16 +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: 36cb018d-220f-495e-960f-57149e1ac4d4 X-Archives-Hash: a09d5d873c2c052cfe9c2d60cbc360f6 commit: de148e5714e6c52f5b08e25e9c7c1fda822927c3 Author: Lucio Sauer posteo net> AuthorDate: Mon Dec 11 13:26:03 2023 +0000 Commit: Lucio Sauer posteo net> CommitDate: Mon Dec 11 13:26:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=de148e57 app-misc/anki-bin: add 23.10.1-r1, drop 23.10.1 Fix runtime Qt detection mechanism: Prior to this commit, Anki would select its Qt6 GUI at runtime, if it successfully imported PyQt6. Anki's choice of GUI framework should only depend on the qt6 USE flag. Signed-off-by: Lucio Sauer posteo.net> .../{anki-bin-23.10.1.ebuild => anki-bin-23.10.1-r1.ebuild} | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app-misc/anki-bin/anki-bin-23.10.1.ebuild b/app-misc/anki-bin/anki-bin-23.10.1-r1.ebuild similarity index 95% rename from app-misc/anki-bin/anki-bin-23.10.1.ebuild rename to app-misc/anki-bin/anki-bin-23.10.1-r1.ebuild index 697a1f3924..247ebe6f01 100644 --- a/app-misc/anki-bin/anki-bin-23.10.1.ebuild +++ b/app-misc/anki-bin/anki-bin-23.10.1-r1.ebuild @@ -19,8 +19,8 @@ SRC_URI=" https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.1 -> ${P}.1 https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.desktop -> ${P}.desktop https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.png -> ${P}.png - https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.xpm -> ${P}.xpm https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.xml -> ${P}.xml + https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.xpm -> ${P}.xpm " # The program itself is licensed under AGPL-3+ with contributed portions licensed @@ -110,13 +110,22 @@ The latter option has additional runtime dependencies. Please take a look at this package's 'optional runtime features' for a complete listing. In an early 2024 update, ENABLE_QT5_COMPAT will be removed, so this is not a -long term solution. +long-term solution. Anki's user manual is located online at https://docs.ankiweb.net/ Anki's add-on developer manual is located online at https://addon-docs.ankiweb.net/ " +src_prepare() { + default + # 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/" aqt/qt/__init__.py || die + fi +} + src_install() { python_domodule anki {,_}aqt *.dist-info printf "#!/usr/bin/python3\nimport sys;from aqt import run;sys.exit(run())" > runanki