[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/, sys-apps/portage/files/

["Sam James" <sam@gentoo.org>]

commit:     67e33dbaf367adfc465f322d0b6b5793c76207a8
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sat Jul 15 03:20:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 03:44:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e33dba

sys-apps/portage: backport message fix

Backport the "no ebuilds/binpkgs" message fix from the unreleased 3.0.50
to the affected versions.

Bug: https://bugs.gentoo.org/909853
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31891
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...epgraph.py-fix-no-ebuilds-binpkgs-message.patch | 43 ++++++++++++++++++++++
 ...0.48.1-r1.ebuild => portage-3.0.48.1-r2.ebuild} |  5 +++
 ...tage-3.0.49.ebuild => portage-3.0.49-r1.ebuild} |  5 +++
 3 files changed, 53 insertions(+)

diff --git a/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch b/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch
new file mode 100644
index 000000000000..97cff72cd85c
--- /dev/null
+++ b/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 <xxc3ncoredxx@gmail.com>
+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 <xxc3ncoredxx@gmail.com>
+Closes: https://github.com/gentoo/portage/pull/1065
+Fixes: 0b21a5a392bd84c07b94373991f59108fbe98516
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ 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/sys-apps/portage/portage-3.0.48.1-r1.ebuild b/sys-apps/portage/portage-3.0.48.1-r2.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.48.1-r1.ebuild
rename to sys-apps/portage/portage-3.0.48.1-r2.ebuild
index 9e5f7353bb48..d86dba628ab6 100644
--- a/sys-apps/portage/portage-3.0.48.1-r1.ebuild
+++ b/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/sys-apps/portage/portage-3.0.49.ebuild b/sys-apps/portage/portage-3.0.49-r1.ebuild
similarity index 98%
rename from sys-apps/portage/portage-3.0.49.ebuild
rename to sys-apps/portage/portage-3.0.49-r1.ebuild
index f4767cd601e3..5375872b2127 100644
--- a/sys-apps/portage/portage-3.0.49.ebuild
+++ b/sys-apps/portage/portage-3.0.49-r1.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() {