pkgcore 0.12.47__tar.gz → 0.12.48__tar.gz

{pkgcore-0.12.47 → pkgcore-0.12.48}/NEWS.rst

@@ -2,6 +2,19 @@
 Release Notes
 =============
 
+----------------------------
+pkgcore 0.12.48 (2026-10-24)
+----------------------------
+
+Fixes
+~~~~~
+
+- ``pkgcore.ebuild.eclass.EclassDoc``: functions and variables an eclass
+  defines only for some of its ``@SUPPORTED_EAPIS`` are now included, fixing
+  pkgcheck UnusedInherits false positives; ``eapi_exported_function_names``
+  and ``eapi_exported_variable_names`` give the names for one EAPI (Arthur
+  Zamarin)
+
 ----------------------------
 pkgcore 0.12.47 (2026-10-17)
 ----------------------------

{pkgcore-0.12.47 → pkgcore-0.12.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pkgcore
-Version: 0.12.47
+Version: 0.12.48
 Summary: package managing framework
 Author-email: Michał Górny <mgorny@gentoo.org>, Tim Harder <radhermit@gmail.com>, Brian Harring <ferringb@gmail.com>, Arthur Zamarin <arthurzam@gentoo.org>, Marien Zwart <marienz@gentoo.org>
 Maintainer-email: Arthur Zamarin <arthurzam@gentoo.org>

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/patom.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PATOM" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PATOM" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 patom \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/pclean.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PCLEAN" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PCLEAN" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pclean \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/pclonecache.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PCLONECACHE" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PCLONECACHE" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pclonecache \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/pconfig.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PCONFIG" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PCONFIG" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pconfig \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/pebuild.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PEBUILD" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PEBUILD" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pebuild \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/pinspect.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PINSPECT" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PINSPECT" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pinspect \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/pmaint.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PMAINT" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PMAINT" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pmaint \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/pmerge.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PMERGE" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PMERGE" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pmerge \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/build/sphinx/man/pquery.1

@@ -1,5 +1,5 @@
 .\" Man page generated from reStructuredText
-.\" by the Docutils 0.22.4 manpage writer.
+.\" by the Docutils 0.23 manpage writer.
 .
 .
 .nr rst2man-indent-level 0
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PQUERY" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
+.TH "PQUERY" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pquery \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.47 → pkgcore-0.12.48}/src/pkgcore/__init__.py

@@ -1,4 +1,4 @@
 __title__ = "pkgcore"
-__version__ = "0.12.47"
-__version_info__ = (0, 12, 47)
+__version__ = "0.12.48"
+__version_info__ = (0, 12, 48)
 __python_mininum_version__ = (3, 12, 0)

pkgcore-0.12.48/src/pkgcore/_verinfo.py

@@ -0,0 +1 @@
+version_info={'rev': '1d86803da4fc2eb2615a90d89e6c2767e78bb986', 'date': 'Sat Oct 24 18:48:27 2026', 'timestamp': 1792867707, 'tag': '0.12.48', 'commits': 0}

{pkgcore-0.12.47 → pkgcore-0.12.48}/src/pkgcore/binpkg/xpak.py

@@ -5,12 +5,12 @@ XPAK container support
 __all__ = ("MalformedXpak", "Xpak")
 
 import os
+import struct
 import typing
 from collections import OrderedDict
 from contextlib import contextmanager
 
 from snakeoil import klass
-from snakeoil import struct_compat as struct
 
 from ..exceptions import PkgcoreException
 
@@ -121,18 +121,21 @@ class Xpak:
         new_data = joiner.join(new_data)
 
         handle.seek(start, 0)
-        cls.header.write(handle, cls.header_pre_magic, len(new_index), len(new_data))
+        handle.write(
+            cls.header.pack(cls.header_pre_magic, len(new_index), len(new_data))
+        )
 
         handle.write(
             struct.pack(f">{len(new_index)}s{len(new_data)}s", new_index, new_data)
         )
 
         # the +8 is for the longs for new_index/new_data
