gentoo resync : 12.05.2022

3 files changed, 60 insertions, 40 deletions

diff --git a/app-emacs/lsp-mode/Manifest b/app-emacs/lsp-mode/Manifest
index d4637db414a9..66b31e5e44e3 100644
--- a/app-emacs/lsp-mode/Manifest
+++ b/app-emacs/lsp-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50lsp-mode-gentoo.el 2081 BLAKE2B ac9eee2a41fa09e1ee72cabef2380b6095f469f1c668833b4d6d59964796a974457e2f85f4cdb7b66ea652ad23a6806326f9a43c20b4d1592fc1f19eb33a3773 SHA512 632fb2b9d0af9735c16fffbe6d0aca7ba0a494edd001ea289f17836e9ddd34d9ea60cf22035194e1837505cc214370be31e0dff0637a59361eeb6a4f2d12e816
 DIST lsp-mode-8.0.0.tar.gz 14703640 BLAKE2B ab7993772cfc127ee94ba4a0af75e8d7f6789ac22c76acce8df250b5579c1dd2f41e353b26cbdcf6e1a2e6a8d1f8a179d4736b67914cdec31c23032f93dffd3c SHA512 2620288142cea7b06ad2725b63e5db945b1d62d0b4c215e8d35d79d6c3f05bcdf2736dab34bd10c2b9f8928caf36ef617182c41c309e62e2ce8ddf45df376cbc
-EBUILD lsp-mode-8.0.0.ebuild 770 BLAKE2B a71c666d6657bbf9660564be35f1214f2bdc27e300809452e021e2e759456092b1e50f7ffc53432243de45eedfdea23b1c3b464b5b96213fdf2c5cc99c6394cb SHA512 0bf24d7d6a8077b40bf2197cb684a262407140539187b126c84f99e27855c9d5f06c662ee871e3f9dddeb5cd265bb61e9cf9eea02a36f773f3ff61c304e80246
+EBUILD lsp-mode-8.0.0-r1.ebuild 1205 BLAKE2B 26abed125c70a373a1ac0cc9672af1e174dfd179ab2a5a4c47bb50f41a7d68a5606302e24e2cfb45360f436e65d3299e92af50aafd0ac47c89563ddcc5c3b107 SHA512 85958cca001fca56f0416d75dfab2d9b0e7a621c0f6864cf25770e25abe780256e43c16f4b7b6a88e3a58b2d0a6a04124f8f78d9ec641fa8b8181733424cf0a9
 MISC metadata.xml 364 BLAKE2B d28d1feb1f2948839ed9759bd1d7f22285218f301e2862e50b6a58aad591f81d8d94ff8bf2fce8c399c04839467e89b82c2487b2ff09a129f4636d81555db4f8 SHA512 1b9aff2f7852a2af981b93c1e2ca1a0df378e52d0a0817a7fe4a00e5c74721389979df9367a6e93c3a62ac02adb118fbdfff84272f9f902c5883d0759a422d4c
diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..ec668118c0b9
--- /dev/null
+++ b/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild
@@ -0,0 +1,59 @@
+# 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="Emacs client/library for the Language Server Protocol"
+HOMEPAGE="https://emacs-lsp.github.io/lsp-mode/"
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-emacs/dash-2.18.0
+	>=app-emacs/f-0.20.0
+	app-emacs/ht
+	app-emacs/lv
+	app-emacs/markdown-mode
+	app-emacs/spinner
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/deferred
+		app-emacs/ecukes
+		app-emacs/el-mock
+		app-emacs/ert-runner
+		app-emacs/espuds
+		app-emacs/flycheck
+		app-emacs/undercover
+	)
+"
+
+DOCS=( AUTHORS CHANGELOG.org README.md refcard )
+BYTECOMPFLAGS="-L . -L clients"
+ELISP_REMOVE="test/lsp-clangd-test.el test/lsp-common-test.el
+	test/lsp-integration-test.el"  # Remove failing tests
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-compile clients/*.el
+}
+
+src_test() {
+	ert-runner -L clients --reporter ert+duration -t "!no-win" -t "!org" || die
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/clients clients/*
+}
diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild
deleted file mode 100644
index 610948576522..000000000000
--- a/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=26.1
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="Emacs client/library for the Language Server Protocol"
-HOMEPAGE="https://emacs-lsp.github.io/lsp-mode/"
-SRC_URI="https://github.com/emacs-lsp/lsp-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-DOCS="CHANGELOG.org README.md"
-
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
-	>=app-emacs/dash-2.18.0
-	>=app-emacs/f-0.20.0
-	>=app-emacs/ht-2.3
-	app-emacs/lv
-	>=app-emacs/markdown-mode-2.3
-	>=app-emacs/spinner-1.7.3
-"
-DEPEND=${RDEPEND}
-
-# Requires unpackaged dependencies, e.g. Cask
-RESTRICT="test"
-
-src_install() {
-	elisp_src_install
-
-	elisp-install ${PN}/clients clients/*
-}