gentoo auto-resync : 27:07:2023 - 10:33:45

5 files changed, 50 insertions, 63 deletions

diff --git a/app-emacs/rust-mode/Manifest b/app-emacs/rust-mode/Manifest
index c463211dcf80..1373cb23c253 100644
--- a/app-emacs/rust-mode/Manifest
+++ b/app-emacs/rust-mode/Manifest
@@ -1,8 +1,5 @@
 AUX 50rust-mode-gentoo.el 135 BLAKE2B 083a273140a659c1a76c05178990ffe4b0f3ae2ede81878ce8cfaab451df4a5169cea46fa4600e57ea77a9a7d55571cb7c862098e5ee76677dd73213e6a30036 SHA512 bd6f7579408d26900d40e674ff75bac2d1989c9bd068dae4bd4c54271e7b04cfcdf4d7d3622955f949cb60496a0d055f5f436084975bb624415b46ddb330f0fe
-DIST rust-mode-0.4.0.tar.gz 41774 BLAKE2B c0263f9fa839dcf5ee74706d8d13c10161d024114fda161dbd5235036eb322d273e8624a23f5e848e9246500d1da0c272420cb89f250f8d1852c7552eb7d0939 SHA512 fe0e1d667ba9595f9cbed22e0f88096508e49ffe8e3c86349cb3319eefea38a1dd86c2b55aef1415ae0cfc3b65ac6807f1863eb0e6eaa9ff49aea989a46e5edc
-DIST rust-mode-1.0.4.tar.gz 52123 BLAKE2B 3b7535d8906da6a477b029991c21520114c516a194f5f627ad544953f5f04c380e9481858e8045db4d96ef42f620c23d4b6002c76464216908c4ecf94c9de650 SHA512 8318c96280760a66841a4549407cb749cf0da15979d92e41d0c4f9ddd9d6a4d4fd22a4292b22fc69107ea6afa729f4c7516a10ceee044211829435078bd2814c
+AUX rust-mode-1.0.5-tests.patch 1148 BLAKE2B b6f1761b50a85adcce46f86c963c7eeb1df4d3432b4a9bdde74da6ee0aaa2f6b279a49256a62911fad03622f88e41e904bc2f9bd8931cf0ca2d8a52309d20268 SHA512 0073b2613a4a8008b242d9e4be4c5ee12f94775079aae963005998ab6fa24602f651f127a196a1d104e2a1918b78286da9e12ac08bf3f4849afa1d4be90d8bb9
 DIST rust-mode-1.0.5.tar.gz 52665 BLAKE2B 3b61372223637b7950ec7a15a80abd3b74972ecda0677f730f3ebc8e574b50985a7427b4531766b1dfd20225f7b718497aa4437dadfa041c5a9cde9413d3cb5c SHA512 7b76384adf7281866fbef0ab507098084a96fe562d1dbd5dd99e03fda2a91c23392c8667c21aa5800b188cd09f5349a7394b0a7215826b9bc668cc36ac902999
