gentoo resync : 25.10.2021

3 files changed, 3 insertions, 82 deletions

diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index d29df131c26e..4c9c1a6c25d4 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,6 +1,5 @@
-AUX gns3-server-2.2.24-Fix-tests.patch 2975 BLAKE2B 91d3da6f87e88e172f3e31afc941b0e7f8199e1a601d018847834df57687eafee36f2a8130293b77449bda8f6de94a5d786e950207dc3e21ff4702193367dc1d SHA512 b7f7570977aa6c36b3eeadb15c2327d902e77abae06d2496b8d72914abb442e1ba80b7b54787d98e3df66e38d175f7e2a1085695c13fa07891a808c0964e2480
-DIST gns3-server-2.2.24.tar.gz 9057352 BLAKE2B cc49127afa9b3422f25ec2d10e53b7cedc59a4b872394d7b7c47ac34e6859fd5f22547277f351ba75b6520a0881b2ebbda6ba932af31108f070c2ccd92574020 SHA512 22a4394f645b5909e75b07d63164ad4fa362f78d69c6f30e8e2daf15bc910c238e8cd983a9f1cb3c1045a0722f9a1c260002b4afe8fb5915033b3ddb20814a17
 DIST gns3-server-2.2.25.tar.gz 10229566 BLAKE2B 73827940698335dcf9ef6d4b6c4c88b162852ec493f8ea05eebbdca20df3c84e4f5ee2ac218ed72755350df2f0e27cfc6cbd34b541e9e5bc0eada2fcb8e266ac SHA512 c7fa163eedc064fd266100658d7d2084ab0c542280d6689938a06943534df320f905c0e46175580bd3792218369936c55f9e135a12577f8a4b7eb86ac8fe9739
-EBUILD gns3-server-2.2.24.ebuild 2208 BLAKE2B 4baaf0cb904aed94173092f4ce584120bb247cc157a66acb63ee84cb44789127c3f6a868943a474eae48838112fe18e2d24090cc8396056a1c3400802d59aec7 SHA512 5675af064e4194b765ba350ced456424688e9f2b3fbd01f099ca854ea1c40be30ec5382795c60cc999ddb1411b0f73b7c70b546b585e453db4d437e55cf9a5d4
+DIST gns3-server-2.2.26.tar.gz 10230386 BLAKE2B 9b9de96cc22aeb1da92a48c9c04a0bf0271f3e47909bf09de76f357d727a4dfc2aa8181c47713192a9c88e55497ca3d8577f34635bf1f2f353387008c1bd13b7 SHA512 80a3e2939374b7a8f7e961f565b16d8a7575414793a3772235b41eadc184d02543ddae18122e90a2602ca51ce24513e1add17b1e7732f44c108daf3d6bc9dc7a
 EBUILD gns3-server-2.2.25.ebuild 2079 BLAKE2B 5d0cd48a38265e55410e9b3934fd248745c9aaace27163c46cbd97a0412b0893b52ebc96322abe19e8241d888c13a29aadd22faf1ea9e50f9d61412282cd0ae7 SHA512 4d21ffce7f0e447ceb490fc00d97f7bcdfea30ccc562b347afd767b3652977e12dc77a58a585c997773b698928735a4284c42a7610bd5aa122df84b11320f0a6
