eclass: Delete backwards-compat code for @ECLASS-VARIABLE

Signed-off-by: Ulrich Müller <ulm@gentoo.org>

Author: ulm

src/pkgcore/ebuild/eclass.py

@@ -279,36 +279,6 @@ def parse(self, lines, line_ind, next_line):
         return AttrDict(data)
 
 
-# For backwards compatibility, can be removed after 2022-12-31
-class EclassVarBlockCompat(ParseEclassDoc):
-    """ECLASS-VARIABLE doc block."""
-
-    tag = "@ECLASS-VARIABLE:"
-    key = "variables"
-    default = True
-
-    def __init__(self):
-        tags = {
-            "@ECLASS-VARIABLE:": ("name", True, self._eclass_variable, None),
-            "@DEPRECATED:": ("deprecated", False, self._tag_deprecated, False),
-            "@DEFAULT_UNSET": ("default_unset", False, self._tag_bool, False),
-            "@INTERNAL": ("internal", False, self._tag_bool, False),
-            "@REQUIRED": ("required", False, self._tag_bool, False),
-            "@PRE_INHERIT": ("pre_inherit", False, self._tag_bool, False),
-            "@USER_VARIABLE": ("user_variable", False, self._tag_bool, False),
-            "@OUTPUT_VARIABLE": ("output_variable", False, self._tag_bool, False),
-            "@DESCRIPTION:": ("description", True, self._tag_multiline_str, None),
-        }
-        super().__init__(tags)
-
-    def _eclass_variable(self, block, tag, lineno):
-        """Parse @ECLASS-VARIABLE tag."""
-        logger.warning(
-            f"{tag!r}, line {lineno}: deprecated, use '@ECLASS_VARIABLE' instead"
-        )
-        return self._tag_inline_arg(block, tag, lineno)
-
-
 class EclassFuncBlock(ParseEclassDoc):
     """FUNCTION doc block."""
 

tests/ebuild/test_eclass.py

@@ -75,10 +75,6 @@ def make_eclass(name, provides=None):
 # @DESCRIPTION:
 # Public variable.
 
-# @ECLASS-VARIABLE: FOO_ANOTHER_ECLASS_VAR
-# @DESCRIPTION:
-# Yet another variable.
-
 # @FUNCTION: _foo_internal_func
 # @USAGE: <bar> [<baz>]
 # @RETURN: nothing special
@@ -150,7 +146,6 @@ def test_foo_eclass(self, tmp_path):
             (
                 "FOO_PUBLIC_ECLASS_VAR",
                 "_FOO_INTERNAL_ECLASS_VAR",
-                "FOO_ANOTHER_ECLASS_VAR",
             )
         )
         assert doc.internal_variable_names == frozenset(("_FOO_INTERNAL_ECLASS_VAR",))
@@ -194,7 +189,7 @@ def test_foo_eclass(self, tmp_path):
             "description": "\n\nPublic variable for foo_public_func.",
         }
 
-        assert len(doc.variables) == 3
+        assert len(doc.variables) == 2
         assert doc.variables[0] == {
             "name": "_FOO_INTERNAL_ECLASS_VAR",
             "deprecated": False,
@@ -217,17 +212,6 @@ def test_foo_eclass(self, tmp_path):
             "output_variable": False,
             "description": "\n\nPublic variable.",
         }
-        assert doc.variables[2] == {
-            "name": "FOO_ANOTHER_ECLASS_VAR",
-            "deprecated": False,
-            "default_unset": False,
-            "internal": False,
-            "required": False,
-            "pre_inherit": False,
-            "user_variable": False,
-            "output_variable": False,
-            "description": "\n\nYet another variable.",
-        }
 
     def test_recursive_provides(self, tmp_path):
         with chdir(tmp_path):