public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:prefix commit in: /
Date: Thu, 22 Feb 2024 07:27:49 +0000 (UTC)	[thread overview]
Message-ID: <1708586831.07e60cd2a4f67f0b4207fb8150f9d7a1689cb295.grobian@gentoo> (raw)

commit:     07e60cd2a4f67f0b4207fb8150f9d7a1689cb295
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 07:27:11 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 07:27:11 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=07e60cd2

Merge remote-tracking branch 'origin/master' into prefix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .git-blame-ignore-revs                             |   2 +
 .github/workflows/ci.yml                           |  47 +-
 .github/workflows/lint.yml                         |   2 +-
 .pre-commit-config.yaml                            |   8 +-
 NEWS                                               | 173 +++++
 bin/dispatch-conf                                  |   2 +-
 bin/ebuild-helpers/dohtml                          |   2 +-
 bin/ebuild-helpers/fowners                         |   2 +-
 bin/ebuild-helpers/fperms                          |   2 +-
 bin/ebuild.sh                                      |   8 +-
 bin/estrip                                         |  35 +-
 bin/fixpackages                                    |  71 +-
 bin/install-qa-check.d/05prefix                    |  10 +-
 bin/install-qa-check.d/60bash-completion           |   4 +-
 bin/install-qa-check.d/90bad-bin-group-write       |   2 +-
 bin/install-qa-check.d/90bad-bin-owner             |   2 +-
 bin/install-qa-check.d/90cmake-warnings            |   2 +-
 bin/install-qa-check.d/90world-writable            |   2 +-
 bin/install-qa-check.d/95empty-dirs                |   2 +-
 bin/phase-functions.sh                             |   3 +-
 bin/phase-helpers.sh                               |  10 +-
 bin/quickpkg                                       |  13 +-
 cnf/make.conf.example.arc.diff                     |  46 ++
 cnf/make.globals                                   |  10 +-
 lib/_emerge/AbstractDepPriority.py                 |   3 +-
 lib/_emerge/AsynchronousTask.py                    |   6 +-
 lib/_emerge/Binpkg.py                              |  34 +-
 lib/_emerge/BinpkgFetcher.py                       | 120 ++--
 lib/_emerge/BinpkgPrefetcher.py                    |  36 +-
 lib/_emerge/BinpkgVerifier.py                      |  22 +-
 lib/_emerge/DepPriority.py                         |   4 +-
 lib/_emerge/DepPriorityNormalRange.py              |   4 +-
 lib/_emerge/DepPrioritySatisfiedRange.py           |   1 +
 lib/_emerge/EbuildBinpkg.py                        |  37 +-
 lib/_emerge/EbuildBuild.py                         |  39 +-
 lib/_emerge/EbuildFetchonly.py                     |  10 +-
 lib/_emerge/EbuildMetadataPhase.py                 |  52 +-
 lib/_emerge/EbuildPhase.py                         |  29 +-
 lib/_emerge/MergeListItem.py                       |   1 -
 lib/_emerge/MetadataRegen.py                       |  16 +-
 lib/_emerge/PipeReader.py                          |   1 -
 lib/_emerge/Scheduler.py                           |  65 +-
 lib/_emerge/SpawnProcess.py                        |  50 +-
 lib/_emerge/SubProcess.py                          |  28 +-
 lib/_emerge/UnmergeDepPriority.py                  |  38 +-
 lib/_emerge/actions.py                             |  51 +-
 lib/_emerge/depgraph.py                            | 238 +++++--
 lib/_emerge/resolver/circular_dependency.py        |  21 +-
 lib/_emerge/resolver/slot_collision.py             |  12 +-
 .../{binpkg_compression.py => binpkg_format.py}    |  16 +-
 lib/portage/_compat_upgrade/meson.build            |   1 +
 lib/portage/_emirrordist/DeletionIterator.py       |   8 +-
 lib/portage/_emirrordist/FetchIterator.py          |  18 +-
 lib/portage/_global_updates.py                     |  15 +-
 lib/portage/_selinux.py                            |  17 +-
 lib/portage/_sets/dbapi.py                         |   2 +-
 lib/portage/_sets/libs.py                          |   1 -
 lib/portage/binpkg.py                              |   2 +-
 lib/portage/cache/anydbm.py                        |  17 +-
 lib/portage/const.py                               |   4 +-
 lib/portage/dbapi/__init__.py                      |  14 +-
 lib/portage/dbapi/bintree.py                       | 187 +++--
 lib/portage/dbapi/porttree.py                      | 130 ++--
 lib/portage/dbapi/vartree.py                       |  51 +-
 lib/portage/dep/__init__.py                        |  24 +-
 lib/portage/dep/_slot_operator.py                  |   1 +
 lib/portage/dep/dep_check.py                       |  17 +-
 lib/portage/dep/libc.py                            |  83 +++
 lib/portage/dep/meson.build                        |   1 +
 lib/portage/dep/soname/multilib_category.py        |  10 +
 lib/portage/emaint/main.py                         |   2 +-
 lib/portage/emaint/modules/merges/merges.py        |   4 +-
 lib/portage/exception.py                           |  10 +-
 lib/portage/gpg.py                                 |  14 +-
 lib/portage/gpkg.py                                |  34 +-
 lib/portage/output.py                              |  15 +-
 lib/portage/package/ebuild/config.py               |  67 +-
 lib/portage/package/ebuild/doebuild.py             | 214 +++---
 lib/portage/package/ebuild/fetch.py                |   1 +
 lib/portage/process.py                             | 766 +++++++++++++++------
 lib/portage/proxy/objectproxy.py                   |   1 -
 lib/portage/sync/modules/git/git.py                |  32 +-
 lib/portage/sync/modules/rsync/rsync.py            |  40 +-
 lib/portage/tests/__init__.py                      |  12 +-
 lib/portage/tests/bin/setup_env.py                 |   7 +-
 lib/portage/tests/dbapi/test_auxdb.py              |  71 +-
 lib/portage/tests/dbapi/test_portdb_cache.py       |   6 +-
 lib/portage/tests/dep/meson.build                  |   1 +
 lib/portage/tests/dep/test_libc.py                 |  81 +++
 lib/portage/tests/dep/test_overlap_dnf.py          |  49 +-
 lib/portage/tests/ebuild/test_fetch.py             |  24 +-
 lib/portage/tests/emerge/conftest.py               |  21 +-
 lib/portage/tests/emerge/meson.build               |   2 +
 lib/portage/tests/emerge/test_actions.py           |  23 +-
 lib/portage/tests/emerge/test_baseline.py          |   2 +-
 ...cker_file_collision.py => test_binpkg_fetch.py} | 185 ++---
 lib/portage/tests/emerge/test_config_protect.py    |   2 +-
 .../emerge/test_emerge_blocker_file_collision.py   |   2 +-
 lib/portage/tests/emerge/test_emerge_slot_abi.py   |   2 +-
 lib/portage/tests/emerge/test_libc_dep_inject.py   | 552 +++++++++++++++
 .../tests/env/config/test_PortageModulesFile.py    |   3 +-
 lib/portage/tests/glsa/test_security_set.py        |   4 +-
 lib/portage/tests/gpkg/test_gpkg_gpg.py            |  23 +-
 .../tests/gpkg/test_gpkg_metadata_update.py        |   2 +-
 lib/portage/tests/gpkg/test_gpkg_metadata_url.py   |  45 +-
 lib/portage/tests/gpkg/test_gpkg_path.py           |   3 +-
 lib/portage/tests/locks/test_lock_nonblock.py      |  55 +-
 lib/portage/tests/news/test_NewsItem.py            |   3 +-
 lib/portage/tests/process/meson.build              |   1 +
 lib/portage/tests/process/test_AsyncFunction.py    |  27 +-
 lib/portage/tests/process/test_spawn_fail_e2big.py |   7 +-
 lib/portage/tests/process/test_spawn_returnproc.py |  39 ++
 lib/portage/tests/resolver/ResolverPlayground.py   |  96 ++-
 lib/portage/tests/resolver/meson.build             |   2 +
 .../tests/resolver/soname/test_skip_update.py      |  17 +-
 lib/portage/tests/resolver/test_broken_deps.py     |  76 ++
 .../tests/resolver/test_cross_dep_priority.py      | 164 +++++
 lib/portage/tests/resolver/test_depclean_order.py  | 117 +++-
 lib/portage/tests/resolver/test_eapi.py            |   4 +-
 lib/portage/tests/sets/base/test_variable_set.py   |   8 +
 .../tests/sets/files/test_config_file_set.py       |   3 +-
 .../tests/sets/files/test_static_file_set.py       |   3 +-
 lib/portage/tests/sets/shell/test_shell.py         |   4 +-
 lib/portage/tests/sync/test_sync_local.py          |   2 +-
 lib/portage/tests/update/test_move_ent.py          | 205 +++++-
 lib/portage/tests/update/test_move_slot_ent.py     | 157 ++++-
 lib/portage/tests/update/test_update_dbentry.py    | 217 +++++-
 lib/portage/tests/util/dyn_libs/meson.build        |   1 +
 .../tests/util/dyn_libs/test_installed_dynlibs.py  |  65 ++
 lib/portage/tests/util/futures/asyncio/meson.build |   1 -
 .../util/futures/asyncio/test_child_watcher.py     |  50 --
 lib/portage/tests/util/futures/test_retry.py       |  43 +-
 lib/portage/tests/util/test_manifest.py            |   7 +-
 lib/portage/util/_async/AsyncTaskFuture.py         |   8 +-
 lib/portage/util/_async/BuildLogger.py             |  39 +-
 lib/portage/util/_async/ForkProcess.py             | 191 ++---
 lib/portage/util/_async/PipeLogger.py              |   1 -
 lib/portage/util/_async/PopenProcess.py            |   5 +-
 lib/portage/util/_async/TaskScheduler.py           |   1 -
 lib/portage/util/_dyn_libs/LinkageMapELF.py        |   3 -
 lib/portage/util/_dyn_libs/dyn_libs.py             |  43 +-
 lib/portage/util/elf/constants.py                  |   5 +
 lib/portage/util/file_copy/__init__.py             |   7 +-
 lib/portage/util/futures/_asyncio/__init__.py      |  32 +-
 lib/portage/util/futures/_sync_decorator.py        |   8 +-
 lib/portage/util/futures/executor/fork.py          |   6 +-
 lib/portage/util/locale.py                         |  73 +-
 lib/portage/util/socks5.py                         |  36 +-
 man/ebuild.5                                       |   8 +
 man/emerge.1                                       |   5 +-
 man/make.conf.5                                    |  30 +-
 meson.build                                        |   2 +-
 misc/emerge-delta-webrsync                         |   1 +
 tox.ini                                            |   3 +-
 154 files changed, 4862 insertions(+), 1338 deletions(-)

