Commit Graph
1086438 Commits
Author SHA1 Message Date
Eli Schwartz 524fd9500c meson.eclass: hoist setup_meson_src_configure outside of subshell
Internally, it may call `die`, but the effects of such do not trigger
until the subshell completes. This meant that after it dies, meson setup
still runs after the traceback. In fact, the fact that it runs at all is
a problem, because a symptom of it running is that it runs *after* the
"If you need support, [...]" bit, and logs the command line followed by
"ERROR: Cannot find specified native file:".

This makes it quite frustrating to locate the actual error.

Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-03 04:15:54 +02:00
Eli Schwartz c593619096 meson.eclass: sanity check if meson-format-array works
We call this program many times inside a heredoc. If it fails and runs
`|| die` then the heredoc isn't killed, the main ebuild process is
killed. But by that time possibly dozens of $(meson-format-array ...)'s
have been run, each one printing its own traceback from `die`, which is
quite confusing.

Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-03 04:15:54 +02:00
Eli Schwartz 4e0d5fb7af distutils-r1.eclass: drop *FLAGS localization workaround for meson-python
After the previous commit, meson.eclass doesn't modify *FLAGS anymore,
which means it is safe again to call other build systems alongside a
single meson-python wheel build.

Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-03 04:15:54 +02:00
Eli Schwartz 3e0f6807df meson.eclass: localize all *FLAGS variables before calling filter-lto
We filter LTO in order to generate meson's machine files describing the
*FLAGS values, with LTO stripped out and replaced by meson's -D b_lto
builtin option. Since the values are frozen into the machine files, the
variables themselves don't need to persist past the end of the function.

We already run setup_meson_src_configure inside a subshell just to avoid
messing with the environment across meson-multilib.eclass calls, and we
do similar in distutils-r1.eclass when invoking the meson-python build
backend. It is simpler and more straightforward if we instead make
setup_meson_src_configure itself avoid side effects -- and we don't want
to use a subshell there anyway.

Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-03 04:15:54 +02:00
Michał Górny e68814c2ea distutils-r1.eclass: Use SYSROOT condition for all cross logic
Acked by chewi.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
Merges: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:53 +02:00
Michał Górny c74fc126ce distutils-r1.eclass: Install wheels with --verify-tags when possible
Pass --verify-tags to "gpep517 install-wheel" when a new enough version
is installed along with a new enough version of dev-python/packaging
(which is a PDEPEND).

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:53 +02:00
Michał Górny 9e64c23296 distutils-r1.eclass: Set PYTHON*_USEDEP in single-impl mode
Set PYTHON_USEDEP and PYTHON_SINGLE_USEDEP for sub-phase functions when
running the build in single-impl mode.  This ensures parity with
multi-impl mode where these variables are set by python_foreach_impl().

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:53 +02:00
Luca Barbato 1444374ef5 distutils-r1.eclass: always add PYTHON_DEPS to DEPEND
distutils_wheel_create() always passes --sysroot to gpep517 whenever
SYSROOT is set, and gpep517 requires the target interpreter's own
_sysconfigdata under it -- even for a pure-Python package. DEPEND only
got PYTHON_DEPS when DISTUTILS_EXT was set, so the build dies whenever
SYSROOT and ROOT diverge and the interpreter isn't in SYSROOT.

Invisible under the common crossdev setup (SYSROOT == ROOT), but
reproducible with plain crossdev by pointing ROOT elsewhere:

  ROOT=/some/other/root ${CHOST}-emerge dev-python/pysocks

dies with "should have found one _sysconfigdata file, found []".

