pkgcore 0.12.42__tar.gz → 0.12.44__tar.gz

{pkgcore-0.12.42 → pkgcore-0.12.44}/NEWS.rst

@@ -2,6 +2,66 @@
 Release Notes
 =============
 
+----------------------------
+pkgcore 0.12.44 (2029-09-26)
+----------------------------
+
+Features
+~~~~~~~~
+
+- ``--sandbox`` is now shared machinery rather than something ``pmaint regen``
+  owns, so any command that sources ebuilds can offer it (Arthur Zamarin)
+
+- ``pquery`` now confines itself while querying with landlock (Arthur Zamarin)
+
+- ``pinspect``: the usage reports and ``digests`` now confine themselves with
+  landlock (Arthur Zamarin)
+
+- ``pmaint eclass`` now confines itself with landlock (Arthur Zamarin)
+
+- ``pmaint copy`` now confines itself with landlock (Arthur Zamarin)
+
+- ``pmaint sync --import`` adds a repo from Gentoo's published repository list
+  and syncs it, so a new overlay no longer needs a hand-written repos.conf
+  entry first (Arthur Zamarin)
+
+- ``pmaint sync --import-masters`` does the same for everything a repo inherits
+  from, following masters of masters (Arthur Zamarin)
+
+Fixes
+~~~~~
+
+- landlock: shut down ebuild daemons started before the restrictions go on.
+  Landlock only reaches processes started afterwards, so one left over from
+  earlier kept the access it was spawned with (Arthur Zamarin)
+
+----------------------------
+pkgcore 0.12.43 (2029-09-12)
+----------------------------
+
+Fixes
+~~~~~
+
+- ``pmaint eclass -f devbook``: don't wrap a list item's only paragraph in
+  ``<p>`` (Arthur Zamarin, #485)
+
+- ``pmaint eclass``: ``-q`` no longer swallows errors along with the warnings
+  (Arthur Zamarin)
+
+- ``pmaint eclass``: render an eclass before opening its output file, so only
+  valid results are written (Arthur Zamarin)
+
+- ``pmaint eclass -f devbook``: map reST's admonitions, tables and field lists
+  onto the DevBook elements that match them, and render anything else DevBook
+  can't express as its content alone.  A single eclass reaching for reST beyond
+  DevBook used to abort the whole run (Arthur Zamarin)
+
+- eclass: read eclassdoc prose's hand-written inline code: both
+  ``\`markdown\``` style and GNU ``\`style'`` (Arthur Zamarin)
+
+- eclass: separate an ``@SUBSECTION`` heading from the prose above it, so it
+  renders as a heading (Arthur Zamarin)
+
 ----------------------------
 pkgcore 0.12.42 (2026-09-05)
 ----------------------------

{pkgcore-0.12.42 → pkgcore-0.12.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pkgcore
-Version: 0.12.42
+Version: 0.12.44
 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.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PATOM" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 patom \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PCLEAN" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 pclean \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PCLONECACHE" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 pclonecache \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PCONFIG" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 pconfig \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PEBUILD" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 pebuild \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PINSPECT" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 pinspect \- Wrapper for running commandline scripts.
 .SH SYNOPSIS
@@ -168,7 +168,7 @@ where stdout is not a tty.
 .EX
 pinspect eapi_usage [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN]
                     [\-\-no\-final\-summary] [\-\-sort\-by\-name]
-                    [\-\-first FIRST | \-\-last LAST]
+                    [\-\-first FIRST | \-\-last LAST] [\-\-sandbox BOOLEAN]
                     [repo ...]
 .EE
 .UNINDENT
@@ -200,6 +200,15 @@ show only the first N detail items
 .B \-\-last LAST
 show only the last N detail items
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
 .SS Base Options
 .INDENT 0.0
 .TP
@@ -238,6 +247,7 @@ where stdout is not a tty.
 pinspect license_usage [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN]
                        [\-\-no\-final\-summary] [\-\-sort\-by\-name]
                        [\-\-first FIRST | \-\-last LAST]
+                       [\-\-sandbox BOOLEAN]
                        [repo ...]
 .EE
 .UNINDENT
@@ -269,6 +279,15 @@ show only the first N detail items
 .B \-\-last LAST
 show only the last N detail items
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
 .SS Base Options
 .INDENT 0.0
 .TP
@@ -307,6 +326,7 @@ where stdout is not a tty.
 pinspect eclass_usage [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN]
                       [\-\-no\-final\-summary] [\-\-sort\-by\-name]
                       [\-\-first FIRST | \-\-last LAST]
+                      [\-\-sandbox BOOLEAN]
                       [repo ...]
 .EE
 .UNINDENT
@@ -338,6 +358,15 @@ show only the first N detail items
 .B \-\-last LAST
 show only the last N detail items
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
 .SS Base Options
 .INDENT 0.0
 .TP
@@ -376,6 +405,7 @@ where stdout is not a tty.
 pinspect mirror_usage [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN]
                       [\-\-no\-final\-summary] [\-\-sort\-by\-name]
                       [\-\-first FIRST | \-\-last LAST]
+                      [\-\-sandbox BOOLEAN]
                       [repo ...]
 .EE
 .UNINDENT
@@ -407,6 +437,15 @@ show only the first N detail items
 .B \-\-last LAST
 show only the last N detail items
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
 .SS Base Options
 .INDENT 0.0
 .TP
@@ -446,7 +485,7 @@ pinspect distfiles_usage [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN]
                          [\-\-no\-final\-summary | \-\-no\-repo\-summary |
                          \-\-no\-detail] [\-\-sort\-by\-name]
                          [\-\-first FIRST | \-\-last LAST]
-                         [\-\-include\-nonmirrored]
+                         [\-\-sandbox BOOLEAN] [\-\-include\-nonmirrored]
                          [\-\-include\-restricted]
                          [repo ...]
 .EE
@@ -491,6 +530,15 @@ show only the last N detail items
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-\-include\-nonmirrored
 if set, nonmirrored  distfiles will be included in the total
 .UNINDENT
@@ -2739,7 +2787,7 @@ where stdout is not a tty.
 .sp
 .EX
 pinspect digests [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN]
-                 [\-\-domain DOMAIN]
+                 [\-\-domain DOMAIN] [\-\-sandbox BOOLEAN]
                  [repos ...]
 .EE
 .UNINDENT
@@ -2750,6 +2798,16 @@ pinspect digests [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN]
 .B repos
 repo to inspect
 .UNINDENT
+.SS Options
+.INDENT 0.0
+.TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
 .SS Base Options
 .INDENT 0.0
 .TP

{pkgcore-0.12.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PMAINT" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 pmaint \- Wrapper for running commandline scripts.
 .SH SYNOPSIS
@@ -100,7 +100,9 @@ general system maintenance
 .INDENT 3.5
 .sp
 .EX
-pmaint sync [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN] [\-f] [repo ...]
+pmaint sync [\-h] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN] [\-f]
+            [\-\-import REPO] [\-\-import\-masters PATH]
+            [repo ...]
 .EE
 .UNINDENT
 .UNINDENT
@@ -116,6 +118,35 @@ repo(s) to sync
 .B \-f, \-\-force
 force syncing to occur regardless of staleness checks
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-import REPO
+Look a repository up by name in Gentoo\(aqs published repository list,
+write a \fBrepos.conf\fP entry for it, and sync it. Pass the option
+again to add more than one repo.
+.sp
+New repos land beside the repos already being synced, which is
+\fB/var/db/repos\fP on an ordinary install, and get a file of their own
+when \fBrepos.conf\fP is a directory. The list is fetched from
+\%<https://\:api\:.gentoo\:.org/\:overlays/\:repositories\:.xml> and cached locally.
+.sp
+A repo that\(aqs already configured is simply synced, so an import can be
+repeated without failing.
+.sp
+Importing leaves the rest of the configured repos alone; name them as
+arguments to sync those as well.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-import\-masters PATH
+Read the masters of the repo at the given path, add the ones that
+aren\(aqt configured yet, and sync them all.
+.sp
+Masters of masters are followed as each repo is synced and its own
+\fBlayout.conf\fP becomes readable, so the repo ends up with everything
+it inherits from present and current. That makes it the one command a
+CI run needs before checking a repo it doesn\(aqt own the parents of.
+.UNINDENT
 .SS Base Options
 .INDENT 0.0
 .TP
@@ -153,6 +184,7 @@ where stdout is not a tty.
 .EX
 pmaint copy [\-\-domain DOMAIN] [\-h] [\-\-debug] [\-q] [\-v]
             [\-\-color BOOLEAN] [\-s SOURCE_REPO] [\-i]
+            [\-\-sandbox BOOLEAN]
             target_repo query [query ...]
 .EE
 .UNINDENT
@@ -214,6 +246,15 @@ copy strictly from the supplied repository; else it copies from wherever a match
 .B \-i, \-\-ignore\-existing
 if a matching pkg already exists in the target, don\(aqt update it
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
 .SS pmaint regen \- regenerate repository caches
 .SS Synopsis
 .INDENT 0.0
@@ -301,10 +342,11 @@ use separate directory to store repository caches
 .INDENT 0.0
 .TP
 .B \-\-sandbox BOOLEAN
-Confine the run with Landlock where the kernel supports it: writes are
-limited to the caches being regenerated, and outgoing TCP is denied.
-Enabled by default; \(aqy\(aq turns an unsupported kernel into an error
-instead of continuing unconfined, and \(aqn\(aq disables it.
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -380,8 +422,8 @@ do not update etc/ldso.conf and ld.so.cache
 .sp
 .EX
 pmaint eclass [\-\-domain DOMAIN] [\-h] [\-\-debug] [\-q] [\-v]
-              [\-\-color BOOLEAN] [\-\-dir OUTPUT_DIR] [\-o OUTPUT_FORMAT]
-              [\-f {rst,man,html,devbook}] [\-r REPO]
+              [\-\-color BOOLEAN] [\-\-dir OUTPUT_DIR] [\-\-sandbox BOOLEAN]
+              [\-o OUTPUT_FORMAT] [\-f {rst,man,html,devbook}] [\-r REPO]
               [eclasses ...]
 .EE
 .UNINDENT
@@ -435,6 +477,15 @@ output directory
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-o, \-\-output OUTPUT_FORMAT
 Output file name format. Defaults to \fB{eclass}.eclass.{format}\fP\&. You
 can use \fB{eclass}\fP and \fB{format}\fP placeholders to customize the

{pkgcore-0.12.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PMERGE" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 pmerge \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.42 → pkgcore-0.12.44}/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" "Sep 05, 2026" "0.12.42" "pkgcore"
+.TH "PQUERY" "1" "Sep 26, 2026" "0.12.44" "pkgcore"
 .SH NAME
 pquery \- Wrapper for running commandline scripts.
 .SH SYNOPSIS
@@ -37,11 +37,11 @@ pquery \- Wrapper for running commandline scripts.
 .sp
 .EX
 pquery [\-h] [\-\-version] [\-\-debug] [\-q] [\-v] [\-\-color BOOLEAN]
-       [\-\-config CONFIG_PATH] [\-\-domain DOMAIN] [\-\-raw] [\-\-unfiltered]
-       [\-\-virtuals {only,disable}] [\-r REPO | \-E | \-B | \-I | \-A]
-       [\-\-all] [\-\-has\-use has_use] [\-\-license license] [\-\-live]
-       [\-\-non\-live] [\-\-revdep REVDEP] [\-\-revdep\-pkgs REVDEP_PKGS]
-       [\-\-restrict\-revdep restrict_revdep]
+       [\-\-config CONFIG_PATH] [\-\-domain DOMAIN] [\-\-sandbox BOOLEAN]
+       [\-\-raw] [\-\-unfiltered] [\-\-virtuals {only,disable}] [\-r REPO |
+       \-E | \-B | \-I | \-A] [\-\-all] [\-\-has\-use has_use]
+       [\-\-license license] [\-\-live] [\-\-non\-live] [\-\-revdep REVDEP]
+       [\-\-revdep\-pkgs REVDEP_PKGS] [\-\-restrict\-revdep restrict_revdep]
        [\-\-restrict\-revdep\-pkgs restrict_revdep_pkgs] [\-S description]
        [\-\-eapi eapi] [\-\-owns owns] [\-\-owns\-re owns_re]
        [\-\-maintainer maintainer] [\-\-maintainer\-name maintainer_name]
@@ -69,6 +69,16 @@ repo selection options are almost completely separate from the
 restriction options. The only exception to that is that restrictions on
 contents automatically select the vdb (installed packages) repo, since
 running them on source repos makes no sense.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-\-sandbox BOOLEAN
+Confine the run with Landlock where the kernel supports it: writes
+are limited to the paths the command legitimately needs, and
+outgoing TCP is denied. Enabled by default; \(aqy\(aq turns an
+unsupported kernel into an error instead of continuing unconfined,
+and \(aqn\(aq disables it.
+.UNINDENT
 .SH BASE OPTIONS
 .INDENT 0.0
 .TP

{pkgcore-0.12.42 → pkgcore-0.12.44}/src/pkgcore/__init__.py

@@ -1,4 +1,4 @@
 __title__ = "pkgcore"
-__version__ = "0.12.42"
-__version_info__ = (0, 12, 42)
+__version__ = "0.12.44"
+__version_info__ = (0, 12, 44)
 __python_mininum_version__ = (3, 12, 0)

pkgcore-0.12.44/src/pkgcore/_verinfo.py

@@ -0,0 +1 @@
+version_info={'rev': 'be9c8f7aa79d3b08e56a9654dcc3955fde85ba88', 'date': 'Sat Sep 26 17:46:26 2026', 'timestamp': 1790444786, 'tag': '0.12.44', 'commits': 0}

{pkgcore-0.12.42 → pkgcore-0.12.44}/src/pkgcore/ebuild/atom.py

@@ -75,11 +75,6 @@ class atom(boolean.AndRestriction):
         "repo_id",
     )
 
-    klass.inject_richcmp_methods_from_cmp(locals())
-    # hack; combine these 2 metaclasses at some point...
-    locals().pop("__eq__", None)
-    locals().pop("__ne__", None)
-
     # overrided in child class if it's supported
     evaluate_depset = None
 
@@ -429,7 +424,13 @@ class atom(boolean.AndRestriction):
     def __getitem__(self, index):
         return self.restrictions[index]
 
-    def __cmp__(self, other):
+    def _cmp(self, other) -> int:
+        """three way comparison of two atoms
+
+        Covers every attribute of :py:attr:`__attr_comparison__`, so atoms that
+        differ only in subslot or slot operator get a stable order rather than
+        comparing as equal.
+        """
         if not isinstance(other, atom):
             raise TypeError(f"other isn't of {atom!r} type, is {other.__class__}")
 
@@ -464,10 +465,15 @@ class atom(boolean.AndRestriction):
         if c:
             return c
 
-        def f(v):
-            return "" if v is None else v
+        c = cmp(self.slot, other.slot)
+        if c:
+            return c
+
+        c = cmp(self.subslot, other.subslot)
+        if c:
+            return c
 
-        c = cmp(f(self.slot), f(other.slot))
+        c = cmp(self.slot_operator, other.slot_operator)
         if c:
             return c
 
@@ -477,6 +483,18 @@ class atom(boolean.AndRestriction):
 
         return cmp(self.repo_id, other.repo_id)
 
+    def __lt__(self, other) -> bool:
+        return self._cmp(other) < 0
+
+    def __le__(self, other) -> bool:
+        return self._cmp(other) <= 0
+
+    def __gt__(self, other) -> bool:
+        return self._cmp(other) > 0
+
+    def __ge__(self, other) -> bool:
+        return self._cmp(other) >= 0
+
     no_usedeps = klass.alias_attr("get_atom_without_use_deps")
 
     @property

{pkgcore-0.12.42 → pkgcore-0.12.44}/src/pkgcore/ebuild/domain.py

@@ -24,7 +24,7 @@ from snakeoil.cli.exceptions import find_user_exception
 from snakeoil.data_source import local_source
 from snakeoil.log import suppress_logging
 from snakeoil.mappings import ImmutableDict, ProtectedDict
-from snakeoil.sequences import predicate_split, split_negations, stable_unique
+from snakeoil.sequences import predicate_split, split_negations, unique_stable
 
 from ..binpkg import repository as binary_repo
 from ..cache.flat_hash import md5_cache
@@ -301,7 +301,7 @@ class domain(config_domain):
     def system_shell_profile(self, data):
         # prepend system profile $PATH if it exists
         if "PATH" in data:
-            path = stable_unique(
+            path = unique_stable(
                 data["PATH"].split(os.pathsep) + os.environ["PATH"].split(os.pathsep)
             )
             os.environ["PATH"] = os.pathsep.join(path)
@@ -466,25 +466,25 @@ class domain(config_domain):
     def pkg_keywords(self, data, debug=False):
         if debug:
             return tuple(data)
-        return tuple((x[0], stable_unique(x[1])) for x in data)
+        return tuple((x[0], tuple(unique_stable(x[1]))) for x in data)
 
     @load_property("package.accept_keywords", parse_func=restriction_payload_splitter)
     def pkg_accept_keywords(self, data, debug=False):
         if debug:
             return tuple(data)
-        return tuple((x[0], stable_unique(x[1])) for x in data)
+        return tuple((x[0], tuple(unique_stable(x[1]))) for x in data)
 
     @load_property("package.license", parse_func=restriction_payload_splitter)
     def pkg_licenses(self, data, debug=False):
         if debug:
             return tuple(data)
-        return tuple((x[0], stable_unique(x[1])) for x in data)
+        return tuple((x[0], tuple(unique_stable(x[1]))) for x in data)
 
     @load_property("package.use", parse_func=package_use_splitter)
     def pkg_use(self, data, debug=False):
         if debug:
             return tuple(data)
-        return tuple((x[0], split_negations(stable_unique(x[1]))) for x in data)
+        return tuple((x[0], split_negations(unique_stable(x[1]))) for x in data)
 
     @load_property("package.env")
     def pkg_env(self, data, debug=False):

{pkgcore-0.12.42 → pkgcore-0.12.44}/src/pkgcore/ebuild/eapi.py

@@ -12,7 +12,7 @@ from snakeoil import klass
 from snakeoil.delayed import regexp
 from snakeoil.klass import immutable
 from snakeoil.mappings import ImmutableDict, OrderedFrozenSet, inject_getitem_as_getattr
-from snakeoil.sequences import stable_unique
+from snakeoil.sequences import unique_stable
 
 from ..log import logger
 from ..spawn import bash_version
@@ -488,7 +488,7 @@ class EAPI(immutable.Strict):
                         paths[phase].append(dirpath)
                     else:
                         raise ValueError(f"unknown phase: {phase!r}")
-        return ImmutableDict((k, tuple(stable_unique(v))) for k, v in paths.items())
+        return ImmutableDict((k, tuple(unique_stable(v))) for k, v in paths.items())
 
     @klass.jit_attr
     def ebd_env(self):