From ab43658d602b4cf94caa64b384b47d6cc164bf07 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:10:58 +0100 Subject: [PATCH] overlay: Fix references to moved packages --- build_library/toolchain_util.sh | 2 +- ...s-dev-0.1.0-r83.ebuild => coreos-dev-0.1.0-r84.ebuild} | 0 .../coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild | 2 +- ...ro-client-0.1.1.ebuild => fero-client-0.1.1-r1.ebuild} | 0 .../coreos-devel/fero-client/fero-client-9999.ebuild | 2 +- .../rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} | 8 ++++---- .../profiles/coreos/base/package.accept_keywords | 4 ++-- ...{systemd-252.11-r1.ebuild => systemd-252.11-r2.ebuild} | 2 +- .../rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} | 0 9 files changed, 10 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r83.ebuild => coreos-dev-0.1.0-r84.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/{fero-client-0.1.1.ebuild => fero-client-0.1.1-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-252.11-r1.ebuild => systemd-252.11-r2.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/virtual/rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} (100%) diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index 93f288a453..8afd45e49f 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -330,7 +330,7 @@ _get_cross_pkgs_for_emerge_and_crossdev() { local -n gcpfeac_emerge_atoms_var_ref="${gcpfeac_emerge_atoms_var_name}" local -n gcpfeac_crossdev_pkg_flags_var_ref="${gcpfeac_crossdev_pkg_flags_var_name}" - local -a all_pkgs=( "${TOOLCHAIN_PKGS[@]}" sys-devel/gdb ) + local -a all_pkgs=( "${TOOLCHAIN_PKGS[@]}" dev-debug/gdb ) local -A crossdev_flags_map=( [binutils]=--binutils [gdb]=--gdb diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r83.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r84.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r83.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r84.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild index 7d80b997f5..c2e71d89de 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild @@ -19,6 +19,7 @@ RDEPEND=" app-portage/gentoolkit coreos-base/coreos coreos-base/emerge-gitclone + dev-debug/gdb dev-lang/python dev-util/pahole dev-util/strace @@ -41,7 +42,6 @@ RDEPEND=" sys-apps/smartmontools sys-apps/which sys-devel/gcc - sys-devel/gdb sys-fs/lvm2 sys-fs/squashfs-tools sys-process/procps diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild index 4bb4ac7507..de7e2d34ba 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild @@ -24,7 +24,7 @@ SLOT="0" IUSE="" DEPEND=">=dev-libs/protobuf-3.0.0 - dev-util/cmake" + dev-build/cmake" RDEPEND=">=dev-libs/protobuf-3.0.0" src_unpack() { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0-r1.ebuild index 88f11540e6..6a13905a1b 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0-r1.ebuild @@ -96,10 +96,10 @@ BDEPEND="${PYTHON_DEPS} ) system-bootstrap? ( ${BOOTSTRAP_DEPEND} ) !system-llvm? ( - >=dev-util/cmake-3.13.4 - dev-util/ninja + >=dev-build/cmake-3.13.4 + dev-build/ninja ) - test? ( sys-devel/gdb ) + test? ( dev-debug/gdb ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -773,7 +773,7 @@ src_install() { pkg_postinst() { eselect rust update - if has_version sys-devel/gdb || has_version dev-util/lldb; then + if has_version dev-debug/gdb || has_version dev-debug/lldb; then elog "Rust installs a helper script for calling GDB and LLDB," elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." fi diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 073ad448ad..991b29315f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -41,7 +41,7 @@ =dev-lang/nasm-2.15.05 ~arm64 # Accept unstable host Rust compilers. -=dev-lang/rust-1.75.0 ~amd64 ~arm64 +=dev-lang/rust-1.75.0-r1 ~amd64 ~arm64 # Needed by arm64-native SDK. =dev-lang/yasm-1.3.0-r1 ~arm64 @@ -103,4 +103,4 @@ =sys-process/procps-4.0.4 ~amd64 # Accept unstable host Rust compilers. -=virtual/rust-1.75.0 ~amd64 ~arm64 +=virtual/rust-1.75.0-r1 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r2.ebuild index 796f927fde..76ef14c334 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r2.ebuild @@ -154,7 +154,7 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd] BDEPEND=" app-arch/xz-utils:0 dev-util/gperf - >=dev-util/meson-0.46 + >=dev-build/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.75.0.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.75.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.75.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.75.0-r1.ebuild