From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/anki/
Date: Sun, 17 Nov 2019 18:51:52 +0000 (UTC) [thread overview]
Message-ID: <1574016699.41fc05a8d3ea6aee49bcff68ddce01151dec6a62.pesa@gentoo> (raw)
commit: 41fc05a8d3ea6aee49bcff68ddce01151dec6a62
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 18:50:53 2019 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 18:51:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fc05a8
app-misc/anki: be compatible with split PyQtWebEngine
Bug: https://bugs.gentoo.org/699306
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
app-misc/anki/anki-2.1.0_beta27.ebuild | 10 ++++++++--
app-misc/anki/anki-2.1.13.ebuild | 8 +++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
index a4c33685fa1..9c8bfdb780b 100644
--- a/app-misc/anki/anki-2.1.0_beta27.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,7 +22,13 @@ IUSE="latex +recording +sound test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/PyQt5[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
+ || (
+ (
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ )
+ <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
+ )
>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/app-misc/anki/anki-2.1.13.ebuild b/app-misc/anki/anki-2.1.13.ebuild
index bb38a02500c..a9775f88b92 100644
--- a/app-misc/anki/anki-2.1.13.ebuild
+++ b/app-misc/anki/anki-2.1.13.ebuild
@@ -21,7 +21,13 @@ IUSE="latex +recording +sound test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/PyQt5[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
+ || (
+ (
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ )
+ <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
+ )
>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
dev-python/decorator[${PYTHON_USEDEP}]
next reply other threads:[~2019-11-17 18:51 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-17 18:51 Davide Pesavento [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-10 3:58 [gentoo-commits] repo/gentoo:master commit in: app-misc/anki/ Sam James
2025-03-10 3:56 Sam James
2025-02-19 20:22 Michał Górny
2025-02-15 9:29 Ulrich Müller
2024-12-27 12:08 Sam James
2024-12-01 6:47 Sam James
2024-12-01 6:47 Sam James
2024-10-25 11:52 Joonas Niilola
2024-08-19 19:04 Joonas Niilola
2024-08-19 19:04 Joonas Niilola
2024-08-19 19:04 Joonas Niilola
2024-05-15 9:56 Florian Schmaus
2024-05-15 9:56 Florian Schmaus
2024-05-15 9:56 Florian Schmaus
2024-03-21 2:50 Sam James
2024-01-21 10:00 Sam James
2022-06-02 7:52 Michał Górny
2021-06-01 0:04 Sam James
2021-04-12 22:50 Sam James
2021-02-02 22:08 Sam James
2021-01-01 0:47 Michał Górny
2020-02-16 22:13 Andreas Sturmlechner
2020-02-09 16:11 Michał Górny
2019-06-20 13:26 罗百科
2018-03-01 12:55 Andreas Sturmlechner
2017-12-19 0:20 Andreas Sturmlechner
2017-12-18 12:37 Michael Weber
2017-12-14 15:32 Michael Weber
2017-11-18 14:01 Patrick Lauer
2017-09-23 6:31 Patrick Lauer
2017-04-22 13:52 Michał Górny
2017-04-20 7:59 David Seifert
2017-03-08 1:23 Mike Frysinger
2017-01-29 17:07 Patrick Lauer
2016-04-19 10:06 Patrick Lauer
2016-04-11 10:13 Patrick Lauer
2016-03-31 6:18 Patrick Lauer
2016-01-02 18:53 Agostino Sarubbo
2015-12-12 5:15 Thomas Kahle
2015-12-12 5:15 Thomas Kahle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1574016699.41fc05a8d3ea6aee49bcff68ddce01151dec6a62.pesa@gentoo \
--to=pesa@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox