sci-libs/libsigrok: Switch to PYTHON_MULTI_USEDEP API

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

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index 4b21e16866f8ff9c63884398eb344f8f1dca09d9..a1816ed7b3c576d7d996202f8738e1883855547c 100644 (file)
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
        >=dev-libs/libzip-0.8:=[static-libs(+)]
        cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-       python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
+       python? (
+               ${PYTHON_DEPS}
+               $(python_gen_cond_dep '
+                       >=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
        parport? ( sys-libs/libieee1284[static-libs(+)] )
        serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
                >=virtual/jdk-1.4
        )
        python? (
-               dev-python/setuptools[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               ')
                >=dev-lang/swig-3.0.6
        )
        virtual/pkgconfig"

diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index af1e257b9010dbf3ecbafa700968c2958d839249..de2b5e3a0ceec2dcf96f27316f63ee4eef091434 100644 (file)
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
        >=dev-libs/libzip-0.8:=[static-libs(+)]
        cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-       python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
+       python? (
+               ${PYTHON_DEPS}
+               $(python_gen_cond_dep '
+                       >=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
        parport? ( sys-libs/libieee1284[static-libs(+)] )
        serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
                >=virtual/jdk-1.4
        )
        python? (
-               dev-python/setuptools[${PYTHON_USEDEP}]
-               dev-python/numpy[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep '
+                       dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+                       dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+               ')
                >=dev-lang/swig-3.0.6
        )
        virtual/pkgconfig"