diff options
| -rw-r--r-- | app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch | 15 | ||||
| -rw-r--r-- | app-emacs/magit/magit-3.3.0-r4.ebuild (renamed from app-emacs/magit/magit-3.3.0-r3.ebuild) | 5 |
2 files changed, 19 insertions, 1 deletions
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 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" |