From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED677158087 for ; Mon, 31 Jan 2022 19:00:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE1042BC00B; Mon, 31 Jan 2022 19:00:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3D772BC00B for ; Mon, 31 Jan 2022 19:00:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8591C3430F9 for ; Mon, 31 Jan 2022 19:00:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F003E2AE for ; Mon, 31 Jan 2022 19:00:46 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1643655640.b7fb1e25477f431c2a5b1cfa2ba3362e86a44fdc.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/nftables/nftables-9999.ebuild X-VCS-Directories: net-firewall/nftables/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: b7fb1e25477f431c2a5b1cfa2ba3362e86a44fdc X-VCS-Branch: master Date: Mon, 31 Jan 2022 19:00:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d5593dac-6385-4255-af19-c97adbcbde79 X-Archives-Hash: 132239a8d964baf3293a237c62d03854 commit: b7fb1e25477f431c2a5b1cfa2ba3362e86a44fdc Author: Patrick McLean sony com> AuthorDate: Mon Jan 31 19:00:26 2022 +0000 Commit: Patrick McLean gentoo org> CommitDate: Mon Jan 31 19:00:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7fb1e25 net-firewall/nftables: Sync 9999 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Patrick McLean gentoo.org> net-firewall/nftables/nftables-9999.ebuild | 36 +++++++++++++++++------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild index 944c87fea31f..82923aace969 100644 --- a/net-firewall/nftables/nftables-9999.ebuild +++ b/net-firewall/nftables/nftables-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7..10} ) - -inherit autotools linux-info python-r1 systemd +DISTUTILS_OPTIONAL=1 +inherit autotools linux-info distutils-r1 systemd DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" HOMEPAGE="https://netfilter.org/projects/nftables/" @@ -56,15 +56,6 @@ PATCHES=( "${FILESDIR}/${PN}-0.9.8-slibtool.patch" ) -python_make() { - emake \ - -C py \ - abs_builddir="${S}" \ - DESTDIR="${D}" \ - PYTHON_BIN="${PYTHON}" \ - "${@}" -} - pkg_setup() { if kernel_is ge 3 13; then if use modern-kernel && kernel_is lt 3 18; then @@ -87,6 +78,12 @@ src_prepare() { -i files/osf/Makefile.am || die eautoreconf + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi } src_configure() { @@ -104,13 +101,21 @@ src_configure() { $(use_with xtables) ) econf "${myeconfargs[@]}" + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_configure + popd >/dev/null || die + fi } src_compile() { default if use python; then - python_foreach_impl python_make + pushd py >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die fi } @@ -134,8 +139,9 @@ src_install() { systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service if use python ; then - python_foreach_impl python_make install - python_foreach_impl python_optimize + pushd py >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die fi find "${ED}" -type f -name "*.la" -delete || die