From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/
Date: Sat, 18 Mar 2023 23:22:43 +0000 (UTC) [thread overview]
Message-ID: <1679181732.3d8762f07bd8ae6779b5011f34b0f497c4947c58.ionen@gentoo> (raw)
commit: 3d8762f07bd8ae6779b5011f34b0f497c4947c58
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 22:10:33 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 23:22:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d8762f0
www-client/qutebrowser: drop 3.0.0_pre9999
The qt6-v2 branch was merged in the main branch making this
obsolete. Use normal 9999 if want USE=qt6 (or at least until
3.0.0 is released).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../qutebrowser/qutebrowser-3.0.0_pre9999.ebuild | 187 ---------------------
1 file changed, 187 deletions(-)
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
deleted file mode 100644
index 0de37e2649d8..000000000000
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.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} == *9999 ]]; 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? ( <www-plugins/pdfjs-3 )
- )
- 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}]
- qt6? ( dev-python/PyQt6[testlib] )
- !qt6? ( dev-python/PyQt5[testlib] )
- )
- ')"
-[[ ${PV} == *9999 ]] && BDEPEND+=" app-text/asciidoc"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- distutils-r1_src_prepare
-
- if use pdf; then
- sed -e '/^content.pdfjs:/,+1s/false/true/' \
- -i ${PN}/config/configdata.yml || die
- fi
-
- if use widevine && use prefix; then
- # hack: QtWebEngine knows Gentoo's widevine, but not with ${EPREFIX}
- 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
- fi
-
- # ensure run the requested Qt backend
- 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} == *9999 ]]; then
- # call asciidoc(1) rather than the single target python module
- sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \
- -i scripts/asciidoc2html.py || die
-
- "${EPYTHON}" scripts/asciidoc2html.py || die
- fi
-
- # 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
- if [[ ${PV} == *9999 ]]; then
- rm tests/unit/scripts/test_run_vulture.py || die
- else
- rm tests/unit/scripts/test_problemmatchers.py || die
- fi
-}
-
-python_test() {
- local -x PYTEST_QT_API=pyqt$(usex qt6 6 5)
-
- 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
- # 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 " https://github.com/qutebrowser/qutebrowser/tree/qt6-v2 [used branch]"
- 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
-
- # 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
-}
next reply other threads:[~2023-03-18 23:22 UTC|newest]
Thread overview: 192+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-18 23:22 Ionen Wolkens [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-15 2:31 [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/ Ionen Wolkens
2024-11-15 2:23 Ionen Wolkens
2024-11-13 10:16 Ionen Wolkens
2024-11-13 10:04 Ionen Wolkens
2024-11-13 10:04 Ionen Wolkens
2024-11-04 16:15 Ionen Wolkens
2024-10-23 7:13 Joonas Niilola
2024-10-12 21:14 Ionen Wolkens
2024-09-03 12:31 Ionen Wolkens
2024-09-03 12:31 Ionen Wolkens
2024-07-05 14:03 Arthur Zamarin
2024-06-25 16:36 Ionen Wolkens
2024-06-24 8:21 Joonas Niilola
2024-06-18 18:14 Ionen Wolkens
2024-06-03 19:27 Ionen Wolkens
2024-06-03 19:27 Ionen Wolkens
2024-04-15 1:17 Ionen Wolkens
2024-03-27 11:01 Ionen Wolkens
2024-03-27 11:01 Ionen Wolkens
2024-02-09 9:09 Ionen Wolkens
2024-01-09 14:08 Ionen Wolkens
2024-01-08 23:03 Ionen Wolkens
2024-01-08 12:59 Ionen Wolkens
2023-12-16 12:06 Ionen Wolkens
2023-12-08 15:55 Ionen Wolkens
2023-11-30 11:52 Ionen Wolkens
2023-11-27 8:47 Ionen Wolkens
2023-11-06 14:07 Ionen Wolkens
2023-11-01 14:03 Ionen Wolkens
2023-10-20 1:15 Ionen Wolkens
2023-10-10 20:20 Ionen Wolkens
2023-09-17 1:59 Ionen Wolkens
2023-09-15 6:08 Ionen Wolkens
2023-08-21 16:08 Ionen Wolkens
2023-08-18 20:10 Ionen Wolkens
2023-08-18 19:51 Ionen Wolkens
2023-08-18 14:34 Ionen Wolkens
2023-08-18 14:34 Ionen Wolkens
2023-08-18 14:34 Ionen Wolkens
2023-08-17 0:21 Ionen Wolkens
2023-07-25 0:10 Ionen Wolkens
2023-07-23 16:07 Ionen Wolkens
2023-07-22 12:28 Ionen Wolkens
2023-03-18 23:22 Ionen Wolkens
2023-03-18 23:22 Ionen Wolkens
2023-03-14 5:18 Ionen Wolkens
2023-03-11 14:09 Ionen Wolkens
2023-03-11 14:09 Ionen Wolkens
2023-03-09 20:13 Ionen Wolkens
2023-03-05 16:05 Ionen Wolkens
2023-02-17 22:58 Ionen Wolkens
2023-02-17 22:58 Ionen Wolkens
2023-01-20 22:48 Ionen Wolkens
2023-01-14 12:07 Ionen Wolkens
2022-12-17 11:45 Ionen Wolkens
2022-11-04 4:14 Ionen Wolkens
2022-09-07 7:51 Michał Górny
2022-08-17 15:48 Ionen Wolkens
2022-08-03 0:22 Ionen Wolkens
2022-07-20 6:47 Ionen Wolkens
2022-07-12 22:19 Ionen Wolkens
2022-07-11 22:57 Ionen Wolkens
2022-07-07 4:39 Ionen Wolkens
2022-06-22 18:26 Ionen Wolkens
2022-06-22 18:26 Ionen Wolkens
2022-06-18 9:31 Ionen Wolkens
2022-06-16 13:16 Ionen Wolkens
2022-06-11 13:18 Ionen Wolkens
2022-06-09 3:50 Ionen Wolkens
2022-05-26 15:00 Ionen Wolkens
2022-05-26 15:00 Ionen Wolkens
2022-04-29 11:23 Ionen Wolkens
2022-04-21 4:41 Ionen Wolkens
2022-04-01 17:46 Ionen Wolkens
2022-01-20 18:10 Ionen Wolkens
2021-11-21 2:38 Ionen Wolkens
2021-11-21 2:38 Ionen Wolkens
2021-11-21 2:38 Ionen Wolkens
2021-10-22 14:35 Agostino Sarubbo
2021-10-22 7:26 Ionen Wolkens
2021-10-21 21:11 Ionen Wolkens
2021-10-21 21:11 Ionen Wolkens
2021-10-21 21:11 Ionen Wolkens
2021-10-15 15:53 Ionen Wolkens
2021-10-15 15:53 Ionen Wolkens
2021-10-15 15:53 Ionen Wolkens
2021-10-15 15:53 Ionen Wolkens
2021-10-15 15:53 Ionen Wolkens
2021-10-15 15:53 Ionen Wolkens
2021-10-14 10:00 Michał Górny
2021-09-21 6:33 Ionen Wolkens
2021-09-21 6:33 Ionen Wolkens
2021-09-21 6:33 Ionen Wolkens
2021-06-30 2:05 Stefan Strogin
2021-06-18 11:40 Stefan Strogin
2021-06-18 11:40 Stefan Strogin
2021-05-22 15:28 Stefan Strogin
2021-05-22 2:40 Stefan Strogin
2021-04-27 10:54 Stefan Strogin
2021-04-22 22:30 Stefan Strogin
2021-04-08 2:33 Stefan Strogin
2021-04-08 1:31 Stefan Strogin
2021-03-20 8:25 Joonas Niilola
2021-03-12 23:45 Stefan Strogin
2021-03-12 14:50 Joonas Niilola
2021-02-15 19:12 Stefan Strogin
2021-01-06 12:48 Stefan Strogin
2021-01-06 9:41 Stefan Strogin
2020-12-24 8:48 Michał Górny
2020-12-06 0:48 Stefan Strogin
2020-12-06 0:48 Stefan Strogin
2020-10-17 23:25 Stefan Strogin
2020-10-17 23:25 Stefan Strogin
2020-09-07 8:55 David Seifert
2020-08-30 16:08 Sam James
2020-08-12 2:21 Stefan Strogin
2020-08-12 2:08 Stefan Strogin
2020-07-09 17:16 Stefan Strogin
2020-07-09 17:16 Stefan Strogin
2020-06-11 2:21 Stefan Strogin
2020-05-12 13:57 Joonas Niilola
2020-05-12 13:57 Joonas Niilola
2020-05-12 13:57 Joonas Niilola
2020-02-28 5:37 Joonas Niilola
2020-02-28 5:37 Joonas Niilola
2020-02-28 5:37 Joonas Niilola
2020-02-28 5:37 Joonas Niilola
2020-02-28 5:37 Joonas Niilola
2020-01-03 9:15 Joonas Niilola
2019-12-27 21:32 Sebastian Pipping
2019-12-10 17:25 Joonas Niilola
2019-12-10 17:25 Joonas Niilola
2019-12-10 17:25 Joonas Niilola
2019-12-10 17:25 Joonas Niilola
2019-12-10 17:25 Joonas Niilola
2019-11-17 22:10 Tim Harder
2019-09-04 14:21 Justin Bronder
2019-07-18 22:22 Justin Bronder
2019-06-18 17:24 Justin Bronder
2019-05-25 3:32 Justin Bronder
2019-04-09 21:41 Justin Bronder
2019-03-20 18:18 Justin Bronder
2019-03-11 14:11 Justin Bronder
2019-02-26 18:40 Justin Bronder
2019-02-26 2:27 Justin Bronder
2019-02-26 2:22 Justin Bronder
2019-02-26 2:17 Justin Bronder
2019-01-31 2:44 Justin Bronder
2019-01-31 2:43 Justin Bronder
2018-10-29 15:03 Justin Bronder
2018-10-10 15:08 Justin Bronder
2018-10-10 15:08 Justin Bronder
2018-10-04 16:11 Justin Bronder
2018-09-03 2:28 Justin Bronder
2018-07-11 15:23 Justin Bronder
2018-07-03 19:38 Justin Bronder
2018-06-22 14:21 Justin Bronder
2018-06-11 14:31 Justin Bronder
2018-05-29 14:37 Justin Bronder
2018-05-04 15:07 Justin Bronder
2018-03-19 14:23 Justin Bronder
2018-03-12 14:29 Justin Bronder
2018-01-24 15:35 Justin Bronder
2018-01-16 16:17 Justin Bronder
2017-11-28 13:00 Justin Bronder
2017-11-04 23:17 Justin Bronder
2017-11-04 23:17 Justin Bronder
2017-10-29 16:31 Justin Bronder
2017-10-26 21:02 Justin Bronder
2017-10-26 17:59 Justin Bronder
2017-10-26 17:44 Justin Bronder
2017-10-26 17:44 Justin Bronder
2017-10-26 17:44 Justin Bronder
2017-10-26 17:44 Justin Bronder
2017-07-14 21:03 Michał Górny
2017-05-29 13:37 Patrice Clement
2017-04-12 21:06 Michał Górny
2017-01-16 18:46 Tim Harder
2017-01-15 17:21 Patrice Clement
2016-12-09 8:34 Tim Harder
2016-11-12 5:03 Tim Harder
2016-08-06 2:18 Tim Harder
2016-07-12 17:55 Tim Harder
2016-07-12 17:55 Tim Harder
2016-05-05 5:33 Tim Harder
2016-04-12 3:14 Tim Harder
2016-04-09 2:15 Tim Harder
2016-03-15 7:38 Tim Harder
2016-03-11 3:15 Tim Harder
2015-10-26 13:38 Ian Delaney
2015-10-26 9:08 Ian Delaney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1679181732.3d8762f07bd8ae6779b5011f34b0f497c4947c58.ionen@gentoo \
--to=ionen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox