gentoo auto-resync : 21:05:2024 - 00:05:35

5 files changed, 68 insertions, 36 deletions

diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 84503cc83834..b977e7a2934f 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,5 +1,7 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
 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
-MISC metadata.xml 897 BLAKE2B ffc0c9c8260fd035b5d2d73b87ca250aa1272ed22ee8b6ce470e103a01a47bff44becb1ccfbcbc3bcfa50c19c94461100fb2032f0d2f212a6fa007ffd08a2421 SHA512 1236dba8fc89a33863db76c1ed16a2541508a21cd3901b369c9f5ff79af4a37dee2c9448b489900faa7f0627b3718adb17d91bafe02fdf7c261b1401108a9a7b
+DIST magit-3.3.0.50_p20240520.tar.gz 673945 BLAKE2B d61fb8c566de2bc6a2c4109d787808be76fa33d994adeb97b3d472c9c2da929aa55cf6b81f9cc2055e46d5860aa0d9ddc37080a1b2be06984b3831382031b12b SHA512 53203cdc8bc291302ee35aabe6e4d32e0c0de5bb411ab013d112bcd3d934a221c34f42d6ebccea9d33335d53415f75588468c23668cbbf57851dc61de505fffb
+EBUILD magit-3.3.0.50_p20230912-r1.ebuild 1084 BLAKE2B bdd2e6c89a24c27e9cb1f5d36f60b1d326e5d6496e87c5599759ca15b36b3a13dc1bd289665ffa4d79401ef96470872e37d9da03f076e567b68f2349227f57ba SHA512 78758e54ff3c0a4ef994cbf215938edd494fd18796b0321b58d886d00cdfe45872a7225089bdbc10ae857a28342c979e67cf7762f992e3f43434ca176489381f
+EBUILD magit-3.3.0.50_p20240520.ebuild 1122 BLAKE2B a5ff84001a6e1d539bcabc901822bdd20ea053ef081e1a747a99a8fe67d2119c7c6c75bc5d2d225bc7d068c0abce751cf43dce96d0c9347365b0f4484ce3eb60 SHA512 c19eae1c0fb9da2e4a3873b5893102dd8ee542164a37375575f75a10a83ab62c876b6ebd3950111be2697d88e54efe5c7abe83cab99451539af9d2ac11f8a629
+EBUILD magit-9999.ebuild 992 BLAKE2B b3f41173969680daf7e7e818e3656e1f094bef32a9d9f01dc90b2db78fcf82d6f1d6d712f77f5048c11f9bd30483fd9282cbf3384812903f58cc79b32f9e655d SHA512 db9cfec22ce0164a388f489c68af4d8b6ed43e14f0d2186f72ad93926ad541ada7e158af896ff95078de6a7307fe7beb7ce0894f74cffaee24f6a2bf8c98c0e6
+MISC metadata.xml 812 BLAKE2B a00fcce22437d2853e3c6ab16e57e284444eed91cc2ec90e443ac14ab61c60dd476b21504fd41fae27eb0180cebb236f86b35cee557a41ca34c854939c8a0ab8 SHA512 a0aa797e586bdb7657c9f4af4eaa8611a012146abbae4f47f47b124a7ebb9c2a8e65f9e862464bef0cc6f5671da40a2bd6e6cb78e0fb9d6ec02c362bcbd27399
diff --git a/app-emacs/magit/magit-3.3.0.50_p20230912.ebuild b/app-emacs/magit/magit-3.3.0.50_p20230912-r1.ebuild
index 2894d75d1d6f..5990133510ee 100644
--- a/app-emacs/magit/magit-3.3.0.50_p20230912.ebuild
+++ b/app-emacs/magit/magit-3.3.0.50_p20230912-r1.ebuild
@@ -26,7 +26,6 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="libgit"
 
 DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes )
 ELISP_TEXINFO="../docs/*.texi"
@@ -36,7 +35,6 @@ 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}
@@ -48,16 +46,7 @@ RDEPEND+="
 
 src_prepare() {
 	default
-	use libgit || rm magit-libgit.el || die
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
 
-pkg_postinst() {
-	elisp_pkg_postinst
-
-	if ! use libgit; then
-		einfo "The dependency on app-emacs/libegit2 is optional"
-		einfo "since magit version 3.3.0. Enable the \"libgit\" flag"
-		einfo "if you need the libgit backend."
-	fi
+	rm magit-libgit.el || die
+	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
 }
diff --git a/app-emacs/magit/magit-3.3.0.50_p20240520.ebuild b/app-emacs/magit/magit-3.3.0.50_p20240520.ebuild
new file mode 100644
index 000000000000..40c3863eb285
--- /dev/null
+++ b/app-emacs/magit/magit-3.3.0.50_p20240520.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 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"
+	S="${WORKDIR}/${P}/lisp"
+else
+	[[ "${PV}" == *p20240520 ]] && COMMIT="9cde118744151caca08b080e15f0c903f17d0f20"
+
+	SRC_URI="https://github.com/magit/magit/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}/lisp"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes )
+ELISP_TEXINFO="../docs/*.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	>=app-emacs/compat-29.1.4.5
+	>=app-emacs/dash-2.19.1
+	>=app-emacs/transient-0.6.0
+	>=app-emacs/with-editor-3.3.2
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND+="
+	>=dev-vcs/git-2.0.0
+"
+
+src_prepare() {
+	default
+
+	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 b4313fb02089..31188d0515ae 100644
--- a/app-emacs/magit/magit-9999.ebuild
+++ b/app-emacs/magit/magit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,13 +9,14 @@ DESCRIPTION="A Git porcelain inside Emacs"
 HOMEPAGE="https://magit.vc/
 	https://github.com/magit/magit/"
 
-if [[ ${PV} == *9999* ]] ; then
+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
 
@@ -23,17 +24,16 @@ S="${WORKDIR}/${P}/lisp"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="libgit"
 
 DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes )
 ELISP_TEXINFO="../docs/*.texi"
 SITEFILE="50${PN}-gentoo.el"
 
 RDEPEND="
+	>=app-emacs/compat-29.1.4.5
 	>=app-emacs/dash-2.19.1
-	>=app-emacs/transient-0.3.6
-	>=app-emacs/with-editor-3.0.5
-	libgit? ( app-emacs/libegit2 )
+	>=app-emacs/transient-0.6.0
+	>=app-emacs/with-editor-3.3.2
 "
 BDEPEND="
 	${RDEPEND}
@@ -45,16 +45,7 @@ RDEPEND+="
 
 src_prepare() {
 	default
-	use libgit || rm magit-libgit.el || die
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
-
-pkg_postinst() {
-	elisp_pkg_postinst
 
-	if ! use libgit; then
-		einfo "The dependency on app-emacs/libegit2 is optional"
-		einfo "since magit version 3.3.0. Enable the \"libgit\" flag"
-		einfo "if you need the libgit backend."
-	fi
+	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 6b01d379f24b..f81070d61ccb 100644
--- a/app-emacs/magit/metadata.xml
+++ b/app-emacs/magit/metadata.xml
@@ -16,9 +16,6 @@
   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>