summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin55095 -> 55096 bytes
-rw-r--r--net-misc/gns3-gui/Manifest5
-rw-r--r--net-misc/gns3-gui/gns3-gui-2.2.31.ebuild40
-rw-r--r--net-misc/gns3-gui/gns3-gui-2.2.34.ebuild (renamed from net-misc/gns3-gui/gns3-gui-2.2.31-r1.ebuild)6
-rw-r--r--net-misc/gns3-server/Manifest5
-rw-r--r--net-misc/gns3-server/gns3-server-2.2.31.ebuild71
-rw-r--r--net-misc/gns3-server/gns3-server-2.2.34.ebuild (renamed from net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild)17
7 files changed, 19 insertions, 125 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 956ea81ea620..33c34b973edd 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index b2e7ea96a881..b430739f44f1 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,6 +1,5 @@
-DIST gns3-gui-2.2.31.tar.gz 5043086 BLAKE2B 3b028b57406d86137fc4d0488cb588bf5821de1d79c4be80c7da6b8895fb594f90bc7018341d82d4e77db2e25510b8fdb191ce819904423ebbcc5caef612bf21 SHA512 ea894cf65b80dad985fbc2112d018750c42b3c0bd358f6f5a6a491748d12e90e2de01108658611c7ba890a55fa688853c3e98d9220c8cb28c772595fa586100e
DIST gns3-gui-2.2.33.1.tar.gz 5044746 BLAKE2B ddd1cf1cfe8cf8ad0c9e2313161ecc9c13f0f0eac7edbafc5c0ccef55935f58f889d7ca358b8bddc658b425744a19f5f7a71e80481b31c369bf8450e11e2356a SHA512 2a9018f1d04835f288b2f633e6ef71a168418aebcc6f85e666cc4ef6694754e8840ad9aaaa7a61dffff54e4432cea33d84040d1dd18bda784c18315e145f9c69
-EBUILD gns3-gui-2.2.31-r1.ebuild 1028 BLAKE2B 9c671256241def910d47cd711ad5f98524c08233d5162cea5e3b9e566d26da709ce8f7b16ac6b887c60470ac3bb5acb7ff41d17e227676751cb2e3f031db249d SHA512 f932eab7abb0e82e90cd834c1c04932f8b8a7d218a01bb3aa12d493c13d69abdb06d62a37a0a7119b3daac52fa393bdb62f679ebb1c384fd56b7114a8de11b81
-EBUILD gns3-gui-2.2.31.ebuild 1028 BLAKE2B 1d7b4a0b5b4b26966cc1abb49d6c0d4f0c99e42dc303b498bebeef664be57afde6f24dd545d813fe288b3df800318e36b788d4fb78b7445d380068d0f03d4371 SHA512 5c407af4148e1fa26ce7bf20c607b78d625bc648f5ea9b08768e263256ed5f4df28dfc23bbeb899c8a3efcf5b37545dca26a5d80f8476f74e8241bd61f245563
+DIST gns3-gui-2.2.34.tar.gz 5045580 BLAKE2B 00ec1a44d9ff0ce9157e578c984fb619458b267d0f2906cef0c1766fca6c3cf542ce87eef317dfe2c96899f8e4a7d178dca9bb62e5c3a514f63306b105b9fb43 SHA512 46f43d6696f6f2aa8ed64b126d95e93416898aeb87558e9dd505c1ca9fc31de0cbfc8a8eeb26027f13a68bfcd96424e2c17073e7e583e8f4eeeaf6758317e437
EBUILD gns3-gui-2.2.33.1.ebuild 1029 BLAKE2B 162df852bd6939e06738e54af998cad50a37078ccb0e5692aec774e771db3944a13c524499b5c6b8142d8e9157897d6be628819d5f3218ca577425c11e8c199b SHA512 245ee46e5b673ccf1853f5eb257bd9ae5f370dfff581a86470ac64347dc064d976f1d9ec0f6da615e8fc7b325c08fbad86a0a8ad85640e4890dc89c11ca1e2b6
+EBUILD gns3-gui-2.2.34.ebuild 1028 BLAKE2B b2f826cc9812d3c5e262f78934d4bc5bdd69a758da9621a0e3d69ffd902a3433cf6357d2fea1a5a4cdc89d39cba7d5b59609c532e0456772b03232139529ee95 SHA512 91553bcc534b00985a0f24507e5b6cf4acd76afbc0508233573879e13f51fd89fc18f0389985b4b2056553af9cac30fecee5e82010be408dcbfe66808b8b751a
MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.31.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.31.ebuild
deleted file mode 100644
index 7373084f8b44..000000000000
--- a/net-misc/gns3-gui/gns3-gui-2.2.31.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="Graphical Network Simulator"
-HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
-SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-#net-misc/gns3-server version should always match gns3-gui version
-RDEPEND="
- >=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.5.4[${PYTHON_USEDEP}]
- ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
- dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- default
-
- # newer python packages are fine
- sed -i -e 's/[<>=].*//' requirements.txt || die
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.31-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.34.ebuild
index 5ab96a981071..ee2c380c56e5 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.31-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.34.ebuild
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86"
#net-misc/gns3-server version should always match gns3-gui version
RDEPEND="
- >=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.5.4[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.9.1[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.9.5[${PYTHON_USEDEP}]
~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
"
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 69210d6879ad..1f17c7bd0d1f 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,8 +1,7 @@
AUX gns3-server-2.2.33.1-openrc-posix-complaint.patch 769 BLAKE2B c32ff784e1e6d8e30afe4a0d19c9f45299be6a16d55447069131f773aa13db5ff87e27229a2eb94544f3b9577210972f39f456995cdff7ab997a4fbdec501772 SHA512 077d6a8957e24c873784e7fc915f12c157ab5f0abce0beb9ea67f8f014980791909da486f437e579d4ac866b62ce983bb72b16c4cda5bd50091b69b30c394e20
-DIST gns3-server-2.2.31.tar.gz 10245461 BLAKE2B 488a91305408704accd4c7df936dde13e9a64404ac6a7e4ed7bdb94f996bb1bbd418d38523318603a8e93a7095c9fb8e30795c6b0dece70a45ed4758569b6711 SHA512 e8bf9357bc5a69e38dc27bc649af88c6ed39e6b5c63e2a1d374ec2a0784c7a6eadae3de0f4300a268fbf91ab55ad342e476573ca9a4bac609158d7d371a7a834
DIST gns3-server-2.2.33.1.tar.gz 10245850 BLAKE2B 069af8a0b77e7c7ce50903577fe0f037ddf574d9081f547686589ee7a48b71295c8c9f3fd9e47c9428e3d3b260828ddbb83188f29dd0cdb87f14fc7757032ad5 SHA512 af1207d92f64862a3f225bde70fa1bf10853c4ab7c661524d3ceed0fcf56388556cc257a31a0b2a741b90fcd793501ba54000d3b18c35d3ff0c47ca080488fc7
-EBUILD gns3-server-2.2.31-r1.ebuild 2082 BLAKE2B 28fafaf83e6c99bddd61f9e57f2b847e223cf4a2d2cd50774ca0b91f0eab028de6f6e7d5fca3b2879ce36bad1251ab1949365ad623d6d9ae511d8126e838161c SHA512 e140763c03d78769bc79b7615dd72618aacb586529594f970546ec4aaac4088f2904fc0b183e787cb79f277eaa44cfb2d4554542964343125844903c41441659
-EBUILD gns3-server-2.2.31.ebuild 2082 BLAKE2B a08edd08a381a217063f92ab533ab78546434604ed1a096e88b816ff923032e05d28dba8acbc5167be6e2777762bc3faade3df503d9c2afd739d55d4bd547019 SHA512 c7888cc3968590b8e71d236eeae246f7346d7b3407ec150a1a76ade50e2d97355e72d3e95167e6515a20929ae355c67c15758f9bcb6f1b94640bd28e94b6b90c
+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
+EBUILD gns3-server-2.2.34.ebuild 2234 BLAKE2B 73bbb9e3ffd8b434043c485d4bb022fc81cd9359bf2afe95f2cd0cb42b1a326aeade4d70f9d7be08393264a9ee82de51686d14c62dfc4973044df0bdc9617fd9 SHA512 cd10528658f361a9aafcc89d1e618abbaa9657f77954922bc0d39a82d8c24deb87931336cdb875db18c7170ec94375663be8fee3b9c66fb9d21edfc4892605d6
MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.31.ebuild b/net-misc/gns3-server/gns3-server-2.2.31.ebuild
deleted file mode 100644
index ac4d69e7b4de..000000000000
--- a/net-misc/gns3-server/gns3-server-2.2.31.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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="
- 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.6.0[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]
- >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-1.5.4[${PYTHON_USEDEP}]
- net-misc/ubridge
- sys-apps/busybox
-"
-BDEPEND="
- test? (
- dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
- )
-"
-
-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
-
- 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.31-r1.ebuild b/net-misc/gns3-server/gns3-server-2.2.34.ebuild
index cdb46f4d488b..0b9158470f08 100644
--- a/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.34.ebuild
@@ -17,17 +17,19 @@ 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.7.4[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/distro-1.6.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.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.4[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-1.9.5[${PYTHON_USEDEP}]
net-misc/ubridge
sys-apps/busybox
"
@@ -37,6 +39,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.33.1-openrc-posix-complaint.patch"
+ )
+
distutils_enable_tests pytest
src_prepare() {
@@ -53,6 +59,7 @@ 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