commit: 1d20760fcfff422888e8cd8ef8af5a3134e9a19d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 15 07:50:04 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 15 07:50:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d20760f
dev-vcs/git: fix USE=tk for 2.49.0 The gitk-gui subdirectory isn't wired up to the toplevel meson. Closes: https://bugs.gentoo.org/951357 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{git-2.49.0.ebuild => git-2.49.0-r1.ebuild} | 29 ++++++++++++++++------ dev-vcs/git/git-9999-r1.ebuild | 29 ++++++++++++++++------ dev-vcs/git/git-9999-r2.ebuild | 29 ++++++++++++++++------ dev-vcs/git/git-9999-r3.ebuild | 29 ++++++++++++++++------ dev-vcs/git/git-9999.ebuild | 29 ++++++++++++++++------ 5 files changed, 110 insertions(+), 35 deletions(-) diff --git a/dev-vcs/git/git-2.49.0.ebuild b/dev-vcs/git/git-2.49.0-r1.ebuild similarity index 96% rename from dev-vcs/git/git-2.49.0.ebuild rename to dev-vcs/git/git-2.49.0-r1.ebuild index 133f0889e801..24763886d4ad 100644 --- a/dev-vcs/git/git-2.49.0.ebuild +++ b/dev-vcs/git/git-2.49.0-r1.ebuild @@ -218,8 +218,6 @@ src_configure() { # We don't want to bake /usr/bin/sh from usrmerged systems into # binaries. /bin/sh is required by POSIX. sh='/bin/sh' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,6 +252,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -292,6 +299,13 @@ src_compile() { if use tk ; then git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -308,11 +322,6 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { @@ -436,6 +445,12 @@ src_install() { fi if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 133f0889e801..24763886d4ad 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -218,8 +218,6 @@ src_configure() { # We don't want to bake /usr/bin/sh from usrmerged systems into # binaries. /bin/sh is required by POSIX. sh='/bin/sh' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,6 +252,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -292,6 +299,13 @@ src_compile() { if use tk ; then git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -308,11 +322,6 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { @@ -436,6 +445,12 @@ src_install() { fi if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 133f0889e801..24763886d4ad 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -218,8 +218,6 @@ src_configure() { # We don't want to bake /usr/bin/sh from usrmerged systems into # binaries. /bin/sh is required by POSIX. sh='/bin/sh' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,6 +252,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -292,6 +299,13 @@ src_compile() { if use tk ; then git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -308,11 +322,6 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { @@ -436,6 +445,12 @@ src_install() { fi if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 133f0889e801..24763886d4ad 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -218,8 +218,6 @@ src_configure() { # We don't want to bake /usr/bin/sh from usrmerged systems into # binaries. /bin/sh is required by POSIX. sh='/bin/sh' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,6 +252,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -292,6 +299,13 @@ src_compile() { if use tk ; then git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -308,11 +322,6 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { @@ -436,6 +445,12 @@ src_install() { fi if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 133f0889e801..24763886d4ad 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -218,8 +218,6 @@ src_configure() { # We don't want to bake /usr/bin/sh from usrmerged systems into # binaries. /bin/sh is required by POSIX. sh='/bin/sh' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,6 +252,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -292,6 +299,13 @@ src_compile() { if use tk ; then git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -308,11 +322,6 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { @@ -436,6 +445,12 @@ src_install() { fi if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi
