gentoo auto-resync : 16:07:2023 - 10:42:35

11 files changed, 132 insertions, 27 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 42b18dab0311..f7b9bb79d821 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/exheres-mode/Manifest b/app-emacs/exheres-mode/Manifest
index ad8fb768aedb..7fdce4b6c9f9 100644
--- a/app-emacs/exheres-mode/Manifest
+++ b/app-emacs/exheres-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50exheres-mode-gentoo.el 76 BLAKE2B 4680cd97c6ae73c90349e9f62d408bc5652868134d13c4be61df58a08fc8800605f760e05b64f6ae2f8fe8f64d5c3d8e894acaf1c02e076f108c1236d6cf1944 SHA512 457cf7b3b2a7d40142ed78f4e3d3c0e51350a11fb1ec6b2eaf4ddd8086d0ba468eda849e26732a8ecf4826751699a30b3ac6a27a5ae978b09f2ac5ea8f6a662f
 DIST exheres-mode-1.10.tar.xz 49364 BLAKE2B 39d9233c212255d0c472740425357484d9d34c1a71e7ecefb40eecae19de551785c627ff0985b8018f8b9cfbdd7068e0ba624b7a624aa1e4e037135d1d83f520 SHA512 ac2be1197999f387dccbf4c335837ed0e9e356fed909a4436857fd5b1cbbf8ee47d046d7a166674462e4804ddf816d064dac6a62999d4447ff3554e5062a0f63
-EBUILD exheres-mode-1.10.ebuild 499 BLAKE2B efbfe64ff45c63a3abc8291d9ad8194c37d1e0dc2b6a439fc38d435efad0519111a1a71b879b16d3cda2a1d9d3562621124bc3db63e57ff758f47e31594299b5 SHA512 b073ad802dc0f25640c377b172668c5d268c7261a154a0c8a81ad82447b8c05ce08eab4540ccaf1c0cfad27a649e07bcdb4bdf8b434e2b1e83b9032f07282d3b
+EBUILD exheres-mode-1.10.ebuild 510 BLAKE2B 719af073250b58984b9a53d2264cc4d09b4fefd55d89ee135ff60104f36dc6927b46cfcb4db73f0511c4e0edbef61fedbfb64c3ce99bd13ad4753b66fc9b3987 SHA512 0885e7b3ebddee1605c721097bc1e561e9a1facedb772205a4313192e02e6861a5369c07df34b5ae68a66443f7296748310a7dfa58054aa2c9720416282c9ace
 MISC metadata.xml 382 BLAKE2B f9fc2608a144dfc1d9dcd5ebe7ee95656be8c807b3468a413bf97e326d2df0f5c1d44f94c17bee45528a3429e9b00abc8aaa640976d80aec238a13ead8c44584 SHA512 485df941afb141c1bf2062f1c2dd79e01b9ae545043e0af4a7fb7b0f455424d8cb5fd23dd252f98ef025e14db436e53a399306d5f40cc4bc709d419854dd93ba
diff --git a/app-emacs/exheres-mode/exheres-mode-1.10.ebuild b/app-emacs/exheres-mode/exheres-mode-1.10.ebuild
index 45a923df12b6..105bd4a950d5 100644
--- a/app-emacs/exheres-mode/exheres-mode-1.10.ebuild
+++ b/app-emacs/exheres-mode/exheres-mode-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="Major mode for editing files in exheres format"
 HOMEPAGE="https://www.exherbo.org/
 	https://gitlab.exherbo.org/exherbo-misc/exheres-mode/"
 SRC_URI="https://dev.exherbo.org/distfiles/${PN}/${P}.tar.xz"
