gentoo auto-resync : 08:11:2023 - 22:21:23

3 files changed, 0 insertions, 199 deletions

diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index bfb26d4a17c2..cf5d8da10d10 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,7 +1,4 @@
-AUX backport-2ace1a1-issue-92.patch 5161 BLAKE2B a2974216dd5bfb64a53033f1a587a8d05181e3b894c3f5bbece7f3ec40014d38ee9185b8fb500dab78668319e1c91a9b8213a326a2df3ba6b347698082ed854f SHA512 58129ae687b0a8d78c0deb189519dbe3dd8b55484b3b9a6455f2bb0f607fcc5c43992ca6c841eadc576af46fac9f9ba5fb42f14b089c8864e60588ee72189ccb
-DIST xdot-1.2.tar.gz 136057 BLAKE2B 484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3dcccc6b96795d3b7c203db922 SHA512 b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda
 DIST xdot-1.3.tar.gz 144187 BLAKE2B 38e89a8c47dd519a79221634ed3e451cc5ba9c0448545802561e92876c06af599b3327d2ab808d5f81842826baddc42d3921da9c6885a2b6485e39c79de80c9f SHA512 8d66a64182970b968adbb5031d17f0b2b3709d4daa0f6d32ba0e3616177be1e43bcaa62a3133a3a0d92f8468dbc12147918d04b5d543b94b5df6d39b7af31e17
-EBUILD xdot-1.2-r1.ebuild 1060 BLAKE2B b6a8fc4bfdce93a11f3d4c011888eb6017fd6652aa3b650d1dd6d85440258987c5f7c2efabff04156291ce17cbad8e1eb05115c17db6439d482c1be28c5aee1b SHA512 20aaa576d5a5a63f6373198643177120e73d29ad77113b82f0f89a8dae196def4ca115ed3843a974c099a45b060eb1b927fca575462ff6c9640f8bb804a17026
 EBUILD xdot-1.3.ebuild 1035 BLAKE2B d9276c1b62817c8b75f67bdd4818c17973a4c631b264de17d1945567f14639869601ffeb2cc13ef26a9fdb84a6b21b448ce9fb44a980b32ed64ca4ea569a4a2f SHA512 82e5ad83c6ec5c0bb8acd0bc697162c3a397cdbece7e6a4d4cfa471cd266b324a689908fc57b6d0c8cb72bad788fee1cc0a8c342ac8fe2f44f48c1761ef0b39b
 EBUILD xdot-9999.ebuild 1042 BLAKE2B 64764e379da52d59905affaf3e4285b809a046cd5f8edd3c08f3b415d10505df149ba2d32792a8a7aaf807ca5f14f9cb2d903021fc37d714aacfca2e9fe441b4 SHA512 512dc09eae2ce9b592a30a7ff55d336597fe0e0074add5c5f3104b7108e1eb8e3445cebeaccb933b1f3876e04632f28a6ed287f18308772229fe6db4bf046ebb
 MISC metadata.xml 399 BLAKE2B 06318ca9aa1bb3f53733542916d19d28c03133866e868aefeba88d7e6e1b7594a628488471fe7f6853e02402a14db8501e056f5df9ae1429c4eca66ab7b6a492 SHA512 16caf359c45841ae27bfdeee51c7fdd71d6282548773e6f519cbcbfe43f9fa39c65322a610d2b3d5cb4471129cfa3738e6ee66ff6b6e94b4263d918fd44ff30c
