gentoo auto-resync : 24:06:2023 - 01:25:35

4 files changed, 12 insertions, 47 deletions

diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index 713e0eb560a7..d6cddfd0f1cc 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -1,8 +1,4 @@
 AUX 50csharp-mode-gentoo.el 171 BLAKE2B 6fa14f46d3ea4fba310ad4cb59a037ed5a4f123cc5b9243db715e08d3301bad7f24abb4cf1aa3ec178ad9c8e859d5225f49a3c8b87a302ac50c7a30eb56a34a1 SHA512 e0c9a5dc17c849ce9619a75ee46a0eb7415c0c04cb71cef326845ec9fdd79f57abf397590ba85bb0b901103ba0815cd6c873e9e12670cfb97d796b1f2cef087a
-DIST csharp-mode-0.9.2.tar.gz 52389 BLAKE2B 897d8bf3b9e0963647071628af874a77f7181592fe21f2094082c807cb33d26e43825f36cefcd100ad46dea67d217f99ec89e5f3e2c94a639553d7334ff39bc8 SHA512 da4e0aff63600c01d1571fea19d7892af1c3bd5366b97a1d9321853db7d52f04431f0c7c16371a0ef0f8296ccbf2baf0890ceb67e48a9159faf6fd6d10cb49ab
-DIST csharp-mode-1.1.1.tar.gz 36326 BLAKE2B b76c926eb32b0ac1e72bd3c789d6d8ccda9fb234bc7148f6fef402ad4c58bb378792d8cd2c005ca0222e17a0c71ab08bf8a18869611534aa4e1f4511fa21e310 SHA512 5cce24cf5810332b127caa750e4efa64bf80fefc8ebcf4fc11ffa7f3329ef49390818305238f069c657eec7bdab9694e9bd765cfeb999d7df283053cb265cd55
 DIST csharp-mode-2.0.0.tar.gz 36697 BLAKE2B f4ed14de59e89e09a6da68e6e46ca5acde69eafaa9d6aefdf15d609d828f972ab45769368bc6fe620965d3fa1132e46965080e6538d235cbd9b64e7044b017e9 SHA512 d55c832905af3ce112bdf3b896f056a963c7f13035d474b314599179c448b76b79d9633e493824cda948554ca6d33a6e426b61a7a9230de6523d2427ad72a1d4
-EBUILD csharp-mode-0.9.2.ebuild 540 BLAKE2B 1ce353c24d36286c139e7681a633e7bfc705cf992d8d393d29d053a130edbd78700e080515fda3a75c29ba9bcaaa44020e89d99df068af8d387c16e36a5e0a7b SHA512 b662d976dee79d73534c083fab34b9aa98a737c4c5390d051e9ed9d52225a6c6968475cacbd25e3c42a2268d5ecd282f5b304ad86bbab8a11b1f57bc97ab8007
-EBUILD csharp-mode-1.1.1-r1.ebuild 598 BLAKE2B 8a4dbef1d47a183f7b4173a8f940398241701cd1d17537d149325572a491f5479bef8324b1b8851d3be86e3e0b62eb075032530fd167d82e9442805f9abad4b6 SHA512 3cffd7ab93489dd81bf0f256d01f7b50267b23271c4faddb18ba140aa0528acf79f2621d268b821031c2a6441a8812eac254caa07dad4cd77ab2973efa6c0d46
-EBUILD csharp-mode-2.0.0.ebuild 598 BLAKE2B 356a8992c1981a5dfb2a5b3c43a170fee34f6d90fbf67985be4f31a055245cfc8b811705746f3ca27075a38f9323d0718c4b2de1b182550ec3e7c2a7f76807ed SHA512 360ea55b5d44b1983c57b95232167d70e70a2c7d267451fc0dc904e2d66da39ac3b23bd87270620c277f19c815c23dbbb885c47f1d989e9a51776fa5c4a52d97
+EBUILD csharp-mode-2.0.0.ebuild 820 BLAKE2B 28a725a57ec043297af45fee5129d4289e29a0b283bba9744a8c45df503b2821721cb695959db73960998f32fbbd7130da8df989a4236d7f0a99c5cf2695d897 SHA512 c44e23d99e9733ddb4eaf995e571da441cce87c2865a0d074e4957a63b7023978164383c15c4ef87adc608eaabfb8ab78bd722c13ed378bcf57d2b6cf308c93b
 MISC metadata.xml 366 BLAKE2B 14fde660cfcda8c045193020c0fa1c1b6f82de229ba2eba1aaa34ca82d1c93abe1f97290d87661c91dbee58f3c7f4d2848fda28bcfa113dd4cc5b92ca68e825c SHA512 060790025d1f855035b0adbf7156619fb8b60bb0f9b977057f21ee37e7c25272569dc46d4622a1302c037deeaa1cd774e14fa8e4d52fd3bb3370bc1ab2907396
diff --git a/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild b/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
deleted file mode 100644
index 3429cd891bdf..000000000000
--- a/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
-HOMEPAGE="https://github.com/josteink/csharp-mode"
-SRC_URI="https://github.com/josteink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp-install ${PN} csharp-mode.el{,c}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc README.org
-}
diff --git a/app-emacs/csharp-mode/csharp-mode-1.1.1-r1.ebuild b/app-emacs/csharp-mode/csharp-mode-1.1.1-r1.ebuild
deleted file mode 100644
index 231ed5a13097..000000000000
--- a/app-emacs/csharp-mode/csharp-mode-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
-HOMEPAGE="https://github.com/emacs-csharp/csharp-mode"
-SRC_URI="https://github.com/emacs-csharp/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-RESTRICT="test" # tries to install an old version of dash from the network
-
-DOCS=( README.org )
-ELISP_REMOVE="csharp-mode-tests.el"  # useless since we can not run tests
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/csharp-mode/csharp-mode-2.0.0.ebuild b/app-emacs/csharp-mode/csharp-mode-2.0.0.ebuild
index 38b6550b6d21..047ba7f86bb7 100644
--- a/app-emacs/csharp-mode/csharp-mode-2.0.0.ebuild
+++ b/app-emacs/csharp-mode/csharp-mode-2.0.0.ebuild
@@ -7,7 +7,8 @@ inherit elisp
 
 DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
 HOMEPAGE="https://github.com/emacs-csharp/csharp-mode"
-SRC_URI="https://github.com/emacs-csharp/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/emacs-csharp/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -17,3 +18,12 @@ RESTRICT="test" # tries to install an old version of dash from the network
 DOCS=( README.org )
 ELISP_REMOVE="csharp-mode-tests.el"  # useless since we can not run tests
 SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	elisp_pkg_setup
+
+	if ver_test "$(elisp-emacs-version)" -ge 29 ; then
+		ewarn "csharp-mode is included in GNU Emacs >=29,"
+		ewarn "Emacs developers recommend that you use the provided mode instead."
+	fi
+}