pkgcore 0.12.45__tar.gz → 0.12.47__tar.gz

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

@@ -2,6 +2,131 @@
 Release Notes
 =============
 
+----------------------------
+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)
+----------------------------
+
+Fixes
+~~~~~
+
+- ``repo:path`` entries in the ``parent`` file of a profile outside a repo,
+  such as a ``/etc/portage/make.profile`` directory, now work (Arthur Zamarin,
+  #440)
+
+- ``pmaint regen`` no longer deletes the ``Manifest.gz`` files in the
+  metadata cache of rsync checkouts, and reading the cache no longer fails
+  on them (Arthur Zamarin)
+
+- ``pmaint regen`` no longer fails with ``TimeoutError: ebp for pid ...
+  appears dead`` while updating ``use.local.desc`` (Arthur Zamarin)
+
+- Sourcing ebuilds from a repo whose path has non-ASCII characters no
+  longer fails for every package (Arthur Zamarin)
+
+- pkgcore tools no longer hang when terminated while starting ebuild
+  processors, or when an ebuild processor fails during startup (Arthur
+  Zamarin)
+
+- ``pmaint regen`` of several repos no longer crashes with ``signal only
+  works in main thread`` when an ebuild fails to source (Arthur Zamarin)
+
+- pkgcore tools no longer exit silently with status 141 when an ebuild
+  processor dies, e.g. from the OOM killer (Arthur Zamarin)
+
+- An ebuild processor dying while reporting a ``die`` no longer leaves
+  pkgcore looping forever with growing memory (Arthur Zamarin)
+
+- ``pmaint regen`` no longer leaves an ebuild processor running for each
+  ebuild that fails to source without calling ``die`` (Arthur Zamarin)
+
+- ``pmaint regen`` writes ``use.local.desc`` and ``pkg_desc_index`` as UTF-8
+  instead of failing on non-ASCII text in a non-UTF-8 locale (Arthur
+  Zamarin)
+
+- ``pmaint regen`` with threads no longer writes ``pkg_desc_index``,
+  ``use.local.desc`` and ``timestamp.chk`` world-writable, with snakeoil
+  0.11.7 (Arthur Zamarin)
+
+- A ``thirdpartymirrors`` line naming a mirror without URIs is skipped like
+  in portage, instead of failing to load the repo (Arthur Zamarin)
+
+- An ebuild file whose name isn't a valid version of its package, such as
+  ``pkg-1.0-rc1.ebuild``, is skipped with a warning like in portage,
+  instead of aborting ``pmaint regen`` (Arthur Zamarin)
+
+- ``pmaint regen --use-local-desc`` reports a ``metadata.xml`` that isn't
+  valid UTF-8 or can't be read as an error for that package, instead of
+  not writing ``use.local.desc`` at all (Arthur Zamarin)
+
+- ``pmaint regen`` reports an ebuild that confuses or kills its ebuild
+  processor as failing to source, instead of crashing after the regen
+  (Arthur Zamarin)
+
+- ``pmaint regen`` reports and counts a ``RuntimeError`` while regenerating
+  a package, instead of losing it with its worker thread and exiting 0
+  (Arthur Zamarin)
+
+- An ebuild that sets an invalid ``EAPI`` after its header, or adds an
+  unknown eclass to ``INHERITED``, is reported as bad metadata instead of
+  crashing ``pmaint regen`` (Arthur Zamarin)
+
+- A repo whose ``profiles/categories``, ``profiles/repo_name``,
+  ``profiles/thirdpartymirrors`` or ``metadata/layout.conf`` isn't valid
+  UTF-8 loads with the bad bytes replaced like in portage, instead of
+  failing (Arthur Zamarin)
+
+- A category listed in ``profiles/categories`` that's a file or can't be
+  read is logged and treated as empty, instead of crashing ``pmaint regen``
+  (Arthur Zamarin)
+
+- An eclass changing during ``pmaint regen`` no longer makes the next
+  packages sourced by the same processor fail (Arthur Zamarin)
+
+- ``pconfig configurables`` no longer crashes with a ``TypeError``
+  (Arthur Zamarin)
+
+- With ``--sandbox`` confinement and ``TMPDIR`` set, ebuilds using here-strings
+  or here-documents in global scope no longer fail to source (Arthur Zamarin)
+
+- Sync, strip and ``install-info`` binaries are no longer looked up in the
+  current directory when ``PATH`` is empty or unset (Arthur Zamarin)
+
 ----------------------------
 pkgcore 0.12.45 (2026-10-03)
 ----------------------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pkgcore
-Version: 0.12.45
+Version: 0.12.47
 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.45 → pkgcore-0.12.47}/build/sphinx/man/patom.1

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PATOM" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 patom \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

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

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PCLEAN" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pclean \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

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

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PCLONECACHE" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pclonecache \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

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

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PCONFIG" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pconfig \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

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

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PEBUILD" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pebuild \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

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

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PINSPECT" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pinspect \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

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

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PMAINT" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pmaint \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

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

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PMERGE" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pmerge \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

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