diff --git a/media-gfx/xdot/files/backport-2ace1a1-issue-92.patch b/media-gfx/xdot/files/backport-2ace1a1-issue-92.patch
deleted file mode 100644
index 8cb76a43fe55..000000000000
--- a/media-gfx/xdot/files/backport-2ace1a1-issue-92.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-https://github.com/jrfonseca/xdot.py/issues/92
-https://bugs.gentoo.org/873490
-
-From 2ace1a12d78423d9e7af20fdb0bca34827010408 Mon Sep 17 00:00:00 2001
-From: Jose Fonseca <jose.r.fonseca@gmail.com>
-Date: Tue, 28 Sep 2021 13:19:49 +0100
-Subject: [PATCH] Handle xdot backslashes correctly.
-
-Irrespectively of graphviz version.
-
-Fixes https://github.com/jrfonseca/xdot.py/issues/92
----
- tests/issue_92_a.dot |  3 +++
- tests/issue_92_b.dot |  3 +++
- xdot/dot/parser.py   | 26 +++++++++++++++++++++-----
- xdot/ui/window.py    | 11 ++++++++++-
- 4 files changed, 37 insertions(+), 6 deletions(-)
- create mode 100644 tests/issue_92_a.dot
- create mode 100644 tests/issue_92_b.dot
-
-diff --git a/tests/issue_92_a.dot b/tests/issue_92_a.dot
-new file mode 100644
-index 0000000..ea486b0
---- /dev/null
-+++ b/tests/issue_92_a.dot
-@@ -0,0 +1,3 @@
-+digraph {
-+   1 [label="a\\00"]
-+}
-diff --git a/tests/issue_92_b.dot b/tests/issue_92_b.dot
-new file mode 100644
-index 0000000..ba90566
---- /dev/null
-+++ b/tests/issue_92_b.dot
-@@ -0,0 +1,3 @@
-+digraph {
-+   1 [label="a\\b"]
-+}
-diff --git a/xdot/dot/parser.py b/xdot/dot/parser.py
-index 4244e03..6578c23 100644
---- a/xdot/dot/parser.py
-+++ b/xdot/dot/parser.py
-@@ -14,8 +14,11 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- import colorsys
-+import re
- import sys
- 
-+from distutils.version import LooseVersion
-+
- from .lexer import ParseError, DotLexer
- 
- from ..ui.colors import lookup_color
-@@ -85,7 +88,14 @@ class XDotAttrParser:
-     - http://www.graphviz.org/doc/info/output.html#d:xdot
-     """
- 
--    def __init__(self, parser, buf):
-+    def __init__(self, parser, buf, broken_backslashes):
-+
-+        # `\` should be escaped as `\\`, but older versions of graphviz xdot
-+        # output failed to properly escape it.  See also
-+        # https://github.com/jrfonseca/xdot.py/issues/92
-+        if not broken_backslashes:
-+            buf = re.sub(br'\\(.)', br'\1', buf)
-+
-         self.parser = parser
-         self.buf = buf
-         self.pos = 0
-@@ -427,10 +437,16 @@ class XDotParser(DotParser):
- 
-     XDOTVERSION = '1.7'
- 
--    def __init__(self, xdotcode):
-+    def __init__(self, xdotcode, graphviz_version=None):
-         lexer = DotLexer(buf=xdotcode)
-         DotParser.__init__(self, lexer)
- 
-+        # https://github.com/jrfonseca/xdot.py/issues/92
-+        self.broken_backslashes = False
-+        if graphviz_version is not None and \
-+                LooseVersion(graphviz_version) < LooseVersion("2.46.0"):
-+            self.broken_backslashes = True
-+
-         self.nodes = []
-         self.edges = []
-         self.shapes = []
-@@ -480,7 +496,7 @@ def handle_graph(self, attrs):
- 
-         for attr in ("_draw_", "_ldraw_", "_hdraw_", "_tdraw_", "_hldraw_", "_tldraw_"):
-             if attr in attrs:
--                parser = XDotAttrParser(self, attrs[attr])
-+                parser = XDotAttrParser(self, attrs[attr], self.broken_backslashes)
-                 self.shapes.extend(parser.parse())
- 
-     def handle_node(self, id, attrs):
-@@ -502,7 +518,7 @@ def handle_node(self, id, attrs):
-         shapes = []
-         for attr in ("_draw_", "_ldraw_"):
-             if attr in attrs:
--                parser = XDotAttrParser(self, attrs[attr])
-+                parser = XDotAttrParser(self, attrs[attr], self.broken_backslashes)
-                 shapes.extend(parser.parse())
-         try:
-             url = attrs['URL']
-@@ -525,7 +541,7 @@ def handle_edge(self, src_id, dst_id, attrs):
-         shapes = []
-         for attr in ("_draw_", "_ldraw_", "_hdraw_", "_tdraw_", "_hldraw_", "_tldraw_"):
-             if attr in attrs:
--                parser = XDotAttrParser(self, attrs[attr])
-+                parser = XDotAttrParser(self, attrs[attr], self.broken_backslashes)
-                 shapes.extend(parser.parse())
-         if shapes:
-             src = self.node_by_name[src_id]
-diff --git a/xdot/ui/window.py b/xdot/ui/window.py
-index 893bd1d..e27f000 100644
---- a/xdot/ui/window.py
-+++ b/xdot/ui/window.py
-@@ -56,6 +56,7 @@ class DotWidget(Gtk.DrawingArea):
-     }
- 
-     filter = 'dot'
-+    graphviz_version = None
- 
-     def __init__(self):
-         Gtk.DrawingArea.__init__(self)
-@@ -100,6 +101,7 @@ def error_dialog(self, message):
- 
-     def set_filter(self, filter):
-         self.filter = filter
-+        self.graphviz_version = None
- 
-     def run_filter(self, dotcode):
-         if not self.filter:
-@@ -153,7 +155,14 @@ def set_dotcode(self, dotcode, filename=None, center=True):
- 
-     def set_xdotcode(self, xdotcode, center=True):
-         assert isinstance(xdotcode, bytes)
--        parser = XDotParser(xdotcode)
-+        if self.graphviz_version is None:
-+            stdout = subprocess.check_output([self.filter, '-V'], stderr=subprocess.STDOUT)
-+            stdout = stdout.rstrip()
-+            mo = re.match(br'^.* - .* version (?P<version>.*) \(.*\)$', stdout)
-+            assert mo
-+            self.graphviz_version = mo.group('version').decode('ascii')
-+
-+        parser = XDotParser(xdotcode, graphviz_version=self.graphviz_version)
-         self.graph = parser.parse()
-         self.zoom_image(self.zoom_ratio, center=center)
- 
diff --git a/media-gfx/xdot/xdot-1.2-r1.ebuild b/media-gfx/xdot/xdot-1.2-r1.ebuild
deleted file mode 100644
index 32e4f34fbe3a..000000000000
--- a/media-gfx/xdot/xdot-1.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-
-MY_PN=xdot.py
-EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-inherit ${GIT_ECLASS} distutils-r1 virtualx
-
-DESCRIPTION="Interactive viewer for Graphviz dot files"
-HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-PATCHES=( "${FILESDIR}/backport-2ace1a1-issue-92.patch" )
-
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	media-gfx/graphviz
-	test? ( x11-libs/gtk+:3[X] )
-"
-RDEPEND="${DEPEND}"
-
-run_test() {
-	cd tests && "${EPYTHON}" ../test.py *.dot graphs/*.gv
-	return "${?}"
-}
-
-python_test() {
-	virtx run_test
-}