gentoo resync : 17.07.2021

2 files changed, 18 insertions, 7 deletions

diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index fd9eb7d840c6..c4e19fdb56ed 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B 213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e634934431111c82b0d91b5afb61f SHA512 f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039
 DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B dbbbba4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29 SHA512 adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb
-EBUILD gns3-server-2.2.19.ebuild 1920 BLAKE2B 97df3dc66e92ef74325c411945666fdd2be613ff9f43bc3cad09e7fb891c8a914612c398968b8158848775eeb7fbea32c4dc9499b15ad1a1386acc44404ba561 SHA512 a3ea580135874ec73009f732b72fda4b9b3b785937c9347b13434ed613cfa223607e2d0813c11d895f46195d84170b2569ec085399a6328aa1a307fa75a28c2a
+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
+EBUILD gns3-server-2.2.22.ebuild 2233 BLAKE2B 58febe525be2f40d6294398ae76b7b7f87261b0a97f246512a07db590aa545b7b3dda22f0fb8ffa317c202867dbcb99748bc3e771f660278a67d2f2bf260b2c6 SHA512 ffbde90e9fd1a526f74a5031af44d8550d75e0a051f5aa7f68facf72b01cbbacfef183e898c32472a2187dd9557616a20704a954080e261214fc9c700034936f
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-server/gns3-server-2.2.19.ebuild b/net-misc/gns3-server/gns3-server-2.2.22.ebuild
index c02bcf1c7998..b670345461be 100644
--- a/net-misc/gns3-server/gns3-server-2.2.19.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.22.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,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"
@@ -29,7 +29,15 @@ RDEPEND="
 	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
 	>=net-misc/ubridge-0.9.14
+	sys-apps/busybox
 "
+BDEPEND="
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -40,8 +48,9 @@ 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
+	# prevent installing tests directory, see:
+	# https://github.com/GNS3/gns3-server/pull/1930
+	sed -i 's/"tests"/"tests*"/' setup.py || die
 }
 
 python_install() {
@@ -54,11 +63,13 @@ python_install() {
 }
 
 pkg_postinst() {
+	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	elog ""
 	optfeature "QEMU Support" "app-emulation/qemu"
 	optfeature "Virtualbox Support" "app-emulation/virtualbox"
 	optfeature "Docker Support" "app-emulation/docker"
 	optfeature "Wireshark Support" "net-analyzer/wireshark"
-	elog
+	elog ""
 	elog "The following packages are currently unsupported:"
 	elog "iouyap and vpcs"
 }