pkgcore 0.12.46__tar.gz → 0.12.48__tar.gz

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

@@ -2,6 +2,55 @@
 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)
+----------------------------
+
+Fixes
+~~~~~
+
+- ``pquery`` no longer crashes with ``NotImplementedError`` when a binpkg
+  repo is configured in ``repos.conf`` (Arthur Zamarin)
+
+- Remerging a package whose protected config file already has an identical
+  pending ``._cfg`` update reuses it instead of adding another
+  (Arthur Zamarin)
+
+- ``pkgcore.binpkg.xpak.Xpak``: close the binpkg after each read instead of
+  leaving it open until garbage collection (Arthur Zamarin)
+
+- A ``%`` in a ``pkgcore.conf`` value that isn't a valid interpolation is
+  reported as a config parsing error naming the file, instead of a traceback
+  (Arthur Zamarin)
+
+- ``pkgcore.fs.livefs.iter_scan``: with an ``offset``, stat the top entry inside
+  the offset rather than the host path of the same name, stop at a top entry
+  that is a file, and honor ``follow_symlinks`` below the top (Arthur Zamarin)
+
+- Version comparison treats the first version component as an integer, as PMS
+  and Portage do, so ``pkg-01`` equals ``pkg-1`` and ``=cat/pkg-1`` matches it
+  (Arthur Zamarin)
+
+- ``pquery --owns`` finds files through symlinked directories, so
+  ``/bin/ls`` matches ``/usr/bin/ls`` on merged-usr systems (Arthur Zamarin)
+
+- Support the ``profile-default-eapi`` profile format: profiles without an
+  ``eapi`` file use ``profile_eapi_when_unspecified`` from ``layout.conf``
+  instead of EAPI 0 (Arthur Zamarin)
+
 ----------------------------
 pkgcore 0.12.46 (2026-10-08)
 ----------------------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pkgcore
-Version: 0.12.46
+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.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PATOM" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 patom \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PCLEAN" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pclean \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PCLONECACHE" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pclonecache \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PCONFIG" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pconfig \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PEBUILD" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pebuild \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PINSPECT" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pinspect \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PMAINT" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pmaint \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PMERGE" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pmerge \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → 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 08, 2026" "0.12.46" "pkgcore"
+.TH "PQUERY" "1" "Oct 24, 2026" "0.12.48" "pkgcore"
 .SH NAME
 pquery \- Wrapper for running commandline scripts.
 .SH SYNOPSIS
@@ -268,7 +268,8 @@ match packages using a given EAPI
 .INDENT 0.0
 .TP
 .B \-\-owns owns
-exact match on an owned file/dir
+Match packages owning the given path. Symlinked parent directories
+are resolved, so \fB/bin/ls\fP matches \fB/usr/bin/ls\fP on merged\-usr.
 .UNINDENT
 .INDENT 0.0
 .TP

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

@@ -1,4 +1,4 @@
 __title__ = "pkgcore"
-__version__ = "0.12.46"
-__version_info__ = (0, 12, 46)
+__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.46 → pkgcore-0.12.48}/src/pkgcore/binpkg/xpak.py

@@ -5,11 +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
 
@@ -57,13 +58,15 @@ class Xpak:
         # keys_dict becomes an ordereddict after _load_offsets; reason for
         # it is so that reads are serialized.
 
-    @property
-    def _fd(self):
-        # we do this annoying little dance to avoid having a couple
-        # hundred fds open if they're accessing a lot of binpkgs
+    @contextmanager
+    def _open(self):
+        """Yield the source, opening a path per use and closing it after."""
+        # avoids a couple hundred open fds when accessing a lot of binpkgs
         if self._source_is_path:
-            return open(self._source, "rb")
-        return self._source
+            with open(self._source, "rb") as fd:
+                yield fd
+        else:
+            yield self._source
 
     @classmethod
     def write_xpak(cls, target_source, data):
@@ -118,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()
@@ -137,7 +143,10 @@ class Xpak:
 
     @klass.jit_attr
     def keys_dict(self):
