[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: ad94d2fe89249c6d7c7f8962668e409bcdfa464f
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Apr 26 11:25:15 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 26 11:30:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad94d2fe
www-client/qutebrowser: backport tests fix for PyQt6-6.7.0
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/qutebrowser-3.1.0-pyqt670-tests.patch| 73 ++
www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild | 1 +
2 files changed, 74 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
b/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
new file mode 100644
index ..8095c3fa02ce
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
@@ -0,0 +1,73 @@
+https://github.com/qutebrowser/qutebrowser/commit/1ee138b681a590ee500954361eed2cf923b1d8a0
+From: Florian Bruhin
+Date: Mon, 25 Mar 2024 23:19:37 +0100
+Subject: [PATCH] qtutils: Handle QDataStream.Status.SizeLimitExceeded
+--- a/qutebrowser/utils/qtutils.py
b/qutebrowser/utils/qtutils.py
+@@ -193,6 +193,15 @@ def check_qdatastream(stream: QDataStream) -> None:
+ QDataStream.Status.WriteFailed: ("The data stream cannot write to the
"
+ "underlying device."),
+ }
++try:
++status_to_str[QDataStream.Status.SizeLimitExceeded] = ( # type:
ignore[attr-defined]
++"The data stream cannot read or write the data because its size
is larger "
++"than supported by the current platform."
++)
++except AttributeError:
++# Added in Qt 6.7
++pass
++
+ if stream.status() != QDataStream.Status.Ok:
+ raise OSError(status_to_str[stream.status()])
+
+--- a/tests/unit/utils/test_qtutils.py
b/tests/unit/utils/test_qtutils.py
+@@ -208,6 +208,18 @@ def test_ensure_valid(obj, raising, exc_reason, exc_str):
+ "The data stream has read corrupt data."),
+ (QDataStream.Status.WriteFailed, True,
+ "The data stream cannot write to the underlying device."),
++pytest.param(
++getattr(QDataStream.Status, "SizeLimitExceeded", None),
++True,
++(
++"The data stream cannot read or write the data because its size
is larger "
++"than supported by the current platform."
++),
++marks=pytest.mark.skipif(
++not hasattr(QDataStream.Status, "SizeLimitExceeded"),
++reason="Added in Qt 6.7"
++)
++),
+ ])
+ def test_check_qdatastream(status, raising, message):
+ """Test check_qdatastream.
+@@ -226,10 +238,25 @@ def test_check_qdatastream(status, raising, message):
+ qtutils.check_qdatastream(stream)
+
+
+-def test_qdatastream_status_count():
+-"""Make sure no new members are added to QDataStream.Status."""
+-status_vals = testutils.enum_members(QDataStream, QDataStream.Status)
+-assert len(status_vals) == 4
++def test_qdatastream_status_members():
++"""Make sure no new members are added to QDataStream.Status.
++
++If this fails, qtutils.check_qdatastream will need to be updated with the
++respective error documentation.
++"""
++status_vals = set(testutils.enum_members(QDataStream,
QDataStream.Status).values())
++expected = {
++QDataStream.Status.Ok,
++QDataStream.Status.ReadPastEnd,
++QDataStream.Status.ReadCorruptData,
++QDataStream.Status.WriteFailed,
++}
++try:
++expected.add(QDataStream.Status.SizeLimitExceeded)
++except AttributeError:
++# Added in Qt 6.7
++pass
++assert status_vals == expected
+
+
+ @pytest.mark.parametrize('color, expected', [
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
index f40f5009dff3..3eb916073966 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
@@ -83,6 +83,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/${P}-qt663-tests.patch
+ "${FILESDIR}"/${P}-pyqt670-tests.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 2d27d585c0f269f0a0e0762917e528e8340d5ea6
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Apr 15 01:08:24 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Apr 15 01:15:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d27d585
www-client/qutebrowser: limit pdfjs to <4.1 for now
Incompatible with the non-legacy sdist of 4.1.329 and
will fail to load any pdf with type errors.
Not that 4.1.329 is in-tree yet, just doing it before it breaks
(revbumps are cheap for this package) and will revisit later.
Signed-off-by: Ionen Wolkens gentoo.org>
.../{qutebrowser-3.1.0.ebuild => qutebrowser-3.1.0-r1.ebuild}| 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 5 -
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
similarity index 99%
rename from www-client/qutebrowser/qutebrowser-3.1.0.ebuild
rename to www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
index a8f02d769926..f40f5009dff3 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
dev-qt/qtbase:6[icu,sqlite]
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
- pdf? ( www-plugins/pdfjs )
+ pdf? (
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: b4de57077200b5c9bbddf981b82aeb276f10d0aa
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Mar 27 10:43:20 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Mar 27 11:01:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4de5707
www-client/qutebrowser: force-enable Qt6 in live
Still supported upstream, but qtwebengine:5 is slowly on its way
out in Gentoo and offers a poor browsing experience with modern
websites. Some may prefer Qt5 for better DE integration at the
moment, but considering that these issues throne over that.
Also drop the transition warning, we can rely on the warning that
qutebrowser itself will do (formerly was missing, thus the ebuild
warning was more useful). Plus given there is no USE to disable Qt6
anymore going back the other way is unlikely.
Qutebrowser's default is Qt6 so we can also drop the overrides.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 63 --
1 file changed, 8 insertions(+), 55 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 0ee9fb6c0be8..63c251546529 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -26,37 +26,28 @@ HOMEPAGE="https://qutebrowser.org/;
LICENSE="GPL-3+"
SLOT="0"
-IUSE="+adblock pdf +qt6 widevine"
+IUSE="+adblock pdf widevine"
RDEPEND="
$(python_gen_cond_dep '
+ dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/zipp[${PYTHON_USEDEP}]
+ dev-qt/qtbase:6[icu,sqlite]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- qt6? (
- dev-qt/qtbase:6[icu,sqlite]
-
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
- dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
- pdf? ( www-plugins/pdfjs )
- )
- !qt6? (
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- dev-qt/qtsql:5[sqlite]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- pdf? (
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: f61707f5690c4cb3e7c684b2ac01c7eb9b28df89
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Mar 27 10:49:28 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Mar 27 11:01:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61707f5
www-client/qutebrowser: show USE=-qt6 warning regardless of arch
qtwebengine:6 is keyworded on arm64 now, and x86 keywords were dropped.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
index b71080584826..a8f02d769926 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -200,8 +200,7 @@ pkg_postinst() {
ewarn "be a warning on startup, and may optionally want to
backup first."
fi
- # only show Qt6 warning on arches where USE=qt6 is unmasked
- if use amd64 && use !qt6; then
+ if use !qt6; then
ewarn
ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses
an older"
ewarn "chromium version. While it is relatively maintained for
security, it will"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: 89949e527754f03fed66122a4302e5ac5b409d6d
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Mar 22 02:19:07 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Mar 22 02:23:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89949e52
www-client/qutebrowser: fix tests qith upcoming Qt6.6.3+6.7.0
Thought this was 6.7.0-only at first, but seems it was backported
to 6.6.3 which should release very soon.
Not touching live given upstream is likely to look more closely at
6.7.0 issues soon.
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/files/qutebrowser-3.1.0-qt663-tests.patch| 12
www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 4
2 files changed, 16 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-3.1.0-qt663-tests.patch
b/www-client/qutebrowser/files/qutebrowser-3.1.0-qt663-tests.patch
new file mode 100644
index ..e262623ab1c7
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-3.1.0-qt663-tests.patch
@@ -0,0 +1,12 @@
+6.6.3 and 6.7.0-rc start to emit a new warning that causes:
+test_browsertab.py:13: Failure: Qt messages with level WARNING or above emitted
+
+It still seems(?) to be able to find qutebrowser's installed dictionaries
+fine and spellchecking works. Let's just ignore this warning for now.
+--- a/pytest.ini
b/pytest.ini
+@@ -63,2 +63,4 @@
+ Error in contacting registry:
"org\.freedesktop\.DBus\.Error\.Disconnected" "Not connected to D-Bus server"
++# Qt 6.6.3 and 6.7.0, not looked into but spellchecking still functions
++^Path override failed for key base::DIR_APP_DICTIONARIES and path .*
+ xfail_strict = true
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
index 8bf80f2e1370..b71080584826 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -81,6 +81,10 @@ fi
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-qt663-tests.patch
+)
+
src_prepare() {
distutils-r1_src_prepare
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 13733f1bdf1cb5641fb1ebc53d9de38da0c7ffbe
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Feb 9 05:51:34 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Feb 9 09:08:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13733f1b
www-client/qutebrowser: warn about qtwebengine[bindist]
With the binhost gaining popularity, it may be good to warn about it.
Not an issue for most packages, but losing e.g. h264 in a full web
browser is not great and may leave users confused.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 8
www-client/qutebrowser/qutebrowser-.ebuild | 8
2 files changed, 16 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
index 1f3619d59962..8bf80f2e1370 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -203,4 +203,12 @@ pkg_postinst() {
ewarn "chromium version. While it is relatively maintained for
security, it will"
ewarn "cause issues for sites/features designed with a newer
version in mind."
fi
+
+ if { use qt6 && has_version 'dev-qt/qtwebengine:6[bindist]'; } ||
+ { use !qt6 && has_version 'dev-qt/qtwebengine:5[bindist]'; }
+ then
+ ewarn
+ ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that
this"
+ ewarn "will prevent playback of proprietary media formats (e.g.
h264)."
+ fi
}
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 9d0b343f3286..0ee9fb6c0be8 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -203,4 +203,12 @@ pkg_postinst() {
ewarn "chromium version. While it is relatively maintained for
security, it will"
ewarn "cause issues for sites/features designed with a newer
version in mind."
fi
+
+ if { use qt6 && has_version 'dev-qt/qtwebengine:6[bindist]'; } ||
+ { use !qt6 && has_version 'dev-qt/qtwebengine:5[bindist]'; }
+ then
+ ewarn
+ ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that
this"
+ ewarn "will prevent playback of proprietary media formats (e.g.
h264)."
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: f496729944e1d1d53e9929200059538528f0f16f
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Jan 9 08:45:30 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jan 9 14:05:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4967299
www-client/qutebrowser: fix casing typo in comment
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
index 6134e6cba9f4..1f3619d59962 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -155,7 +155,7 @@ python_test() {
local epytestargs=(
# prefer pytest-xvfb over virtx given same upstream and is
expected
-p xvfb
- # skip warning tests broken by -wdefault, and benchmarks
+ # skip warning tests broken by -Wdefault, and benchmarks
-k 'not _bench and not _matches_tree and not _warning'
# override eclass' settings, tempdirs are re-used by Qt
-o tmp_path_retention_policy=all
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 6d2ceaa9e208..9d0b343f3286 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -155,7 +155,7 @@ python_test() {
local epytestargs=(
# prefer pytest-xvfb over virtx given same upstream and is
expected
-p xvfb
- # skip warning tests broken by -wdefault, and benchmarks
+ # skip warning tests broken by -Wdefault, and benchmarks
-k 'not _bench and not _matches_tree and not _warning'
# override eclass' settings, tempdirs are re-used by Qt
-o tmp_path_retention_policy=all
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 737704ccd537f71f22bb98920f410f9d2ebc9b9b
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 8 22:50:27 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 8 23:00:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737704cc
www-client/qutebrowser: fix tests due to python-utils changes
Several tests fail due to `-o tmp_path_retention_policy=failed`
from python-utils.eclass since commit b77499537549, so set
back to the default (=all).
The other setting (tmp_path_retention_count=0) does not seem
to be a problem.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 14 +++---
www-client/qutebrowser/qutebrowser-.ebuild | 14 +++---
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
index 7ddeb9db71fb..6134e6cba9f4 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -152,8 +152,16 @@ python_test() {
tests/unit/mainwindow/test_tabwidget.py::TestTabWidget::test_tab_text_not_edlided_for_wide_tabs
)
- # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
+ local epytestargs=(
+ # prefer pytest-xvfb over virtx given same upstream and is
expected
+ -p xvfb
+ # skip warning tests broken by -wdefault, and benchmarks
+ -k 'not _bench and not _matches_tree and not _warning'
+ # override eclass' settings, tempdirs are re-used by Qt
+ -o tmp_path_retention_policy=all
+ )
+
+ epytest "${epytestargs[@]}"
}
python_install_all() {
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 23ed8b900a7c..6d2ceaa9e208 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -152,8 +152,16 @@ python_test() {
tests/unit/mainwindow/test_tabwidget.py::TestTabWidget::test_tab_text_not_edlided_for_wide_tabs
)
- # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
+ local epytestargs=(
+ # prefer pytest-xvfb over virtx given same upstream and is
expected
+ -p xvfb
+ # skip warning tests broken by -wdefault, and benchmarks
+ -k 'not _bench and not _matches_tree and not _warning'
+ # override eclass' settings, tempdirs are re-used by Qt
+ -o tmp_path_retention_policy=all
+ )
+
+ epytest "${epytestargs[@]}"
}
python_install_all() {
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 872de6c6b71e65b9f919968f205405c74813634a
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 8 12:13:51 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 8 12:57:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872de6c6
www-client/qutebrowser: drop 3.0.2-r1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest| 2 -
www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild | 198 -
2 files changed, 200 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index feae6aeaaade..02e1b0c83623 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,2 @@
-DIST qutebrowser-3.0.2.tar.gz 6036377 BLAKE2B
e7e20eacae745fb6a2c30e16667f1db55dc744d63cc20d287d563b1a69741797a2d473c8a450a93bae700db6798f9dd7549c3bec5497ffc67679d8f63e82d5fb
SHA512
fb980d3d55bb6f6ecdb79f3d38e616399828c647b9fbf16c791e8964ba3e6f350ffced0944bbec60b60a2451c60e383ecdd93e535f41292d2dc2b75830049a66
-DIST qutebrowser-3.0.2.tar.gz.asc 659 BLAKE2B
ed789a18a5221143632f0abcc112526910952eccfd01c01cc418ef2175b2ca42b1ae7b0a21ac4194789b0ce5713628b328dc36a5328e3e01084672839fcef184
SHA512
b01276f073498f9ef982706b1b8048db22e3fa017d99b9ebe2f4f75615a12c5614ea2b047577632e558e4f3c860fa9a84429a47f0dfa75a287b24fb86a8af950
DIST qutebrowser-3.1.0.tar.gz 6045747 BLAKE2B
d0cca696dd85bb99b8514331a392e1cb54fcbeff32fcf13e058739ef5a20ef1725980fbabef187a226f1cc29be9943784ba1f93275047586827922c3e98d0a64
SHA512
79dff3cf4ff93c75150e5cb9ada835ed5faf0343f03854266c6138fb8e6cceb921c868e1e408432da61b85ebe37e7e1657f634771ff73f1395d1b6e169138d98
DIST qutebrowser-3.1.0.tar.gz.asc 659 BLAKE2B
023916e83cf2ac084f013ad750acf1ddb02a146197e92f703a96c54bceafcabf9d09a398c43e1679d0e425d54f13726c576c1b2e13707888e097952abef9797b
SHA512
f89369b0c61852c0ee22a476fcce0c8fc236920a2c6fbcfb945e010275650bdd133b6714ec2b64c1156789eb3f6f897cbf9a31441e913afcf9f19ea3113611f7
diff --git a/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
deleted file mode 100644
index c15328b191b8..
--- a/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
-else
- inherit verify-sig
- SRC_URI="
-
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
- verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
- "
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
-HOMEPAGE="https://qutebrowser.org/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf +qt6 widevine"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- qt6? (
- dev-qt/qtbase:6[icu,sqlite]
-
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
- dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
- pdf? ( https://github.com/qutebrowser/qutebrowser/issues/7620
- rm tests/unit/scripts/test_problemmatchers.py || die
- fi
- fi
-}
-
-python_test() {
- local -x PYTEST_QT_API=pyqt$(usex qt6 6 5)
-
- local EPYTEST_DESELECT=(
- # end2end/IPC tests are broken with "Name error" if socket path
is over
- # ~108 characters (>124 in /var/tmp/portage) due to Linux
limitations,
- # skip rather than bother using /tmp+cleanup over ${T} (end2end
tests
- # are important, but the other tests should be enough for
downstream)
- tests/end2end
- tests/unit/misc/test_ipc.py
- # python eclasses provide a fake "failing" python2 and trips
this test
- tests/unit/misc/test_checkpyver.py::test_old_python
- # not worth running dbus over
- tests/unit/browser/test_notification.py::TestDBus
- # fails in ebuild, seems due to saving fake downloads in the
wrong location
-
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 5bcb5e4ba199cc0e2eae8ae570bb1137fcb96a3e
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Dec 16 11:52:50 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Dec 16 12:01:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bcb5e4b
www-client/qutebrowser: stabilize 3.1.0 for amd64
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
index 23ed8b900a7c..7ddeb9db71fb 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -18,7 +18,7 @@ else
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="amd64 ~arm64"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 6294066db20560a8ddecab8702427a154e71d7cd
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Dec 8 15:51:44 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Dec 8 15:54:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6294066d
www-client/qutebrowser: add 3.1.0
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 2 +
www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 198
2 files changed, 200 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 812ce75e59b1..feae6aeaaade 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,4 @@
DIST qutebrowser-3.0.2.tar.gz 6036377 BLAKE2B
e7e20eacae745fb6a2c30e16667f1db55dc744d63cc20d287d563b1a69741797a2d473c8a450a93bae700db6798f9dd7549c3bec5497ffc67679d8f63e82d5fb
SHA512
fb980d3d55bb6f6ecdb79f3d38e616399828c647b9fbf16c791e8964ba3e6f350ffced0944bbec60b60a2451c60e383ecdd93e535f41292d2dc2b75830049a66
DIST qutebrowser-3.0.2.tar.gz.asc 659 BLAKE2B
ed789a18a5221143632f0abcc112526910952eccfd01c01cc418ef2175b2ca42b1ae7b0a21ac4194789b0ce5713628b328dc36a5328e3e01084672839fcef184
SHA512
b01276f073498f9ef982706b1b8048db22e3fa017d99b9ebe2f4f75615a12c5614ea2b047577632e558e4f3c860fa9a84429a47f0dfa75a287b24fb86a8af950
+DIST qutebrowser-3.1.0.tar.gz 6045747 BLAKE2B
d0cca696dd85bb99b8514331a392e1cb54fcbeff32fcf13e058739ef5a20ef1725980fbabef187a226f1cc29be9943784ba1f93275047586827922c3e98d0a64
SHA512
79dff3cf4ff93c75150e5cb9ada835ed5faf0343f03854266c6138fb8e6cceb921c868e1e408432da61b85ebe37e7e1657f634771ff73f1395d1b6e169138d98
+DIST qutebrowser-3.1.0.tar.gz.asc 659 BLAKE2B
023916e83cf2ac084f013ad750acf1ddb02a146197e92f703a96c54bceafcabf9d09a398c43e1679d0e425d54f13726c576c1b2e13707888e097952abef9797b
SHA512
f89369b0c61852c0ee22a476fcce0c8fc236920a2c6fbcfb945e010275650bdd133b6714ec2b64c1156789eb3f6f897cbf9a31441e913afcf9f19ea3113611f7
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
new file mode 100644
index ..23ed8b900a7c
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+ inherit verify-sig
+ SRC_URI="
+
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
+ verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
+ "
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf +qt6 widevine"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+ qt6? (
+ dev-qt/qtbase:6[icu,sqlite]
+
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
+ dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+ pdf? ( www-plugins/pdfjs )
+ )
+ !qt6? (
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ dev-qt/qtsql:5[sqlite]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ pdf? ( https://github.com/qutebrowser/qutebrowser/issues/7620
+ rm tests/unit/scripts/test_problemmatchers.py || die
+ fi
+ fi
+}
+
+python_test() {
+ local -x PYTEST_QT_API=pyqt$(usex qt6 6 5)
+
+ local EPYTEST_DESELECT=(
+ # end2end/IPC tests are broken with "Name error" if socket path
is over
+ # ~108 characters (>124 in /var/tmp/portage) due to Linux
limitations,
+ # skip rather than bother using /tmp+cleanup over ${T} (end2end
tests
+ # are important, but the other tests should be enough for
downstream)
+ tests/end2end
+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: c6e790445a1de74732bc902c58f5bc91599777d1
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Nov 30 07:24:10 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Nov 30 11:52:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e79044
www-client/qutebrowser: drop x86 keyword
Same issue as calibre, qutebrowser and qtwebengine are masked
on x86 -- so let's just drop the keyword rather than pretend
that it's still supported.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild | 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
index c9a32babc5d7..c15328b191b8 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
@@ -18,7 +18,7 @@ else
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 645b91a3dbb8..23ed8b900a7c 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -18,7 +18,7 @@ else
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 1b2cf9875d08cacf086796e85e023a658546d07d
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Nov 27 08:13:38 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Nov 27 08:45:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2cf987
www-client/qutebrowser: preemptively add pdfjs upper bound
Not added to ::gentoo yet but is known incompatible at the
moment. Should be fixed next qutebrowser release.
Signed-off-by: Ionen Wolkens gentoo.org>
.../{qutebrowser-3.0.2.ebuild => qutebrowser-3.0.2-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
similarity index 99%
rename from www-client/qutebrowser/qutebrowser-3.0.2.ebuild
rename to www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
index 8a9ac019a4d3..c9a32babc5d7 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.2-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
dev-qt/qtbase:6[icu,sqlite]
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
- pdf? ( www-plugins/pdfjs )
+ pdf? (
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
commit: 5f803d5c4c05646ee9fd9c11bd3813542b22b3a7
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Nov 27 08:11:55 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Nov 27 08:45:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f803d5c
www-client/qutebrowser: drop 3.0.0
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest| 2 -
.../files/qutebrowser-3.0.0-tests-qt653.patch | 12 --
www-client/qutebrowser/qutebrowser-3.0.0.ebuild| 202 -
3 files changed, 216 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 6f44a498049f..812ce75e59b1 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,2 @@
-DIST qutebrowser-3.0.0.tar.gz 6030459 BLAKE2B
05e1f3c87fe572ec66d199b9c255178c7e7358321c44255b9191624fa4fede0525b16ff0740df5051390f4e3b2a2c3ee99d53fcf6c44279689f9ea0427df13ca
SHA512
2aa361b418adad1e2c2dd068148215f3eaea29c70e00634fd1a2370d584ffa2a66b0a0e22623656fc5f634d35ba99a178c269a3accd25edf778b7e3077ceb373
-DIST qutebrowser-3.0.0.tar.gz.asc 659 BLAKE2B
19d736ede7cfb2ac4d3ebaea7f4f8a6da722e3eac0c1693d487ed16f2bc5a5cce13bbc69604cd7c34e266c345f3149f2f2250aba71555f3290cd63216adc0b98
SHA512
25c9cd3fa44f712b98ef3f8d1821f61d5f2b96d8bf108ff2277dc6609343237876124f7587cf906127b8d6161923bda0946c6ef75f3cbf6c401cf5d72b7a6ffd
DIST qutebrowser-3.0.2.tar.gz 6036377 BLAKE2B
e7e20eacae745fb6a2c30e16667f1db55dc744d63cc20d287d563b1a69741797a2d473c8a450a93bae700db6798f9dd7549c3bec5497ffc67679d8f63e82d5fb
SHA512
fb980d3d55bb6f6ecdb79f3d38e616399828c647b9fbf16c791e8964ba3e6f350ffced0944bbec60b60a2451c60e383ecdd93e535f41292d2dc2b75830049a66
DIST qutebrowser-3.0.2.tar.gz.asc 659 BLAKE2B
ed789a18a5221143632f0abcc112526910952eccfd01c01cc418ef2175b2ca42b1ae7b0a21ac4194789b0ce5713628b328dc36a5328e3e01084672839fcef184
SHA512
b01276f073498f9ef982706b1b8048db22e3fa017d99b9ebe2f4f75615a12c5614ea2b047577632e558e4f3c860fa9a84429a47f0dfa75a287b24fb86a8af950
diff --git a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
deleted file mode 100644
index 107a50f2b07a..
--- a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt6.5.3(?)+6.6.0-rc emits new warnings and causes tests to be
-aborted even if did not really fail. Should be fixed[1] in 6.6.0
-final and cleanable later.
-
-[1] https://bugreports.qt.io/browse/QTBUG-117200
a/pytest.ini
-+++ b/pytest.ini
-@@ -61,2 +61,4 @@
- ^QBackingStore::endPaint\(\) called with active painter; did you forget
to destroy it or call QPainter::end\(\) on it\?$
-+# ...and Qt 6.5.3+
-+^QItemSelectionModel: Selecting when no model has been set will result in
a no-op\.
- xfail_strict = true
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
deleted file mode 100644
index 879050450943..
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
-else
- inherit verify-sig
- SRC_URI="
-
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
- verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
- "
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
-HOMEPAGE="https://qutebrowser.org/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf +qt6 widevine"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- qt6? (
- dev-qt/qtbase:6[icu,sqlite]
-
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
- dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
- pdf? ( www-plugins/pdfjs )
- )
- !qt6? (
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
-
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 8b15ab2460b41e26a6c70596cc98eea5213d41b0
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Nov 6 14:06:54 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Nov 6 14:07:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b15ab24
www-client/qutebrowser: stabilize 3.0.2 for amd64
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
index 645b91a3dbb8..8a9ac019a4d3 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
@@ -18,7 +18,7 @@ else
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 9cc1b24eff7b7d5e2c3968587ab69382e790e5b7
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Nov 1 13:52:34 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Nov 1 13:55:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc1b24e
www-client/qutebrowser: revert to back to old verify-sig handling
This was done for BROOT, but if BROOT no longer need to be passed
then redefining src_unpack is unnecessary.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 10 +-
www-client/qutebrowser/qutebrowser-3.0.2.ebuild | 10 +-
www-client/qutebrowser/qutebrowser-.ebuild | 10 +-
3 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 7a25445e2a5d..879050450943 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -17,6 +17,7 @@ else
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
KEYWORDS="amd64 ~arm64 ~x86"
fi
@@ -84,15 +85,6 @@ PATCHES=(
"${FILESDIR}"/${P}-tests-qt653.patch
)
-src_unpack() {
- if [[ ${PV} == ]]; then
- git-r3_src_unpack
- else
- local
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- verify-sig_src_unpack
- fi
-}
-
src_prepare() {
distutils-r1_src_prepare
diff --git a/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
index 2a7b18264bcb..645b91a3dbb8 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
@@ -17,6 +17,7 @@ else
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
KEYWORDS="~amd64 ~arm64 ~x86"
fi
@@ -80,15 +81,6 @@ fi
distutils_enable_tests pytest
-src_unpack() {
- if [[ ${PV} == ]]; then
- git-r3_src_unpack
- else
- local
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- verify-sig_src_unpack
- fi
-}
-
src_prepare() {
distutils-r1_src_prepare
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 2a7b18264bcb..645b91a3dbb8 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -17,6 +17,7 @@ else
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
KEYWORDS="~amd64 ~arm64 ~x86"
fi
@@ -80,15 +81,6 @@ fi
distutils_enable_tests pytest
-src_unpack() {
- if [[ ${PV} == ]]; then
- git-r3_src_unpack
- else
- local
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
- verify-sig_src_unpack
- fi
-}
-
src_prepare() {
distutils-r1_src_prepare
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: d979c16f62833da4e009dab5db8257737363604a
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Oct 20 01:05:53 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 20 01:13:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d979c16f
www-client/qutebrowser: add 3.0.2
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 2 +
www-client/qutebrowser/qutebrowser-3.0.2.ebuild | 206
2 files changed, 208 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index f985470fac4a..6f44a498049f 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,4 @@
DIST qutebrowser-3.0.0.tar.gz 6030459 BLAKE2B
05e1f3c87fe572ec66d199b9c255178c7e7358321c44255b9191624fa4fede0525b16ff0740df5051390f4e3b2a2c3ee99d53fcf6c44279689f9ea0427df13ca
SHA512
2aa361b418adad1e2c2dd068148215f3eaea29c70e00634fd1a2370d584ffa2a66b0a0e22623656fc5f634d35ba99a178c269a3accd25edf778b7e3077ceb373
DIST qutebrowser-3.0.0.tar.gz.asc 659 BLAKE2B
19d736ede7cfb2ac4d3ebaea7f4f8a6da722e3eac0c1693d487ed16f2bc5a5cce13bbc69604cd7c34e266c345f3149f2f2250aba71555f3290cd63216adc0b98
SHA512
25c9cd3fa44f712b98ef3f8d1821f61d5f2b96d8bf108ff2277dc6609343237876124f7587cf906127b8d6161923bda0946c6ef75f3cbf6c401cf5d72b7a6ffd
+DIST qutebrowser-3.0.2.tar.gz 6036377 BLAKE2B
e7e20eacae745fb6a2c30e16667f1db55dc744d63cc20d287d563b1a69741797a2d473c8a450a93bae700db6798f9dd7549c3bec5497ffc67679d8f63e82d5fb
SHA512
fb980d3d55bb6f6ecdb79f3d38e616399828c647b9fbf16c791e8964ba3e6f350ffced0944bbec60b60a2451c60e383ecdd93e535f41292d2dc2b75830049a66
+DIST qutebrowser-3.0.2.tar.gz.asc 659 BLAKE2B
ed789a18a5221143632f0abcc112526910952eccfd01c01cc418ef2175b2ca42b1ae7b0a21ac4194789b0ce5713628b328dc36a5328e3e01084672839fcef184
SHA512
b01276f073498f9ef982706b1b8048db22e3fa017d99b9ebe2f4f75615a12c5614ea2b047577632e558e4f3c860fa9a84429a47f0dfa75a287b24fb86a8af950
diff --git a/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
new file mode 100644
index ..e6b161f1ee7b
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-3.0.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+ inherit verify-sig
+ SRC_URI="
+
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
+ verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
+ "
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf +qt6 widevine"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+ qt6? (
+ dev-qt/qtbase:6[icu,sqlite]
+
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
+ dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+ pdf? ( www-plugins/pdfjs )
+ )
+ !qt6? (
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ dev-qt/qtsql:5[sqlite]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ pdf? ( https://github.com/qutebrowser/qutebrowser/issues/7620
+ rm tests/unit/scripts/test_problemmatchers.py || die
+ fi
+ fi
+}
+
+python_test() {
+ local -x PYTEST_QT_API=pyqt$(usex qt6 6 5)
+
+ local EPYTEST_DESELECT=(
+ # end2end/IPC tests are broken with "Name error" if socket path
is over
+ # ~108 characters (>124 in /var/tmp/portage) due to Linux
limitations,
+ # skip rather than bother using /tmp+cleanup over ${T} (end2end
tests
+ # are important, but the other tests should be enough for
downstream)
+ tests/end2end
+ tests/unit/misc/test_ipc.py
+ # python eclasses
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: f34bf41a36fa763ab5d3d818ff54c9a09044b8fe
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Oct 10 18:45:01 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Oct 10 20:18:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34bf41a
www-client/qutebrowser: fix VariableScope
Would probably be simpler if the eclass could handle BROOT by itself.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 10 +-
www-client/qutebrowser/qutebrowser-.ebuild | 10 +-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 189d01f0bdf8..901679cc38fa 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -17,7 +17,6 @@ else
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
-
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
KEYWORDS="amd64 ~arm64 ~x86"
fi
@@ -85,6 +84,15 @@ PATCHES=(
"${FILESDIR}"/${P}-tests-qt653.patch
)
+src_unpack() {
+ if [[ ${PV} == ]]; then
+ git-r3_src_unpack
+ else
+ local
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg
+ verify-sig_src_unpack
+ fi
+}
+
src_prepare() {
distutils-r1_src_prepare
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 7b51f2231379..e6b161f1ee7b 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -17,7 +17,6 @@ else
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
-
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
KEYWORDS="~amd64 ~arm64 ~x86"
fi
@@ -81,6 +80,15 @@ fi
distutils_enable_tests pytest
+src_unpack() {
+ if [[ ${PV} == ]]; then
+ git-r3_src_unpack
+ else
+ local
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg
+ verify-sig_src_unpack
+ fi
+}
+
src_prepare() {
distutils-r1_src_prepare
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/
commit: 3d4e5a52a98d1645cd068761010e3e87da5fb491 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 27 17:43:08 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Sep 28 12:31:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4e5a52 www-client/qutebrowser: add bug link for qt653 tests patch Signed-off-by: Ionen Wolkens gentoo.org> .../qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch index e6d1185202cd..107a50f2b07a 100644 --- a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch +++ b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch @@ -1,10 +1,12 @@ -Qt6.5.3+ emits new warnings and causes tests to be aborted even if did -not really fail. May(?) indicate that something needs to be done better -in PyQt6 or qutebrowser, but let's just ignore it here for now. +Qt6.5.3(?)+6.6.0-rc emits new warnings and causes tests to be +aborted even if did not really fail. Should be fixed[1] in 6.6.0 +final and cleanable later. + +[1] https://bugreports.qt.io/browse/QTBUG-117200 --- a/pytest.ini +++ b/pytest.ini @@ -61,2 +61,4 @@ ^QBackingStore::endPaint\(\) called with active painter; did you forget to destroy it or call QPainter::end\(\) on it\?$ -+# ...and Qt 6.5.3 ++# ...and Qt 6.5.3+ +^QItemSelectionModel: Selecting when no model has been set will result in a no-op\. xfail_strict = true
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: ef9afe012b1708dd6eec8b9c888b66b019d1fecf
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 26 23:45:16 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Sep 27 00:00:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9afe01
Revert "www-client/qutebrowser: drop 6.5.3 tests workaround"
This reverts commit 33ef6a9d4df3ea6a0c688b0bb3bde2f7fa5e481d.
Actually still cause problems with 6.6.0-rc, going to keep
this around for a bit longer and see how it goes.
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch | 10 ++
www-client/qutebrowser/qutebrowser-3.0.0.ebuild| 4
2 files changed, 14 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
new file mode 100644
index ..e6d1185202cd
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
@@ -0,0 +1,10 @@
+Qt6.5.3+ emits new warnings and causes tests to be aborted even if did
+not really fail. May(?) indicate that something needs to be done better
+in PyQt6 or qutebrowser, but let's just ignore it here for now.
+--- a/pytest.ini
b/pytest.ini
+@@ -61,2 +61,4 @@
+ ^QBackingStore::endPaint\(\) called with active painter; did you forget
to destroy it or call QPainter::end\(\) on it\?$
++# ...and Qt 6.5.3
++^QItemSelectionModel: Selecting when no model has been set will result in
a no-op\.
+ xfail_strict = true
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index f2467c8a47d8..189d01f0bdf8 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -81,6 +81,10 @@ fi
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-tests-qt653.patch
+)
+
src_prepare() {
distutils-r1_src_prepare
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: 8ab0af2d2de53e11130eb6eeb8f2ad7c27e8c47f
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Sep 18 11:51:52 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Sep 18 11:51:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab0af2d
www-client/qutebrowser: drop 2.5.4-r1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest| 1 -
.../qutebrowser-2.5.4-tests-python-3.11.4.patch| 102 -
www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild | 162 -
3 files changed, 265 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 92c58976db37..f985470fac4a 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,3 +1,2 @@
-DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B
d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3
SHA512
1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
DIST qutebrowser-3.0.0.tar.gz 6030459 BLAKE2B
05e1f3c87fe572ec66d199b9c255178c7e7358321c44255b9191624fa4fede0525b16ff0740df5051390f4e3b2a2c3ee99d53fcf6c44279689f9ea0427df13ca
SHA512
2aa361b418adad1e2c2dd068148215f3eaea29c70e00634fd1a2370d584ffa2a66b0a0e22623656fc5f634d35ba99a178c269a3accd25edf778b7e3077ceb373
DIST qutebrowser-3.0.0.tar.gz.asc 659 BLAKE2B
19d736ede7cfb2ac4d3ebaea7f4f8a6da722e3eac0c1693d487ed16f2bc5a5cce13bbc69604cd7c34e266c345f3149f2f2250aba71555f3290cd63216adc0b98
SHA512
25c9cd3fa44f712b98ef3f8d1821f61d5f2b96d8bf108ff2277dc6609343237876124f7587cf906127b8d6161923bda0946c6ef75f3cbf6c401cf5d72b7a6ffd
diff --git
a/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
b/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
deleted file mode 100644
index 909bd3acfab7..
--- a/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Backports for tests broken by python-3.11.4.
-https://bugs.gentoo.org/910742
-
-IPv6 tests are notably related to https://bugs.gentoo.org/909747
-
-https://github.com/qutebrowser/qutebrowser/commit/e1d0b3c543fc470a0459a18be3dee5a151ed79ed
-https://github.com/qutebrowser/qutebrowser/commit/5d890f14d093689e53fcbdec3d739daf04a8aae4
-...was for 3.12 but change was backported to 3.11.4 which led to:
-https://github.com/qutebrowser/qutebrowser/commit/8b058389b7db591fb52b99fe9f7afbacfeabd901
a/tests/unit/config/test_configfiles.py
-+++ b/tests/unit/config/test_configfiles.py
-@@ -1102,7 +1102,14 @@
- error = excinfo.value.errors[0]
--assert isinstance(error.exception, ValueError)
--assert error.text == "Error while compiling"
-+
-+if sys.version_info >= (3, 11, 4):
-+assert isinstance(error.exception, SyntaxError)
-+assert error.text == "Unhandled exception"
-+assert error.traceback is not None # tested in more detail by
test below
-+else:
-+assert isinstance(error.exception, ValueError)
-+assert error.text == "Error while compiling"
-+assert error.traceback is None
-+
- exception_text = 'source code string cannot contain null bytes'
- assert str(error.exception) == exception_text
--assert error.traceback is None
-
a/tests/unit/utils/test_urlmatch.py
-+++ b/tests/unit/utils/test_urlmatch.py
-@@ -42,2 +42,8 @@
-
-+_INVALID_IP_MESSAGE = (
-+r'Invalid IPv6 address; source was ".*"; host = ""|'
-+r"'.*' does not appear to be an IPv4 or IPv6 address" # Python 3.11.4+
-+)
-+
-+
- @pytest.mark.parametrize('pattern, error', [
-@@ -62,3 +68,7 @@
- ## TEST(ExtensionURLPatternTest, IPv6Patterns)
--pytest.param("http://[]:/*;, "Pattern without host", id='host-ipv6'),
-+pytest.param(
-+"http://[]:/*;,
-+"Pattern without host|'' does not appear to be an IPv4 or IPv6
address",
-+id='host-ipv6',
-+),
-
-@@ -89,3 +99,6 @@
- "http://[[2607:f8b0:4005:805::200e]/*;,
--r"""Expected '\]' to match '\[' in hostname; source was
"\[2607:f8b0:4005:805::200e"; host = ",
-+(
-+r'''Expected '\]' to match '\[' in hostname; source was
"\[2607:f8b0:4005:805::200e"; host = ""|'''
-+r"'\[2607:f8b0:4005:805::200e' does not appear to be an IPv4 or
IPv6 address"
-+),
- id='host-ipv6-two-open',
-@@ -95,3 +108,3 @@
- "http://[2607:f8b0:4005:805:200e]/*;,
--'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e"; host =
""',
-+_INVALID_IP_MESSAGE,
- id='host-ipv6-colons',
-@@ -101,3 +114,3 @@
- "http://[2607:f8b0:4005:805:200e:12:bogus]/*;,
--'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e:12:bogus";
host = ""',
-+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
commit: f45b72a5c98aef514d1565b2b59f4d1645f3231f
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Sep 16 07:40:46 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Sep 17 01:54:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45b72a5
www-client/qutebrowser: ignore new Qt warnings for tests
Maybe bit early to do this, but currently getting these
warnings with due-for-release-soon 6.5.3 and 6.6.0 branches.
Temporary either way, that's something upstream will handle
if still needed by the time of next release.
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch | 10 ++
www-client/qutebrowser/qutebrowser-3.0.0.ebuild| 4
2 files changed, 14 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
new file mode 100644
index ..e6d1185202cd
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
@@ -0,0 +1,10 @@
+Qt6.5.3+ emits new warnings and causes tests to be aborted even if did
+not really fail. May(?) indicate that something needs to be done better
+in PyQt6 or qutebrowser, but let's just ignore it here for now.
+--- a/pytest.ini
b/pytest.ini
+@@ -61,2 +61,4 @@
+ ^QBackingStore::endPaint\(\) called with active painter; did you forget
to destroy it or call QPainter::end\(\) on it\?$
++# ...and Qt 6.5.3
++^QItemSelectionModel: Selecting when no model has been set will result in
a no-op\.
+ xfail_strict = true
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 917250eb0675..0b5e8e7dd8d5 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -81,6 +81,10 @@ fi
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-tests-qt653.patch
+)
+
src_prepare() {
distutils-r1_src_prepare
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 00174203013e3adccd779a689e2cb8f3728d7c23
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Sep 16 14:58:32 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Sep 17 01:56:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00174203
www-client/qutebrowser: skip chromium version test
Checks if the chromium version matches known versions recorded in the
test. Upstream updates as needed but that means failure for any older
qutebrowser version whenever there's a new major qtwebengine (aka,
currently fails with 6.6. which reports 112 rather than 108, but
otherwise qutebrowser works just fine with it and upstream has updated
this in qutebrowser-).
Not really useful for us, let's just skip it rather than update.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 2 ++
www-client/qutebrowser/qutebrowser-.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 0b5e8e7dd8d5..189d01f0bdf8 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -146,6 +146,8 @@ python_test() {
# needs _WRAPPER_OVERRIDE = None, but we have changed it
tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default
tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit}
+ # fails if chromium version is unrecognized (aka newer
qtwebengine)
+
tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version
)
# tests known failing with Qt5 which is considered a 2nd class citizen
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 788f4a608a3b..7b51f2231379 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -142,6 +142,8 @@ python_test() {
# needs _WRAPPER_OVERRIDE = None, but we have changed it
tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default
tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit}
+ # fails if chromium version is unrecognized (aka newer
qtwebengine)
+
tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version
)
# tests known failing with Qt5 which is considered a 2nd class citizen
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: f67593cf76d394c46d2476b0346f0ee93ac19330
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Sep 15 05:36:00 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Sep 15 06:08:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f67593cf
www-client/qutebrowser: stabilize 3.0.0 for amd64
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 788f4a608a3b..917250eb0675 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -18,7 +18,7 @@ else
verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 32cb42f03a2f84ca9690ceea0454d7731117e6f2
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Aug 21 15:45:27 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Aug 21 16:08:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32cb42f0
www-client/qutebrowser: enable py3.12
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 5 +
www-client/qutebrowser/qutebrowser-.ebuild | 5 +
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 51bd2ff8c4a4..d9a92b3f4c88 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -5,10 +5,7 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-# py3.12 should work (no tests regressions), but waiting on the last dep
-# (pytest-qt) to properly have py3.12 which gets more complicated with
-# QtPy + pyside* that we don't actually use here
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 xdg
if [[ ${PV} == ]]; then
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 51bd2ff8c4a4..d9a92b3f4c88 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -5,10 +5,7 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-# py3.12 should work (no tests regressions), but waiting on the last dep
-# (pytest-qt) to properly have py3.12 which gets more complicated with
-# QtPy + pyside* that we don't actually use here
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 xdg
if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 3eae99b922bf4e7e12b97c696caf543a44e1153a
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Aug 18 20:08:14 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 18 20:08:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eae99b9
www-client/qutebrowser: note prefix qtwebengine reminder
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 1 +
www-client/qutebrowser/qutebrowser-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 98701890400a..51bd2ff8c4a4 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -95,6 +95,7 @@ src_prepare() {
if use widevine && use prefix; then
# hack: QtWebEngine knows Gentoo's widevine, but not with
${EPREFIX}
+ # TODO: prefixify QtWebEngine itself
local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
sed -e "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
-i ${PN}/config/qtargs.py || die
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 98701890400a..51bd2ff8c4a4 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -95,6 +95,7 @@ src_prepare() {
if use widevine && use prefix; then
# hack: QtWebEngine knows Gentoo's widevine, but not with
${EPREFIX}
+ # TODO: prefixify QtWebEngine itself
local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
sed -e "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
-i ${PN}/config/qtargs.py || die
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 724d78b24a00b531c17315e5b4f962254caafd5c
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Aug 18 19:50:32 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 18 19:50:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724d78b2
www-client/qutebrowser: note issue link for deleted test
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 1176435dd59a..98701890400a 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -125,7 +125,7 @@ src_prepare() {
# likewise, needs vulture
rm tests/unit/scripts/test_run_vulture.py || die
else
- # needs dev scripts not included in release tarballs
+ # https://github.com/qutebrowser/qutebrowser/issues/7620
rm tests/unit/scripts/test_problemmatchers.py || die
fi
fi
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 1176435dd59a..98701890400a 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -125,7 +125,7 @@ src_prepare() {
# likewise, needs vulture
rm tests/unit/scripts/test_run_vulture.py || die
else
- # needs dev scripts not included in release tarballs
+ # https://github.com/qutebrowser/qutebrowser/issues/7620
rm tests/unit/scripts/test_problemmatchers.py || die
fi
fi
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 9fc6a99692c2d22ca23882769ca461be81913f95
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 17 15:26:41 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 18 14:33:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc6a996
www-client/qutebrowser: more minor live adjustments
wrt qt6 ewarn, at this point don't want it to sound like Qt6
is not stable and Qt5 removal is not happening anytime soon.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 29 +++---
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 8319d7eaab10..b9e02809fe3f 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -20,7 +20,7 @@ else
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
-HOMEPAGE="https://www.qutebrowser.org/;
+HOMEPAGE="https://qutebrowser.org/;
LICENSE="GPL-3+"
SLOT="0"
@@ -105,14 +105,19 @@ src_prepare() {
"${EPYTHON}" scripts/asciidoc2html.py || die
fi
- # disable tests/plugins that are unncessary for us and need extras
- sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
- -e '/pytest-instafail/d' -e 's/--instafail//' \
- -i pytest.ini || die
- if [[ ${PV} == ]]; then
- rm tests/unit/scripts/test_run_vulture.py || die
- else
- rm tests/unit/scripts/test_problemmatchers.py || die
+ if use test; then
+ # unnecessary here, and would require extra deps
+ sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
+ -e '/pytest-instafail/d' -e 's/--instafail//' \
+ -i pytest.ini || die
+
+ if [[ ${PV} == ]]; then
+ # likewise, needs vulture
+ rm tests/unit/scripts/test_run_vulture.py || die
+ else
+ # needs dev scripts not included in release tarballs
+ rm tests/unit/scripts/test_problemmatchers.py || die
+ fi
fi
}
@@ -122,14 +127,15 @@ python_test() {
local EPYTEST_DESELECT=(
# end2end/IPC tests are broken with "Name error" if socket path
is over
# ~108 characters (>124 in /var/tmp/portage) due to Linux
limitations,
- # skip rather than bother using /tmp+cleanup over ${T}
+ # skip rather than bother using /tmp+cleanup over ${T} (end2end
tests
+ # are important, but the other tests should be enough for
downstream)
tests/end2end
tests/unit/misc/test_ipc.py
# python eclasses provide a fake "failing" python2 and trips
this test
tests/unit/misc/test_checkpyver.py::test_old_python
# not worth running dbus over
tests/unit/browser/test_notification.py::TestDBus
- # fails in ebuild, seems due to saving fake downloads in wrong
location
+ # fails in ebuild, seems due to saving fake downloads in the
wrong location
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
# may fail if environment is very large (bug #819393)
tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
@@ -190,6 +196,5 @@ pkg_postinst() {
ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses
an older"
ewarn "chromium version. While it is relatively maintained for
security, it will"
ewarn "cause issues for sites/features designed with a newer
version in mind."
- ewarn "When Qt6 support is stable enough, ebuild's Qt5 support
may get removed."
fi
}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 734cdd94c938cbc19d22e227773f73ba5c6a62be
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Aug 18 14:29:50 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 18 14:33:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734cdd94
www-client/qutebrowser: add 3.0.0
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 2 +
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 210
2 files changed, 212 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 7644b9878438..92c58976db37 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1 +1,3 @@
DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B
d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3
SHA512
1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
+DIST qutebrowser-3.0.0.tar.gz 6030459 BLAKE2B
05e1f3c87fe572ec66d199b9c255178c7e7358321c44255b9191624fa4fede0525b16ff0740df5051390f4e3b2a2c3ee99d53fcf6c44279689f9ea0427df13ca
SHA512
2aa361b418adad1e2c2dd068148215f3eaea29c70e00634fd1a2370d584ffa2a66b0a0e22623656fc5f634d35ba99a178c269a3accd25edf778b7e3077ceb373
+DIST qutebrowser-3.0.0.tar.gz.asc 659 BLAKE2B
19d736ede7cfb2ac4d3ebaea7f4f8a6da722e3eac0c1693d487ed16f2bc5a5cce13bbc69604cd7c34e266c345f3149f2f2250aba71555f3290cd63216adc0b98
SHA512
25c9cd3fa44f712b98ef3f8d1821f61d5f2b96d8bf108ff2277dc6609343237876124f7587cf906127b8d6161923bda0946c6ef75f3cbf6c401cf5d72b7a6ffd
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
new file mode 100644
index ..1176435dd59a
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+# py3.12 should work (no tests regressions), but waiting on the last dep
+# (pytest-qt) to properly have py3.12 which gets more complicated with
+# QtPy + pyside* that we don't actually use here
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+ inherit verify-sig
+ SRC_URI="
+
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
+ verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
+ "
+
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf +qt6 widevine"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+ qt6? (
+ dev-qt/qtbase:6[icu,sqlite]
+
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
+ dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+ pdf? ( www-plugins/pdfjs )
+ )
+ !qt6? (
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ dev-qt/qtsql:5[sqlite]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ pdf? ( 124 in /var/tmp/portage) due to Linux
limitations,
+ # skip rather than bother using /tmp+cleanup over ${T} (end2end
tests
+ # are important, but the other tests should be enough for
downstream)
+ tests/end2end
+ tests/unit/misc/test_ipc.py
+ # python eclasses provide a fake "failing" python2 and trips
this test
+ tests/unit/misc/test_checkpyver.py::test_old_python
+ # not worth running dbus over
+ tests/unit/browser/test_notification.py::TestDBus
+ # fails in ebuild, seems due to saving fake downloads in the
wrong location
+
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 221b558b58731c2632130a170211b4c097103cd3
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 17 18:45:33 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 18 14:33:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221b558b
www-client/qutebrowser: verify-sig support
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index b9e02809fe3f..1176435dd59a 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -15,7 +15,12 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
else
-
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ inherit verify-sig
+ SRC_URI="
+
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
+ verify-sig? (
https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc
)
+ "
+
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
KEYWORDS="~amd64 ~arm64 ~x86"
fi
@@ -70,7 +75,12 @@ BDEPEND="
)
')
"
-[[ ${PV} == ]] && BDEPEND+=" app-text/asciidoc"
+
+if [[ ${PV} == ]]; then
+ BDEPEND+=" app-text/asciidoc"
+else
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-qutebrowser )"
+fi
distutils_enable_tests pytest
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 6d2688586e570173e6685c1ae8ac846d462185c3
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 17 00:08:17 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 17 00:20:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d268858
www-client/qutebrowser: update/tidy live
No notable changes, but clarify/reword a few comments, call
python_gen_cond_dep less times, skip a failing test with Qt5,
and uncomment the Qt6 warning. Rest is just style.
This is in preparation for the imminent qutebrowser-3 release,
tests pass for both Qt5 and Qt6 in current state.
May still be other small adjustments to do depending on how
the release tarball is created.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 82 ++
1 file changed, 44 insertions(+), 38 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 5df6b9fbacf4..8319d7eaab10 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -29,32 +29,29 @@ IUSE="+adblock pdf +qt6 widevine"
RDEPEND="
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/zipp[${PYTHON_USEDEP}]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- ')
- qt6? (
- dev-qt/qtbase:6[icu,sqlite]
- $(python_gen_cond_dep '
+ qt6? (
+ dev-qt/qtbase:6[icu,sqlite]
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
- ')
- pdf? ( www-plugins/pdfjs )
- )
- !qt6? (
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- dev-qt/qtsql:5[sqlite]
- $(python_gen_cond_dep '
+ pdf? ( www-plugins/pdfjs )
+ )
+ !qt6? (
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ dev-qt/qtsql:5[sqlite]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- ')
- pdf? ( https://github.com/qutebrowser/qutebrowser/issues/888 (not
just OSX)
+ # end2end/IPC tests are broken with "Name error" if socket path
is over
+ # ~108 characters (>124 in /var/tmp/portage) due to Linux
limitations,
+ # skip rather than bother using /tmp+cleanup over ${T}
tests/end2end
tests/unit/misc/test_ipc.py
- # calls eclass' python2 "failure" wrapper
+ # python eclasses provide a fake "failing" python2 and trips
this test
tests/unit/misc/test_checkpyver.py::test_old_python
# not worth running dbus over
tests/unit/browser/test_notification.py::TestDBus
- # bug 819393
-
tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
- # test does not know about our newer fixed qtwebengine:5
+ # fails in ebuild, seems due to saving fake downloads in wrong
location
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+ # may fail if environment is very large (bug #819393)
+
tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
# needs _WRAPPER_OVERRIDE = None, but we have changed it
tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default
tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit}
)
- # qtargs are mangled with widevine+prefix
- use widevine && use prefix && EPYTEST_DESELECT+=(
tests/unit/config/test_qtargs.py )
+
+ # we mangle qtargs with widevine+prefix leading to unexpected results
+ use widevine && use prefix &&
+ EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+ # tests known failing with Qt5 which is considered a 2nd class citizen
+ # and, unless completely broken, new tests issues may not be pursued
+ use qt6 || EPYTEST_DESELECT+=(
+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 1c5557f964a70a4cb1ef70420586035df288ac6f
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jul 24 20:36:39 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jul 25 00:01:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c5557f9
www-client/qutebrowser: add note wrt py3.12 in live
Last blocker is pyside2+6 to enable py3.12 on QtPy which is needed
by pytest-qt, but tests on pyside are restricted and I do not
use/follow either of these to be able to know if it works.
If ignore the pyside deps and force enable 3.12 just to be able
to run qutebrowser's tests, it passes fine.
Leaving this on hold for now so don't need to restrict tests.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 56936f3f91bd..5df6b9fbacf4 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -5,7 +5,10 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+# py3.12 should work (no tests regressions), but waiting on the last dep
+# (pytest-qt) to properly have py3.12 which gets more complicated with
+# QtPy + pyside* that we don't actually use here
+PYTHON_COMPAT=( python3_{10..11} )
inherit distutils-r1 xdg
if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: 4572075395f82d95930d4162686f62a256c70888
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jul 24 04:17:48 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jul 24 04:25:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45720753
www-client/qutebrowser: fix tests with python-3.11.4
No consequence on runtime, just tests issues. Already fixed
in live nearly two months ago. Doesn't hurt to backport so
can have a working reference when major qutebrowser-3.0.0
releases.
Closes: https://bugs.gentoo.org/910742
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser-2.5.4-tests-python-3.11.4.patch| 102 +
www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild | 4 +
2 files changed, 106 insertions(+)
diff --git
a/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
b/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
new file mode 100644
index ..909bd3acfab7
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
@@ -0,0 +1,102 @@
+Backports for tests broken by python-3.11.4.
+https://bugs.gentoo.org/910742
+
+IPv6 tests are notably related to https://bugs.gentoo.org/909747
+
+https://github.com/qutebrowser/qutebrowser/commit/e1d0b3c543fc470a0459a18be3dee5a151ed79ed
+https://github.com/qutebrowser/qutebrowser/commit/5d890f14d093689e53fcbdec3d739daf04a8aae4
+...was for 3.12 but change was backported to 3.11.4 which led to:
+https://github.com/qutebrowser/qutebrowser/commit/8b058389b7db591fb52b99fe9f7afbacfeabd901
+--- a/tests/unit/config/test_configfiles.py
b/tests/unit/config/test_configfiles.py
+@@ -1102,7 +1102,14 @@
+ error = excinfo.value.errors[0]
+-assert isinstance(error.exception, ValueError)
+-assert error.text == "Error while compiling"
++
++if sys.version_info >= (3, 11, 4):
++assert isinstance(error.exception, SyntaxError)
++assert error.text == "Unhandled exception"
++assert error.traceback is not None # tested in more detail by
test below
++else:
++assert isinstance(error.exception, ValueError)
++assert error.text == "Error while compiling"
++assert error.traceback is None
++
+ exception_text = 'source code string cannot contain null bytes'
+ assert str(error.exception) == exception_text
+-assert error.traceback is None
+
+--- a/tests/unit/utils/test_urlmatch.py
b/tests/unit/utils/test_urlmatch.py
+@@ -42,2 +42,8 @@
+
++_INVALID_IP_MESSAGE = (
++r'Invalid IPv6 address; source was ".*"; host = ""|'
++r"'.*' does not appear to be an IPv4 or IPv6 address" # Python 3.11.4+
++)
++
++
+ @pytest.mark.parametrize('pattern, error', [
+@@ -62,3 +68,7 @@
+ ## TEST(ExtensionURLPatternTest, IPv6Patterns)
+-pytest.param("http://[]:/*;, "Pattern without host", id='host-ipv6'),
++pytest.param(
++"http://[]:/*;,
++"Pattern without host|'' does not appear to be an IPv4 or IPv6
address",
++id='host-ipv6',
++),
+
+@@ -89,3 +99,6 @@
+ "http://[[2607:f8b0:4005:805::200e]/*;,
+-r"""Expected '\]' to match '\[' in hostname; source was
"\[2607:f8b0:4005:805::200e"; host = ",
++(
++r'''Expected '\]' to match '\[' in hostname; source was
"\[2607:f8b0:4005:805::200e"; host = ""|'''
++r"'\[2607:f8b0:4005:805::200e' does not appear to be an IPv4 or
IPv6 address"
++),
+ id='host-ipv6-two-open',
+@@ -95,3 +108,3 @@
+ "http://[2607:f8b0:4005:805:200e]/*;,
+-'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e"; host =
""',
++_INVALID_IP_MESSAGE,
+ id='host-ipv6-colons',
+@@ -101,3 +114,3 @@
+ "http://[2607:f8b0:4005:805:200e:12:bogus]/*;,
+-'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e:12:bogus";
host = ""',
++_INVALID_IP_MESSAGE,
+ id='host-ipv6-non-hex',
+@@ -155,3 +168,3 @@
+ "http://[fc2e::bb88::edac];,
+-'Invalid IPv6 address; source was "fc2e::bb88::edac"; host = ""',
++_INVALID_IP_MESSAGE,
+ id='ipv6-double-double',
+@@ -160,3 +173,3 @@
+ "http://[fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac];,
+-'Invalid IPv6 address; source was
"fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac"; host = ""',
++_INVALID_IP_MESSAGE,
+ id='ipv6-long-double',
+@@ -165,3 +178,3 @@
+ "http://[fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac];,
+-'Invalid IPv6 address; source was
"fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac"; host = ""',
++_INVALID_IP_MESSAGE,
+ id='ipv6-long',
+@@ -170,3 +183,3 @@
+ "http://[127.0.0.1:fc2e::bb88:edac];,
+-r'Invalid IPv6 address; source was "127\.0\.0\.1:fc2e::bb88:edac',
++_INVALID_IP_MESSAGE,
+ id='ipv6-ipv4',
+@@ -176,3 +189,3 @@
+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 8fd38ad512543c617457f2dd6db4ca0c428b3f41
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Jul 23 16:02:36 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Jul 23 16:05:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd38ad5
www-client/qutebrowser: depend on qtsql/qtbase[sqlite]
Fairly rare that users have anything else enabled (e.g. mysql),
but sqlite is specifically needed to read qtwebengine/chromium's
sqlite databases like history.sqlite.
Signed-off-by: Ionen Wolkens gentoo.org>
.../{qutebrowser-2.5.4.ebuild => qutebrowser-2.5.4-r1.ebuild} | 1 +
www-client/qutebrowser/qutebrowser-.ebuild | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
similarity index 99%
rename from www-client/qutebrowser/qutebrowser-2.5.4.ebuild
rename to www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
index 59de8c56dd4a..cf04e29c3d8d 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
')
dev-qt/qtcore:5[icu]
dev-qt/qtgui:5[png]
+ dev-qt/qtsql:5[sqlite]
pdf? (
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 0aa673fe2b450a8eaa43d718b85cba6134fbb079
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jul 22 12:03:25 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jul 22 12:28:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa673fe
www-client/qutebrowser: update live
Now defaults to Qt6 and auto-fallbacks to Qt5 if missing or broken,
but there is little reason to use automagic in our case and it should
use the backend ebuild set dependencies for (users can still override
this at runtime if really wanted).
Using sed is what machinery.py suggests.
On a side-note, selected qt6 tests currently pass and qt5 has one
failure. Will be reviewed further on release.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 2a80f2b1aa5d..0e11fd896ab8 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -88,11 +88,9 @@ src_prepare() {
-i ${PN}/config/qtargs.py || die
fi
- # default to the requested Qt backend, current default is PyQt5 but
- # sed unconditionally for safety in given this is going to change
- # (note that using sed is the suggested solution by upstream for now)
- sed -e "/^_DEFAULT_WRAPPER =/s/=.*/= \"PyQt$(usex qt6 6 5)\"/" \
- -i ${PN}/qt/machinery.py || die
+ # ensure the requested backend is used in case multiple are available
+ sed -e "/^_WRAPPER_OVERRIDE =/s/None/\"PyQt$(usex qt6 6 5)\"/" \
+ -i qutebrowser/qt/machinery.py || die
# let eclass handle python
sed -i '/setup.py/d' misc/Makefile || die
@@ -130,9 +128,12 @@ python_test() {
# not worth running dbus over
tests/unit/browser/test_notification.py::TestDBus
# bug 819393
-
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
- # tests that don't know about our newer qtwebengine:5
+
tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
+ # test does not know about our newer fixed qtwebengine:5
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+ # needs _WRAPPER_OVERRIDE = None, but we have changed it
+
tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default
+
tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit}
)
# qtargs are mangled with widevine+prefix
use widevine && use prefix && EPYTEST_DESELECT+=(
tests/unit/config/test_qtargs.py )
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 43ab677c4f37f3831555251bc2151df77252450d
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Mar 16 22:13:27 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 18 23:22:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ab677c
www-client/qutebrowser: update live
qt6-v2 was merged in the main branch, so this syncs with
the old 3.0.0_pre ebuild plus a few adjustments
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 60 ++
1 file changed, 51 insertions(+), 9 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 7cb5d6ee3504..2a80f2b1aa5d 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -21,12 +21,10 @@ HOMEPAGE="https://www.qutebrowser.org/;
LICENSE="GPL-3+"
SLOT="0"
-IUSE="+adblock pdf widevine"
+IUSE="+adblock pdf +qt6 widevine"
RDEPEND="
$(python_gen_cond_dep '
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
@@ -35,14 +33,27 @@ RDEPEND="
dev-python/zipp[${PYTHON_USEDEP}]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
')
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- pdf? ( https://github.com/gentoo/gentoo/pull/29181
albeit
+ # may need to comment it out again when stabling if don't stable Qt6
(yet).
+# if use amd64 && use !qt6; then
+# ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses
an older"
+# ewarn "chromium version. While it is relatively maintained for
security, it may"
+# ewarn "cause issues for sites/features designed with a newer
version in mind."
+# ewarn "When Qt6 support is stable enough, ebuild's Qt5 support
may get removed."
+# fi
}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 59f5a7a6520eafedacc453910fb7f5f13c5ccb9e
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Mar 18 05:34:39 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 18 23:22:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f5a7a6
www-client/qutebrowser: warn in 2.5.4 if downgrade from Qt6
Should have very few users actually using Qt6 (USE is masked,
and ebuilds are unkeyworded), but given removed the _pre ebuild
it's possible it'll cause an unexpected downgrade and it wouldn't
hurt to warn (albeit should be fairly noticeable given the deps
pulled are non-trivial).
Switching will be less of a worry in qutebrowser-3.0.0 given it
can detect a mismatch on startup, but the old 2.5.4 is oblivious.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.4.ebuild | 15 +++
1 file changed, 15 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
index 30a3498c8cf8..59de8c56dd4a 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
@@ -131,6 +131,12 @@ python_install_all() {
einstalldocs
}
+pkg_preinst() {
+ xdg_pkg_preinst
+
+ has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6=
+}
+
pkg_postinst() {
xdg_pkg_postinst
@@ -139,4 +145,13 @@ pkg_postinst() {
elog "have additional dependencies not covered by this ebuild,
for example"
elog "view_in_mpv needs media-video/mpv[lua] and
net-misc/yt-dlp."
fi
+
+ if [[ -v QUTEBROWSER_HAD_QT6 ]]; then
+ ewarn "This is a downgrade from Qt6-based ${PN} to Qt5-based,
and this"
+ ewarn "older version of ${PN} will /not/ warn on startup that
this is"
+ ewarn "going to destroy some browsing data (e.g. cookies) when
older chromium"
+ ewarn "version tries to use the newer
~/.local/share/${PN}/webengine."
+ ewarn
+ ewarn "It is recommended to backup in case or go back to Qt6."
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 3d8762f07bd8ae6779b5011f34b0f497c4947c58
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Mar 16 22:10:33 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 18 23:22:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d8762f0
www-client/qutebrowser: drop 3.0.0_pre
The qt6-v2 branch was merged in the main branch making this
obsolete. Use normal if want USE=qt6 (or at least until
3.0.0 is released).
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/qutebrowser-3.0.0_pre.ebuild | 187 -
1 file changed, 187 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
deleted file mode 100644
index 0de37e2649d8..
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 xdg
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
- EGIT_BRANCH="qt6-v2"
-else
-
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
-HOMEPAGE="https://www.qutebrowser.org/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf +qt6 widevine"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/colorama[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- ')
- qt6? (
- dev-qt/qtbase:6[icu]
- $(python_gen_cond_dep '
-
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
- dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
- ')
- pdf? ( www-plugins/pdfjs )
- )
- !qt6? (
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep '
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- ')
- pdf? ( https://github.com/qutebrowser/qutebrowser/issues/888 (not
just OSX)
- tests/end2end
- tests/unit/misc/test_ipc.py
- # calls eclass' python2 "failure" wrapper
- tests/unit/misc/test_checkpyver.py::test_old_python
- # not worth running dbus over
- tests/unit/browser/test_notification.py::TestDBus
- # bug 819393
-
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
- # tests that don't know about our newer qtwebengine:5
-
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
- )
- # qtargs are mangled with widevine+prefix
- use widevine && use prefix && EPYTEST_DESELECT+=(
tests/unit/config/test_qtargs.py )
-
- # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -p xvfb -n ${jobs} -k 'not _bench and not _matches_tree and not
_warning'
-}
-
-python_install_all() {
- emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-
- rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
- fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
- python_fix_shebang "${ED}"/usr/share/${PN}
-
- einstalldocs
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6=
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "Note that optional scripts in
${EROOT}/usr/share/${PN}/{user,}scripts"
- elog "have additional dependencies not covered by this ebuild,
for example"
- elog "view_in_mpv needs media-video/mpv[lua] and
net-misc/yt-dlp."
- fi
-
- if [[ ! -v QUTEBROWSER_HAD_QT6 ]] && use qt6; then
- elog "USE=qt6 is enabled using the qt6-v2 branch, it is
work-in-progress"
- elog "and some issues may be expected. Can follow upstream
progress at:"
- elog " https://github.com/qutebrowser/qutebrowser/issues/7202
[qt6 general]"
- elog "
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
commit: c74ded47caf44e1655e62f23dcc223a5b7541496
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Mar 16 22:19:46 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 18 23:22:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74ded47
www-client/qutebrowser: drop 2.5.2-r1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest| 1 -
.../files/qutebrowser-2.5.2-dictcli.patch | 17 ---
www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild | 133 -
3 files changed, 151 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index ec0594f9451b..7644b9878438 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1 @@
-DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B
5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad
SHA512
4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B
d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3
SHA512
1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
diff --git a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
deleted file mode 100644
index cd179a5d0236..
--- a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/qutebrowser/qutebrowser/commit/f277876ce0817f7d05ca94b05beb644482027f85
-From: Florian Bruhin
-Date: Sat, 19 Nov 2022 16:00:15 +0100
-Subject: [PATCH] dictcli: Switch from master to main
-
-Fixes #7481
a/scripts/dictcli.py
-+++ b/scripts/dictcli.py
-@@ -40,7 +40,7 @@
- from qutebrowser.utils import standarddir
-
-
--API_URL =
'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/master/'
-+API_URL =
'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/main/'
-
-
- class InvalidLanguageError(Exception):
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
deleted file mode 100644
index 1e0b94274b51..
--- a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
-else
-
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf widevine"
-
-RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep '
- dev-python/colorama[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
- pdf? ( https://github.com/qutebrowser/qutebrowser/issues/888 (not
just OSX)
- tests/end2end
- tests/unit/misc/test_ipc.py
- # tests that don't know about our newer qtwebengine
-
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
- tests/unit/utils/test_version.py::TestChromiumVersion
- # may misbehave depending on installed old python versions
- tests/unit/misc/test_checkpyver.py::test_old_python
- # bug 819393
-
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
- # not worth running dbus over
- tests/unit/browser/test_notification.py::TestDBus
- )
- use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
-
- # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -p xvfb -k 'not _bench and not _matches_tree
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 8f4965997cbdcf22cc4d63f7f731a627c13ec67f
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Mar 14 04:54:23 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Mar 14 05:17:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f496599
www-client/qutebrowser: add 2.5.4, drop 2.5.3-r1
This is a bump in name only, they are almost identical
and the 2 lines changes is for FreeBSD. So skipping the
usual process and just git mv'ing in stable.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 2 +-
.../{qutebrowser-2.5.3-r1.ebuild => qutebrowser-2.5.4.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 6942f82805d0..ec0594f9451b 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,2 @@
DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B
5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad
SHA512
4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
-DIST qutebrowser-2.5.3.tar.gz 6117665 BLAKE2B
3fc1304e4a4343d9a3bdfbf6ac708305a283da2217938dfe2b0f5e049d3a100bc255e0f06807e98c12e095f25dce4d5ed22705a5ae6674cff2f8ffcb0c5afab8
SHA512
a53db1a842b59613115d0823ce9b7d8ea703c6db8882250a587f4c7042a52b7ba93e9f516cfae1804e2f10ad369b0ab8f9d613092a9ca4be86e113c4ed4be7d9
+DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B
d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3
SHA512
1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3-r1.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
similarity index 100%
rename from www-client/qutebrowser/qutebrowser-2.5.3-r1.ebuild
rename to www-client/qutebrowser/qutebrowser-2.5.4.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 4b56990a413505dd277a8ca8491aca03998f6a63
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Mar 11 13:54:57 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 11 14:08:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b56990a
Revert "www-client/qutebrowser: install apparmor profile"
This reverts commit de3188d3b33e3826a278b3426d5376311439e3dc.
Adding this was a request but profile is apparently unmaintained
upstream and installing it does not seem like a good idea if it's
going to potentially crash the browser wrt bug #900861.
>From a quick look it seems like it'd need adjustment for the
paths we uses too, but not limited to these (handling both slots
of qtwebengine and gpu-related things it does seems non-trivial,
lot of this profile feels like wishful guesswork).
Users that really want this are invited to install/modify it
manually for now.
Bug: https://bugs.gentoo.org/900861
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.3.ebuild | 3 ---
www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild | 3 ---
www-client/qutebrowser/qutebrowser-.ebuild | 3 ---
3 files changed, 9 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
index 830f4037ddb5..30a3498c8cf8 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
@@ -128,9 +128,6 @@ python_install_all() {
fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
- insinto /etc/apparmor.d
- doins -r misc/apparmor/.
-
einstalldocs
}
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
index 7a65a374061c..0de37e2649d8 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -146,9 +146,6 @@ python_install_all() {
fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
- insinto /etc/apparmor.d
- doins -r misc/apparmor/.
-
einstalldocs
}
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 6260bb8c6fc8..7cb5d6ee3504 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -128,9 +128,6 @@ python_install_all() {
fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
- insinto /etc/apparmor.d
- doins -r misc/apparmor/.
-
einstalldocs
}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: fa0be5662e3f7a35dcfd6f0ffef1cad0e7323de0
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Mar 11 13:56:23 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 11 14:08:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0be566
www-client/qutebrowser: revbump to ensure no broken apparmor profile
Closes: https://bugs.gentoo.org/900861
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/{qutebrowser-2.5.3.ebuild => qutebrowser-2.5.3-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.3-r1.ebuild
similarity index 100%
rename from www-client/qutebrowser/qutebrowser-2.5.3.ebuild
rename to www-client/qutebrowser/qutebrowser-2.5.3-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: e683967b551669e85c91516e929d405da2ec4316
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Mar 9 18:48:21 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Mar 9 20:12:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e683967b
www-client/qutebrowser: stabilize 2.5.3 for amd64
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
index 6260bb8c6fc8..830f4037ddb5 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
else
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: de3188d3b33e3826a278b3426d5376311439e3dc
Author: Sergey Alirzaev riseup net>
AuthorDate: Thu Mar 2 14:39:31 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Mar 5 16:02:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3188d3
www-client/qutebrowser: install apparmor profile
Signed-off-by: Sergey Alirzaev riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/29898
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.3.ebuild | 3 +++
www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild | 3 +++
www-client/qutebrowser/qutebrowser-.ebuild | 3 +++
3 files changed, 9 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
index 7cb5d6ee3504..6260bb8c6fc8 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
@@ -128,6 +128,9 @@ python_install_all() {
fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
+ insinto /etc/apparmor.d
+ doins -r misc/apparmor/.
+
einstalldocs
}
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
index 0de37e2649d8..7a65a374061c 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -146,6 +146,9 @@ python_install_all() {
fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
+ insinto /etc/apparmor.d
+ doins -r misc/apparmor/.
+
einstalldocs
}
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 7cb5d6ee3504..6260bb8c6fc8 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -128,6 +128,9 @@ python_install_all() {
fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
+ insinto /etc/apparmor.d
+ doins -r misc/apparmor/.
+
einstalldocs
}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 230e7f5301e44233cb0b33b19dbf53764233fc8d
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Feb 17 14:35:38 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Feb 17 22:57:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=230e7f53
www-client/qutebrowser: sync live
Somewhat sync with 3.0.0_pre minus qt6.
Reverted xdist usage since getting random failures, perhaps they
are qt5-only but not going to worry about it given need to bump/test
this too rarely to need the test suite to be speedy.
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/qutebrowser-3.0.0_pre.ebuild | 34 ++--
www-client/qutebrowser/qutebrowser-.ebuild | 63 --
2 files changed, 53 insertions(+), 44 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
index cffa4849cc2e..0de37e2649d8 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 multiprocessing xdg
+inherit distutils-r1 xdg
if [[ ${PV} == * ]]; then
inherit git-r3
@@ -30,14 +30,16 @@ RDEPEND="
>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+ ')
qt6? (
dev-qt/qtbase:6[icu]
$(python_gen_cond_dep '
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
- dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]')
+ dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+ ')
pdf? ( www-plugins/pdfjs )
)
!qt6? (
@@ -45,7 +47,8 @@ RDEPEND="
dev-qt/qtgui:5[png]
$(python_gen_cond_dep '
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]')
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ ')
pdf? ( https://github.com/qutebrowser/qutebrowser/issues/888 (not
just OSX)
tests/end2end
tests/unit/misc/test_ipc.py
+ # calls eclass' python2 "failure" wrapper
+ tests/unit/misc/test_checkpyver.py::test_old_python
# not worth running dbus over
tests/unit/browser/test_notification.py::TestDBus
# bug 819393
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
- # calls eclass' python2 "failure" wrapper
- tests/unit/misc/test_checkpyver.py::test_old_python
- # qtargs are mangled with USE=widevine
- $(usev widevine tests/unit/config/test_qtargs.py)
+ # tests that don't know about our newer qtwebengine:5
+
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
)
-
- # single thread is slow, but do half+1 given spikes ram usage quickly
- local jobs=$(($(makeopts_jobs) / 2 + 1))
+ # qtargs are mangled with widevine+prefix
+ use widevine && use prefix && EPYTEST_DESELECT+=(
tests/unit/config/test_qtargs.py )
# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
epytest -p xvfb -n ${jobs} -k 'not _bench and not _matches_tree and not
_warning'
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 3d0c12b40655..7cb5d6ee3504 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS="~amd64 ~arm64 ~x86"
fi
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
HOMEPAGE="https://www.qutebrowser.org/;
LICENSE="GPL-3+"
@@ -24,23 +24,25 @@ SLOT="0"
IUSE="+adblock pdf widevine"
RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
$(python_gen_cond_dep '
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 9dc99958d962a6d11c6d9d1f79da9d8d97ff1d20
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Feb 17 14:33:16 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Feb 17 22:56:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc99958
www-client/qutebrowser: add 2.5.3
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.5.3.ebuild | 142
2 files changed, 143 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index ec46e883633d..6942f82805d0 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1 +1,2 @@
DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B
5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad
SHA512
4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
+DIST qutebrowser-2.5.3.tar.gz 6117665 BLAKE2B
3fc1304e4a4343d9a3bdfbf6ac708305a283da2217938dfe2b0f5e049d3a100bc255e0f06807e98c12e095f25dce4d5ed22705a5ae6674cff2f8ffcb0c5afab8
SHA512
a53db1a842b59613115d0823ce9b7d8ea703c6db8882250a587f4c7042a52b7ba93e9f516cfae1804e2f10ad369b0ab8f9d613092a9ca4be86e113c4ed4be7d9
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
new file mode 100644
index ..7cb5d6ee3504
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://www.qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf widevine"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+ ')
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ pdf? ( https://github.com/qutebrowser/qutebrowser/issues/888 (not
just OSX)
+ tests/end2end
+ tests/unit/misc/test_ipc.py
+ # calls eclass' python2 "failure" wrapper
+ tests/unit/misc/test_checkpyver.py::test_old_python
+ # not worth running dbus over
+ tests/unit/browser/test_notification.py::TestDBus
+ # bug 819393
+
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
+ # tests that don't know about our newer qtwebengine:5
+
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+ )
+ # qtargs are mangled with widevine+prefix
+ use widevine && use prefix && EPYTEST_DESELECT+=(
tests/unit/config/test_qtargs.py )
+
+ # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+ epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
+}
+
+python_install_all() {
+ emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+ rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
+ fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
+ python_fix_shebang "${ED}"/usr/share/${PN}
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "Note that optional scripts in
${EROOT}/usr/share/${PN}/{user,}scripts"
+ elog "have additional dependencies not covered by this ebuild,
for example"
+ elog "view_in_mpv needs media-video/mpv[lua] and
net-misc/yt-dlp."
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 4eccdb1b084607826d743347cb1370c528b7ab96
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Jan 20 03:52:31 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 20 22:44:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eccdb1b
www-client/qutebrowser: adjust 3.0.0_pre ebuild
* show USE=-qt6 warning on amd64 (about to be unmasked) + note Qt5
support is eventually due for removal (while upstream will keep
supporting it for a while, they strongly recommend moving to Qt6)
* restore full set of keywords given USE=qt6 will remain masked on
non-amd64 until keyworded. Not that it matters in live.
* minor style/comment adjustments
This ebuild will eventually replace after qt6-v2 is merged
to master, so not bothering to keep in sync for now.
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/qutebrowser-3.0.0_pre.ebuild | 29 +++---
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
index 5fa6c903ac8c..cffa4849cc2e 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]]; then
EGIT_BRANCH="qt6-v2"
else
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
@@ -74,33 +74,33 @@ src_prepare() {
distutils-r1_src_prepare
if use pdf; then
- sed '/^content.pdfjs:/,+1s/false/true/' \
+ sed -e '/^content.pdfjs:/,+1s/false/true/' \
-i ${PN}/config/configdata.yml || die
fi
if use widevine; then
- # Qt6 knows Gentoo's, but pass to ensure libdir, EPREFIX, and
for Qt5
+ # Qt6 knows Gentoo's, but pass for libdir, EPREFIX, and Qt5(bug
#888783)
local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
- sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
+ sed -e "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
-i ${PN}/config/qtargs.py || die
fi
# ensure run the requested Qt backend
- sed -i '/^_WRAPPERS = /,/^]/c\_WRAPPERS = [ "PyQt'$(usex qt6 6 5)'" ]' \
- ${PN}/qt/machinery.py || die
+ sed -e '/^_WRAPPERS = /,/^]/c\_WRAPPERS = [ "PyQt'$(usex qt6 6 5)'" ]' \
+ -i ${PN}/qt/machinery.py || die
# let eclass handle python
sed -i '/setup.py/d' misc/Makefile || die
if [[ ${PV} == * ]]; then
# call asciidoc(1) rather than the single target python module
- sed '/cmdline = /s/= .*/= ["asciidoc"]/' \
+ sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \
-i scripts/asciidoc2html.py || die
"${EPYTHON}" scripts/asciidoc2html.py || die
fi
- # disable unnecessary tests/plugins that need extras (_ignore not
enough)
+ # disable unnecessary tests/plugins that need extras
sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
-e '/pytest-instafail/d' -e 's/--instafail//' \
-i pytest.ini || die
@@ -175,10 +175,11 @@ pkg_postinst() {
fi
fi
- # TODO: left-out given be confusing while IUSE is masked anywhere
-# if use !qt6; then
-# ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses
an older"
-# ewarn "chromium version. While it is relatively maintained for
security, it may"
-# ewarn "cause issues for sites/features designed with a newer
version in mind."
-# fi
+ # only show qt6 warning on arches where USE=qt6 is unmasked
+ if use amd64 && use !qt6; then
+ ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses
an older"
+ ewarn "chromium version. While it is relatively maintained for
security, it may"
+ ewarn "cause issues for sites/features designed with a newer
version in mind."
+ ewarn "When Qt6 support is stable enough, ebuild's Qt5 support
may get removed."
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: dce3bd4fb7077a89de90e6d16b5c24ac58af71d7
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jan 14 11:55:38 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jan 14 12:04:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dce3bd4f
www-client/qutebrowser: cleanup py3.8 and importlib_resources dep
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild | 5 ++---
www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild | 6 ++
www-client/qutebrowser/qutebrowser-.ebuild | 5 ++---
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
index 459d498416d1..1e0b94274b51 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 xdg
if [[ ${PV} == ]]; then
@@ -26,7 +26,6 @@ IUSE="+adblock pdf widevine"
RDEPEND="
dev-qt/qtcore:5[icu]
dev-qt/qtgui:5[png]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
index 08fc978ae6f4..5fa6c903ac8c 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 multiprocessing xdg
if [[ ${PV} == * ]]; then
@@ -25,8 +25,6 @@ SLOT="0"
IUSE="+adblock pdf +qt6 widevine"
RDEPEND="
- $(python_gen_cond_dep '
- dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index c4bb985b2edc..3d0c12b40655 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 xdg
if [[ ${PV} == ]]; then
@@ -26,7 +26,6 @@ IUSE="+adblock pdf widevine"
RDEPEND="
dev-qt/qtcore:5[icu]
dev-qt/qtgui:5[png]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 8e552d249c84b94f57ef6891fa9c88e3a5073a2a
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Dec 17 11:25:45 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Dec 17 11:44:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e552d24
www-client/qutebrowser: adjust asciidoc call for live
Upstream now calls `python3 -m asciidoc` to simplify some venv/pip
handling but, given asciidoc is single target, matching pythons
over this would be inconvenient (aka fails if asciidoc is 3.10 and
qutebrowser is 3.11).
Alternatively could make asciidoc multi-target but this works just
fine if just swap it out for ["asciidoc"]. May review this solution
eventually but won't worry too much if it's for live-only.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild | 9 +++--
www-client/qutebrowser/qutebrowser-.ebuild | 8 +++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
index 19f356ecb5d7..08fc978ae6f4 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -94,8 +94,13 @@ src_prepare() {
# let eclass handle python
sed -i '/setup.py/d' misc/Makefile || die
- # live version lacks pre-generated docs
- [[ ${PV} != * ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+ if [[ ${PV} == * ]]; then
+ # call asciidoc(1) rather than the single target python module
+ sed '/cmdline = /s/= .*/= ["asciidoc"]/' \
+ -i scripts/asciidoc2html.py || die
+
+ "${EPYTHON}" scripts/asciidoc2html.py || die
+ fi
# disable unnecessary tests/plugins that need extras (_ignore not
enough)
sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 0521c244a164..c4bb985b2edc 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -74,7 +74,13 @@ src_prepare() {
# let eclass handle python
sed -i '/setup.py/d' misc/Makefile || die
- [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+ if [[ ${PV} == ]]; then
+ # call asciidoc(1) rather than the single target python module
+ sed '/cmdline = /s/= .*/= ["asciidoc"]/' \
+ -i scripts/asciidoc2html.py || die
+
+ "${EPYTHON}" scripts/asciidoc2html.py || die
+ fi
# these plugins/tests are unnecessary here and have extra dependencies
sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
commit: 9c374f2d54c4bd5730da0c38f32a879fb92a3b24
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Dec 11 18:11:39 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Dec 11 18:14:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c374f2d
www-client/qutebrowser: backport trivial dictcli.py fix
Not super important, but still be a while before a 3.0.0,
and unsure when/if 2.5.3 is happening.
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/files/qutebrowser-2.5.2-dictcli.patch | 17 +
...browser-2.5.2.ebuild => qutebrowser-2.5.2-r1.ebuild} | 4
2 files changed, 21 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
new file mode 100644
index ..cd179a5d0236
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
@@ -0,0 +1,17 @@
+https://github.com/qutebrowser/qutebrowser/commit/f277876ce0817f7d05ca94b05beb644482027f85
+From: Florian Bruhin
+Date: Sat, 19 Nov 2022 16:00:15 +0100
+Subject: [PATCH] dictcli: Switch from master to main
+
+Fixes #7481
+--- a/scripts/dictcli.py
b/scripts/dictcli.py
+@@ -40,7 +40,7 @@
+ from qutebrowser.utils import standarddir
+
+
+-API_URL =
'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/master/'
++API_URL =
'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/main/'
+
+
+ class InvalidLanguageError(Exception):
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
similarity index 98%
rename from www-client/qutebrowser/qutebrowser-2.5.2.ebuild
rename to www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
index d3151e4cf8de..459d498416d1 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
@@ -57,6 +57,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-dictcli.patch
+)
+
src_prepare() {
distutils-r1_src_prepare
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: e90cbb5d089b9d0d9b3033c20a35fa5f936869c0
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Nov 4 01:58:34 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Nov 4 04:10:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90cbb5d
www-client/qutebrowser: add IUSE=pdf to handle pdfjs
Unfortunately qtwebengine:5 doesn't fare so well with new pdfjs-3,
while :6 has no issues. As a optfeature, handling this is rather
unintuitive and older pdfjs may get dropped without a dependency check.
This is just python and builds quickly, so add IUSE=pdf to control
versions and also make content.pdfjs a default if enabled.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.2.ebuild | 12
www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild | 13 +
www-client/qutebrowser/qutebrowser-.ebuild | 12
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
index b531a2983052..d3151e4cf8de 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1 optfeature xdg
+inherit distutils-r1 xdg
if [[ ${PV} == ]]; then
inherit git-r3
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.qutebrowser.org/;
LICENSE="GPL-3+"
SLOT="0"
-IUSE="+adblock widevine"
+IUSE="+adblock pdf widevine"
RDEPEND="
dev-qt/qtcore:5[icu]
@@ -37,6 +37,7 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
dev-python/zipp[${PYTHON_USEDEP}]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+ pdf? ( https://www.qutebrowser.org/;
LICENSE="GPL-3+"
SLOT="0"
-IUSE="+adblock +qt6 widevine"
+IUSE="+adblock pdf +qt6 widevine"
RDEPEND="
$(python_gen_cond_dep '
@@ -40,6 +40,7 @@ RDEPEND="
$(python_gen_cond_dep '
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]')
+ pdf? ( www-plugins/pdfjs )
)
!qt6? (
dev-qt/qtcore:5[icu]
@@ -47,6 +48,7 @@ RDEPEND="
$(python_gen_cond_dep '
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]')
+ pdf? ( https://www.qutebrowser.org/;
LICENSE="GPL-3+"
SLOT="0"
-IUSE="+adblock widevine"
+IUSE="+adblock pdf widevine"
RDEPEND="
dev-qt/qtcore:5[icu]
@@ -37,6 +37,7 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
dev-python/zipp[${PYTHON_USEDEP}]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+ pdf? (
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: acc4b275f901448367ea4902c28bc1b3c4e17730
Author: Michał Górny gentoo org>
AuthorDate: Sun Sep 4 08:36:39 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Sep 7 07:50:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc4b275
www-client/qutebrowser: Enable pytest-xvfb explicitly
Signed-off-by: Michał Górny gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.2.ebuild | 2 +-
www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild | 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
index a803b50c57ca..b531a2983052 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -100,7 +100,7 @@ python_test() {
use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -k 'not _bench and not _matches_tree and not _warning'
+ epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
}
python_install_all() {
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
index a08871af437f..28af4e718008 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -124,7 +124,7 @@ python_test() {
local jobs=$(($(makeopts_jobs) / 2 + 1))
# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -n ${jobs} -k 'not _bench and not _matches_tree and not
_warning'
+ epytest -p xvfb -n ${jobs} -k 'not _bench and not _matches_tree and not
_warning'
}
python_install_all() {
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index db080c13371e..9721e0227ee9 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -100,7 +100,7 @@ python_test() {
use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -k 'not _bench and not _matches_tree and not _warning'
+ epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
}
python_install_all() {
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 1e66eb82f760f38e1c97df630891c40f900f96b2
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Aug 17 13:14:14 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Aug 17 15:44:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e66eb82
www-client/qutebrowser: don't warn about backup on first installs
Also reword expected issues, still WIP but realistically there's
no notable issues anymore from user-perspective.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
index baadc7dc34b0..a08871af437f 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -156,13 +156,15 @@ pkg_postinst() {
if [[ ! -v QUTEBROWSER_HAD_QT6 ]] && use qt6; then
elog "USE=qt6 is enabled using the qt6-v2 branch, it is
work-in-progress"
- elog "and some issues are to be expected. Can follow upstream
progress at:"
+ elog "and some issues may be expected. Can follow upstream
progress at:"
elog " https://github.com/qutebrowser/qutebrowser/issues/7202
[qt6 general]"
elog " https://github.com/qutebrowser/qutebrowser/tree/qt6-v2
[used branch]"
- elog
- elog "You may optionally want to backup your
~/.local/share/${PN} before"
- elog "it is converted to use Qt6 WebEngine (one-way
conversion). ${PN}"
- elog "will also warn about this on launch for a last chance to
abort."
+ if [[ ${REPLACING_VERSIONS} ]]; then
+ elog
+ elog "You may optionally want to backup your
~/.local/share/${PN} before"
+ elog "it is converted to use Qt6 WebEngine (one-way
conversion). ${PN}"
+ elog "will also warn about this on launch for a last
chance to abort."
+ fi
fi
# TODO: left-out given be confusing while IUSE is masked anywhere
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 020a3d4461eb733c50046cbaf395010156d133d8
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jul 20 07:25:40 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Aug 3 00:21:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020a3d44
www-client/qutebrowser: add 3.0.0_pre
Test version using the wip-but-mostly-fine qt6-v2 branch to
prepare for the 3.0.0 release planned to have qt6 support.
Also some misc ebuild improvements, notably trying python-xdist
which used to fail but seems fine now (upstream uses it too).
Will be merged into normal - when upstream merges to master.
Closes: https://github.com/gentoo/gentoo/pull/26504
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/metadata.xml| 1 +
.../qutebrowser/qutebrowser-3.0.0_pre.ebuild | 174 +
2 files changed, 175 insertions(+)
diff --git a/www-client/qutebrowser/metadata.xml
b/www-client/qutebrowser/metadata.xml
index 44b66f5f9007..224624c5a073 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -24,6 +24,7 @@
Enable Brave's ABP-style adblocker library
for improved adblocking
+ Use Qt6 that provides a newer Chromium
version
Unsupported closed-source DRM capability
(required by Netflix VOD)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
new file mode 100644
index ..50f156d349ff
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 multiprocessing optfeature xdg
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+ EGIT_BRANCH="qt6-v2"
+else
+
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://www.qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock +qt6 widevine"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
+ $(python_gen_cond_dep '
+ dev-python/colorama[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-6[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+ qt6? (
+ dev-qt/qtbase:6[icu]
+ $(python_gen_cond_dep '
+
dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
+ dev-python/PyQt6_WebEngine[${PYTHON_USEDEP},widgets]')
+ )
+ !qt6? (
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ $(python_gen_cond_dep '
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]')
+ )
+ widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/cheroot[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-bdd[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-qt[${PYTHON_USEDEP}]
+ dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+ dev-python/tldextract[${PYTHON_USEDEP}]
+ qt6? ( dev-python/PyQt6[testlib] )
+ !qt6? ( dev-python/PyQt5[testlib] )
+ )')"
+[[ ${PV} == * ]] && BDEPEND+=" app-text/asciidoc"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ if use widevine; then
+ # Qt6 knows Gentoo's, but pass to ensure libdir, EPREFIX, and
for Qt5
+ local
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: c127558551879f38767ccb67063c57c60fc6f151
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jul 20 06:39:31 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jul 20 06:46:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1275585
www-client/qutebrowser: force pyqt5 for tests
Doing this now so don't forget, will be needed when PyQt6 is
in the tree and technically ensures pyside2 is not used too.
Version 3.0.0_pre will be able to "pyqt$(usex qt6 6 5)" for
tests, this already works with local Qt6 ebuilds.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.2.ebuild | 2 ++
www-client/qutebrowser/qutebrowser-.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
index cb9e18e62ecc..a803b50c57ca 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -79,6 +79,8 @@ src_prepare() {
}
python_test() {
+ local -x PYTEST_QT_API=pyqt5
+
local EPYTEST_DESELECT=(
# end2end and other IPC tests are broken with "Name error" if
# socket path is over 104 characters (=124 in /var/tmp/portage)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 5fbedd8a8bf8..db080c13371e 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -79,6 +79,8 @@ src_prepare() {
}
python_test() {
+ local -x PYTEST_QT_API=pyqt5
+
local EPYTEST_DESELECT=(
# end2end and other IPC tests are broken with "Name error" if
# socket path is over 104 characters (=124 in /var/tmp/portage)
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 3857516eeb5194a6546e9b6b572746d78b5264ef
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Jul 12 21:49:50 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jul 12 22:19:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3857516e
www-client/qutebrowser: enable py3.11 again
No known issues with >=python-3.11.0_beta4 (randomly crash with beta3).
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.2.ebuild | 3 +--
www-client/qutebrowser/qutebrowser-.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
index ffafdb6882e8..cb9e18e62ecc 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -5,8 +5,7 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-# py3.11: wait for https://github.com/python/cpython/issues/93252
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 optfeature xdg
if [[ ${PV} == ]]; then
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 8e1dcf48ee29..5fbedd8a8bf8 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -5,8 +5,7 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-# py3.11: wait for https://github.com/python/cpython/issues/93252
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 optfeature xdg
if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 4492dc43cf906932e4e9bdf4e659df37202cd5af
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jul 11 22:44:34 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jul 11 22:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4492dc43
www-client/qutebrowser: drop 2.5.1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 -
www-client/qutebrowser/qutebrowser-2.5.1.ebuild | 123
2 files changed, 124 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index b326e61f842a..ec46e883633d 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1 @@
-DIST qutebrowser-2.5.1.tar.gz 6089389 BLAKE2B
e26be42742795b22c34d131a5c9046e0223cef2fd461d8aa3c656a8182bf0127e17e55a7e0a79e1ade76c883094d841a822864e995365b0217ef1b422272e6e0
SHA512
27eca3e987e4c2a662fc863840d3ea697da65f55c7b9180e892466aeb5a2753f1eca424bbf8705670fe8cd9363e3297e03f9f9cc0d4f85f0198a4e3312d32f3c
DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B
5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad
SHA512
4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
diff --git a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
deleted file mode 100644
index 9287f76d1bec..
--- a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-# py3.11: wait for https://github.com/python/cpython/issues/93252
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
-else
-
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock widevine"
-
-RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
- $(python_gen_cond_dep '
- dev-python/colorama[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
- widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
- $(python_gen_cond_dep '
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/cheroot[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-bdd[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-python/pytest-qt[${PYTHON_USEDEP}]
- dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
- dev-python/pytest-xvfb[${PYTHON_USEDEP}]
- dev-python/tldextract[${PYTHON_USEDEP}]
- )')"
-[[ ${PV} != ]] || BDEPEND+=" app-text/asciidoc"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- distutils-r1_src_prepare
-
- if use widevine; then
- local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
- sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
- -i ${PN}/config/qtargs.py || die
- fi
-
- # let eclass handle python
- sed -i '/setup.py/d' misc/Makefile || die
-
- [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
-
- # these plugins/tests are unnecessary here and have extra dependencies
- sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
- -e '/pytest-instafail/d;s/--instafail//' \
- -i pytest.ini || die
- [[ ${PV} == ]] || rm tests/unit/scripts/test_problemmatchers.py ||
die
- [[ ${PV} != ]] || rm
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 727e89cbbae49fd0032e89a2f03064af10bb8a7c
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jul 7 04:32:15 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jul 7 04:39:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727e89cb
www-client/qutebrowser: stabilize 2.5.2 for amd64
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
index 8e1dcf48ee29..ffafdb6882e8 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
else
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: b8515e05fc6087ebfc22dd5f1188b322de62248f
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jun 22 18:23:42 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jun 22 18:26:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8515e05
www-client/qutebrowser: sync live
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 09bc4c14cb21..8e1dcf48ee29 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -93,6 +93,8 @@ python_test() {
tests/unit/misc/test_checkpyver.py::test_old_python
# bug 819393
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
+ # not worth running dbus over
+ tests/unit/browser/test_notification.py::TestDBus
)
use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 6495b87e48192ea0c022026b80c60607b851ec7b
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jun 22 16:59:52 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jun 22 18:26:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6495b87e
www-client/qutebrowser: add 2.5.2
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.5.2.ebuild | 125
2 files changed, 126 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 6e8d0cec438b..b326e61f842a 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1 +1,2 @@
DIST qutebrowser-2.5.1.tar.gz 6089389 BLAKE2B
e26be42742795b22c34d131a5c9046e0223cef2fd461d8aa3c656a8182bf0127e17e55a7e0a79e1ade76c883094d841a822864e995365b0217ef1b422272e6e0
SHA512
27eca3e987e4c2a662fc863840d3ea697da65f55c7b9180e892466aeb5a2753f1eca424bbf8705670fe8cd9363e3297e03f9f9cc0d4f85f0198a4e3312d32f3c
+DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B
5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad
SHA512
4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
new file mode 100644
index ..8e1dcf48ee29
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+# py3.11: wait for https://github.com/python/cpython/issues/93252
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock widevine"
+
+RDEPEND="
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
+ $(python_gen_cond_dep '
+ dev-python/colorama[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+ widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/cheroot[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-bdd[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-qt[${PYTHON_USEDEP}]
+ dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+ dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+ dev-python/tldextract[${PYTHON_USEDEP}]
+ )')"
+[[ ${PV} != ]] || BDEPEND+=" app-text/asciidoc"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ if use widevine; then
+ local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+ sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
+ -i ${PN}/config/qtargs.py || die
+ fi
+
+ # let eclass handle python
+ sed -i '/setup.py/d' misc/Makefile || die
+
+ [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+ # these plugins/tests are unnecessary here and have extra dependencies
+ sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+ -e '/pytest-instafail/d;s/--instafail//' \
+ -i pytest.ini || die
+ [[ ${PV} == ]] || rm tests/unit/scripts/test_problemmatchers.py ||
die
+ [[ ${PV} != ]] || rm
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: ef432eb511d6bf24fdf1385adc3545ea77f9bd67
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jun 18 09:02:11 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jun 18 09:25:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef432eb5
www-client/qutebrowser: drop 2.5.0
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 -
www-client/qutebrowser/qutebrowser-2.5.0.ebuild | 122
2 files changed, 123 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 3dde123518cc..6e8d0cec438b 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1 @@
-DIST qutebrowser-2.5.0.tar.gz 6086105 BLAKE2B
c95afbbdfeebe4352e461cef78d499e9efa9de2e4acc2cedf350904bd617a4f238c34042369655030e53433f941288ff676f8ffd873683939ddd38ff01604aa1
SHA512
41ab6f6d2b72c94e0f66ba0a80999d820748d0f86dbec92583a2be88725f1ebd7517dd75edbaa0ce60bc029ed4dc0dd3e30a1cb25ab4ef940b968c87b4df2472
DIST qutebrowser-2.5.1.tar.gz 6089389 BLAKE2B
e26be42742795b22c34d131a5c9046e0223cef2fd461d8aa3c656a8182bf0127e17e55a7e0a79e1ade76c883094d841a822864e995365b0217ef1b422272e6e0
SHA512
27eca3e987e4c2a662fc863840d3ea697da65f55c7b9180e892466aeb5a2753f1eca424bbf8705670fe8cd9363e3297e03f9f9cc0d4f85f0198a4e3312d32f3c
diff --git a/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
deleted file mode 100644
index 7d651f4ce4d0..
--- a/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
-else
-
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock widevine"
-
-RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
- $(python_gen_cond_dep '
- dev-python/colorama[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
- widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
- $(python_gen_cond_dep '
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/cheroot[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-bdd[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-python/pytest-qt[${PYTHON_USEDEP}]
- dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
- dev-python/pytest-xvfb[${PYTHON_USEDEP}]
- dev-python/tldextract[${PYTHON_USEDEP}]
- )')"
-[[ ${PV} != ]] || BDEPEND+=" app-text/asciidoc"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if use widevine; then
- local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
- sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
- -i ${PN}/config/qtargs.py || die
- fi
-
- # let eclass handle python
- sed -i '/setup.py/d' misc/Makefile || die
-
- [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
-
- # these plugins/tests are unnecessary here and have extra dependencies
- sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
- -e '/pytest-instafail/d;s/--instafail//' \
- -i pytest.ini || die
- [[ ${PV} == ]] || rm tests/unit/scripts/test_problemmatchers.py ||
die
- [[ ${PV} != ]] || rm tests/unit/scripts/test_run_vulture.py || die
-}
-
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: a35f5a16351a195f9421e873bcfc1ab9e36060ad
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jun 16 12:16:36 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jun 16 13:14:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a35f5a16
www-client/qutebrowser: stabilize 2.5.1 for amd64
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
index 09bc4c14cb21..9287f76d1bec 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
else
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: f1ba4857b1bdbcdfafb336309a6675169e6502f2
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jun 11 13:11:43 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jun 11 13:17:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ba4857
www-client/qutebrowser: disable py3.11
Rare but can randomly crash with 3.11b3 which can be quite annoying,
believed to be a cpython beta bug rather than in qutebrowser (see
ebuild comment).
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.1.ebuild | 3 ++-
www-client/qutebrowser/qutebrowser-.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
index 6011faed3b7d..09bc4c14cb21 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
@@ -5,7 +5,8 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+# py3.11: wait for https://github.com/python/cpython/issues/93252
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 optfeature xdg
if [[ ${PV} == ]]; then
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 6011faed3b7d..09bc4c14cb21 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -5,7 +5,8 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+# py3.11: wait for https://github.com/python/cpython/issues/93252
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 optfeature xdg
if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 13a534d9ce7c95ebe246897d4dac3fbc8f090594
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jun 9 03:15:20 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jun 9 03:41:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a534d9
www-client/qutebrowser: enable py3.11
There was a known issue with PyQt+py3.11_beta1 but does not seem
to occur anymore with 3.11_beta3. Still feels early to do this but
tests pass, and seems to run fine.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.1.ebuild | 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
index 2d84333f9a0e..6011faed3b7d 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 optfeature xdg
if [[ ${PV} == ]]; then
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 2d84333f9a0e..6011faed3b7d 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 optfeature xdg
if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 97cfd790df200459afe91022d962c1abc62ea18e
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu May 26 14:38:27 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu May 26 14:56:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97cfd790
www-client/qutebrowser: add 2.5.1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.5.1.ebuild | 122
2 files changed, 123 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 35bedaf766a8..3dde123518cc 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1 +1,2 @@
DIST qutebrowser-2.5.0.tar.gz 6086105 BLAKE2B
c95afbbdfeebe4352e461cef78d499e9efa9de2e4acc2cedf350904bd617a4f238c34042369655030e53433f941288ff676f8ffd873683939ddd38ff01604aa1
SHA512
41ab6f6d2b72c94e0f66ba0a80999d820748d0f86dbec92583a2be88725f1ebd7517dd75edbaa0ce60bc029ed4dc0dd3e30a1cb25ab4ef940b968c87b4df2472
+DIST qutebrowser-2.5.1.tar.gz 6089389 BLAKE2B
e26be42742795b22c34d131a5c9046e0223cef2fd461d8aa3c656a8182bf0127e17e55a7e0a79e1ade76c883094d841a822864e995365b0217ef1b422272e6e0
SHA512
27eca3e987e4c2a662fc863840d3ea697da65f55c7b9180e892466aeb5a2753f1eca424bbf8705670fe8cd9363e3297e03f9f9cc0d4f85f0198a4e3312d32f3c
diff --git a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
new file mode 100644
index ..2d84333f9a0e
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock widevine"
+
+RDEPEND="
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
+ $(python_gen_cond_dep '
+ dev-python/colorama[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+ widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/cheroot[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-bdd[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-qt[${PYTHON_USEDEP}]
+ dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+ dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+ dev-python/tldextract[${PYTHON_USEDEP}]
+ )')"
+[[ ${PV} != ]] || BDEPEND+=" app-text/asciidoc"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ if use widevine; then
+ local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+ sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
+ -i ${PN}/config/qtargs.py || die
+ fi
+
+ # let eclass handle python
+ sed -i '/setup.py/d' misc/Makefile || die
+
+ [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+ # these plugins/tests are unnecessary here and have extra dependencies
+ sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+ -e '/pytest-instafail/d;s/--instafail//' \
+ -i pytest.ini || die
+ [[ ${PV} == ]] || rm tests/unit/scripts/test_problemmatchers.py ||
die
+ [[ ${PV} != ]] || rm tests/unit/scripts/test_run_vulture.py || die
+}
+
+python_test() {
+ local
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 6b1c1679ca914428e3f09cd5b6d2828a22e68f84
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu May 26 14:39:10 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu May 26 14:56:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b1c1679
www-client/qutebrowser: sync live
Minor style nitpicks
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 6e52913c8194..2d84333f9a0e 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -26,7 +26,7 @@ IUSE="+adblock widevine"
RDEPEND="
dev-qt/qtcore:5[icu]
dev-qt/qtgui:5[png]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
@@ -56,8 +56,8 @@ BDEPEND="
distutils_enable_tests pytest
-python_prepare_all() {
- distutils-r1_python_prepare_all
+src_prepare() {
+ distutils-r1_src_prepare
if use widevine; then
local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: ebe3a6217afdd72092523f42f6e74f778fca37c8
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Apr 29 10:38:46 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 29 11:22:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe3a621
www-client/qutebrowser: drop 2.4.0
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 -
www-client/qutebrowser/qutebrowser-2.4.0.ebuild | 124
2 files changed, 125 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index b8f275d85467..35bedaf766a8 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1 @@
-DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B
9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84
SHA512
e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
DIST qutebrowser-2.5.0.tar.gz 6086105 BLAKE2B
c95afbbdfeebe4352e461cef78d499e9efa9de2e4acc2cedf350904bd617a4f238c34042369655030e53433f941288ff676f8ffd873683939ddd38ff01604aa1
SHA512
41ab6f6d2b72c94e0f66ba0a80999d820748d0f86dbec92583a2be88725f1ebd7517dd75edbaa0ce60bc029ed4dc0dd3e30a1cb25ab4ef940b968c87b4df2472
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
deleted file mode 100644
index d18f294eab0a..
--- a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
-else
-
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock widevine"
-
-RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
- $(python_gen_cond_dep '
- >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
- >=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
- >=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
- adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
- ')
- widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
- app-text/asciidoc
- $(python_gen_cond_dep '
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/cheroot[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-bdd[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-python/pytest-qt[${PYTHON_USEDEP}]
- dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
- dev-python/pytest-xvfb[${PYTHON_USEDEP}]
- dev-python/tldextract[${PYTHON_USEDEP}]
- )
- ')"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if use widevine; then
- sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'"
\
- -i ${PN}/config/qtargs.py || die
- fi
-
- sed -i '/setup.py/d' misc/Makefile || die
-
- [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
-
- # these plugins/tests are unnecessary here and have extra dependencies
- sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
- -e '/pytest-instafail/d;s/--instafail//' \
- -i pytest.ini || die
- [[ ${PV} == ]] || rm tests/unit/scripts/test_problemmatchers.py ||
die
- [[ ${PV} != ]] || rm tests/unit/scripts/test_run_vulture.py || die
-}
-
-python_test() {
-
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 1d5646e223c69eda0a7c95bcc3d5c37f83bbe04a
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Apr 21 04:31:44 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Apr 21 04:31:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5646e2
www-client/qutebrowser: stabilize 2.5.0 for amd64
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
index 6e52913c8194..7d651f4ce4d0 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
else
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: e2f59199cbeb3897bb3089895b65c2a7f7d0a8c7
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Apr 1 17:20:45 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 1 17:46:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f59199
www-client/qutebrowser: add 2.5.0
This includes a workaround for CVE-2022-25255 wrt bug #833583
Bug: https://bugs.gentoo.org/833583
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.5.0.ebuild | 122
2 files changed, 123 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 95272ae21135..b8f275d85467 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1 +1,2 @@
DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B
9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84
SHA512
e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
+DIST qutebrowser-2.5.0.tar.gz 6086105 BLAKE2B
c95afbbdfeebe4352e461cef78d499e9efa9de2e4acc2cedf350904bd617a4f238c34042369655030e53433f941288ff676f8ffd873683939ddd38ff01604aa1
SHA512
41ab6f6d2b72c94e0f66ba0a80999d820748d0f86dbec92583a2be88725f1ebd7517dd75edbaa0ce60bc029ed4dc0dd3e30a1cb25ab4ef940b968c87b4df2472
diff --git a/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
new file mode 100644
index ..6e52913c8194
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock widevine"
+
+RDEPEND="
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+ $(python_gen_cond_dep '
+ dev-python/colorama[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+ widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/cheroot[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-bdd[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-qt[${PYTHON_USEDEP}]
+ dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+ dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+ dev-python/tldextract[${PYTHON_USEDEP}]
+ )')"
+[[ ${PV} != ]] || BDEPEND+=" app-text/asciidoc"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if use widevine; then
+ local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+ sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
+ -i ${PN}/config/qtargs.py || die
+ fi
+
+ # let eclass handle python
+ sed -i '/setup.py/d' misc/Makefile || die
+
+ [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+ # these plugins/tests are unnecessary here and have extra dependencies
+ sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+ -e '/pytest-instafail/d;s/--instafail//' \
+ -i pytest.ini || die
+ [[ ${PV} == ]] || rm tests/unit/scripts/test_problemmatchers.py ||
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 732752644bee2ef95565cd0533c89ee1da2fa947
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jan 20 17:13:41 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jan 20 18:10:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73275264
www-client/qutebrowser: tidy live ebuild and use pep517
QtWebKit test was fixed to properly ignore that we don't have it,
albeit may still be present in a potential 2.4.1 release on a
separate branch.
Remove typing-extensions, was only needed for gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index f3fcf16be9a4..6e52913c8194 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 optfeature xdg
@@ -27,20 +28,17 @@ RDEPEND="
dev-qt/qtgui:5[png]
$(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
$(python_gen_cond_dep '
- >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
- >=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
- >=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
- adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
- ')
+ dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
widevine? ( www-plugins/chrome-binary-plugins )"
BDEPEND="
- app-text/asciidoc
$(python_gen_cond_dep '
test? (
dev-python/beautifulsoup4[${PYTHON_USEDEP}]
@@ -53,8 +51,8 @@ BDEPEND="
dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
dev-python/pytest-xvfb[${PYTHON_USEDEP}]
dev-python/tldextract[${PYTHON_USEDEP}]
- )
- ')"
+ )')"
+[[ ${PV} != ]] || BDEPEND+=" app-text/asciidoc"
distutils_enable_tests pytest
@@ -62,10 +60,12 @@ python_prepare_all() {
distutils-r1_python_prepare_all
if use widevine; then
- sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'"
\
+ local
widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+ sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${widevine}'" \
-i ${PN}/config/qtargs.py || die
fi
+ # let eclass handle python
sed -i '/setup.py/d' misc/Makefile || die
[[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
@@ -88,8 +88,6 @@ python_test() {
# tests that don't know about our newer qtwebengine
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
tests/unit/utils/test_version.py::TestChromiumVersion
- # needs qtwebkit and isn't skipped by default
- tests/unit/config/test_websettings.py::test_config_init
# may misbehave depending on installed old python versions
tests/unit/misc/test_checkpyver.py::test_old_python
# bug 819393
@@ -102,7 +100,7 @@ python_test() {
}
python_install_all() {
- emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
commit: 2a532e1e3f186c98d72f80ae8a2088ee60db9484
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Dec 2 04:51:35 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Dec 2 05:10:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a532e1e
www-client/qutebrowser: drop 2.3.1-r2
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest| 1 -
.../files/qutebrowser-2.3.1-pyyaml60.patch | 19 ---
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 128 -
3 files changed, 148 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index f42c7956d26e..95272ae21135 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1 @@
-DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B
55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211
SHA512
1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B
9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84
SHA512
e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
deleted file mode 100644
index d585109b9f2c..
--- a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/qutebrowser/qutebrowser/commit/1547a48
-From: Florian Bruhin
-Date: Thu, 14 Oct 2021 09:05:07 +0200
-Subject: [PATCH] tests: Adjust for PyYAML 6.0
a/tests/unit/utils/test_utils.py
-+++ b/tests/unit/utils/test_utils.py
-@@ -809,8 +809,11 @@ def test_load(self):
- assert utils.yaml_load("[1, 2]") == [1, 2]
-
- def test_load_float_bug(self):
--with pytest.raises(yaml.YAMLError):
-+try:
- utils.yaml_load("._")
-+except yaml.YAMLError:
-+# Either no exception or YAMLError, not ValueError
-+pass
-
- def test_load_file(self, tmp_path):
- tmpfile = tmp_path / 'foo.yml'
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
deleted file mode 100644
index bfc54af8e690..
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
-else
-
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock widevine"
-
-RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
- $(python_gen_cond_dep '
- >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- ')
- widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
- app-text/asciidoc
- $(python_gen_cond_dep '
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/cheroot[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-bdd[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-python/pytest-qt[${PYTHON_USEDEP}]
- dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
- dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 7ec970f9339fd975bccea15cc0ff14dbced1e54b
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 21 01:03:21 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Nov 21 02:35:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec970f9
www-client/qutebrowser: stabilize 2.4.0 for amd64
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
index f3fcf16be9a4..d18f294eab0a 100644
--- a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
else
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: becda816e508d089a52682cbb1eaf904d507fce9
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 21 01:53:12 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Nov 21 02:35:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=becda816
www-client/qutebrowser: remove mention of youtube-dl
mpv now defaults to yt-dlp without further setting up, and
yt-dlp also provides a youtube-dl wrapper either way.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 2 +-
www-client/qutebrowser/qutebrowser-2.4.0.ebuild| 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
index 0b940abb3a02..bfc54af8e690 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -123,6 +123,6 @@ pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS} ]]; then
elog "Note that optional scripts in
${EROOT}/usr/share/${PN}/{user,}scripts"
elog "have additional dependencies not covered by this ebuild,
for example"
- elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or
youtube-dl."
+ elog "view_in_mpv needs media-video/mpv[lua] and
net-misc/yt-dlp."
fi
}
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
index a48b15b96f0f..f3fcf16be9a4 100644
--- a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
@@ -119,6 +119,6 @@ pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS} ]]; then
elog "Note that optional scripts in
${EROOT}/usr/share/${PN}/{user,}scripts"
elog "have additional dependencies not covered by this ebuild,
for example"
- elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or
youtube-dl."
+ elog "view_in_mpv needs media-video/mpv[lua] and
net-misc/yt-dlp."
fi
}
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index a48b15b96f0f..f3fcf16be9a4 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -119,6 +119,6 @@ pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS} ]]; then
elog "Note that optional scripts in
${EROOT}/usr/share/${PN}/{user,}scripts"
elog "have additional dependencies not covered by this ebuild,
for example"
- elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or
youtube-dl."
+ elog "view_in_mpv needs media-video/mpv[lua] and
net-misc/yt-dlp."
fi
}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: a155bfd174292bda46a8f7daa5aed982c70dabc5
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 21 00:52:05 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Nov 21 02:35:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a155bfd1
www-client/qutebrowser: soften pyyaml version restriction
Upstream added a test fix for 6.0 and a requirement, but it
does not actually harm use with <6.0 (no related code change
beside the test, which pass with 5.4.1).
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.4.0.ebuild | 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
index 82cb9d908b85..a48b15b96f0f 100644
--- a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 82cb9d908b85..a48b15b96f0f 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 8aff9b37c119b515125ff976d3c03efadfe4c096
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Oct 22 14:35:21 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Oct 22 14:35:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aff9b37
www-client/qutebrowser: amd64 stable wrt bug #818031
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
index b54b75f29d4..0b940abb3a0 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
else
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: c84df465999d2b6618bf2fdd1bb832877d17ee10
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Oct 22 07:15:21 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 22 07:25:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84df465
www-client/qutebrowser: skip test_custom_env posix userscript test
Closes: https://bugs.gentoo.org/819393
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 2 ++
www-client/qutebrowser/qutebrowser-2.4.0.ebuild| 2 ++
www-client/qutebrowser/qutebrowser-.ebuild | 2 ++
3 files changed, 6 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
index 3a90e9763a2..b54b75f29d4 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -96,6 +96,8 @@ python_test() {
tests/unit/config/test_websettings.py::test_config_init
# may misbehave depending on installed old python versions
tests/unit/misc/test_checkpyver.py::test_old_python
+ # bug 819393
+
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
)
use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
index 258222d563c..82cb9d908b8 100644
--- a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
@@ -92,6 +92,8 @@ python_test() {
tests/unit/config/test_websettings.py::test_config_init
# may misbehave depending on installed old python versions
tests/unit/misc/test_checkpyver.py::test_old_python
+ # bug 819393
+
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
)
use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 258222d563c..82cb9d908b8 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -92,6 +92,8 @@ python_test() {
tests/unit/config/test_websettings.py::test_config_init
# may misbehave depending on installed old python versions
tests/unit/misc/test_checkpyver.py::test_old_python
+ # bug 819393
+
tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
)
use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 79125674a2c67b82a3942e07147854313b1bf9c0
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Oct 21 20:50:37 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Oct 21 21:11:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79125674
www-client/qutebrowser: sync live
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 22d3277e686..258222d563c 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
+ >=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+ adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
')
widevine? ( www-plugins/chrome-binary-plugins )"
BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 4a54b75971f92d2dc701c6789c72b7b4cef9b1d2
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Oct 21 20:07:12 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Oct 21 21:11:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a54b759
www-client/qutebrowser: add 2.4.0
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.4.0.ebuild | 122
2 files changed, 123 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 3e3b2438d15..f42c7956d26 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1 +1,2 @@
DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B
55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211
SHA512
1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
+DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B
9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84
SHA512
e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
new file mode 100644
index 000..258222d563c
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock widevine"
+
+RDEPEND="
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+ $(python_gen_cond_dep '
+ >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+ >=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
+ >=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
+ adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
+ ')
+ widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+ app-text/asciidoc
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/cheroot[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-bdd[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-qt[${PYTHON_USEDEP}]
+ dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+ dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+ dev-python/tldextract[${PYTHON_USEDEP}]
+ )
+ ')"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if use widevine; then
+ sed "/yield from _qtwebengine_settings_args/a\yield
'--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'"
\
+ -i ${PN}/config/qtargs.py || die
+ fi
+
+ sed -i '/setup.py/d' misc/Makefile || die
+
+ [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+ # these plugins/tests are unnecessary here and have extra dependencies
+ sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+ -e '/pytest-instafail/d;s/--instafail//' \
+ -i pytest.ini || die
+ [[ ${PV} == ]] || rm tests/unit/scripts/test_problemmatchers.py ||
die
+ [[ ${PV} != ]] || rm tests/unit/scripts/test_run_vulture.py || die
+}
+
+python_test() {
+ local
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 8d213222d3e8d2207ef62fd6a7c6300150050d27
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Oct 21 20:55:58 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Oct 21 21:11:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d213222
www-client/qutebrowser: drop 2.3.1-r1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild | 83 --
1 file changed, 83 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
deleted file mode 100644
index fb10ef39b48..000
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit desktop distutils-r1 optfeature xdg
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+adblock test"
-
-BDEPEND="app-text/asciidoc"
-RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
- >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-# Tests depend (misc/requirements/requirements-tests.txt) on plugins
-# we don't have packages for.
-RESTRICT="test"
-
-python_compile_all() {
- a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
- insinto /usr/share/metainfo
- doins misc/org.qutebrowser.qutebrowser.appdata.xml
- doman doc/${PN}.1
- domenu misc/org.${PN}.${PN}.desktop
- for s in 16 24 32 48 64 128 256 512; do
- doicon -s ${s} icons/qutebrowser-${s}x${s}.png
- done
- doicon -s scalable icons/${PN}.svg
-
- insinto /usr/share/qutebrowser/userscripts
- doins misc/userscripts/README.md
- exeinto /usr/share/qutebrowser/userscripts
- for f in misc/userscripts/*; do
- if [[ ${f} == __pycache__ ]]; then
- continue
- fi
- doexe "${f}"
- done
-
- exeinto /usr/share/qutebrowser/scripts
- for f in scripts/*; do
- if [[ ${f} == scripts/__init__.py ||
- ${f} == scripts/__pycache__ ||
- ${f} == scripts/dev ||
- ${f} == scripts/testbrowser ||
- ${f} == scripts/asciidoc2html.py ||
- ${f} == scripts/setupcommon.py ||
- ${f} == scripts/link_pyqt.py ]]; then
- continue
- fi
- doexe "${f}"
- done
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "PDF display support" www-plugins/pdfjs
-}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: fffd8606988d3eebc7324f6353d01469c18cfe81
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Oct 14 13:30:43 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 15 15:43:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fffd8606
www-client/qutebrowser: backport pyyaml-6.0 test fix
Closes: https://github.com/gentoo/gentoo/pull/22571
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/qutebrowser-2.3.1-pyyaml60.patch| 19 +++
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild| 4
2 files changed, 23 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
new file mode 100644
index 000..d585109b9f2
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
@@ -0,0 +1,19 @@
+https://github.com/qutebrowser/qutebrowser/commit/1547a48
+From: Florian Bruhin
+Date: Thu, 14 Oct 2021 09:05:07 +0200
+Subject: [PATCH] tests: Adjust for PyYAML 6.0
+--- a/tests/unit/utils/test_utils.py
b/tests/unit/utils/test_utils.py
+@@ -809,8 +809,11 @@ def test_load(self):
+ assert utils.yaml_load("[1, 2]") == [1, 2]
+
+ def test_load_float_bug(self):
+-with pytest.raises(yaml.YAMLError):
++try:
+ utils.yaml_load("._")
++except yaml.YAMLError:
++# Either no exception or YAMLError, not ValueError
++pass
+
+ def test_load_file(self, tmp_path):
+ tmpfile = tmp_path / 'foo.yml'
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
index f196542337c..3a90e9763a2 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -58,6 +58,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-pyyaml60.patch
+)
+
python_prepare_all() {
distutils-r1_python_prepare_all
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 705e1c9f8b98793dbb76d8e034dbbe6332c674e5
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Oct 14 12:28:39 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 15 15:43:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705e1c9f
www-client/qutebrowser: drop 2.2.3-r2, 2.3.0-r1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest| 2 -
www-client/qutebrowser/qutebrowser-2.2.3-r2.ebuild | 90 --
www-client/qutebrowser/qutebrowser-2.3.0-r1.ebuild | 90 --
3 files changed, 182 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 0c975bb9b5b..3e3b2438d15 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,3 +1 @@
-DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B
7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c
SHA512
608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
-DIST qutebrowser-2.3.0.tar.gz 6244786 BLAKE2B
6722074efd854e70aeb40c5992277d0dad59045795c464ecea2b53fcd648b900054e9ad7d19cf2879d814624304a3827c166f495e721344ecc334aa0f49a0d39
SHA512
1f0afc642fe68d4524fa0263f8f196429710f1ae0a27edb43748a688f1eadd3dc42af82da96715b78cbe19e6d0e6c1e9604a55d6c5deb7ebc5eba97b9bfa118f
DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B
55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211
SHA512
1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
diff --git a/www-client/qutebrowser/qutebrowser-2.2.3-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.2.3-r2.ebuild
deleted file mode 100644
index b0ead4bc437..000
--- a/www-client/qutebrowser/qutebrowser-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+adblock test"
-
-BDEPEND="app-text/asciidoc"
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
- a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
- insinto /usr/share/metainfo
- doins misc/org.qutebrowser.qutebrowser.appdata.xml
- doman doc/${PN}.1
- domenu misc/org.${PN}.${PN}.desktop
- for s in 16 24 32 48 64 128 256 512; do
- doicon -s ${s} icons/qutebrowser-${s}x${s}.png
- done
- doicon -s scalable icons/${PN}.svg
-
- insinto /usr/share/qutebrowser/userscripts
- doins misc/userscripts/README.md
- exeinto /usr/share/qutebrowser/userscripts
- for f in misc/userscripts/*; do
- if [[ "${f}" == "__pycache__" ]]; then
- continue
- fi
- doexe "${f}"
- done
-
- exeinto /usr/share/qutebrowser/scripts
- for f in scripts/*; do
- if [[ "${f}" == "scripts/__init__.py" || \
- "${f}" == "scripts/__pycache__" || \
- "${f}" == "scripts/dev" || \
- "${f}" == "scripts/testbrowser" || \
- "${f}" == "scripts/asciidoc2html.py" || \
- "${f}" == "scripts/setupcommon.py" || \
- "${f}" == "scripts/link_pyqt.py" ]]; then
- continue
- fi
- doexe "${f}"
- done
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "PDF display support"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 0b8b467249ed31d90aaeb9e535d039c08379bafa
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Oct 12 19:02:25 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 15 15:43:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8b4672
www-client/qutebrowser: sync and update live ebuild
Now also running asciidoc2html needed for :help / qute://help
to function (these are pre-converted in release copy).
Done in prepare_all given has to be before python_compile for
simplicity (compile_all runs after compile) and only only done
once rather than per-implementation (not that using multiple).
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/metadata.xml| 2 -
www-client/qutebrowser/qutebrowser-.ebuild | 162 +++--
2 files changed, 95 insertions(+), 69 deletions(-)
diff --git a/www-client/qutebrowser/metadata.xml
b/www-client/qutebrowser/metadata.xml
index bfc1e23ae3f..44b66f5f900 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -24,8 +24,6 @@
Enable Brave's ABP-style adblocker library
for improved adblocking
- Installs userscripts from the
misc/userscripts
- directory to /usr/share/qutebrowser/userscripts.
Unsupported closed-source DRM capability
(required by Netflix VOD)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index c015de929af..22d3277e686 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -3,92 +3,120 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
-inherit desktop distutils-r1 git-r3 optfeature xdg
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+HOMEPAGE="https://www.qutebrowser.org/;
LICENSE="GPL-3+"
SLOT="0"
-IUSE="scripts test"
+IUSE="+adblock widevine"
-BDEPEND="
- app-text/asciidoc"
RDEPEND="
- dev-python/attrs[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/cssutils[${PYTHON_USEDEP}]
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
$(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pypeg2[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile() {
- ${EPYTHON} scripts/asciidoc2html.py || die
- distutils-r1_python_compile
+ $(python_gen_cond_dep '
+ >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
+ >=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
+ >=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+ ')
+ widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+ app-text/asciidoc
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/cheroot[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-bdd[${PYTHON_USEDEP}]
+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: b5d821f486fdf64a961bea4705387da3cad9736e
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Oct 12 18:47:59 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 15 15:43:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d821f4
www-client/qutebrowser: enable py3.10
Upstream already actively tests with 3.10 and the
newly enabled tests pass.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
index 4fd97899626..f196542337c 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 optfeature xdg
if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 68bccf5f15c24ae1af8eaf66425628cb68d976f5
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Oct 8 21:06:52 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 15 15:43:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68bccf5f
www-client/qutebrowser: simplify, use single impl, tighten deps
misc/Makefile can do most of the install work (picking scripts,
man page, icons, etc...), just need to strip out setup.py to
leave this up to the eclass.
Since this isn't a library, there's little sense in not being
single python impl. Additionally use that single impl to fix
shebang of /usr/share/qutebrowser extra scripts.
Two new USE deps:
- qtcore:5[icu]: fix TestFileCompletion test (locale issues)
- qtgui:5[png]: fix 'Failed to load :/icons/qutebrowser-16x16.png'
May have other ill effects if missing, so ensure availability.
Also added basic postinst elog to warn that shouldn't expect all
scripts/userscripts to work as-is due to untracked dependencies.
Many are irrelevant to most users (kodi, nextcloud, keepassxc)
and do not wish to add more optfeature noise or control with USE.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 76 ++
1 file changed, 76 insertions(+)
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
new file mode 100644
index 000..f5481f420b5
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 optfeature xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git;
+else
+
SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock"
+# Tests depend (misc/requirements/requirements-tests.txt) on plugins
+# we don't have packages for.
+RESTRICT="test"
+
+RDEPEND="
+ dev-qt/qtcore:5[icu]
+ dev-qt/qtgui:5[png]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+ $(python_gen_cond_dep '
+ >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+ ')"
+BDEPEND="app-text/asciidoc"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ sed -i '/setup.py/d' misc/Makefile || die
+
+ [[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+}
+
+python_install_all() {
+ emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+ rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
+ fperms -x
/usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
+ python_fix_shebang "${ED}"/usr/share/${PN}
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "PDF display support" www-plugins/pdfjs
+
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "Note that optional scripts in
${EROOT}/usr/share/${PN}/{user,}scripts"
+ elog "have additional dependencies not covered by this ebuild,
for example"
+ elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or
youtube-dl."
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, profiles/arch/arm64/
commit: 02f5a42867aba21641749b289962029b1b66a5d7
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Oct 12 18:06:27 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 15 15:43:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f5a428
www-client/qutebrowser: enable tests
Difficult to enable every tests (notably annoyances with IPC
tests) but still provides >7500 passing tests that should be
mostly enough to check for blatant regressions.
Signed-off-by: Ionen Wolkens gentoo.org>
profiles/arch/arm64/package.use.mask | 4 ++
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 48 --
2 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/profiles/arch/arm64/package.use.mask
b/profiles/arch/arm64/package.use.mask
index b240d240249..4b28cdb018a 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Ionen Wolkens (2021-10-15)
+# dev-python/pytest-bdd is not keyworded here yet
+www-client/qutebrowser test
+
# Jakov Smolić (2021-10-07)
# dev-libs/mongo-c-driver is not keyworded here
net-analyzer/zmap mongo
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
index 510e711ce98..4fd97899626 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -21,9 +21,6 @@ HOMEPAGE="https://www.qutebrowser.org/;
LICENSE="GPL-3+"
SLOT="0"
IUSE="+adblock widevine"
-# Tests depend (misc/requirements/requirements-tests.txt) on plugins
-# we don't have packages for.
-RESTRICT="test"
RDEPEND="
dev-qt/qtcore:5[icu]
@@ -42,7 +39,22 @@ RDEPEND="
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
')
widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="app-text/asciidoc"
+BDEPEND="
+ app-text/asciidoc
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/cheroot[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-bdd[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-qt[${PYTHON_USEDEP}]
+ dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+ dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+ dev-python/tldextract[${PYTHON_USEDEP}]
+ )
+ ')"
distutils_enable_tests pytest
@@ -57,6 +69,34 @@ python_prepare_all() {
sed -i '/setup.py/d' misc/Makefile || die
[[ ${PV} != ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+ # these plugins/tests are unnecessary here and have extra dependencies
+ sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+ -e '/pytest-instafail/d;s/--instafail//' \
+ -i pytest.ini || die
+ [[ ${PV} == ]] || rm tests/unit/scripts/test_problemmatchers.py ||
die
+ [[ ${PV} != ]] || rm tests/unit/scripts/test_run_vulture.py || die
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # end2end and other IPC tests are broken with "Name error" if
+ # socket path is over 104 characters (=124 in /var/tmp/portage)
+ # https://github.com/qutebrowser/qutebrowser/issues/888 (not
just OSX)
+ tests/end2end
+ tests/unit/misc/test_ipc.py
+ # tests that don't know about our newer qtwebengine
+
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+ tests/unit/utils/test_version.py::TestChromiumVersion
+ # needs qtwebkit and isn't skipped by default
+ tests/unit/config/test_websettings.py::test_config_init
+ # may misbehave depending on installed old python versions
+ tests/unit/misc/test_checkpyver.py::test_old_python
+ )
+ use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+ # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+ epytest -k 'not _bench and not _matches_tree and not _warning'
}
python_install_all() {
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 216f4475644eb07f8f267685ec518d591b3ab060 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Oct 12 18:33:35 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Oct 15 15:43:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216f4475 www-client/qutebrowser: set ALLARCHES Signed-off-by: Ionen Wolkens gentoo.org> www-client/qutebrowser/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml index 0311f6f4cbe..c3857041d96 100644 --- a/www-client/qutebrowser/metadata.xml +++ b/www-client/qutebrowser/metadata.xml @@ -17,6 +17,7 @@ ste...@gentoo.org Stefan Strogin + qutebrowser/qutebrowser
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 92dc2e5368963d9ce24ea91d3c86c56579eb Author: Ionen Wolkens gentoo org> AuthorDate: Fri Oct 8 20:32:32 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Oct 15 15:43:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92dc2e53 www-client/qutebrowser: add myself as a maintainer Signed-off-by: Ionen Wolkens gentoo.org> www-client/qutebrowser/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml index 9255ec048f5..0311f6f4cbe 100644 --- a/www-client/qutebrowser/metadata.xml +++ b/www-client/qutebrowser/metadata.xml @@ -1,6 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd;> + + io...@gentoo.org + Ionen Wolkens + guillaumese...@gmail.com Guillaume Seren
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: b5654a20185b28d5abbfa90141256fae6c00d04e
Author: Michał Górny gentoo org>
AuthorDate: Thu Oct 14 10:00:28 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Oct 14 10:00:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5654a20
www-client/qutebrowser: pyyaml is using libyaml unconditionally now
Signed-off-by: Michał Górny gentoo.org>
.../{qutebrowser-2.2.3-r1.ebuild => qutebrowser-2.2.3-r2.ebuild}| 2 +-
.../{qutebrowser-2.3.0.ebuild => qutebrowser-2.3.0-r1.ebuild} | 2 +-
.../{qutebrowser-2.3.1.ebuild => qutebrowser-2.3.1-r1.ebuild} | 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
b/www-client/qutebrowser/qutebrowser-2.2.3-r2.ebuild
similarity index 97%
rename from www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
rename to www-client/qutebrowser/qutebrowser-2.2.3-r2.ebuild
index a546f877c3d..b0ead4bc437 100644
--- a/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.2.3-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/zipp[${PYTHON_USEDEP}]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
diff --git a/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.0-r1.ebuild
similarity index 97%
rename from www-client/qutebrowser/qutebrowser-2.3.0.ebuild
rename to www-client/qutebrowser/qutebrowser-2.3.0-r1.ebuild
index dd61b8b7158..afa2de99138 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.0-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/zipp[${PYTHON_USEDEP}]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
similarity index 97%
rename from www-client/qutebrowser/qutebrowser-2.3.1.ebuild
rename to www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
index e11338abf31..fb10ef39b48 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/zipp[${PYTHON_USEDEP}]
adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index b9c6a309b37..c015de929af 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-python/pypeg2[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/zipp[${PYTHON_USEDEP}]
"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: c20eaf5374d83c9b837fc364bbfae05206495863
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 21 06:00:21 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 21 06:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20eaf53
www-client/qutebrowser: EAPI7->8, migrate to xdg eclass, tidy a bit
Trying not to change too much here (unless I end up officially
maintaining this), but removed some unnecessary quotes, add + to
GPL-3 (as indicated in .py files), and cleanup python3.7 which
wasn't usable anymore either way.
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/qutebrowser-2.3.1.ebuild | 39 ++---
www-client/qutebrowser/qutebrowser-.ebuild | 23 +--
2 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
index dd61b8b7158..e11338abf31 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
@@ -1,24 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..9} )
-inherit desktop distutils-r1 optfeature xdg-utils
+inherit desktop distutils-r1 optfeature xdg
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+adblock test"
BDEPEND="app-text/asciidoc"
RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
@@ -53,7 +53,7 @@ python_install_all() {
doins misc/userscripts/README.md
exeinto /usr/share/qutebrowser/userscripts
for f in misc/userscripts/*; do
- if [[ "${f}" == "__pycache__" ]]; then
+ if [[ ${f} == __pycache__ ]]; then
continue
fi
doexe "${f}"
@@ -61,13 +61,13 @@ python_install_all() {
exeinto /usr/share/qutebrowser/scripts
for f in scripts/*; do
- if [[ "${f}" == "scripts/__init__.py" || \
- "${f}" == "scripts/__pycache__" || \
- "${f}" == "scripts/dev" || \
- "${f}" == "scripts/testbrowser" || \
- "${f}" == "scripts/asciidoc2html.py" || \
- "${f}" == "scripts/setupcommon.py" || \
- "${f}" == "scripts/link_pyqt.py" ]]; then
+ if [[ ${f} == scripts/__init__.py ||
+ ${f} == scripts/__pycache__ ||
+ ${f} == scripts/dev ||
+ ${f} == scripts/testbrowser ||
+ ${f} == scripts/asciidoc2html.py ||
+ ${f} == scripts/setupcommon.py ||
+ ${f} == scripts/link_pyqt.py ]]; then
continue
fi
doexe "${f}"
@@ -77,14 +77,7 @@ python_install_all() {
}
pkg_postinst() {
- optfeature "PDF display support" www-plugins/pdfjs
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
+ xdg_pkg_postinst
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
+ optfeature "PDF display support" www-plugins/pdfjs
}
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 8ed082ba920..b9c6a309b37 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -1,18 +1,18 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..9} )
DISTUTILS_USE_SETUPTOOLS="rdepend"
-inherit desktop distutils-r1 git-r3 optfeature xdg-utils
+inherit desktop distutils-r1 git-r3 optfeature xdg
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
-LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 826f1e0825dd7290c0072c74f9aff27b408b869a
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 21 06:07:31 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 21 06:32:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826f1e08
www-client/qutebrowser: drop 2.1.1, 2.2.2
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 2 -
www-client/qutebrowser/qutebrowser-2.1.1.ebuild | 91
www-client/qutebrowser/qutebrowser-2.2.2.ebuild | 93 -
3 files changed, 186 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 377172fa043..0c975bb9b5b 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,5 +1,3 @@
-DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d
SHA512
85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
-DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B
e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4
SHA512
ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B
7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c
SHA512
608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
DIST qutebrowser-2.3.0.tar.gz 6244786 BLAKE2B
6722074efd854e70aeb40c5992277d0dad59045795c464ecea2b53fcd648b900054e9ad7d19cf2879d814624304a3827c166f495e721344ecc334aa0f49a0d39
SHA512
1f0afc642fe68d4524fa0263f8f196429710f1ae0a27edb43748a688f1eadd3dc42af82da96715b78cbe19e6d0e6c1e9604a55d6c5deb7ebc5eba97b9bfa118f
DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B
55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211
SHA512
1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
diff --git a/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
deleted file mode 100644
index 1260f00c148..000
--- a/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="scripts test"
-
-BDEPEND="
- app-text/asciidoc"
-RDEPEND="
- dev-python/colorama[${PYTHON_USEDEP}]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
- a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
- doman doc/${PN}.1
- domenu misc/org.${PN}.${PN}.desktop
- doicon -s scalable icons/${PN}.svg
-
- if use scripts; then
- insinto /usr/share/qutebrowser/userscripts/
- doins misc/userscripts/README.md
- exeinto /usr/share/qutebrowser/userscripts/
- doexe misc/userscripts/add-nextcloud-bookmarks \
- misc/userscripts/add-nextcloud-cookbook \
- misc/userscripts/cast \
- misc/userscripts/dmenu_qutebrowser \
- misc/userscripts/format_json \
- misc/userscripts/getbib \
- misc/userscripts/kodi \
- misc/userscripts/open_download \
- misc/userscripts/openfeeds \
- misc/userscripts/password_fill \
- misc/userscripts/qr \
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 8f6b04f21535a396baee7d2651887ce7934452f3
Author: Christian Schroeder gmail com>
AuthorDate: Tue Sep 7 17:56:17 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 21 06:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6b04f2
www-client/qutebrowser: version bump to 2.3.1
Closes: https://bugs.gentoo.org/808648
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christian Schroeder gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22239
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.3.1.ebuild | 90 +
2 files changed, 91 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index a45fb9b65dd..377172fa043 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -2,3 +2,4 @@ DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a
DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B
e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4
SHA512
ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B
7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c
SHA512
608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
DIST qutebrowser-2.3.0.tar.gz 6244786 BLAKE2B
6722074efd854e70aeb40c5992277d0dad59045795c464ecea2b53fcd648b900054e9ad7d19cf2879d814624304a3827c166f495e721344ecc334aa0f49a0d39
SHA512
1f0afc642fe68d4524fa0263f8f196429710f1ae0a27edb43748a688f1eadd3dc42af82da96715b78cbe19e6d0e6c1e9604a55d6c5deb7ebc5eba97b9bfa118f
+DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B
55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211
SHA512
1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
new file mode 100644
index 000..dd61b8b7158
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+adblock test"
+
+BDEPEND="app-text/asciidoc"
+RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
+ >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+# Tests depend (misc/requirements/requirements-tests.txt) on plugins
+# we don't have packages for.
+RESTRICT="test"
+
+python_compile_all() {
+ a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_install_all() {
+ insinto /usr/share/metainfo
+ doins misc/org.qutebrowser.qutebrowser.appdata.xml
+ doman doc/${PN}.1
+ domenu misc/org.${PN}.${PN}.desktop
+ for s in 16 24 32 48 64 128 256 512; do
+ doicon -s ${s} icons/qutebrowser-${s}x${s}.png
+ done
+ doicon -s scalable icons/${PN}.svg
+
+ insinto /usr/share/qutebrowser/userscripts
+ doins misc/userscripts/README.md
+ exeinto /usr/share/qutebrowser/userscripts
+ for f in misc/userscripts/*; do
+ if [[ "${f}" == "__pycache__" ]]; then
+ continue
+ fi
+ doexe "${f}"
+ done
+
+ exeinto /usr/share/qutebrowser/scripts
+ for f in scripts/*; do
+ if [[ "${f}" == "scripts/__init__.py" || \
+ "${f}" == "scripts/__pycache__" || \
+ "${f}" ==
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 7f98a8f44c677dffd896fda5a76bfa2a15dcd3a8
Author: Stefan Strogin gentoo org>
AuthorDate: Wed Jun 30 01:50:27 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Wed Jun 30 01:50:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f98a8f4
www-client/qutebrowser: upgrade to 2.3.0
Closes: https://bugs.gentoo.org/722702
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.3.0.ebuild | 90 +
2 files changed, 91 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 6b4e1544930..a45fb9b65dd 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,3 +1,4 @@
DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d
SHA512
85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B
e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4
SHA512
ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B
7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c
SHA512
608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
+DIST qutebrowser-2.3.0.tar.gz 6244786 BLAKE2B
6722074efd854e70aeb40c5992277d0dad59045795c464ecea2b53fcd648b900054e9ad7d19cf2879d814624304a3827c166f495e721344ecc334aa0f49a0d39
SHA512
1f0afc642fe68d4524fa0263f8f196429710f1ae0a27edb43748a688f1eadd3dc42af82da96715b78cbe19e6d0e6c1e9604a55d6c5deb7ebc5eba97b9bfa118f
diff --git a/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
new file mode 100644
index 000..dd61b8b7158
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+adblock test"
+
+BDEPEND="app-text/asciidoc"
+RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
+ >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+# Tests depend (misc/requirements/requirements-tests.txt) on plugins
+# we don't have packages for.
+RESTRICT="test"
+
+python_compile_all() {
+ a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_install_all() {
+ insinto /usr/share/metainfo
+ doins misc/org.qutebrowser.qutebrowser.appdata.xml
+ doman doc/${PN}.1
+ domenu misc/org.${PN}.${PN}.desktop
+ for s in 16 24 32 48 64 128 256 512; do
+ doicon -s ${s} icons/qutebrowser-${s}x${s}.png
+ done
+ doicon -s scalable icons/${PN}.svg
+
+ insinto /usr/share/qutebrowser/userscripts
+ doins misc/userscripts/README.md
+ exeinto /usr/share/qutebrowser/userscripts
+ for f in misc/userscripts/*; do
+ if [[ "${f}" == "__pycache__" ]]; then
+ continue
+ fi
+ doexe "${f}"
+ done
+
+ exeinto /usr/share/qutebrowser/scripts
+ for f in scripts/*; do
+ if [[ "${f}" == "scripts/__init__.py" || \
+ "${f}" == "scripts/__pycache__" || \
+ "${f}" == "scripts/dev" || \
+ "${f}" == "scripts/testbrowser" || \
+ "${f}" == "scripts/asciidoc2html.py" || \
+ "${f}" ==
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 4863a9219f2f8af6b463795228af253f1cc2b4f5
Author: Stefan Strogin gentoo org>
AuthorDate: Fri Jun 18 11:34:31 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Fri Jun 18 11:40:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4863a921
www-client/qutebrowser: upgrade to 2.2.3
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.2.3.ebuild | 90 +
2 files changed, 91 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index d6f1197cedc..7a1b8510eb2 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,3 +1,4 @@
DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d
SHA512
85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
DIST qutebrowser-2.2.1.tar.gz 6299507 BLAKE2B
a92ce4c79c35932c6cb8b7a8b9ecaefe61aedbfc1a4e77e41a70a4111859ab5d1f1fdd57b4e9a5097aaa13dc86cb0dcf939ec97ac9d2bb15131bcd1a50c2c540
SHA512
397d6e8ababf2c20112a2b7bcbfb30abb441a528ac023214326a61e1f906749ee47dcbd36bea4c2c4a1e31176fd52f0f63d86a1f7a2d8c8f40bc698e8db891cf
DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B
e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4
SHA512
ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
+DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B
7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c
SHA512
608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
diff --git a/www-client/qutebrowser/qutebrowser-2.2.3.ebuild
b/www-client/qutebrowser/qutebrowser-2.2.3.ebuild
new file mode 100644
index 000..ab48622e1e2
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.2.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="scripts test"
+
+BDEPEND="app-text/asciidoc"
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
+RESTRICT="test"
+
+python_compile_all() {
+ a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_install_all() {
+ doman doc/${PN}.1
+ domenu misc/org.${PN}.${PN}.desktop
+ doicon -s scalable icons/${PN}.svg
+
+ if use scripts; then
+ insinto /usr/share/qutebrowser/userscripts/
+ doins misc/userscripts/README.md
+ exeinto /usr/share/qutebrowser/userscripts/
+ doexe misc/userscripts/add-nextcloud-bookmarks \
+ misc/userscripts/add-nextcloud-cookbook \
+ misc/userscripts/cast \
+ misc/userscripts/dmenu_qutebrowser \
+ misc/userscripts/format_json \
+ misc/userscripts/getbib \
+ misc/userscripts/kodi \
+ misc/userscripts/open_download \
+ misc/userscripts/openfeeds \
+ misc/userscripts/password_fill \
+ misc/userscripts/qr \
+ misc/userscripts/qute-bitwarden \
+ misc/userscripts/qutedmenu \
+ misc/userscripts/qute-keepass \
+ misc/userscripts/qute-keepassxc \
+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 51c84b06f73b32dab007883c855943fc62839528
Author: Stefan Strogin gentoo org>
AuthorDate: Fri Jun 18 11:35:42 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Fri Jun 18 11:40:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c84b06
www-client/qutebrowser: drop old 2.2.1
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/Manifest | 1 -
www-client/qutebrowser/qutebrowser-2.2.1.ebuild | 93 -
2 files changed, 94 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 7a1b8510eb2..6b4e1544930 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,3 @@
DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d
SHA512
85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
-DIST qutebrowser-2.2.1.tar.gz 6299507 BLAKE2B
a92ce4c79c35932c6cb8b7a8b9ecaefe61aedbfc1a4e77e41a70a4111859ab5d1f1fdd57b4e9a5097aaa13dc86cb0dcf939ec97ac9d2bb15131bcd1a50c2c540
SHA512
397d6e8ababf2c20112a2b7bcbfb30abb441a528ac023214326a61e1f906749ee47dcbd36bea4c2c4a1e31176fd52f0f63d86a1f7a2d8c8f40bc698e8db891cf
DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B
e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4
SHA512
ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B
7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c
SHA512
608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
diff --git a/www-client/qutebrowser/qutebrowser-2.2.1.ebuild
b/www-client/qutebrowser/qutebrowser-2.2.1.ebuild
deleted file mode 100644
index be33807c24d..000
--- a/www-client/qutebrowser/qutebrowser-2.2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="scripts test"
-
-BDEPEND="
- app-text/asciidoc"
-RDEPEND="
- dev-python/colorama[${PYTHON_USEDEP}]
- $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
- a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
- doman doc/${PN}.1
- domenu misc/org.${PN}.${PN}.desktop
- doicon -s scalable icons/${PN}.svg
-
- if use scripts; then
- insinto /usr/share/qutebrowser/userscripts/
- doins misc/userscripts/README.md
- exeinto /usr/share/qutebrowser/userscripts/
- doexe misc/userscripts/add-nextcloud-bookmarks \
- misc/userscripts/add-nextcloud-cookbook \
- misc/userscripts/cast \
- misc/userscripts/dmenu_qutebrowser \
- misc/userscripts/format_json \
- misc/userscripts/getbib \
- misc/userscripts/kodi \
- misc/userscripts/open_download \
- misc/userscripts/openfeeds \
- misc/userscripts/password_fill \
- misc/userscripts/qr \
- misc/userscripts/qute-bitwarden \
- misc/userscripts/qutedmenu \
- misc/userscripts/qute-keepass \
- misc/userscripts/qute-keepassxc \
-
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 9011862db1c19166dbba65f0bd6b31ef412fbeb2
Author: Stefan Strogin gentoo org>
AuthorDate: Sat May 22 02:47:09 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Sat May 22 15:27:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9011862d
www-client/qutebrowser: upgrade to 2.2.2
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/Manifest | 1 +
www-client/qutebrowser/qutebrowser-2.2.2.ebuild | 93 +
2 files changed, 94 insertions(+)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 1506d50d97d..d6f1197cedc 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,3 @@
DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d
SHA512
85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
DIST qutebrowser-2.2.1.tar.gz 6299507 BLAKE2B
a92ce4c79c35932c6cb8b7a8b9ecaefe61aedbfc1a4e77e41a70a4111859ab5d1f1fdd57b4e9a5097aaa13dc86cb0dcf939ec97ac9d2bb15131bcd1a50c2c540
SHA512
397d6e8ababf2c20112a2b7bcbfb30abb441a528ac023214326a61e1f906749ee47dcbd36bea4c2c4a1e31176fd52f0f63d86a1f7a2d8c8f40bc698e8db891cf
+DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B
e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4
SHA512
ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
diff --git a/www-client/qutebrowser/qutebrowser-2.2.2.ebuild
b/www-client/qutebrowser/qutebrowser-2.2.2.ebuild
new file mode 100644
index 000..be33807c24d
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop distutils-r1 optfeature xdg-utils
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="scripts test"
+
+BDEPEND="
+ app-text/asciidoc"
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests setup.py
+
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
+RESTRICT="test"
+
+python_compile_all() {
+ a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_install_all() {
+ doman doc/${PN}.1
+ domenu misc/org.${PN}.${PN}.desktop
+ doicon -s scalable icons/${PN}.svg
+
+ if use scripts; then
+ insinto /usr/share/qutebrowser/userscripts/
+ doins misc/userscripts/README.md
+ exeinto /usr/share/qutebrowser/userscripts/
+ doexe misc/userscripts/add-nextcloud-bookmarks \
+ misc/userscripts/add-nextcloud-cookbook \
+ misc/userscripts/cast \
+ misc/userscripts/dmenu_qutebrowser \
+ misc/userscripts/format_json \
+ misc/userscripts/getbib \
+ misc/userscripts/kodi \
+ misc/userscripts/open_download \
+ misc/userscripts/openfeeds \
+ misc/userscripts/password_fill \
+ misc/userscripts/qr \
+ misc/userscripts/qute-bitwarden \
+ misc/userscripts/qutedmenu \
+ misc/userscripts/qute-keepass \
+ misc/userscripts/qute-keepassxc \
+ misc/userscripts/qute-lastpass \
+ misc/userscripts/qute-pass \
+ misc/userscripts/readability \
+ misc/userscripts/readability-js \
+ misc/userscripts/ripbang \
+ misc/userscripts/rss \
+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: f4f44a8e08d7ade6bd6f8f5e771c4f64c6d9e0c0
Author: Nicu Borta tutanota com>
AuthorDate: Sat May 1 18:10:03 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Sat May 22 02:39:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f44a8e
www-client/qutebrowser: upgrade 2.2.0 -> 2.2.1
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Nicu Borta tutanota.com>
Closes: https://github.com/gentoo/gentoo/pull/20637
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/Manifest | 2 +-
.../{qutebrowser-2.2.0-r1.ebuild => qutebrowser-2.2.1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index c4d3eae6bff..1506d50d97d 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,2 @@
DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d
SHA512
85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
-DIST qutebrowser-2.2.0.tar.gz 6297885 BLAKE2B
c43d5fdefe4fdabf479b7575ffc1582340aa6ca3add7f717a4d46ebe24fd086c26e57bee0932262e997abf5a2ce9c636732c83d8659617b16f9a040c196fad68
SHA512
79cc35d47a48d4eef8abb95082aa047a63356f53ac94027b48fbd679621f172e5fa4863af21e2398c6ec37b554871ca96e7338381aee2e0b01f6e1d661823fbc
+DIST qutebrowser-2.2.1.tar.gz 6299507 BLAKE2B
a92ce4c79c35932c6cb8b7a8b9ecaefe61aedbfc1a4e77e41a70a4111859ab5d1f1fdd57b4e9a5097aaa13dc86cb0dcf939ec97ac9d2bb15131bcd1a50c2c540
SHA512
397d6e8ababf2c20112a2b7bcbfb30abb441a528ac023214326a61e1f906749ee47dcbd36bea4c2c4a1e31176fd52f0f63d86a1f7a2d8c8f40bc698e8db891cf
diff --git a/www-client/qutebrowser/qutebrowser-2.2.0-r1.ebuild
b/www-client/qutebrowser/qutebrowser-2.2.1.ebuild
similarity index 100%
rename from www-client/qutebrowser/qutebrowser-2.2.0-r1.ebuild
rename to www-client/qutebrowser/qutebrowser-2.2.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 05c48bc3e9be6335f3bfda8af5c26396519fa63c
Author: Guillaume Seren gmail com>
AuthorDate: Fri Apr 23 15:40:36 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Tue Apr 27 10:52:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c48bc3
www-client/qutebrowser: add PyQt5[dbus] dependency
Closes: https://bugs.gentoo.org/785202
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Guillaume Seren gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20514
Signed-off-by: Stefan Strogin gentoo.org>
.../{qutebrowser-2.2.0.ebuild => qutebrowser-2.2.0-r1.ebuild} | 2 +-
www-client/qutebrowser/qutebrowser-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-2.2.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.2.0-r1.ebuild
similarity index 96%
rename from www-client/qutebrowser/qutebrowser-2.2.0.ebuild
rename to www-client/qutebrowser/qutebrowser-2.2.0-r1.ebuild
index 7d86502435d..be33807c24d 100644
--- a/www-client/qutebrowser/qutebrowser-2.2.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.2.0-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 603c6acf96c..8ed082ba920 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/pypeg2[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
dev-python/typing-extensions[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: 110313fc084eb4a3b8f6f9644797b0075259105a
Author: Stefan Strogin gentoo org>
AuthorDate: Thu Apr 22 22:28:13 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Thu Apr 22 22:30:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110313fc
www-client/qutebrowser: upgrade to 2.2.0
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/Manifest| 1 +
...utebrowser-.ebuild => qutebrowser-2.2.0.ebuild} | 18 ++
www-client/qutebrowser/qutebrowser-.ebuild | 4 +++-
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index d703d5dba82..c4d3eae6bff 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1 +1,2 @@
DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d
SHA512
85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
+DIST qutebrowser-2.2.0.tar.gz 6297885 BLAKE2B
c43d5fdefe4fdabf479b7575ffc1582340aa6ca3add7f717a4d46ebe24fd086c26e57bee0932262e997abf5a2ce9c636732c83d8659617b16f9a040c196fad68
SHA512
79cc35d47a48d4eef8abb95082aa047a63356f53ac94027b48fbd679621f172e5fa4863af21e2398c6ec37b554871ca96e7338381aee2e0b01f6e1d661823fbc
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-2.2.0.ebuild
similarity index 86%
copy from www-client/qutebrowser/qutebrowser-.ebuild
copy to www-client/qutebrowser/qutebrowser-2.2.0.ebuild
index a46589e9223..7d86502435d 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.2.0.ebuild
@@ -4,32 +4,31 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-inherit desktop distutils-r1 git-r3 optfeature xdg-utils
+inherit desktop distutils-r1 optfeature xdg-utils
DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
LICENSE="GPL-3"
SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="scripts test"
BDEPEND="
app-text/asciidoc"
RDEPEND="
- dev-python/attrs[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/cssutils[${PYTHON_USEDEP}]
$(python_gen_cond_dep
'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pypeg2[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
"
distutils_enable_tests setup.py
@@ -38,11 +37,6 @@ distutils_enable_tests setup.py
# isn't complete and X11 is required in order to start up qutebrowser.
RESTRICT="test"
-python_compile() {
- ${EPYTHON} scripts/asciidoc2html.py || die
- distutils-r1_python_compile
-}
-
python_compile_all() {
a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
}
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index a46589e9223..603c6acf96c 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -29,7 +29,9 @@ RDEPEND="
dev-python/pypeg2[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/zipp[${PYTHON_USEDEP}]
"
distutils_enable_tests setup.py
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: d3f3a5f21b4765bd8dbd0d034feaa962095935b0
Author: Stefan Strogin gentoo org>
AuthorDate: Thu Apr 8 02:12:05 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Thu Apr 8 02:33:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f3a5f2
www-client/qutebrowser: sync
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/qutebrowser-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/www-client/qutebrowser/qutebrowser-.ebuild
b/www-client/qutebrowser/qutebrowser-.ebuild
index 255fa35da86..a46589e9223 100644
--- a/www-client/qutebrowser/qutebrowser-.ebuild
+++ b/www-client/qutebrowser/qutebrowser-.ebuild
@@ -70,6 +70,7 @@ python_install_all() {
misc/userscripts/qute-bitwarden \
misc/userscripts/qutedmenu \
misc/userscripts/qute-keepass \
+ misc/userscripts/qute-keepassxc \
misc/userscripts/qute-lastpass \
misc/userscripts/qute-pass \
misc/userscripts/readability \
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
commit: a2df71f74c0d103e97b476f39328afd78beccef8
Author: Stefan Strogin gentoo org>
AuthorDate: Thu Apr 8 01:28:11 2021 +
Commit: Stefan Strogin gentoo org>
CommitDate: Thu Apr 8 01:29:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2df71f7
www-client/qutebrowser: upgrade 2.1.0 -> 2.1.1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/Manifest | 2 +-
.../qutebrowser/{qutebrowser-2.1.0.ebuild => qutebrowser-2.1.1.ebuild} | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 2f0f1322f8a..d703d5dba82 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1 +1 @@
-DIST qutebrowser-2.1.0.tar.gz 6246732 BLAKE2B
8765112265a3b0852ef4f55aae2e69e0d6d623d218ed40c54e0a5d7a76ac9ed83885fa83a3112419f1b01316c3ae06934e89f316d280c2ecfabf70966bde0ddb
SHA512
eec5ebc8cd4ba530cccd8296320768a3824c4f0828c806523acd95762a3dc9a40019b22b9e9219b27d1078648b78f861c6f3792ccfe991c0bdd4b3b95a009c2e
+DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B
941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d
SHA512
85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
diff --git a/www-client/qutebrowser/qutebrowser-2.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
similarity index 98%
rename from www-client/qutebrowser/qutebrowser-2.1.0.ebuild
rename to www-client/qutebrowser/qutebrowser-2.1.1.ebuild
index defe2baa7c4..1260f00c148 100644
--- a/www-client/qutebrowser/qutebrowser-2.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
@@ -62,6 +62,7 @@ python_install_all() {
misc/userscripts/qute-bitwarden \
misc/userscripts/qutedmenu \
misc/userscripts/qute-keepass \
+ misc/userscripts/qute-keepassxc \
misc/userscripts/qute-lastpass \
misc/userscripts/qute-pass \
misc/userscripts/readability \