Closes: https://bugs.gentoo.org/981568
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:53 +02:00
Michał Górny 2f350fe3d8 eclass/tests: Add best wheel selection tests for distutils-r1
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:52 +02:00
Michał Górny 973da8e8ba distutils-r1.eclass: Fix preserving order in DISTUTILS_WHEELS
Split DISTUTILS_WHEELS into a separate DISTUTILS_WHEELS array
and DISTUTILS_WHEEL_PATHS associative array, in order to preserve wheel
order.  As it turns out, bash took associative arrays seriously and did
implement them as a hash map.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:52 +02:00
Michał Górny 37fa587374 distutils-r1.eclass: Split wheel selection into a function
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:52 +02:00
Michał Górny 4768246b1e distutils-r1.eclass: Add a Python tag safety check for wheel reuse
Add a safety check verifying whether all the previously built wheels
were built for a Python tag that's not newer than the current
implementation.  Given we are always building from the oldest version to
newest, this must always be true and we fail immediately if it is not.
Note that since we're merely checking this particular aspect, we do not
check whether the combination of the Python tag and the ABI tag is
compatible.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:52 +02:00
Michał Górny b6409296ae distutils-r1.eclass: Prefer later wheels for reuse
When choosing the wheel to reuse, prefer the latest wheel that is
compatible with the target.  This matches the behavior of Python
installers, and ensures that when both cp312-abi3 and cp315-abi3.abi3t
wheels are available, the latter is preferred.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:51 +02:00
Michał Górny 42cd48ce8f distutils-r1.eclass: Support abi3t wheel reuse for freethreading
Add explicit support for reusing *-abi3t-* wheels when installing for
freethreading Python.  Tested by calling src_compile() in cryptography
twice.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:51 +02:00
Michał Górny 9deb7f9b7f distutils-r1.eclass: Match tags precisely in the wheel reuse logic
Modify the wheel reuse logic to split the tags from the wheel filename,
and match them precisely rather than applying a broad match.  Notably,
this fixes handling compressed tag sets, and therefore enables us to
reuse *-abi3.abi3t-* wheels on Python 3.15.

Note that this currently does not strictly following the installer
behavior, as earlier wheels are preferred over later wheels.
For example, for cryptography the *-cp312-abi3-*.whl will be used rather
than the *-cp315-abi3.abi3t-*.whl, if built.  In other words, this will
currently make a difference only if you're building for 3.15+3.15t with
no earlier implementations.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:51 +02:00
Michał Górny d76b5a2509 python-utils-r1.eclass: Reorder impls for ascending versions
Reorder the implementations so that the builds are run in ascending
versions, rather than having all freethreading builds done first.  This
still preserves the assumption that for a given Python version,
freethreading build is done before the GIL-enabled build (and therefore
the latter is preferred -- and we want this as long as we consider
freethreading experimental and potentially suboptimal for general use).
However, it also ensures that a newer Python version would not be built
before an earlier version.

This is an assumption we've made when implementing wheel reuse.
Normally, wheels encode the minimum supported Python version using
the Python tag.  For example, an ABI3 wheel for Python 3.12+ is named
*-cp312-abi3-*.whl.

However, rather than parsing these tags, we rely on the assumption that
a given Python version needs to be able to run wheels it is building,
so it will not output wheels requiring a newer Python versions.
Therefore, as long as earlier versions are built first, we can assume
that the wheels in the reuse list will be compatible with the subsequent
implementations.

For this assumption to hold, we were relying on the fact that
freethreading builds did not support the limited API, and therefore
could not produce reusable wheels.  With Python 3.15, this is no longer
the case and a 3.15t build can produce an *-cp315-abi3.abi3t-*.whl that
is compatible with GIL-enabled Python 3.15, but not lower versions.
This did not explode straight away because our overcautious logic
specifically required *-abi3-*.whl, but it's still worth fixing.

Of course, it would probably be even better to actually look
at the Python tag, but one does not preclude the other.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1732
2026-09-03 04:15:51 +02:00
Michał Górny 6a1d161015 dev-python/lxml: Bump to 6.1.3
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-03 04:15:50 +02:00
Michał Górny bfa06a5361 dev-python/django: Bump to 6.1.1
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-03 04:15:50 +02:00
Michał Górny 3b3c33a3c2 dev-python/boto3: Bump to 1.43.87
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-03 04:15:50 +02:00
Michał Górny a4c042972f dev-python/botocore: Bump to 1.43.87
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-03 04:15:50 +02:00
Ionen Wolkens e3daa52fb0 games-emulation/zsnes: remove -* from KEYWORDS
It has potential to support more arches now, albeit currently
only arm64 sounds possible.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 22:11:38 -04:00
Ionen Wolkens 4b36e91de9 games-emulation/zsnes: add 2.3.0
Now with experimental x86_64 support, which opting to enable
right away (please stick to 2.2.3 for now if have issues).