-S="${S}"/src
+S="${WORKDIR}/${P}/src"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 5ff22c40efc0..a75dd1d1fe06 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,8 +1,10 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
-AUX magit-3.3.0-magit-libgit.patch 151 BLAKE2B d5d93475820bdb072e86269cb887b6ed8d73a568cb35538ad850dcd0394d59af16f93da02a6fb06b31d4d5f34ddafef56fda37258636a0c48d84c050cecf7250 SHA512 5fb1a427e025dc8c1518e49e144bd11b8d12638e13eb23e09849abc4ae48795db66d123ecd79f500b1a484eb5244194810e22d2a7c3a3878d418f9c7ff049877
+AUX magit-3.3.0-inhibit-libgit.patch 629 BLAKE2B 281721586bc1e37ab9655366ba09d4bdc2b509c7a9c86cbf6bbd79aec4583ade3f43ea26449dc14be87d084154c2c77403cbd088c6249f0a882e514d255e1c68 SHA512 cefd33afc1d2f939ecb6b7724dfb2e907e4d6be2453eab2c42ce9a11c99c5cc43c0df4ed999c8cc0b176fa06f45d27091d548fb20bd27e5f03745f8a9b0663d3
 DIST magit-3.2.0.tar.gz 618602 BLAKE2B c96226669bc5160460d24a1b9b36784d6764234e2e2690f059c362176e9a56fc742b961a0d4103049b33d958e44c092f4bbb75de3b3437ac178dae89e34028e0 SHA512 3b4bd5a13592814c0c638a26ba09c6e01a15db6af3555db41bc0adc53e8c08eaa2e7c58d8a105101fb46a8a04be0e09a0f2c86d365391430b42adee83df382f6
 DIST magit-3.3.0.tar.gz 629283 BLAKE2B b07a071682ac543ba4a94b9bb8d78cedca1dcc4a7140ad2972d65e014666a2fea078611a7fd98356747d02431e5aa2456801e7e9a12e2b08027666b437863535 SHA512 22fa7c41cb18746b33f64ef936f88dbf229f998e2d2a5d066771711450753c98430335040d0a9812832f3fa39f96f6e88133d5274964332bc899fa7ef19422eb
 EBUILD magit-3.2.0.ebuild 807 BLAKE2B 418802ee37923255aa288b501f4888c36f4018a2dd4bd52672f767811a714a63a7c95987984f9d481b1422af00a1bb4a8575032bc2683537af626f3134aa3351 SHA512 59be2f1efbc33801bfe959158147db52193be79c5641235ed0fcdca6ce887dd08b24e3472191b516047a184d0a72065fac2f1ea2b4f0e80fe6258bff7a56194d
