From 18786cdbe9d22955bf2ac9f1b52968f9ae74b6c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 20:06:18 +0100 Subject: [PATCH] sci-libs/libsigrok: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 13 ++++++++++--- sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild index 4b21e16866f8..a1816ed7b3c5 100644 --- 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 af1e257b9010..de2b5e3a0cee 100644 --- 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" -- 2.26.2