commit: 8e426ccff148220423503c9a1c6c512c9b63ddfa Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Tue Oct 13 14:27:14 2020 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Tue Oct 13 14:28:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e426ccf
app-portage/gentoolkit: Fix use flag desc. in 0.5.0-r1 bug 748129 Fix duplicated text in some use flag descriptions caused by the -r1 py3.9 patch. Closes: https://bugs.gentoo.org/748129 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> .../files/gentoolkit-0.5.0-r1-python3_9.patch | 34 ++++++++++++++++++++++ ...-0.5.0-r1.ebuild => gentoolkit-0.5.0-r2.ebuild} | 5 +++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch new file mode 100644 index 00000000000..a9dae615045 --- /dev/null +++ b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch @@ -0,0 +1,34 @@ +From f14b6198d1dd9cb7f4a83f3822e4a1782a5581e8 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <[email protected]> +Date: Tue, 13 Oct 2020 10:04:07 -0400 +Subject: [PATCH] metadata.py: Fix duplicated use flag text bug 748129 + +Regression from commit: 517581df206766 +link: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=517581df206766fabf10273cde565e0a6dc62829 +Gentoo bug: https://bugs.gentoo.org/748129 +Signed-off-by: Brian Dolbec <[email protected]> +--- + pym/gentoolkit/metadata.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py +index c3dba98..0b58392 100644 +--- a/pym/gentoolkit/metadata.py ++++ b/pym/gentoolkit/metadata.py +@@ -101,8 +101,11 @@ class _Useflag(object): + if node.text: + _desc = node.text + for child in node.iter(): +- _desc += child.text if child.text else '' +- _desc += child.tail if child.tail else '' ++ # prevent duplicate text ++ if child.text and child.text not in _desc: ++ _desc += child.text ++ if child.tail and not child.tail in _desc: ++ _desc += child.tail + # This takes care of tabs and newlines left from the file + self.description = re.sub(r'\s+', ' ', _desc) + +-- +libgit2 1.0.1 + diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild similarity index 95% rename from app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild rename to app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild index 18ac36af876..77fdfb33cf1 100644 --- a/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild @@ -27,7 +27,10 @@ RDEPEND="${DEPEND} distutils_enable_tests setup.py -PATCHES=( "${FILESDIR}"/${PN}-0.5.0-python3_9.patch) +PATCHES=( + "${FILESDIR}"/${PN}-0.5.0-python3_9.patch + "${FILESDIR}"/${PN}-0.5.0-r1-python3_9.patch +) python_prepare_all() { python_setup
