| 1 |
commit: 18786cdbe9d22955bf2ac9f1b52968f9ae74b6c8 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 19:06:18 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:35:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18786cdb |
| 7 |
|
| 8 |
sci-libs/libsigrok: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 13 ++++++++++--- |
| 13 |
sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 13 ++++++++++--- |
| 14 |
2 files changed, 20 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild |
| 17 |
index 4b21e16866f..a1816ed7b3c 100644 |
| 18 |
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild |
| 19 |
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild |
| 20 |
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )" |
| 21 |
LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)] |
| 22 |
>=dev-libs/libzip-0.8:=[static-libs(+)] |
| 23 |
cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) |
| 24 |
- python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] ) |
| 25 |
+ python? ( |
| 26 |
+ ${PYTHON_DEPS} |
| 27 |
+ $(python_gen_cond_dep ' |
| 28 |
+ >=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}] |
| 29 |
+ ') |
| 30 |
+ ) |
| 31 |
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) |
| 32 |
parport? ( sys-libs/libieee1284[static-libs(+)] ) |
| 33 |
serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) |
| 34 |
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]} |
| 35 |
>=virtual/jdk-1.4 |
| 36 |
) |
| 37 |
python? ( |
| 38 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 39 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 40 |
+ $(python_gen_cond_dep ' |
| 41 |
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}] |
| 42 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 43 |
+ ') |
| 44 |
>=dev-lang/swig-3.0.6 |
| 45 |
) |
| 46 |
virtual/pkgconfig" |
| 47 |
|
| 48 |
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild |
| 49 |
index af1e257b901..de2b5e3a0ce 100644 |
| 50 |
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild |
| 51 |
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild |
| 52 |
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )" |
| 53 |
LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)] |
| 54 |
>=dev-libs/libzip-0.8:=[static-libs(+)] |
| 55 |
cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) |
| 56 |
- python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] ) |
| 57 |
+ python? ( |
| 58 |
+ ${PYTHON_DEPS} |
| 59 |
+ $(python_gen_cond_dep ' |
| 60 |
+ >=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}] |
| 61 |
+ ') |
| 62 |
+ ) |
| 63 |
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) |
| 64 |
parport? ( sys-libs/libieee1284[static-libs(+)] ) |
| 65 |
serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) |
| 66 |
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]} |
| 67 |
>=virtual/jdk-1.4 |
| 68 |
) |
| 69 |
python? ( |
| 70 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 71 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 72 |
+ $(python_gen_cond_dep ' |
| 73 |
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}] |
| 74 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 75 |
+ ') |
| 76 |
>=dev-lang/swig-3.0.6 |
| 77 |
) |
| 78 |
virtual/pkgconfig" |
Archives