Merge pull request #2250 from flatcar/chewi/no-eapi6

Bump remaining EAPI 6 ebuilds to 8 and drop obsolete eclasses

.github/workflows/portage-stable-packages-list

@@ -378,10 +378,8 @@ eclass/eapi8-dosym.eclass
 eclass/edo.eclass
 eclass/edos2unix.eclass
 eclass/elisp-common.eclass
-eclass/epatch.eclass
 eclass/eqawarn.eclass
 eclass/estack.eclass
-eclass/eutils.eclass
 eclass/fcaps.eclass
 eclass/flag-o-matic.eclass
 eclass/git-r3.eclass
@@ -405,7 +403,6 @@ eclass/linux-mod.eclass
 eclass/llvm-r1.eclass
 eclass/llvm-utils.eclass
 eclass/llvm.eclass
-eclass/ltprune.eclass
 eclass/lua-single.eclass
 eclass/lua-utils.eclass
 eclass/mercurial.eclass

sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.5.0-r2.ebuild

@@ -1,25 +1,19 @@
 # Copyright (c) 2016 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-TMPFILES_OPTIONAL=1
 inherit systemd tmpfiles
 
 DESCRIPTION="etcd (System Application Container)"
 HOMEPAGE="https://github.com/etcd-io/etcd"
-KEYWORDS="amd64 arm64"
-
+S="${WORKDIR}"
 LICENSE="Apache-2.0"
-IUSE=""
-SLOT=0
-
-DEPEND=""
+SLOT="0"
+KEYWORDS="amd64 arm64"
 
 RDEPEND=">=app-admin/sdnotify-proxy-0.1.0"
 
-S=${WORKDIR}
-
 src_install() {
 	local tag="v${PV}"
 	if [[ "${ARCH}" != "amd64" ]]; then
@@ -30,7 +24,7 @@ src_install() {
 	doexe "${FILESDIR}"/etcd-wrapper
 
 	sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \
-		"${FILESDIR}"/etcd-member.service > ${T}/etcd-member.service
-	systemd_dounit ${T}/etcd-member.service
+		"${FILESDIR}"/etcd-member.service > "${T}"/etcd-member.service
+	systemd_dounit "${T}"/etcd-member.service
 	dotmpfiles "${FILESDIR}"/etcd-wrapper.conf
 }

sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/metadata.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<upstream>
+		<remote-id type="github">etcd-io/etcd</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.14.0-r1.ebuild

@@ -1,27 +1,21 @@
 # Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit systemd
 
 DESCRIPTION="flannel (System Application Container)"
-HOMEPAGE="https://github.com/coreos/flannel"
-
-KEYWORDS="amd64 arm64"
-SRC_URI=""
-
+HOMEPAGE="https://github.com/flannel-io/flannel"
+S="${WORKDIR}"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+KEYWORDS="amd64 arm64"
 
 RDEPEND="
-	!app-admin/flannel
 	>=app-admin/sdnotify-proxy-0.1.0
 "
 
-S="$WORKDIR"
-
 src_install() {
 	local tag="v${PV}"
 	if [[ "${ARCH}" != "amd64" ]]; then
@@ -32,12 +26,12 @@ src_install() {
 	doexe "${FILESDIR}"/flannel-wrapper
 
 	sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \
-		"${FILESDIR}"/flanneld.service > ${T}/flanneld.service
-	systemd_dounit ${T}/flanneld.service
+		"${FILESDIR}"/flanneld.service > "${T}"/flanneld.service
+	systemd_dounit "${T}"/flanneld.service
 
 	sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \
-		"${FILESDIR}"/flannel-docker-opts.service > ${T}/flannel-docker-opts.service
-	systemd_dounit ${T}/flannel-docker-opts.service
+		"${FILESDIR}"/flannel-docker-opts.service > "${T}"/flannel-docker-opts.service
+	systemd_dounit "${T}"/flannel-docker-opts.service
 
 	insinto /usr/lib/systemd/network
 	doins "${FILESDIR}"/50-flannel.network

sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/metadata.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<upstream>
+		<remote-id type="github">flannel-io/flannel</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/Manifest

@@ -1 +1 @@
-DIST 20190124.tar.gz 126211 BLAKE2B 7608ec8370f9c1aa1da4cf0f0ec20ff86ef07846bdcb6aabac6de441326a78e98b559502b11ee4028065eb8056f9ee6c2f3247e26485e8c9af70892d955236f7 SHA512 8f12c2a361ebd833b0eb3fa6ef26f42a82b4ef6497d8e5231eeaaf5b2e6dd1662ec596e1bbad73e06207ac29e098863311538c360c62efe9fd5cc9b58d1b8ad4
+DIST google-compute-engine-20190124.tar.gz 126211 BLAKE2B 7608ec8370f9c1aa1da4cf0f0ec20ff86ef07846bdcb6aabac6de441326a78e98b559502b11ee4028065eb8056f9ee6c2f3247e26485e8c9af70892d955236f7 SHA512 8f12c2a361ebd833b0eb3fa6ef26f42a82b4ef6497d8e5231eeaaf5b2e6dd1662ec596e1bbad73e06207ac29e098863311538c360c62efe9fd5cc9b58d1b8ad4

sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r2.ebuild

@@ -1,41 +1,30 @@
 # Copyright (c) 2016-2018 CoreOS, Inc. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit eutils
+PYTHON_COMPAT=( python3_11 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
 
 DESCRIPTION="Linux Guest Environment for Google Compute Engine"
 HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages"
-SRC_URI="https://github.com/GoogleCloudPlatform/compute-image-packages/archive/${PV}.tar.gz"
-
+SRC_URI="https://github.com/GoogleCloudPlatform/compute-image-packages/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/compute-image-packages-${PV}"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
+KEYWORDS="amd64"
 
 # These dependencies cover all commands called by the scripts.
 RDEPEND="
 	app-admin/sudo
-	dev-python/boto
-	dev-python/distro
-	dev-python/setuptools
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
 	sys-apps/ethtool
 	sys-apps/coreutils
 	sys-apps/gawk
 	sys-apps/grep
 	sys-apps/iproute2
 	sys-apps/shadow
 "
-
-S="${WORKDIR}/compute-image-packages-${PV}"
-
-src_compile() {
-	(cd "${S}" && exec python3 setup.py build)
-}
-
-src_install() {
-	(cd "${S}" && exec python3 setup.py install -O1 --skip-build --root "${D}")
-}

sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">GoogleCloudPlatform/compute-image-packages</remote-id>
+	</upstream>
+</pkgmetadata>

sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/Manifest

@@ -1 +1 @@
-DIST eselect-go-0.1.0.tar.gz 104232 SHA256 541de8bc7b77d93f070f907f17760bb30dc3fa8244216d565fcdfb58ab04381b SHA512 b7e9bf07bc7026115d639ed893c54332d63cd2d7a46a6f3b2f8a6748658dfb82f09e875def8bf9abecfb1e39f054ef194b39b0c415ac9ce69ea03332125d4c1f WHIRLPOOL 77996759041eea27f169eadab48f122e55ec11886e851d583ebdd0cf667500d7ca45a62a9edfb99400cc69cbd936887ddface15e7c81d2b301ba111c53123a6a
+DIST eselect-go-0.1.0.tar.gz 104232 BLAKE2B 770773f990509bdfcdb1c463f01915526358fe28b440be288dad0833a4e8647cf52ba136569b4e7b46c71b80c6ffd43075fd25bfb516ec5790f80067247e08c5 SHA512 b7e9bf07bc7026115d639ed893c54332d63cd2d7a46a6f3b2f8a6748658dfb82f09e875def8bf9abecfb1e39f054ef194b39b0c415ac9ce69ea03332125d4c1f

sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0.ebuild → sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0-r1.ebuild

@@ -1,19 +1,19 @@
 # Copyright 2016 CoreOS, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Eselect module for managing multiple Go versions"
 HOMEPAGE="https://github.com/coreos/eselect-go"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/coreos/eselect-go/releases/download/v${PV}/${P}.tar.gz"
 # Note for future releases: the tarball was generated via `make dist` and
 # uploaded to GitHub so there is no need for initializing autotools here.
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-libs/glib )"
 RDEPEND="app-admin/eselect

sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/metadata.xml

@@ -6,4 +6,7 @@
 		packages or architectures that cannot upgrade to the same Go version
 		all at the same time. Gentoo doesn't support this use case.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coreos/eselect-go</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/flatcar-eks-0.0.1-r4.ebuild

@@ -0,0 +1,50 @@
+# Copyright (c) 2021 Kinvolk GmbH
+# Distributed under the terms of the Apache License 2.0
+
+# This package is heavily based on the files distributed in
+# https://github.com/awslabs/amazon-eks-ami, the files have been adapted to fit
+# Flatcar Container Linux instead of Amazon Linux.
+
+EAPI=8
+
+DESCRIPTION="Configuration for EKS worker nodes"
+HOMEPAGE="https://www.flatcar.org"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+
+src_prepare() {
+	# The bootstrap.sh file has been downloaded from:
+	# https://raw.githubusercontent.com/awslabs/amazon-eks-ami/master/files/bootstrap.sh
+	# We keep our patches separate to facilitate sychronizing changes
+	cp "${FILESDIR}/bootstrap.sh" "${WORKDIR}/"
+	eapply "${FILESDIR}/bootstrap.patch"
+	default
+}
+
+src_install() {
+	exeinto /usr/share/amazon/eks
+	insinto /usr/share/amazon/eks
+	doexe "${WORKDIR}/bootstrap.sh"
+
+	# These files are based on the ones found on the amazon-eks-ami repository,
+	# but adapted to fit Flatcar needs. Since they are a lot simpler, we don't
+	# use the patching technique, but rather just edit them as needed.
+	doins "${FILESDIR}/kubelet-kubeconfig"
+	doins "${FILESDIR}/kubelet.service"
+
+	# These files are taken verbatim from the amazon-eks-ami repository:
+	# https://raw.githubusercontent.com/awslabs/amazon-eks-ami/master/files/kubelet-config.json
+	# https://raw.githubusercontent.com/awslabs/amazon-eks-ami/master/files/docker-daemon.json
+	# https://raw.githubusercontent.com/awslabs/amazon-eks-ami/master/files/eni-max-pods.txt
+	doins "${FILESDIR}/kubelet-config.json"
+	doins "${FILESDIR}/docker-daemon.json"
+	doins "${FILESDIR}/eni-max-pods.txt"
+
+	# This downloading script has been created specially for Flatcar. It gets
+	# the current EKS Cluster Kubernetes version and downloads all the
+	# necessary files to run the kubelet on the node.
+	doexe "${FILESDIR}/download-kubelet.sh"
+}

sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/metadata.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription lang="en">
-	</longdescription>
+	<upstream>
+		<remote-id type="github">flatcar/baselayout</remote-id>
+	</upstream>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/sys-auth/pambase/pambase-20220214.ebuild

@@ -1,17 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DESCRIPTION="Compatibility ebuild stub for CoreOS"
-HOMEPAGE="https://github.com/coreos/baselayout"
-SRC_URI=""
+DESCRIPTION="Compatibility ebuild stub for Flatcar"
+HOMEPAGE="https://github.com/flatcar/baselayout"
 
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
 
 RDEPEND=">=sys-apps/baselayout-3.6
 	>=sys-libs/pam-1.4"
-DEPEND=""