From eecd75a62239257eb2235bfe8697c73887a9a080 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jan 2024 00:57:18 +0000 Subject: gentoo auto-resync : 29:01:2024 - 00:57:18 --- dev-util/Manifest.gz | Bin 64122 -> 64129 bytes dev-util/itstool/Manifest | 2 + .../itstool/files/itstool-2.0.7-raw-string.patch | 74 +++++++++++++++++++++ dev-util/itstool/itstool-2.0.7-r2.ebuild | 38 +++++++++++ 4 files changed, 114 insertions(+) create mode 100644 dev-util/itstool/files/itstool-2.0.7-raw-string.patch create mode 100644 dev-util/itstool/itstool-2.0.7-r2.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 5177a44e964e..35e84c832cc0 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest index 8770af28da2a..bde488d201a1 100644 --- a/dev-util/itstool/Manifest +++ b/dev-util/itstool/Manifest @@ -1,5 +1,7 @@ AUX itstool-2.0.7-missing-translation-fix.patch 1260 BLAKE2B af0023bb175919f58ce3150b714f28059c39991e6b1a223b3599b3776690a4457b4ca67d267599ae562ff1633c4c6c93fa064d0a6221abf8b889cb9975f9a0bd SHA512 4536552d4587f4ce5573367c274854710e3df56485fefb00c9d3ca5efcff3cce91e2ff4b0b67d604f4b3884b57493e4ff282d4bafce6c1e257eeb0686cd824d9 +AUX itstool-2.0.7-raw-string.patch 3193 BLAKE2B 37f1a182d0a26837a84ad7a0524f47b309264c0eb150e39333071a273e825a2a3962d6172911d72e6744189c2a007c528ca57f073bbb436e874aed21bde47041 SHA512 a783b912b0306d8a336fee292db9cd90ca1d61e382d144b823581d16d0ec0f9f96305c3f6b8bf0704295d3b29fd997378d22258899695319c27e6c24912e41aa DIST itstool-2.0.7.tar.bz2 104648 BLAKE2B e2d27d7b0a772596a0fa02b157bbef65b132b839c908c114596d21a54c245a0c941419a3555a8b9b7255800f9ef65d557a5b0f6847103b0a3934c908d43128ab SHA512 710c188e518a7eccbf9d31df59692fd6acc79430589a93ef4333f33f74440c311c340614ca74cc43191830567a98024d0981325ccd83a8fd9b75410d9dd91992 EBUILD itstool-2.0.7-r1.ebuild 1034 BLAKE2B f0ad751a56a749fa33e55598a844f0fc24754f1e1a887abdb70ad501b3934d4119bc47f0ef01083bc5e7e5d2c20ecf3e9839077837a0158d0144a9e1f09edd98 SHA512 1b2031ca5978d97671107e29acff1d81f2cbb35a204d87c6b055cc2b937dbb97b402fe0cc8078d3e6205bbb42c6be41adf6591153ada20cfb133dee7b1306ffb +EBUILD itstool-2.0.7-r2.ebuild 1076 BLAKE2B 4a57164ff937639a8dab4355f2232b1d40d37806a30b0a3f3f91737502bf28b47e81d927bbe55054f4bd0ccf0a9718034f05719a2a3dc02de99883c158508c6d SHA512 81dd3d3d4ab33ecc9200076235f08a5de7abc433795ff51f64a08af92f2b2338f129b2696b8e98d78c2fca7cddaf445b5c7b8743b9b530772a477837f4d14bc0 EBUILD itstool-2.0.7.ebuild 964 BLAKE2B 7eef310838935bc5b47d23706e3e4ad6410c137e868f662f83e86a7e7c66d703b893625d7645fd878e818ff818016805b75833ea82361d75cac42f51ec809333 SHA512 588c133c33a90f5f81886a89f632a6d0bec501b7089b05385aed0adbb88c7255ce09c30962620a902739c7f49334d90e4d72f7f87414f29234d784f263fe979b MISC metadata.xml 612 BLAKE2B 0d4784d03f20c26f28f64015ee59a119b1059fd75f27352b0e99f07b5c3914ea3541674d4970620b1bbd6278951e524e687807d1275da1999d3a2fa311fb8206 SHA512 dcf3e043d41747edbd72e8081b75617b88d76e6c46fea1e112e5c2a8e7049f74f1b5ece6de4681863994eeb18bade3b793c3944269ddc5d3b6c6ead1a72dc8f9 diff --git a/dev-util/itstool/files/itstool-2.0.7-raw-string.patch b/dev-util/itstool/files/itstool-2.0.7-raw-string.patch new file mode 100644 index 000000000000..d879734b7622 --- /dev/null +++ b/dev-util/itstool/files/itstool-2.0.7-raw-string.patch @@ -0,0 +1,74 @@ +From: https://github.com/itstool/itstool/pull/51/commits/32c7d07664dc37765100285d1202d488cd6a27e8 +From 32c7d07664dc37765100285d1202d488cd6a27e8 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Mon, 9 Oct 2023 14:26:43 +0200 +Subject: [PATCH] Fix insufficiently quoted regular expressions + +These went under the radar until Python 3.12 started warning about them. + +Signed-off-by: Nils Philippsen +--- + itstool.in | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/itstool.in b/itstool.in +index c21ad4b..4452616 100755 +--- a/itstool.in ++++ b/itstool.in +@@ -220,7 +220,7 @@ class Message (object): + if not isinstance(text, ustr_type): + text = ustr(text, 'utf-8') + self._message[-1] += text.replace('&', '&').replace('<', '<').replace('>', '>') +- if re.sub('\s+', ' ', text).strip() != '': ++ if re.sub(r'\s+', ' ', text).strip() != '': + self._empty = False + + def add_entity_ref (self, name): +@@ -318,7 +318,7 @@ class Message (object): + message += '<_:%s-%i/>' % (msg.name, placeholder) + placeholder += 1 + if not self._preserve: +- message = re.sub('\s+', ' ', message).strip() ++ message = re.sub(r'\s+', ' ', message).strip() + return message + + def get_preserve_space (self): +@@ -456,9 +456,9 @@ class LocNote (object): + if self._preserve_space: + return self.locnote + else: +- return re.sub('\s+', ' ', self.locnote).strip() ++ return re.sub(r'\s+', ' ', self.locnote).strip() + elif self.locnoteref is not None: +- return '(itstool) link: ' + re.sub('\s+', ' ', self.locnoteref).strip() ++ return '(itstool) link: ' + re.sub(r'\s+', ' ', self.locnoteref).strip() + return '' + + +@@ -889,7 +889,7 @@ class Document (object): + trans = translations.ugettext('_\x04translator-credits') + if trans is None or trans == 'translator-credits': + return +- regex = re.compile('(.*) \<(.*)\>, (.*)') ++ regex = re.compile(r'(.*) \<(.*)\>, (.*)') + for credit in trans.split('\n'): + match = regex.match(credit) + if not match: +@@ -924,7 +924,7 @@ class Document (object): + prevnode = None + if node.prev is not None and node.prev.type == 'text': + prevtext = node.prev.content +- if re.sub('\s+', '', prevtext) == '': ++ if re.sub(r'\s+', '', prevtext) == '': + prevnode = node.prev + for lang in sorted(list(translations.keys()), reverse=True): + locale = self.get_its_locale_filter(node) +@@ -1468,7 +1468,7 @@ def match_locale(extrange, locale): + localei += 1 + return True + +-_locale_pattern = re.compile('([a-zA-Z0-9-]+)(_[A-Za-z0-9]+)?(@[A-Za-z0-9]+)?(\.[A-Za-z0-9]+)?') ++_locale_pattern = re.compile(r'([a-zA-Z0-9-]+)(_[A-Za-z0-9]+)?(@[A-Za-z0-9]+)?(\.[A-Za-z0-9]+)?') + def convert_locale (locale): + # Automatically convert POSIX-style locales to BCP47 + match = _locale_pattern.match(locale) diff --git a/dev-util/itstool/itstool-2.0.7-r2.ebuild b/dev-util/itstool/itstool-2.0.7-r2.ebuild new file mode 100644 index 000000000000..e8306872ae4a --- /dev/null +++ b/dev-util/itstool/itstool-2.0.7-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit python-single-r1 + +DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules" +HOMEPAGE="http://itstool.org/" +SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2" + +# files in /usr/share/itstool/its are under a special exception || GPL-3+ +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/libxml2[python,${PYTHON_USEDEP}] + ')" +DEPEND="${RDEPEND}" + +DOCS=(ChangeLog NEWS) # AUTHORS, README are empty + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.7-missing-translation-fix.patch + "${FILESDIR}"/${PN}-2.0.7-raw-string.patch +) + +src_test() { + : + #"${PYTHON}" tests/run_tests.py || die "test suite failed" # Test suite not shipped in tarball +} -- cgit v1.2.3