[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

[Andreas Sturmlechner]

commit:     03b3c1e088fef1a1327fd46a8b46ea6021553307
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 22:51:59 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  6 18:15:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b3c1e0

sci-libs/libsigrok: Run python_setup conditionally in pkg_setup

...instead of unconditionally in src_configure.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 18ae0ba31b3..476037f9317 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -68,6 +68,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 S="${WORKDIR}"/${P}
 
 pkg_setup() {
+       use python && python_setup
        use ruby && ruby-ng_pkg_setup
        java-pkg-opt-2_pkg_setup
 }
@@ -116,7 +117,6 @@ each_python_configure() {
 }
 
 src_configure() {
-       python_setup
        sigrok_src_configure --disable-ruby --disable-python
        use ruby && ruby-ng_src_configure
        use python && python_foreach_impl each_python_configure

diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild 
b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 065e6b2667f..ce8dd772ca1 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -68,6 +68,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 S="${WORKDIR}"/${P}
 
 pkg_setup() {
+       use python && python_setup
        use ruby && ruby-ng_pkg_setup
        java-pkg-opt-2_pkg_setup
 }
@@ -116,7 +117,6 @@ each_python_configure() {
 }
 
 src_configure() {
-       python_setup
        sigrok_src_configure --disable-ruby --disable-python
        use ruby && ruby-ng_src_configure
        use python && python_foreach_impl each_python_configure