gentoo auto-resync : 09:01:2024 - 01:01:10

4 files changed, 68 insertions, 35 deletions

diff --git a/app-emacs/fsharp-mode/Manifest b/app-emacs/fsharp-mode/Manifest
index 8c8ea9f40968..1b349d192c90 100644
--- a/app-emacs/fsharp-mode/Manifest
+++ b/app-emacs/fsharp-mode/Manifest
@@ -1,6 +1,7 @@
 AUX 50fsharp-mode-gentoo.el 184 BLAKE2B 381798f016470b06d444b3187161b33aee39cc9512e53b26d925299818dd91a3bea0accef5cc8390e40216cd6db9c1db56399a3f6afe8810f49c62987e718af7 SHA512 d199454deaefaff33e55b7e3af0230de753b9700458366452372ed958bbefeca506f5ce670551e0906905291c6e6a02a5b5169c84dc48dcb459bbdc1d33e24e2
-DIST fsharp-mode-1.10_p20211229.tar.gz 78916 BLAKE2B 4cd9182c62ea0d5c7a23f2120586d4c74d16fad14762ecdb3f11a11d6c78c757b363d5c14473c10c47086c1c0e648911846fe039dfedc04fd1d84301b4aa10c5 SHA512 b02be4c8e56a2c22b7f6e6a302756278d9056e7d8b8c206c183aea5470b98610b73a3403c83e93da295d3b4d0092a4f2f1c0bdf78f701009478a3c8b1e054ab7
 DIST fsharp-mode-2.0.tar.gz 80880 BLAKE2B e8de665216ac9e147d63d168abc9aebf3cf2ca6a5a6ea9f8afe45c3329d692fa0342a1c3afb982dcdb1b59e1f348e1a307e0ce6a09f708c782b32595bc74106f SHA512 bcb95995604404c42147b636d101dfcaba61945b7ef30196a0e41c138bfd0901c744ca73e36438bae14c1727030f05fc4fcc07aef06f25d46394777ff58537db
-EBUILD fsharp-mode-1.10_p20211229.ebuild 767 BLAKE2B 43dbdcace489e60f865f3983cea97057139522a18637e986ca02659f37ff10a456e9e930b30f5e75e1dacee55baf54cb0ad38c39ce80b630335124356fb48211 SHA512 9b5ba4ac986bc52f3adbbfb41040412fe93ccc2e72dc9161ac070c9faee5ff64b75e013a4c7e3e7e7fa3e5766152c5a1180532e2443f09094f71d9d3020a1617
+DIST fsharp-mode-2.0_p20230622.tar.gz 82036 BLAKE2B 0a23200925a475ca4a046bd4ece13fd994bead0d021a5e0dff6d0494637b52f6113d8d1cb22d4e9505ae13a0033c48f205dea8690b9793ea5f9d6b0dc62419c2 SHA512 2385039129d09b3e037168e488f7e7867d862ba52ccfcf4f4713d648e516ca14a25aa7a879cd3adcc09d91c571a374c4573d3b3f50bba0cf800e48e953266e07
 EBUILD fsharp-mode-2.0.ebuild 560 BLAKE2B e089fd3cde31e0358ba8975ac574755ded9d5e686ba834f7aebecb4bc14e7fb0f7fdb3265dd86952f9c1fc7b2585087c7dab26be100520205b760333c0faf546 SHA512 0f8269f009138ccd3bfc89bd488a3f473dad3e9f9a4a3f4073398afde6e81e2078ae7e614799407c9c002f440dc293a504083a6e169ff979c4ce266757552f91
