commit: 6fd71933acc45adbf58ea3c60283435fbbf9d785 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Feb 17 09:58:40 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 17 09:58:40 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd71933
sys-apps/portage: depend on dev-util/debugedit This is needed to avoid collisions with build IDs as debugedit is now used to salt them in installed paths. As discussed at https://public-inbox.gentoo.org/gentoo-dev/877bvq1cnz.fsf <AT> gentoo.org/. Bug: https://bugs.gentoo.org/953869 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/portage/{portage-9999.ebuild => portage-3.0.77-r2.ebuild} | 7 ++++++- sys-apps/portage/portage-9999.ebuild | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-3.0.77-r2.ebuild similarity index 96% copy from sys-apps/portage/portage-9999.ebuild copy to sys-apps/portage/portage-3.0.77-r2.ebuild index 21fad59014bc..ce54cfa4db4f 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-3.0.77-r2.ebuild @@ -20,7 +20,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" fi LICENSE="GPL-2" @@ -64,6 +64,7 @@ RDEPEND=" >=app-admin/eselect-1.2 app-portage/getuto >=app-shells/bash-5.3:0 + dev-util/debugedit >=sec-keys/openpgp-keys-gentoo-release-20240703 >=sys-apps/sed-4.0.5 rsync-verify? ( @@ -89,6 +90,10 @@ PDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch +) + pkg_pretend() { local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 21fad59014bc..21ddda65ae91 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -25,7 +25,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +IUSE="apidoc build doc gentoo-dev +ipc minimal +native-extensions +rsync-verify selinux test xattr" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -64,6 +64,7 @@ RDEPEND=" >=app-admin/eselect-1.2 app-portage/getuto >=app-shells/bash-5.3:0 + dev-util/debugedit >=sec-keys/openpgp-keys-gentoo-release-20240703 >=sys-apps/sed-4.0.5 rsync-verify? (
