diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-06 18:11:38 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-06 18:11:38 +0000 |
| commit | 6c0d1528e3598898fd1026a3da35ffede0a1f14a (patch) | |
| tree | d5ab9d7f6d2b41d05fb156069ee81e9ed779f12b /net-misc/openvswitch | |
| parent | 29efd7db303b443e103311cc0e458ee5c134e8e5 (diff) | |
gentoo auto-resync : 06:01:2023 - 18:11:38
Diffstat (limited to 'net-misc/openvswitch')
| -rw-r--r-- | net-misc/openvswitch/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/openvswitch/openvswitch-2.15.0.ebuild | 7 | ||||
| -rw-r--r-- | net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 7 |
3 files changed, 14 insertions, 4 deletions
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 44c2166ae4e9..0fa21909db70 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -8,6 +8,6 @@ AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e 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 4406 BLAKE2B 2bd8f0c6fa31c291c358666b12bc8a7cee17b8aec4f9860e8cd21d93d671ce318c2e55f6a938b2c406a5892787de3b3e1546eaff16cc7859031e6b6edcf043ea SHA512 8d8ac462e9102b7162c417eab2194601027ee1cbe247ad2bd1b10b828780ad2bebe8991addee49ff4f31358c560e946e7f3a73a2cc60d2dc148eb6e55d6ecf8b -EBUILD openvswitch-2.17.2-r1.ebuild 4726 BLAKE2B fc03ba0f79fd5d36b432517814da6186b06d7ffb3993c89e682a517864cafb7cd0e6e3b139ebbef3536f7b2fd3481686c4a099db255c2f9164998fef8de8089b SHA512 7d4aca976bc1207d48e50fdd2c45c5cd098672f4d53dd4d8302aa0241b44a8cb8f08a9953dd6ad66aedcb70deb94b3add54dd61ce148b52b5c0a8f4dc4082785 +EBUILD openvswitch-2.15.0.ebuild 4607 BLAKE2B 3a3b551712633d67a11d8e329272b496cafbc1a52513c0638790d0e384a392b03f994ad5b2faaead69da08888972739bd5b05566b8f1830094680ed4cc509577 SHA512 18ec365a456b6915f058a757f9efa099905e45f9a360186c5c919daa4dff27b3b539df01d2d79a9225cd984dd4a58599d9e14662ca9fb3ac1d630d4c5d063d21 +EBUILD openvswitch-2.17.2-r1.ebuild 4927 BLAKE2B 55ebc29470c5b15eb7a2c0e3b4155c4b7a1d9207bb73e90c29360311c6ec77f09ae3b90bb0efe3db287dcfe651c3f1ceaf92db4852fe66d9509c0dc4455f5e06 SHA512 0950bdac8fabb53b92b4487714418ddbdf10e5392f20bea312a4805eb070de31f6e95657a6a56cc168889323b258582cfb9702597e3d19ee7ad9f3f82361831a 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 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 |