[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/

["John Helmert III" <ajak@gentoo.org>]

commit:     e6b4565e4f32d431e10922941fddb71b1e464173
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 15:32:18 2023 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> 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 <ajak <AT> 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