From 2a3c23cd62d1285c1d8d6814b187b0af7de4ae75 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 11 Apr 2022 07:43:32 +0000 Subject: [PATCH] app-emulation/google-compute-engine: update to 20190124 and add missing dependencies on dev-python/distro and sys-apps/coreutils. We need to bump the version to 20190124 because: * 20180611 is not compatible with python 3.9 because of missing distro module and trying to access os.errno (instead of importing the errno module). Also why we need the dependency on dev-python/distro * 20190124 is the last version before the repo was split and reorganized which would require more work to the ebuilds The coreutils dependency is necessary because the scripts call basename/nproc/cat but previously coreutils was pulled in by the following dependency chain: (dependency required by "app-admin/eselect-1.4.16::portage-stable" [binary]) (dependency required by "app-eselect/eselect-python-20160516::portage-stable" [binary]) (dependency required by "dev-lang/python-2.7.15::portage-stable" [binary]) (dependency required by "dev-python/boto-2.48.0::portage-stable" [binary]) (dependency required by "app-emulation/google-compute-engine-20180611::coreos" [binary]) (dependency required by "coreos-base/coreos-oem-gce-0.0.1-r5::coreos" [binary]) (dependency required by "coreos-base/coreos-oem-gce" [argument]) This chain seems to not hold any longer and we should be explicit about dependencies. --- .../coreos-overlay/app-emulation/google-compute-engine/Manifest | 2 +- ...80611-r1.ebuild => google-compute-engine-20190124-r1.ebuild} | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/{google-compute-engine-20180611-r1.ebuild => google-compute-engine-20190124-r1.ebuild} (95%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest index cd11d66d4f..ff0c0c21a2 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest @@ -1 +1 @@ -DIST 20180611.tar.gz 143678 SHA256 f71bdc6d01cff014bb4d066096be9a6e067fd3028c730cc4c9557001ec99ab6e SHA512 9e94cdda66f9b45dbb0ade25ce2dabbcc38c96b7c6f94a09bfef80f1611e7fe0233578ccc55f76530dca16f4ee261a22c05ae12b76ce527734be50b856caca3e WHIRLPOOL f37f980686924003570567e77ec1b740a7ce538a03917d01757f2599a595c17f8babd32184ca26b6075df14de1e5da2876f5eb3111141d442c1571e043350b8d +DIST 20190124.tar.gz 126211 BLAKE2B 7608ec8370f9c1aa1da4cf0f0ec20ff86ef07846bdcb6aabac6de441326a78e98b559502b11ee4028065eb8056f9ee6c2f3247e26485e8c9af70892d955236f7 SHA512 8f12c2a361ebd833b0eb3fa6ef26f42a82b4ef6497d8e5231eeaaf5b2e6dd1662ec596e1bbad73e06207ac29e098863311538c360c62efe9fd5cc9b58d1b8ad4 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20180611-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r1.ebuild similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20180611-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r1.ebuild index 352d755515..0d61ec344a 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20180611-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r1.ebuild @@ -20,8 +20,10 @@ DEPEND="dev-python/setuptools" RDEPEND=" app-admin/sudo dev-python/boto + dev-python/distro dev-python/setuptools sys-apps/ethtool + sys-apps/coreutils sys-apps/gawk sys-apps/grep sys-apps/iproute2