commit: 101f66556ddc3d8d72fbf0e035240e597005f79c Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Apr 24 16:49:32 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Apr 24 16:52:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=101f6655
dev-lang/yasm: use python-single-r1 Closes: https://bugs.gentoo.org/710216 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-lang/yasm/yasm-1.3.0.ebuild | 10 +++++++--- dev-lang/yasm/yasm-9999.ebuild | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dev-lang/yasm/yasm-1.3.0.ebuild b/dev-lang/yasm/yasm-1.3.0.ebuild index e1ef59791ee..53906bb765c 100644 --- a/dev-lang/yasm/yasm-1.3.0.ebuild +++ b/dev-lang/yasm/yasm-1.3.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit python-r1 +inherit python-single-r1 DESCRIPTION="An assembler for x86 and x86_64 instruction sets" HOMEPAGE="http://yasm.tortall.net/"; @@ -23,7 +23,11 @@ RDEPEND=" DEPEND=" ${RDEPEND} nls? ( sys-devel/gettext ) - python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )" + python? ( $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') )" + +pkg_setup() { + : # Avoid python-single-r1_pkg_setup +} src_configure() { use python && python_setup diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild index 1dc81bc993d..bb7aeeb4452 100644 --- a/dev-lang/yasm/yasm-9999.ebuild +++ b/dev-lang/yasm/yasm-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit autotools eutils python-r1 +inherit autotools eutils python-single-r1 if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="https://github.com/yasm/yasm.git"; @@ -29,12 +29,16 @@ RDEPEND=" DEPEND=" ${RDEPEND} nls? ( sys-devel/gettext ) - python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )" + python? ( $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') )" if [[ ${PV} == 9999* ]]; then DEPEND="${DEPEND} ${PYTHON_DEPS} app-text/xmlto app-text/docbook-xml-dtd:4.1.2" fi +pkg_setup() { + : # Avoid python-single-r1_pkg_setup +} + src_prepare() { if ! [[ ${PV} == 9999* ]]; then sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940
