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

30 files changed, 272 insertions, 69 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 0208cc6d3dab..8741d8f91ac6 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/apheleia/Manifest b/app-emacs/apheleia/Manifest
index f84b3ee246ae..55a4057241a2 100644
--- a/app-emacs/apheleia/Manifest
+++ b/app-emacs/apheleia/Manifest
@@ -1,4 +1,6 @@
 AUX 50apheleia-gentoo.el 387 BLAKE2B a9cc757f9c846a50dad3a4ba7383e5203dd158a6233cd7d9039e2f8bdbf31dd950577244a87165c7965c96bffd442b883b3a8e3e55be560332eeb749d413f4a6 SHA512 72ca9116df3e5e363977fc8d0b559a80fa055ce4ceb8d85b912f67eb705f5fd278454f692d2979ad371a047ba604a67de8aebb16c26871a59cf108a68e67f8b3
 DIST apheleia-4.1.tar.gz 178011 BLAKE2B c48b9f98e7d985b8a6a30c8945ce92d512eecd9b8ec5403f26870ca3a38cefb40d35e7757875964898e537eb65b48d85573be909685dc4dc06f56584d989b1e7 SHA512 37e946651aa084cf322eaa45c3fd72cc3d6089da237b2ce02f2ba5481eb60c63030b654c78a614c70943b2825df184249ac8fe53a013f75cde54c31062dd0c6b
+DIST apheleia-4.2.tar.gz 188004 BLAKE2B 4113876579e2e1b7ea52af109c541344d58489453f6ac55dd35be6f27898a57ea36455fd1cb99bebb491940b51de7f40f6f87fadbe0b6191d122da2b9a1609fa SHA512 2465d7bba8e3660812b588051043ee2048bb31be896af38c7551f419b235ffb572a9bd2dc7a80b20fc0b9e1c6939d22a4bcdfbbbb3c473a509e1548056c8d663
 EBUILD apheleia-4.1.ebuild 591 BLAKE2B 1cf32814c60db0d6a176c2f66fdca43b4af53a5fb605fc3348366a9ffb29d89e52b2460c089c646cbf6a08454cabc627c1c4f85bab4c4239befe359a4e0c8714 SHA512 5b478eda49f6302903b44c0e9d6405bcf7f4501694764421edd31293284833a2f7880b6aa15d4b03006690713cc013db4fb663070eb9cfbb7718eafd99dc7e44
+EBUILD apheleia-4.2.ebuild 592 BLAKE2B 516bdf17556b2a01b8aaeb78cbff5cfc0e1e347eb78b2ae86fbeaa02c5552feb624f7a44d24699ad92a0161905e04e97e98dde06f724b959d16065dab2da81f1 SHA512 85ceb6fc6ffdee6b75779e7f28a138e0ae38a3fe5dacf90430e1c2890c609c5a11fc654769502148f6b15b18eaa3991a29e341f6cbc31b4c821eb756abddaaab
 MISC metadata.xml 870 BLAKE2B 9eefb192026bcc6839477e5199ff99071952a22f40c6ed6903cadedc585b4f4e1dd05c0da5fe49eab97160838277a071876fdeba23c78f11c8379f1a8a4c5bd0 SHA512 bcfbda9b31eb9826943119405ca2553fe99578e985d4b4c3397955b14cad7613e7115c69ca6dd4cbc3751574c36d46e1c6409f7482d8406ca7b896ece89f04d1
diff --git a/app-emacs/apheleia/apheleia-4.2.ebuild b/app-emacs/apheleia/apheleia-4.2.ebuild
new file mode 100644
index 000000000000..cca10275eb7b
--- /dev/null
+++ b/app-emacs/apheleia/apheleia-4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27
+
+inherit elisp
+
+DESCRIPTION="Reformat GNU Emacs buffers stably without moving point"
+HOMEPAGE="https://github.com/radian-software/apheleia/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/radian-software/${PN}.git"
+else
+	SRC_URI="https://github.com/radian-software/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DOCS=( README.md CHANGELOG.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/emacsql/Manifest b/app-emacs/emacsql/Manifest
index 7ab03e5f897e..9c4cf8652d5a 100644
--- a/app-emacs/emacsql/Manifest
+++ b/app-emacs/emacsql/Manifest
@@ -1,4 +1,6 @@
 AUX emacsql-3.1.1-fix-utf8-bom-writing.patch 2164 BLAKE2B 8e2a4be8cb6f4ef77a4da1dd5b0328a381800404e4c29861e4b9507055c64f6854da01178150804889aad8753e0ce33e0e17588c7bcd9c1ff55b738e27935dbc SHA512 a1307f072d26651e32e202cb70790d58019ee542c4cb1753a912913edd41eeb6f645f564a31d309737748ce6aaa278c206fb9b666ff87073df76bf4451fcc1cf
 DIST emacsql-3.1.1.tar.gz 2392710 BLAKE2B 7281c9630c26363d9e88463a3ead8b241a3fc1a5e87cbf855eb233ef6b295ca6ba4ea4a79b5137b27f9eed33012dfaa183dab7be8e76b240305ee921edebe874 SHA512 0ec3890cfa014a0afef23e2e38bcd844527b0a497bbfe6f89cbbb090811d43996074e642f83f7f49b27659fc51a901645a54aac600e9988dcb40fffe86a06fbf
+DIST emacsql-4.0.0.tar.gz 2398791 BLAKE2B 55a67c5da79e290ba1024a8704113276d6db9d05e539eba79bded01d4092c3565a50c48608cb0932ad0e06d0b1a378e61cceffc8bb910c03da717c6f0a70e62b SHA512 040d8fc9a28505102791ea203d8cb58520ea871b2abc937a128e7d26eba62e89886094874c69806a3e6e5e01cafff5d9caf699438693b03ccd383aa5f94ae949
 EBUILD emacsql-3.1.1.ebuild 1490 BLAKE2B 7b8945b85f58513844d72cc4f2ffec1ea68b252bfa7ba4a63fc5315e28675367564cf92a56beecb3042a8c496f25db0bda8c39ee91586e2f4a6bc6cc9dca76af SHA512 102c7b2bb78bfe043692cf347d69b6f0aae98ae7ddfa143ebc904448cb350521a93abc338fb5331d1b05c16afc3b49450ad1669d7cc55950ddb4a8a55938f3e1
+EBUILD emacsql-4.0.0.ebuild 1448 BLAKE2B d5b819dede266c70ddb11ac1daf3f4a47bf2336cdb9ee3bebc5e3e41fd2fe1812f03ea08e4c1c69cb083461adf7ef90afb019a6b3db16424676c5ccadb4fcafc SHA512 4512ec40fc51cd914334c9bbb3aa0338d48f809c5cb357a29507016cc85faa3346ea49a12ed5831e6774b2353c60c6f52789af3b7159b929e9f2a448b2febc81
 MISC metadata.xml 479 BLAKE2B a51c34e3703652d2e5f8f7e220ab7993b849c88cc55a1ae8f631da0196399985996588e13814f7d52c13bb7f57771e95f436c6cd4fe196476a2bdbe18d5db718 SHA512 9d137ba2b6ed1807116101dc5a8e3c131a5d1dc23e285704aa3344afb608725fe29700d1b946dbc523dba3d80899c08ca4e7a64bd4a89c9250abacd155e61d18
