mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-10 06:26:57 +02:00
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.
This commit is contained in:
parent
3bb67d01dc
commit
842c5cb9ec
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
|
|
||||||
inherit multilib python-any-r1 systemd toolchain-funcs
|
inherit multilib python-any-r1 systemd toolchain-funcs
|
||||||
|
|
@ -2,7 +2,7 @@
|
|||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
TMPFILES_OPTIONAL=1
|
TMPFILES_OPTIONAL=1
|
||||||
inherit python-any-r1 systemd tmpfiles
|
inherit python-any-r1 systemd tmpfiles
|
||||||
|
|
@ -14,7 +14,7 @@ else
|
|||||||
KEYWORDS="amd64 arm arm64 x86"
|
KEYWORDS="amd64 arm arm64 x86"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
|
|
||||||
inherit cros-workon systemd python-any-r1
|
inherit cros-workon systemd python-any-r1
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ else
|
|||||||
KEYWORDS="amd64 arm arm64 x86"
|
KEYWORDS="amd64 arm arm64 x86"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
|
|
||||||
inherit cros-workon python-single-r1
|
inherit cros-workon python-single-r1
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
|
|
||||||
inherit autotools linux-info python-r1 systemd
|
inherit autotools linux-info python-r1 systemd
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{8..10} )
|
PYTHON_COMPAT=( python3_{8..11} )
|
||||||
PYTHON_REQ_USE="threads(+),xml(+)"
|
PYTHON_REQ_USE="threads(+),xml(+)"
|
||||||
TMPFILES_OPTIONAL=1
|
TMPFILES_OPTIONAL=1
|
||||||
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
|
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
|
|
||||||
inherit bash-completion-r1 python-single-r1
|
inherit bash-completion-r1 python-single-r1
|
||||||
|
|
@ -26,7 +26,7 @@
|
|||||||
=dev-lang/python-3.10.12 ~amd64
|
=dev-lang/python-3.10.12 ~amd64
|
||||||
|
|
||||||
# Accept unstable host Rust compilers
|
# 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.
|
# Needed by arm64-native SDK.
|
||||||
=dev-lang/yasm-1.3.0-r1 ~arm64
|
=dev-lang/yasm-1.3.0-r1 ~arm64
|
||||||
@ -50,14 +50,14 @@
|
|||||||
=net-misc/curl-8.1.2 ~amd64 ~arm64
|
=net-misc/curl-8.1.2 ~amd64 ~arm64
|
||||||
|
|
||||||
# Keep versions on both arches in sync.
|
# Keep versions on both arches in sync.
|
||||||
=sec-policy/selinux-base-2.20200818-r2 ~arm64
|
=sec-policy/selinux-base-2.20200818-r3 ~arm64
|
||||||
=sec-policy/selinux-base-policy-2.20200818-r2 ~arm64
|
=sec-policy/selinux-base-policy-2.20200818-r3 ~arm64
|
||||||
=sec-policy/selinux-unconfined-2.20200818-r2 ~arm64
|
=sec-policy/selinux-unconfined-2.20200818-r2 ~arm64
|
||||||
=sec-policy/selinux-virt-2.20200818-r2 ~arm64
|
=sec-policy/selinux-virt-2.20200818-r2 ~arm64
|
||||||
=sys-apps/checkpolicy-3.1 ~arm64
|
=sys-apps/checkpolicy-3.1 ~arm64
|
||||||
=sys-apps/coreutils-9.3-r2 ~arm64
|
=sys-apps/coreutils-9.3-r2 ~arm64
|
||||||
=sys-apps/kexec-tools-2.0.24 ~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/sandbox-2.30-r1 ~arm64
|
||||||
=sys-apps/semodule-utils-3.1 ~arm64
|
=sys-apps/semodule-utils-3.1 ~arm64
|
||||||
|
|
||||||
@ -72,8 +72,8 @@
|
|||||||
|
|
||||||
# Keep versions on both arches in sync.
|
# Keep versions on both arches in sync.
|
||||||
=sys-fs/multipath-tools-0.9.5 ~amd64
|
=sys-fs/multipath-tools-0.9.5 ~amd64
|
||||||
=sys-libs/libselinux-3.1-r2 ~arm64
|
=sys-libs/libselinux-3.1-r3 ~arm64
|
||||||
=sys-libs/libsemanage-3.1-r1 ~arm64
|
=sys-libs/libsemanage-3.1-r2 ~arm64
|
||||||
=sys-libs/libsepol-3.1 ~arm64
|
=sys-libs/libsepol-3.1 ~arm64
|
||||||
|
|
||||||
# A dependency of app-shells/bash version that we need for security
|
# A dependency of app-shells/bash version that we need for security
|
||||||
|
@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
|
|||||||
inherit git-r3
|
inherit git-r3
|
||||||
else
|
else
|
||||||
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
|
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"
|
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
|
||||||
fi
|
fi
|
||||||
|
|
@ -4,8 +4,8 @@
|
|||||||
EAPI="7"
|
EAPI="7"
|
||||||
|
|
||||||
# flatcar changes
|
# flatcar changes
|
||||||
PYTHON_COMPAT=( python3_{8,9,10} )
|
PYTHON_COMPAT=( python3_{8,9,10,11} )
|
||||||
PYTHON_REQ_USE="xml"
|
PYTHON_REQ_USE="xml(+)"
|
||||||
TMPFILES_OPTIONAL=1
|
TMPFILES_OPTIONAL=1
|
||||||
inherit systemd tmpfiles python-any-r1
|
inherit systemd tmpfiles python-any-r1
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
|
|||||||
inherit git-r3
|
inherit git-r3
|
||||||
else
|
else
|
||||||
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
|
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"
|
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
|
||||||
fi
|
fi
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{8..10} )
|
PYTHON_COMPAT=( python3_{8..11} )
|
||||||
TMPFILES_OPTIONAL=1
|
TMPFILES_OPTIONAL=1
|
||||||
|
|
||||||
# At least at the moment, while a CMake port exists, it's not recommended
|
# At least at the moment, while a CMake port exists, it's not recommended
|
@ -2,8 +2,8 @@
|
|||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI="7"
|
EAPI="7"
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
PYTHON_REQ_USE="xml"
|
PYTHON_REQ_USE="xml(+)"
|
||||||
|
|
||||||
inherit multilib python-r1 toolchain-funcs bash-completion-r1
|
inherit multilib python-r1 toolchain-funcs bash-completion-r1
|
||||||
|
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
|
|
||||||
TMPFILES_OPTIONAL=1
|
TMPFILES_OPTIONAL=1
|
||||||
inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs tmpfiles
|
inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs tmpfiles
|
@ -16,7 +16,7 @@ fi
|
|||||||
inherit cros-workon
|
inherit cros-workon
|
||||||
|
|
||||||
if [[ -n ${GRUB_AUTOGEN} ]]; then
|
if [[ -n ${GRUB_AUTOGEN} ]]; then
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
WANT_LIBTOOL=none
|
WANT_LIBTOOL=none
|
||||||
inherit autotools python-any-r1
|
inherit autotools python-any-r1
|
||||||
fi
|
fi
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{9..10} )
|
PYTHON_COMPAT=( python3_{9..11} )
|
||||||
|
|
||||||
inherit bash-completion-r1 python-single-r1 udev
|
inherit bash-completion-r1 python-single-r1 udev
|
||||||
|
|
@ -2,7 +2,7 @@
|
|||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI="7"
|
EAPI="7"
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
USE_RUBY="ruby25 ruby26 ruby27"
|
USE_RUBY="ruby25 ruby26 ruby27"
|
||||||
|
|
||||||
# No, I am not calling ruby-ng
|
# No, I am not calling ruby-ng
|
@ -2,7 +2,7 @@
|
|||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
|
|
||||||
# flatcar changes
|
# flatcar changes
|
||||||
TMPFILES_OPTIONAL=1
|
TMPFILES_OPTIONAL=1
|
@ -4,7 +4,7 @@
|
|||||||
EAPI=7
|
EAPI=7
|
||||||
|
|
||||||
# Flatcar: Support python 3.6.
|
# Flatcar: Support python 3.6.
|
||||||
PYTHON_COMPAT=( python3_{6..10} )
|
PYTHON_COMPAT=( python3_{6..11} )
|
||||||
|
|
||||||
TMPFILES_OPTIONAL=1
|
TMPFILES_OPTIONAL=1
|
||||||
inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript tmpfiles
|
inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript tmpfiles
|
Loading…
Reference in New Issue
Block a user