Created attachment 875913 [details, diff] perfix portage-3.0.55.1, allow r0X.Y revision numbers thanks for bringing an updated portage to prefix (e.g. update of gentoolkit, which i am using, needs it). but i get double prefix errors. bin/meson.build and cnf/meson.build do some "hprefixify" on install for etc-update and for make.globals and repos.conf. but during src_prepare() these three also get EPREFIX added. my quick solution was adding to the ebuild file sed -e "s|${EPREFIX}||" \ -i bin/etc-update cnf/repos.conf cnf/make.globals || \ die "failed to revert some EPREFIX additions" after the find . -type f -exec sed .... || die "Failed to patch sources" and may i please propose again (cf. bug #832062) my patch to allow r0X.Y revisions, rebased version attached. thanks for your consideration, regards, fritz
Hey thanks, I did some initial testing, but didn't catch this yet. Regarding the inter-revisions, why are you using those? If it's for a generic purpose, perhaps we can see if Portage main wants to consider the feature.
This is odd, I can't seem to reproduce this. What's your EPREFIX? Nevertheless I do think indeed it shouldn't run both from the ebuild as well as meson.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dee6d4d7a9612d4a2a793d40a8b5db62bdada60e commit dee6d4d7a9612d4a2a793d40a8b5db62bdada60e Author: Fabian Groffen <grobian@gentoo.org> AuthorDate: 2023-12-03 10:16:57 +0000 Commit: Fabian Groffen <grobian@gentoo.org> CommitDate: 2023-12-03 10:16:57 +0000 sys-apps/portage-3.0.56: version bump Fix interaction between old Prefix path adjustments and recent newer ones via meson. Double handling could cause bugs such as #918717 when the chosen offset prefix matches the paths replaced by hprefixify (e.g. something starting with /usr). Closes: https://bugs.gentoo.org/918717 Signed-off-by: Fabian Groffen <grobian@gentoo.org> sys-apps/portage/Manifest | 2 +- ...rtage-3.0.55.1.ebuild => portage-3.0.56.ebuild} | 46 +++++++++++----------- 2 files changed, 25 insertions(+), 23 deletions(-) Additionally, it has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=213ae19a34cd7a54b9548d7bcedc34c1eba1a4e4 commit 213ae19a34cd7a54b9548d7bcedc34c1eba1a4e4 Author: Fabian Groffen <grobian@gentoo.org> AuthorDate: 2023-12-03 09:55:35 +0000 Commit: Fabian Groffen <grobian@gentoo.org> CommitDate: 2023-12-03 09:55:35 +0000 sys-apps/portage: cleanup + update interrevisions patch Bug: https://bugs.gentoo.org/918717 Signed-off-by: Fabian Groffen <grobian@gentoo.org> sys-apps/portage/Manifest | 2 - .../portage/files/portage-2.3.45-ebuildshell.patch | 354 --------------------- ...patch => portage-3.0.55.1-interrevisions.patch} | 10 +- sys-apps/portage/portage-3.0.21.ebuild | 307 ------------------ sys-apps/portage/portage-3.0.30.1-r1.ebuild | 305 ------------------ sys-apps/portage/portage-3.0.30.1.ebuild | 308 ------------------ sys-apps/portage/portage-3.0.55.1.ebuild | 4 + 7 files changed, 9 insertions(+), 1281 deletions(-)
