* [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-common/
@ 2024-11-09 6:42 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-11-09 6:42 UTC (permalink / raw
To: gentoo-commits
commit: df36b3660451cc2601b84ea0161919e6c6260c86
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 06:37:47 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 06:37:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df36b366
dev-lang/rust-common: tweak blockers
* Use just :0 to simplify and shorten the blockers.
By doing this, we also cover upgrading from older versions than those
listed too.
* Include dev-lang/rust-bin too.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/rust-common/rust-common-1.81.0.ebuild | 10 ++--------
dev-lang/rust-common/rust-common-1.82.0.ebuild | 10 ++--------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/dev-lang/rust-common/rust-common-1.81.0.ebuild b/dev-lang/rust-common/rust-common-1.81.0.ebuild
index fadef8ec46b5..ae917833b983 100644
--- a/dev-lang/rust-common/rust-common-1.81.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.81.0.ebuild
@@ -30,14 +30,8 @@ KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
IUSE="verify-sig"
RDEPEND="
- !dev-lang/rust:stable/1.71.1
- !dev-lang/rust:stable/1.74.1
- !dev-lang/rust:stable/1.75.0
- !dev-lang/rust:stable/1.77.1
- !dev-lang/rust:stable/1.79.0
- !dev-lang/rust:stable/1.80.1
- !dev-lang/rust:stable/1.81.0
- !dev-lang/rust:stable/1.82.0
+ !dev-lang/rust:stable
+ !dev-lang/rust-bin:stable
"
src_configure() {
diff --git a/dev-lang/rust-common/rust-common-1.82.0.ebuild b/dev-lang/rust-common/rust-common-1.82.0.ebuild
index c1d6b791917f..19197b4537fd 100644
--- a/dev-lang/rust-common/rust-common-1.82.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.82.0.ebuild
@@ -31,14 +31,8 @@ IUSE="verify-sig"
# Legacy non-slotted versions bash completions will collide.
RDEPEND="
- !dev-lang/rust:stable/1.71.1
- !dev-lang/rust:stable/1.74.1
- !dev-lang/rust:stable/1.75.0
- !dev-lang/rust:stable/1.77.1
- !dev-lang/rust:stable/1.79.0
- !dev-lang/rust:stable/1.80.1
- !dev-lang/rust:stable/1.81.0
- !dev-lang/rust:stable/1.82.0
+ !dev-lang/rust:stable
+ !dev-lang/rust-bin:stable
"
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-common/
@ 2024-11-09 7:42 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-11-09 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 2d190c9e5b1db3292ea5d36f77a314eee019f99d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 07:41:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 07:41:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d190c9e
dev-lang/rust-common: avoid unpacking whole archive
Reported by mgorny (and suggested fix is by him): unpack just cargo.bashcomp.sh
from the distfile instead of the whole thing, that way we don't need
chcek-reqs.eclass.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/rust-common/rust-common-1.81.0.ebuild | 5 +++++
dev-lang/rust-common/rust-common-1.82.0.ebuild | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/dev-lang/rust-common/rust-common-1.81.0.ebuild b/dev-lang/rust-common/rust-common-1.81.0.ebuild
index ae917833b983..b977c5aa1b92 100644
--- a/dev-lang/rust-common/rust-common-1.81.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.81.0.ebuild
@@ -34,6 +34,11 @@ RDEPEND="
!dev-lang/rust-bin:stable
"
+src_unpack() {
+ # Avoid unpacking the whole tarball which would need check-reqs
+ tar -xf "${DISTDIR}"/${SRC} ${SRC%%.tar.xz}/src/tools/cargo/src/etc/cargo.bashcomp.sh || die
+}
+
src_configure() {
:
}
diff --git a/dev-lang/rust-common/rust-common-1.82.0.ebuild b/dev-lang/rust-common/rust-common-1.82.0.ebuild
index 19197b4537fd..0d4b5aa7b8ae 100644
--- a/dev-lang/rust-common/rust-common-1.82.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.82.0.ebuild
@@ -35,6 +35,11 @@ RDEPEND="
!dev-lang/rust-bin:stable
"
+src_unpack() {
+ # Avoid unpacking the whole tarball which would need check-reqs
+ tar -xf "${DISTDIR}"/${SRC} ${SRC%%.tar.xz}/src/tools/cargo/src/etc/cargo.bashcomp.sh || die
+}
+
src_configure() {
:
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-common/
@ 2024-11-10 13:03 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-11-10 13:03 UTC (permalink / raw
To: gentoo-commits
commit: d859c906462b56fab05deb6170d4ed639d41549c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 13:01:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 13:02:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d859c906
dev-lang/rust-common: wire up USE=verify-sig
The USE was there but it wasn't doing anything. Note that we don't
use verify-sig_src_unpack to avoid unpacking everything, see also
2d190c9e5b1db3292ea5d36f77a314eee019f99d.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/rust-common/rust-common-1.81.0.ebuild | 12 +++++++++---
dev-lang/rust-common/rust-common-1.82.0.ebuild | 11 ++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/dev-lang/rust-common/rust-common-1.81.0.ebuild b/dev-lang/rust-common/rust-common-1.81.0.ebuild
index b977c5aa1b92..83fbbf485e6c 100644
--- a/dev-lang/rust-common/rust-common-1.81.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.81.0.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-inherit bash-completion-r1
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc
+inherit bash-completion-r1 verify-sig
DESCRIPTION="Common files shared between multiple slots of Rust"
HOMEPAGE="https://www.rust-lang.org/"
@@ -25,16 +26,21 @@ SRC_URI="
S="${WORKDIR}/${MY_P}-src"
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
-SLOT=0
+SLOT="0"
KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="verify-sig"
+# Legacy non-slotted versions bash completions will collide.
RDEPEND="
!dev-lang/rust:stable
!dev-lang/rust-bin:stable
"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-rust )"
src_unpack() {
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${SRC} "${DISTDIR}"/${SRC}.asc
+ fi
+
# Avoid unpacking the whole tarball which would need check-reqs
tar -xf "${DISTDIR}"/${SRC} ${SRC%%.tar.xz}/src/tools/cargo/src/etc/cargo.bashcomp.sh || die
}
diff --git a/dev-lang/rust-common/rust-common-1.82.0.ebuild b/dev-lang/rust-common/rust-common-1.82.0.ebuild
index 0d4b5aa7b8ae..285a9a5b8e5f 100644
--- a/dev-lang/rust-common/rust-common-1.82.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.82.0.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-inherit bash-completion-r1
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc
+inherit bash-completion-r1 verify-sig
DESCRIPTION="Common files shared between multiple slots of Rust"
HOMEPAGE="https://www.rust-lang.org/"
@@ -25,17 +26,21 @@ SRC_URI="
S="${WORKDIR}/${MY_P}-src"
LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
-SLOT=0
+SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="verify-sig"
# Legacy non-slotted versions bash completions will collide.
RDEPEND="
!dev-lang/rust:stable
!dev-lang/rust-bin:stable
"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-rust )"
src_unpack() {
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${SRC} "${DISTDIR}"/${SRC}.asc
+ fi
+
# Avoid unpacking the whole tarball which would need check-reqs
tar -xf "${DISTDIR}"/${SRC} ${SRC%%.tar.xz}/src/tools/cargo/src/etc/cargo.bashcomp.sh || die
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-common/
@ 2024-12-01 8:23 Arthur Zamarin
0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2024-12-01 8:23 UTC (permalink / raw
To: gentoo-commits
commit: d3d4384f9b643e10962b5a6b62ffc3b038e50576
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 09:09:51 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 08:23:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d4384f
dev-lang/rust-common: add 1.83.0
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-lang/rust-common/Manifest | 2 +
dev-lang/rust-common/rust-common-1.83.0.ebuild | 58 ++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/dev-lang/rust-common/Manifest b/dev-lang/rust-common/Manifest
index 88ff26dbed31..2f233b63cf30 100644
--- a/dev-lang/rust-common/Manifest
+++ b/dev-lang/rust-common/Manifest
@@ -2,3 +2,5 @@ DIST rustc-1.81.0-src.tar.xz 216743872 BLAKE2B d9f52da9092d0723c862ebbb2dc351cad
DIST rustc-1.81.0-src.tar.xz.asc 801 BLAKE2B 01cd9f386d3fd73f4eb43b14d7d479ebababb8640abbff170e697817b94b8a18edd801c6047ecf3c084a0a51764c5e4f3f4bd6b00e8ae000ef0b850e9506572a SHA512 19c0da9d67f2bd9fd79a2078f0f486ee7fad5646a09a609b7e30d9531851955ae8df0ec69f9ddc09e2fd6e74d529648335b0fda833839c88c54c84494ec1988e
DIST rustc-1.82.0-src.tar.xz 219769328 BLAKE2B 611f33e134c2d459c9af1695c0a4d033df93afc986e91a17fceb0dd293fb4ffbd5f7475ef571d36cecf49da6c3fdb3801c98d7f72f9dd1c39e42502f649b192f SHA512 d158c7c71c1814bde2a3ec3cbeabe34949bd3201b730c0d7ec6baad4158bb28dd13696c430a6b99dc38b9d23ad7ddf8dde7d2487cbfbbbe9c3473016994210f0
DIST rustc-1.82.0-src.tar.xz.asc 801 BLAKE2B 8138fb15b8d7ec15be45378fe663207a8e87e3c527348ab079995b1840a771ed6e9d5464eb8855ac9e006c0cfcf54b1a4fea489d31e6c9899cb03e6f4c737b67 SHA512 3cd6b27e72041baf9996efa10f25aca2e04f3e3727b60ecfd90c1bef9c52d216d2dc130802f935b110e35766645a27637a01661aa8d5acf02bf64b02a107c93c
+DIST rustc-1.83.0-src.tar.xz 353808388 BLAKE2B 217c85f7351a7c57a2684da2c7c81a32094187b3812dee628b327a5b2faca57235abc54d033c586c071c8bfa0c7360bb28761aaa42fe18414e388db704d81231 SHA512 64db57949c6ac1df6a3f4c6bd0938685a5fb1bc3d318b34ccfcfccb0f9eff1cffd4d8a53a190ef0409eeca9ad12bc6234c2c1de69196cc74ae02d6afa20d0ce6
+DIST rustc-1.83.0-src.tar.xz.asc 801 BLAKE2B 3bacb43d50ebba579dc2d4f1726298a7887e303e15f039ef72b840e30d90bc2cf9cdbe4617a9ee113a2b1a48f1982e72cf30323d72cdfb9a65b5b4d734ca0024 SHA512 84b252ccaddc06cb05858ff64f582dd25823818c81b1e3a00362deeda06f09e6c36948fd316d5f0ca5e24949e6f99bb14a14dbd2af1cfbb85e679e27ab0a813c
diff --git a/dev-lang/rust-common/rust-common-1.83.0.ebuild b/dev-lang/rust-common/rust-common-1.83.0.ebuild
new file mode 100644
index 000000000000..285a9a5b8e5f
--- /dev/null
+++ b/dev-lang/rust-common/rust-common-1.83.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc
+inherit bash-completion-r1 verify-sig
+
+DESCRIPTION="Common files shared between multiple slots of Rust"
+HOMEPAGE="https://www.rust-lang.org/"
+
+if [[ ${PV} = *beta* ]]; then
+ betaver=${PV//*beta}
+ BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+ SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+ ABI_VER="$(ver_cut 1-2)"
+ MY_P="rustc-${PV}"
+ SRC="${MY_P}-src.tar.xz"
+fi
+
+SRC_URI="
+ https://static.rust-lang.org/dist/${SRC}
+ verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Legacy non-slotted versions bash completions will collide.
+RDEPEND="
+ !dev-lang/rust:stable
+ !dev-lang/rust-bin:stable
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-rust )"
+
+src_unpack() {
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${SRC} "${DISTDIR}"/${SRC}.asc
+ fi
+
+ # Avoid unpacking the whole tarball which would need check-reqs
+ tar -xf "${DISTDIR}"/${SRC} ${SRC%%.tar.xz}/src/tools/cargo/src/etc/cargo.bashcomp.sh || die
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-01 8:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-01 8:23 [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-common/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2024-11-10 13:03 Sam James
2024-11-09 7:42 Sam James
2024-11-09 6:42 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox