From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1727964-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id DD9FB1584F2
for <garchives@archives.gentoo.org>; Sat, 15 Mar 2025 07:51:09 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id C5D53343065
for <garchives@archives.gentoo.org>; Sat, 15 Mar 2025 07:51:09 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id BACED1103C7;
Sat, 15 Mar 2025 07:51:08 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id AAEE11103C7
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Mar 2025 07:51:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5469E342FA1
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Mar 2025 07:51:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B01F511A8
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Mar 2025 07:51:06 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1742025041.1d20760fcfff422888e8cd8ef8af5a3134e9a19d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-vcs/git/git-2.49.0-r1.ebuild dev-vcs/git/git-2.49.0.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild dev-vcs/git/git-9999.ebuild
X-VCS-Directories: dev-vcs/git/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 1d20760fcfff422888e8cd8ef8af5a3134e9a19d
X-VCS-Branch: master
Date: Sat, 15 Mar 2025 07:51:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: cde1f09a-bbe3-47ec-b2a4-f0733caa643b
X-Archives-Hash: ee5220b2c22a431ef7a207244fc4febc
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