-        fd = self._fd
+        with self._open() as fd:
+            return self._read_keys(fd)
+
+    def _read_keys(self, fd):
         index_start, index_len, data_len = self._check_magic(fd)
         data_start = index_start + index_len
         keys_dict = OrderedDict()
@@ -169,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}"
@@ -186,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:
@@ -200,13 +209,15 @@ class Xpak:
         return self.keys_dict.keys()
 
     def values(self):
-        fd = self._fd
-        return (self._get_data(fd, *v) for v in self.keys_dict.values())
+        with self._open() as fd:
+            for v in self.keys_dict.values():
+                yield self._get_data(fd, *v)
 
     def items(self):
         # note that it's an OrderedDict, so this works.
-        fd = self._fd
-        return ((k, self._get_data(fd, *v)) for k, v in self.keys_dict.items())
+        with self._open() as fd:
+            for k, v in self.keys_dict.items():
+                yield k, self._get_data(fd, *v)
 
     def __len__(self):
         return len(self.keys_dict)
@@ -221,7 +232,8 @@ class Xpak:
         return iter(self.keys_dict)
 
     def __getitem__(self, key):
-        return self._get_data(self._fd, *self.keys_dict[key])
+        with self._open() as fd:
+            return self._get_data(fd, *self.keys_dict[key])
 
     def __delitem__(self, key):
         del self.keys_dict[key]

{pkgcore-0.12.46 → pkgcore-0.12.48}/src/pkgcore/config/cparser.py

@@ -30,10 +30,12 @@ def config_from_file(file_obj: typing.Iterable[str]) -> mappings.LazyValDict:
     cparser = CaseSensitiveConfigParser()
     try:
         cparser.read_file(file_obj)
-    except configparser.ParsingError as e:
+        # interpolate now, so a bad % is reported as a parse error of this file
+        sections = {name: dict(cparser.items(name)) for name in cparser.sections()}
+    except configparser.Error as e:
         raise errors.ParsingError(f"while parsing {file_obj}", e) from e
 
     def get_section(section):
-        return basics.ConfigSectionFromStringDict(dict(cparser.items(section)))
+        return basics.ConfigSectionFromStringDict(sections[section])
 
     return mappings.LazyValDict(cparser.sections, get_section)

{pkgcore-0.12.46 → pkgcore-0.12.48}/src/pkgcore/ebuild/cpv.py

@@ -156,15 +156,16 @@ def ver_cmp(ver1: str, rev1: str, ver2: str, rev2: str) -> int:
         ver_parts2_len = len(ver_parts2)
 
         # Iterate through the components
-        for v1, v2 in zip(ver_parts1, ver_parts2):
+        for i, (v1, v2) in enumerate(zip(ver_parts1, ver_parts2)):
             # If the string components are equal, the numerical
             # components will be equal too.
             if v1 == v2:
                 continue
 
-            # If one of the components begins with a "0" then they
-            # are compared as floats so that 1.1 > 1.02; else ints.
-            if v1[0] != "0" and v2[0] != "0":
+            # The first component is always an integer (PMS algorithm 3.2).
+            # Later ones beginning with a "0" are compared as floats so
+            # that 1.1 > 1.02; else ints.
+            if i == 0 or (v1[0] != "0" and v2[0] != "0"):
                 v1 = int(v1)
                 v2 = int(v2)
             else:

{pkgcore-0.12.46 → 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.46 → pkgcore-0.12.48}/src/pkgcore/ebuild/misc.py

@@ -5,7 +5,6 @@ misc. stuff we've not found a spot for yet.
 __all__ = (
     "ChunkedDataDict",
     "IncrementalsDict",
-    "PayloadDict",
     "chunked_data",
     "collapsed_restrict_to_data",
     "get_relative_dosym_target",
@@ -459,11 +458,6 @@ class ChunkedDataDict(GenericEquality):
                 "merge expects a ChunkedDataDict instance; "
                 f"got type {type(cdict)}, {cdict!r}"
             )
-        if isinstance(cdict, PayloadDict) and not isinstance(self, PayloadDict):
-            raise TypeError(
-                "merge expects a PayloadDataDict instance; "
-                f"got type {type(cdict)}, {cdict!r}"
-            )
         # straight extensions for this, rather than update_from_stream.
         d = self._dict
         for key, values in cdict._dict.items():
