gentoo auto-resync : 13:09:2023 - 22:45:20

4 files changed, 70 insertions, 38 deletions

diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 7092edced16e..be500c03dff4 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,9 +1,10 @@
 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
 DIST magit-3.3.0.tar.gz 629283 BLAKE2B b07a071682ac543ba4a94b9bb8d78cedca1dcc4a7140ad2972d65e014666a2fea078611a7fd98356747d02431e5aa2456801e7e9a12e2b08027666b437863535 SHA512 22fa7c41cb18746b33f64ef936f88dbf229f998e2d2a5d066771711450753c98430335040d0a9812832f3fa39f96f6e88133d5274964332bc899fa7ef19422eb
 EBUILD magit-3.3.0-r2.ebuild 1370 BLAKE2B 61f27f958f6789a6b711c501a327356803fd9b0c2e3f3253b843710e917fb44ece5220f7b3173bb7e38b444599ba59fc2e71d5d58e0a1c883292cf0d67278def SHA512 eaac1d916e5149865678b90294ff27e6b4613b2c4b58438204c97174f9712c625498865f9a9ee733363d6e42a9b49b80be8f3af640e1ac4fabc0ff13c7e20916
 EBUILD magit-3.3.0-r4.ebuild 1367 BLAKE2B 528372810dd7b3cdc4f1aa33f1b20079444c7b7d5ea10f739e83e0b57f59da11bef1036052c1d0aac1c8f6f4cc1d6893aa37b69744b4b8d5c3c5200c2a74f5b2 SHA512 8ae7478301e492149b9cf25b45e1e56af2c76668f4ea67ffc5f8026bd1ed319e3136f41bc462a2cd69439b7f26c9cde1fc17a4e72737a205276506491d22a021
-EBUILD magit-3.3.0.ebuild 826 BLAKE2B ca539102915e7ed93337ef91930ade8bccf28b6584618015e039602fe4d3cd1877689005ef08abcdecb981a116b334a41000683c0258440a1b18ab9905612748 SHA512 722ecf9f5041b7f117171ee33fbd3d95270a47a53b34bcb7b58a2c222ef9d3178343c7274fa1d8832ac61ed3400ea07a21dcc4950385b29bed3e94b409c8c04d
-EBUILD magit-9999.ebuild 1197 BLAKE2B 3e31eb726e742f2d73ef632f9d1f4c433edb295624c04506a777b8e458ac0db5523ab3b629dafbe7315426779488b6e9e546a18eaf64cd4d37e9e5b27d400b51 SHA512 3222319fa7dabdd6dc94eb020ea8002006c64e466214fa533aa0d804993f11d53702da79c45df0104d5e1c0a8b1e62182b9b90ee3f1b29954d4f426e00f8154e
+EBUILD magit-3.3.0.50_p20230912.ebuild 1371 BLAKE2B 362ece83d26971600f287338e757fb9373703bfda1d9f52b8722c8afb057a2b101d663894de61e96eba1741a340d09bdf9f2e869f1ef38ce648e5c0b63b6561b SHA512 2997c904d9b5467c0d259fb7e2a3bb144c56a78d04bf49cffc5ac659f96375725903d745d6848668491be1fcf1ae4a79a93ad4a3fbaafdec58eb5fb59122be9e
+EBUILD magit-9999.ebuild 1275 BLAKE2B 100dfce89a6dc49a3a607a74ff2347234b8b62e75bb2b76a315a579a41dfc04203dbbbeefdc35e0a9066a3a18e8508b77844eee8fde15b621b49af1fd2d2f048 SHA512 767e005a054b6994f75c0423c60ea34e32d26f03dce722353b36ade45035ffbb3de9df4075425d8c9f4055ea97953d6d7ee02d19e771fe986c0353ac468d2786
 MISC metadata.xml 897 BLAKE2B ffc0c9c8260fd035b5d2d73b87ca250aa1272ed22ee8b6ce470e103a01a47bff44becb1ccfbcbc3bcfa50c19c94461100fb2032f0d2f212a6fa007ffd08a2421 SHA512 1236dba8fc89a33863db76c1ed16a2541508a21cd3901b369c9f5ff79af4a37dee2c9448b489900faa7f0627b3718adb17d91bafe02fdf7c261b1401108a9a7b
diff --git a/app-emacs/magit/magit-3.3.0.50_p20230912.ebuild b/app-emacs/magit/magit-3.3.0.50_p20230912.ebuild
new file mode 100644
index 000000000000..e3ec1a1224e8
--- /dev/null
+++ b/app-emacs/magit/magit-3.3.0.50_p20230912.ebuild
@@ -0,0 +1,63 @@
+# 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"
+	S="${WORKDIR}/${P}/lisp"
+else
+	[[ ${PV} == *_p20230912 ]] && COMMIT=141dd46798e5cae57617e941418ebbb3a2172f5e
+
+	SRC_URI="https://github.com/magit/magit/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}/lisp"
+
+	KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+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/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
+
+	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
+}
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 fd1904e9d6ec..592c14218074 100644
--- a/app-emacs/magit/magit-9999.ebuild
+++ b/app-emacs/magit/magit-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 S="${WORKDIR}/${P}/lisp"
 
@@ -23,14 +23,15 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="libgit"
 
-DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes )
-ELISP_TEXINFO="../docs/*.texi"
+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}