commit: 7e4731691bf7d76ad6530951e10fb3954e16c9d8 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Thu Sep 16 01:05:18 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 16 01:25:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e473169
sci-libs/libsigrokdecode: Pick the right python3-embed version Closes: https://bugs.gentoo.org/794592 Closes: https://bugs.gentoo.org/799614 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> ...-0.5.3.ebuild => libsigrokdecode-0.5.3-r1.ebuild} | 20 +++++++++----------- sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild | 18 ++++++++---------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild similarity index 64% rename from sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild rename to sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild index 64dcf8d7c68..94adf3d75fe 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild +++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit python-single-r1 +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit autotools python-single-r1 if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 autotools + inherit git-r3 else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"; KEYWORDS="~amd64 ~x86" @@ -32,17 +32,15 @@ BDEPEND=" src_prepare() { default - [[ ${PV} == *9999* ]] && eautoreconf - # Only a test program (not installed, and not used by src_test) - # is used by libsigrok, so disable it to avoid the compile. - sed -i \ - -e '/build_runtc=/s:yes:no:' \ - configure || die + # bug #794592 + sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac || die + + eautoreconf } src_configure() { - econf $(use_enable static-libs static) + econf $(use_enable static-libs static) PYTHON3="${PYTHON}" } src_test() { diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild index a5914c13031..71b414a4c1a 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild +++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild @@ -3,12 +3,12 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit python-single-r1 +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit autotools python-single-r1 if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 autotools + inherit git-r3 else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"; KEYWORDS="~amd64 ~x86" @@ -32,17 +32,15 @@ BDEPEND=" src_prepare() { default - [[ ${PV} == *9999* ]] && eautoreconf - # Only a test program (not installed, and not used by src_test) - # is used by libsigrok, so disable it to avoid the compile. - sed -i \ - -e '/build_runtc=/s:yes:no:' \ - configure || die + # bug #794592 + sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac || die + + eautoreconf } src_configure() { - econf $(use_enable static-libs static) + econf $(use_enable static-libs static) PYTHON3="${PYTHON}" } src_test() {
