From 9640fe39f2075f72000d9710332dc023c02feedb Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 20 Aug 2021 21:14:02 +0200 Subject: [PATCH] coreos-base: Rename gmerge package to emerge-gitclone We dropped the installation of the gmerge script a while ago, because it was not used anywhere and that made one script less to port to python3 at the time of updating portage to a recent version. Now we only install the emerge-gitclone script, so rename the package to reflect this fact. --- .../coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild | 2 +- .../emerge-gitclone/emerge-gitclone-0.0.1-r585.ebuild | 1 + .../emerge-gitclone-9999.ebuild} | 0 .../coreos-base/{gmerge => emerge-gitclone}/metadata.xml | 0 .../coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r585.ebuild | 1 - 5 files changed, 2 insertions(+), 2 deletions(-) create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r585.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/{gmerge/gmerge-9999.ebuild => emerge-gitclone/emerge-gitclone-9999.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/{gmerge => emerge-gitclone}/metadata.xml (100%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r585.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 d23dbb2a5f..fa37e9a39d 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,7 +19,7 @@ RDEPEND=" app-portage/gentoolkit coreos-base/coreos coreos-base/coreos-experimental - coreos-base/gmerge + coreos-base/emerge-gitclone coreos-devel/mantle dev-lang/python dev-util/strace diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r585.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r585.ebuild new file mode 120000 index 0000000000..9e6a3d1fe6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r585.ebuild @@ -0,0 +1 @@ +emerge-gitclone-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/metadata.xml similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/metadata.xml rename to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r585.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r585.ebuild deleted file mode 120000 index 96e52437f2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r585.ebuild +++ /dev/null @@ -1 +0,0 @@ -gmerge-9999.ebuild \ No newline at end of file