| 1 |
commit: 101f66556ddc3d8d72fbf0e035240e597005f79c |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 24 16:49:32 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 24 16:52:57 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=101f6655 |
| 7 |
|
| 8 |
dev-lang/yasm: use python-single-r1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/710216 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/yasm/yasm-1.3.0.ebuild | 10 +++++++--- |
| 14 |
dev-lang/yasm/yasm-9999.ebuild | 10 +++++++--- |
| 15 |
2 files changed, 14 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/yasm/yasm-1.3.0.ebuild b/dev-lang/yasm/yasm-1.3.0.ebuild |
| 18 |
index e1ef59791ee..53906bb765c 100644 |
| 19 |
--- a/dev-lang/yasm/yasm-1.3.0.ebuild |
| 20 |
+++ b/dev-lang/yasm/yasm-1.3.0.ebuild |
| 21 |
@@ -1,11 +1,11 @@ |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=5 |
| 27 |
|
| 28 |
PYTHON_COMPAT=( python2_7 ) |
| 29 |
|
| 30 |
-inherit python-r1 |
| 31 |
+inherit python-single-r1 |
| 32 |
|
| 33 |
DESCRIPTION="An assembler for x86 and x86_64 instruction sets" |
| 34 |
HOMEPAGE="http://yasm.tortall.net/" |
| 35 |
@@ -23,7 +23,11 @@ RDEPEND=" |
| 36 |
DEPEND=" |
| 37 |
${RDEPEND} |
| 38 |
nls? ( sys-devel/gettext ) |
| 39 |
- python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )" |
| 40 |
+ python? ( $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') )" |
| 41 |
+ |
| 42 |
+pkg_setup() { |
| 43 |
+ : # Avoid python-single-r1_pkg_setup |
| 44 |
+} |
| 45 |
|
| 46 |
src_configure() { |
| 47 |
use python && python_setup |
| 48 |
|
| 49 |
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild |
| 50 |
index 1dc81bc993d..bb7aeeb4452 100644 |
| 51 |
--- a/dev-lang/yasm/yasm-9999.ebuild |
| 52 |
+++ b/dev-lang/yasm/yasm-9999.ebuild |
| 53 |
@@ -1,11 +1,11 @@ |
| 54 |
-# Copyright 1999-2017 Gentoo Foundation |
| 55 |
+# Copyright 1999-2020 Gentoo Authors |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
PYTHON_COMPAT=( python2_7 ) |
| 61 |
|
| 62 |
-inherit autotools eutils python-r1 |
| 63 |
+inherit autotools eutils python-single-r1 |
| 64 |
|
| 65 |
if [[ ${PV} == 9999* ]] ; then |
| 66 |
EGIT_REPO_URI="https://github.com/yasm/yasm.git" |
| 67 |
@@ -29,12 +29,16 @@ RDEPEND=" |
| 68 |
DEPEND=" |
| 69 |
${RDEPEND} |
| 70 |
nls? ( sys-devel/gettext ) |
| 71 |
- python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )" |
| 72 |
+ python? ( $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') )" |
| 73 |
|
| 74 |
if [[ ${PV} == 9999* ]]; then |
| 75 |
DEPEND="${DEPEND} ${PYTHON_DEPS} app-text/xmlto app-text/docbook-xml-dtd:4.1.2" |
| 76 |
fi |
| 77 |
|
| 78 |
+pkg_setup() { |
| 79 |
+ : # Avoid python-single-r1_pkg_setup |
| 80 |
+} |
| 81 |
+ |
| 82 |
src_prepare() { |
| 83 |
if ! [[ ${PV} == 9999* ]]; then |
| 84 |
sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940 |
Archives