@@ -528,7 +522,6 @@ class ChunkedDataDict(GenericEquality):
             g_stream = _build_cp_atom_payload(
                 self._global_settings,
                 packages.AlwaysTrue,
-                payload_form=isinstance(self, PayloadDict),
                 interner=interner,
             )
         else:
@@ -540,7 +533,6 @@ class ChunkedDataDict(GenericEquality):
                 cache,
                 self._global_settings,
                 packages.AlwaysTrue,
-                payload_form=isinstance(self, PayloadDict),
             )
 
         if self.frozen:
@@ -557,7 +549,6 @@ class ChunkedDataDict(GenericEquality):
         return d
 
     def render_to_payload(self):
-        d = PayloadDict()
         d = {
             atom.atom(k): _build_cp_atom_payload(v, atom.atom(k), True)
             for k, v in self._dict.items()
@@ -586,43 +577,6 @@ class ChunkedDataDict(GenericEquality):
     pull_data = render_pkg
 
 
-class PayloadDict(ChunkedDataDict):
-    def mk_item(self, key, neg, pos):
-        return restrict_payload(key, tuple(chain(("-" + x for x in neg), pos)))
-
-    def add_bare_global(self, payload):
-        neg = [x[1:] for x in payload if x[0] == "-"]
-        pos = [x for x in payload if x[0] != "-"]
-        ChunkedDataDict.add_bare_global(self, neg, pos)
-
-    def add_global(self, pinst):
-        neg = [x[1:] for x in pinst.data if x[0] == "-"]
-        pos = [x for x in pinst.data if x[0] != "-"]
-        return ChunkedDataDict.add_global(self, chunked_data(pinst.restrict, neg, pos))
-
-    def update_from_stream(self, stream):
-        for pinst in stream:
-            if getattr(pinst.restrict, "key", None) is not None:
-                # atom, or something similar.  use the key lookup.
-                # hack also... recreate the restriction; this is due to
-                # internal idiocy in ChunkedDataDict that will be fixed.
-                self._dict[pinst.restrict.key].append(pinst)
-            else:
-                self.add_global(pinst)
-
-    def render_pkg(self, pkg, pre_defaults=()):
-        items = self._dict.get(atom.atom(pkg.key))
-        if items is None:
-            items = self._global_settings
-        s = set(pre_defaults)
-        data = chain.from_iterable(
-            item.data for item in items if item.restrict.match(pkg)
-        )
-        return incremental_expansion(data, orig=s)
-
-    pull_data = render_pkg
-
-
 def run_sanity_checks(pkgs, domain, threads=None):
     """Run all sanity checks for a sequence of packages."""
     sanity_failures = defaultdict(list)

{pkgcore-0.12.46 → pkgcore-0.12.48}/src/pkgcore/ebuild/processor.py

@@ -374,6 +374,16 @@ def chuck_StoppingCommand(ebp, line):
         raise ProcessorError(args[1])
 
 
+def _bash_quote(val: str) -> str:
+    """Quote a value for a bash assignment."""
+    if val.isalnum():
+        return val
+    if "'" not in val:
+        return f"'{val}'"
+    escaped = val.replace("\\", "\\\\").replace("'", "\\'")
+    return f"$'{escaped}'"
+
+
 class EbuildProcessor:
     """Abstraction of a running ebd instance.
 
@@ -815,14 +825,12 @@ class EbuildProcessor:
                 )
 
             if isinstance(val, (list, tuple)):
-                assign = f"{key}=({' '.join(f'[{i}]="{value}"' for i, value in enumerate(val))})"
-            elif val.isalnum():
-                assign = f"{key}={val}"
-            elif "'" not in val:
-                assign = f"{key}='{val}'"
+                elements = " ".join(
+                    f"[{i}]={_bash_quote(value)}" for i, value in enumerate(val)
+                )
+                assign = f"{key}=({elements})"
             else:
-                escaped = val.replace("\\", "\\\\").replace("'", "\\'")
-                assign = f"{key}=$'{escaped}'"
+                assign = f"{key}={_bash_quote(val)}"
 
             (plain if key in nonexported else exported).append(assign)