Merge updates from master

13 files changed, 191 insertions, 37 deletions

diff --git a/app-containers/earthly/Manifest b/app-containers/earthly/Manifest
index b0276f55d494..8bf9e73f799d 100644
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@@ -1,6 +1,6 @@
-DIST earthly-0.8.12-deps.tar.xz 163755972 BLAKE2B 6d5e7e2d157b54818bebca7cc0b57be23be4581660bae8002bb90983cc9478d9d05ebea3dd102123ced6c1f1a8b94f93ca0868c040defa1fb5f0137f901b1c50 SHA512 bcfc4eecfceefcf5677f145475406fe4fef9d3a70c177ea657f2f0eec7227c752fcc01b129c001fbb8d9fa6ba934a6425b0fb0957b6812d2f751e7d3b99dd0a2
-DIST earthly-0.8.12.tar.gz 8090651 BLAKE2B ce916a50b23bc5567b4174ad88a5a52b9c728b4ee215239f46680fe5574f0cabe353d5a336e395f7eec42c86a726bb0d0da4b5204dcc9654c76a8a8cd3366fb4 SHA512 7cc62cc3af6aef039f8059e04564a181dd9b497cb51f15b6a49f2aad4a975147aa30d9109eb1c33cfc74a6f354eae77904d5c0e15e63172cb7ee20874b9bc05e
 DIST earthly-0.8.13-deps.tar.xz 163750220 BLAKE2B 995ed748f99b7d4c4ca90cdd1964c295270963e55462bfa3bdd830209a90303d67c91fed66e7d52984993ef58b1d060e140694fdc8931ca2181dd88701d8f6dd SHA512 ab3ee4fef9a87dab9009ffd4e31d00a256c8ad88096c8573a5a2fb782079392415752024821240da60549d260c9dcfe3d6f1457fb3fbc8cc8a1f2602bb875aee
 DIST earthly-0.8.13.tar.gz 8082676 BLAKE2B cf6d5c6d397951a60302e5492ad219d3d673cce9bf2e06696a3cd8719dcf1d755644413171c7db1b27c60d6cbe0d85facf2d6a5d150c26dc5530c07d1255b742 SHA512 f3abd814c0c57f485a37c83e322d9a8478236ae4220baf455330a6a28d98a8cb7806fb4cee9525c9b27c51bc0ed8780872f51ece7194059658defd54cce1a6b5
 DIST earthly-0.8.14-deps.tar.xz 163777848 BLAKE2B 0615db6d874a0d490666df6517581763315c44a67662d1c8c630d59983849c3a1c10bdee4d626f9ded02a58f7eb037e24cca6b22dfc7eadf79d4e735a33306c5 SHA512 ac062ae77e98ec36f9bba1a73430080d2f2c7bed3ad8c48af8bb1da4a6f006a4285fca8f4d85363652ec3db9df78e76befdfc838971684d704512d795d672414
 DIST earthly-0.8.14.tar.gz 8079338 BLAKE2B c3da74c39b77f671656ba51f7e8a82b77476650e986e5665e1df86fd1674e808b79edcc0b8f616891b6749ec034de45268fb48df519c5fdf54c1e3e583eab5a6 SHA512 566e6bdd6f026baa99bad33128e3a843ef20dacc15efdccaf19af648440c8ee7b445bed80f33102b9fc419d211dc6dea38a66655247549f1eaf17837c6687105
