gentoo auto-resync : 27:08:2024 - 12:00:02

2 files changed, 17 insertions, 16 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b18afc2a1149..37d3c18ac6c9 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -44,7 +44,7 @@ DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb7
 DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
 DIST locale-gen-2.22.tar.gz 7971 BLAKE2B 2dc66fa69bf51799d0c34459b654fba6998b80a7e322e9b670036c967e269ad921f50195e6e34c4a83c1f0bad191fd5aa3f37defb82271b73acbca07b7e49d08 SHA512 9798b10dbbc792345a7b7a121dec5f4bba9839a8aec010f01a09f3402fd5bf2376f79e03a6a19bc357010db780037a8811c381136ce19be1f1370374906dff38
 DIST locale-gen-2.23.tar.gz 7977 BLAKE2B bf2cc1fa05828a9133789133ce2d910662f1b5979269869cd76dac45831c45917700fc81357441fc7691af23196c6a6c3a28bb4440ceb6a5a3b17dbdc55c2bcc SHA512 f6b3daf3e2f10bc2f68626d8e7edc0f27eb0fe16bfe8840904a1b13d8fc76318d9f83277ee7fcb7a6db177413ba8a2cda94493e56d01df3a20ca37fed64e469c
-EBUILD glibc-2.19-r3.ebuild 38671 BLAKE2B 41b7e3b67dcb71c6a0e48277d9987778c7dd56cfc29c5fee7d825a2e160a2ce2ba9cc1dae0d05e98adf28239d839b3d79680fe2014efcac9356f5d4fdb0e0f67 SHA512 7294a19e2204d7d5f881864a35198a62821abce5949f30ec99cae422576ae61b4193350cd4c6aae4bde56a683d4087947dcbf148f6745602b4e5d33cf5119227
+EBUILD glibc-2.19-r3.ebuild 38671 BLAKE2B a8c18c106dcc2569b25f483567c088308fcae40bac9c0988ba36ea3ae1a6174b3d7139dc966de923157ebab891a24a73a2efa4e83c953d0eee9248136adcc40a SHA512 4fd4a820625b7bd2e7627e74e449f1e5028a3dd48e6a8cc474d2528b28777618cc6c7c80043963e0b7c96ef8a1d1da547a4ffe53dd81ac0702bb82366a81f010
 EBUILD glibc-2.31-r7.ebuild 44612 BLAKE2B 57bf608e30337d95d5c8c3002b3dc795052a9fcf0cddd89ca1a6c560d0e120db775ea6d3269b392fc611da77256b36e33f977e3c37dd8ef65c5a1a4c3cf4731f SHA512 d55db06fe7190d592b2fb3c99a194ef0b5da0b64409a9a7d69eeb8942c8d3dfe6af58a9559f4b34c4d0985580ef34347532ecda15a5c8d0b2bed4de7874a17e0
 EBUILD glibc-2.32-r8.ebuild 44970 BLAKE2B d39fb2901adee5b32ef87c09e06f821b06d7bc673315eb37f53b8a0c9cf5dff244c6812f96ead96095634f4605a7345b27507f846c098b3e0f1d2d028a28ce0a SHA512 a3bc29194010f5a2ee766805decc705a3491bd5eed1ac3bc5915f4973851a41288fca0eff7cc9feaa58856c0e9b3299ada711dd979e97a107edac08057eff0a6
 EBUILD glibc-2.33-r14.ebuild 48506 BLAKE2B 1c59cc020ccdf520e08a952868617b0087fb0b9d74c2c06d298bfb919fce68a0eb5fae6d54948c5c6f705cf0dc5350516c35a0e365458a27155c544aa6a36f13 SHA512 0e04638d31e273ffd5c6712f58caedd4e96a9e6d237b0209d38d246f47e17254696f4acf692d6a36b6744baa7fd4171ccf6b0fe6bc4e2812f4f7bf12397b806f
diff --git a/sys-libs/glibc/glibc-2.19-r3.ebuild b/sys-libs/glibc/glibc-2.19-r3.ebuild
index 06c7071e8efb..1ebbe700f363 100644
--- a/sys-libs/glibc/glibc-2.19-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 TMPFILES_OPTIONAL=1
 
@@ -10,6 +10,7 @@ inherit prefix toolchain-funcs flag-o-matic gnuconfig \
 
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
+
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
 SLOT="2.2"
 
@@ -464,7 +465,7 @@ check_devpts() {
 	[[ ${MERGE_TYPE} == "buildonly" ]] && return
 
 	# Only sanity check when installing the native glibc.
-	[[ ${ROOT} != "/" ]] && return
+	[[ -n ${ROOT} ]] && return
 
 	# If they're opting in to the old suid code, then no need to check.
 	use suid && return
@@ -552,7 +553,7 @@ sanity_prechecks() {
 
 	# Prevent native builds from downgrading
 	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ ${ROOT} == "/" ]] && \
+	   [[ -z ${ROOT} ]] && \
 	   [[ ${CBUILD} == ${CHOST} ]] && \
 	   [[ ${CHOST} == ${CTARGET} ]] ; then
 
@@ -625,8 +626,8 @@ sanity_prechecks() {
 				STAT=0
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
-			eend $STAT
-			if [[ $STAT -ne 0 ]]; then
+			eend ${STAT}
+			if [[ ${STAT} -ne 0 ]]; then
 				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
 				eerror "Seek support otherwise."
 				die "Unable to execute 32-bit binaries"
@@ -1030,10 +1031,10 @@ src_test() {
 run_locale_gen() {
 	# if the host locales.gen contains no entries, we'll install everything
 	local root="$1"
-	local locale_list="${root}/etc/locale.gen"
+	local locale_list="${root%/}/etc/locale.gen"
 	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
 		ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-		locale_list="${root}/usr/share/i18n/SUPPORTED"
+		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
 	fi
 
 	locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
@@ -1044,7 +1045,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install
+	emake install_root="${D}/$(alt_prefix)" install
 
 	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
 	# which come without headers etc. Only needed for binary packages since the
@@ -1061,9 +1062,9 @@ glibc_do_src_install() {
 		# Move versioned .a file out of libdir to evade portage QA checks
 		# instead of using gen_usr_ldscript(). We fix ldscript as:
 		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
-		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
 		dodir $(alt_usrlibdir)/${P}
-		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
 	fi
 
 	# We'll take care of the cache ourselves
@@ -1218,7 +1219,7 @@ glibc_do_src_install() {
 glibc_headers_install() {
 	local builddir=$(builddir "headers")
 	cd "${builddir}"
-	emake install_root="${D}$(alt_prefix)" install-headers
+	emake install_root="${D}/$(alt_prefix)" install-headers
 
 	insinto $(alt_headers)/gnu
 	doins "${S}"/include/gnu/stubs.h
@@ -1289,7 +1290,7 @@ pkg_preinst() {
 		einfo "Defaulting /etc/host.conf:multi to on"
 	fi
 
-	[[ ${ROOT} != "/" ]] && return 0
+	[[ -n ${ROOT} ]] && return 0
 	[[ -d ${ED}/$(get_libdir) ]] || return 0
 	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
 }
@@ -1300,11 +1301,11 @@ pkg_postinst() {
 
 	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
 		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
 	fi
 
-	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		use compile-locales || run_locale_gen "${EROOT}"
+	if ! is_crosscompile && [[ -n ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
 	fi
 
 	# Check for sanity of /etc/nsswitch.conf, take 2