diff --git a/app-emacs/emacsql/emacsql-4.0.0.ebuild b/app-emacs/emacsql/emacsql-4.0.0.ebuild
new file mode 100644
index 000000000000..d95717bb989e
--- /dev/null
+++ b/app-emacs/emacsql/emacsql-4.0.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit edo elisp toolchain-funcs
+
+DESCRIPTION="A high-level Emacs Lisp RDBMS front-end"
+HOMEPAGE="https://github.com/magit/emacsql"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/magit/${PN}/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+# TODO(arsen): postgres-pg using app-emacs/pg (unpackaged as of yet)
+IUSE="+sqlite postgres mysql"
+
+DEPEND="
+	sqlite? (
+		dev-db/sqlite:3
+	)
+"
+RDEPEND="
+	${DEPEND}
+	postgres? (
+		dev-db/postgresql
+	)
+	mysql? (
+		virtual/mysql
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Not packaged.
+	rm emacsql-pg.el || die
+
+	local -A backends=(
+		[sqlite]=sqlite
+		[postgres]=psql
+		[mysql]=mysql
+	)
+
+	for useflag in "${!backends[@]}"; do
+		if ! use "${useflag}"; then
+			rm emacsql-"${backends[${useflag}]}".el || die
+		fi
+	done
+}
+
+src_compile() {
+	if use sqlite; then
+		edo $(tc-getCC) -fPIC -Wall -Wextra \
+			$($(tc-getPKG_CONFIG) --cflags --libs sqlite3) \
+			${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o emacsql-sqlite \
+			sqlite/emacsql.c
+	fi
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+
+	if use sqlite; then
+		exeinto "${SITELISP}"/emacsql/sqlite
+		doexe emacsql-sqlite
+	fi
+}
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index 4d4423814f78..fb278d75bcbb 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,4 +1,6 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
 DIST ghub-3.6.0.tar.gz 62572 BLAKE2B 5693177be9ac22d18b7b6f5cdc230eea4340a5bfd007fa4b18f3503fe796fd8b104753be51c8579de6e693cfc620c4524dae195627af4c542bd2fe94aad1d0dd SHA512 e54752f70c462ce4fed3a1fc3ca60f22107e2acaefb06ebf42d35c6b65f9091bba07ff72436310782d9be7fbf35aef473dbbe39ef7a4ac3de1ebd82a417c6b0a
+DIST ghub-4.0.0.tar.gz 63020 BLAKE2B e01df9e093573933e24c39ef9a252d31dda4c9b0304ad5ab1f5ba55b6869224bb708dbdc0994c316c35ac0bb8df08d7238da0469a7e0ff84f3f769d35b55d89e SHA512 61825bd5230bc4a80c4a0a40cb717fd4a603ac351a3cdae2bc93fa0e8ca6d4ba51647d8cb151e436a8b19def7a389629dddebb1454172588a472bf0eb2c21b8e
 EBUILD ghub-3.6.0.ebuild 680 BLAKE2B fa115049b7133a78173b659a22f3ac772ac98abbe08ae5ae32741ef0cb1b5ec1b9c7db2a91c6e312d6f9d7ae119910d7f0cc6dab0f594f9f84a09bfb748b7373 SHA512 ebbb18cd22bd388db95430de170dbad3ebe0eff64dae63c1eb31fa9f51086a0ddc4bdcfa765350bc9178b5a77ec169b77564c54c06ba6684a401ac4c46c393fb
+EBUILD ghub-4.0.0.ebuild 798 BLAKE2B b5308e464e1ec67f842ec9b179938eb08a35ec60781042e925445e3302e79797194a760dbc3d7e9be6a45968d303515391af7869aa79c369fd7111ea2af1ec99 SHA512 ed7a17bdf68494bd7cbf61ce89e3e0eb5fc26ca7b3237a33d2e41d1c163541abcd99df468b89a4e28a7c3b5458816b1d0a9020d4ada8d00afe5fc13f312f36f7
 MISC metadata.xml 1297 BLAKE2B 76a67936c0754ffeba3ca47551417bea6a0996c5197977b2dce2c73bf7acbe421f0c7ac0f8415b529f1ee3109868bc5306d7e714a58f3faec549ddd575cc82b1 SHA512 8cb4ebebcce9526416253b528bd8e2865311a796f10cc176b7d87d0fd06b573a9d7dc094cf3c2ccb916eccffb69dd5a164ad64c8f0310727147bea3804aa79de
diff --git a/app-emacs/transient/transient-0.6.0.ebuild b/app-emacs/ghub/ghub-4.0.0.ebuild
index f479cee08744..4a4eeabd3d10 100644
--- a/app-emacs/transient/transient-0.6.0.ebuild
+++ b/app-emacs/ghub/ghub-4.0.0.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 inherit elisp
 
-DESCRIPTION="Transient commands abstraction for GNU Emacs"
-HOMEPAGE="https://magit.vc/manual/transient/
-	https://github.com/magit/transient/"
+DESCRIPTION="Minuscule client library for the Git forge APIs"
+HOMEPAGE="https://magit.vc/manual/ghub/
+	https://github.com/magit/ghub/"
 
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
@@ -17,18 +17,19 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3+"
 SLOT="0"
 
-DOCS=( CHANGELOG README.org "docs/${PN}.org" )
-ELISP_TEXINFO="docs/${PN}.texi"
+DOCS=( README.org )
+ELISP_TEXINFO="docs/ghub.texi"
 SITEFILE="50${PN}-gentoo.el"
 
 RDEPEND="
-	>=app-emacs/compat-29.1.4.1
+	>=app-emacs/compat-30.0.0.0
+	>=app-emacs/treepy-0.1.2
 "
 BDEPEND="
 	${RDEPEND}
@@ -36,7 +37,8 @@ BDEPEND="
 "
 
 src_prepare() {
-	mv lisp/*.el . || die
+	default
 
-	elisp_src_prepare
+	mv lisp/*.el . || die
+	rm ghub-pkg.el || die
 }
diff --git a/app-emacs/git-modes/Manifest b/app-emacs/git-modes/Manifest
index e4b3f065d019..a731d50f95ed 100644
--- a/app-emacs/git-modes/Manifest
+++ b/app-emacs/git-modes/Manifest
@@ -1,7 +1,7 @@
 AUX 50git-modes-gentoo.el 73 BLAKE2B f756bc038b5b0c6dec420176142336902f9a350bb63ac5a10ac51895e28d1f0a5446ef1f959ce10638b97ebd1f6405ece3b2e101238ec835f62d91fe0b189cea SHA512 56c251fa8100e882225d0220f6ce656bf8012fe47ab9dd3a98c240a01e257689ab6867a8fcb6f9d11b911fb958ab3950589cd238434f27e10ca86aaecae74d69
-DIST git-modes-1.4.2.tar.gz 18444 BLAKE2B ecb8894b41ba9f7744a4ceceedea339fca9993bf3b3335c93fd408ad05a7136266ea84cf28891684e0932bf8f1b997f9cb32c4ca7b4f44f735e6c45885f8f012 SHA512 b968b6bab869ad7d8b7232d2a97ab903c30c6fdf8fe0705633f0a7010900d5224f6ea2174708b4ef816241f2a6527bd7eb4f891c2072aee58aea1a153a825d9f
 DIST git-modes-1.4.3.tar.gz 18487 BLAKE2B 2df138576b6eeb628e88bf6f7649f42897d852f89d7d9ab0febc26db0f5c71cc0412ddb511f93b7ce32e444f085747e8f66eabeba5a0182bbe2ff99be3b4b6ed SHA512 0f96e3259ef9c17249f0960c8495043e8b0e2769cdf3b0572e72f83fdecd469403561a4c2666323d0f8d8a3059b8785443662e260881699e0b93e76b3a9e0474
-EBUILD git-modes-1.4.2.ebuild 545 BLAKE2B 295c2963f6e3bc43d9365f0c525f762d31b48980e51544bf22cddf7c7b732692ac2f3ba951ed395b820080522a8f28b92b17fc3538301e572f2491609ce14bfa SHA512 cb7e79e52dc1437594ad117684ea8aa2976b072e564067bc8312c6453ab5674232c7d7b878a8e9a9b98de9e7eb83d6e5a42e66e4c92dd54a41768721df8605ea
+DIST git-modes-1.4.4.tar.gz 18483 BLAKE2B 031635fd4bdc457456ddfb518be5f676f4be8b369b69b966b6b25b61e781ef0484592fec84be0df67c5d3087169336a3271b9f95fe8a1091d271c77e1f07c4fe SHA512 4959efb71f0321a2964e4a768fdcbbcbc668517b699b5a4f8416f6df3dd7322f69cd0d1fb306a0fd7221a369f17d042d3670cea57655b39f60a1f78e0a5ab7ed
 EBUILD git-modes-1.4.3.ebuild 668 BLAKE2B 6b6d16da05ef365627816a4bcd081eac1c3e89a0aa8cc6ce44a93660fa8fd163b0ec8b7164017d1d3b637135c6379a5d8cccfe0854df01aebd141dcf8bebf35b SHA512 223c01a76f534dd102d0e5eeb516cf64497317394f897450398445fdb63ccc7f25933806bdad29b04675e1d8e6a7d5c306119415c2e881b0e3e88675176045de
-EBUILD git-modes-9999.ebuild 669 BLAKE2B 2909817d8b158444f19944c552e7dba39863c76072364f2915b90827bd650901583ebe33c0b365a045ec75ba9806779c5b9546a23914ec83aaacb684faa5aadb SHA512 636da687e485a30ed4e473abf321b2ee255fa4a04626a10633bcb64201747fb6b457ed474b119ce52b719595dfc956708818a066bffcb4b890a2e726fe234188
+EBUILD git-modes-1.4.4.ebuild 669 BLAKE2B d2c5538ab0566e378274713efd62276abc5f96837dc48745932d3327622eeac9df31382582435aa602d2e7cdc6f2d080f4121f80fdf58c61a4f31f0a1688dfa9 SHA512 4932a590f42f42589f17e883639b892f4a765938aa371a832a1b873c995e3a30aedd91dd9ed5120b9e53d80e4200a00149e4de63ab622439d5d2a0f0f9c96f3c
+EBUILD git-modes-9999.ebuild 669 BLAKE2B d2c5538ab0566e378274713efd62276abc5f96837dc48745932d3327622eeac9df31382582435aa602d2e7cdc6f2d080f4121f80fdf58c61a4f31f0a1688dfa9 SHA512 4932a590f42f42589f17e883639b892f4a765938aa371a832a1b873c995e3a30aedd91dd9ed5120b9e53d80e4200a00149e4de63ab622439d5d2a0f0f9c96f3c
 MISC metadata.xml 419 BLAKE2B 6e3a5051a08003fb5450a0a4a9eb68df7c91878d1f61c7f5dbb58569dc1235ee4101f69a8d6bb35c846c3a78bfbf5f2e0fdfadd69a359e159818b3b145b04a5e SHA512 31f2551caca2dcb46aefdf851e01fc518260b6b8900d76c86106c7789f74de306357d4f0fa2e9852d9a8bad91253284cf5a68e6d66004a1e0abf25ba6a82ad58
diff --git a/app-emacs/git-modes/git-modes-1.4.2.ebuild b/app-emacs/git-modes/git-modes-1.4.4.ebuild
index b761256b1fe3..cbe21880ac81 100644
--- a/app-emacs/git-modes/git-modes-1.4.2.ebuild
+++ b/app-emacs/git-modes/git-modes-1.4.4.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
@@ -7,15 +7,27 @@ inherit elisp
 
 DESCRIPTION="Emacs major modes for editing Git configuration files"
 HOMEPAGE="https://github.com/magit/git-modes/"
-SRC_URI="https://github.com/magit/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
+else
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64 ~x86"
 SLOT="0"
 
-RDEPEND=">=app-emacs/compat-29.1.4.1"
-BDEPEND="${RDEPEND}"
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+"
+BDEPEND="
+	${RDEPEND}
+"
 
 DOCS=( README.org )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/git-modes/git-modes-9999.ebuild b/app-emacs/git-modes/git-modes-9999.ebuild
index 2a0e06023a16..cbe21880ac81 100644
--- a/app-emacs/git-modes/git-modes-9999.ebuild
+++ b/app-emacs/git-modes/git-modes-9999.ebuild
@@ -23,7 +23,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
-	>=app-emacs/compat-29.1.4.5
+	>=app-emacs/compat-30.0.0.0
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/app-emacs/hl-todo/Manifest b/app-emacs/hl-todo/Manifest
index 0399f5601d37..bf2bf11bb5db 100644
--- a/app-emacs/hl-todo/Manifest
+++ b/app-emacs/hl-todo/Manifest
@@ -1,6 +1,6 @@
 AUX 50hl-todo-gentoo.el 180 BLAKE2B 967e85d2d5738a45f21cc1bb038ac64366a0774d88fda4b542521f76ee204f88b950769eb120d2f537b0a48fdd239d17453263c19aefcbd1f2bf14d886cfcf88 SHA512 9b9b437d6ea14762afac357012a307599677f115bc1659d0c07cfd7db4eefa95b5a7104d03db101cdfefed05a9e510324a11066772e5642891c054675424e533
-DIST hl-todo-3.7.0.tar.gz 19369 BLAKE2B 4e2b56a94ef399207ad6f92da44596bdacfddc31c3182aff088e00a58c955890a34464b858e4194611ea88c90df4827a7a7ab8d177ee99ac7fd5597f8393f046 SHA512 74dcce9c4e8e638a135d57b9c00d6fe364326bb00045452289e86a278c7ccd864e756a930973eabd717e5239b86f7d5a46b82df19834eeef8a3a3d6d1111b14b
 DIST hl-todo-3.8.0.tar.gz 19403 BLAKE2B 1e3752c3466899b444167924b6d273812f622c4bac9bc473d5d2181686d3faa9ba936b1eb61d3cd231f44c18ad8c762651b30044d222d9b01f6c3039ccc166bf SHA512 3a5c466d3ffa883b48e342640502dfa0a54a064ca12b9b8fe40db9dacf27f8083bcb383e3ec332e7ae2683eb6dfbba3f6d6c83f8c53c6edb8183cb4711be27b3
-EBUILD hl-todo-3.7.0.ebuild 614 BLAKE2B 4992384a2bf326566dc3cb4735f748fcf60e5c3ab5a06e389ebeda6dc9f0b235d3427826c53ff69ec58ada453d6915469ca8bbf5d7fb722a7a3e8c29e8e1dd1b SHA512 a15bfa5d45fff0c0e7b3a31844816884d79906cc82a3f4285febff878446cd7d27438d21723b25e9e3653b6967c3903c96c25290f91a0e9d866463cdde484043
+DIST hl-todo-3.8.1.tar.gz 19400 BLAKE2B 035cfdd0bcd859c48acc59a9f2bbd797c1e0f2a3510d3ac4f8538cd0a467afc01175cfbcd17ea597e83d5aeb366f74f8f52a5316e40236fa95bcf6e6334f7fcc SHA512 9cbb0537a375f54b73f39bd9c2ec80ba7fa425630e516b147fb5e674c9123eaf5fe79d3cba829b4b0dbb249834df5f7fe2240830d313d84c03cdb8eb0f9266a2
 EBUILD hl-todo-3.8.0.ebuild 614 BLAKE2B 4992384a2bf326566dc3cb4735f748fcf60e5c3ab5a06e389ebeda6dc9f0b235d3427826c53ff69ec58ada453d6915469ca8bbf5d7fb722a7a3e8c29e8e1dd1b SHA512 a15bfa5d45fff0c0e7b3a31844816884d79906cc82a3f4285febff878446cd7d27438d21723b25e9e3653b6967c3903c96c25290f91a0e9d866463cdde484043
+EBUILD hl-todo-3.8.1.ebuild 614 BLAKE2B 214042f79759b91f01cadef7a8b493c003fff01d624826c872025dc17b8bde1e8097dff3d0b4d63747c3cf964b887c56943627d74110461653452c41203a21bc SHA512 68128fe664c722436e04a02e4fad951d719ec9d5ed22566eecacf3e485bc8b9bae6eb605f4bf98a495797065d0211540636b66ff41ebd57fc58bef83a922d7a8
 MISC metadata.xml 361 BLAKE2B d64dcf7b0a3a4d6fce92bc067d14e85ef5f4124414269aced39eacbce3fe1f2e96a5342886dbc8bcca39a0dfd6b2c2919ef404b106b408e3894f0c6e595971cb SHA512 3b795dfdb6a9c151218874c8a753474ba352e4d8d701de6f08340e9e11456752fcbeefcb715da11a1930ede0a6cb079bbe99c0d77e772413b5db86749d9a5581
diff --git a/app-emacs/hl-todo/hl-todo-3.7.0.ebuild b/app-emacs/hl-todo/hl-todo-3.8.1.ebuild
index 50a91455193c..777af57de0e1 100644
--- a/app-emacs/hl-todo/hl-todo-3.7.0.ebuild
+++ b/app-emacs/hl-todo/hl-todo-3.8.1.ebuild
@@ -23,7 +23,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
-	>=app-emacs/compat-29.1.4.5
+	>=app-emacs/compat-30.0.0.0
 "
 BDEPEND="
 	${RDEPEND}
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
 }
diff --git a/app-emacs/mastodon/Manifest b/app-emacs/mastodon/Manifest
index 1ceb4783ddd1..606faf9a851c 100644
--- a/app-emacs/mastodon/Manifest
+++ b/app-emacs/mastodon/Manifest
@@ -1,7 +1,7 @@
 AUX 50mastodon-gentoo.el 137 BLAKE2B 1a4d306658bc54fa3b69a6b250a9fc48d8013e79261afad49b71e01fa0096c6f81187eeb4a308d19888045be948c8cf3d726e9ee9865120cb803be2f35969892 SHA512 52bffd9a794108da342152e435aba1fb551e5f058e1ff02d0a094b221a6b1359e39d0bf629472d5e42fff43244303d78cc4bfd7052f5760b512a61d18300074b
-DIST mastodon-1.0.23.tar.gz 164188 BLAKE2B 524419fd20e6366fa5fc3be253ba6ff0c4118ff4c1fef8418498809e5f3f441be2fbc088abe517a69075e7b63bb8042b04330d6ba661e7633d981657117fd251 SHA512 91a537c73170a49001d6d10204e0de01251d24e3a54d75850869f860dd390a20168e2a1329541a69e267eb8bf37d757012054034d9a8c2db252dcbd1ab384236
 DIST mastodon-1.0.24.tar.gz 171101 BLAKE2B 53250b92428d1f962044805a628615ff76e6f418dfafd5785081ef8baa17a70046220801279a22f962fa204bee8cdc590aa43cc43abf7f866a1f5e05a489ac14 SHA512 adbb4dac02baf8e53794a85820257a9dfbc6cb840f412dc7dcb08af08d7d623831727a65f7a3ee90d9fd0d3e12a2bee722e7ad6658d29ed0d902186fe7b6778a
-EBUILD mastodon-1.0.23.ebuild 756 BLAKE2B 276df9dfd44fbd5a2be854abbdf5c3090514af76547db688bdcc7dca3346b5bdc5468f161daeb59ea24a4268a0e357bf12547b69baa8a8e2d4393b479e616183 SHA512 79c6259ecca453f557239ff1c3671299e35a1cc90fc00c064488bb97778d12d850e3d25e5bde091fd20dffa6edb218d50b569c935d374eeab7cf7eefe22db124
+DIST mastodon-1.0.25.tar.gz 624494 BLAKE2B 50be585fd5419c94a3c81705130631882f6f71c69a70c7521b0a5b1df43245f0d1214d50c6c86cf32131437514f020c168bf612f3b32fc236bc0ae6c20418818 SHA512 dbb5e36a2db92242df25d0af0c829c693af70046522ba76a9f3da8bdba4877c29d1b3a774d95750cdaeb73bb8e84dbe04022148c420ba7f4e9324c6c2bfc3969
 EBUILD mastodon-1.0.24.ebuild 756 BLAKE2B 276df9dfd44fbd5a2be854abbdf5c3090514af76547db688bdcc7dca3346b5bdc5468f161daeb59ea24a4268a0e357bf12547b69baa8a8e2d4393b479e616183 SHA512 79c6259ecca453f557239ff1c3671299e35a1cc90fc00c064488bb97778d12d850e3d25e5bde091fd20dffa6edb218d50b569c935d374eeab7cf7eefe22db124
+EBUILD mastodon-1.0.25.ebuild 756 BLAKE2B 276df9dfd44fbd5a2be854abbdf5c3090514af76547db688bdcc7dca3346b5bdc5468f161daeb59ea24a4268a0e357bf12547b69baa8a8e2d4393b479e616183 SHA512 79c6259ecca453f557239ff1c3671299e35a1cc90fc00c064488bb97778d12d850e3d25e5bde091fd20dffa6edb218d50b569c935d374eeab7cf7eefe22db124
 EBUILD mastodon-9999.ebuild 756 BLAKE2B 276df9dfd44fbd5a2be854abbdf5c3090514af76547db688bdcc7dca3346b5bdc5468f161daeb59ea24a4268a0e357bf12547b69baa8a8e2d4393b479e616183 SHA512 79c6259ecca453f557239ff1c3671299e35a1cc90fc00c064488bb97778d12d850e3d25e5bde091fd20dffa6edb218d50b569c935d374eeab7cf7eefe22db124
 MISC metadata.xml 512 BLAKE2B d8a604d5c6c58e2851d87c5602398d8bbc654a537febc54faad53815db5f527e507e1d45d75b0326db05dd747e315003b82e220fd494ad89c85ff7e951dbc563 SHA512 12b0ab3aeee03e66c3eac83b7ce581eee6110bc469681f7b0979c45110d651c19c5362d780886d95e2eaffdaba3fca44a00991e99f155312ba51cd4726ac4464
diff --git a/app-emacs/mastodon/mastodon-1.0.23.ebuild b/app-emacs/mastodon/mastodon-1.0.25.ebuild
index 2a79521adfed..2a79521adfed 100644
--- a/app-emacs/mastodon/mastodon-1.0.23.ebuild
+++ b/app-emacs/mastodon/mastodon-1.0.25.ebuild
diff --git a/app-emacs/no-littering/Manifest b/app-emacs/no-littering/Manifest
index 1dbed82b7b97..2eb86a59ea21 100644
--- a/app-emacs/no-littering/Manifest
+++ b/app-emacs/no-littering/Manifest
@@ -1,5 +1,5 @@
-DIST no-littering-1.5.0.tar.gz 25036 BLAKE2B af09461841e178944810f796049693ba191a6ee5197487741826285a1a8d4e3e22e425f27528f6c1ffa986203fd4151fe9d91d3b9882e5304c92ddfe721db205 SHA512 e9a0141429fbeee90aacd9bda9ce59c3077380d0f508ac39286520561f70238609dc5eb682ac7449af1313aa186c52ffe05b2c3c33ffced4347beaa216b957ac
 DIST no-littering-1.7.0.tar.gz 25944 BLAKE2B 45a979b7fc49fb09d50465ce523f3b9d40ce77833507a3ae1c786b0a80157f99f12baedf40ef4412f5c40158270da2f244900a4b4058313d29a40354378878d6 SHA512 016a3848e012086a500ac0b32f86edb7e939fadb36bd0561bb0332d75326fbb5d595a6ed8648746cb0aa7e34b425c8d850f8d4af770d2db3dc2251ec6fe84a10
-EBUILD no-littering-1.5.0.ebuild 653 BLAKE2B cfc0360d6b82212034ab7006d6098f15ace3c43d95ea7cc9524c0ce40b66f4c1bb9e9dc39138af07bdb65b55de081bc2c4045cad6f19d8642bc6d8e9c2e6c4a6 SHA512 4348bcc54ab946df892ed44c3956e0cdcba90c7c32507310922509be3e66085e0e6dcec8a681a82367ecf79569444cb89688f739308104bb4de40b0231cbf724
+DIST no-littering-1.7.1.tar.gz 25972 BLAKE2B 076c0509911ab83849401827460e22f8e04fc131bb2e94a4b69259616bcc49ea13b5fc4adf0fbac72bc6f510fbc2e5ec7c127e5961027d38019861124b9b0fb5 SHA512 056b79d68a5af243c068d6a86bfb03cd7fef8240510f2756864424a6059aa47e592ef25f2b20e1acce89b12093c39847d4fa83fa954304b2f6342a42f4cd8135
 EBUILD no-littering-1.7.0.ebuild 653 BLAKE2B cfc0360d6b82212034ab7006d6098f15ace3c43d95ea7cc9524c0ce40b66f4c1bb9e9dc39138af07bdb65b55de081bc2c4045cad6f19d8642bc6d8e9c2e6c4a6 SHA512 4348bcc54ab946df892ed44c3956e0cdcba90c7c32507310922509be3e66085e0e6dcec8a681a82367ecf79569444cb89688f739308104bb4de40b0231cbf724
+EBUILD no-littering-1.7.1.ebuild 664 BLAKE2B 0913de5f062dc132c4295e64ef4dba013501fbf5c9f7db3da069e41836d5363ab088ba0a630375e8c8dcacca64bdce73397ab384f7467b8b14366c36d8187ebb SHA512 cba3ee416bae810c04fc742ca0a55c1aeded4db13bc25e30aefc2e7cd811af317bf4cc2e657430157b36bf54021985c7dfec77b0be603d8f05973cd5f99b6e5d
 MISC metadata.xml 1245 BLAKE2B ea7276a10c2486bf38ee988d5fb4702e32b3e5393c0f842ec51eb2f10a4e01f175759c7a73d88c52c682a46f4b1f620066ec0e43135e90f38e0266653b33146d SHA512 8090e3888fe979f1217ff1c3bd5e605e0a438c10a8a0e60da01637ce813aa271aa639aae087cec5e451c16d4e5e9c2d876ff57cd8d3385795f76d0cf620f46f0
diff --git a/app-emacs/no-littering/no-littering-1.5.0.ebuild b/app-emacs/no-littering/no-littering-1.7.1.ebuild
index 604af65ad8d7..265b8c212a37 100644
--- a/app-emacs/no-littering/no-littering-1.5.0.ebuild
+++ b/app-emacs/no-littering/no-littering-1.7.1.ebuild
@@ -23,7 +23,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
-	app-emacs/compat
+	>=app-emacs/compat-30.0.0.0
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/app-emacs/org-modern/Manifest b/app-emacs/org-modern/Manifest
index 5aa45af47b8c..df46e048dc86 100644
--- a/app-emacs/org-modern/Manifest
+++ b/app-emacs/org-modern/Manifest
@@ -1,6 +1,9 @@
 AUX 50org-modern-gentoo.el 268 BLAKE2B 1c60242a6d203e31583ee774e87f200637b1ca71540b65cae68ea0f9255f5eaa4655345bbf21a3e992a087c7dc5abff49a039dc6d36cec59d1a7d8d973da518c SHA512 0b0fac73188c85d3447e34730fab7431eeeeba56f623e38858aae7a73aeae3160b1c272ee9565899375319194b7817578351ad578bc9123b903c8f169ebcec9b
 DIST org-modern-1.3.tar.gz 25476 BLAKE2B ae3c4299ba94fa90fafb8d70ab78dc774052763e88b80974c98cdc1511a8d0107bbc429da6118c4bd16ae85761d6feb791cf8359ebc475fcffafcfbb714b6854 SHA512 d4fc8cbebb8a97a2a06312d35df86b5c3e112740b473bd00681b4dc8e73d82f0bbbdbe2977ef51d27efd59b0ce5aca8d7defba22b25881261ffa1f1d7c0173cc
 DIST org-modern-1.4.tar.gz 25746 BLAKE2B fc4269e7b812b93a42f160b8295525d2b830e8f03b4a1af7777b4287b4b879e991ba8384124ae6dc7bd93b09fecf3a2ee7d310c60ed8601f524e14f69f5f4e77 SHA512 1b4d9b504a7a4eff20dcc47528176bbb3b144ef47849ab6b14fe00405322f1c3d5b7448834fa105e99183d0c5ff503d681f2f267df6d10ee7041cefe9d895f2b
+DIST org-modern-1.5.tar.gz 25739 BLAKE2B 3d8ccc352c18f71ef4c4d317957ccadf83cefb5caab24417eb930e20078b9a80e5d2758b8724cf271b622251d7e05aefe43a81500f9ca95c523d4fbd70592a67 SHA512 f98833f37a90873d17df4dc0b7540bb05b2794e3bb754514a0fefdc5693acc137ecc7fbf3d3959aecf95cf5368e17aa093c2977ff87a2a57fa694d98cf36d2c1
 EBUILD org-modern-1.3.ebuild 623 BLAKE2B 2eb1626c8c284ed0099e0de43d98f8f1731fafec37b1cc139ee72bb966cb196c94f819fa85aef45376b265f66aa4c691da2f29d2498df700f0f1c22746f4b7c6 SHA512 6c8e86ce2b27a2a4b63a5b3b2610ed0362aead4b0aaa935cdf0531addb4627f65fb50fa124059381f6b73e937757f68103c398be893792bb6ec4465c57590a2f
 EBUILD org-modern-1.4.ebuild 623 BLAKE2B 2eb1626c8c284ed0099e0de43d98f8f1731fafec37b1cc139ee72bb966cb196c94f819fa85aef45376b265f66aa4c691da2f29d2498df700f0f1c22746f4b7c6 SHA512 6c8e86ce2b27a2a4b63a5b3b2610ed0362aead4b0aaa935cdf0531addb4627f65fb50fa124059381f6b73e937757f68103c398be893792bb6ec4465c57590a2f
+EBUILD org-modern-1.5.ebuild 623 BLAKE2B b0ba64e8c778531dab255223e94953a8046fcbd8164e1d1365065897ab62a7ca3ae459693322342bba0621caa79bdd785ddaf0321c152313a4eb2bbc64482b80 SHA512 9eb117413c6c346f58990aa8981f015d626aa30462317595c6a7da5c1f520ed287ee54399ba0e2ab0101fc41c7ded949318dfe723f793d888f574b644568e62a
+EBUILD org-modern-9999.ebuild 623 BLAKE2B b0ba64e8c778531dab255223e94953a8046fcbd8164e1d1365065897ab62a7ca3ae459693322342bba0621caa79bdd785ddaf0321c152313a4eb2bbc64482b80 SHA512 9eb117413c6c346f58990aa8981f015d626aa30462317595c6a7da5c1f520ed287ee54399ba0e2ab0101fc41c7ded949318dfe723f793d888f574b644568e62a
 MISC metadata.xml 803 BLAKE2B 76b689a9bee8d6d86128fb80844c575294e9e91812161e735c47eb4fc7c9192539f2109ebbcbdc143abee07426faf6b7cf0bc86c48d411738a8329b14c7b56a1 SHA512 cc417a871bdf3534187e566c197007c848f0974b2b4b58eff473087ef09702a929a9df5f4f1df019a4ca632884e7657db055d0ab58ed2ec328506ff0a4a7fcb6
diff --git a/app-emacs/org-modern/org-modern-1.5.ebuild b/app-emacs/org-modern/org-modern-1.5.ebuild
new file mode 100644
index 000000000000..5091d68a3b9b
--- /dev/null
+++ b/app-emacs/org-modern/org-modern-1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Modern style for your GNU Emacs Org buffers"
+HOMEPAGE="https://github.com/minad/org-modern/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/minad/${PN}.git"
+else
+	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( README.org example.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-modern/org-modern-9999.ebuild b/app-emacs/org-modern/org-modern-9999.ebuild
new file mode 100644
index 000000000000..5091d68a3b9b
--- /dev/null
+++ b/app-emacs/org-modern/org-modern-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Modern style for your GNU Emacs Org buffers"
+HOMEPAGE="https://github.com/minad/org-modern/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/minad/${PN}.git"
+else
+	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( README.org example.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/transient/Manifest b/app-emacs/transient/Manifest
index 26ae139b6ba8..6e0c5c951988 100644
--- a/app-emacs/transient/Manifest
+++ b/app-emacs/transient/Manifest
@@ -1,10 +1,8 @@
-DIST transient-0.6.0.tar.gz 136259 BLAKE2B a983ec4b42de10f9adfc71180bbd8df83a80d5593e199999b8435fc6da72f2007c78c40b5207a6957e961642699ca0752795a57f3313e0b3f245467fd2e70261 SHA512 a2709b1e6d620f46ff84a15807936bc9264792365ec8dd6633a2419ff094f5cdde139fe2f4dcbc8d393a23a2e2697f3fe1ea1fff7162024169a44a0cff463d75
-DIST transient-0.7.0.tar.gz 137584 BLAKE2B da99fd756f77214186e3a5cab8c52ece8ee9af01fbe004a33b1f53a1197c3ff4efe6ca476ca57835e9f1f7c77db1f08510ff407d4abecae5a7bd34f98573f28a SHA512 c3cf5dd9c42ef2628308a42fc6ec3f6aaf92a0516e186f5f336d6531ebcc12fbfc3864d8ab9cdcfcccbe662a8a9bd136cee866c7d6fbfbb6373910758522e8b1
 DIST transient-0.7.2.tar.gz 138256 BLAKE2B c3b425a9b6089b54eb7377d47c7763fda87d9800246de866330dd2ca6ac8561fad5d7429b0b1f0c5f10072e836825d025b08676bd973a793d93e9b32616bcf07 SHA512 2863701146ecf4ac5f4a8025f47737667bc3ee0ca1de70e747a3299c9bb7831c0d9a3853553d79790c929ca9e5fe9f534e2c7499bc37a22ca2fb8d1d28b269fd
 DIST transient-0.7.3.tar.gz 139105 BLAKE2B 7ab629632e90b009cb1a306e99c86b997ddf49573188f6923109abfd1be8b32ea857644d807f33b240139150f57e267c8ed674cb15d2888cb82694b653466227 SHA512 d219b821a2cae2529044c390436a28a1213e0d649113ac1f761888298f76ef518e820ff933aa4471ec830f0690c6d0c75e5344aee8c5693677f36d3a3458df2b
-EBUILD transient-0.6.0.ebuild 818 BLAKE2B 96769074e22959fcfaf3a2b89fe8e9fe6a46eed0cf627afe4f6ff6ee5eeb21a73be3ca8bbc071c28c04c4aa33868a9f3fd1329481b8dee1f1880e9e22eee3db8 SHA512 32c71973fc6748eeab8e1df8255aebf3c63127095793fda1535a726de23f769c1319736b627deef3b11a6fc59bbd9165cbf31091886fb80e64510ccc988c12d9
-EBUILD transient-0.7.0.ebuild 818 BLAKE2B 96769074e22959fcfaf3a2b89fe8e9fe6a46eed0cf627afe4f6ff6ee5eeb21a73be3ca8bbc071c28c04c4aa33868a9f3fd1329481b8dee1f1880e9e22eee3db8 SHA512 32c71973fc6748eeab8e1df8255aebf3c63127095793fda1535a726de23f769c1319736b627deef3b11a6fc59bbd9165cbf31091886fb80e64510ccc988c12d9
+DIST transient-0.7.4.tar.gz 139828 BLAKE2B 6ac959237be5f46d4ba381b8c8855ac0b6387405101024e1807af83c98ed7419cbd463fb7c8874b2196d0f5879610903940df34260a70487f3505495d5e47343 SHA512 711bed7c75417778894035fb8fd1006ac78e73c4e545785b94b4f0f8aa1f1903a1426ff5175310e1ab665e29ad4756ffd4ec4b897c1720e33531ec2ce3faf82a
 EBUILD transient-0.7.2.ebuild 818 BLAKE2B 96769074e22959fcfaf3a2b89fe8e9fe6a46eed0cf627afe4f6ff6ee5eeb21a73be3ca8bbc071c28c04c4aa33868a9f3fd1329481b8dee1f1880e9e22eee3db8 SHA512 32c71973fc6748eeab8e1df8255aebf3c63127095793fda1535a726de23f769c1319736b627deef3b11a6fc59bbd9165cbf31091886fb80e64510ccc988c12d9
 EBUILD transient-0.7.3.ebuild 820 BLAKE2B 79bd5b610003fd448c4b75a2d7dd1dbfcccb7ad23e83157714ce3578b52c9bd26910926178637af59d57eb1eb528df9e1f6885750f57dde2be72f075883925b9 SHA512 2885695105824ea2a9748f6914ece35d5a2543296bf79b51bfbd88e979fdc3e6cb5916c7d39e5888976657fa1f80e6650e7efb9cfefbf6de43a2a111f44c0732
-EBUILD transient-9999.ebuild 820 BLAKE2B 79bd5b610003fd448c4b75a2d7dd1dbfcccb7ad23e83157714ce3578b52c9bd26910926178637af59d57eb1eb528df9e1f6885750f57dde2be72f075883925b9 SHA512 2885695105824ea2a9748f6914ece35d5a2543296bf79b51bfbd88e979fdc3e6cb5916c7d39e5888976657fa1f80e6650e7efb9cfefbf6de43a2a111f44c0732
+EBUILD transient-0.7.4.ebuild 820 BLAKE2B 76547cddda312d94a13d084390a7458c797cf38b733e1ae18415a5258ae4ca8ff7f7fe9257efa2fcb3a40a10f0dcd110ed6fc67bdb9edc493db69b1e3d4cef8e SHA512 77577a6f96888ce5e7aeaa1b0daf9cefbd9b7c3693bd1840dd93c1eb3e6881892179792411fecec62ee930b988066605328959eb587ae5a8ee84c6b2fa740658
+EBUILD transient-9999.ebuild 820 BLAKE2B 76547cddda312d94a13d084390a7458c797cf38b733e1ae18415a5258ae4ca8ff7f7fe9257efa2fcb3a40a10f0dcd110ed6fc67bdb9edc493db69b1e3d4cef8e SHA512 77577a6f96888ce5e7aeaa1b0daf9cefbd9b7c3693bd1840dd93c1eb3e6881892179792411fecec62ee930b988066605328959eb587ae5a8ee84c6b2fa740658
 MISC metadata.xml 1434 BLAKE2B 6f7f91e2cd8c87559f15552d6fbe920e5262a50f21919a096af55df037726eb380a774cfba8be73b588ba9aa2c39da5caf6ad64a31106b843c6bd308fe7aa40e SHA512 3316d9ac21d2a2aa0a5824f2c8ded736ad1bfcd7319a9c4cb8b02f0ffec5f440820bfe48e4f4d4264fbc3864bd7959875f1396285b6a7eb2ad3333a6a062a14f
diff --git a/app-emacs/transient/transient-0.7.0.ebuild b/app-emacs/transient/transient-0.7.4.ebuild
index f479cee08744..f99ae40b0465 100644
--- a/app-emacs/transient/transient-0.7.0.ebuild
+++ b/app-emacs/transient/transient-0.7.4.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3+"
@@ -28,7 +28,7 @@ ELISP_TEXINFO="docs/${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"
 
 RDEPEND="
-	>=app-emacs/compat-29.1.4.1
+	>=app-emacs/compat-30.0.0.0
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/app-emacs/transient/transient-9999.ebuild b/app-emacs/transient/transient-9999.ebuild
index 02944ca13d21..f99ae40b0465 100644
--- a/app-emacs/transient/transient-9999.ebuild
+++ b/app-emacs/transient/transient-9999.ebuild
@@ -28,7 +28,7 @@ ELISP_TEXINFO="docs/${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"
 
 RDEPEND="
-	>=app-emacs/compat-29.1.4.1
+	>=app-emacs/compat-30.0.0.0
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
index 84eb729c42fd..b5e9ac94183a 100644
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -3,6 +3,6 @@ AUX vterm-0.0.1_pre20210618-dont-compile.patch 772 BLAKE2B 235f1050ccf434663da28
 DIST vterm-0.0.2_p20240102.tar.gz 61754 BLAKE2B 283730dbd1d826590111495c798bfdf78a1921c73ac6aba7f062590c775c2d99265f70cf915f486316837a28e97f0e6a0e3fca72aed74295fbfc807acd8c1a99 SHA512 74a6a789ffc2863eea7be6775761c65537812cb0a6c571334ae3958129ddd3e7bbe764812e4dfe2782194a3e92af6cc6d04e400ca94a2e73dfa38fa0b476eabc
 DIST vterm-0.0.2_p20240705.tar.gz 61759 BLAKE2B a89ca81e905ce184eac3a7374502be9d550c5ac662a8576b8f623bb265fabde5dfb1e32534fdd2f92b8d8b7f3e164faa4137b51c0424a2a0d1cccc2f948e646c SHA512 4b51f67e18a98297b2fb85d9d28b840855bbf52e80d03e9c9889ba525a301a48777837bfb8583bfc60a660235ddd2beb7fec41258f9f062414eed82a385385b2
 EBUILD vterm-0.0.2_p20240102.ebuild 1654 BLAKE2B e7da142afdb62f64a0a5898a7f8864216292ce0904e4ccceefe7a43814c619820c48a0a409cab8a21c71bf46eef69154abadca40bc36bfaa3828331d0f3e3e3d SHA512 0360afe49e11ae7217127abb1f7b4cd4ee046d377ae6e8a0ea3a8bc4d6a7dff22c62906faf686d296e027d525dfcc074288948456ceebff35f4cd4ba1b7dfc74
-EBUILD vterm-0.0.2_p20240705.ebuild 1535 BLAKE2B c20f52dd0c9afc6c651ac60a378f9847e7b3df3fdf5f2179e3ae91a0630c52ac1b49af8833d94e5957b0217f8cd89d089a78a3bc090846c0fa8ad8c60b5361fa SHA512 c0a78aea25fe898a483c7ea5c3dd2d6bf3d72d56c322f655fa153b7a4decf95c326d3bb6d498cf4ec8c5aa4b1cadab957c5ef40e939ee3e1fb9ef0a21dbba685
+EBUILD vterm-0.0.2_p20240705.ebuild 1534 BLAKE2B df99276cacf6198e941be53475fbd987d2d226fb90e55a5eb16c3f51b4b80e35b251e93f3da2e2f1ac43c0ac12c7e874056a6c951bfd6afd330e7e9f19bd4357 SHA512 a1955f6ad9298de443ea6e0720ffd60c61bb7fb8aef2c204c240d1e5e441cb06eddd4c955674c587258920a6cb6b211886feb924be60884ea9d2e50e47c7d3d5
 EBUILD vterm-9999.ebuild 1535 BLAKE2B c20f52dd0c9afc6c651ac60a378f9847e7b3df3fdf5f2179e3ae91a0630c52ac1b49af8833d94e5957b0217f8cd89d089a78a3bc090846c0fa8ad8c60b5361fa SHA512 c0a78aea25fe898a483c7ea5c3dd2d6bf3d72d56c322f655fa153b7a4decf95c326d3bb6d498cf4ec8c5aa4b1cadab957c5ef40e939ee3e1fb9ef0a21dbba685
 MISC metadata.xml 634 BLAKE2B 09ec6e8f2b00735c5fc3dbca525205b0b98a580feecfea36a1c2b435bfd6de2e4b5e85c47c07f4830da1b3ddc8793d06e4e6ec3a02e5df19c876e0251226f5c7 SHA512 09d9be89b4275192c5048eb3a7fc3729d6d4923861bc5ab075c8097e7bb1f6776649e82440e53b1d0236dc669a4580aa2da31da5cdc5994b59eabaffdeeedc61
diff --git a/app-emacs/vterm/vterm-0.0.2_p20240705.ebuild b/app-emacs/vterm/vterm-0.0.2_p20240705.ebuild
index 66772f19f189..240abf4e93ec 100644
--- a/app-emacs/vterm/vterm-0.0.2_p20240705.ebuild
+++ b/app-emacs/vterm/vterm-0.0.2_p20240705.ebuild
@@ -23,7 +23,7 @@ case ${PV} in
 		SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT:-${PV}}.tar.gz
 			-> ${P}.tar.gz"
 		S="${WORKDIR}/${MY_PN}-${COMMIT:-${PV}}"
-		KEYWORDS="~amd64 ~arm64 ~x86"
+		KEYWORDS="amd64 ~arm64 ~x86"
 		;;
 esac
 
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 998e40295328..20d00eba329a 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1,8 +1,8 @@
-DIST with-editor-3.3.3.tar.gz 33282 BLAKE2B 3c2cbd4efeb4d4dc5f0a7372127d83d5c6d7781d6bf2743c03618fb88413f9771ae228431c94797b48e6962ff29096d29ee12b8f1cb99f382bb79594cacb156d SHA512 8a6bfbefe62437d44920c6a9d23d4e383a5f2b31bc79e2de8f94299836782fa3512c1c1d3c1813ae8408817ce7ea8b653ca86c5a812fcd06940f8d93fb815dd5
 DIST with-editor-3.3.4.tar.gz 33288 BLAKE2B 59e2b1c94be967cafbe112aad34a51aef6355d2f734ee2ce6160d3de2357fef226ef7bb0666f3c419b9e1bdce0ab8e3468ab0ab9bc259152014ede7ed1b4b453 SHA512 700f6e5a884e4664b2450f7dd3ea879f45934abdbc09eb9569a58233d57ad7411a47d977341231b5c23a2ae5710ce490b2ee3960aee150e912a3ec0017665942
 DIST with-editor-3.4.0.tar.gz 33396 BLAKE2B bc5956e658e77fcc4bdc2099374299fe38696d200ad201f9be1a63039874f7e33b035b91cd54a7a7abbbf9855bc47d775db85713bea003fb4d780e0c2266129a SHA512 c1ad247d1cc90fe5f5ace0ca257f33751d1e8eee7cd7b11bdfba6ead7a82a47be59b1cc8f3bcb28b77b5a386ee1604ef27ca72d5ced3d8a2262b298f85a8b1ee
-EBUILD with-editor-3.3.3.ebuild 787 BLAKE2B 33dbffe32ff1a495c9c95ced0ee8deae253e64fbdc59041eea7113bf193c8faa158616a1518a8b4c5b836ab5411b6f83c44edf08f0ee87da7c127b70234905fe SHA512 267d736ff504668aa900a1e22dcb46d008bbf9b0f23e502677d5482f0537fe5d12779cbf25a27d6bbb446e17ff309ba1230b699c6a1b47f195e0a50f30e4ca20
+DIST with-editor-3.4.1.tar.gz 33395 BLAKE2B 5d71328f455b87bd6af60ce1a6f07c39b16619fd4d8232e6a38761b60daa40786999e36a3a3c46687e59a84e2f23ac89b51bcf43e45da7bdc1c61aac12480ddf SHA512 1cca1803355461fac83107d40661edb8e6ee4fd6e5f925b80ffd28dfb6ee97387f1d18336b58c467f19b5e5d8b55ef162274840d0daaedb728594966cbc86120
 EBUILD with-editor-3.3.4.ebuild 787 BLAKE2B 33dbffe32ff1a495c9c95ced0ee8deae253e64fbdc59041eea7113bf193c8faa158616a1518a8b4c5b836ab5411b6f83c44edf08f0ee87da7c127b70234905fe SHA512 267d736ff504668aa900a1e22dcb46d008bbf9b0f23e502677d5482f0537fe5d12779cbf25a27d6bbb446e17ff309ba1230b699c6a1b47f195e0a50f30e4ca20
 EBUILD with-editor-3.4.0.ebuild 791 BLAKE2B 708113ab63818447868df1e1654d8a6ba55971974951c12d315730cc964d689c9800dad850c4b92604f35049e6fddec9b4bd7925e428df343ddaffa96ae59091 SHA512 92ccb53aab1bfc3435b93a21eb2e1eaa7b9faa015b6b364781e824734e779c6e57e8a56ceee3df8b5a527fc3f5daf0d71c08b358acb0716dafce28aecdb485a4
-EBUILD with-editor-9999.ebuild 790 BLAKE2B 35492417aca1738392e5ab3e18fbf592a2dd3e2b4dfd0426af5aeeeb409467f3c5d0f9b2d2bd53cebc23fe287397c4f0d6d6b853577a879f1931386b8e6cbfa5 SHA512 ef3d7ec950019e522335d9a5354719f967ac785bd66dc7c06566cfb4bbc6bf89e5f262f7e029bec7f12564fb26d1395dcc7bc116fd9a75ffb1fa5cfe52061bda
+EBUILD with-editor-3.4.1.ebuild 791 BLAKE2B 43fc140139a915803dcc551a6dbbde8c7b14ddecd32974b97aadfbba0ddead09ef39a96b9dafc687d885e86160afe00b488736c079e0d95ad705fc2a6c6c611b SHA512 37a978306d8b1d4b5e30d00472618e9d0d112240555b3687da78d3226b093d30fc15900f74460611ba1b55655b803d02ccb5209ea35b3d30348c272a7b03ea7f
+EBUILD with-editor-9999.ebuild 791 BLAKE2B 43fc140139a915803dcc551a6dbbde8c7b14ddecd32974b97aadfbba0ddead09ef39a96b9dafc687d885e86160afe00b488736c079e0d95ad705fc2a6c6c611b SHA512 37a978306d8b1d4b5e30d00472618e9d0d112240555b3687da78d3226b093d30fc15900f74460611ba1b55655b803d02ccb5209ea35b3d30348c272a7b03ea7f
 MISC metadata.xml 708 BLAKE2B f2e619818ede95a7a0b17cc7f36f903f4210ddc634d4f0edf27886e8fbc4d084daa5ef67c8167ef2f39930141c8dbe1e98c4e5992b7af35234499fa73e9de4cc SHA512 bf422e1a42e025426795319834a7fa75252e8f2c42da1d82098e2def918ed9c4f827978753c86cc4e41cde581bcdc8eb2c9781d75849a80ab6f94f945b4cdea3
diff --git a/app-emacs/with-editor/with-editor-3.3.3.ebuild b/app-emacs/with-editor/with-editor-3.4.1.ebuild
index 450104f0273e..f01c1a6f71dd 100644
--- a/app-emacs/with-editor/with-editor-3.3.3.ebuild
+++ b/app-emacs/with-editor/with-editor-3.4.1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	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"
@@ -26,7 +26,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
-	>=app-emacs/compat-29.1.4.1
+	>=app-emacs/compat-30.0.0.0
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/app-emacs/with-editor/with-editor-9999.ebuild b/app-emacs/with-editor/with-editor-9999.ebuild
index 7e5a5295cac5..f01c1a6f71dd 100644
--- a/app-emacs/with-editor/with-editor-9999.ebuild
+++ b/app-emacs/with-editor/with-editor-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
 else
-	SRC_URI="https://github.com/magit/${PN}/archive/${PV}.tar.gz
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
@@ -26,7 +26,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
-	>=app-emacs/compat-29.1.4.1
+	>=app-emacs/compat-30.0.0.0
 "
 BDEPEND="
 	${RDEPEND}