From f18e045929b9e1da0e4007b251135c53472c5de6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 16 Sep 2024 07:15:49 +0000 Subject: [PATCH] virtual/rust: Sync with Gentoo It's from Gentoo commit a2ac92cd9504d21a4f76b4ae228f92c89461a1a7. --- .../virtual/rust/rust-1.71.0-r2.ebuild | 23 ------------------- .../virtual/rust/rust-1.73.0-r1.ebuild | 23 ------------------- .../virtual/rust/rust-1.76.0.ebuild | 23 ------------------- .../virtual/rust/rust-1.80.1.ebuild | 2 +- ...{rust-1.78.0.ebuild => rust-1.81.0.ebuild} | 3 --- 5 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.0-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.73.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.76.0.ebuild rename sdk_container/src/third_party/portage-stable/virtual/rust/{rust-1.78.0.ebuild => rust-1.81.0.ebuild} (96%) diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.0-r2.ebuild deleted file mode 100644 index f452208a1d..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.0-r2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# 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="profiler rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.73.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.73.0-r1.ebuild deleted file mode 100644 index 36a81c55f8..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.73.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# 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="profiler rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.76.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.76.0.ebuild deleted file mode 100644 index 2790ab8f7a..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.76.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# 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="profiler rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild index 89d9152202..8806d910b7 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild @@ -13,7 +13,7 @@ LICENSE="" # we do not allow multiple llvm versions in dev-lang/rust for # neither system nor bundled, so we just hardcode it here. SLOT="0/llvm-18" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="rustfmt profiler" BDEPEND="" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.78.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.78.0.ebuild rename to sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0.ebuild index 89d9152202..57e3cc3e65 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.78.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0.ebuild @@ -7,8 +7,6 @@ inherit multilib-build DESCRIPTION="Virtual for Rust language compiler" -LICENSE="" - # adjust when rust upstream bumps internal llvm # we do not allow multiple llvm versions in dev-lang/rust for # neither system nor bundled, so we just hardcode it here. @@ -16,7 +14,6 @@ SLOT="0/llvm-18" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="rustfmt profiler" -BDEPEND="" RDEPEND="|| ( ~dev-lang/rust-bin-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] ~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}]