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