From 28267a5e528b273fbd1b0f5f52ecaab4b03016ab Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 24 Jul 2022 08:52:43 +0100
Subject: gentoo auto-resync : 24:07:2022 - 08:52:43

---
 net-misc/Manifest.gz                              | Bin 55453 -> 55460 bytes
 net-misc/openvswitch/Manifest                     |   2 +-
 net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild |  20 +++++++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'net-misc')

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 981f0d7988d2..d837975e05a0 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 56a04abb2fa2..db042e586780 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -9,5 +9,5 @@ AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6fa
 DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832
 DIST openvswitch-2.17.2.tar.gz 7955727 BLAKE2B da7ffc29b6af5dbf8eeb410725ed4cb6b6c5f4abe22f17d0963429a3333e459e1d4cc4ef06d13518dc2486d5e9e78a090318ad66e50175606e47fcf1d61cfce7 SHA512 e01e41ef2fea21afcc891b8ab0a773fe7c9adf873853e10926b8bde2fd970e12b354010687439238e8d80a87884f497f7396a4a1f2b179104e49e87c66cfc79e
 EBUILD openvswitch-2.15.0.ebuild 4406 BLAKE2B 2bd8f0c6fa31c291c358666b12bc8a7cee17b8aec4f9860e8cd21d93d671ce318c2e55f6a938b2c406a5892787de3b3e1546eaff16cc7859031e6b6edcf043ea SHA512 8d8ac462e9102b7162c417eab2194601027ee1cbe247ad2bd1b10b828780ad2bebe8991addee49ff4f31358c560e946e7f3a73a2cc60d2dc148eb6e55d6ecf8b
-EBUILD openvswitch-2.17.2-r1.ebuild 4562 BLAKE2B 8a5eddbc042035ab411a6ca39094b22593dca85767b01b92314708b59ba73dce8f3b18e8f338d62873718cda703a8465c4ac0caa94676c482431436db8168bfe SHA512 fc6a114fdf865137ee4fe9382b2745a1d6f3821280d058e88e861b02fdb11bab4c87d1eda5f2d6ef96f55db56feb03376c0c75dc3356e989656f9f08b1f2f959
+EBUILD openvswitch-2.17.2-r1.ebuild 4728 BLAKE2B ccf1ba0d8e430fe8a633322c02e313636d354cd39d122aced017a22c89f6a2b0844962ea083c05c00e77d9ff1366b68536e5e4a5eb473cd7ac3337e581f2472f SHA512 f3faaafb8bc35861c0326d6230e40ce1c18258be439b591968b8041c750261dd4ff14984e85c0fc632bb4e39465d0224707ce902f6b6f2d7892e2544ea6f4a16
 MISC metadata.xml 459 BLAKE2B b404d36a797768044b82701f1d65c2931b33d2ddb553dcc56cd476686d66102988a863261a6afd05c366b3e0521959e3c4b3af2cc1751899ecc386adf458fb12 SHA512 1b11fe7e1e1d117f60eb24da05c27a2b3e431dc4c46ea8e97cff69cef8747f110be6ae7e6a83fcb604a75954c7c2133139e052823620bdf1b010f8c4f8b0f931
diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild
index 4f04cb37a9a8..6cfb0d98f8bb 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}
@@ -73,10 +75,15 @@ src_configure() {
 	# in Gentoo does not make much sense, only breaks them: bug #607280
 	export ovs_cv_flake8="no"
 
+	# Only adds a diagram to the man page, just skip it as we don't
+	# want to add a BDEPEND on graphviz right now. bug #856286
+	export ovs_cv_dot="no"
+
 	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 +104,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
-- 
cgit v1.2.3