gentoo auto-resync : 05:02:2023 - 09:16:04

3 files changed, 17 insertions, 96 deletions

diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 1f17c7bd0d1f..9468ab23b834 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,7 +1,6 @@
 AUX gns3-server-2.2.33.1-openrc-posix-complaint.patch 769 BLAKE2B c32ff784e1e6d8e30afe4a0d19c9f45299be6a16d55447069131f773aa13db5ff87e27229a2eb94544f3b9577210972f39f456995cdff7ab997a4fbdec501772 SHA512 077d6a8957e24c873784e7fc915f12c157ab5f0abce0beb9ea67f8f014980791909da486f437e579d4ac866b62ce983bb72b16c4cda5bd50091b69b30c394e20
-DIST gns3-server-2.2.33.1.tar.gz 10245850 BLAKE2B 069af8a0b77e7c7ce50903577fe0f037ddf574d9081f547686589ee7a48b71295c8c9f3fd9e47c9428e3d3b260828ddbb83188f29dd0cdb87f14fc7757032ad5 SHA512 af1207d92f64862a3f225bde70fa1bf10853c4ab7c661524d3ceed0fcf56388556cc257a31a0b2a741b90fcd793501ba54000d3b18c35d3ff0c47ca080488fc7
 DIST gns3-server-2.2.34.tar.gz 10249497 BLAKE2B 740ce654a675fb096434685d496f4fea25d19881237b160293ddb8a66ddbcaf7bcf399dd7a19e87cd68fb6d7aadee6420f7b07227d2b3aa4af1a2087ed65c134 SHA512 576e7e04f2681912882b98b19155d7ec61d10e6c54c40878c3850b0432763c18a3eca4f12bb7c1b19a836e440183fbad356e6cff3d84487767fe82f29e4adfd8
-EBUILD gns3-server-2.2.33.1-r2.ebuild 2225 BLAKE2B a340110c28752dc5886af745a45a57c3421e8782f4553f67e7f1fc5b4db211b97b52424ebf127fc80a1a1fea61185f5cafcf88967790825055bbe8f7456c2e88 SHA512 268e7978787923e427c82c8ad9b5c3da247a3fa6c916a0145041328dd15216e510aa140ff182e9a3955e4377a822eee4d1a086cddc103150a95ca2797bee6334
-EBUILD gns3-server-2.2.33.1.ebuild 2083 BLAKE2B 5bc59b3334b586c5eaffa135b39883a88f51145251213e07dacb8ab3bbdeaa3265ffd0d2e5f7fbdbf6dd49a9269a0a61f68d2f70aa0dc46877a9c4336cebc4f3 SHA512 aa992f0554b8b3bc143f488b8cdb3b9bee00683e979504e86b8597c8d4936f3e3d2f771831d70038e806cbbbaf509236338d485ed79b872127a0799b76ccfef3
+DIST gns3-server-2.2.37.tar.gz 9690092 BLAKE2B 9cc7dabde818996ea87494cb4a61a4ba5f9ad2dfe028a4ca9d45e9bd8f6dd4a17b4845275a87386ad068be4f354f932e6cada8d2b8eafd54230ea82fae3f5571 SHA512 f56d1f130e3179fe250b12e9459d8b66745c780c94380cce0ed60206918458f4aab119faa77b23ef7c58115bee11ff2ef6630539b5f184ab2d36b936564de1b7
 EBUILD gns3-server-2.2.34.ebuild 2234 BLAKE2B 73bbb9e3ffd8b434043c485d4bb022fc81cd9359bf2afe95f2cd0cb42b1a326aeade4d70f9d7be08393264a9ee82de51686d14c62dfc4973044df0bdc9617fd9 SHA512 cd10528658f361a9aafcc89d1e618abbaa9657f77954922bc0d39a82d8c24deb87931336cdb875db18c7170ec94375663be8fee3b9c66fb9d21edfc4892605d6
+EBUILD gns3-server-2.2.37.ebuild 2079 BLAKE2B e46367dcbb45b02b11508f74f22e607f6f5639663e8c843cd5d8a76a88fc62fe1163b3fcd1a60d4fcafb1e14451ec05c56fad285a1ef3364c9c8cdc7b3526c05 SHA512 18b79dcb6e722aa95e1e4c5fa4bcae14f3dcf2c0dfeed5964dbd5b5b92967074483e31e95d726e2e32f9fc0ab0ca5a1a5cb268f2e96a4f1ebae8b4acf3ad8fb3
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.33.1-r2.ebuild b/net-misc/gns3-server/gns3-server-2.2.33.1-r2.ebuild
deleted file mode 100644
index e991cd78ac09..000000000000
--- a/net-misc/gns3-server/gns3-server-2.2.33.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	acct-group/gns3
-	acct-user/gns3
-	app-emulation/dynamips
-	>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.9.1[${PYTHON_USEDEP}]
-	>=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.5.12[${PYTHON_USEDEP}]
-	net-misc/ubridge
-	sys-apps/busybox
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openrc-posix-complaint.patch"
-	)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# newer python packages are fine
-	sed -i -e 's/[<>=].*//' requirements.txt || die
-
-	# Remove Pre-built busybox binary
-	rm gns3server/compute/docker/resources/bin/busybox || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	systemd_dounit init/gns3.service.systemd
-	newinitd init/gns3.service.openrc gns3server
-
-	mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
-	ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
-}
-
-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-containers/docker"
-	optfeature "Wireshark Support" "net-analyzer/wireshark"
-	elog ""
-	elog "The following packages are currently unsupported:"
-	elog "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.2.33.1.ebuild b/net-misc/gns3-server/gns3-server-2.2.37.ebuild
index 9866607bfa22..d399b6d9463f 100644
--- a/net-misc/gns3-server/gns3-server-2.2.33.1.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.37.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature systemd
 
@@ -17,19 +17,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
+	acct-group/gns3
+	acct-user/gns3
 	app-emulation/dynamips
-	>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
+	>=dev-python/aiofiles-22.1.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.8.3[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.9.1[${PYTHON_USEDEP}]
-	>=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.5.12[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
+	>=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.12.1[${PYTHON_USEDEP}]
 	net-misc/ubridge
-	sys-apps/busybox
+	sys-apps/busybox[static]
 "
 BDEPEND="
 	test? (
@@ -44,17 +46,15 @@ src_prepare() {
 
 	# newer python packages are fine
 	sed -i -e 's/[<>=].*//' requirements.txt || die
-
-	# Remove Pre-built busybox binary
-	rm gns3server/compute/docker/resources/bin/busybox || die
 }
 
 python_install() {
 	distutils-r1_python_install
 
 	systemd_dounit init/gns3.service.systemd
+	newinitd init/gns3.service.openrc gns3server
 
-	mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
+	rm "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
 	ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
 }