1 |
commit: db43f1380900143b4091f85b289d156620f4cf08 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 24 17:13:08 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 24 17:13:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db43f138 |
7 |
|
8 |
dev-lang/yasm: EAPI=7 |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
dev-lang/yasm/yasm-9999.ebuild | 47 ++++++++++++++++++++++++++---------------- |
13 |
1 file changed, 29 insertions(+), 18 deletions(-) |
14 |
|
15 |
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild |
16 |
index df73fec26ad..5be4c7a9719 100644 |
17 |
--- a/dev-lang/yasm/yasm-9999.ebuild |
18 |
+++ b/dev-lang/yasm/yasm-9999.ebuild |
19 |
@@ -1,8 +1,7 @@ |
20 |
# Copyright 1999-2020 Gentoo Authors |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
-EAPI=5 |
24 |
- |
25 |
+EAPI=7 |
26 |
PYTHON_COMPAT=( python2_7 ) |
27 |
|
28 |
inherit autotools eutils python-single-r1 |
29 |
@@ -23,16 +22,25 @@ SLOT="0" |
30 |
IUSE="nls python" |
31 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
32 |
|
33 |
-RDEPEND=" |
34 |
- nls? ( virtual/libintl ) |
35 |
- python? ( ${PYTHON_DEPS} )" |
36 |
-DEPEND=" |
37 |
- ${RDEPEND} |
38 |
+BDEPEND=" |
39 |
nls? ( sys-devel/gettext ) |
40 |
- python? ( $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') )" |
41 |
+ python? ( |
42 |
+ ${PYTHON_DEPS} |
43 |
+ $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') |
44 |
+ ) |
45 |
+" |
46 |
+DEPEND=" |
47 |
+ nls? ( virtual/libintl ) |
48 |
+" |
49 |
+RDEPEND="${DEPEND} |
50 |
+ python? ( ${PYTHON_DEPS} ) |
51 |
+" |
52 |
|
53 |
if [[ ${PV} == 9999* ]]; then |
54 |
- DEPEND="${DEPEND} ${PYTHON_DEPS} app-text/xmlto app-text/docbook-xml-dtd:4.1.2" |
55 |
+ BDEPEND+=" |
56 |
+ app-text/xmlto |
57 |
+ app-text/docbook-xml-dtd:4.1.2 |
58 |
+ " |
59 |
fi |
60 |
|
61 |
pkg_setup() { |
62 |
@@ -40,11 +48,15 @@ pkg_setup() { |
63 |
} |
64 |
|
65 |
src_prepare() { |
66 |
+ default |
67 |
+ |
68 |
if ! [[ ${PV} == 9999* ]]; then |
69 |
sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940 |
70 |
fi |
71 |
+ |
72 |
# ksh doesn't grok $(xxx), makes aclocal fail |
73 |
sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die |
74 |
+ |
75 |
eautoreconf |
76 |
|
77 |
if [[ ${PV} == 9999* ]]; then |
78 |
@@ -53,17 +65,16 @@ src_prepare() { |
79 |
} |
80 |
|
81 |
src_configure() { |
82 |
- if [[ ${PV} == 9999* ]]; then |
83 |
- python_setup |
84 |
- else |
85 |
- use python && python_setup |
86 |
- fi |
87 |
+ use python && python_setup |
88 |
|
89 |
- econf \ |
90 |
- --disable-warnerror \ |
91 |
- $(use_enable python) \ |
92 |
- $(use_enable python python-bindings) \ |
93 |
+ local myconf=( |
94 |
+ --disable-warnerror |
95 |
+ $(use_enable python) |
96 |
+ $(use_enable python python-bindings) |
97 |
$(use_enable nls) |
98 |
+ ) |
99 |
+ |
100 |
+ econf "${myconf[@]}" |
101 |
} |
102 |
|
103 |
src_test() { |