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 9223115800F for ; Fri, 6 Jan 2023 15:37:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B28D9E07D8; Fri, 6 Jan 2023 15:37:24 +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 9861EE07D8 for ; Fri, 6 Jan 2023 15:37:24 +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 C5282340C74 for ; Fri, 6 Jan 2023 15:37:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CF5F7FC for ; Fri, 6 Jan 2023 15:37:22 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1673019226.e6b4565e4f32d431e10922941fddb71b1e464173.ajak@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.15.0.ebuild net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild X-VCS-Directories: net-misc/openvswitch/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: e6b4565e4f32d431e10922941fddb71b1e464173 X-VCS-Branch: master Date: Fri, 6 Jan 2023 15:37:22 +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: f7c987e5-c435-4179-9ce9-1b2595c86ee8 X-Archives-Hash: 65f473d1e0d147e34b1e4340fe63a395 commit: e6b4565e4f32d431e10922941fddb71b1e464173 Author: John Helmert III gentoo org> AuthorDate: Fri Jan 6 15:32:18 2023 +0000 Commit: John Helmert III gentoo org> CommitDate: Fri Jan 6 15:33:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b4565e net-misc/openvswitch: fix installation with merged-usr Closes: https://bugs.gentoo.org/889846 Signed-off-by: John Helmert III gentoo.org> net-misc/openvswitch/openvswitch-2.15.0.ebuild | 7 ++++++- net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild index 83ea5328d7d0..a81e57ca0d58 100644 --- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -90,6 +90,11 @@ src_install() { local SCRIPT if use monitor; then + # ovs-bugtool is installed to sbin by the build system, but we + # install it to bin below, and these clash in merged-usr + # https://bugs.gentoo.org/889846 + rm "${ED}"/usr/sbin/ovs-bugtool || die + 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}" diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild index 963f20e12233..2029ed52fd05 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -103,6 +103,11 @@ src_install() { local SCRIPT if use monitor; then + # ovs-bugtool is installed to sbin by the build system, but we + # install it to bin below, and these clash in merged-usr + # https://bugs.gentoo.org/889846 + rm "${ED}"/usr/sbin/ovs-bugtool || die + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do python_doscript utilities/"${SCRIPT}" done