gentoo auto-resync : 11:08:2024 - 11:06:01

3 files changed, 22 insertions, 25 deletions

diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 564edf98e32b..9f2852d398ff 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,7 +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
 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
+DIST magit-4.0.0.tar.gz 676167 BLAKE2B 2adc7388cddc5230615344b3340ae181feaea1e6c174970e11a5d6f6795ecb32581dc12448c1bdfa6ec4144cc4118ace70049ff264a2c29f084cf90aa3f56d69 SHA512 c42dfe78f1f1c5f6cc732a566b820362993763ada7186d1a76ba0deedf7bd91415d502984e4afd6e958ea237b3f351c718a9e588f9734d7afc186793432229f0
 EBUILD magit-3.3.0.50_p20240520.ebuild 1120 BLAKE2B a5f8184f392161262ec3bd0aab184b1c44efefce1defc6bac75e50a3990d26bb4840efab2b6352632b42711952d04d66457a181d4d4f42c85c4ccbf33b01849c SHA512 cc79b06ebfe3dddb1558fc416a9803d57393c84ab643f27c0abab14104d95c9d79ead58e1d252c25010848d207eb99e96cf90ced97f3a38c5c8c9b3c934f0b52
-EBUILD magit-9999.ebuild 992 BLAKE2B b3f41173969680daf7e7e818e3656e1f094bef32a9d9f01dc90b2db78fcf82d6f1d6d712f77f5048c11f9bd30483fd9282cbf3384812903f58cc79b32f9e655d SHA512 db9cfec22ce0164a388f489c68af4d8b6ed43e14f0d2186f72ad93926ad541ada7e158af896ff95078de6a7307fe7beb7ce0894f74cffaee24f6a2bf8c98c0e6
+EBUILD magit-4.0.0.ebuild 973 BLAKE2B 368ebb249bafdb56b1e72b9360905e91680a728db80283d6c59e5aaa060da8747e8cd6208f930b8df4714e2a376fec654206c1d7dae304455752004873c0026d SHA512 87bcb40afe391ebc234ce46ebce02873d1a1063fbb52edc78cf92d533bf6c016891ea7fcb0daed0dda7a19945438aef527b2b31782b92b3616290f56d0220f78
+EBUILD magit-9999.ebuild 973 BLAKE2B 368ebb249bafdb56b1e72b9360905e91680a728db80283d6c59e5aaa060da8747e8cd6208f930b8df4714e2a376fec654206c1d7dae304455752004873c0026d SHA512 87bcb40afe391ebc234ce46ebce02873d1a1063fbb52edc78cf92d533bf6c016891ea7fcb0daed0dda7a19945438aef527b2b31782b92b3616290f56d0220f78
 MISC metadata.xml 812 BLAKE2B a00fcce22437d2853e3c6ab16e57e284444eed91cc2ec90e443ac14ab61c60dd476b21504fd41fae27eb0180cebb236f86b35cee557a41ca34c854939c8a0ab8 SHA512 a0aa797e586bdb7657c9f4af4eaa8611a012146abbae4f47f47b124a7ebb9c2a8e65f9e862464bef0cc6f5671da40a2bd6e6cb78e0fb9d6ec02c362bcbd27399
diff --git a/app-emacs/magit/magit-3.3.0.50_p20230912-r1.ebuild b/app-emacs/magit/magit-4.0.0.ebuild
index 5990133510ee..19d51447f288 100644
--- a/app-emacs/magit/magit-3.3.0.50_p20230912-r1.ebuild
+++ b/app-emacs/magit/magit-4.0.0.ebuild
@@ -9,21 +9,19 @@ 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"
-	S="${WORKDIR}/${P}/lisp"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
-	[[ ${PV} == *_p20230912 ]] && COMMIT=141dd46798e5cae57617e941418ebbb3a2172f5e
-
-	SRC_URI="https://github.com/magit/magit/archive/${COMMIT}.tar.gz
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}/lisp"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
+S="${WORKDIR}/${P}/lisp"
+
 LICENSE="GPL-3+"
 SLOT="0"
 
@@ -32,21 +30,21 @@ ELISP_TEXINFO="../docs/*.texi"
 SITEFILE="50${PN}-gentoo.el"
 
 RDEPEND="
+	>=app-emacs/compat-30.0.0.0
 	>=app-emacs/dash-2.19.1
-	>=app-emacs/transient-0.3.6
-	>=app-emacs/with-editor-3.0.5
+	>=app-emacs/transient-0.7.4
+	>=app-emacs/with-editor-3.4.1
 "
 BDEPEND="
 	${RDEPEND}
 	sys-apps/texinfo
 "
 RDEPEND+="
-	>=dev-vcs/git-2.0.0
+	>=dev-vcs/git-2.44.2
 "
 
 src_prepare() {
 	default
 
-	rm magit-libgit.el || die
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+	echo "(setq ${PN}-version \"${PV}\")" > ./${PN}-version.el || die
 }
diff --git a/app-emacs/magit/magit-9999.ebuild b/app-emacs/magit/magit-9999.ebuild
index 31188d0515ae..19d51447f288 100644
--- a/app-emacs/magit/magit-9999.ebuild
+++ b/app-emacs/magit/magit-9999.ebuild
@@ -12,12 +12,12 @@ HOMEPAGE="https://magit.vc/
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/magit/magit.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
-	SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${P}/lisp"
@@ -30,22 +30,21 @@ ELISP_TEXINFO="../docs/*.texi"
 SITEFILE="50${PN}-gentoo.el"
 
 RDEPEND="
-	>=app-emacs/compat-29.1.4.5
+	>=app-emacs/compat-30.0.0.0
 	>=app-emacs/dash-2.19.1
-	>=app-emacs/transient-0.6.0
-	>=app-emacs/with-editor-3.3.2
+	>=app-emacs/transient-0.7.4
+	>=app-emacs/with-editor-3.4.1
 "
 BDEPEND="
 	${RDEPEND}
 	sys-apps/texinfo
 "
 RDEPEND+="
-	>=dev-vcs/git-2.0.0
+	>=dev-vcs/git-2.44.2
 "
 
 src_prepare() {
 	default
 
-	rm magit-libgit.el || die
-	echo "(setq magit-version \"${PV}\")" > ./magit-version.el || die
+	echo "(setq ${PN}-version \"${PV}\")" > ./${PN}-version.el || die
 }