[gentoo-commits] repo/gentoo:master commit in: app-misc/anki/, app-misc/anki/files/

2024-02-27 Thread Michał Górny 
commit: d0ee350a1b37c26651f2a8642b4b95b417e9b963
Author: Lucio Sauer  posteo  net>
AuthorDate: Tue Feb 27 15:54:21 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb 28 04:03:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ee350a

app-misc/anki: drop 2.1.15-r1, 2.1.15-r2

Closes: https://bugs.gentoo.org/878689
Closes: https://bugs.gentoo.org/762922
Signed-off-by: Lucio Sauer  posteo.net>
Signed-off-by: Michał Górny  gentoo.org>

 app-misc/anki/Manifest |  1 -
 app-misc/anki/anki-2.1.15-r1.ebuild| 94 -
 app-misc/anki/anki-2.1.15-r2.ebuild| 95 --
 .../anki/files/anki-2.1.0_beta25-web-folder.patch  | 11 ---
 app-misc/anki/files/anki-2.1.15-fix-prefs.patch| 17 
 app-misc/anki/files/anki-2.1.15-mpv-args.patch | 26 --
 app-misc/anki/files/anki-2.1.15-unescape.patch | 13 ---
 7 files changed, 257 deletions(-)

diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 151eabce9198..cfc5a9797c3e 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -8,7 +8,6 @@ DIST ammonia-3.3.0.crate 46061 BLAKE2B 
082ee30f39ad788c9ae87888f003c2f6d08fbea7a
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 
4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055
 SHA512 
4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 
86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e
 SHA512 
b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anes-0.1.6.crate 23857 BLAKE2B 
9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f22ccfe509ef7197d4694f439084dbdb01fdf88829d181965ea9d1452253789a46fdf6d0520e3413c50d61
 SHA512 
f9dfaaca9ca327881ec30efaf24e208daae668b1e9d6963c8b0ca9f9fd13be777c793076a87980429f0dfa4db28ef5331ce6652a76da4d5a87485b23fc2fde29
-DIST anki-2.1.15.tgz 4269571 BLAKE2B 
00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e
 SHA512 
f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
 DIST anki-23.12.1.gh.tar.gz 2369459 BLAKE2B 
0248cc5d994af10c56f9cf7bb719cb427aeee7dd0c4f9ee8dab73f216f923368e276b79577ddb2303cb0cde1500190a2e5ecdcde82f4d340dff4b10b59d0cfc3
 SHA512 
076d3eba5db7dd4b8e00de9b69140a54f73c2e6ce52f46ddce9a6455a8ce7ae5d49bfb2fc60571d851d6b4948a08a0b3deb508aa37c7e79624b6273837a975a5
 DIST anki-core-i18n-fb301cc62da3b7a83b4ea266d9a2e70cfc1a8418.gh.tar.gz 1245454 
BLAKE2B 
a8ad2a286a6006b9427114e648c236e868a149c8fa8f1506cc406676dac9f352ae74addee1e6965b92767ac9eb49c6cc26312cc517823433cd5e013ce6d8c6b9
 SHA512 
12e9187bda8f728d06a904fe21f3820aa2acad0e1924933d9db24f3879936b0a7b489934186fcab85440a40b974917ada729b5a7ec276ca2acea70b5c88caa5a
 DIST anki-desktop-ftl-8c2191a7c797747cec767e3953bbbcc50acc5246.gh.tar.gz 
215288 BLAKE2B 
6b71e3f81f5be651ece9094743132e18c88f69487cc125d436d30bc7dae99cdcc793f34094b4c034f4b26073148e0fd9e2cb16db592c9ea9f2cc3ca4dcd1e6d6
 SHA512 
91c3609fa8ca67de2d520798acbb7200d310c4d587270143528a5c18ed341c7dd3b9ddc8d79fe1f44224e83dc06f12cdbcdcf2114969513cbd60e82950343373

