commit: aba2b486ec0f3c3c66e6405b1b6bd8a5f6f40f0b
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Mar 3 15:09:41 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 03:15:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba2b486
app-doc/gimp-help: drop old 2.10.0-r2
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-doc/gimp-help/Manifest | 1 -
.../gimp-help/files/gimp-help-2.10.0-python3.patch | 297 ---------------------
app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 44 ---
3 files changed, 342 deletions(-)
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index b47b3228533e..f364e53f8979 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,2 +1 @@
-DIST gimp-help-2.10.0.tar.bz2 187092180 BLAKE2B
29a7fbe3fcb6f3210aeda4bc514d7e0eeca05f9fabd3b9022c7ed1e5a9432876cc3bf530632648e2eb50509add4e387106d9705a1c17469e33496daec737d21b
SHA512
2f6d5e7cf0c3b4960c92074ef02d51a1d089c148f6453a66e453a3084cdede280f72c6b77d35f66777adbda8aa273ec2a472fb538142e51bb263c3077eec473a
DIST gimp-help-2.10.34.tar.bz2 165540436 BLAKE2B
eff5afe87bbddf9166647424ef63399a4ebc4215980dddf42f949e18245c60d1095269592f5a314683f7e1d7b27e2b9130215bda5987e7c8dfcafb5cebb6abbc
SHA512
316d558f66c96a0d2d0f17baf700020b76aa221f9e220ddfc3e85b10c82b20b9c1cf36893776a342e90af5170e0102eb743b79663451581444d4f881256cf377
diff --git a/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch
b/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch
deleted file mode 100644
index e42214a0f82b..000000000000
--- a/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff -urNp a/tools/xml2po/__init__.py b/tools/xml2po/__init__.py
---- a/tools/xml2po/__init__.py 2019-11-28 11:45:00.889048989 +0100
-+++ b/tools/xml2po/__init__.py 2020-01-06 13:24:24.715787902 +0100
-@@ -166,7 +166,7 @@ class XMLDocument(object):
- elif node.isText():
- if node.isBlankNode():
- if self.app.options.get('expand_entities') or \
-- (not (node.prev and not node.prev.isBlankNode() and
node.next and not node.next.isBlankNode()) ):
-+ (not (node.prev and not node.prev.isBlankNode() and
node.nextElementSibling() and not node.next.isBlankNode()) ):
- #print >>sys.stderr, "BLANK"
- node.setContent('')
- else:
-@@ -200,7 +200,7 @@ class XMLDocument(object):
- tree = ctxt.doc()
- newnode = tree.getRootElement()
- except:
-- print >> sys.stderr, """Error while normalizing string as
XML:\n"%s"\n""" % (text)
-+ print("""Error while normalizing string as XML:\n"%s"\n""" %
(text), file=sys.stderr)
- return text
-
- self.normalizeNode(newnode)
-@@ -259,7 +259,7 @@ class XMLDocument(object):
- if not self.expand_entities:
- result += '&' + child.name + ';'
- else:
-- result += child.content.decode('utf-8')
-+ result += child.content
- else:
- result += self.myAttributeSerialize(child)
- child = child.next
-@@ -326,7 +326,7 @@ class XMLDocument(object):
- pass
-
- content = '<%s>%s</%s>' % (starttag, text, endtag)
-- tmp = tmp + content.encode('utf-8')
-+ tmp = tmp + content
-
- newnode = None
- try:
-@@ -338,7 +338,7 @@ class XMLDocument(object):
- pass
-
- if not newnode:
-- print >> sys.stderr, """Error while parsing translation as
XML:\n"%s"\n""" % (text.encode('utf-8'))
-+ print("""Error while parsing translation as XML:\n"%s"\n""" %
(text), file=sys.stderr)
- return
-
- newelem = newnode.getRootElement()
-@@ -354,7 +354,7 @@ class XMLDocument(object):
- copy = newelem.copyNodeList()
- next = node.next
- node.replaceNode(newelem.copyNodeList())
-- node.next = next
-+ node.__next__ = next
-
- else:
- # In practice, this happens with tags such as "<para>
</para>" (only whitespace in between)
-@@ -406,7 +406,7 @@ class XMLDocument(object):
- translation = self.app.getTranslation(outtxt) # unicode or None
- if translation is not None:
- self.replaceAttributeContentsWithText(attr,
--
translation.encode('utf-8'))
-+ translation)
- else:
- self.app.msg.outputMessage(outtxt, node.lineNo(), "",
spacepreserve=False,
- tag = node.name + ":" + attr.name)
-@@ -447,14 +447,14 @@ class XMLDocument(object):
- norm_outtxt = self.normalizeString(outtxt,
self.app.isSpacePreserveNode(node))
- translation = self.app.getTranslation(norm_outtxt)
- else:
-- translation = outtxt.decode('utf-8')
-+ translation = outtxt
-
- starttag = self.startTagForNode(node)
- endtag = self.endTagForNode(node)
-
- worth = self.worthOutputting(node)
- if not translation:
-- translation = outtxt.decode('utf-8')
-+ translation = outtxt
- if worth and self.app.options.get('mark_untranslated'):
- node.setLang('C')
-
-@@ -463,7 +463,7 @@ class XMLDocument(object):
- # repl[0] may contain translated attributes with
- # non-ASCII chars, so implicit conversion to <str> may fail
- replacement = '<%s>%s</%s>' % \
-- (repl[0].decode('utf-8'), repl[3], repl[2])
-+ (repl[0], repl[3], repl[2])
- translation = translation.replace('<placeholder-%d/>' %
(i+1), replacement)
-
- if worth:
-@@ -542,7 +542,7 @@ class Main(object):
- elif output == '-':
- self.out = sys.stdout
- else:
-- self.out = file(output, 'w')
-+ self.out = open(output, 'w')
-
- def load_mode(self, modename):
- try:
-@@ -565,7 +565,7 @@ class Main(object):
- try:
- doc = XMLDocument(xmlfile, self)
- except Exception as e:
-- print >> sys.stderr, "Unable to parse XML file '%s': %s" %
(xmlfile, str(e))
-+ print("Unable to parse XML file '%s': %s" % (xmlfile,
str(e)), file=sys.stderr)
- sys.exit(1)
- self.current_mode.preProcessXml(doc.doc, self.msg)
- doc.generate_messages()
-@@ -578,13 +578,13 @@ class Main(object):
- try:
- doc = XMLDocument(xmlfile, self)
- except Exception as e:
-- print >> sys.stderr, str(e)
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
-
- try:
- mfile = open(mofile, "rb")
- except:
-- print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
-+ print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
- self.gt = gettext.GNUTranslations(mfile)
- self.gt.add_fallback(NoneTranslations())
- # Has preProcessXml use cases for merge?
-@@ -607,7 +607,7 @@ class Main(object):
- try:
- doc = XMLDocument(xmlfile, self)
- except Exception as e:
-- print >> sys.stderr, str(e)
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
- doc.generate_messages()
-
-@@ -615,7 +615,7 @@ class Main(object):
- try:
- doc = XMLDocument(origxml, self)
- except Exception as e:
-- print >> sys.stderr, str(e)
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
- doc.generate_messages()
- self.output_po()
-@@ -646,11 +646,11 @@ class Main(object):
-
- text should be a string to look for.
- """
-- #print >>sys.stderr,"getTranslation('%s')" % (text.encode('utf-8'))
-+ #print >>sys.stderr,"getTranslation('%s')" % (text)
- if not text or text.strip() == '':
- return text
- if self.gt:
-- res = self.gt.ugettext(text.decode('utf-8'))
-+ res = self.gt.gettext(text)
- return res
-
- return text
-diff -urNp a/tools/xml2po/modes/docbook.py b/tools/xml2po/modes/docbook.py
---- a/tools/xml2po/modes/docbook.py 2019-11-28 11:45:00.889048989 +0100
-+++ b/tools/xml2po/modes/docbook.py 2020-01-06 13:10:18.324679751 +0100
-@@ -43,7 +43,7 @@ try:
- except ImportError:
- from md5 import new as md5_new
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class docbookXmlMode(basicXmlMode):
- """Class for special handling of DocBook document types.
-@@ -131,7 +131,7 @@ class docbookXmlMode(basicXmlMode):
- hash = self._md5_for_file(fullpath)
- else:
- hash = "THIS FILE DOESN'T EXIST"
-- print >>sys.stderr, "Warning: image file '%s' not found."
% fullpath
-+ print("Warning: image file '%s' not found." % fullpath,
file=sys.stderr)
-
- msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash),
node.lineNo(),
- "When image changes, this message will be
marked fuzzy or untranslated for you.\n"+
-@@ -184,7 +184,7 @@ class docbookXmlMode(basicXmlMode):
- else:
- ai.addChild(copy)
- if match.group(3):
-- copy.newChild(None, "year",
match.group(3).encode('utf-8'))
-+ copy.newChild(None, "year", match.group(3))
- if match.group(1) and match.group(2):
- holder = match.group(1)+"(%s)" % match.group(2)
- elif match.group(1):
-@@ -193,15 +193,15 @@ class docbookXmlMode(basicXmlMode):
- holder = match.group(2)
- else:
- holder = "???"
-- copy.newChild(None, "holder", holder.encode('utf-8'))
-+ copy.newChild(None, "holder", holder)
-
- # Perform some tests when ran standalone
- if __name__ == '__main__':
- test = docbookXmlMode()
-- print "Ignored tags : " + repr(test.getIgnoredTags())
-- print "Final tags : " + repr(test.getFinalTags())
-- print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
-+ print("Ignored tags : " + repr(test.getIgnoredTags()))
-+ print("Final tags : " + repr(test.getFinalTags()))
-+ print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
-
-- print "Credits from string: '%s'" % test.getStringForTranslators()
-- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
-+ print("Credits from string: '%s'" % test.getStringForTranslators())
-+ print("Explanation for credits:\n\t'%s'" %
test.getCommentForTranslators())
-
-diff -urNp a/tools/xml2po/modes/gimphelp.py b/tools/xml2po/modes/gimphelp.py
---- a/tools/xml2po/modes/gimphelp.py 2019-11-28 11:45:00.889048989 +0100
-+++ b/tools/xml2po/modes/gimphelp.py 2020-01-06 11:59:17.387855373 +0100
-@@ -31,7 +31,7 @@ try:
- except ImportError:
- from md5 import new as md5_new
-
--from docbook import docbookXmlMode
-+from .docbook import docbookXmlMode
-
- class gimphelpXmlMode(docbookXmlMode):
- """Class for special handling of gimp-help DocBook document types.
-@@ -91,10 +91,10 @@ class gimphelpXmlMode(docbookXmlMode):
- # Perform some tests when ran standalone
- if __name__ == '__main__':
- test = gimphelpXmlMode()
-- print "Ignored tags : " + repr(test.getIgnoredTags())
-- print "Final tags : " + repr(test.getFinalTags())
-- print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
-+ print("Ignored tags : " + repr(test.getIgnoredTags()))
-+ print("Final tags : " + repr(test.getFinalTags()))
-+ print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
-
-- print "Credits from string: '%s'" % test.getStringForTranslators()
-- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
-+ print("Credits from string: '%s'" % test.getStringForTranslators())
-+ print("Explanation for credits:\n\t'%s'" %
test.getCommentForTranslators())
-
-diff -urNp a/tools/xml2po.py b/tools/xml2po.py
---- a/tools/xml2po.py 2019-11-28 11:45:00.889048989 +0100
-+++ b/tools/xml2po.py 2020-01-06 11:59:17.387855373 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- # -*- encoding: utf-8 -*-
- # Copyright (c) 2004, 2005, 2006 Danilo Šegan <[email protected]>.
- # Copyright (c) 2009 Claude Paroz <[email protected]>.
-@@ -41,9 +41,9 @@ NULL_STRING = '/dev/null'
- if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
-
- def usage (with_help = False):
-- print >> sys.stderr, "Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
-+ print("Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]),
file=sys.stderr)
- if with_help:
-- print >> sys.stderr, """
-+ print("""
- OPTIONS may be some of:
- -a --automatic-tags Automatically decides if tags are to be
considered
- "final" or not
-@@ -72,7 +72,7 @@ EXAMPLES:
- using -p option for each XML file:
- %(command)s -p de.po chapter1.xml > chapter1.de.xml
- %(command)s -p de.po chapter2.xml > chapter2.de.xml
--""" % {'command': sys.argv[0]}
-+""" % {'command': sys.argv[0]}, file=sys.stderr)
-
-
- def main(argv):
-@@ -148,7 +148,7 @@ def main(argv):
- sys.exit(0)
-
- if operation == 'update' and output != "-":
-- print >> sys.stderr, "Option '-o' is not yet supported when updating
translations directly. Ignoring this option."
-+ print("Option '-o' is not yet supported when updating translations
directly. Ignoring this option.", file=sys.stderr)
-
- # Treat remaining arguments as XML files
- filenames = []
-@@ -158,16 +158,16 @@ def main(argv):
- try:
- xml2po_main = Main(default_mode, operation, output, options)
- except IOError:
-- print >> sys.stderr, "Error: cannot open file %s for writing." %
(output)
-+ print("Error: cannot open file %s for writing." % (output),
file=sys.stderr)
- sys.exit(5)
-
- if operation == 'merge':
- if len(filenames) > 1:
-- print >> sys.stderr, "Error: You can merge translations with
only one XML file at a time."
-+ print("Error: You can merge translations with only one XML file
at a time.", file=sys.stderr)
- sys.exit(2)
-
- if not mofile:
-- print >> sys.stderr, "Error: You must specify MO file when
merging translations."
-+ print("Error: You must specify MO file when merging
translations.", file=sys.stderr)
- sys.exit(3)
-
- xml2po_main.merge(mofile, filenames[0])
diff --git a/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild
b/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild
deleted file mode 100644
index dfd098a6ac79..000000000000
--- a/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit python-any-r1
-
-DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="https://docs.gimp.org/";
-SRC_URI="mirror://gimp/help/${P}.tar.bz2"
-
-LICENSE="FDL-1.2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-BDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd
- dev-lang/perl
- dev-libs/libxslt
- sys-devel/gettext
-"
-
-# Adds python3 build support, bug 725940
-# patch is from https://gitlab.gnome.org/GNOME/gimp-help/-/issues/201
-PATCHES=( "${FILESDIR}/${P}-python3.patch" )
-
-python_check_deps() {
- python_has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
-src_configure() {
- econf --without-gimp
-}
-
-src_compile() {
- # See bug: 833566
- python_export_utf8_locale
- # Affected with bugs: 677198, 876205. Set "emake -j1"
- emake -j1
-}
