commit:     a6360b5dbc79543a3ffb692e736dcc9705e39ace
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Tue Aug 15 17:16:58 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 16:39:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6360b5d

media-gfx/hydrus: Update 9999

Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/32330
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-9999.ebuild | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild 
b/media-gfx/hydrus/hydrus-9999.ebuild
index 851d373d97a8..6c1cb6719c2e 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -34,11 +34,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 # RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
+# Python libraries with no specific requirements
+# Python libraries with specific version, slot, or use requirements
+# Non-python dependencies
 RDEPEND="
        ${PYTHON_DEPS}
        $(python_gen_cond_dep '
+               dev-python/beautifulsoup4[${PYTHON_USEDEP}]
                dev-python/cbor2[${PYTHON_USEDEP}]
                dev-python/chardet[${PYTHON_USEDEP}]
                dev-python/cloudscraper[${PYTHON_USEDEP}]
@@ -48,19 +50,18 @@ RDEPEND="
                dev-python/pillow[${PYTHON_USEDEP},lcms]
                dev-python/psutil[${PYTHON_USEDEP}]
                dev-python/pyopenssl[${PYTHON_USEDEP}]
-               dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
                dev-python/python-mpv[${PYTHON_USEDEP}]
                dev-python/pyyaml[${PYTHON_USEDEP}]
                dev-python/requests[${PYTHON_USEDEP}]
                dev-python/send2trash[${PYTHON_USEDEP}]
                dev-python/service-identity[${PYTHON_USEDEP}]
-               dev-python/six[${PYTHON_USEDEP}]
                dev-python/twisted[${PYTHON_USEDEP}]
+
+               dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
+               || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+
                media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
                media-video/ffmpeg
-
-               >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-               dev-python/beautifulsoup4[${PYTHON_USEDEP}]
        ')
 "
 BDEPEND="
@@ -69,8 +70,6 @@ BDEPEND="
                test? (
                        dev-python/httmock[${PYTHON_USEDEP}]
                        dev-python/mock[${PYTHON_USEDEP}]
-
-                       
dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
                )
        ')
 "
@@ -144,7 +143,7 @@ src_install() {
 
 pkg_postinst() {
        optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-       optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
        optfeature "memory compression in the client" "dev-python/lz4"
        optfeature "SOCKS proxy support" "dev-python/requests[socks5]" 
"dev-python/PySocks"
+       optfeature "bandwidth charts support" "dev-python/pyside2[charts]" 
"dev-python/pyside6[charts]"
 }

Reply via email to