From 1e9ed6156cc379a6b3f192243ae0c98eb8772f64 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:58:32 +0100 Subject: [PATCH] virtual/rust: Drop unused package Mentions of virtual/rust in some scripts were replaced with dev-lang/rust-bin. These were usually about skipping the update/build of the package, and these already contained dev-lang/rust, so added the -bin variant for completeness. --- .../workflows/portage-stable-packages-list | 1 - build_dev_binpkgs | 2 +- build_library/catalyst.sh | 2 +- .../portage-stable/virtual/rust/metadata.xml | 25 ------------------- .../virtual/rust/rust-1.71.1-r2.ebuild | 23 ----------------- .../virtual/rust/rust-1.74.1-r1.ebuild | 23 ----------------- .../virtual/rust/rust-1.75.0-r1.ebuild | 23 ----------------- .../virtual/rust/rust-1.77.1.ebuild | 23 ----------------- .../virtual/rust/rust-1.79.0.ebuild | 23 ----------------- .../virtual/rust/rust-1.80.1.ebuild | 23 ----------------- .../virtual/rust/rust-1.81.0-r1.ebuild | 20 --------------- .../virtual/rust/rust-1.82.0.ebuild | 20 --------------- 12 files changed, 2 insertions(+), 206 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.74.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.75.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.77.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.79.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.82.0.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 1b07e80de7..ca3b1fb038 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -701,7 +701,6 @@ virtual/perl-Getopt-Long virtual/perl-Unicode-Collate virtual/pkgconfig virtual/resolvconf -virtual/rust virtual/service-manager virtual/ssh virtual/tmpfiles diff --git a/build_dev_binpkgs b/build_dev_binpkgs index 8c64e3678b..a3fdfe6b7f 100755 --- a/build_dev_binpkgs +++ b/build_dev_binpkgs @@ -13,7 +13,7 @@ packages_default=( "coreos-devel/board-packages" ) # Packages that are rdeps of the above but should not be included. # (mostly large packages, e.g. programming languages etc.) -skip_packages_default="dev-lang/rust,virtual/rust,dev-lang/go,dev-lang/go-bootstrap,dev-go/go-md2man" +skip_packages_default="dev-lang/rust,dev-lang/rust-bin,dev-lang/go,dev-lang/go-bootstrap,dev-go/go-md2man" # Developer-visible flags. diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index 83d94d1a4b..d7d16f4e08 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -105,7 +105,7 @@ cat < - - - - randy@electronsweatshop.com - Randy Barlow - - - navi@vlhl.dev - Anna Figueiredo Gomes - - - matoro_gentoo@matoro.tk - Matoro Mahri - - - rust@gentoo.org - Rust Project - - - Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts) - Install rustfmt, Rust code formatter - - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.1-r2.ebuild deleted file mode 100644 index 62393a5d36..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.1-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.74.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.74.1-r1.ebuild deleted file mode 100644 index 4e9f43e556..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.74.1-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.75.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.75.0-r1.ebuild deleted file mode 100644 index 4e9f43e556..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.75.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.77.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.77.1.ebuild deleted file mode 100644 index 516aad0fc8..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.77.1.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 ~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}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.79.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.79.0.ebuild deleted file mode 100644 index 8806d910b7..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.79.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-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}] -)" 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 deleted file mode 100644 index 8806d910b7..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.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-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}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0-r1.ebuild deleted file mode 100644 index 332a8b70f2..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0-r1.ebuild +++ /dev/null @@ -1,20 +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" - -# 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-18" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="rustfmt profiler" - -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[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.82.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.82.0.ebuild deleted file mode 100644 index 2f9c39eae8..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.82.0.ebuild +++ /dev/null @@ -1,20 +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" - -# 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-19" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="rustfmt profiler" - -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] -)"