diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch b/sdk_container/src/third_party/portage-stable/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch new file mode 100644 index 0000000000..97cff72cd8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch @@ -0,0 +1,43 @@ +From b199d0307b47f9fb06dbe533d7e24926a561c238 Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen +Date: Sun, 9 Jul 2023 00:08:27 -0500 +Subject: [PATCH] depgraph.py: fix "no ebuilds/binpkgs" message + +The "there are no binary packages to satisfy" was being unconditionally +output for packages that could not be found. Fix the logic for choosing +between the "binary packages" and "ebuilds" form of the message. + +This is a temporary stopgap as alluded to by me in the bug, but the +tl;dr is that some entries in the `myopts` dict have "y"/"n" values +whereas some are True/unset, and this discrepancy should be sorted out. + +[sam: Add NEWS and Fixes, although the change in that commit _shouldn't_ +have been wrong, it is because of a quirk for now...] + +[oskari: remove NEWS for backport] + +Bug: https://bugs.gentoo.org/909853 +Signed-off-by: Oskari Pirhonen +Closes: https://github.com/gentoo/portage/pull/1065 +Fixes: 0b21a5a392bd84c07b94373991f59108fbe98516 +Signed-off-by: Sam James +--- + lib/_emerge/depgraph.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py +index a36ab6351..1aeae6257 100644 +--- a/lib/_emerge/depgraph.py ++++ b/lib/_emerge/depgraph.py +@@ -6456,7 +6456,7 @@ class depgraph: + cp_exists = True + break + +- if self._frozen_config.myopts.get("--usepkgonly", "y"): ++ if self._frozen_config.myopts.get("--usepkgonly", False): + writemsg( + f"\nemerge: there are no binary packages to satisfy {green(xinfo)}.\n", + noiselevel=-1, +-- +2.41.0 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.1-r2.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.1-r2.ebuild index 9e5f7353bb..d86dba628a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.1-r2.ebuild @@ -93,6 +93,11 @@ PDEPEND=" ) " +# message patch used in 3.0.48.1 and 3.0.49 (bug 909853) +PATCHES=( + "${FILESDIR}/depgraph.py-fix-no-ebuilds-binpkgs-message.patch" +) + distutils_enable_tests pytest pkg_pretend() { diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.49.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.49-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.49.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.49-r1.ebuild index 9e5f7353bb..0108022357 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.49.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.49-r1.ebuild @@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi LICENSE="GPL-2" @@ -93,6 +93,11 @@ PDEPEND=" ) " +# message patch used in 3.0.48.1 and 3.0.49 (bug 909853) +PATCHES=( + "${FILESDIR}/depgraph.py-fix-no-ebuilds-binpkgs-message.patch" +) + distutils_enable_tests pytest pkg_pretend() { diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild index 9e5f7353bb..d8eb0c8817 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild @@ -50,7 +50,6 @@ DEPEND=" " # Require sandbox-2.2 for bug #288863. # For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). # app-portage/gemato goes without PYTHON_USEDEP since we're calling # the executable. RDEPEND=" @@ -62,7 +61,7 @@ RDEPEND=" >=sys-apps/findutils-4.4 !build? ( >=app-admin/eselect-1.2 - >=app-shells/bash-5.0:0[readline] + >=app-shells/bash-5.0:0 >=sys-apps/sed-4.0.5 >=sec-keys/openpgp-keys-gentoo-release-20230329 rsync-verify? (