@@ -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 03, 2026" "0.12.45" "pkgcore"
+.TH "PQUERY" "1" "Oct 17, 2026" "0.12.47" "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.45 → pkgcore-0.12.47}/data/lib/pkgcore/ebd/ebuild-daemon-lib.bash

@@ -25,6 +25,8 @@ __ebd_read_array() {
 
 # read -N usage requires bash-4.1 or so (EAPI 6 requires >= 4.2)
 __ebd_read_size() {
+	# python sends sizes in bytes
+	local LC_ALL=C
 	read -u ${PKGCORE_EBD_READ_FD} -r -N $1 $2
 	local ret=$?
 	[[ ${ret} -ne 0 ]] && \

{pkgcore-0.12.45 → pkgcore-0.12.47}/data/lib/pkgcore/ebd/ebuild-daemon.bash

@@ -135,8 +135,8 @@ __ebd_exec_main() {
 
 	# finally, load the master list of pkgcore funcs. fallback to
 	# regenerating it if needed.
-	if [[ -f ${PKGCORE_EBD_PATH}/generated/funcs/global ]]; then
-		PKGCORE_BLACKLIST_FUNCS+=( $(<"${PKGCORE_EBD_PATH}"/generated/funcs/global) )
+	if [[ -f ${PKGCORE_EBD_PATH}/.generated/funcs/global ]]; then
+		PKGCORE_BLACKLIST_FUNCS+=( $(<"${PKGCORE_EBD_PATH}"/.generated/funcs/global) )
 	else
 		PKGCORE_BLACKLIST_FUNCS+=( $("${PKGCORE_EBD_PATH}"/generate_global_func_list 2> /dev/null) )
 	fi

{pkgcore-0.12.45 → pkgcore-0.12.47}/examples/report_pkg_changes.py

@@ -4,7 +4,6 @@ import os
 import sys
 
 from snakeoil.bash import read_bash
-from snakeoil.osutils import listdir_files
 
 from pkgcore.config import load_config
 from pkgcore.ebuild.atom import atom
@@ -76,7 +75,9 @@ def parse_moves(location):
         return tuple(reversed(fname.split("-")))
 
     moves = {}
-    for update_file in sorted(listdir_files(location), key=get_key):
+    for update_file in sorted(
+        [e.name for e in os.scandir(location) if e.is_file()], key=get_key
+    ):
         for line in read_bash(pjoin(location, update_file)):
             line = line.split()
             if line[0] != "move":

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

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

pkgcore-0.12.47/src/pkgcore/_verinfo.py

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

{pkgcore-0.12.45 → pkgcore-0.12.47}/src/pkgcore/binpkg/repo_ops.py

@@ -13,9 +13,10 @@ __all__ = ("install", "operations", "replace", "uninstall")
 
 import os
 from os.path import join as pjoin
+from pathlib import Path
 
 from snakeoil.compression import compress_data
-from snakeoil.osutils import ensure_dirs, unlink_if_exists
+from snakeoil.osutils import ensure_dirs
 
 from ..fs import tar
 from ..log import logger
@@ -94,7 +95,7 @@ class install(repo_interfaces.install):
             os.chmod(tmp_path, 0o644)
         except Exception:
             try:
-                unlink_if_exists(tmp_path)
+                Path(tmp_path).unlink(missing_ok=True)
             except OSError as e:
                 logger.warning(f"failed removing {tmp_path!r}: {e}")
             raise

{pkgcore-0.12.45 → pkgcore-0.12.47}/src/pkgcore/binpkg/repository.py

@@ -13,7 +13,6 @@ from snakeoil import chksum, compression
 from snakeoil.data_source import data_source, local_source
 from snakeoil.klass import alias_attr, jit_attr, jit_attr_named
 from snakeoil.mappings import DictMixin, StackedDict
-from snakeoil.osutils import listdir_dirs, listdir_files
 
 from ..config.hint import ConfigHint
 from ..ebuild import ebd, ebuild_built
@@ -243,7 +242,11 @@ class tree(prototype.tree):
 
     def _get_categories(self):
         try:
-            return tuple(x for x in listdir_dirs(self.base) if x.lower() != "all")
+            return tuple(
+                e.name
+                for e in os.scandir(self.base)
+                if e.name.lower() != "all" and e.is_dir()
+            )
         except OSError as e:
             raise KeyError(f"failed fetching categories: {e}") from e
 
@@ -253,7 +256,7 @@ class tree(prototype.tree):
         d = {}
         lext = len(self.extension)
         try:
-            for x in listdir_files(cpath):
+            for x in [e.name for e in os.scandir(cpath) if e.is_file()]:
                 # don't use lstat; symlinks may exist
                 if (
                     x.endswith(".lockfile")

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

@@ -7,6 +7,7 @@ __all__ = ("MalformedXpak", "Xpak")
 import os
 import typing
 from collections import OrderedDict
+from contextlib import contextmanager
 
 from snakeoil import klass
 from snakeoil import struct_compat as struct
@@ -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):
@@ -137,7 +140,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()
@@ -200,13 +206,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 +229,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.45 → pkgcore-0.12.47}/src/pkgcore/cache/__init__.py

@@ -204,6 +204,9 @@ class base:
         for key in list(self):
             del self[key]
 
+    def remove_leftovers(self):
+        """Remove what interrupted writes left behind."""
+
     def set_sync_rate(self, rate=0):
         self.sync_rate = rate
         if rate == 0:

{pkgcore-0.12.45 → pkgcore-0.12.47}/src/pkgcore/cache/flat_hash.py

@@ -4,6 +4,7 @@ per key file based backend
 
 __all__ = ("database",)
 
+import contextlib
 import os
 import stat
 from os.path import join as pjoin
@@ -11,6 +12,8 @@ from os.path import join as pjoin
 from snakeoil.fileutils import readlines_utf8
 
 from ..config.hint import ConfigHint
+from ..ebuild.cpv import VersionedCPV
+from ..ebuild.errors import InvalidCPV
 from . import errors, fs_template
 
 
@@ -82,9 +85,13 @@ class database(fs_template.FsBased):
 
         if self._mtime_used and not self.mtime_in_entry:
             mtime = values["_mtime_"]
-        myf.writelines(f"{k}={v}\n" for k, v in sorted(values.items()))
-
-        myf.close()
+        try:
+            with myf:
+                myf.writelines(f"{k}={v}\n" for k, v in sorted(values.items()))
+        except OSError as e:
+            with contextlib.suppress(OSError):
+                os.remove(fp)
+            raise errors.CacheCorruption(cpv, e) from e
         if self._mtime_used and not self.mtime_in_entry:
             self._ensure_access(fp, mtime=mtime)
         else:
@@ -110,13 +117,30 @@ class database(fs_template.FsBased):
         return os.path.exists(pjoin(self.location, cpv))
 
     def keys(self):
-        """generator for walking the dir struct"""
-        dirs = [self.location]
+        """Yield the cache entries, skipping files that aren't a versioned CPV,
+        such as the Manifest.gz files of rsync checkouts."""
+        for key in self._files():
+            try:
+                VersionedCPV(key)
+            except InvalidCPV:
+                continue
+            yield key
+
+    def remove_leftovers(self):
+        """Remove the temporary files of interrupted writes."""
+        for path in self._files():
+            if os.path.basename(path).startswith(".update."):
+                with contextlib.suppress(OSError):
+                    os.remove(pjoin(self.location, path))
+
+    def _files(self):
+        """Yield the paths of files up to one directory deep."""
+        dirs = [(0, self.location)]
         len_base = len(self.location)
         # Note: the misc try/except clauses are to protect against concurrent
         # modification of the cache resulting in transient errors.
         while dirs:
-            d = dirs.pop(0)
+            depth, d = dirs.pop(0)
             try:
                 subdirs = os.listdir(d)
             except FileNotFoundError:
@@ -124,8 +148,6 @@ class database(fs_template.FsBased):
             except OSError as e:
                 raise KeyError(d, f"access failure: {e}") from e
             for l in subdirs:
-                if l.endswith(".cpickle"):
-                    continue
                 p = pjoin(d, l)
                 try:
                     st = os.lstat(p)
@@ -134,7 +156,8 @@ class database(fs_template.FsBased):
                 except OSError as e:
                     raise KeyError(d, f"Unhandled IO error: {e}") from e
                 if stat.S_ISDIR(st.st_mode):
-                    dirs.append(p)
+                    if depth < 1:
+                        dirs.append((depth + 1, p))
                     continue
                 yield p[len_base + 1 :]
 

{pkgcore-0.12.45 → pkgcore-0.12.47}/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.45 → pkgcore-0.12.47}/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.45 → pkgcore-0.12.47}/src/pkgcore/ebuild/ebd.py

@@ -32,7 +32,7 @@ from snakeoil import data_source, klass
 from snakeoil.compatibility import IGNORED_EXCEPTIONS
 from snakeoil.currying import post_curry, pretty_docs
 from snakeoil.fileutils import touch
-from snakeoil.osutils import ensure_dirs, listdir_files
+from snakeoil.osutils import ensure_dirs
 from snakeoil.sequences import iflatten_instance, unique_stable
 
 from .. import const
@@ -493,7 +493,11 @@ class ebd:
     def _reload_state(self):
         try:
             self.__set_stage_state__(
-                [x[1:] for x in listdir_files(self.builddir) if x.startswith(".")]
+                [
+                    e.name[1:]
+                    for e in os.scandir(self.builddir)
+                    if e.name.startswith(".") and e.is_file()
+                ]
             )
         except OSError as e:
             if e.errno not in (errno.ENOTDIR, errno.ENOENT):

{pkgcore-0.12.45 → pkgcore-0.12.47}/src/pkgcore/ebuild/ebuild_src.py

@@ -540,9 +540,20 @@ class package_factory(metadata.factory):
                 raise metadata_errors.MetadataException(
                     pkg, "data", "failed sourcing ebuild", e
                 )
+            # protocol errors, or a dead daemon's broken pipe
+            except (processor.ProcessingInterruption, OSError, RuntimeError) as e:
+                raise metadata_errors.MetadataException(
+                    pkg,
+                    "data",
+                    "failed sourcing ebuild",
+                    processor.ProcessorError(str(e)),
+                ) from e
 
         # Rewrite defined_phases as needed, since we now know the EAPI.
