From f5e880a5ad26a6fc7a5fc156f0a033f8b507cf93 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Mar 2023 13:18:21 +0000 Subject: [PATCH] sys-apps/portage: Sync with Gentoo It's from Gentoo commit f52d2611a9b2dc690a0765055efddb0f1d33349e. --- .../src/third_party/portage-stable/sys-apps/portage/Manifest | 2 +- .../{portage-3.0.45.1.ebuild => portage-3.0.45.2.ebuild} | 4 ---- .../portage-stable/sys-apps/portage/portage-9999.ebuild | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/portage/{portage-3.0.45.1.ebuild => portage-3.0.45.2.ebuild} (98%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest index a995596573..58289a9dee 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest @@ -1,3 +1,3 @@ DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691 DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4ae6246aeb1045e3a5c5dcb33d74f74e74aa3f2325acbf37e16a535095c433f2796ed042f73cea5e208150e210cb0 SHA512 d40c95f3a31c5e2ae35374243c40c8d1f6b47b7c89f6a711a12d8744cb6848a85443298c0f947475b32acf52332e7f09b1e85915149ab8363930c0404f08410e -DIST portage-3.0.45.1.tar.bz2 1146037 BLAKE2B 562900b41684a4da3b10a91d796e91b75d631267145c36f0e46d0b3bc749b2e88bbc7e20c4a3c1a8cba74e8bfb25dc1ffc9ffd481ec11a2a2e1d23f9cae770a3 SHA512 961630cd0959001a841d62b3a293458442aeb7725241d6808d4052dd47209bf5d0abdf229a48013d91f9c441349075117747229639a1228fccd5bf6f75e947fd +DIST portage-3.0.45.2.tar.bz2 1145556 BLAKE2B 09cd28839418f91f512ce4ddf45addf37f72d07d6ee84812519239245529c6b5fbe63e45ee3fe3048fb8b3aced2a18c0f30fbdb261a793bae87243e9258799bd SHA512 16be3572d74b26ca5ed62392e3da701cc8e93e6d6d35024a2d10b0f971618404a135645a869d8df2aedf9e3e9201e7ad912a427e9593065fe20ada7a0fedf353 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2.ebuild index df564a4830..c226bd8136 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.2.ebuild @@ -158,10 +158,6 @@ python_prepare_all() { -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ -i cnf/repos.conf || die "sed failed" fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" fi cd "${S}/cnf" || die diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild index 3eac8033c3..fb5130b948 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild @@ -151,10 +151,6 @@ python_prepare_all() { -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ -i cnf/repos.conf || die "sed failed" fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" fi cd "${S}/cnf" || die