From 842c5cb9ec33636b69ab8f41fdfc2e665eb0619c Mon Sep 17 00:00:00 2001 From: krishjainx Date: Wed, 5 Jul 2023 13:15:19 +0200 Subject: [PATCH] overlay: Bump PYTHON_COMPAT to 3.11 and update PYTHON_REQ_USE Python 3.11 does not have the xml USE flag any more, so some older packages needs to be updated to assume that xml USE flag is enabled if it's missing from python. --- ...re-4.14.2-r1.ebuild => xenstore-4.14.2-r2.ebuild} | 2 +- ...es-3.91.ebuild => ca-certificates-3.91-r1.ebuild} | 2 +- ...0.1-r182.ebuild => coreos-init-0.0.1-r183.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- ...r590.ebuild => emerge-gitclone-0.0.1-r591.ebuild} | 0 .../emerge-gitclone/emerge-gitclone-9999.ebuild | 2 +- .../{rust-1.70.0.ebuild => rust-1.70.0-r1.ebuild} | 0 ...bles-0.9.9-r1.ebuild => nftables-0.9.9-r2.ebuild} | 2 +- ...samba-4.15.4-r3.ebuild => samba-4.15.4-r4.ebuild} | 2 +- ...-r2.ebuild => google-cloud-sdk-355.0.0-r3.ebuild} | 2 +- .../profiles/coreos/base/package.accept_keywords | 12 ++++++------ ...uild => selinux-base-policy-2.20200818-r3.ebuild} | 2 +- ...8-r2.ebuild => selinux-base-2.20200818-r3.ebuild} | 6 +++--- .../{dbus-1.14.4.ebuild => dbus-1.14.4-r1.ebuild} | 2 +- ...s-3.1-r3.ebuild => policycoreutils-3.1-r4.ebuild} | 4 ++-- .../{sssd-2.3.1-r4.ebuild => sssd-2.3.1-r5.ebuild} | 2 +- .../{grub-2.02-r9.ebuild => grub-2.02-r10.ebuild} | 0 .../coreos-overlay/sys-boot/grub/grub-9999.ebuild | 2 +- ...rogs-6.0.2.ebuild => btrfs-progs-6.0.2-r1.ebuild} | 2 +- ...elinux-3.1-r2.ebuild => libselinux-3.1-r3.ebuild} | 2 +- ...anage-3.1-r1.ebuild => libsemanage-3.1-r2.ebuild} | 2 +- .../{audit-3.0.6.ebuild => audit-3.0.6-r1.ebuild} | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/{xenstore-4.14.2-r1.ebuild => xenstore-4.14.2-r2.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/{ca-certificates-3.91.ebuild => ca-certificates-3.91-r1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r182.ebuild => coreos-init-0.0.1-r183.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/{emerge-gitclone-0.0.1-r590.ebuild => emerge-gitclone-0.0.1-r591.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/{rust-1.70.0.ebuild => rust-1.70.0-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/{nftables-0.9.9-r1.ebuild => nftables-0.9.9-r2.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/net-fs/samba/{samba-4.15.4-r3.ebuild => samba-4.15.4-r4.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/{google-cloud-sdk-355.0.0-r2.ebuild => google-cloud-sdk-355.0.0-r3.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/{selinux-base-policy-2.20200818-r2.ebuild => selinux-base-policy-2.20200818-r3.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/{selinux-base-2.20200818-r2.ebuild => selinux-base-2.20200818-r3.ebuild} (97%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/{dbus-1.14.4.ebuild => dbus-1.14.4-r1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/{policycoreutils-3.1-r3.ebuild => policycoreutils-3.1-r4.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/{sssd-2.3.1-r4.ebuild => sssd-2.3.1-r5.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-boot/grub/{grub-2.02-r9.ebuild => grub-2.02-r10.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/{btrfs-progs-6.0.2.ebuild => btrfs-progs-6.0.2-r1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/{libselinux-3.1-r2.ebuild => libselinux-3.1-r3.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/{libsemanage-3.1-r1.ebuild => libsemanage-3.1-r2.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-process/audit/{audit-3.0.6.ebuild => audit-3.0.6-r1.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r2.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r2.ebuild index 3e52034a5d..69914b39af 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r2.ebuild @@ -4,7 +4,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit multilib python-any-r1 systemd toolchain-funcs diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91-r1.ebuild index ccf8d89c08..a03dd258b2 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) TMPFILES_OPTIONAL=1 inherit python-any-r1 systemd tmpfiles diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r182.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r183.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r182.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r183.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index d823f38bcc..99662f96c1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit cros-workon systemd python-any-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r590.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r591.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r590.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r591.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild index 25fe078a25..5aba366d83 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit cros-workon python-single-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.70.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.70.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.70.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.70.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r2.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r2.ebuild index 528373f724..ce56aed820 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit autotools linux-info python-r1 systemd diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r4.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r4.ebuild index 46c11daf01..b0fa91bbdc 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+),xml(+)" TMPFILES_OPTIONAL=1 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r3.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r3.ebuild index 854ee948e3..224311acb3 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit bash-completion-r1 python-single-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index aa93149afd..474643bf59 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -26,7 +26,7 @@ =dev-lang/python-3.10.12 ~amd64 # Accept unstable host Rust compilers -=dev-lang/rust-1.70.0 ~amd64 ~arm64 +=dev-lang/rust-1.70.0-r1 ~amd64 ~arm64 # Needed by arm64-native SDK. =dev-lang/yasm-1.3.0-r1 ~arm64 @@ -50,14 +50,14 @@ =net-misc/curl-8.1.2 ~amd64 ~arm64 # Keep versions on both arches in sync. -=sec-policy/selinux-base-2.20200818-r2 ~arm64 -=sec-policy/selinux-base-policy-2.20200818-r2 ~arm64 +=sec-policy/selinux-base-2.20200818-r3 ~arm64 +=sec-policy/selinux-base-policy-2.20200818-r3 ~arm64 =sec-policy/selinux-unconfined-2.20200818-r2 ~arm64 =sec-policy/selinux-virt-2.20200818-r2 ~arm64 =sys-apps/checkpolicy-3.1 ~arm64 =sys-apps/coreutils-9.3-r2 ~arm64 =sys-apps/kexec-tools-2.0.24 ~arm64 -=sys-apps/policycoreutils-3.1-r3 ~arm64 +=sys-apps/policycoreutils-3.1-r4 ~arm64 =sys-apps/sandbox-2.30-r1 ~arm64 =sys-apps/semodule-utils-3.1 ~arm64 @@ -72,8 +72,8 @@ # Keep versions on both arches in sync. =sys-fs/multipath-tools-0.9.5 ~amd64 -=sys-libs/libselinux-3.1-r2 ~arm64 -=sys-libs/libsemanage-3.1-r1 ~arm64 +=sys-libs/libselinux-3.1-r3 ~arm64 +=sys-libs/libsemanage-3.1-r2 ~arm64 =sys-libs/libsepol-3.1 ~arm64 # A dependency of app-shells/bash version that we need for security diff --git a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r3.ebuild index cd986fdb29..7f1a7a6d49 100644 --- a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2 - https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2" + https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PV}-r2.tar.bz2" KEYWORDS="amd64 -arm ~arm64 ~mips x86" fi diff --git a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r3.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r3.ebuild index f17de9ee5b..bc58b54ab5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r3.ebuild @@ -4,8 +4,8 @@ EAPI="7" # flatcar changes -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{8,9,10,11} ) +PYTHON_REQ_USE="xml(+)" TMPFILES_OPTIONAL=1 inherit systemd tmpfiles python-any-r1 @@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2 - https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2" + https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PV}-r2.tar.bz2" KEYWORDS="amd64 -arm ~arm64 ~mips x86" fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild index ac7ebdfa29..71a4c75bba 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) TMPFILES_OPTIONAL=1 # At least at the moment, while a CMake port exists, it's not recommended diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r4.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r4.ebuild index 36158efe11..9b71258245 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r4.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{6..10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{6..11} ) +PYTHON_REQ_USE="xml(+)" inherit multilib python-r1 toolchain-funcs bash-completion-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild index 03d0a0476a..ea87f1b4ba 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild @@ -8,7 +8,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) TMPFILES_OPTIONAL=1 inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs tmpfiles diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r10.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild index 3d976f29b5..9e7b79cc91 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild @@ -16,7 +16,7 @@ fi inherit cros-workon if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python3_{6..10} ) + PYTHON_COMPAT=( python3_{6..11} ) WANT_LIBTOOL=none inherit autotools python-any-r1 fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2-r1.ebuild index ad75587042..9ce447f745 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit bash-completion-r1 python-single-r1 udev diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild index 11993cce17..94c25dfda6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) USE_RUBY="ruby25 ruby26 ruby27" # No, I am not calling ruby-ng diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r2.ebuild index c75996eed8..f01673d1fd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) # flatcar changes TMPFILES_OPTIONAL=1 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6-r1.ebuild index bdc585b9f2..846a0db491 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 # Flatcar: Support python 3.6. -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) TMPFILES_OPTIONAL=1 inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript tmpfiles