10 files changed, 104 insertions, 35 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index dc8a14359a34..376c2171f31f 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/eglot/Manifest b/app-emacs/eglot/Manifest
index 624264841ad4..690974627342 100644
--- a/app-emacs/eglot/Manifest
+++ b/app-emacs/eglot/Manifest
@@ -1,8 +1,8 @@
 AUX 50eglot-gentoo.el 82 BLAKE2B d5c0e215ceef684ac390a835633aca107f4ea95a83544779724c4fcf9a73963ba87d956aece3406d82bb02f82a5f9b909632d52e3b8fe361d26921f88d0f4e67 SHA512 9039a33b75c7101b04e367432f217700354fd2293914a295adfe3abd4ae1b8626205155fe8c0d809acf5d02b56af3feca22e837e926cba96d872fea4b3354a5d
 DIST eglot-1.11.tar.xz 36900 BLAKE2B 20496e37944127c0e209762d2455fad01e6578fd1fa8350cc1a6782ed3e5dc11b09f8b737cd97d5439ab7ef67caa5cdf725d53d2e9e91bbca10223106a9073ad SHA512 c258c89d8c81b1c1df8ea9798c120a7534c174ce435a4551f503c7477520619ac08bd627372033ed1740dfc67bf7e8004751259769844d6be9adc9411d8ae5ac
 DIST eglot-1.13.tar.gz 303750 BLAKE2B ecd2efe5fcf2d0d8229336f01ced60f882cfb3e4a0a8af6bcd9f5da0e5cdc6d247634960de50fe46cd4fdac32ea83cd3b506fd025f109c684cb468a60969cbc4 SHA512 43e659213e8f2cedd0ecbd0a2bb1b475de37083577845574adb8bb61d20d0c72b8fc291689e1654c00156f8b2c03d29fc327f7adbac0eb0c5f88d851583f28b8
-DIST eglot-1.9.tar.gz 316541 BLAKE2B 5b9f188ae3f2b26fd7bb95aeb3095fbf5a78f6a15eeccaceaf947f5f91e78253622d2c81d5e57f11762c0370baf9d6c856a4f770c2652840d750f98ee780b418 SHA512 961399e0877a09bd292424715c3fac86e7750e144ba302e61262925b6ded1d30c6ebf3e63067b27b56fa2062461a947425951ac5538e25312d179fa20bd68b79
+DIST eglot-1.15.tar.gz 305200 BLAKE2B e9bb3f10dc9aac803f9b1184f489d76bd217b279d398c67a403c887298ec3e73e30a359a7e31af9c298b8778a2cdf916e9f40495ab3d01216a12fb38aed4d83b SHA512 871d56404c08baa490488d6027645f7ba0252faee7d006ade4e29890abb2e70a3f1715114c852721db7991bdece29266d920bbef6da0eb2ea2f37b842f411ac2
 EBUILD eglot-1.11.ebuild 581 BLAKE2B 9ca1ee6b890de466cfcc4fcef75117e3845de756ca5d6c9c24551f9383ea39cab090e7ff74ad44898319d4faf9a0db77c760bf19ccf2553f64ae4d05b0b01d83 SHA512 7b65c4ef0771f65277797a8fa91e74ed14244d734db8bf8d6fad6e790decc98f716c98271dc12805120290c47bd8c644c84af21bdb9ac57f6d5a2a76ab1ce496
 EBUILD eglot-1.13.ebuild 970 BLAKE2B 3715b4012f0febd3c9e9e8e61f64e4669604499a7e9c474cc6d5fb988d1d5022073a05abbc4407208d4da9bc5d8ff126d174bafa95dbc7df7e5893fbe89932f6 SHA512 0ba5bfc55193a3835162b39f61e839543e79c29a23148dc3956974a800c959ce9d68952fc9df12488d0ce4c218d6ba82920969db265ae421e36ac0f22db0b87e
-EBUILD eglot-1.9.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
+EBUILD eglot-1.15.ebuild 880 BLAKE2B f70fc53eb2c5d8dd66ba0930896c5fc4fb7bfdd76d6cbdfa9665f071819c11d4f882e9912be2acaebd607a645327ea0a9ee2d18917d8d9e12adb46b823735964 SHA512 a16e60a6d9cee85b4735f0f512ff79da97d6ae59ba03951ca1d5679cd3655dd6d53d311310d9c916406b5713ef041d460a49a3da095f1f20cb99be947151534c
 MISC metadata.xml 701 BLAKE2B 436bc9f2720fad7cc3a7bcf9597a820317617ad7522e72c05417d6b9e1cb9c37d171ce5e24741b5730ab6708a0bcafacc8f41df3d4108926868887dc6ee25df3 SHA512 457dec4f625c37429917085c187e7c21ad1155217f79980033a7c0ecf62da941d340433ccbcbd5ae36a028aed7ab0cd1204e74985e36844e31829dab288c4fa8
diff --git a/app-emacs/eglot/eglot-1.15.ebuild b/app-emacs/eglot/eglot-1.15.ebuild
new file mode 100644
index 000000000000..9ffaace3d84d
--- /dev/null
+++ b/app-emacs/eglot/eglot-1.15.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.3
+
+inherit elisp
+
+DESCRIPTION="A minimal Emacs LSP client for GNU Emacs"
+HOMEPAGE="https://github.com/joaotavora/eglot/
+	https://elpa.gnu.org/packages/eglot.html"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/joaotavora/${PN}.git"
+elif [[ ${PV} == 1.15 ]] ; then
+	COMMIT=8b5532dd32b25276c1857508030b207f765ef9b6
+	SRC_URI="https://github.com/joaotavora/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT}
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test"  # Requires the newest "project" package.
+
+RDEPEND="app-emacs/external-completion"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp-make-autoload-file
+	elisp_src_install
+}
diff --git a/app-emacs/eglot/eglot-1.9.ebuild b/app-emacs/eglot/eglot-1.9.ebuild
deleted file mode 100644
index b5463a817ab2..000000000000
--- a/app-emacs/eglot/eglot-1.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="26.1"
-
-inherit elisp
-
-DESCRIPTION="A minimal Emacs LSP client"
-HOMEPAGE="https://github.com/joaotavora/eglot"
-SRC_URI="https://github.com/joaotavora/eglot/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-# test requires internet connection to install several language servers, one of which
-# is not packaged
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_REMOVE="eglot-tests.el"
-DOCS=( README.md NEWS.md )
-
-src_install() {
-	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
-	elisp_src_install
-}
diff --git a/app-emacs/elfeed-protocol/Manifest b/app-emacs/elfeed-protocol/Manifest
new file mode 100644
index 000000000000..fe1fea41ae69
--- /dev/null
+++ b/app-emacs/elfeed-protocol/Manifest
@@ -0,0 +1,4 @@
+AUX 50elfeed-protocol-gentoo.el 250 BLAKE2B c979151b26ed4f18dd202fbbae107dd0eb3a8fff3f55daa480351b6982a215cee8102b953413cf06bb2836ac5d97068ebd5190805ebba26ba5d6b01b425698bb SHA512 c7771e89a3dda4da04b91f7c9ce52043f53df6a95b98071b87c6680665cf6ecd1b09a5872135c4229c15d83814d284771ad93c7349a11d5ba002dcb5c74293d7
+DIST elfeed-protocol-0.8.1.tar.gz 48250 BLAKE2B 9a6491c29b1fe64bc7ced8e94548552b85b501279e60173bca0a8a11e5b624a17a51cdb035139620905ecde0c7c4dab0fed7a00f869af823123ca69c12dcfdc6 SHA512 846c39766d9312b3612b9d27ebe88e2aac153b2a3cd1683438b696004aaa4cb6d250b876c9669bf63a17a6fc6aaa6a0980550e962b19ab85268d6214ad4a022f
+EBUILD elfeed-protocol-0.8.1.ebuild 635 BLAKE2B 3c1822919592c5157cf13f23b2813dd927eb0bd93c54f2930da1e08ae3d403bd2d4b70b8db2d1456ac105ce8c7e87dcf04b49f4c6a8ca953915d7b914950c63e SHA512 223001c56b52d3addc25379df440b1b22e57a42bff048c4b1a9ea0732db474b740750bbce747060e900ff4295afeeeab4d409402ed32b546e087d7a769b88879
+MISC metadata.xml 647 BLAKE2B 6f4948342bfb58a61f60e7b3d4ffd1dd19042409ff2a5a162ea584058b22667ba1cb894fa88e8e992d0233739bfee64765e83680865b975baacbfe9fc0127ee5 SHA512 849d5863b942be20a5a1c8d562d15ebfeda15ff7b29e14282ed0b8f1859a67cc723061e8ee81dda2ae070e73fa6b1b7d94ebc9d31cd27a9965885fd1d6c7d737
diff --git a/app-emacs/elfeed-protocol/elfeed-protocol-0.8.1.ebuild b/app-emacs/elfeed-protocol/elfeed-protocol-0.8.1.ebuild
new file mode 100644
index 000000000000..1fd5f3db4117
--- /dev/null
+++ b/app-emacs/elfeed-protocol/elfeed-protocol-0.8.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Provide extra news client subscription protocols for elfeed"
+HOMEPAGE="https://github.com/fasheng/elfeed-protocol/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fasheng/${PN}.git"
+else
+	SRC_URI="https://github.com/fasheng/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="app-emacs/elfeed"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert-runner test
diff --git a/app-emacs/elfeed-protocol/files/50elfeed-protocol-gentoo.el b/app-emacs/elfeed-protocol/files/50elfeed-protocol-gentoo.el
new file mode 100644
index 000000000000..788ac23ffeba
--- /dev/null
+++ b/app-emacs/elfeed-protocol/files/50elfeed-protocol-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elfeed-protocol-disable "elfeed-protocol"
+  "Disable hooks and advices for elfeed-protocol." t)
+(autoload 'elfeed-protocol-enable "elfeed-protocol"
+  "Enable hooks and advices for elfeed-protocol." t)
diff --git a/app-emacs/elfeed-protocol/metadata.xml b/app-emacs/elfeed-protocol/metadata.xml
new file mode 100644
index 000000000000..7906f06796a4
--- /dev/null
+++ b/app-emacs/elfeed-protocol/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    Provide extra protocols to make self-hosting RSS readers work with elfeed,
+    including Fever, NewsBlur, Nextcloud/ownCloud News, Tiny Tiny RSS and even
+    more.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/fasheng/elfeed-protocol/issues/</bugs-to>
+    <remote-id type="github">fasheng/elfeed-protocol</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/elfeed/Manifest b/app-emacs/elfeed/Manifest
index 361499be48c8..5c25206a3ea8 100644
--- a/app-emacs/elfeed/Manifest
+++ b/app-emacs/elfeed/Manifest
@@ -1,4 +1,4 @@
 AUX 50elfeed-gentoo.el 84 BLAKE2B 53bc34c6763b76071786ff235b7eb2cddef4ee7c6f4705f3f1e55f48d6716b3654fcb17759d15bcfb337e12664c81237bbfd78d62558fe46b57bc905f554e9fc SHA512 ffaad20340726c020e3ef6acf86513b6edc36320eddc70c2cb60d2443a9d7156dba5bd19d67faee3850e15905ff17ef422bbb56642437f68dcb1232c9640b002
 DIST elfeed-3.4.1_p20210822.tar.gz 67360 BLAKE2B 32931bbe54578bb8a0b9fc330d5114e4cc5f5f915f6e6125ad3d8cb5be459e72a097d1afb132ff6a73427efe9ffcce4a7e081a9a45144a5c1ea7fcdfe19ba4d9 SHA512 41bb095b87df3dfb40b6a155881f8703c674ddb9f15b5b2765fd4f893d4e58ddafb2fa0da296995e988a9ba6096e78760c262c9a18ef7624e65b60f2d7bf4140
-EBUILD elfeed-3.4.1_p20210822.ebuild 656 BLAKE2B f54bc51746965fcb8fe37d5118da76a61088b3419b447a46eac43e550a7ae7fc4204c6b6e8219b79e68747829dd050dfb657056371a573ce2c8a36dace089c70 SHA512 980cd1a5545ea2b608ffac2ce0b07a934aa14f9b9c7575930f898ad0daf23559c6f54557b5c41eff74ef2e4565810e86053dce31bb416c11ec06e61919a31c04
+EBUILD elfeed-3.4.1_p20210822.ebuild 671 BLAKE2B ad9d6bb9a68bd5945699121605685e1ed5278c12e452ceb7b903145808aee9ce03a0ab1d05ee9ae7361a18fb2aea257928c9268f5c94114e3d9138cb75ab4f1a SHA512 c9dc9f7b71698207529eefaa83d51d6aaf9ff82936c9dc697ca75d069b58fbd9bd74261c9a7e8d71452c720cac46793f43e3c71df817d51e0b3653551a4e86de
 MISC metadata.xml 683 BLAKE2B 55080a2245baf36818bdb4db06ab52f69ede139fe47329519b51479efd4a1b86d942d39b1d9a128d98caf6c19cda9c995b99928f926c0073ed05605af733bc4d SHA512 b4be6457c7c201d7e732484adaf36ace79dab0ab29c38e3d5b7aadfb4bcb2495ff8dc08cc447e3f104c4ccba9cb6c71cd4174491d57e1d5424ecc93750e00e17
diff --git a/app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild b/app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild
index 4d41447fde72..544ebdef09f5 100644
--- a/app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild
+++ b/app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild
@@ -8,12 +8,14 @@ inherit elisp
 DESCRIPTION="Emacs web feeds client"
 HOMEPAGE="https://github.com/skeeto/elfeed/"
 
-if [[ ${PV} == *_p* ]] ; then
+if [[ ${PV} == *_p20210822 ]] ; then
 	COMMIT=162d7d545ed41c27967d108c04aa31f5a61c8e16
-	SRC_URI="https://github.com/skeeto/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/skeeto/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-${COMMIT}
 else
-	SRC_URI="https://github.com/skeeto/${PN}/releases/download/${PV}/${P}.tar"
+	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
 fi
 
 LICENSE="Unlicense"
@@ -22,6 +24,7 @@ KEYWORDS="amd64 ~x86"
 
 RDEPEND="net-misc/curl[ssl]"
 
-DOCS=( NEWS.md README.md )
 ELISP_REMOVE="${PN}-pkg.el"
+
+DOCS=( NEWS.md README.md )
 SITEFILE="50${PN}-gentoo.el"