From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1677768-garchives=archives.gentoo.org@lists.gentoo.org>
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 2896115807A
for <garchives@archives.gentoo.org>; Tue, 8 Oct 2024 15:18:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EC760E29E0;
Tue, 8 Oct 2024 15:18:45 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 D6B03E29E0
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Oct 2024 15:18:45 +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 14ABC3431A3
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Oct 2024 15:18:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 74B081293
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Oct 2024 15:18:43 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1728400692.6c7a7f2c99d77a5aed1dc21d9525a5f85fea5968.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ufw/, net-firewall/ufw/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-firewall/ufw/files/ufw-0.36.1-distutils.patch net-firewall/ufw/ufw-0.36.1-r1.ebuild net-firewall/ufw/ufw-0.36.1.ebuild
X-VCS-Directories: net-firewall/ufw/ net-firewall/ufw/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6c7a7f2c99d77a5aed1dc21d9525a5f85fea5968
X-VCS-Branch: master
Date: Tue, 8 Oct 2024 15:18:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7b25c0f7-5309-4de3-aa18-9b11924f1ffc
X-Archives-Hash: ddc5276e3e2a86cb466ec818c5d86038
commit: 6c7a7f2c99d77a5aed1dc21d9525a5f85fea5968
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 8 15:17:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 8 15:18:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7a7f2c
net-firewall/ufw: strip distutils use
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-firewall/ufw/files/ufw-0.36.1-distutils.patch | 14 ++++++++++++++
.../ufw/{ufw-0.36.1.ebuild => ufw-0.36.1-r1.ebuild} | 6 +++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/net-firewall/ufw/files/ufw-0.36.1-distutils.patch b/net-firewall/ufw/files/ufw-0.36.1-distutils.patch
new file mode 100644
index 000000000000..fe7ab3845058
--- /dev/null
+++ b/net-firewall/ufw/files/ufw-0.36.1-distutils.patch
@@ -0,0 +1,14 @@
+https://src.fedoraproject.org/rpms/ufw/raw/rawhide/f/ufw-0.35-distutils-setuptools.patch
+--- a/setup.py
++++ b/setup.py
+@@ -26,8 +26,8 @@
+ #
+
+ from __future__ import print_function
+-from distutils.command.install import install as _install
+-from distutils.core import setup
++from setuptools.command.install import install as _install
++from setuptools import setup
+ import errno
+ import os
+ import re
diff --git a/net-firewall/ufw/ufw-0.36.1.ebuild b/net-firewall/ufw/ufw-0.36.1-r1.ebuild
similarity index 98%
rename from net-firewall/ufw/ufw-0.36.1.ebuild
rename to net-firewall/ufw/ufw-0.36.1-r1.ebuild
index b731656a901d..09b82a5878f8 100644
--- a/net-firewall/ufw/ufw-0.36.1.ebuild
+++ b/net-firewall/ufw/ufw-0.36.1-r1.ebuild
@@ -20,10 +20,8 @@ IUSE="examples ipv6"
RDEPEND="net-firewall/iptables[ipv6(+)?]"
BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/gettext
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ' python3_12)
"
PATCHES=(
@@ -35,6 +33,8 @@ PATCHES=(
"${FILESDIR}/${P}-shebang.patch"
# Fix bash completions, bug #526300
"${FILESDIR}/${PN}-0.36-bash-completion.patch"
+ # Strip distutils use
+ "${FILESDIR}/${PN}-0.36.1-distutils.patch"
)
pkg_pretend() {