diff --cc lib/portage/const.py
index 8769ab2707,2154213b7b..1909199ef3
--- a/lib/portage/const.py
+++ b/lib/portage/const.py
@@@ -1,14 -1,7 +1,14 @@@
  # portage: Constants
- # Copyright 1998-2023 Gentoo Authors
+ # Copyright 1998-2024 Gentoo Authors
  # Distributed under the terms of the GNU General Public License v2
  
 +# BEGIN PREFIX LOCAL
 +# ===========================================================================
 +# autotool supplied constants.
 +# ===========================================================================
 +from portage.const_autotool import *
 +# END PREFIX LOCAL
 +
  import os
  
  from portage import installation
diff --cc lib/portage/package/ebuild/doebuild.py
index c627077a27,bc51fdff2d..7994394bdd
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@@ -19,10 -19,9 +19,11 @@@ import sy
  import tempfile
  from textwrap import wrap
  import time
+ from typing import Union
  import warnings
  import zlib
 +# PREFIX LOCAL
 +import platform
  
  import portage
  


             reply	other threads:[~2024-02-22  7:27 UTC|newest]

Thread overview: 195+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-22  7:27 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-25  9:40 [gentoo-commits] proj/portage:prefix commit in: / Fabian Groffen
2024-01-18 10:22 Fabian Groffen
2024-01-18  9:36 Fabian Groffen
2023-12-03 10:10 Fabian Groffen
2023-12-03  9:54 Fabian Groffen
2023-12-03  9:54 Fabian Groffen
2023-12-03  9:54 Fabian Groffen
2023-11-24 20:18 Fabian Groffen
2023-11-24 20:06 Fabian Groffen
2023-11-24 20:06 Fabian Groffen
2023-06-22  8:47 Fabian Groffen
2023-06-17  9:04 Fabian Groffen
2023-06-17  8:41 Fabian Groffen
2022-07-28 17:38 Fabian Groffen
2022-07-27 19:20 Fabian Groffen
2022-07-26 19:39 Fabian Groffen
2022-07-25 15:20 Fabian Groffen
2022-07-24 19:27 Fabian Groffen
2022-07-24 14:01 Fabian Groffen
2022-07-24  9:45 Fabian Groffen
2022-01-14 10:40 Fabian Groffen
2022-01-14 10:32 Fabian Groffen
2021-07-06  7:10 Fabian Groffen
2021-04-16 13:37 Fabian Groffen
2021-01-24  9:02 Fabian Groffen
2021-01-04 10:48 Fabian Groffen
2020-12-07 17:28 Fabian Groffen
2020-12-07 16:46 Fabian Groffen
2020-11-23  7:48 Fabian Groffen
2020-11-22 11:15 Fabian Groffen
2020-09-26 11:29 Fabian Groffen
2020-08-02 12:33 Fabian Groffen
2020-06-02 18:55 Fabian Groffen
2020-01-08 19:14 Fabian Groffen
2019-07-01 13:11 Fabian Groffen
2019-05-30  9:20 Fabian Groffen
2019-02-28 12:31 Fabian Groffen
2019-01-11 10:19 Fabian Groffen
2019-01-07 10:22 Fabian Groffen
2018-12-23 11:14 Fabian Groffen
2018-12-12 18:54 Fabian Groffen
2018-08-04  6:56 Fabian Groffen
2018-06-25  8:34 Fabian Groffen
2018-06-17 14:38 Fabian Groffen
2018-06-17 14:38 Fabian Groffen
2018-05-28 15:24 Fabian Groffen
2018-05-25 19:44 Fabian Groffen
2018-05-25 19:44 Fabian Groffen
2018-05-18 19:46 Fabian Groffen
2017-12-12  8:19 Fabian Groffen
2017-10-29 14:51 Fabian Groffen
2017-10-03  7:32 Fabian Groffen
2017-09-22 10:08 Fabian Groffen
2017-08-21 13:27 Fabian Groffen
2017-08-13  7:21 Fabian Groffen
2017-05-23 13:34 Fabian Groffen
2017-03-25  9:12 Fabian Groffen
2017-03-24 19:09 Fabian Groffen
2017-03-24  7:43 Fabian Groffen
2017-03-23 17:46 Fabian Groffen
2017-03-23 17:32 Fabian Groffen
2017-03-23 17:23 Fabian Groffen
2017-03-23 15:38 Fabian Groffen
2017-03-17  8:25 Fabian Groffen
2017-03-02  8:48 Fabian Groffen
2017-03-02  8:18 Fabian Groffen
2017-02-23 14:05 Fabian Groffen
2017-01-27 15:08 Fabian Groffen
2017-01-27 15:08 Fabian Groffen
2016-03-20 19:31 Fabian Groffen
2016-02-21 16:17 Fabian Groffen
2016-02-21 16:17 Fabian Groffen
2016-02-18 19:35 Fabian Groffen
2016-02-18 19:35 Fabian Groffen
2015-06-20  7:12 Fabian Groffen
2015-06-09 18:30 Fabian Groffen
2015-06-09 18:01 Fabian Groffen
2015-06-04 19:47 Fabian Groffen
2015-04-05  9:15 Fabian Groffen
2014-11-12 17:31 Fabian Groffen
2014-10-02 18:48 Fabian Groffen
2014-09-28 17:52 Fabian Groffen
2014-05-06 19:32 Fabian Groffen
2014-05-06 19:18 Fabian Groffen
2014-04-22 19:52 Fabian Groffen
2014-02-06 21:09 Fabian Groffen
2014-01-06  9:47 Fabian Groffen
2013-09-24 17:29 Fabian Groffen
2013-09-20 17:59 Fabian Groffen
2013-09-18 18:34 Fabian Groffen
2013-09-13 18:02 Fabian Groffen
2013-08-10 20:54 Fabian Groffen
2013-07-10  5:31 Fabian Groffen
2013-07-08 19:32 Fabian Groffen
2013-06-29  5:41 Fabian Groffen
2013-06-27 17:20 Fabian Groffen
2013-06-12  9:02 Fabian Groffen
2013-06-09 15:53 Fabian Groffen
2013-05-04 18:55 Fabian Groffen
2013-04-02 16:57 Fabian Groffen
2013-03-31 19:03 Fabian Groffen
2013-03-31 19:00 Fabian Groffen
2013-03-24  8:36 Fabian Groffen
2013-03-23 19:54 Fabian Groffen
2013-02-28 19:29 Fabian Groffen
2013-02-07 20:01 Fabian Groffen
2013-01-27 21:41 Fabian Groffen
2013-01-27 21:41 Fabian Groffen
2013-01-13 10:26 Fabian Groffen
2013-01-10 21:02 Fabian Groffen
2013-01-05 18:14 Fabian Groffen
2012-12-26 14:48 Fabian Groffen
2012-12-02 15:47 Fabian Groffen
2012-12-02 15:36 Fabian Groffen
2012-12-02 15:33 Fabian Groffen
2012-12-02 15:33 Fabian Groffen
2012-12-02 15:33 Fabian Groffen
2012-12-02 13:12 Fabian Groffen
2012-12-02 12:59 Fabian Groffen
2012-11-04 10:48 Fabian Groffen
2012-10-22 17:25 Fabian Groffen
2012-10-02 12:02 Fabian Groffen
2012-09-30 11:22 Fabian Groffen
2012-09-26 18:26 Fabian Groffen
2012-09-12 18:18 Fabian Groffen
2012-09-09  7:40 Fabian Groffen
2012-09-06 18:14 Fabian Groffen
2012-08-27  6:44 Fabian Groffen
2012-08-12  7:50 Fabian Groffen
2012-07-19 16:25 Fabian Groffen
2012-07-06  7:05 Fabian Groffen
2012-04-23 19:23 Fabian Groffen
2012-04-03 18:04 Fabian Groffen
2012-03-31 19:31 Fabian Groffen
2012-03-01 20:32 Fabian Groffen
2012-02-19  9:58 Fabian Groffen
2012-02-09  8:01 Fabian Groffen
2012-01-10 17:45 Fabian Groffen
2011-12-31 16:45 Fabian Groffen
2011-12-26  9:12 Fabian Groffen
2011-12-23  9:51 Fabian Groffen
2011-12-22  9:51 Fabian Groffen
2011-12-19 18:30 Fabian Groffen
2011-12-14 15:25 Fabian Groffen
2011-12-10 11:28 Fabian Groffen
2011-12-09 20:33 Fabian Groffen
2011-12-02 20:31 Fabian Groffen
2011-12-02 19:20 Fabian Groffen
2011-12-02 19:19 Fabian Groffen
2011-12-02 19:18 Fabian Groffen
2011-12-02 18:03 Fabian Groffen
2011-10-21 17:34 Fabian Groffen
2011-10-21 17:34 Fabian Groffen
2011-10-20 20:28 Fabian Groffen
2011-10-20 17:08 Fabian Groffen
2011-10-20 16:38 Fabian Groffen
2011-10-17 18:36 Fabian Groffen
2011-10-16 13:59 Fabian Groffen
2011-10-15 18:27 Fabian Groffen
2011-10-13  6:52 Fabian Groffen
2011-09-23 18:38 Fabian Groffen
2011-09-23 18:23 Fabian Groffen
2011-09-20 18:25 Fabian Groffen
2011-09-14 18:43 Fabian Groffen
2011-09-14 18:38 Fabian Groffen
2011-09-13 17:41 Fabian Groffen
2011-08-31 18:39 Fabian Groffen
2011-08-30 18:45 Fabian Groffen
2011-08-29 19:03 Fabian Groffen
2011-08-25 20:25 Fabian Groffen
2011-08-20 17:50 Fabian Groffen
2011-07-26 17:35 Fabian Groffen
2011-07-17  9:48 Fabian Groffen
2011-07-17  8:12 Fabian Groffen
2011-07-01 17:44 Fabian Groffen
2011-06-14 15:39 Fabian Groffen
2011-06-06 17:12 Fabian Groffen
2011-05-28  8:29 Fabian Groffen
2011-05-27 17:41 Fabian Groffen
2011-05-14 13:59 Fabian Groffen
2011-05-02 17:41 Fabian Groffen
2011-04-24 12:08 Fabian Groffen
2011-04-15 18:27 Fabian Groffen
2011-04-15 18:27 Fabian Groffen
2011-03-28 16:52 Fabian Groffen
2011-03-23 19:26 Fabian Groffen
2011-03-17 19:08 Fabian Groffen
2011-03-13 14:45 Fabian Groffen
2011-03-09 19:44 Fabian Groffen
2011-02-26 21:15 Fabian Groffen
2011-02-10 18:46 Fabian Groffen
2011-02-10 18:44 Fabian Groffen
2011-02-10 18:20 Fabian Groffen
2011-02-05 12:25 Fabian Groffen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1708586831.07e60cd2a4f67f0b4207fb8150f9d7a1689cb295.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox