1 |
commit: f000d15e32ab37449521db8932e99691f7cc594c |
2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 25 04:31:51 2021 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 25 04:35:11 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f000d15e |
7 |
|
8 |
app-i18n/nkf: enable py3.{9,10}, add die calls, clean deps |
9 |
|
10 |
Closes: https://bugs.gentoo.org/800602 |
11 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
12 |
|
13 |
app-i18n/nkf/nkf-2.1.5.ebuild | 47 +++++++++++++++++++++---------------------- |
14 |
1 file changed, 23 insertions(+), 24 deletions(-) |
15 |
|
16 |
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild |
17 |
index e937e5a5aeb..7720d4a3fae 100644 |
18 |
--- a/app-i18n/nkf/nkf-2.1.5.ebuild |
19 |
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild |
20 |
@@ -1,10 +1,10 @@ |
21 |
# Copyright 1999-2021 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI="7" |
25 |
-PYTHON_COMPAT=( python3_{7,8} ) |
26 |
+EAPI=7 |
27 |
+ |
28 |
+PYTHON_COMPAT=( python3_{8..10} ) |
29 |
DISTUTILS_OPTIONAL="1" |
30 |
-DISTUTILS_USE_SETUPTOOLS="no" |
31 |
|
32 |
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot |
33 |
|
34 |
@@ -22,13 +22,12 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
35 |
IUSE="perl python l10n_ja" |
36 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
37 |
|
38 |
-RDEPEND="python? ( |
39 |
+RDEPEND="python? ( ${PYTHON_DEPS} )" |
40 |
+DEPEND="${RDEPEND}" |
41 |
+BDEPEND="python? ( |
42 |
${PYTHON_DEPS} |
43 |
- $(python_gen_cond_dep ' |
44 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
45 |
- ') |
46 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
47 |
)" |
48 |
-DEPEND="${RDEPEND}" |
49 |
|
50 |
src_unpack() { |
51 |
use python && vcs-snapshot_src_unpack || default |
52 |
@@ -42,9 +41,9 @@ src_prepare() { |
53 |
if use python; then |
54 |
mv "${WORKDIR}"/${PY_P} NKF.python || die |
55 |
eapply "${FILESDIR}"/${PN}-python.patch |
56 |
- cd NKF.python |
57 |
+ cd NKF.python || die |
58 |
distutils-r1_src_prepare |
59 |
- cd - >/dev/null |
60 |
+ cd - >/dev/null || die |
61 |
fi |
62 |
|
63 |
default |
64 |
@@ -53,37 +52,37 @@ src_prepare() { |
65 |
src_configure() { |
66 |
default |
67 |
if use perl; then |
68 |
- cd NKF.mod |
69 |
+ cd NKF.mod || die |
70 |
perl-module_src_configure |
71 |
- cd - >/dev/null |
72 |
+ cd - >/dev/null || die |
73 |
fi |
74 |
if use python; then |
75 |
- cd NKF.python |
76 |
+ cd NKF.python || die |
77 |
distutils-r1_src_configure |
78 |
- cd - >/dev/null |
79 |
+ cd - >/dev/null || die |
80 |
fi |
81 |
} |
82 |
|
83 |
src_compile() { |
84 |
emake CC="$(tc-getCC)" |
85 |
if use perl; then |
86 |
- cd NKF.mod |
87 |
+ cd NKF.mod || die |
88 |
perl-module_src_compile |
89 |
- cd - >/dev/null |
90 |
+ cd - >/dev/null || die |
91 |
fi |
92 |
if use python; then |
93 |
- cd NKF.python |
94 |
+ cd NKF.python || die |
95 |
distutils-r1_src_compile |
96 |
- cd - >/dev/null |
97 |
+ cd - >/dev/null || die |
98 |
fi |
99 |
} |
100 |
|
101 |
src_test() { |
102 |
default |
103 |
if use perl; then |
104 |
- cd NKF.mod |
105 |
+ cd NKF.mod || die |
106 |
perl-module_src_test |
107 |
- cd - >/dev/null |
108 |
+ cd - >/dev/null || die |
109 |
fi |
110 |
} |
111 |
|
112 |
@@ -98,16 +97,16 @@ src_install() { |
113 |
dodoc ${PN}.doc |
114 |
|
115 |
if use perl; then |
116 |
- cd NKF.mod |
117 |
+ cd NKF.mod || die |
118 |
docinto perl |
119 |
perl-module_src_install |
120 |
- cd - >/dev/null |
121 |
+ cd - >/dev/null || die |
122 |
fi |
123 |
if use python; then |
124 |
- cd NKF.python |
125 |
+ cd NKF.python || die |
126 |
docinto python |
127 |
DOCS= distutils-r1_src_install |
128 |
dodoc CHANGES README.md |
129 |
- cd - >/dev/null |
130 |
+ cd - >/dev/null || die |
131 |
fi |
132 |
} |