-        cls.trailer.write(
-            handle,
-            cls.trailer_pre_magic,
-            len(new_index) + len(new_data) + cls.trailer.size + 8,
-            cls.trailer_post_magic,
+        handle.write(
+            cls.trailer.pack(
+                cls.trailer_pre_magic,
+                len(new_index) + len(new_data) + cls.trailer.size + 8,
+                cls.trailer_post_magic,
+            )
         )
         handle.truncate()
         handle.close()
@@ -175,7 +178,7 @@ class Xpak:
     def _check_magic(self, fd):
         fd.seek(-16, 2)
         try:
-            pre, size, post = self.trailer.read(fd)
+            pre, size, post = self.trailer.unpack(fd.read(self.trailer.size))
             if pre != self.trailer_pre_magic or post != self.trailer_post_magic:
                 raise MalformedXpak(
                     f"not an xpak segment, trailer didn't match: {fd!r}"
@@ -192,7 +195,7 @@ class Xpak:
         fd.seek(-(size + 8), 2)
         self.xpak_start = fd.tell()
         try:
-            pre, index_len, data_len = self.header.read(fd)
+            pre, index_len, data_len = self.header.unpack(fd.read(self.header.size))
             if pre != self.header_pre_magic:
                 raise MalformedXpak(f"not an xpak segment, header didn't match: {fd!r}")
         except struct.error as e:

{pkgcore-0.12.47 → pkgcore-0.12.48}/src/pkgcore/ebuild/eclass.py

@@ -426,7 +426,7 @@ _eclass_blocks_re = regexp(
 class EclassDoc(AttrDict):
     """Support parsing eclass docs for a given eclass path."""
 
-    ABI_VERSION = 6
+    ABI_VERSION = 7
 
     def __init__(self, path, /, *, sourced=False, repo=None):
         self.mtime = os.path.getmtime(path)
@@ -440,7 +440,7 @@ class EclassDoc(AttrDict):
 
         # inject full lists of exported funcs and vars
         if sourced:
-            data.update(self._source_eclass(path))
+            data.update(self._source_eclass(path, data["supported_eapis"]))
 
         super().__init__(data)
 
@@ -458,10 +458,22 @@ class EclassDoc(AttrDict):
         return tuple(out)
 
     @staticmethod
-    def _source_eclass(path):
+    def _source_eclass(path, eapis=()):
+        """Functions, variables and PROPERTIES the eclass defines.
+
+        Functions and variables are also collected with ``EAPI`` set to each of
+        *eapis*, and the names missing under an EAPI are recorded only for the
+        EAPIs that lack some.
+        """
         data = {}
         # TODO: support this via pkgcore's ebd
-        # source eclass to determine PROPERTIES
+        path = shlex.quote(path)
+        per_eapi = "".join(
+            f"echo @{shlex.quote(eapi)}; "
+            f"(EAPI={shlex.quote(eapi)}; source {path} >/dev/null; compgen -A function; "
+            f"printf '$%s\\n' $(compgen -A variable)); "
+            for eapi in eapis
+        )
         p = subprocess.run(
             [
                 "env",
@@ -469,7 +481,9 @@ class EclassDoc(AttrDict):
                 "bash",
                 "-c",
                 (
-                    f"source {shlex.quote(path)}; "
+                    f"{per_eapi}"
+                    f'echo "#"; '
+                    f"source {path} >/dev/null; "
                     f"compgen -A function; "
                     f'echo "#"; '
                     f"compgen -A variable; "
@@ -483,12 +497,37 @@ class EclassDoc(AttrDict):
             check=False,
         )
         if p.returncode == 0:
-            eclass_obj = ParseEclassDoc.blocks["@ECLASS:"]
-            funcs, variables, properties = p.stdout.split("#\n")
-            data["_exported_funcs"] = tuple(funcs.split())
-            data["_exported_vars"] = tuple(
-                x for x in variables.split() if x not in eclass_obj.bash_env_vars
-            )
+            bash_env_vars = ParseEclassDoc.blocks["@ECLASS:"].bash_env_vars | {"EAPI"}
+            per_eapi_out, funcs, variables, properties = p.stdout.split("#\n")
+
+            eapi_names = {}
+            for name in per_eapi_out.split():
+                if name.startswith("@"):
+                    eapi_names[name[1:]] = (eapi_funcs := set()), (eapi_vars := set())
+                elif name.startswith("$"):
+                    eapi_vars.add(name[1:])
+                else:
+                    eapi_funcs.add(name)
+
+            funcs = set(funcs.split())
+            variables = set(variables.split())
+            for eapi_funcs, eapi_vars in eapi_names.values():
+                funcs.update(eapi_funcs)
+                variables.update(eapi_vars)
+            variables.difference_update(bash_env_vars)
+
+            data["_exported_funcs"] = tuple(sorted(funcs))
+            data["_exported_vars"] = tuple(sorted(variables))
+            data["_eapi_missing_funcs"] = {
+                eapi: missing
+                for eapi, (eapi_funcs, _) in eapi_names.items()
+                if (missing := tuple(sorted(funcs - eapi_funcs)))
+            }
+            data["_eapi_missing_vars"] = {
+                eapi: missing
+                for eapi, (_, eapi_vars) in eapi_names.items()
+                if (missing := tuple(sorted(variables - eapi_vars)))
+            }
             data["_properties"] = conditionals.DepSet.parse(
                 properties, str, operators={}, attr="PROPERTIES"
             )
@@ -513,6 +552,11 @@ class EclassDoc(AttrDict):
         """Set of all exported function names in the eclass."""
         return frozenset(self._dict.get("_exported_funcs", ()))
 
+    def eapi_exported_function_names(self, eapi):
+        """Set of exported function names in the eclass under *eapi*."""
+        missing = self._dict.get("_eapi_missing_funcs", {}).get(str(eapi), ())
+        return self.exported_function_names.difference(missing)
+
     @property
     def variable_names(self):
         """Set of documented variable names in the eclass."""
@@ -536,6 +580,11 @@ class EclassDoc(AttrDict):
         """
         return frozenset(self._dict.get("_exported_vars", ()))
 
+    def eapi_exported_variable_names(self, eapi):
+        """Set of exported variable names in the eclass under *eapi*."""
+        missing = self._dict.get("_eapi_missing_vars", {}).get(str(eapi), ())
+        return self.exported_variable_names.difference(missing)
+
     @property
     def function_variable_names(self):
         """Set of documented function variable names in the eclass."""

{pkgcore-0.12.47 → pkgcore-0.12.48}/tests/ebuild/test_eclass.py

@@ -1,5 +1,6 @@
 import logging
 import re
+import textwrap
 from contextlib import chdir
 
 import pytest
@@ -437,3 +438,33 @@ class TestRewriteQuoting:
         )
         doc = eclass.EclassDoc(str(tmp_path / "foo.eclass"))
         assert "echo `date`" in doc.description
+
+
+def test_sourced_names_defined_for_some_eapis(tmp_path):
+    (path := tmp_path / "gu.eclass").write_text(
+        textwrap.dedent(
+            """\
+            # @ECLASS: gu.eclass
+            # @MAINTAINER:
+            # a@b.c
+            # @SUPPORTED_EAPIS: 6 7 8
+            # @BLURB: test
+
+            case ${EAPI} in
+            \t6) gu_case() { :; }; GU_CASE=1 ;;
+            esac
+            if [[ ${EAPI} == [67] ]]; then
+            \tgu_if() { :; }
+            fi
+            gu_always() { :; }
+            """
+        )
+    )
+    doc = eclass.EclassDoc(str(path), sourced=True)
+    assert doc.exported_function_names == {"gu_always", "gu_case", "gu_if"}
+    assert doc.eapi_exported_function_names("6") == doc.exported_function_names
+    assert doc.eapi_exported_function_names("7") == {"gu_always", "gu_if"}
+    assert doc.eapi_exported_function_names("8") == {"gu_always"}
+    assert doc.eapi_exported_variable_names("6") == {"GU_CASE"}
+    assert doc.eapi_exported_variable_names("8") == set()
+    assert "6" not in doc._eapi_missing_funcs

{pkgcore-0.12.47 → pkgcore-0.12.48}/tests/test_landlock.py

@@ -295,6 +295,7 @@ class TestStaleProcessors:
         """confine() drops them itself, so no caller can forget to."""
         from pkgcore.ebuild import processor
 
+        pytest.importorskip("py_landlock")
         monkeypatch.setattr(processor, "inactive_ebp_list", ["stale ebp"])
         monkeypatch.setattr(landlock, "Landlock", FakeLandlock)
         assert landlock.confine(required=True)

pkgcore-0.12.47/src/pkgcore/_verinfo.py

@@ -1 +0,0 @@
-version_info={'rev': '4f4c6a14ba13af45f21f8184ba2e3640b2a4cb11', 'date': 'Sat Oct 17 06:28:35 2026', 'timestamp': 1792218515, 'tag': '0.12.47', 'commits': 0}