-EBUILD magit-3.3.0-r1.ebuild 1278 BLAKE2B 3447ec38cb98f904715ebea38bb597eafac2c26696d09a2692f8bc08c3ca89834be2ad5398041ebd8724c92d9483618a1b0ca7d3d3ccc586e8035f257f966c51 SHA512 f8c5f03c7b2ac6de594aa9abab6e455d2b97c79f62f2f8cbcb38d679508ebd4b09f5f18d9365911f4505acb69de071bbec8d58987b8016e65f7d1755883925d9
-EBUILD magit-9999.ebuild 1234 BLAKE2B 56a448a6137198697a81af1eae713ea1cf0aa8ac7eebd9e18e18969e79ce9cd9161148b7d8dc02b36e02ae1c7ef652e13ceaa7dacdc860991045caf127b63ee8 SHA512 a84f1a50d0d618ff26bfb1326166d7cee8788bb18719e7e6d7b7424fbf868597c6d650abdc19a2baa4bfc9b50bc531d4f0a68c5009250fd1a2f3047a1a0b3b02
-MISC metadata.xml 812 BLAKE2B a00fcce22437d2853e3c6ab16e57e284444eed91cc2ec90e443ac14ab61c60dd476b21504fd41fae27eb0180cebb236f86b35cee557a41ca34c854939c8a0ab8 SHA512 a0aa797e586bdb7657c9f4af4eaa8611a012146abbae4f47f47b124a7ebb9c2a8e65f9e862464bef0cc6f5671da40a2bd6e6cb78e0fb9d6ec02c362bcbd27399
+EBUILD magit-3.3.0-r2.ebuild 1370 BLAKE2B 61f27f958f6789a6b711c501a327356803fd9b0c2e3f3253b843710e917fb44ece5220f7b3173bb7e38b444599ba59fc2e71d5d58e0a1c883292cf0d67278def SHA512 eaac1d916e5149865678b90294ff27e6b4613b2c4b58438204c97174f9712c625498865f9a9ee733363d6e42a9b49b80be8f3af640e1ac4fabc0ff13c7e20916
+EBUILD magit-3.3.0-r3.ebuild 1371 BLAKE2B 2a400eeca4b273b952c29cbbf456e8017e540c35a282cadee8983ae044054424fe9796d4f27da71768831057d4c0263df0fe2811986bba973bd79d3a58999501 SHA512 4fc13e88a8a6e3b88e28563ee020c440aec4c5623fe3230514d36d74a23c29e0f6a305ba030667f42d215e7ae34f3049c070ca3c5131cdd4c22cd5ba7218e780
+EBUILD magit-3.3.0.ebuild 826 BLAKE2B ca539102915e7ed93337ef91930ade8bccf28b6584618015e039602fe4d3cd1877689005ef08abcdecb981a116b334a41000683c0258440a1b18ab9905612748 SHA512 722ecf9f5041b7f117171ee33fbd3d95270a47a53b34bcb7b58a2c222ef9d3178343c7274fa1d8832ac61ed3400ea07a21dcc4950385b29bed3e94b409c8c04d
+EBUILD magit-9999.ebuild 1241 BLAKE2B 2ca993f354e2ce35ef41e9f4c067993bf8729132dd58f42bd17602df660976e3d30209307484b53dfe39fe3b1183ee15e7bc39732e6c941f7d0fff48bf627f65 SHA512 dc7a35943daf635f1999124e81c120e302bcb8015bd2c78d0e7a67ac96086f8821609062136556d5b63fc78f84afaf4a5a93c2b67a7718c6981c815fb1554273
+MISC metadata.xml 897 BLAKE2B ffc0c9c8260fd035b5d2d73b87ca250aa1272ed22ee8b6ce470e103a01a47bff44becb1ccfbcbc3bcfa50c19c94461100fb2032f0d2f212a6fa007ffd08a2421 SHA512 1236dba8fc89a33863db76c1ed16a2541508a21cd3901b369c9f5ff79af4a37dee2c9448b489900faa7f0627b3718adb17d91bafe02fdf7c261b1401108a9a7b
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/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
index cbec2d023718..9299f8b8d42f 100644
--- a/app-emacs/magit/magit-3.3.0-r1.ebuild
+++ b/app-emacs/magit/magit-3.3.0-r2.ebuild
@@ -15,14 +15,13 @@ if [[ ${PV} == *9999* ]] ; then
 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"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
-S="${S}/lisp"
+S="${WORKDIR}/${P}/lisp"
 
 LICENSE="GPL-3+"
 SLOT="0"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.0-magit-libgit.patch )
+IUSE="+libgit"	# drop the IUSE default for next upstream release
 
 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-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"
+}
diff --git a/app-emacs/magit/magit-3.3.0.ebuild b/app-emacs/magit/magit-3.3.0.ebuild
new file mode 100644
index 000000000000..87684a463d06
--- /dev/null
+++ b/app-emacs/magit/magit-3.3.0.ebuild
@@ -0,0 +1,33 @@
+# 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/"
+SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/*"
+
+DEPEND="
+	>=app-emacs/dash-2.19.1
+	app-emacs/libegit2
+	>=app-emacs/transient-0.3.6
+	>=app-emacs/with-editor-3.0.5
+"
+RDEPEND="${DEPEND} >=dev-vcs/git-2.0.0"
+DEPEND="${DEPEND} sys-apps/texinfo"
+
+src_prepare() {
+	default
+	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 57f82de1ff46..f8f9c547e60d 100644
--- a/app-emacs/magit/magit-9999.ebuild
+++ b/app-emacs/magit/magit-9999.ebuild
@@ -17,12 +17,11 @@ else
 		-> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
-S="${S}/lisp"
+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>