+DIST earthly-0.8.15-deps.tar.xz 163782812 BLAKE2B 09a9cb196206e787a48c2c2082a066a31c0bd8dba8785e379bfb86ac56ccf4f8eb34195c8577b866bc1153657008e4fae142eb7a6e21d2791fe92e9cdfa76e2d SHA512 65afc0bd89b6a54bb3e4cc4d7f39522eddbb79266b25afb33ffc3c6571b57952bc2ceafe00ce196098d1c4185ab2672f8a80d9ecd4d6d07dc06a18ba39da3941
+DIST earthly-0.8.15.tar.gz 8102499 BLAKE2B 92793722206ab8c2d5bb097f7da40392d1ed1f3399797bc217dab7fcc0f305cc91f5e9f8b997b6e5e187f25c0f1109d8aba2294fb79d4b3f26d6660d36827d5c SHA512 0d98f716a2e2a6cb522abb42894f6356c12ac2e398382207db08d204dc951f65c7be04be7473e060c30a052768c4b2b7e9273d206b4252fec26975e6e166ae2a
diff --git a/app-containers/earthly/earthly-0.8.12.ebuild b/app-containers/earthly/earthly-0.8.15.ebuild
index 2b39a6ae5bc6..ed77de6b44c6 100644
--- a/app-containers/earthly/earthly-0.8.12.ebuild
+++ b/app-containers/earthly/earthly-0.8.15.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 # Git commit SHA is needed at runtime by earthly to pull and bootstrap images.
-if [[ "${PV}" == "0.8.12" ]] ; then
-	COMMIT_SHA="7dbb0eab6af95b6f43483ff4065445470252f522"
+if [[ "${PV}" == "0.8.15" ]] ; then
+	COMMIT_SHA="cb38f72663696d17d8393b1cc8bac66aed28faa2"
 else
 	die 'Could not detect "COMMIT_SHA", please update the ebuild.'
 fi
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	|| (
diff --git a/app-emacs/exwm/Manifest b/app-emacs/exwm/Manifest
index 7c9517550009..a53c22d1d11e 100644
--- a/app-emacs/exwm/Manifest
+++ b/app-emacs/exwm/Manifest
@@ -1,2 +1 @@
-DIST exwm-0.27.tar.gz 89941 BLAKE2B a64dcd6ed66686c64e233e2c22e270fadaa8311e08ef05a101ae6c76ede8d0e17e02a08472cbceee7e3e892cd5524f29b99a508fec9e9d480e025add1755a2da SHA512 8e3c47024361aa6f461f44b42ac7947b5f9af0aa767a4e77c3f22d1da6105d85f770de2ea0920c9754e4816879b1440b67fd573d523fdc03e93022e0188e479c
 DIST exwm-0.28.tar.gz 93246 BLAKE2B ec6afeeaf7609d68561c9ec87316c0135bc5e0341c3dba91964221e15edc75442097f4c5c0730d7eaf8e00010b6f88e4deb1f283ada61bd8e7333f21088dbf8b SHA512 5b5db21de7ac6c0c9f38ce6fdc66f5fb366fa50c52ba7d5fd76c9764cbda6b19f3c01213c7af2dba7605f66e7527367204fe1b5c10c1dda6d2ed7aae87312749
diff --git a/app-emacs/exwm/exwm-0.27.ebuild b/app-emacs/exwm/exwm-0.27.ebuild
deleted file mode 100644
index 78371ba95520..000000000000
--- a/app-emacs/exwm/exwm-0.27.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Emacs X Window Manager"
-HOMEPAGE="https://github.com/ch11ng/exwm/"
-SRC_URI="https://github.com/ch11ng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-emacs/xelb"
-RDEPEND="
-	${BDEPEND}
-	x11-apps/xrandr
-"
-
-DOCS=( README.md )
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-
-	insinto ${SITEETC}/${PN}/examples
-	doins xinitrc
-}
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 4c78f5c672f5..31550190f572 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,2 +1,3 @@
 DIST org-mode-release_9.7.5.tar.gz 2361692 BLAKE2B a0daba9d843286a5e7e43066337b2c49257f72d6e6c8282d3ded9c15a2c1d0ca20cee439b9fad252513d87b9cbbd97240f8b012f11a3a1067d271ea1c3ed22eb SHA512 3a80ca7f8728ba58df0ef881ead9f25c59a439532ab1af20b95e2e9764d01b2b4ee192f31f6fa9eca39d4e0038d3ac152f09111038dfafa5b44313aac32eb340
 DIST org-mode-release_9.7.6.tar.gz 2361944 BLAKE2B 238928a0a8b57772d6d6b0a1a28dc8073a72e5783730b171f1751b47a49d2c59578e7ca51187ebb4feedc0afdcd40452d62df7323bdafc1b6a8690815f609f8c SHA512 2c9f8ed35281bf909fe53b85bb5db9f14864d3b82a9f96fe29ae87db163f2c071772568674a0b618842259524864167808f26b32a4a8826cd4f2746ea68f95d1
