gentoo resync : 22.01.2021

3 files changed, 44 insertions, 183 deletions

diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 65a968a34250..3202a10beb50 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,4 +1,5 @@
-AUX gns3-gui-rmraven.patch 7920 BLAKE2B d6264938eae55de6754c187f63bbb96707e8e0f68f1aa7153d8101aec5d81e46d3ad145a16f1694b358467c6a4586478c21112126b797e4b76e3ab549636dfdd SHA512 a47c9445caf185624aaec8834ed0884b588b07c34481e09b3f0be3ae5a9643f0a925eefb816d03617c072fe8d239307376715c6028345b6f498a98a41c3bcc51
 DIST gns3-gui-2.2.11.tar.gz 5240137 BLAKE2B 6601e8477c9d5dadfb04a19d4bb75efad39d23cde1fb4e9bc0698cf59c403f154ea1b46b216e2271da476b42d7d58ecee9ef8acabeae039c4026c1f5ee7325eb SHA512 7cb3b4b8bcae5b6adc6d3637fad9a8e4cf885709f9440f484224c04044960b082d1b7b81ad23b5c128c9e58e6ac23d07101128b96caaa095394c0feedc2a8dc3
+DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B 16501f3f2c9efa3f2bf0305f7af159f91d36000c4850fbcc8bf29afaf204de14d7f0531fc0c63d0e83b7c56a1a26961903852e06254057a4bcc8ff1c900613c8 SHA512 a3871a4d0470917b3bc7b0369ea30eb372cabc72bab1d036653ab94f09d75d5794cc58944905a2b72024c005c96172658a3f14ea081d2d81e7349df10c649045
 EBUILD gns3-gui-2.2.11.ebuild 1339 BLAKE2B 6f583146310feff20f56f007025d35de424a22336c569922082136641a89043cd1604248343bb6605301fe30b922228bdda7fb1c766660e734e2f3a10ddba071 SHA512 b586e650f3ffee47d1f81ab336f0c5cf3a426a2bb5a1e0e7d1a42fb405ab8c97c8d7ff55633fb96b037004f8947a348515254b4127006bb9f7e90c8a139be92d
+EBUILD gns3-gui-2.2.17.ebuild 1128 BLAKE2B 69dd59c79cbde82c113cbd0f9f96978040680a0bd17b4d3374c06e265692c4809e46157be448ce7f3761d49e13f8151de5018ca2a366f9e5bbf0804c014219f9 SHA512 c7f75554ded5a8af7abf70288239686f25f561a013f6c86bdd0ce327548a1655c0e4f8a545355fe52783c4653bb069494caeac63fb91e584836cdebb1c29b419
 MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
