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 18E5515800A for ; Sun, 16 Jul 2023 05:35:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2669BE088A; Sun, 16 Jul 2023 05:35:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D790E088A for ; Sun, 16 Jul 2023 05:35:42 +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 355A2335D5D for ; Sun, 16 Jul 2023 05:35:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C48F9B51 for ; Sun, 16 Jul 2023 05:35:39 +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: <1689485665.f0855a8be53e52bb54c4652d8f0ac9840cb9434a.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/files/, app-emacs/magit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/magit/files/magit-3.3.0-magit-libgit.patch app-emacs/magit/magit-3.3.0-r1.ebuild app-emacs/magit/magit-3.3.0-r2.ebuild app-emacs/magit/magit-9999.ebuild app-emacs/magit/metadata.xml X-VCS-Directories: app-emacs/magit/ app-emacs/magit/files/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: f0855a8be53e52bb54c4652d8f0ac9840cb9434a X-VCS-Branch: master Date: Sun, 16 Jul 2023 05:35:39 +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: 96df5db6-c9c1-4970-b84c-7eb62a34a061 X-Archives-Hash: 9c4cfb39b16efaab64db73d43c0cb4b8 commit: f0855a8be53e52bb54c4652d8f0ac9840cb9434a Author: Ulrich Müller gentoo org> AuthorDate: Sun Jul 16 05:26:36 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Jul 16 05:34:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0855a8b app-emacs/magit: New flag "libgit" Make libegit2 dependency and installation of magit-libgit use-conditional on it. Bug: https://bugs.gentoo.org/910381 Signed-off-by: Ulrich Müller gentoo.org> app-emacs/magit/files/magit-3.3.0-magit-libgit.patch | 11 ----------- .../magit/{magit-3.3.0-r1.ebuild => magit-3.3.0-r2.ebuild} | 6 +++--- app-emacs/magit/magit-9999.ebuild | 5 ++--- app-emacs/magit/metadata.xml | 3 +++ 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/app-emacs/magit/files/magit-3.3.0-magit-libgit.patch b/app-emacs/magit/files/magit-3.3.0-magit-libgit.patch deleted file mode 100644 index f33ac1456198..000000000000 --- a/app-emacs/magit/files/magit-3.3.0-magit-libgit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/magit-libgit.el -+++ b/magit-libgit.el -@@ -51,7 +51,7 @@ - - (require 'magit-git) - --(require 'libgit) -+(require 'libgit nil t) - - ;;; Utilities - diff --git a/app-emacs/magit/magit-3.3.0-r1.ebuild b/app-emacs/magit/magit-3.3.0-r2.ebuild similarity index 93% rename from app-emacs/magit/magit-3.3.0-r1.ebuild rename to app-emacs/magit/magit-3.3.0-r2.ebuild index e15f4b690cc8..e84c3c6320e7 100644 --- a/app-emacs/magit/magit-3.3.0-r1.ebuild +++ b/app-emacs/magit/magit-3.3.0-r2.ebuild @@ -21,8 +21,7 @@ S="${WORKDIR}/${P}/lisp" LICENSE="GPL-3+" SLOT="0" - -PATCHES=( "${FILESDIR}"/${PN}-3.3.0-magit-libgit.patch ) +IUSE="libgit" DOCS=( ../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes ) ELISP_TEXINFO="../Documentation/*.texi" @@ -32,6 +31,7 @@ RDEPEND=" >=app-emacs/dash-2.19.1 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.5 + libgit? ( app-emacs/libegit2 ) " BDEPEND=" ${RDEPEND} @@ -43,7 +43,7 @@ RDEPEND+=" src_prepare() { default - + use libgit || rm magit-libgit.el || die echo "(setq magit-version \"${PV}\")" > magit-version.el || die } diff --git a/app-emacs/magit/magit-9999.ebuild b/app-emacs/magit/magit-9999.ebuild index b3423758df8c..f8f9c547e60d 100644 --- a/app-emacs/magit/magit-9999.ebuild +++ b/app-emacs/magit/magit-9999.ebuild @@ -21,8 +21,7 @@ S="${WORKDIR}/${P}/lisp" LICENSE="GPL-3+" SLOT="0" - -PATCHES=( "${FILESDIR}"/${PN}-3.3.0-magit-libgit.patch ) +IUSE="libgit" DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes ) ELISP_TEXINFO="../docs/*.texi" @@ -43,7 +42,7 @@ RDEPEND+=" src_prepare() { default - + use libgit || rm magit-libgit.el || die echo "(setq magit-version \"${PV}\")" > magit-version.el || die } diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml index f81070d61ccb..6b01d379f24b 100644 --- a/app-emacs/magit/metadata.xml +++ b/app-emacs/magit/metadata.xml @@ -16,6 +16,9 @@ Git operations. + + Use libgit (app-emacs/libegit2) + magit/magit