From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC96A158087 for ; Mon, 24 Jan 2022 20:08:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F08852BC00F; Mon, 24 Jan 2022 20:08:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9ED722BC00F for ; Mon, 24 Jan 2022 20:08:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE0EE342C3D for ; Mon, 24 Jan 2022 20:08:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5276D250 for ; Mon, 24 Jan 2022 20:08:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643054919.48e07ea8abd7fe63bf7c276eae7ffa956f9f64b6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pydot/files/, dev-python/pydot/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch dev-python/pydot/pydot-1.4.2-r2.ebuild X-VCS-Directories: dev-python/pydot/files/ dev-python/pydot/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 48e07ea8abd7fe63bf7c276eae7ffa956f9f64b6 X-VCS-Branch: master Date: Mon, 24 Jan 2022 20:08:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c46a09d-2ad1-493b-bc51-c1aed26e1f48 X-Archives-Hash: 710f56e9b3c5937839d1c02d0426d3c1 commit: 48e07ea8abd7fe63bf7c276eae7ffa956f9f64b6 Author: Sam James gentoo org> AuthorDate: Mon Jan 24 20:08:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 24 20:08:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e07ea8 dev-python/pydot: workaround pyparsing-3 issue Closes: https://bugs.gentoo.org/830676 Signed-off-by: Sam James gentoo.org> .../pydot/files/pydot-1.4.2-pyparsing-3.patch | 22 +++++++++++++ dev-python/pydot/pydot-1.4.2-r2.ebuild | 36 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch b/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch new file mode 100644 index 000000000000..09d4c654ac17 --- /dev/null +++ b/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch @@ -0,0 +1,22 @@ +https://github.com/pydot/pydot/pull/281 +https://bugs.gentoo.org/830676 + +(rebased) + +From 4ab2c033c0dd67cab87be9a9392c558359caf80c Mon Sep 17 00:00:00 2001 +From: Anton Bolshakov +Date: Tue, 4 Jan 2022 16:05:51 +0800 +Subject: [PATCH] Update dot_parser.py + +https://github.com/pydot/pydot/issues/277 +--- a/dot_parser.py ++++ b/dot_parser.py +@@ -439,6 +439,8 @@ def graph_definition(): + + noncomma = "".join([c for c in printables if c != ","]) + alphastring_ = OneOrMore(CharsNotIn(noncomma + ' ')) ++ # override pyparsing tightened whitespace-skipping logic ++ alphastring_.skipWhitespace = True + + def parse_html(s, loc, toks): + return '<%s>' % ''.join(toks[0]) diff --git a/dev-python/pydot/pydot-1.4.2-r2.ebuild b/dev-python/pydot/pydot-1.4.2-r2.ebuild new file mode 100644 index 000000000000..db3881e7fab5 --- /dev/null +++ b/dev-python/pydot/pydot-1.4.2-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Python interface to Graphviz's Dot language" +HOMEPAGE="https://github.com/pydot/pydot https://pypi.org/project/pydot/" +# pypi releases don't include tests +SRC_URI="https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-python/pyparsing[${PYTHON_USEDEP}] + media-gfx/graphviz" +BDEPEND=" + test? ( + ${RDEPEND} + dev-python/chardet[${PYTHON_USEDEP}] + )" + +PATCHES=( +# "${FILESDIR}"/${PN}-1.4.2-pyparsing-3.patch +) + +python_test() { + cd test || die + "${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}" +}