gentoo auto-resync : 15:07:2023 - 16:40:40

4 files changed, 64 insertions, 36 deletions

diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 47a7f1295fa1..3fa10ee768ef 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -2,6 +2,6 @@ AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac3
 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.ebuild 826 BLAKE2B ca539102915e7ed93337ef91930ade8bccf28b6584618015e039602fe4d3cd1877689005ef08abcdecb981a116b334a41000683c0258440a1b18ab9905612748 SHA512 722ecf9f5041b7f117171ee33fbd3d95270a47a53b34bcb7b58a2c222ef9d3178343c7274fa1d8832ac61ed3400ea07a21dcc4950385b29bed3e94b409c8c04d
-EBUILD magit-9999.ebuild 919 BLAKE2B 30e1c7e35eb04b28d89d9dcbe69c65980f3b476e994a297945c5cc5f3036a532bf98e4181cf9176e63fc760d57f6ad6debab3f49105d2ba4f56eee19646b9c9c SHA512 be40ad00de12d02de4db4f9aecb341f8219a0aadb078693d4cffb4a8e5be80cd0b48890c71c30e0e4924fda0d6d7a4b91aa7338073ae8543519d3d200463adf1
+EBUILD magit-3.3.0-r1.ebuild 1220 BLAKE2B ff4db613154edfdafd87de03419722f37371e38d117c8c812630414588f052e9a7426c006ce0038b3203929806f9376b69de8f4b17f7143e8fc4d49133647768 SHA512 cf002d9338335122152b59206c609c0b8f88ac842030337909b85a256f98dfc6d6a2b7a9b2c9c3a83bdeef97d0575dc9634b9795feaf636e13e4c8cdb2ca86fe
+EBUILD magit-9999.ebuild 1176 BLAKE2B 02a19877ffd34837a0bc7e56339378121874f9000797f7974dcceed1735f092d6a81015eca38919ce54a67fd31709d4fcc64d6426f909604301f350f6d4e47a5 SHA512 fd64bb92885281b05d3743a90233443503f679f6181d339952f2113050b9e22ade9392aa4a5464066e43dd8a5bf0937921e6f4f2fcdae2e2fc2acd0d5b67cd40
 MISC metadata.xml 812 BLAKE2B a00fcce22437d2853e3c6ab16e57e284444eed91cc2ec90e443ac14ab61c60dd476b21504fd41fae27eb0180cebb236f86b35cee557a41ca34c854939c8a0ab8 SHA512 a0aa797e586bdb7657c9f4af4eaa8611a012146abbae4f47f47b124a7ebb9c2a8e65f9e862464bef0cc6f5671da40a2bd6e6cb78e0fb9d6ec02c362bcbd27399
diff --git a/app-emacs/magit/magit-3.3.0-r1.ebuild b/app-emacs/magit/magit-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..f5457ac3eebe
--- /dev/null
+++ b/app-emacs/magit/magit-3.3.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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="${S}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+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
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND+="
+	>=dev-vcs/git-2.0.0
+"
+
+src_prepare() {
+	default
+
+	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
deleted file mode 100644
index 87684a463d06..000000000000
--- a/app-emacs/magit/magit-3.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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 031034b86493..d9d3068acc4b 100644
--- a/app-emacs/magit/magit-9999.ebuild
+++ b/app-emacs/magit/magit-9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
 	>=app-emacs/dash-2.19.1
 	>=app-emacs/transient-0.3.6
 	>=app-emacs/with-editor-3.0.5
-	app-emacs/libegit2
 "
 BDEPEND="
 	${RDEPEND}
@@ -45,3 +44,11 @@ src_prepare() {
 
 	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"
+}