4 files changed, 7 insertions, 244 deletions
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 6ad06a2dd437..024698e1530e 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,4 +1,3 @@
-AUX genshi-0.7.5-fix-py3.10.patch 6996 BLAKE2B 835c83e1f3f33d2066b4e4acb81d2ec71958a8a7cbb98abc482d1cdb4b570ac76f8087a7f1df6e1a06fe3e0ef010139ac0e3f2a5ab0ec10ef8aafcd680dc38ab SHA512 ad3c657bf9844159340cbebe1a10ff8ec65cc9764d9c5085b31b1a223ed1ba117281fe4bdfd51bdb778b6ff6344ccd0d1d23e9de50093ff0936d34aa27814425
-DIST Genshi-0.7.5.tar.gz 266071 BLAKE2B 007a094f8ce9aa17209a2c1c7241eb5eb50c3be3439fa2066ac7ceab88fa4dccbcaa11809042445e23ad1ce106b2e9efa825ac11de03038f07b421e9b93c03f6 SHA512 b5be34094e2eea8f5fc373097414dc77ddfe0ab0a82901b6fd87af558cf62420f690fb39bff2d13bde3f7fef5ef000697372996877b48187ed068227dab59119
-EBUILD genshi-0.7.5.ebuild 887 BLAKE2B 75c2c720f780dc77b02630bd134bfc38e3a3596c437d6f9d96fb111af32f7cf2b4ce5fb7d04d257569fac8e97a9d0900c7ee2a4e5b18de1f17b8c9c170f7f2ff SHA512 8b6d8f82af0b84690d651e0e83f98e077f22616bf2046762b496d9e73b0e40af3ebb3f58db77cfdd22af9476762fa7417501e182beea972f80f70d389eb9b924
-MISC metadata.xml 389 BLAKE2B 9d92c761c148cb904ea6098935fcbf2cf8d4cabab5a78a4648e6d8cdd3eb9e60373804c082094e4054b34f5014c0e44d0db22d90b7cff36a160423c494e04e76 SHA512 56d8d92964a3320a392c3f45973bbe73d40e5220b173bfc183ecd3c10c7e7e115aaa2bc7721eef83dadc88c2be78be5beabbfdc15a74a9b7c4a580c1d5978a5a
+DIST Genshi-0.7.6.tar.gz 268913 BLAKE2B c54930023c4cd45e24f44baa62f3cc3fe887c5bfd5feb9f7c694cea9bd500cd8c0cea0ed7a60035fb58de9b933199f54ada2a14edff9f5a1b1f63203d10ac7c8 SHA512 a05e82b2b1b9321153a202e5926a26795ebc7c56ee13b8c6da197007a00711efcc7f8ebfb759446c4c2cb99e7e92a6f689576f9ef1f766aa42e0dab86fd5e335
+EBUILD genshi-0.7.6.ebuild 870 BLAKE2B 82c0a85ba9584f684f159e46a8b43c7c6a3baa4673c09c37bc5028223adf9f9ddaf242fcf1de69796d017c5d3dcdbbe05df12cece469aaceb3e35aa06bdf0229 SHA512 0c7abbf2181dd4d27f4ea1c8343089bc10fb859cba1ef9758f5493742c48dbff5460803b7f2010f05a278a4e593d8ad8384bafc915a78839b03c376b3d913609
+MISC metadata.xml 365 BLAKE2B c5f3b55444eb424fc0ec15f0f19eef39a31c2c5e900fab7a06fe7bade29893ddb59baf4fa7f60621017a400dc7004dc093d124e1d3366df2663c0b714e31c8cc SHA512 1914d0acf5d6c517ff0198c827f606acc4124e834c306312d49d42bb729bb82b80ae6c98f3ac0797178eba3beb2c437a10665a23a843d0d3efbd148250a189dd
diff --git a/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch b/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch
deleted file mode 100644
index fea4e6434b26..000000000000
--- a/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
-https://github.com/edgewall/genshi/pull/49
-
---- a/genshi/util.py
-+++ b/genshi/util.py
-@@ -119,7 +119,6 @@ def _insert_item(self, item):
- 
-     def _manage_size(self):
-         while len(self._dict) > self.capacity:
--            olditem = self._dict[self.tail.key]
-             del self._dict[self.tail.key]
-             if self.tail != self.head:
-                 self.tail = self.tail.prv
-
---- a/genshi/core.py
-+++ b/genshi/core.py
-@@ -20,7 +20,8 @@
- 
- import six
- 
--from genshi.util import plaintext, stripentities, striptags, stringrepr
-+from genshi.compat import stringrepr
-+from genshi.util import stripentities, striptags
- 
- __all__ = ['Stream', 'Markup', 'escape', 'unescape', 'Attrs', 'Namespace',
-            'QName']
---- a/genshi/filters/tests/i18n.py
-+++ b/genshi/filters/tests/i18n.py
-@@ -12,7 +12,6 @@
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
- from datetime import datetime
--import doctest
- from gettext import NullTranslations
- import unittest
- 
---- a/genshi/filters/tests/test_html.py
-+++ b/genshi/filters/tests/test_html.py
-@@ -11,7 +11,6 @@
- # individuals. For the exact contribution history, see the revision
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
--import doctest
- import unittest
- 
- import six
---- a/genshi/filters/tests/transform.py
-+++ b/genshi/filters/tests/transform.py
-@@ -12,7 +12,6 @@
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
- import doctest
--from pprint import pprint
- import unittest
- 
- import six
---- a/genshi/input.py
-+++ b/genshi/input.py
-@@ -22,8 +22,6 @@
- import six
- from six.moves import html_entities as entities, html_parser as html
- 
--import six
--
- from genshi.core import Attrs, QName, Stream, stripentities
- from genshi.core import START, END, XML_DECL, DOCTYPE, TEXT, START_NS, \
-                         END_NS, START_CDATA, END_CDATA, PI, COMMENT
---- a/genshi/output.py
-+++ b/genshi/output.py
-@@ -20,7 +20,7 @@
- 
- import six
- 
--from genshi.core import escape, Attrs, Markup, Namespace, QName, StreamEventKind
-+from genshi.core import escape, Attrs, Markup, QName, StreamEventKind
- from genshi.core import START, END, TEXT, XML_DECL, DOCTYPE, START_NS, END_NS, \
-                         START_CDATA, END_CDATA, PI, COMMENT, XML_NAMESPACE
- 
---- a/genshi/template/base.py
-+++ b/genshi/template/base.py
-@@ -15,7 +15,6 @@
- 
- from collections import deque
- import os
--import sys
- 
- import six
- 
---- a/genshi/template/directives.py
-+++ b/genshi/template/directives.py
-@@ -19,8 +19,7 @@
- from genshi.path import Path
- from genshi.template.base import TemplateRuntimeError, TemplateSyntaxError, \
-                                  EXPR, _apply_directives, _eval_expr
--from genshi.template.eval import Expression, ExpressionASTTransformer, \
--                                 _ast, _parse
-+from genshi.template.eval import Expression, _ast, _parse
- 
- __all__ = ['AttrsDirective', 'ChooseDirective', 'ContentDirective',
-            'DefDirective', 'ForDirective', 'IfDirective', 'MatchDirective',
---- a/genshi/template/interpolation.py
-+++ b/genshi/template/interpolation.py
-@@ -16,7 +16,6 @@
- """
- 
- from itertools import chain
--import os
- import re
- from tokenize import PseudoToken
- 
---- a/genshi/template/markup.py
-+++ b/genshi/template/markup.py
-@@ -15,7 +15,7 @@
- 
- from itertools import chain
- 
--from genshi.core import Attrs, Markup, Namespace, Stream, StreamEventKind
-+from genshi.core import Attrs, Markup, Namespace, Stream
- from genshi.core import START, END, START_NS, END_NS, TEXT, PI, COMMENT
- from genshi.input import XMLParser
- from genshi.template.base import BadDirectiveError, Template, \
---- a/genshi/template/text.py
-+++ b/genshi/template/text.py
-@@ -35,7 +35,6 @@
-                                  TemplateSyntaxError, EXEC, INCLUDE, SUB
- from genshi.template.eval import Suite
- from genshi.template.directives import *
--from genshi.template.directives import Directive
- from genshi.template.interpolation import interpolate
- 
- __all__ = ['NewTextTemplate', 'OldTextTemplate', 'TextTemplate']
---- a/genshi/tests/core.py
-+++ b/genshi/tests/core.py
-@@ -11,13 +11,12 @@
- # individuals. For the exact contribution history, see the revision
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
--import doctest
- import pickle
- import unittest
- 
- from genshi import core
- from genshi.core import Markup, Attrs, Namespace, QName, escape, unescape
--from genshi.input import XML, ParseError
-+from genshi.input import XML
- from genshi.compat import StringIO, BytesIO, IS_PYTHON2
- from genshi.tests.test_utils import doctest_suite
- 
---- a/genshi/tests/input.py
-+++ b/genshi/tests/input.py
-@@ -11,8 +11,6 @@
- # individuals. For the exact contribution history, see the revision
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
--import doctest
--import sys
- import unittest
- 
- from genshi.core import Attrs, Stream
---- a/genshi/tests/output.py
-+++ b/genshi/tests/output.py
-@@ -11,9 +11,7 @@
- # individuals. For the exact contribution history, see the revision
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
--import doctest
- import unittest
--import sys
- 
- from genshi.core import Attrs, Markup, QName, Stream
- from genshi.input import HTML, XML
---- a/genshi/tests/path.py
-+++ b/genshi/tests/path.py
-@@ -11,7 +11,6 @@
- # individuals. For the exact contribution history, see the revision
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
--import doctest
- import unittest
- 
- from genshi.core import Attrs, QName
---- a/genshi/tests/util.py
-+++ b/genshi/tests/util.py
-@@ -11,7 +11,6 @@
- # individuals. For the exact contribution history, see the revision
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
--import doctest
- import unittest
- 
- from genshi import util
---- a/genshi/util.py
-+++ b/genshi/util.py
-@@ -19,8 +19,6 @@
- 
- import six
- 
--from .compat import stringrepr
--
- __docformat__ = 'restructuredtext en'
- 
- 
---- a/setup.py
-+++ b/setup.py
-@@ -12,11 +12,8 @@
- # individuals. For the exact contribution history, see the revision
- # history and logs, available at http://genshi.edgewall.org/log/.
- 
--from distutils.cmd import Command
- from distutils.command.build_ext import build_ext
- from distutils.errors import CCompilerError, DistutilsPlatformError
--import doctest
--from glob import glob
- import os
- try:
-     from setuptools import setup, Extension
-
---- a/genshi/compat.py
-+++ b/genshi/compat.py
-@@ -99,6 +99,13 @@ def get_code_params(code):
- 
- 
-     def build_code_chunk(code, filename, name, lineno):
-+        if hasattr(code, 'replace'):
-+            # Python 3.8+
-+            return code.replace(
-+                co_filename=filename,
-+                co_name=name,
-+                co_firstlineno=lineno,
-+            )
-         params =  [0, code.co_nlocals, code.co_kwonlyargcount,
-                   code.co_stacksize, code.co_flags | 0x0040,
-                   code.co_code, code.co_consts, code.co_names,
diff --git a/dev-python/genshi/genshi-0.7.5.ebuild b/dev-python/genshi/genshi-0.7.6.ebuild
index 113fce0e118e..9bf6bdb8842d 100644
--- a/dev-python/genshi/genshi-0.7.5.ebuild
+++ b/dev-python/genshi/genshi-0.7.6.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Python toolkit for stream-based generation of output for the web"
@@ -22,10 +24,6 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
 python_install_all() {
 	if use doc; then
 		dodoc doc/*.txt
diff --git a/dev-python/genshi/metadata.xml b/dev-python/genshi/metadata.xml
index f3594b2914d0..6c4804592302 100644
--- a/dev-python/genshi/metadata.xml
+++ b/dev-python/genshi/metadata.xml
@@ -5,7 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">edgewall/genshi</remote-id>
 		<remote-id type="pypi">Genshi</remote-id>