commit: 04893125ccb6e4125982e7d5ec17616b602d8151 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 8 00:30:29 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 8 00:30:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04893125
dev-vcs/git: fix USE=tk installation when git is not already installed git-gui/Makefile invokes git to determine gitexecdir if unset. Fortunately, for master, git-gui uses meson, so will switch that in a followup commit. Closes: https://bugs.gentoo.org/957542 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-vcs/git/{git-2.48.1.ebuild => git-2.48.1-r1.ebuild} | 4 ++-- dev-vcs/git/{git-2.49.0-r2.ebuild => git-2.49.0-r3.ebuild} | 4 ++-- dev-vcs/git/git-9999-r1.ebuild | 5 ++--- dev-vcs/git/git-9999-r2.ebuild | 4 ++-- dev-vcs/git/git-9999-r3.ebuild | 4 ++-- dev-vcs/git/git-9999.ebuild | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1-r1.ebuild similarity index 98% rename from dev-vcs/git/git-2.48.1.ebuild rename to dev-vcs/git/git-2.48.1-r1.ebuild index a65507786715..c88a9ecc7d6a 100644 --- a/dev-vcs/git/git-2.48.1.ebuild +++ b/dev-vcs/git/git-2.48.1-r1.ebuild @@ -271,7 +271,7 @@ src_compile() { if use tk ; then git_emake -C gitk-git - git_emake -C git-gui + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" fi if use doc ; then @@ -451,7 +451,7 @@ src_install() { if use tk ; then git_emake -C gitk-git DESTDIR="${D}" install - git_emake -C git-gui DESTDIR="${D}" install + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" DESTDIR="${D}" install fi perl_delete_localpod diff --git a/dev-vcs/git/git-2.49.0-r2.ebuild b/dev-vcs/git/git-2.49.0-r3.ebuild similarity index 98% rename from dev-vcs/git/git-2.49.0-r2.ebuild rename to dev-vcs/git/git-2.49.0-r3.ebuild index 56d25e42eaa3..68412899acc4 100644 --- a/dev-vcs/git/git-2.49.0-r2.ebuild +++ b/dev-vcs/git/git-2.49.0-r3.ebuild @@ -323,7 +323,7 @@ src_compile() { fi if use tk ; then - git_emake -C git-gui + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" ( EMESON_SOURCE="${S}"/gitk-git @@ -476,7 +476,7 @@ src_install() { meson_src_install ) - git_emake -C git-gui DESTDIR="${D}" install + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" DESTDIR="${D}" install fi perl_delete_localpod diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index a479b24dfe0a..8ebc4d045026 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -313,8 +313,7 @@ src_compile() { fi if use tk ; then - git_emake -C git-gui - + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" ( EMESON_SOURCE="${S}"/gitk-git BUILD_DIR="${WORKDIR}"/gitk-git_build @@ -466,7 +465,7 @@ src_install() { meson_src_install ) - git_emake -C git-gui DESTDIR="${D}" install + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" DESTDIR="${D}" install fi perl_delete_localpod diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index a479b24dfe0a..e69f23c7c310 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -313,7 +313,7 @@ src_compile() { fi if use tk ; then - git_emake -C git-gui + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" ( EMESON_SOURCE="${S}"/gitk-git @@ -466,7 +466,7 @@ src_install() { meson_src_install ) - git_emake -C git-gui DESTDIR="${D}" install + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" DESTDIR="${D}" install fi perl_delete_localpod diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index a479b24dfe0a..e69f23c7c310 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -313,7 +313,7 @@ src_compile() { fi if use tk ; then - git_emake -C git-gui + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" ( EMESON_SOURCE="${S}"/gitk-git @@ -466,7 +466,7 @@ src_install() { meson_src_install ) - git_emake -C git-gui DESTDIR="${D}" install + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" DESTDIR="${D}" install fi perl_delete_localpod diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index a479b24dfe0a..e69f23c7c310 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -313,7 +313,7 @@ src_compile() { fi if use tk ; then - git_emake -C git-gui + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" ( EMESON_SOURCE="${S}"/gitk-git @@ -466,7 +466,7 @@ src_install() { meson_src_install ) - git_emake -C git-gui DESTDIR="${D}" install + git_emake -C git-gui gitexecdir="${EPREFIX}/usr/libexec/git-core" DESTDIR="${D}" install fi perl_delete_localpod
