commit: 8b9d01719e16b0016f6525a99e8087e8ee1b50eb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jul 24 22:45:04 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 24 22:45:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9d0171
Revert "sys-libs/glibc: relax python dependencies" This reverts commit 018d5f301fe4bf859e66bf5f1f7b9db94d8104c2. Now that bug #910288 is fixed, we don't need to do this anymore. Bug: https://bugs.gentoo.org/910288 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/glibc/glibc-2.37-r3.ebuild | 16 ++++++++++------ sys-libs/glibc/glibc-9999.ebuild | 18 +++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/sys-libs/glibc/glibc-2.37-r3.ebuild b/sys-libs/glibc/glibc-2.37-r3.ebuild index f46cdcac0bfa..c3c9ca521d37 100644 --- a/sys-libs/glibc/glibc-2.37-r3.ebuild +++ b/sys-libs/glibc/glibc-2.37-r3.ebuild @@ -6,13 +6,10 @@ EAPI=8 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc # Please read & adapt the page as necessary if obsolete. -# 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). - +PYTHON_COMPAT=( python3_{9..11} ) TMPFILES_OPTIONAL=1 -inherit prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ +inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ multilib systemd multiprocessing tmpfiles DESCRIPTION="GNU libc C library" @@ -104,7 +101,7 @@ IDEPEND=" !compile-locales? ( sys-apps/locale-gen ) " BDEPEND=" - || ( dev-lang/python:3.11 dev-lang/python:3.10 dev-lang/python:3.9 ) + ${PYTHON_DEPS} >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison compile-locales? ( sys-apps/locale-gen ) @@ -867,6 +864,13 @@ 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 11f5063768f5..a0250a2928fc 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -6,13 +6,10 @@ EAPI=8 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc # Please read & adapt the page as necessary if obsolete. -# 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). - +PYTHON_COMPAT=( python3_{9..11} ) TMPFILES_OPTIONAL=1 -inherit prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ +inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ multilib systemd multiprocessing tmpfiles DESCRIPTION="GNU libc C library" @@ -42,7 +39,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 @@ -104,7 +101,7 @@ IDEPEND=" !compile-locales? ( sys-apps/locale-gen ) " BDEPEND=" - || ( dev-lang/python:3.11 dev-lang/python:3.10 dev-lang/python:3.9 ) + ${PYTHON_DEPS} >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison compile-locales? ( sys-apps/locale-gen ) @@ -867,6 +864,13 @@ pkg_pretend() { upgrade_warning } +# pkg_setup + +pkg_setup() { + # see bug 682570 + [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup +} + # src_unpack src_unpack() {