+DIST org-mode-release_9.7.7.tar.gz 2362578 BLAKE2B 7cdd44198410b638a242d5538ae6eeaa0f4f1b6922a465483ddae793bbc2deefc4493042f9495d56ade908e16e788c4151f6e93676ae5c1ccd30173723b41c52 SHA512 7519fbc2b40471654e686a915dedb464c31869c65a63ab5ebfabb984c99ae26f0ad3bad531453d245937d628c27d282d0fe4f7a24547835100b3779f9b2f4ed0
diff --git a/app-emacs/org-mode/org-mode-9.7.7.ebuild b/app-emacs/org-mode/org-mode-9.7.7.ebuild
new file mode 100644
index 000000000000..86c9f98ba96b
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.7.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://orgmode.org/"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs/${PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/org"
+	S="${WORKDIR}/org"
+else
+	MY_P="${PN}-release_${PV}"
+	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="
+	doc? ( virtual/texi2dvi )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake -j1 \
+		ORGVERSION="${PV}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+
+	use doc && emake -j1 pdf card
+}
+
+src_install() {
+	emake -j1 \
+		ORGVERSION="${PV}" \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/transient/Manifest b/app-emacs/transient/Manifest
index 5ee128ce87ce..d0a8857e38aa 100644
--- a/app-emacs/transient/Manifest
+++ b/app-emacs/transient/Manifest
@@ -1,3 +1,4 @@
 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
diff --git a/app-emacs/transient/transient-0.7.3.ebuild b/app-emacs/transient/transient-0.7.3.ebuild
new file mode 100644
index 000000000000..02944ca13d21
--- /dev/null
+++ b/app-emacs/transient/transient-0.7.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Transient commands abstraction for GNU Emacs"
+HOMEPAGE="https://magit.vc/manual/transient/
+	https://github.com/magit/transient/"
+
+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 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( CHANGELOG README.org "docs/${PN}.org" )
+ELISP_TEXINFO="docs/${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	>=app-emacs/compat-29.1.4.1
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+src_prepare() {
+	mv lisp/*.el . || die
+
+	elisp_src_prepare
+}
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 5dcc5c135993..6ef94ec36db0 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,2 +1,3 @@
 DIST eisl-3.95.tar.gz 2438216 BLAKE2B 927af9a8b0469fcda16501a6fffba60eebc708dcfaba1b076b0ffe80396c285fc1fbb427694548418f76102451f7e37506686bf8d025decd04245e105fa618f7 SHA512 50e4159bbbc3c72fe985db3b2d77be63f2e8197027e97ac5af0e9316e5f817497bfc0a9f7cf0b0624bb8baf2cf28b5b94556ad77edcdee2e8e8a6d63a74e02a2
 DIST eisl-4.00.tar.gz 2299966 BLAKE2B fe2d4e486d459866870b0baa23d2eb32890e1661460116508bd18aa401ec71cb68395bf857c98ba749005dcfd0985ab628274800a32e749abf27a767a2ce8615 SHA512 0b4d225f6068a9ff05c6483663b68ae920a1f63e30b47e7350243a70902ae7f5818cf4713fdd45c223e858a4e435d5e93f0944965af1db3f8d9d48f0e2db8239
+DIST eisl-5.00.tar.gz 2995464 BLAKE2B ecfc577df2e2b470845a0f3cbaa646408b8d5ec72c0b0e86263c443d6cf0aad0401d7f70e826db71ba824f7659fb4620a83aa81840e2c1b7822c97ada5212d86 SHA512 c82aaac0a9878f33abfe5edd54a37884965a00e6f37e901f81e49537afe8a4891343096d6089058c8ce0df4e8cc89f1f6c179f97eb950e45b949e95d9e094ddf
diff --git a/dev-lang/eisl/eisl-5.00.ebuild b/dev-lang/eisl/eisl-5.00.ebuild
new file mode 100644
index 000000000000..0ef48728bee1
--- /dev/null
+++ b/dev-lang/eisl/eisl-5.00.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
+HOMEPAGE="https://github.com/sasagawa888/eisl/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
+else
+	SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+RESTRICT="test"  # Tests run cppcheck (and fail)
+
+DOCS=( README{,-ja}.md documents )
+
+RDEPEND="
+	sys-libs/ncurses:=
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" clean edlis eisl
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe edlis eisl
+
+	# Compilation of ISLisp files on installation fails.
+	# Do not compile them and mimic "make install".
+	insinto "/usr/share/${PN}"
+	doins -r library
+	doins fast.h ffi.h
+
+	einstalldocs
+}
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index bb38cab0cccd..104267ad81a8 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,2 +1,3 @@
 DIST ytmusicapi-1.7.3.tar.gz 277265 BLAKE2B 1461450fb2c1ceff63703f26c89aa6947cfca7ecae13232dadc207a20361e36ec43a03718dd5b0d63a84e69a5e77eae722fa06b3f1036183f65bbf5ee0fc1ebe SHA512 fa305e8a07c668270db27ea537101862ad78f8c1d353f4f5d98cefdfbcdf1388195e250f65076b1fc0aba5f95951d6b9ff76ca71201e9b35cd1af3fa6fd4476b
 DIST ytmusicapi-1.7.4.tar.gz 277715 BLAKE2B 6210c7666281e1b118a28571fe5852c319d252fbda19ec160a03c0a8a17c4a629e50794064bc86667aaa4d16a1937d3a7445abcf19da7d0094d064db99933e9b SHA512 98f00cc86eb749867ff69a7a5d8b3ea75b00072bb3001a2a087a07e44dab2f0793af2c90527858258929b2638a11f0271bc3949153e437ebc312d01377c9c635
+DIST ytmusicapi-1.7.5.tar.gz 277989 BLAKE2B 18cedc9ecaa5f2220b81dd831102cab6aa7dedcd745be9d561d79b2c7ecc2e31973e9d4671bcdc79827da64f76102dd984a430222b94dff5a6b418df85c1dde6 SHA512 f5c9d2bd5deb45a8d834a262d3d45f7691c1a86a3a67f0b5e3129940f323a1b6f4e50f17e66a9b843f28ca0b04db9e9b2fc873f1edbf147ab915f399d38e386a
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.7.5.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.7.5.ebuild
new file mode 100644
index 000000000000..b1568c0ab835
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-1.7.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unofficial API for YouTube Music"
+HOMEPAGE="https://ytmusicapi.readthedocs.io/
+	https://github.com/sigma67/ytmusicapi/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.3.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.3.ebuild
index 0a8af8cd7296..0a312ba5575e 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.3.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	dev-lang/execline:=