+EBUILD fsharp-mode-2.0_p20230622.ebuild 828 BLAKE2B d5ca95f1d43d2a08bed58e7358213a60ad6d76eca97457fd07c615556ff9ff8b9a453f774b9aab8c7a09cb424ac0bafc032efa3ebac5aa1ec3795830a024053c SHA512 7cfa4444dd6ffaa8c3741e157f2325c03bdd12609f98872b1a95a48e391397a191012bef54eba1464e7cb1f0e60d9ea6f03f93b736f1924dfec8a49088fab212
+EBUILD fsharp-mode-9999.ebuild 765 BLAKE2B 3fed5a3c9eff578619548250d1609ca46c8e4a5e8ed314b1da7196d0c4322e2bb1556fde3217670ee041abf5636835828b676b5428ccb1ede73754d13ce8f8ef SHA512 acbc6534bd06a94768ae23f69a861684322d9808323816ab3b299e5de8a2d738d1a03438eb4e62df50082918a5d2347d9b1ced7de46eef08a880db39be37d6a2
 MISC metadata.xml 533 BLAKE2B d0fff1e8fff09a4d096a94bc372a479a44cbb67c9aa7118ed3080690b136bd446d273b9f00a99536691f3b6bce23e46ede67d505a017b0212e459dd74300ac01 SHA512 a99fa4d18c561c0c8eb4c81a96c4cd477d2f15d8d50f4f5cb951fcafcd77e134977105c186f8ffbe7bd00db126fc218d6a006b7fdc2d29400bb0c6c05dd81b8a
diff --git a/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild b/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
deleted file mode 100644
index 785b9bec28c1..000000000000
--- a/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT=b3aa4c53fc9e98648b25ad036e657632ae2fe192
-
-inherit elisp
-
-DESCRIPTION="Support for the F# programming language"
-HOMEPAGE="https://github.com/fsharp/emacs-fsharp-mode/"
-SRC_URI="https://github.com/fsharp/emacs-${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${PN}-${COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-emacs/s"
-BDEPEND="
-	${RDEPEND}
-	test? ( app-emacs/buttercup )
-"
-
-DOCS=( CHANGELOG.md README.org )
-ELISP_REMOVE="eglot-fsharp.el test/integration-tests.el"
-SITEFILE="50${PN}-gentoo.el"
-
-src_test() {
-	buttercup -L . -L test --traceback full || die
-}
diff --git a/app-emacs/fsharp-mode/fsharp-mode-2.0_p20230622.ebuild b/app-emacs/fsharp-mode/fsharp-mode-2.0_p20230622.ebuild
new file mode 100644
index 000000000000..f01f85ed5720
--- /dev/null
+++ b/app-emacs/fsharp-mode/fsharp-mode-2.0_p20230622.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=b4d31c3da018cfbb3d1f9e6fd416d8777f0835bd
+NEED_EMACS=29.1    # To compile full suite including Eglot, introduced in 29.1.
+
+inherit elisp
+
+DESCRIPTION="Support for the F# programming language"
+HOMEPAGE="https://github.com/fsharp/emacs-fsharp-mode/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fsharp/emacs-${PN}.git"
+else
+	SRC_URI="https://github.com/fsharp/emacs-${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/emacs-${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DOCS=( CHANGELOG.md README.org )
+ELISP_REMOVE="test/fsi-tests.el test/integration-tests.el"
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests buttercup test
diff --git a/app-emacs/fsharp-mode/fsharp-mode-9999.ebuild b/app-emacs/fsharp-mode/fsharp-mode-9999.ebuild
new file mode 100644
index 000000000000..77bff9ac449b
--- /dev/null
+++ b/app-emacs/fsharp-mode/fsharp-mode-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=29.1    # To compile full suite including Eglot, introduced in 29.1.
+
+inherit elisp
+
+DESCRIPTION="Support for the F# programming language"
+HOMEPAGE="https://github.com/fsharp/emacs-fsharp-mode/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fsharp/emacs-${PN}.git"
+else
+	SRC_URI="https://github.com/fsharp/emacs-${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/emacs-${P}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DOCS=( CHANGELOG.md README.org )
+ELISP_REMOVE="test/fsi-tests.el test/integration-tests.el"
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests buttercup test