+EBUILD gns3-server-2.2.26.ebuild 2079 BLAKE2B 5d0cd48a38265e55410e9b3934fd248745c9aaace27163c46cbd97a0412b0893b52ebc96322abe19e8241d888c13a29aadd22faf1ea9e50f9d61412282cd0ae7 SHA512 4d21ffce7f0e447ceb490fc00d97f7bcdfea30ccc562b347afd767b3652977e12dc77a58a585c997773b698928735a4284c42a7610bd5aa122df84b11320f0a6
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch b/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
deleted file mode 100644
index 3d0556ab4a1c..000000000000
--- a/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 4eb8491cfa61310066395f078009ccc822488eb8 Mon Sep 17 00:00:00 2001
-From: grossmj <grossmj@gns3.net>
-Date: Wed, 1 Sep 2021 19:31:37 +0930
-Subject: [PATCH] Fix tests. Fixes #1950
-
----
- tests/compute/qemu/test_qemu_manager.py |  1 -
- tests/compute/qemu/test_qemu_vm.py      | 12 ++++++------
- tests/compute/test_manager.py           |  2 +-
- 3 files changed, 7 insertions(+), 8 deletions(-)
-
---- a/tests/compute/qemu/test_qemu_manager.py
-+++ b/tests/compute/qemu/test_qemu_manager.py
-@@ -71,7 +71,6 @@ async def test_binary_list(monkeypatch, tmpdir):
-         assert {"path": os.path.join(os.environ["PATH"], "qemu-kvm"), "version": version} in qemus
-         assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x42"), "version": version} in qemus
-         assert {"path": os.path.join(os.environ["PATH"], "hello"), "version": version} not in qemus
--        assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x86_64-spice"), "version": version} not in qemus
- 
-         qemus = await Qemu.binary_list(["x86"])
- 
---- a/tests/compute/qemu/test_qemu_vm.py
-+++ b/tests/compute/qemu/test_qemu_vm.py
-@@ -818,21 +818,21 @@ def test_options(linux_platform, vm):
-     assert vm.kvm is False
- 
-     vm.options = "-no-kvm"
--    assert vm.options == "-no-kvm"
-+    assert vm.options == "-machine accel=tcg"
- 
-     vm.options = "-enable-kvm"
--    assert vm.options == "-enable-kvm"
-+    assert vm.options == "-machine accel=kvm"
- 
-     vm.options = "-icount 12"
--    assert vm.options == "-no-kvm -icount 12"
-+    assert vm.options == "-icount 12"
- 
-     vm.options = "-icount 12 -no-kvm"
--    assert vm.options == "-icount 12 -no-kvm"
-+    assert vm.options == "-icount 12 -machine accel=tcg"
- 
- 
- def test_options_windows(windows_platform, vm):
-     vm.options = "-no-kvm"
--    assert vm.options == ""
-+    assert vm.options == "-machine accel=tcg"
- 
-     vm.options = "-enable-kvm"
-     assert vm.options == ""
-@@ -878,7 +878,7 @@ async def test_run_with_kvm_linux_options_no_kvm(linux_platform, vm):
- 
-     with patch("os.path.exists", return_value=True) as os_path:
-         vm.manager.config.set("Qemu", "enable_kvm", True)
--        assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-no-kvm") is False
-+        assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-machine accel=tcg") is False
- 
- 
- async def test_run_with_kvm_not_x86(linux_platform, vm):
---- a/tests/compute/test_manager.py
-+++ b/tests/compute/test_manager.py
-@@ -190,7 +190,7 @@ def test_get_abs_image_recursive_ova(qemu, tmpdir, config):
-     config.set_section_config("Server", {
-         "images_path": str(tmpdir / "images1"),
-         "local": False})
--    assert qemu.get_abs_image_path("test.ova/test1.bin") == path1
-+    assert qemu.get_abs_image_path("demo/test.ova/test1.bin") == path1
-     assert qemu.get_abs_image_path("test.ova/test2.bin") == path2
-     # Absolute path
-     assert qemu.get_abs_image_path(str(path1)) == path1
--- 
-2.33.0
-
diff --git a/net-misc/gns3-server/gns3-server-2.2.24.ebuild b/net-misc/gns3-server/gns3-server-2.2.26.ebuild
index 78581b451547..9d91356deda2 100644
--- a/net-misc/gns3-server/gns3-server-2.2.24.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.26.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 optfeature systemd
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -37,8 +37,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-Fix-tests.patch )
-
 distutils_enable_tests pytest
 
 src_prepare() {
@@ -49,9 +47,6 @@ src_prepare() {
 
 	# Remove Pre-built busybox binary
 	rm gns3server/compute/docker/resources/bin/busybox || die
-
-	# add setuptools dependency, bug #809278
-	echo setuptools >> requirements.txt || die
 }
 
 python_install() {