diff --git a/net-misc/gns3-gui/files/gns3-gui-rmraven.patch b/net-misc/gns3-gui/files/gns3-gui-rmraven.patch
deleted file mode 100644
index 9a8be4e62495..000000000000
--- a/net-misc/gns3-gui/files/gns3-gui-rmraven.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 2ea1946c0f83672f5289edcce207a8d2de03cc43 Mon Sep 17 00:00:00 2001
-From: grossmj <grossmj@gns3.net>
-Date: Tue, 19 May 2020 15:48:53 +0930
-Subject: [PATCH] Replace Raven by Sentry SDK. Fixes
- https://github.com/GNS3/gns3-server/issues/1758
-
----
- gns3/crash_report.py | 111 +++++++++++++++++++++++++------------------
- requirements.txt     |   2 +-
- 2 files changed, 66 insertions(+), 47 deletions(-)
-
-diff --git a/gns3/crash_report.py b/gns3/crash_report.py
-index a6a555fd5..dfbb9fc46 100644
---- a/gns3/crash_report.py
-+++ b/gns3/crash_report.py
-@@ -23,12 +23,11 @@
- import distro
- 
- try:
--    import raven
--    from raven.transport.http import HTTPTransport
--    RAVEN_AVAILABLE = True
-+    import sentry_sdk
-+    SENTRY_SDK_AVAILABLE = True
- except ImportError:
--    # raven is not installed with deb package in order to simplify packaging
--    RAVEN_AVAILABLE = False
-+    # Sentry SDK is not installed with deb package in order to simplify packaging
-+    SENTRY_SDK_AVAILABLE = False
- 
- from .utils.get_resource import get_resource
- from .version import __version__, __version_info__
-@@ -69,49 +68,50 @@ def __init__(self):
-         sentry_uncaught = logging.getLogger('sentry.errors.uncaught')
-         sentry_uncaught.disabled = True
- 
--    def captureException(self, exception, value, tb):
--        from .local_server import LocalServer
--        from .local_config import LocalConfig
--        from .controller import Controller
--        from .compute_manager import ComputeManager
--
--        local_server = LocalServer.instance().localServerSettings()
--        if local_server["report_errors"]:
--            if not RAVEN_AVAILABLE:
--                return
--
--            if os.path.exists(LocalConfig.instance().runAsRootPath()):
--                log.warning("User has run application as root. Crash reports are disabled.")
--                sys.exit(1)
--                return
-+        if SENTRY_SDK_AVAILABLE:
-+            cacert = None
-+            if hasattr(sys, "frozen"):
-+                cacert_resource = get_resource("cacert.pem")
-+                if cacert_resource is not None and os.path.isfile(cacert_resource):
-+                    cacert = cacert_resource
-+                else:
-+                    log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
- 
--            if os.path.exists(".git"):
--                log.warning("A .git directory exist crash report is turn off for developers. Instant exit")
--                sys.exit(1)
--                return
-+            sentry_sdk.init(dsn=CrashReport.DSN,
-+                            release=__version__,
-+                            ca_certs=cacert)
- 
--            if hasattr(exception, "fingerprint"):
--                client = raven.Client(CrashReport.DSN, release=__version__, fingerprint=['{{ default }}', exception.fingerprint], transport=HTTPTransport)
--            else:
--                client = raven.Client(CrashReport.DSN, release=__version__, transport=HTTPTransport)
--            context = {
-+            tags = {
-                 "os:name": platform.system(),
-                 "os:release": platform.release(),
-                 "os:win_32": " ".join(platform.win32_ver()),
-                 "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]),
-                 "os:linux": " ".join(distro.linux_distribution()),
-+
-+            }
-+
-+            self._add_qt_information(tags)
-+
-+            with sentry_sdk.configure_scope() as scope:
-+                for key, value in tags.items():
-+                    scope.set_tag(key, value)
-+
-+            extra_context = {
-                 "python:version": "{}.{}.{}".format(sys.version_info[0],
-                                                     sys.version_info[1],
-                                                     sys.version_info[2]),
-                 "python:bit": struct.calcsize("P") * 8,
-                 "python:encoding": sys.getdefaultencoding(),
--                "python:frozen": "{}".format(hasattr(sys, "frozen")),
-+                "python:frozen": "{}".format(hasattr(sys, "frozen"))
-             }
- 
-             # extra controller and compute information
--            extra_context = {"controller:version": Controller.instance().version(),
--                             "controller:host": Controller.instance().host(),
--                             "controller:connected": Controller.instance().connected()}
-+            from .controller import Controller
-+            from .compute_manager import ComputeManager
-+            extra_context["controller:version"] = Controller.instance().version()
-+            extra_context["controller:host"] = Controller.instance().host()
-+            extra_context["controller:connected"] = Controller.instance().connected()
-+
-             for index, compute in enumerate(ComputeManager.instance().computes()):
-                 extra_context["compute{}:id".format(index)] = compute.id()
-                 extra_context["compute{}:name".format(index)] = compute.name(),
-@@ -120,27 +120,46 @@ def captureException(self, exception, value, tb):
-                 extra_context["compute{}:platform".format(index)] = compute.capabilities().get("platform")
-                 extra_context["compute{}:version".format(index)] = compute.capabilities().get("version")
- 
--            context = self._add_qt_information(context)
--            client.tags_context(context)
--            client.extra_context(extra_context)
-+            with sentry_sdk.configure_scope() as scope:
-+                for key, value in extra_context.items():
-+                    scope.set_extra(key, value)
-+
-+    def captureException(self, exception, value, tb):
-+        from .local_server import LocalServer
-+        from .local_config import LocalConfig
-+
-+        local_server = LocalServer.instance().localServerSettings()
-+        if local_server["report_errors"]:
-+            if not SENTRY_SDK_AVAILABLE:
-+                return
-+
-+            if os.path.exists(LocalConfig.instance().runAsRootPath()):
-+                log.warning("User is running application as root. Crash reports disabled.")
-+                sys.exit(1)
-+                return
-+
-+            if os.path.exists(".git"):
-+                log.warning("A .git directory exists, crash reporting is turned off for developers.")
-+                sys.exit(1)
-+                return
-+
-             try:
--                report = client.captureException((exception, value, tb))
-+                sentry_sdk.capture_exception((exception, value, tb))
-+                log.info("Crash report sent with event ID: {}".format(sentry_sdk.last_event_id()))
-             except Exception as e:
-                 log.error("Can't send crash report to Sentry: {}".format(e))
--                return
--            log.debug("Crash report sent with event ID: {}".format(client.get_ident(report)))
- 
--    def _add_qt_information(self, context):
-+    def _add_qt_information(self, tags):
-+
-         try:
-             from .qt import QtCore
-             from .qt import sip
-         except ImportError:
--            return context
--        context["psutil:version"] = psutil.__version__
--        context["pyqt:version"] = QtCore.PYQT_VERSION_STR
--        context["qt:version"] = QtCore.QT_VERSION_STR
--        context["sip:version"] = sip.SIP_VERSION_STR
--        return context
-+            return tags
-+        tags["pyqt:version"] = QtCore.PYQT_VERSION_STR
-+        tags["qt:version"] = QtCore.QT_VERSION_STR
-+        tags["sip:version"] = sip.SIP_VERSION_STR
-+        return tags
- 
-     @classmethod
-     def instance(cls):
-diff --git a/requirements.txt b/requirements.txt
-index 99e803f1b..abd6cc7c9 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,5 +1,5 @@
- jsonschema==3.2.0; python_version >= '3.8'  # pyup: ignore
- jsonschema==2.6.0; python_version < '3.8'  # pyup: ignore
--raven>=5.23.0
-+sentry-sdk>=0.14.4
- psutil==5.6.6
- distro>=1.3.0
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
new file mode 100644
index 000000000000..222f29a2923d
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 desktop xdg
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
+SRC_URI="https://github.com/GNS3/${PN}/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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+
+	# newer python packages are fine
+	sed -i -e 's/[<>=].*//' requirements.txt || die "fixing requirements failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "resources/images/gns3.ico"
+	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
+}