From 914bc7f07098ac3918913e4c83951a9cbba5a949 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Feb 2024 05:40:46 +0000 Subject: gentoo auto-resync : 23:02:2024 - 05:40:46 --- app-emacs/magit/Manifest | 2 -- .../magit/files/magit-3.3.0-inhibit-libgit.patch | 22 ---------------------- .../magit/files/magit-3.3.0-libgit-unavail.patch | 15 --------------- 3 files changed, 39 deletions(-) delete mode 100644 app-emacs/magit/files/magit-3.3.0-inhibit-libgit.patch delete mode 100644 app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch (limited to 'app-emacs/magit') diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest index be2031f076c4..84503cc83834 100644 --- a/app-emacs/magit/Manifest +++ b/app-emacs/magit/Manifest @@ -1,6 +1,4 @@ AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6 -AUX magit-3.3.0-inhibit-libgit.patch 629 BLAKE2B 281721586bc1e37ab9655366ba09d4bdc2b509c7a9c86cbf6bbd79aec4583ade3f43ea26449dc14be87d084154c2c77403cbd088c6249f0a882e514d255e1c68 SHA512 cefd33afc1d2f939ecb6b7724dfb2e907e4d6be2453eab2c42ce9a11c99c5cc43c0df4ed999c8cc0b176fa06f45d27091d548fb20bd27e5f03745f8a9b0663d3 -AUX magit-3.3.0-libgit-unavail.patch 388 BLAKE2B 5059db82ca0838e156f761f85699e02e3c3cd8b74fb816461106f1f79f6f2c31c4ad75be496c8701f9a62f8e4ffc75b3bf66f6f38954ff7a53a40e96daf9aa4f SHA512 7c246a20e506063481145b8f216bd4bdf059ab4fccaf49bd99f3cbf6999e9a3df6eb504ca83ca286d23a2616b16e6f8ead77477a52e40e8988ff53e245b89357 DIST magit-3.3.0.50_p20230912.tar.gz 666150 BLAKE2B 52d0afa05fad68283c668810806a61e3df6494c8afecdceccf193c64eec5396fb5f45fad5c31d4cb601954c8abc27fcc4be240ffd72c4fc72531876657c4c157 SHA512 d6c8c32676b07253b661388e8db1602162f7012ff3bf5bc6bcc071507bb9c08633359043eb893b743e5f37d7474a17b1a2e96975cd64d0688e3c6337ca65470e EBUILD magit-3.3.0.50_p20230912.ebuild 1376 BLAKE2B 3d7939185a2a7283a4aa0cc8ce50524a54a872a87f5a6bd93562d85504c50d27d80a1c376d77732256028cd8fb1a12d0e00184212a3f6bcca4e0159536e88a99 SHA512 85bbef49e613687b84f9f3626d2fb8bfce7671b953e5e9b9f5b119681987ecf2877b8bd69fa03f101baccc6f30f6575302766e36380fee9672bc242d252a0db8 EBUILD magit-9999.ebuild 1250 BLAKE2B 6449b6b2d52912fb62a3b36101c1d467c6e37b6d9786e1cf5b2e569c40d891d438cf5b6aa9b0961090e9fd5f2570a07e56cb99ff4a302c867103da784b347dd2 SHA512 ebb8495f1a976f8706f045cec56b84efe7f1b71dd48db5ae88b5d71601f8c55984051e80b9070995f6c71ec9fb06852c62ec27c323e5b4704098ea9228bf5e10 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 deleted file mode 100644 index 20fb2381b6c5..000000000000 --- a/app-emacs/magit/files/magit-3.3.0-inhibit-libgit.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 451cbe5c24f2af7ed505f1422af6ad4e8f05205b -Author: Jonas Bernoulli -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/files/magit-3.3.0-libgit-unavail.patch b/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch deleted file mode 100644 index 6373e720dffc..000000000000 --- a/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 -- cgit v1.2.3