gentoo auto-resync : 08:04:2023 - 05:31:31

3 files changed, 2 insertions, 155 deletions

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 6561d642f4b0..59d8835a9f55 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -6,8 +6,6 @@ AUX ovsdb-server-r1 855 BLAKE2B 894b2bd417ad1e8113a0288db59af133e5b705deac982b01
 AUX ovsdb-server-r3.service 813 BLAKE2B ba16534aaf407121f56e1ffc711dcc87b4c5ee07cc12f74e1d8ca2b7e85fefede4100154ef2031470b68fe5085539984b6b38b8c518fa38a8eb19d8af3a24c1c SHA512 ed3137fb0b26be82f311aa9a56855d91bb113a64fd43ecde8d97979354edffe26ee7712eac91c96b19e56c35a5b4ef2c68acfe5c3c0c0cd21e35745fde41574e
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
-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 4588 BLAKE2B f24a50690a85c81a11070f23f04db43d74b132df6725e7e21340034683547a8e384438fc72fbfaa30442f1a68577d838f8fafeaec5820a58804f1e3a755fc570 SHA512 6fadd40705d11a81687f22e1504f5cb6e16c35c276fbcbad0448a95428f0483d27ea6155d08439795788de0378a1f21de1b0830a3452f67aa0066f9f9fe73cb5
-EBUILD openvswitch-2.17.2-r2.ebuild 5032 BLAKE2B a4cd88870f71e144fa29544b63703822280b83e5911c0342464d6108c1bcba02d4c21829fd74cdcf32695ba84f6def8e18b586f6b120eef342f0bedb51d3a197 SHA512 7fa66ab911176b63b48f02f1fb74f81b19e175b2c7851926ea5bada79b62a96d5c41f6c6512878d3e9f38278133f35eec0159bf503028d3e041a935a3bce8916
+DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8
+EBUILD openvswitch-2.17.6.ebuild 5032 BLAKE2B a4cd88870f71e144fa29544b63703822280b83e5911c0342464d6108c1bcba02d4c21829fd74cdcf32695ba84f6def8e18b586f6b120eef342f0bedb51d3a197 SHA512 7fa66ab911176b63b48f02f1fb74f81b19e175b2c7851926ea5bada79b62a96d5c41f6c6512878d3e9f38278133f35eec0159bf503028d3e041a935a3bce8916
 MISC metadata.xml 539 BLAKE2B c6a7e8b9ffb18bd32be27bb2ba301b4b8872a0c17eec6b110f89562d261614ca9bc1a5d89350ac05b6dc26d7536fd7aa1920326c7f55a0ecb4693bfc99986810 SHA512 d731202dfe79480263006596d7da8349a6831e05d75d5ebc9cce28818d02d5a52e81b350f5afb06279e91e5dc700763fb2975b28aad15bc3a0ea72b6264eba71
diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild
deleted file mode 100644
index 620028a7b31f..000000000000
--- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(  python3_9 )
-
-inherit autotools linux-info linux-mod python-r1 systemd tmpfiles
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org"
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-2.13.3[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux[caps]"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="
-	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
-		kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	# use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	# flake8 is primarily a style guide tool, running it as part of the tests
-	# in Gentoo does not make much sense, only breaks them: bug 607280
-	export ovs_cv_flake8="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	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}"
-		done
-		rm -r "${ED}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
-	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
-	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
-	newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	tmpfiles_process openvswitch.conf
-
-	# only needed on non-systemd, but helps anyway
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild b/net-misc/openvswitch/openvswitch-2.17.6.ebuild
index c17e37e3f3bb..c17e37e3f3bb 100644
--- a/net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.17.6.ebuild