From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- net-misc/gns3-server/Manifest | 7 ++- .../files/gns3-server-2.1.3-typing.patch | 9 ---- net-misc/gns3-server/gns3-server-2.1.21.ebuild | 59 ++++++++++++++++++++++ net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild | 59 ---------------------- net-misc/gns3-server/metadata.xml | 9 +++- 5 files changed, 70 insertions(+), 73 deletions(-) delete mode 100644 net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch create mode 100644 net-misc/gns3-server/gns3-server-2.1.21.ebuild delete mode 100644 net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild (limited to 'net-misc/gns3-server') diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index 6c1c41f44ded..4e3dd54c7c53 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,4 +1,3 @@ -AUX gns3-server-2.1.3-typing.patch 259 BLAKE2B 5950ecf364b86f472bab5d5a8c59982086be7b3c541b841f0b6c31e3b4b585d88c4a8e3e013939635cb5c89e8cadf65a428521429ec166879d1a5f90e776b92d SHA512 02a7cafb1c0c306be8177c8c206800511953dd115b428810baa6711ba2e8bba9ae5be7bd9768a87fceb1bf75618fc59c31349e5bf3d55eebe1636a3c71e7fb00 -DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94062b8c431a73b9a83401266ae77f18a4e318651ecd05b789b71c512fc3549d0d1fb95b26fe1fdd23b2953b3367f04c SHA512 df6a98943f893f3d10c16b2a4242869a1407adad56e6c127e6525fe49acefbac9329bf76bc2b16904997985843fdb2b94d03c58f658034ec44763e6d69f7ddaf -EBUILD gns3-server-2.1.3-r4.ebuild 1887 BLAKE2B 794e2d3dfbb51b15c07d726b443a00cce7b313a6f994c194ed7e1de0688f21ccc11b3921d56fb4a3a08eba23e40ab9350fd8477776c84af0e94b8e5e6522ed69 SHA512 efb46c9b0cf5d68814880ccf5b2e54d7a49504c3ded206c857395ec05cb5f7b1b55eabac036fecdab2ec898054cb0da50e7482f4787455c975e6bb8a2be838de -MISC metadata.xml 361 BLAKE2B 52549a2862a4e5aaf855909c27ce68640e52549b8e56a2284081cc1eedfe5b5e6e95c3f957f2d34022c43ce541ebd9c6cf94ff723d2843fc85732b76d6358d7a SHA512 10af38136367903504fcc02e0e3cce154283979bcf4c3398d4fde8fb48fc6716448fdece6a74bb240dd74f37487ef07e1ca0209f4c2b567b4f5f3c67c8ed7a4d +DIST gns3-server-2.1.21.tar.gz 1713993 BLAKE2B 719306e05fd86b22b7413a60eb6fccc0d16a25cc3a34850344124433d0871bce5e85b195386615c1eaebf083295775de4031eee93c477bb8bd07078b839b2ee1 SHA512 3aeb7609f0fad3cf239a4de24affb124b5bed4a3af78c6a6e287a1b771e206c476849a04cf4ab731ce4923ca072d66928068fec5720bc0eb81d6819ed63f71c8 +EBUILD gns3-server-2.1.21.ebuild 1867 BLAKE2B a3e8742132ee6b1ea28c1776351acd7f37579859334abba52ebdc9bb987404b7cfddb56059853b8fcf9f7d747343767df4b90837b32d7e33375aa47e3ea56210 SHA512 8b1e094e3c63aecfe8de74a95052ed7607f872a84492010b349565b7a6fcb126ae9b058fd4149edb2f89638a751708de6c8ac72735894a20f7978a82be132e88 +MISC metadata.xml 562 BLAKE2B ceb6caa8dcb6c506ad0834282075e35a399502c1c4f1c6886223c886d1405f93718439332ede39f1c18ecd169a61af862a128af9ddb6453ef3dce176de9835f2 SHA512 e2113aa60bffff0f9499d300dcd39799f4d096eedd9e2b6212573e4c64bd997d7df1c36c4f68e0d40ac900d59dbec79f44ff34289421b2a9179442e0f06f626c diff --git a/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch b/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch deleted file mode 100644 index 99b32df27ad8..000000000000 --- a/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/requirements.txt -+++ b/requirements.txt -@@ -6,5 +6,5 @@ - raven>=5.23.0 - psutil>=3.0.0 - zipstream>=1.1.4 --typing>=3.5.3.0 # Otherwise yarl fails with python 3.4 -+typing>=3.5.3.0;python_version<"3.5" # Otherwise yarl fails with python 3.4 - prompt-toolkit diff --git a/net-misc/gns3-server/gns3-server-2.1.21.ebuild b/net-misc/gns3-server/gns3-server-2.1.21.ebuild new file mode 100644 index 000000000000..aebe51927092 --- /dev/null +++ b/net-misc/gns3-server/gns3-server-2.1.21.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6} ) + +inherit distutils-r1 python-utils-r1 + +DESCRIPTION="GNS3 server to asynchronously manage emulators" +HOMEPAGE="http://www.gns3.net/" +SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/aiohttp-2.3.3[${PYTHON_USEDEP}] + =dev-python/aiohttp-cors-0.6.0[${PYTHON_USEDEP}] + sys-apps/busybox + =app-emulation/dynamips-0.2.18 + >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] + dev-python/prompt_toolkit[${PYTHON_USEDEP}] + >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}] + >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}] + >=dev-python/raven-5.23.0[${PYTHON_USEDEP}] + >=net-misc/ubridge-0.9.14 +" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +src_prepare() { + default + + #Remove Pre-built busybox binary + rm gns3server/compute/docker/resources/bin/busybox || die + # Package installs 'tests' package which is forbidden + rm -rf tests || die +} + +python_install() { + distutils-r1_python_install + + 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 "" + elog "The following is a list of packages that can be added:" + elog "app-emulation/qemu, app-emulation/virtualbox" + elog "app-emulation/docker and 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.1.3-r4.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild deleted file mode 100644 index f1d6d0ec699a..000000000000 --- a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 eutils - -DESCRIPTION="GNS3 server to asynchronously manage emulators" -HOMEPAGE="http://www.gns3.net/" -SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RESTRICT="test" - -RDEPEND=" - >=app-emulation/dynamips-0.2.12 - >=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}] - =dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}] - >=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}] - >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}] - >=dev-python/raven-5.23.0[${PYTHON_USEDEP}] - dev-python/prompt_toolkit[${PYTHON_USEDEP}] - >=dev-python/psutil-3.0.0[${PYTHON_USEDEP}] - >=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}] - >=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}] - >=net-misc/ubridge-0.9.14 - >=www-servers/tornado-3.1.1[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}] - >=dev-python/yarl-0.11[${PYTHON_USEDEP}] -" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -# https://github.com/GNS3/gns3-server/pull/1368 -PATCHES=( "${FILESDIR}/${P}-typing.patch" ) - -src_prepare() { - default - - # Package installs 'tests' package which is forbidden - rm -rf tests || die -} - -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:" - elog "app-emulation/qemu, app-emulation/virtualbox" - elog "app-emulation/docker and net-analyzer/wireshark" - elog "" - elog "The following packages are currently unsupported:" - elog "iouyap and vpcs" -} diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml index 1ff1650e8848..e4aa7df0de5a 100644 --- a/net-misc/gns3-server/metadata.xml +++ b/net-misc/gns3-server/metadata.xml @@ -1,7 +1,14 @@ - + + onigino@protonmail.com + Gino McCarty + + + proxy-maint@gentoo.org + Proxy Maintainers + gns-3 GNS3/gns3-server -- cgit v1.2.3