From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1710608-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 87A571581F0
for <garchives@archives.gentoo.org>; Sat, 18 Jan 2025 23:24:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7C14CE08EC;
Sat, 18 Jan 2025 23:24:47 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 pigeon.gentoo.org (Postfix) with ESMTPS id 5716DE08EC
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2025 23:24:47 +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 A8FB7342FA3
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2025 23:24:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A09797F
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2025 23:24:43 +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: <1737242660.3e35cd95723d9c74e3da7e82553bd4fd85e12a57.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.48.0-r2.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild
X-VCS-Directories: dev-vcs/git/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 3e35cd95723d9c74e3da7e82553bd4fd85e12a57
X-VCS-Branch: master
Date: Sat, 18 Jan 2025 23:24:43 +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: 6580ff5a-d075-4c62-b600-5ca60edfeadf
X-Archives-Hash: 754b38f5391b4930def706fc63a08dd6
commit: 3e35cd95723d9c74e3da7e82553bd4fd85e12a57
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 23:16:45 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 23:24:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e35cd95
dev-vcs/git: restore USE=-safe-directory patch to 2.48.0
It got lost when tidying up with the Meson switch. Also, sync 9999-r1
too for earlier changes (I'd mixed up 9999-r0 and 9999-r1 as the one
which shouldn't be touchde yet as it's pre-meson).
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/git/git-2.48.0-r2.ebuild | 12 ++++++++++++
dev-vcs/git/git-9999-r1.ebuild | 14 ++++++++++++++
dev-vcs/git/git-9999-r2.ebuild | 12 ++++++++++++
dev-vcs/git/git-9999-r3.ebuild | 12 ++++++++++++
4 files changed, 50 insertions(+)
diff --git a/dev-vcs/git/git-2.48.0-r2.ebuild b/dev-vcs/git/git-2.48.0-r2.ebuild
index ada3bd37529c..f90f10f55f15 100644
--- a/dev-vcs/git/git-2.48.0-r2.ebuild
+++ b/dev-vcs/git/git-2.48.0-r2.ebuild
@@ -181,6 +181,18 @@ src_unpack() {
}
+src_prepare() {
+ if ! use safe-directory ; then
+ # This patch neuters the "safe directory" detection.
+ # bugs #838271, #838223
+ PATCHES+=(
+ "${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+ )
+ fi
+
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature curl)
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 2097a69cfdab..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -181,6 +181,18 @@ src_unpack() {
}
+src_prepare() {
+ if ! use safe-directory ; then
+ # This patch neuters the "safe directory" detection.
+ # bugs #838271, #838223
+ PATCHES+=(
+ "${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+ )
+ fi
+
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature curl)
@@ -253,6 +265,7 @@ src_compile() {
if use tk ; then
git_emake -C gitk-git
+ git_emake -C git-gui
fi
if use doc ; then
@@ -432,6 +445,7 @@ src_install() {
if use tk ; then
git_emake -C gitk-git DESTDIR="${D}" install
+ git_emake -C git-gui 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 ada3bd37529c..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -181,6 +181,18 @@ src_unpack() {
}
+src_prepare() {
+ if ! use safe-directory ; then
+ # This patch neuters the "safe directory" detection.
+ # bugs #838271, #838223
+ PATCHES+=(
+ "${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+ )
+ fi
+
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature curl)
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index ada3bd37529c..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -181,6 +181,18 @@ src_unpack() {
}
+src_prepare() {
+ if ! use safe-directory ; then
+ # This patch neuters the "safe directory" detection.
+ # bugs #838271, #838223
+ PATCHES+=(
+ "${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+ )
+ fi
+
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature curl)