commit: aa3bce6053afcf8429a917625e7d13578bb7e3ed Author: Tom Gillespie <tgbugs <AT> gmail <DOT> com> AuthorDate: Tue Nov 25 01:59:45 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 26 01:33:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3bce60
app-emacs/geiser-guile: do not inherit guile-single guile-single was only used to overwrite the default value of geiser-guile-binary on linux systems, this prevents the user from controlling the version of guile used by geiser via eselect-guile or by some other path manipulation, which means they would need to install their own copy of geiser-guile as a workaround. The ebuild is updated to RDEPEND on dev-scheme/guile without specifying which slot should be used. [sam: add Fixes; revbump for the fixed 'transient' dep and change in behaviour; note that eselect guile didn't exist at the time of the ebuild being ported to guile-single.eclass.] Fixes: 8e3ab0ab221f7d53d986bcae6e005dc2fae16ea5 Signed-off-by: Tom Gillespie <tgbugs <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44770 Closes: https://github.com/gentoo/gentoo/pull/44770 Signed-off-by: Sam James <sam <AT> gentoo.org> ...e-0.28.3-r100.ebuild => geiser-guile-0.28.3-r101.ebuild} | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app-emacs/geiser-guile/geiser-guile-0.28.3-r100.ebuild b/app-emacs/geiser-guile/geiser-guile-0.28.3-r101.ebuild similarity index 83% rename from app-emacs/geiser-guile/geiser-guile-0.28.3-r100.ebuild rename to app-emacs/geiser-guile/geiser-guile-0.28.3-r101.ebuild index eee9b8376022..62f93ed61f0e 100644 --- a/app-emacs/geiser-guile/geiser-guile-0.28.3-r100.ebuild +++ b/app-emacs/geiser-guile/geiser-guile-0.28.3-r101.ebuild @@ -3,9 +3,7 @@ EAPI=8 -GUILE_COMPAT=( 2-2 3-0 ) - -inherit elisp guile-single +inherit elisp DESCRIPTION="Guile's implementation of the Geiser protocols" HOMEPAGE="https://gitlab.com/emacs-geiser/guile/"; @@ -24,14 +22,14 @@ fi LICENSE="BSD" SLOT="0" -REQUIRED_USE="${GUILE_REQUIRED_USE}" BDEPEND=" app-emacs/geiser + app-emacs/transient " RDEPEND=" ${BDEPEND} - ${GUILE_DEPS} + dev-scheme/guile " PATCHES=( "${FILESDIR}/${PN}-guile-scheme-src-dir.patch" ) @@ -40,15 +38,10 @@ DOCS=( readme.org ) ELISP_TEXINFO="${PN}.texi" SITEFILE="50${PN}-gentoo.el" -pkg_setup() { - elisp_pkg_setup -} - src_prepare() { elisp_src_prepare sed -e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" \ - -e "s|t \"guile\"|t \"${GUILE}\"|" \ -i "${PN}.el" || die }
