commit: 018d5f301fe4bf859e66bf5f1f7b9db94d8104c2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Jul 4 11:17:56 2023 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Jul 4 11:18:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=018d5f30
sys-libs/glibc: relax python dependencies Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-libs/glibc/glibc-2.37-r3.ebuild | 16 ++++++---------- sys-libs/glibc/glibc-9999.ebuild | 18 +++++++----------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/sys-libs/glibc/glibc-2.37-r3.ebuild b/sys-libs/glibc/glibc-2.37-r3.ebuild index 5f1be40ebfeb..f5259765d7d6 100644 --- a/sys-libs/glibc/glibc-2.37-r3.ebuild +++ b/sys-libs/glibc/glibc-2.37-r3.ebuild @@ -6,10 +6,13 @@ EAPI=8 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc # Please read & adapt the page as necessary if obsolete. -PYTHON_COMPAT=( python3_{9..11} ) +# Please keep the python line in BDEPEND updated and do NOT use eclasses pr +# ${PYTHON_DEPS} (since they are too strict and lead to problems with the +# package order during upgrades). + TMPFILES_OPTIONAL=1 -inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ +inherit prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ multilib systemd multiprocessing tmpfiles DESCRIPTION="GNU libc C library" @@ -101,7 +104,7 @@ IDEPEND=" !compile-locales? ( sys-apps/locale-gen ) " BDEPEND=" - ${PYTHON_DEPS} + || ( dev-lang/python:3.11 dev-lang/python:3.10 dev-lang/python:3.9 ) >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison compile-locales? ( sys-apps/locale-gen ) @@ -863,13 +866,6 @@ pkg_pretend() { upgrade_warning } -# pkg_setup - -pkg_setup() { - # see bug 682570 - [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup -} - # src_unpack src_unpack() { diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index ffcac4cc7948..53192e4ee2dc 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -6,10 +6,13 @@ EAPI=8 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc # Please read & adapt the page as necessary if obsolete. -PYTHON_COMPAT=( python3_{9..11} ) +# Please keep the python line in BDEPEND updated and do NOT use eclasses pr +# ${PYTHON_DEPS} (since they are too strict and lead to problems with the +# package order during upgrades). + TMPFILES_OPTIONAL=1 -inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ +inherit prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ multilib systemd multiprocessing tmpfiles DESCRIPTION="GNU libc C library" @@ -39,7 +42,7 @@ MIN_PAX_UTILS_VER="1.3.3" if [[ ${PV} == 9999* ]]; then inherit git-r3 else - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + #KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"; fi @@ -101,7 +104,7 @@ IDEPEND=" !compile-locales? ( sys-apps/locale-gen ) " BDEPEND=" - ${PYTHON_DEPS} + || ( dev-lang/python:3.11 dev-lang/python:3.10 dev-lang/python:3.9 ) >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison compile-locales? ( sys-apps/locale-gen ) @@ -863,13 +866,6 @@ pkg_pretend() { upgrade_warning } -# pkg_setup - -pkg_setup() { - # see bug 682570 - [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup -} - # src_unpack src_unpack() {