-EBUILD rust-mode-0.4.0.ebuild 700 BLAKE2B 7ada88a57d8e33cf17a7163e70662631a7f01aeeb816e0c02e5a98402816e9d835698973bcd530c5e2d054055953c3b49773b03c963c25af6c36916ab3c5bbb2 SHA512 221ab80f64051ff1a14ed4fe4cf9dda68252213083638bc6c35f5cb2e53e9a176dfe00bae69c3d6491bcf7e539de1b736139879c9d55534587d16895bd161c91
-EBUILD rust-mode-1.0.4.ebuild 592 BLAKE2B a308ea8e3011902558250c39b0a56eb11e5f679ab622bfb43113f44f51a62ed3ee55b93a6164a26e0a4070287e9b4b0ff57069723cc7fc4214f877b03b06c39b SHA512 98859e988c8f90f25f445df860d9e22c78462b60891074841ca651b9b7738bf7278ff13a194c324ef59e1604c50608af234ffb6968dd9333f1f421ef22e5c5df
-EBUILD rust-mode-1.0.5.ebuild 592 BLAKE2B a308ea8e3011902558250c39b0a56eb11e5f679ab622bfb43113f44f51a62ed3ee55b93a6164a26e0a4070287e9b4b0ff57069723cc7fc4214f877b03b06c39b SHA512 98859e988c8f90f25f445df860d9e22c78462b60891074841ca651b9b7738bf7278ff13a194c324ef59e1604c50608af234ffb6968dd9333f1f421ef22e5c5df
+EBUILD rust-mode-1.0.5.ebuild 645 BLAKE2B 3089475b1bebdc9c0451927a6a0cf9b29d7d29cb43e66cd6f5d4cd75f57322010d7f1d208aa599166a48362b889bd7026ea5ec4640b5f4ded7f07bf005335b41 SHA512 9a7d6bc9ad5d6bebd24d52ce68fbc1989d7d1c093b5bf1f9e46e0361b121a18f9b242797b1c931613aa639e5dbaf95e9dd4ddeae41560cc6f901fea494c757b4
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/rust-mode/files/rust-mode-1.0.5-tests.patch b/app-emacs/rust-mode/files/rust-mode-1.0.5-tests.patch
new file mode 100644
index 000000000000..a7cbe494438e
--- /dev/null
+++ b/app-emacs/rust-mode/files/rust-mode-1.0.5-tests.patch
@@ -0,0 +1,36 @@
+From 8e85850cdba5cbe265d974e63b84b54a9bc9133e Mon Sep 17 00:00:00 2001
+From: Philipp Stephani <phst@google.com>
+Date: Wed, 26 Apr 2023 10:27:30 +0200
+Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20duplicate=20test=20name.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Emacs 29 will signal an error in this case in batch mode, and in any case the
+first test in the duplicate series will never run.
+---
+ rust-mode-tests.el | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rust-mode-tests.el b/rust-mode-tests.el
+index c1d0501..3b23046 100644
+--- a/rust-mode-tests.el
++++ b/rust-mode-tests.el
+@@ -2797,7 +2797,7 @@ fn foo<T:Fn() -> X<Y>>() -> Z {
+      )
+    ))
+ 
+-(ert-deftest rust-test-paren-matching-lt-ops-in-fn-params ()
++(ert-deftest rust-test-paren-matching-lt-ops-in-fn-params-1 ()
+   (rust-test-matching-parens
+    "
+ fn foo(x:i32) {
+@@ -2809,7 +2809,7 @@ fn foo(x:i32) {
+      )
+    ))
+ 
+-(ert-deftest rust-test-paren-matching-lt-ops-in-fn-params ()
++(ert-deftest rust-test-paren-matching-lt-ops-in-fn-params-2 ()
+   (rust-test-matching-parens
+    "
+ fn foo(x:i32) -> bool {
diff --git a/app-emacs/rust-mode/rust-mode-0.4.0.ebuild b/app-emacs/rust-mode/rust-mode-0.4.0.ebuild
deleted file mode 100644
index 882034501e6a..000000000000
--- a/app-emacs/rust-mode/rust-mode-0.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="A major emacs mode for editing Rust source code"
-HOMEPAGE="https://github.com/rust-lang/rust-mode"
-SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
-
-src_test() {
-	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
-		-l rust-mode.el -l rust-mode-tests.el \
-		-f ert-run-tests-batch-and-exit || die "tests failed"
-}
-
-src_install() {
-	elisp-install ${PN} rust-mode.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/rust-mode/rust-mode-1.0.4.ebuild b/app-emacs/rust-mode/rust-mode-1.0.4.ebuild
deleted file mode 100644
index d0c6b3b2bf95..000000000000
--- a/app-emacs/rust-mode/rust-mode-1.0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="A major emacs mode for editing Rust source code"
-HOMEPAGE="https://github.com/rust-lang/rust-mode"
-SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README.md )
-SITEFILE="50${PN}-gentoo.el"
-
-src_test() {
-	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
-		-l rust-mode.el -l rust-mode-tests.el \
-		-f ert-run-tests-batch-and-exit || die "tests failed"
-}
diff --git a/app-emacs/rust-mode/rust-mode-1.0.5.ebuild b/app-emacs/rust-mode/rust-mode-1.0.5.ebuild
index d0c6b3b2bf95..32ca2edbbb59 100644
--- a/app-emacs/rust-mode/rust-mode-1.0.5.ebuild
+++ b/app-emacs/rust-mode/rust-mode-1.0.5.ebuild
@@ -7,17 +7,22 @@ inherit elisp
 
 DESCRIPTION="A major emacs mode for editing Rust source code"
 HOMEPAGE="https://github.com/rust-lang/rust-mode"
-SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
+else
+	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
-		-l rust-mode.el -l rust-mode-tests.el \
-		-f ert-run-tests-batch-and-exit || die "tests failed"
-}
+elisp-enable-tests ert "${S}" -l ${PN}-tests.el