gentoo resync : 03.09.2021

3 files changed, 98 insertions, 15 deletions

diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index c4e19fdb56ed..0608849d76cd 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,6 @@
-DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B dbbbba4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29 SHA512 adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb
+AUX gns3-server-2.2.24-Fix-tests.patch 2975 BLAKE2B 91d3da6f87e88e172f3e31afc941b0e7f8199e1a601d018847834df57687eafee36f2a8130293b77449bda8f6de94a5d786e950207dc3e21ff4702193367dc1d SHA512 b7f7570977aa6c36b3eeadb15c2327d902e77abae06d2496b8d72914abb442e1ba80b7b54787d98e3df66e38d175f7e2a1085695c13fa07891a808c0964e2480
 DIST gns3-server-2.2.22.tar.gz 9011028 BLAKE2B 910711cac6f649d8dd3f7a4d2a9aa77839c9dda9f4280e7079b86857c542907feaa1205b7060ce7cc8956a2fbd220d5393cda319f64ff17eeb5ce476922afccc SHA512 444f483e69a56ab82c053c042b8791711e2fc6b7c800d30c08f2221405418a5c78d780f0f959c80d56ce864230ae17b04639c74a6559c7f5abce65f9c808a282
-EBUILD gns3-server-2.2.21.ebuild 2113 BLAKE2B 843ae1b77b7bae4847d7b2fcd176d550b34fcc26fa4b530ed0d82aaf4667a39480f24903cf5549f3162e136f6dca0d6b8782a6557320868846410b162d9feaf3 SHA512 e10ab97da6dc98892bb04802dfd0d9b56aabf39c9624bcb929c9634c5456f8942fbd793259fd5efe6f6b938cfc3481680f148af28f9aab5d3f641e4fbc0d6c0d
+DIST gns3-server-2.2.24.tar.gz 9057352 BLAKE2B cc49127afa9b3422f25ec2d10e53b7cedc59a4b872394d7b7c47ac34e6859fd5f22547277f351ba75b6520a0881b2ebbda6ba932af31108f070c2ccd92574020 SHA512 22a4394f645b5909e75b07d63164ad4fa362f78d69c6f30e8e2daf15bc910c238e8cd983a9f1cb3c1045a0722f9a1c260002b4afe8fb5915033b3ddb20814a17
 EBUILD gns3-server-2.2.22.ebuild 2233 BLAKE2B 58febe525be2f40d6294398ae76b7b7f87261b0a97f246512a07db590aa545b7b3dda22f0fb8ffa317c202867dbcb99748bc3e771f660278a67d2f2bf260b2c6 SHA512 ffbde90e9fd1a526f74a5031af44d8550d75e0a051f5aa7f68facf72b01cbbacfef183e898c32472a2187dd9557616a20704a954080e261214fc9c700034936f
+EBUILD gns3-server-2.2.24.ebuild 2208 BLAKE2B 4baaf0cb904aed94173092f4ce584120bb247cc157a66acb63ee84cb44789127c3f6a868943a474eae48838112fe18e2d24090cc8396056a1c3400802d59aec7 SHA512 5675af064e4194b765ba350ced456424688e9f2b3fbd01f099ca854ea1c40be30ec5382795c60cc999ddb1411b0f73b7c70b546b585e453db4d437e55cf9a5d4
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
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
new file mode 100644
index 000000000000..3d0556ab4a1c
--- /dev/null
+++ b/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
@@ -0,0 +1,73 @@
+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.21.ebuild b/net-misc/gns3-server/gns3-server-2.2.24.ebuild
index 07b724ce6475..78581b451547 100644
--- a/net-misc/gns3-server/gns3-server-2.2.21.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.24.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 systemd optfeature
+inherit distutils-r1 optfeature systemd
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
@@ -17,19 +17,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=app-emulation/dynamips-0.2.18
-	>=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+	app-emulation/dynamips
+	>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
-	>=net-misc/ubridge-0.9.14
+	>=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+	net-misc/ubridge
+	sys-apps/busybox
 "
+BDEPEND="
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-Fix-tests.patch )
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -40,8 +50,8 @@ src_prepare() {
 	# Remove Pre-built busybox binary
 	rm gns3server/compute/docker/resources/bin/busybox || die
 
-	# Package installs 'tests' package which is forbidden
-	rm -r tests || die
+	# add setuptools dependency, bug #809278
+	echo setuptools >> requirements.txt || die
 }
 
 python_install() {
@@ -56,7 +66,6 @@ python_install() {
 pkg_postinst() {
 	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
 	elog ""
-	elog "The following is a list of packages that can be added:"
 	optfeature "QEMU Support" "app-emulation/qemu"
 	optfeature "Virtualbox Support" "app-emulation/virtualbox"
 	optfeature "Docker Support" "app-emulation/docker"