sci-geosciences/qgis: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
similarity index 84%
rename from sci-geosciences/qgis/qgis-3.10.2.ebuild
rename to sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
index 232d4a5b49c5fc490d0a03932c585b6b60712735..cc6d86b4b702cf58d84a08f22aebe6bedbd20b90 100644 (file)
--- a/sci-geosciences/qgis/qgis-3.10.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
@@ -73,22 +73,24 @@ COMMON_DEPEND="
        postgres? ( dev-db/postgresql:= )
        python? (
                ${PYTHON_DEPS}
-               dev-python/future[${PYTHON_USEDEP}]
-               dev-python/httplib2[${PYTHON_USEDEP}]
-               dev-python/jinja[${PYTHON_USEDEP}]
-               dev-python/markupsafe[${PYTHON_USEDEP}]
-               dev-python/owslib[${PYTHON_USEDEP}]
-               dev-python/pygments[${PYTHON_USEDEP}]
-               dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-               dev-python/python-dateutil[${PYTHON_USEDEP}]
-               dev-python/pytz[${PYTHON_USEDEP}]
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-               >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-               dev-python/requests[${PYTHON_USEDEP}]
-               dev-python/sip:=[${PYTHON_USEDEP}]
-               dev-python/six[${PYTHON_USEDEP}]
-               >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-               postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+               $(python_gen_cond_dep '
+                       dev-python/future[${PYTHON_MULTI_USEDEP}]
+                       dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+                       dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+                       dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+                       dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+                       dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+                       dev-python/requests[${PYTHON_MULTI_USEDEP}]
+                       dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+                       dev-python/six[${PYTHON_MULTI_USEDEP}]
+                       >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+                       postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+               ')
        )
        qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
        webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )

diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index ae1b97d37ba2d892e039419e538929eb6b8ea416..d5cb18ca5d4520ddb9e71388a283321f32b22524 100644 (file)
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -71,22 +71,24 @@ COMMON_DEPEND="
        postgres? ( dev-db/postgresql:= )
        python? (
                ${PYTHON_DEPS}
-               dev-python/future[${PYTHON_USEDEP}]
-               dev-python/httplib2[${PYTHON_USEDEP}]
-               dev-python/jinja[${PYTHON_USEDEP}]
-               dev-python/markupsafe[${PYTHON_USEDEP}]
-               dev-python/owslib[${PYTHON_USEDEP}]
-               dev-python/pygments[${PYTHON_USEDEP}]
-               dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-               dev-python/python-dateutil[${PYTHON_USEDEP}]
-               dev-python/pytz[${PYTHON_USEDEP}]
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-               >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-               dev-python/requests[${PYTHON_USEDEP}]
-               dev-python/sip:=[${PYTHON_USEDEP}]
-               dev-python/six[${PYTHON_USEDEP}]
-               >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-               postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+               $(python_gen_cond_dep '
+                       dev-python/future[${PYTHON_MULTI_USEDEP}]
+                       dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+                       dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+                       dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+                       dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+                       dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+                       dev-python/requests[${PYTHON_MULTI_USEDEP}]
+                       dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+                       dev-python/six[${PYTHON_MULTI_USEDEP}]
+                       >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+                       postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+               ')
        )
        qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
        webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 14ca3c37210b47966cdd6890ba529fbf986999e0..74129055f6bb8397994fbf4671777d7521663aef 100644 (file)
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -73,22 +73,24 @@ COMMON_DEPEND="
        postgres? ( dev-db/postgresql:= )
        python? (
                ${PYTHON_DEPS}
-               dev-python/future[${PYTHON_USEDEP}]
-               dev-python/httplib2[${PYTHON_USEDEP}]
-               dev-python/jinja[${PYTHON_USEDEP}]
-               dev-python/markupsafe[${PYTHON_USEDEP}]
-               dev-python/owslib[${PYTHON_USEDEP}]
-               dev-python/pygments[${PYTHON_USEDEP}]
-               dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-               dev-python/python-dateutil[${PYTHON_USEDEP}]
-               dev-python/pytz[${PYTHON_USEDEP}]
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-               >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-               dev-python/requests[${PYTHON_USEDEP}]
-               dev-python/sip:=[${PYTHON_USEDEP}]
-               dev-python/six[${PYTHON_USEDEP}]
-               >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-               postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+               $(python_gen_cond_dep '
+                       dev-python/future[${PYTHON_MULTI_USEDEP}]
+                       dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+                       dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+                       dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+                       dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+                       dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+                       dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+                       dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+                       dev-python/requests[${PYTHON_MULTI_USEDEP}]
+                       dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+                       dev-python/six[${PYTHON_MULTI_USEDEP}]
+                       >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+                       postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+               ')
        )
        qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
        webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )