From ec95eaffca8731e4604cacefe2fabc4b814f7a9c Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 27 Mar 2024 03:44:42 +0000 Subject: [PATCH] virtual/rust: backport USE=profiler This makes life easier for Chromium which we're about to stable. Bug: https://bugs.gentoo.org/923010 Signed-off-by: Sam James --- profiles/arch/loong/package.use.mask | 4 ++++ profiles/arch/s390/package.use.mask | 4 ++++ .../rust/{rust-1.71.0-r1.ebuild => rust-1.71.0-r2.ebuild} | 8 ++++---- .../rust/{rust-1.71.1-r1.ebuild => rust-1.71.1-r2.ebuild} | 8 ++++---- .../rust/{rust-1.73.0.ebuild => rust-1.73.0-r1.ebuild} | 8 ++++---- .../rust/{rust-1.74.1.ebuild => rust-1.74.1-r1.ebuild} | 6 +++--- .../rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} | 6 +++--- virtual/rust/rust-1.76.0.ebuild | 2 +- 8 files changed, 27 insertions(+), 19 deletions(-) rename virtual/rust/{rust-1.71.0-r1.ebuild => rust-1.71.0-r2.ebuild} (70%) rename virtual/rust/{rust-1.71.1-r1.ebuild => rust-1.71.1-r2.ebuild} (69%) rename virtual/rust/{rust-1.73.0.ebuild => rust-1.73.0-r1.ebuild} (70%) rename virtual/rust/{rust-1.74.1.ebuild => rust-1.74.1-r1.ebuild} (75%) rename virtual/rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} (75%) diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask index 8b3a6e04f5ce1..5a4cfa839690f 100644 --- a/profiles/arch/loong/package.use.mask +++ b/profiles/arch/loong/package.use.mask @@ -1,6 +1,10 @@ # Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-03-27) +# No rust-bin available for profiler + (2024-03-27) +# No rust-bin available for profiler +virtual/rust profiler + # Eray Aslan (2024-03-08) # mongodb dependencies are not keyworded mail-mta/postfix mongodb diff --git a/virtual/rust/rust-1.71.0-r1.ebuild b/virtual/rust/rust-1.71.0-r2.ebuild similarity index 70% rename from virtual/rust/rust-1.71.0-r1.ebuild rename to virtual/rust/rust-1.71.0-r2.ebuild index 455f215fceccc..f452208a1d82a 100644 --- a/virtual/rust/rust-1.71.0-r1.ebuild +++ b/virtual/rust/rust-1.71.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,10 +14,10 @@ LICENSE="" # neither system nor bundled, so we just hardcode it here. SLOT="0/llvm-16" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="rustfmt" +IUSE="profiler rustfmt" BDEPEND="" RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] )" diff --git a/virtual/rust/rust-1.71.1-r1.ebuild b/virtual/rust/rust-1.71.1-r2.ebuild similarity index 69% rename from virtual/rust/rust-1.71.1-r1.ebuild rename to virtual/rust/rust-1.71.1-r2.ebuild index 5641e68236d48..62393a5d36f69 100644 --- a/virtual/rust/rust-1.71.1-r1.ebuild +++ b/virtual/rust/rust-1.71.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,10 +14,10 @@ LICENSE="" # neither system nor bundled, so we just hardcode it here. SLOT="0/llvm-16" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="rustfmt" +IUSE="profiler rustfmt" BDEPEND="" RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] )" diff --git a/virtual/rust/rust-1.73.0.ebuild b/virtual/rust/rust-1.73.0-r1.ebuild similarity index 70% rename from virtual/rust/rust-1.73.0.ebuild rename to virtual/rust/rust-1.73.0-r1.ebuild index 6662fd2eeded8..36a81c55f875c 100644 --- a/virtual/rust/rust-1.73.0.ebuild +++ b/virtual/rust/rust-1.73.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,10 +14,10 @@ LICENSE="" # neither system nor bundled, so we just hardcode it here. SLOT="0/llvm-17" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="rustfmt" +IUSE="profiler rustfmt" BDEPEND="" RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] )" diff --git a/virtual/rust/rust-1.74.1.ebuild b/virtual/rust/rust-1.74.1-r1.ebuild similarity index 75% rename from virtual/rust/rust-1.74.1.ebuild rename to virtual/rust/rust-1.74.1-r1.ebuild index 142a357e436a2..4e9f43e5561b3 100644 --- a/virtual/rust/rust-1.74.1.ebuild +++ b/virtual/rust/rust-1.74.1-r1.ebuild @@ -14,10 +14,10 @@ LICENSE="" # neither system nor bundled, so we just hardcode it here. SLOT="0/llvm-17" KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="rustfmt" +IUSE="profiler rustfmt" BDEPEND="" RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] )" diff --git a/virtual/rust/rust-1.75.0.ebuild b/virtual/rust/rust-1.75.0-r1.ebuild similarity index 75% rename from virtual/rust/rust-1.75.0.ebuild rename to virtual/rust/rust-1.75.0-r1.ebuild index bf56f7a58c9d5..4ed48e05d3167 100644 --- a/virtual/rust/rust-1.75.0.ebuild +++ b/virtual/rust/rust-1.75.0-r1.ebuild @@ -14,10 +14,10 @@ LICENSE="" # neither system nor bundled, so we just hardcode it here. SLOT="0/llvm-17" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="rustfmt" +IUSE="profiler rustfmt" BDEPEND="" RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] + ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] )" diff --git a/virtual/rust/rust-1.76.0.ebuild b/virtual/rust/rust-1.76.0.ebuild index 187391b932747..2790ab8f7afce 100644 --- a/virtual/rust/rust-1.76.0.ebuild +++ b/virtual/rust/rust-1.76.0.ebuild @@ -14,7 +14,7 @@ LICENSE="" # neither system nor bundled, so we just hardcode it here. SLOT="0/llvm-17" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="rustfmt profiler" +IUSE="profiler rustfmt" BDEPEND="" RDEPEND="|| (