Simple stuff. the prefix-chaining patch needs to be rebased, I've done so and will be attaching the updated patch. Reproducible: Always Steps to Reproduce: 1. attempt to build sys-apps/portage-2.3.18::prefix (ebuild, emerge, whatever) 2. 3. Actual Results: Patch fails to apply Expected Results: Patch applies.
Created attachment 511780 [details, diff] portage-2.3.18-prefix-chaining.patch Add this to $FILESDIR, adjust the ebuild (prolly no need for a revbumb, as it would not build anyways without this)
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2790e4405fc6cbeb3e5e6e138f357d09cbc4b46f commit 2790e4405fc6cbeb3e5e6e138f357d09cbc4b46f Author: Fabian Groffen <grobian@gentoo.org> AuthorDate: 2017-12-29 13:06:43 +0000 Commit: Fabian Groffen <grobian@gentoo.org> CommitDate: 2017-12-29 13:06:43 +0000 sys-apps/portage: add/update patch for prefix-chaining, bug #642456 Closes: https://bugs.gentoo.org/642456 Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6 .../portage-2.2.00.15801-prefix-chaining.patch | 693 --------------------- .../portage-2.2.01.18826-aix-preservelibs.patch | 32 - .../portage-2.2.01.19247-aix-preserve-libs.patch | 163 ----- ...portage-2.2.10.1-brokentty-more-platforms.patch | 35 -- .../portage-2.2.10.1-case-insensitive-fs.patch | 375 ----------- ...ortage-2.2.7-macho-relative-install_names.patch | 68 -- sys-apps/portage/files/portage-2.2.7-sandbox.patch | 21 - .../files/portage-2.2.7-shebang-fixes.patch | 153 ----- ....patch => portage-2.3.18-prefix-chaining.patch} | 182 +++--- .../files/portage-2.3.4-mj-safe-econf.patch | 39 -- sys-apps/portage/portage-2.3.18.ebuild | 2 +- 11 files changed, 80 insertions(+), 1683 deletions(-)
Something's wrong with the rebased patch - I do get this error now (unless using --nodeps): File "/tools/haubi/gentoo/ow04/usr/lib/python2.7/site-packages/_emerge/depgraph.py", line 3270, in _add_pkg_deps dep_string = portage.dep.use_reduce(dep_string, UnboundLocalError: local variable 'dep_string' referenced before assignment
Huh. Well, I just did what I thought to be correct with regards to rebasing it with contextual clues. I personally don't know portage's internals all that well, so I could have done it wrong.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6230e5caf431d35944fa927827fa97ac596251f commit f6230e5caf431d35944fa927827fa97ac596251f Author: Michael Haubenwallner <haubi@gentoo.org> AuthorDate: 2018-01-18 12:00:32 +0000 Commit: Michael Haubenwallner <haubi@gentoo.org> CommitDate: 2018-01-18 12:00:32 +0000 sys-apps/portage: rebase prefix-chaining patch Closes: https://bugs.gentoo.org/642456 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../files/portage-2.3.18-prefix-chaining.patch | 90 ++++++++++++++-------- 1 file changed, 60 insertions(+), 30 deletions(-)
