commit: 6d76d43044be0b610edfcf4f7fda7c976f47e31e Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Fri Feb 14 14:12:14 2025 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sat Feb 22 09:38:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d76d430
sys-libs/glibc: Port to ver_replacing Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> sys-libs/glibc/glibc-2.41.ebuild | 18 +++++++----------- sys-libs/glibc/glibc-9999.ebuild | 18 +++++++----------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/sys-libs/glibc/glibc-2.41.ebuild b/sys-libs/glibc/glibc-2.41.ebuild index 9706271cc1ec..394b594a66ff 100644 --- a/sys-libs/glibc/glibc-2.41.ebuild +++ b/sys-libs/glibc/glibc-2.41.ebuild @@ -33,7 +33,7 @@ MIN_PAX_UTILS_VER="1.3.3" MIN_SYSTEMD_VER="254.9-r1" inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ - multilib systemd multiprocessing tmpfiles + multilib systemd multiprocessing tmpfiles eapi9-ver DESCRIPTION="GNU libc C library" HOMEPAGE="https://www.gnu.org/software/libc/"; @@ -895,16 +895,12 @@ upgrade_warning() { is_crosscompile && return if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then - local oldv newv=$(ver_cut 1-2 ${PV}) - for oldv in ${REPLACING_VERSIONS}; do - if ver_test ${oldv} -lt ${newv}; then - ewarn "After upgrading glibc, please restart all running processes." - ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)." - ewarn "Alternatively, reboot your system." - ewarn "(See bug #660556, bug #741116, bug #823756, etc)" - break - fi - done + if ver_replacing -lt $(ver_cut 1-2 ${PV}); then + ewarn "After upgrading glibc, please restart all running processes." + ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)." + ewarn "Alternatively, reboot your system." + ewarn "(See bug #660556, bug #741116, bug #823756, etc)" + fi fi } diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 3d994649ea35..f66d2de88db7 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -33,7 +33,7 @@ MIN_PAX_UTILS_VER="1.3.3" MIN_SYSTEMD_VER="254.9-r1" inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ - multilib systemd multiprocessing tmpfiles + multilib systemd multiprocessing tmpfiles eapi9-ver DESCRIPTION="GNU libc C library" HOMEPAGE="https://www.gnu.org/software/libc/"; @@ -895,16 +895,12 @@ upgrade_warning() { is_crosscompile && return if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then - local oldv newv=$(ver_cut 1-2 ${PV}) - for oldv in ${REPLACING_VERSIONS}; do - if ver_test ${oldv} -lt ${newv}; then - ewarn "After upgrading glibc, please restart all running processes." - ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)." - ewarn "Alternatively, reboot your system." - ewarn "(See bug #660556, bug #741116, bug #823756, etc)" - break - fi - done + if ver_replacing -lt $(ver_cut 1-2 ${PV}); then + ewarn "After upgrading glibc, please restart all running processes." + ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)." + ewarn "Alternatively, reboot your system." + ewarn "(See bug #660556, bug #741116, bug #823756, etc)" + fi fi }
