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

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

[Ulrich Müller]

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>

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

[Ulrich Müller]

commit:     80ff253cb2ae33ff9860be7d7cec65965764e5bb
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 06:07:19 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 06:09:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ff253c

app-emacs/magit: Backport magit-inhibit-libgit patch

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../magit/files/magit-3.3.0-inhibit-libgit.patch   | 22 +++++++++
 app-emacs/magit/magit-3.3.0-r3.ebuild              | 57 ++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/app-emacs/magit/files/magit-3.3.0-inhibit-libgit.patch b/app-emacs/magit/files/magit-3.3.0-inhibit-libgit.patch
new file mode 100644
index 000000000000..20fb2381b6c5
--- /dev/null
+++ b/app-emacs/magit/files/magit-3.3.0-inhibit-libgit.patch
@@ -0,0 +1,22 @@
+commit 451cbe5c24f2af7ed505f1422af6ad4e8f05205b
+Author: Jonas Bernoulli <jonas@bernoul.li>
+Date:   Sun Feb 19 13:37:28 2023 +0100
+
+    Inhibit use of libgit by default
+
+--- lisp/magit-git.el
++++ lisp/magit-git.el
+@@ -66,8 +66,11 @@
+ 
+ ;;; Git implementations
+ 
+-(defvar magit-inhibit-libgit nil
+-  "Whether to inhibit the use of libgit.")
++(defvar magit-inhibit-libgit t
++  "Whether to inhibit the use of libgit.
++Use of libgit is inhibited by default because support for libgit
++in magit is only a stub for now.  There is no benefit in using
++it.")
+ 
+ (defvar magit--libgit-available-p 'unknown
+   "Whether libgit is available.

diff --git a/app-emacs/magit/magit-3.3.0-r3.ebuild b/app-emacs/magit/magit-3.3.0-r3.ebuild
new file mode 100644
index 000000000000..ac91b3d9a7f5
--- /dev/null
+++ b/app-emacs/magit/magit-3.3.0-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/
+	https://github.com/magit/magit/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/magit/magit.git"
+else
+	SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+S="${WORKDIR}/${P}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="libgit"
+
+PATCHES=( "${FILESDIR}"/${P}-inhibit-libgit.patch )
+DOCS=( ../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes )
+ELISP_TEXINFO="../Documentation/*.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+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}
+	sys-apps/texinfo
+"
+RDEPEND+="
+	>=dev-vcs/git-2.0.0
+"
+
+src_prepare() {
+	default
+	use libgit || rm magit-libgit.el || die
+	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	einfo "magit version 3.3.0 dropped necessity of the app-emacs/libegit2 package"
+	einfo "magit after 3.3.0 can now use the git executable directly,"
+	einfo "if you need the libegit backend, then please add app-emacs/libegit2 to @world"
+}