[gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/files/, app-emacs/magit/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     f0855a8be53e52bb54c4652d8f0ac9840cb9434a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 05:26:36 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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.
 </longdescription>
 <stabilize-allarches/>
+<use>
+  <flag name="libgit">Use libgit (<pkg>app-emacs/libegit2</pkg>)</flag>
+</use>
 <upstream>
   <remote-id type="github">magit/magit</remote-id>
 </upstream>