From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E12A415800A for ; Thu, 20 Jul 2023 16:07:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24577E0874; Thu, 20 Jul 2023 16:07:46 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0924CE0874 for ; Thu, 20 Jul 2023 16:07:46 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1406A33E6A3 for ; Thu, 20 Jul 2023 16:07:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A36C4B8B for ; Thu, 20 Jul 2023 16:07:43 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1689869257.2a3b51eb21b1282891c5adea3faa483888e3e410.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/, app-emacs/magit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch app-emacs/magit/magit-3.3.0-r3.ebuild app-emacs/magit/magit-3.3.0-r4.ebuild X-VCS-Directories: app-emacs/magit/files/ app-emacs/magit/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 2a3b51eb21b1282891c5adea3faa483888e3e410 X-VCS-Branch: master Date: Thu, 20 Jul 2023 16:07:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d0da92f-5307-40f6-89e9-7b0ed05f6f32 X-Archives-Hash: 8d886de2055c1e4114aae29075be6f38 commit: 2a3b51eb21b1282891c5adea3faa483888e3e410 Author: Ulrich Müller gentoo org> AuthorDate: Thu Jul 20 16:05:29 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Jul 20 16:07:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3b51eb app-emacs/magit: Suppress warning message about missing magit-libgit Bug: https://bugs.gentoo.org/910593 Signed-off-by: Ulrich Müller gentoo.org> app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch | 15 +++++++++++++++ .../{magit-3.3.0-r3.ebuild => magit-3.3.0-r4.ebuild} | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch b/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch new file mode 100644 index 000000000000..6373e720dffc --- /dev/null +++ b/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch @@ -0,0 +1,15 @@ +Suppress warning message about missing magit-libgit +https://bugs.gentoo.org/910593 + +--- lisp/magit-core.el ++++ lisp/magit-core.el +@@ -41,7 +41,8 @@ + (require 'magit-transient) + (require 'magit-autorevert) + +-(when (magit--libgit-available-p) ++(when (and (not magit-inhibit-libgit) ++ (magit--libgit-available-p)) + (condition-case err + (require 'magit-libgit) + (error diff --git a/app-emacs/magit/magit-3.3.0-r3.ebuild b/app-emacs/magit/magit-3.3.0-r4.ebuild similarity index 93% rename from app-emacs/magit/magit-3.3.0-r3.ebuild rename to app-emacs/magit/magit-3.3.0-r4.ebuild index eaee9f6713a7..46f40464fe43 100644 --- a/app-emacs/magit/magit-3.3.0-r3.ebuild +++ b/app-emacs/magit/magit-3.3.0-r4.ebuild @@ -23,7 +23,10 @@ LICENSE="GPL-3+" SLOT="0" IUSE="libgit" -PATCHES=( "${FILESDIR}"/${P}-inhibit-libgit.patch ) +PATCHES=( + "${FILESDIR}"/${P}-inhibit-libgit.patch + "${FILESDIR}"/${P}-libgit-unavail.patch +) DOCS=( ../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes ) ELISP_TEXINFO="../Documentation/*.texi" SITEFILE="50${PN}-gentoo.el"