6 files changed, 35 insertions, 71 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 45c4ab85d57e..825b1026ac33 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/dape/Manifest b/app-emacs/dape/Manifest
index 48fdfcbac0f6..e2f051f44008 100644
--- a/app-emacs/dape/Manifest
+++ b/app-emacs/dape/Manifest
@@ -1,6 +1,4 @@
 AUX 50dape-gentoo.el 149 BLAKE2B fe626d62af990a5e351b78bb0f40ca6347484c4673641f5d0532dc74ec2d0b059b698f6976270b5c2e314325145df08e30c3155419e43d52630373c0bab8eb84 SHA512 a6e543b1c03d95fbf3d4672547e8e6b13d630ec6ffdcea7f1e9e602f8d9585ee6fbb740ce4078b2c01829775b6cbce447f1919e035f008613ebb40a64bc9dc36
-DIST dape-0.17.0.tar.gz 77229 BLAKE2B f0942019fe6215b416cecce89b01a81bb450a615ff2898d3c67788b6c3575bbe72c1420d27b6796a619c3403a6a94e717db805e553212c0bc8a07d5ae9e6670a SHA512 a0f26ecee4ec2cd8e57035ee58f15562e3d11b61203ded80e5560951e2f37a7a1c00c44538d75699c902b39cf9d2a59edcb1a528f6ce12351717fdd6136ae6e8
 DIST dape-0.18.0.tar.gz 78174 BLAKE2B cf883262a7d23d67c5f76dacb47dbc6ea6ed62d81506e1f124d4d85e8a818c692bd26b7d3ef7543fdead999713603a3b008832d5296edcd7fa2d784a2019ec1b SHA512 4d447c7b0fb01707046baa7c6bcd9528fc12bc295259be34a3dca21f9dea85a020cec9557468282947257aad059b174ae211f953ade6d67d615fa2daf50d1400
-EBUILD dape-0.17.0.ebuild 1354 BLAKE2B f3cf5270d84238c1aa1d1a24fbfb5cb5f2b46c6ecb6d50738c2f87422496c070cadbe22173d3f06bfff6ab7efc76154a2f418c13eaaf6b24f813826e05fa92a7 SHA512 50b6026fc3c3c1ea550c998830513e1ddb08284591f06beb0794864a34e4525b1a66eea4494232d96bbdc47873f474190b339b9b6228a496355af55e553073cf
-EBUILD dape-0.18.0.ebuild 1354 BLAKE2B f3cf5270d84238c1aa1d1a24fbfb5cb5f2b46c6ecb6d50738c2f87422496c070cadbe22173d3f06bfff6ab7efc76154a2f418c13eaaf6b24f813826e05fa92a7 SHA512 50b6026fc3c3c1ea550c998830513e1ddb08284591f06beb0794864a34e4525b1a66eea4494232d96bbdc47873f474190b339b9b6228a496355af55e553073cf
+EBUILD dape-0.18.0-r1.ebuild 1399 BLAKE2B 978d1ca9311696cdd5f5a03e8c56d070763007e7c95c74076cd6f6f90deee99216cd90b0b17ebfc860224cf84a502deeae5172e8ea42a9ff9656b58334393f9a SHA512 4029541173ed0969f77a22dc7601a5bb84aa239565b8794234f8a13e43cedf9845f912b9b3bf2dd7cbd619bbee78aa552f405d1b9c75594227b3be0d5176c334
 MISC metadata.xml 598 BLAKE2B 45e2a0bc9bfef6eee95b870c9d4d00d66f29798314093dc3cb525afdde400463c57b206122fd114f8b26c2d51d8a35f9ebf82d587d2b96436bbd3a92a2420ea0 SHA512 12b0c71e123ef1b3b0cbf32a8a7c857b9746607eb4853d2c5d1e3b7a7ccd8cdd5383eeda516586bffd1d863eb2ade6582cf8450c8944ca625a37702495be23d3