-        eapi = get_eapi(mydata.get("EAPI", "0"))
+        try:
+            eapi = get_eapi(mydata.get("EAPI", "0"))
+        except ValueError as e:
+            raise metadata_errors.MetadataException(pkg, "eapi", str(e)) from e
         if parsed_eapi != eapi:
             raise metadata_errors.MetadataException(
                 pkg,
@@ -562,7 +573,12 @@ class package_factory(metadata.factory):
             mydata["DEFINED_PHASES"] = " ".join(sorted(phases))
 
         if inherited := mydata.pop("INHERITED", None):
-            mydata["_eclasses_"] = self._ecache.get_eclass_data(inherited.split())
+            try:
+                mydata["_eclasses_"] = self._ecache.get_eclass_data(inherited.split())
+            except KeyError as e:
+                raise metadata_errors.MetadataException(
+                    pkg, "data", f"inherited unknown eclass {e.args[0]!r}"
+                ) from e
         mydata["_chf_"] = chksum.LazilyHashedPath(pkg.path)
 
         for x in wipes:

{pkgcore-0.12.45 → pkgcore-0.12.47}/src/pkgcore/ebuild/eclass_cache.py

@@ -14,7 +14,6 @@ from snakeoil.chksum import LazilyHashedPath
 from snakeoil.data_source import local_source
 from snakeoil.klass import jit_attr_ext_method
 from snakeoil.mappings import ImmutableDict, StackedDict
-from snakeoil.osutils import listdir_files
 
 from ..config.hint import ConfigHint
 
@@ -101,7 +100,7 @@ class cache(base):
         ec = {}
         eclass_len = len(".eclass")
         try:
-            files = listdir_files(self.eclassdir)
+            files = [e.name for e in os.scandir(self.eclassdir) if e.is_file()]
         except (FileNotFoundError, NotADirectoryError):
             return ImmutableDict()
         for y in sorted(files):