diff --git a/app-misc/anki/anki-2.1.15-r1.ebuild 
b/app-misc/anki/anki-2.1.15-r1.ebuild
deleted file mode 100644
index 06b2d34159d7..
--- a/app-misc/anki/anki-2.1.15-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-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? (
-

[gentoo-commits] repo/gentoo:master commit in: app-misc/anki/, app-misc/anki/files/23.12.1/

2024-01-21 Thread Sam James 
commit: 0d686c653b1eb6df7bcc597728ad7ed8d6566a08
Author: Lucio Sauer  posteo  net>
AuthorDate: Tue Jan  9 05:43:42 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 21 10:00:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d686c65

app-misc/anki: unbundle sqlite correctly

Signed-off-by: Lucio Sauer  posteo.net>
Signed-off-by: Sam James  gentoo.org>

 app-misc/anki/anki-23.12.1.ebuild |  2 +-
 app-misc/anki/files/23.12.1/unbundle-sqlite.patch | 14 --
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/app-misc/anki/anki-23.12.1.ebuild 
b/app-misc/anki/anki-23.12.1.ebuild
index 13e6cf187381..b79e79196831 100644
--- a/app-misc/anki/anki-23.12.1.ebuild
+++ b/app-misc/anki/anki-23.12.1.ebuild
@@ -683,7 +683,6 @@ PATCHES=(
"${FILESDIR}"/${PV}/ninja-gentoo-setup.patch
"${FILESDIR}"/${PV}/no-git-submodule-sync.patch
"${FILESDIR}"/${PV}/pseudo-venv.patch
-   "${FILESDIR}"/${PV}/unbundle-sqlite.patch
"${FILESDIR}"/${PV}/use-system-nextest.patch
"${FILESDIR}"/${PV}/remove-formatter-dep.patch
"${FILESDIR}"/${PV}/remove-yarn-dep.patch
@@ -820,6 +819,7 @@ https://addon-docs.ankiweb.net/
 
 pkg_setup() {
export PROTOC_BINARY="${BROOT}"/usr/bin/protoc
+   export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
export ZSTD_SYS_USE_PKG_CONFIG=1
 
if use gui; then

diff --git a/app-misc/anki/files/23.12.1/unbundle-sqlite.patch 
b/app-misc/anki/files/23.12.1/unbundle-sqlite.patch
deleted file mode 100644
index 496c4fad47a6..
--- a/app-misc/anki/files/23.12.1/unbundle-sqlite.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use system dev-db/sqlite:3 instead of a bundled version.
-
-From: Lucio Sauer 
 a/Cargo.toml
-+++ b/Cargo.toml
-@@ -108,7 +108,7 @@ pyo3 = { version = "0.20.0", features = 
["extension-module", "abi3", "abi3-py39"
- rand = "0.8.5"
- regex = "1.10.2"
- reqwest = { version = "0.11.22", default-features = false, features = 
["json", "socks", "stream", "multipart"] }
--rusqlite = { version = "0.30.0", features = ["trace", "functions", 
"collation", "bundled"] }
-+rusqlite = { version = "0.30.0", features = ["trace", "functions", 
"collation"] }
- scopeguard = "1.2.0"
- serde = { version = "1.0.193", features = ["derive"] }
- serde-aux = "4.2.0"

[gentoo-commits] repo/gentoo:master commit in: app-misc/anki/, app-misc/anki/files/

2020-06-12 Thread Joonas Niilola 
commit: bbf4348280a355c7def871019405fc563730ed7c
Author: Chris Burroughs  gmail  com>
AuthorDate: Fri Nov  8 02:37:38 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun 12 06:59:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf43482

app-misc/anki: bump to 2.1.15 and modernize ebuild

 - claiming maintainer timeout to update version and fix bugs, --juippis

 * Bump to EAPI 7
 * Enable python 3.{7,8} support
 * Fix missing test dependencies
 * Add missing jsonschema dependency
 * Backport argument fix to allow mpv versions > 0.31 to be used by anki
 * Correct and expand LICENSE
 * Resolve NonexistentDeps DEPEND warning (leftover from PyQtWebEngine split,
   but no version of PyQt5 with a webengine use flag is still in the tree.)
 * Use default pkg_setup from eclass and rely on default value for S variable
 * Clarify optional runtime dependencies needed (mpv OR mplayer)
 * Move optional runtime dependencies to optfeature
 * Adjust SRC_URL after upstream re-arranging

NOTE: The upstream LICENSE includes "Qt's bundled translations: LGPL3", but
since we are building from source that is not directly included.  More recent
upstream versions have clarified this in the LICENSE file.

Bug: https://bugs.gentoo.org/625894
Bug: https://bugs.gentoo.org/645314
Bug: https://bugs.gentoo.org/651472
Bug: https://bugs.gentoo.org/688798
Closes: https://bugs.gentoo.org/700010
Closes: https://bugs.gentoo.org/715624
Bug: https://bugs.gentoo.org/722502
Bug: https://bugs.gentoo.org/724482
Bug: https://bugs.gentoo.org/724990
Closes: https://bugs.gentoo.org/726522

Signed-off-by: Chris Burroughs  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16054
Signed-off-by: Joonas Niilola  gentoo.org>

 app-misc/anki/Manifest |  1 +
 app-misc/anki/anki-2.1.15.ebuild   | 93 ++
 app-misc/anki/files/anki-2.1.15-mpv-args.patch | 26 +++
 3 files changed, 120 insertions(+)

diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index b40a9f9484c..d013dc23f14 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,2 +1,3 @@
 DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B 
b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d
 SHA512 
50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
 DIST anki-2.1.13.tgz 4248906 BLAKE2B 
82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f
 SHA512 
921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3
+DIST anki-2.1.15.tgz 4269571 BLAKE2B 
00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e
 SHA512 
f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3

diff --git a/app-misc/anki/anki-2.1.15.ebuild b/app-misc/anki/anki-2.1.15.ebuild
new file mode 100644
index 000..2f651f60f1d
--- /dev/null
+++ b/app-misc/anki/anki-2.1.15.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit desktop eutils 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_MULTI_USEDEP}]
+   >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+   >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+   dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+   dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+   dev-python/jsonschema[${PYTHON_MULTI_USEDEP}]
+   dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+   dev-python/requests[${PYTHON_MULTI_USEDEP}]
+   dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+   ')
+"
+BDEPEND="test? (
+   ${RDEPEND}
+   $(python_gen_cond_dep '
+   dev-python/nose[${PYTHON_MULTI_USEDEP}]
+   dev-python/mock[${PYTHON_MULTI_USEDEP}]
+   ')
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch
+   "${FILESDIR}"/${PN}-2.1.15-mpv-args.patch
+)
+
+src_prepare() {
+   default
+   sed -i -e "s/updates=True/updates=False/" \
+