From: Mike Gilbert <floppym@gentoo.org>
Date: Fri, 24 Apr 2020 16:49:32 +0000 (-0400)
Subject: dev-lang/yasm: use python-single-r1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=101f66556ddc3d8d72fbf0e035240e597005f79c;p=gentoo.git

dev-lang/yasm: use python-single-r1

Closes: https://bugs.gentoo.org/710216
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/dev-lang/yasm/yasm-1.3.0.ebuild b/dev-lang/yasm/yasm-1.3.0.ebuild
index e1ef59791ee0..53906bb765c5 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 1dc81bc993d4..bb7aeeb44525 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