diff --git a/app-emacs/dape/dape-0.17.0.ebuild b/app-emacs/dape/dape-0.18.0-r1.ebuild
index 0b0fa9977676..3238a5a3963b 100644
--- a/app-emacs/dape/dape-0.17.0.ebuild
+++ b/app-emacs/dape/dape-0.18.0-r1.ebuild
@@ -60,8 +60,9 @@ src_compile() {
 # 	elisp-test
 # }
 
-elisp_src_install() {
+src_install() {
 	# Need to ignore dape-tests.el.
 	einstalldocs
 	elisp-install "${PN}" dape.el dape.elc dape-autoloads.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }
diff --git a/app-emacs/dape/dape-0.18.0.ebuild b/app-emacs/dape/dape-0.18.0.ebuild
deleted file mode 100644
index 0b0fa9977676..000000000000
--- a/app-emacs/dape/dape-0.18.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=29.1
-
-inherit elisp
-
-DESCRIPTION="Debug Adapter Protocol for Emacs"
-HOMEPAGE="https://github.com/svaante/dape"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/svaante/${PN}.git"
-else
-	SRC_URI="https://github.com/svaante/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	|| (
-		app-emacs/jsonrpc
-		>=app-editors/emacs-30:*
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-# Requires debugpy, but we do not package debugpy right now, as well as
-# js-debug.  Most tests use only the former.
-RESTRICT="test"
-
-DOCS=( README.org CHANGELOG.org LICENSE )
-SITEFILE="50${PN}-gentoo.el"
-
-# elisp-enable-tests ert . -l dape-tests.el
-
-pkg_setup() {
-	elisp_pkg_setup
-	local has_jsonrpc="$(${EMACS} ${EMACSFLAGS} \
-		--eval "(princ (>= emacs-major-version 30))")"
-	if has_version app-emacs/jsonrpc || [[ ${has_jsonrpc} = t ]]; then
-		:
-	else
-		die "Emacs does not have jsonrpc.el 1.0.25 or later, nor was app-emacs/jsonrpc installed"
-	fi
-}
-
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file
-}
-
-# src_test() {
-# 	elisp-test
-# }
-
-elisp_src_install() {
-	# Need to ignore dape-tests.el.
-	einstalldocs
-	elisp-install "${PN}" dape.el dape.elc dape-autoloads.el
-}
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 856713e06faa..1abde6d66d0f 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,6 +1,8 @@
 AUX 50ebuild-mode-gentoo-1.72.el 1639 BLAKE2B 49bb6726c21b21645bfe32d43d2b1ff4b01bd1f7b326c88d66a6baa4bfe473502d8b1340ddc70d30bbb1db01ab7828e6d5361fb564296fb0483793e654c5bd5b SHA512 4640bf21b4937890870bc1c4381151e8c2ce25a054319928d56363ea227df116df34465e9265de93cbb31f2508e131712487e20e05b6654f95dec7e23594eb37
 DIST ebuild-mode-1.75.tar.xz 48592 BLAKE2B 2273357c2736e0952637bb00754f0eff8379b5bd27793dac43d4d17e12affb8e88925ef321bd74709bc1054953f3fe3263b676c9faab93434558f45f55a70b28 SHA512 c00835513db517f07361ffa9fc86e8b268c89126fb1a0c88950e8566fcae296f115e29e6fa371bd93be34d6938e2a828e3382ea0b489a3e72af972b4f7b22e2e
 DIST ebuild-mode-1.76.tar.xz 50404 BLAKE2B 9aeda48858155286c9df2075b61f596723d457ac1592ab581e1589d291db2f54d3c5d81dd610a41506d43d5d90943404a8f74fc4b742d7ed33f4e623930d1fc7 SHA512 e9659878109de92789204d6bd9493465b1d078a5ac5a10937397478a20766bab453bdfc8d3352625570b37b8bf8aadc28369652979032427a1c8d6d13242aa64
+DIST ebuild-mode-1.77.tar.xz 50840 BLAKE2B 29ecc60dc232def8ef811da88efd68b6ffe66fa5df6a53390e6d01b858160f16f3f5f1f481f3d34628ccbd7228113867df3f81b0587d1f5ced721d129111f3a9 SHA512 f40f294158a36783f6d08297d51f0a0931209368449a6edeb50235568c4347b27070d20227c0d6d32d3581609dc288effefb8dda982d2e45b046243ce0e3495d
 EBUILD ebuild-mode-1.75.ebuild 1001 BLAKE2B cbd68aea9152ebe994ae7c699d41c11484f7ed359d959a106fb98c8a719cb79d5d252c00112121058c76a834d9188e84b8bc013d2a932fd0ff708934ea7c1118 SHA512 02127a3b197565dd3523d0d76fa79100e73eedbcd58c5865cc3af81631ea4bf98521b92d82aca057876ece6d9384f79ee0a703a81df998a917979c5fdb991b58
 EBUILD ebuild-mode-1.76.ebuild 1001 BLAKE2B cbd68aea9152ebe994ae7c699d41c11484f7ed359d959a106fb98c8a719cb79d5d252c00112121058c76a834d9188e84b8bc013d2a932fd0ff708934ea7c1118 SHA512 02127a3b197565dd3523d0d76fa79100e73eedbcd58c5865cc3af81631ea4bf98521b92d82aca057876ece6d9384f79ee0a703a81df998a917979c5fdb991b58
+EBUILD ebuild-mode-1.77.ebuild 1008 BLAKE2B d2f50d167d586e3a31ac11a8a5d7d02b2b7c22e96118205faad32b52e5487dfc3ee9fd13efd4aeaf37390d7db5f120c5fa0c7684866f1d833e516393ac179511 SHA512 d024c499e80902c435f07422b9762f27c6f27f95abb9309e65468fe6d26edc62864089577d2ad338fdd6d5f8ea3dd038cff39dd3723e65d6a13d0260ca8e1957
 MISC metadata.xml 483 BLAKE2B 203c30fd4195b63532c0462427658547b0805fb23b57c9a04c554eba8ef0a9b9bc7e3100a51c3cb7feb11d1dcb9472357e5e53640e9a94658e35594cd3369f56 SHA512 78804ced19849c5d88cf942117714db3302cb2187e93ab3924b5526d0c6aa973dbda2cdb5a67c9e0639d5ac3278ea8da9df1e20c2b3cb96231f3fee5fc6845fb
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.77.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.77.ebuild
new file mode 100644
index 000000000000..8ab41edb1ee4
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.77.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp optfeature
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.72.el"
+
+pkg_postinst() {
+	elisp_pkg_postinst
+	optfeature "ebuild commands support" sys-apps/portage
+	optfeature "additional development tools" dev-util/pkgdev
+	optfeature "ebuild QA utilities" dev-util/pkgcheck
+	optfeature "decode ANSI colors in build.log" app-emacs/tty-format
+	optfeature "XML syntax validation" app-emacs/nxml-gentoo-schemas
+	optfeature "generating HTML from GLEPs" dev-python/docutils-glep
+}