From 1f61b80842470c18d8d208c0ce1521c516365396 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 16 Sep 2021 18:58:00 +0200 Subject: [PATCH] *: Get rid of EAPI 2 --- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 4 +++- ...oem-gce-0.0.1-r4.ebuild => coreos-oem-gce-0.0.1-r5.ebuild} | 0 .../coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild | 2 +- .../{coreos-0.0.1-r300.ebuild => coreos-0.0.1-r301.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- ...-0.0.1-r198.ebuild => hard-host-depends-0.0.1-r199.ebuild} | 0 .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 2 +- .../{linux-sources-2-r1.ebuild => linux-sources-2-r2.ebuild} | 2 +- 8 files changed, 7 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/{coreos-oem-gce-0.0.1-r4.ebuild => coreos-oem-gce-0.0.1-r5.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r300.ebuild => coreos-0.0.1-r301.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r198.ebuild => hard-host-depends-0.0.1-r199.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/{linux-sources-2-r1.ebuild => linux-sources-2-r2.ebuild} (97%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild index 511ff65181..8b8c6ee877 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2017-2018 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="Packages to be installed in a torcx image for Docker" @@ -20,6 +20,8 @@ RDEPEND=" ~sys-process/tini-0.19.0 " +S="${WORKDIR}" + src_install() { insinto /.torcx newins "${FILESDIR}/${P}-manifest.json" manifest.json diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild index 1cbb0129ab..e1ee050a08 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2016 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="CoreOS OEM suite for Google Compute Engine (meta package)" HOMEPAGE="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r300.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r301.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r300.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r301.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 9235e6d9ea..a5840d4435 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="CoreOS (meta package)" HOMEPAGE="http://coreos.com" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r198.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r199.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r198.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r199.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index 5d280210e1..e0a7288e01 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2009 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="List of packages that are needed on the buildhost (meta package)" HOMEPAGE="http://src.chromium.org" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r2.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r2.ebuild index d8473fd1f6..b4fc6c411f 100644 --- a/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r2.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2012 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="CoreOS Kernel virtual package" HOMEPAGE="http://www.coreos.com"