Quite possible overlooked something with all the changes, not
to mention the Makefile is trying harder to do autoconf/meson
and friend's job and may have rough edges.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 22:10:02 -04:00
Ionen Wolkens a00c95d481 games-emulation/zsnes: drop 2.2.1, 2.2.2
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 21:06:09 -04:00
Ionen Wolkens ab7e4da872 media-libs/vips: add 8.18.6
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 20:44:29 -04:00
Ionen Wolkens d03b00b53e media-libs/vips: drop 8.18.3
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 20:44:29 -04:00
Ionen Wolkens 1eafdf3231 dev-cpp/simpleini: add 4.27
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 20:44:28 -04:00
Ionen Wolkens bd5e435284 dev-cpp/simpleini: drop 4.25
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 20:44:28 -04:00
Ionen Wolkens 25c8ef22b4 media-libs/libsdl2: add 2.32.72
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 20:44:28 -04:00
Ionen Wolkens 7382861a4c media-libs/libsdl3: add 3.4.16
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
2026-09-02 20:44:28 -04:00
Sebastian Pipping ec5929156a dev-python/ansi2html: 1.9.4
Bug: https://bugs.gentoo.org/981825
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
2026-09-02 23:49:41 +02:00
James Le Cuirot 18cecfbb96 games-fps/ut2004-*: Drop last-rited packages
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
2026-09-02 22:46:17 +01:00
James Le Cuirot 33b3b01523 games-server/ut2004-ded: Drop last-rited package
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
2026-09-02 22:46:16 +01:00
James Le Cuirot 69ac91e677 games-fps/ut2003*: Drop last-rited packages
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
2026-09-02 22:46:16 +01:00
James Le Cuirot 839ee3e69e games-util/uz2unpack: Drop last-rited package
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
2026-09-02 22:46:16 +01:00
Alfredo Tupone bb80b4e3b5 sci-libs/ogdi: using tc-getAR
Closes: https://bugs.gentoo.org/725618
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
2026-09-02 23:42:04 +02:00
Michał Górny fc76fbe578 sys-kernel/gentoo-kernel-modprep: Fix patchset URL for 7.2*
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:07 +02:00
Michał Górny 37c1248b60 sys-kernel/gentoo-kernel-bin: Fix patchset URL for 7.2*
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:07 +02:00
Michał Górny 836427eea5 sys-kernel/gentoo-kernel: Fix patchset URL for 7.2*
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:06 +02:00
Michał Górny aa85c7d5b1 sys-kernel/gentoo-kernel-modprep: Bump to 6.1.187
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:06 +02:00
Michał Górny 0991fb8ff9 sys-kernel/gentoo-kernel-bin: Bump to 6.1.187
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:06 +02:00
Michał Górny 348122dcce sys-kernel/gentoo-kernel-modprep: Bump to 6.6.156
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:06 +02:00
Michał Górny 113a1b5ad9 sys-kernel/gentoo-kernel-bin: Bump to 6.6.156
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:05 +02:00
Michał Górny 4bb62b6b35 sys-kernel/gentoo-kernel-modprep: Bump to 6.12.108
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:05 +02:00
Michał Górny ed8e7b6e78 sys-kernel/gentoo-kernel-bin: Bump to 6.12.108
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:05 +02:00
Michał Górny d300f7c0ce sys-kernel/gentoo-kernel-modprep: Bump to 6.18.49
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:05 +02:00
Michał Górny 899e764562 sys-kernel/gentoo-kernel-bin: Bump to 6.18.49
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:04 +02:00
Michał Górny 16c7bc3304 sys-kernel/gentoo-kernel-modprep: Bump to 7.1.13
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:04 +02:00
Michał Górny ca82b242ac sys-kernel/gentoo-kernel-bin: Bump to 7.1.13
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:04 +02:00
Michał Górny fd0779e678 sys-kernel/gentoo-kernel-modprep: Bump to 7.2.3
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:04 +02:00
Michał Górny 6b68143ed0 sys-kernel/gentoo-kernel-bin: Bump to 7.2.3
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-02 22:16:03 +02:00