From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1421130-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 A7553158094
for <garchives@archives.gentoo.org>; Sun, 24 Jul 2022 00:37:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A30B2E0D34;
Sun, 24 Jul 2022 00:37:01 +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 58422E0D34
for <gentoo-commits@lists.gentoo.org>; Sun, 24 Jul 2022 00:37:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 4131F340B35
for <gentoo-commits@lists.gentoo.org>; Sun, 24 Jul 2022 00:37:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CFD2254A
for <gentoo-commits@lists.gentoo.org>; Sun, 24 Jul 2022 00:36:58 +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: <1658622999.f20c05d22271e90531a17a04ea279dcb126c7675.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild
X-VCS-Directories: net-misc/openvswitch/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: f20c05d22271e90531a17a04ea279dcb126c7675
X-VCS-Branch: master
Date: Sun, 24 Jul 2022 00:36:58 +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: e31fc434-0206-4f7b-b4a8-c4825f7d215e
X-Archives-Hash: ecbc4742e2a9cca2549ff8954442b75d
commit: f20c05d22271e90531a17a04ea279dcb126c7675
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 00:36:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 00:36:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20c05d2
net-misc/openvswitch: fix installed script Python shebangs
Closes: https://bugs.gentoo.org/860240
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild
index 4f04cb37a9a8..0eacedda4239 100644
--- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
MODULES_OPTIONAL_USE="modules"
PYTHON_COMPAT=( python3_{8..11} )
-inherit autotools linux-info linux-mod python-r1 systemd tmpfiles
+inherit autotools linux-info linux-mod python-single-r1 systemd tmpfiles
DESCRIPTION="Production quality, multilayer virtual switch"
HOMEPAGE="https://www.openvswitch.org"
@@ -20,9 +20,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# Check python/ovs/version.py in tarball for dev-python/ovs dep
RDEPEND="${PYTHON_DEPS}
- ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}]
- dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ ')
debug? ( dev-lang/perl )
ssl? ( dev-libs/openssl:= )"
DEPEND="${RDEPEND}
@@ -76,7 +78,8 @@ src_configure() {
local linux_config
use modules && linux_config="--with-linux=${KV_OUT_DIR}"
- CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \
+ # Need PYTHON3 variable for bug #860240
+ PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \
--with-rundir=/var/run/openvswitch \
--with-logdir=/var/log/openvswitch \
--with-pkidir=/etc/ssl/openvswitch \
@@ -97,8 +100,7 @@ src_install() {
local SCRIPT
if use monitor; then
for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
- python_foreach_impl python_doscript utilities/"${SCRIPT}"
+ python_doscript utilities/"${SCRIPT}"
done
rm -r "${ED}"/usr/share/openvswitch/python || die
fi