xorg-3 eclass no longer works with -9999 ebuilds Reproducible: Always Steps to Reproduce: emerge --oneshot x11-base/xorg-server Actual Results: Calculating dependencies... done! >>> Verifying ebuild manifests >>> Emerging (1 of 1) x11-base/xorg-server-9999::gentoo >>> Unpacking source... * ERROR: x11-base/xorg-server-9999::gentoo failed (unpack phase): * Nothing passed to the 'unpack' command * * Call stack: * ebuild.sh, line 127: Called src_unpack * environment, line 3981: Called xorg-3_src_unpack * environment, line 5005: Called unpack * phase-helpers.sh, line 321: Called die * The specific snippet of code: * [ -z "$*" ] && die "Nothing passed to the 'unpack' command" I was able to work around it like this : --- /mnt/repos/gentoo/eclass/xorg-3.eclass 2022-04-02 19:08:43.772393000 -0400 +++ /mnt/repos/fixes/eclass/xorg-3.eclass 2022-04-03 16:39:50.388782000 -0400 @@ -266,7 +266,8 @@ xorg-3_src_unpack() { debug-print-function ${FUNCNAME} "$@" - if [[ -n ${GIT_ECLASS} ]]; then + #if [[ -n ${GIT_ECLASS} ]]; then + if [[ ${PV} == *9999* ]]; then git-r3_src_unpack else unpack ${A}
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc78701f54654622feff3694c7f66621b2acaa80 commit bc78701f54654622feff3694c7f66621b2acaa80 Author: Matt Turner <mattst88@gentoo.org> AuthorDate: 2022-04-03 23:04:18 +0000 Commit: Matt Turner <mattst88@gentoo.org> CommitDate: 2022-04-03 23:08:28 +0000 xorg-3.eclass: Fix unsetting GIT_ECLASS Apparently I cannot remember how bash works. Closes: https://bugs.gentoo.org/836727 Signed-off-by: Matt Turner <mattst88@gentoo.org> eclass/xorg-3.eclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
