1 |
commit: bb71ed3992d7a0aa8bc221b4ee52dd4ef091d191 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Mon Jan 31 18:58:57 2022 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 31 19:00:40 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb71ed39 |
7 |
|
8 |
net-firewall/nftables: revbump, use distutils eclass (bug #832395) |
9 |
|
10 |
Closes: https://bugs.gentoo.org/832395 |
11 |
Copyright: Sony Interactive Entertainment Inc. |
12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
14 |
|
15 |
...ables-1.0.1.ebuild => nftables-1.0.1-r1.ebuild} | 36 +++++++++++++--------- |
16 |
1 file changed, 21 insertions(+), 15 deletions(-) |
17 |
|
18 |
diff --git a/net-firewall/nftables/nftables-1.0.1.ebuild b/net-firewall/nftables/nftables-1.0.1-r1.ebuild |
19 |
similarity index 89% |
20 |
rename from net-firewall/nftables/nftables-1.0.1.ebuild |
21 |
rename to net-firewall/nftables/nftables-1.0.1-r1.ebuild |
22 |
index 944c87fea31f..82923aace969 100644 |
23 |
--- a/net-firewall/nftables/nftables-1.0.1.ebuild |
24 |
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild |
25 |
@@ -1,11 +1,11 @@ |
26 |
-# Copyright 1999-2021 Gentoo Authors |
27 |
+# Copyright 1999-2022 Gentoo Authors |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
EAPI=7 |
31 |
|
32 |
PYTHON_COMPAT=( python3_{7..10} ) |
33 |
- |
34 |
-inherit autotools linux-info python-r1 systemd |
35 |
+DISTUTILS_OPTIONAL=1 |
36 |
+inherit autotools linux-info distutils-r1 systemd |
37 |
|
38 |
DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" |
39 |
HOMEPAGE="https://netfilter.org/projects/nftables/" |
40 |
@@ -56,15 +56,6 @@ PATCHES=( |
41 |
"${FILESDIR}/${PN}-0.9.8-slibtool.patch" |
42 |
) |
43 |
|
44 |
-python_make() { |
45 |
- emake \ |
46 |
- -C py \ |
47 |
- abs_builddir="${S}" \ |
48 |
- DESTDIR="${D}" \ |
49 |
- PYTHON_BIN="${PYTHON}" \ |
50 |
- "${@}" |
51 |
-} |
52 |
- |
53 |
pkg_setup() { |
54 |
if kernel_is ge 3 13; then |
55 |
if use modern-kernel && kernel_is lt 3 18; then |
56 |
@@ -87,6 +78,12 @@ src_prepare() { |
57 |
-i files/osf/Makefile.am || die |
58 |
|
59 |
eautoreconf |
60 |
+ |
61 |
+ if use python; then |
62 |
+ pushd py >/dev/null || die |
63 |
+ distutils-r1_src_prepare |
64 |
+ popd >/dev/null || die |
65 |
+ fi |
66 |
} |
67 |
|
68 |
src_configure() { |
69 |
@@ -104,13 +101,21 @@ src_configure() { |
70 |
$(use_with xtables) |
71 |
) |
72 |
econf "${myeconfargs[@]}" |
73 |
+ |
74 |
+ if use python; then |
75 |
+ pushd py >/dev/null || die |
76 |
+ distutils-r1_src_configure |
77 |
+ popd >/dev/null || die |
78 |
+ fi |
79 |
} |
80 |
|
81 |
src_compile() { |
82 |
default |
83 |
|
84 |
if use python; then |
85 |
- python_foreach_impl python_make |
86 |
+ pushd py >/dev/null || die |
87 |
+ distutils-r1_src_compile |
88 |
+ popd >/dev/null || die |
89 |
fi |
90 |
} |
91 |
|
92 |
@@ -134,8 +139,9 @@ src_install() { |
93 |
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service |
94 |
|
95 |
if use python ; then |
96 |
- python_foreach_impl python_make install |
97 |
- python_foreach_impl python_optimize |
98 |
+ pushd py >/dev/null || die |
99 |
+ distutils-r1_src_install |
100 |
+ popd >/dev/null || die |
101 |
fi |
102 |
|
103 |
find "${ED}" -type f -name "*.la" -delete || die |