dont install /etc/locales.build if one already exists #72596

Package-Manager: portage-2.0.51.21-r1

10 files changed, 69 insertions, 38 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index fe980b9c7f44..889e13ffd7fd 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,16 +1,16 @@
 MD5 a21b53d7bce27855c61c23ebe3aa72ca ChangeLog 73343
 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418
-MD5 945dc5b2e3fac1658763979a320214de glibc-2.3.2-r12.ebuild 22133
+MD5 32c77366885784a5918822a271fa7309 glibc-2.3.2-r12.ebuild 22279
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 3963de6448ce6ecd712bb0f4ed8bf520 glibc-2.3.5.ebuild 39116
+MD5 cb07984b04a65a81a18753912d7b93dc glibc-2.3.5.ebuild 39230
 MD5 9b326b700170c6163c8ac6c62d8b8d8a glibc-2.3.3.20040420-r2.ebuild 21662
-MD5 2f8e3c1d953f68154702b738a3bf5bfd glibc-2.3.4.20040619-r2.ebuild 21207
-MD5 b874628ac89b22c91cd3dc355ca33684 glibc-2.3.5.20050421.ebuild 40075
-MD5 a6a820bbe10d02548cc801f29c777e74 glibc-2.3.4.20041102-r1.ebuild 33766
-MD5 c77a1f77c4f4c8e765964c5b3a0b8539 glibc-2.3.4.20040808-r1.ebuild 27574
-MD5 7735baedd145dccd8efe23d2f1b05284 glibc-2.3.4.20050125-r1.ebuild 38447
-MD5 341822b4dd125d133b152597389b8f87 glibc-2.3.4.20041102.ebuild 32843
-MD5 381fd86592b5ae14de2f3890f192f41c glibc-2.3.4.20050125.ebuild 35259
+MD5 5bdcaa4a5c28e2bdb19cafecd7ebc1d4 glibc-2.3.4.20040619-r2.ebuild 21334
+MD5 25547c355987ecc7bdce81b85baef594 glibc-2.3.5.20050421.ebuild 40189
+MD5 e656e5a8ffb364a1a01eea842e19cd4c glibc-2.3.4.20041102-r1.ebuild 33878
+MD5 95b4e7444058938794df5a13114d3ab3 glibc-2.3.4.20040808-r1.ebuild 27683
+MD5 7a02380eacb46c97302c4f1f3adab935 glibc-2.3.4.20050125-r1.ebuild 38560
+MD5 b3ff23e096e9f095cc65120cffd322ec glibc-2.3.4.20041102.ebuild 32954
+MD5 d0dac88854c0bc02ddf1c7aae2141ccc glibc-2.3.4.20050125.ebuild 35372
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
 MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
diff --git a/sys-libs/glibc/glibc-2.3.2-r12.ebuild b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
index c5f467102f69..f7c54f165886 100644
--- a/sys-libs/glibc/glibc-2.3.2-r12.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.10 2005/04/22 23:04:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.11 2005/05/16 22:23:15 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -151,10 +151,10 @@ install_locales() {
 setup_locales() {
 	if ! use userlocales ; then
 		einfo "userlocales not enabled, installing -ALL- locales..."
-	elif [ -e /etc/locales.build ]; then
+	elif [[ -e ${ROOT}/etc/locales.build ]] ; then
 		einfo "Installing locales in /etc/locales.build..."
 		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
-		cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+		cat "${ROOT}"/etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
 			>> SUPPORTED.locales
 		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
 	elif [ -e ${FILESDIR}/locales.build ]; then
@@ -696,6 +696,11 @@ EOF
 	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
 }
 
+pkg_preinst() {
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
+}
+
 pkg_postinst() {
 	# Correct me if I am wrong here, but my /etc/localtime is a file
 	# created by zic ....
diff --git a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
index f4d1437a9e84..57eca8b672d5 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.12 2005/05/14 17:58:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.13 2005/05/16 22:23:15 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -729,6 +729,11 @@ EOF
 	fi
 }
 
+pkg_preinst() {
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
+}
+
 pkg_postinst() {
 	# Correct me if I am wrong here, but my /etc/localtime is a file
 	# created by zic ....
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index 840adbe38371..61254ea54f1c 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.44 2005/04/22 23:04:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.45 2005/05/16 22:23:15 vapier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -910,6 +910,9 @@ pkg_preinst() {
 	# 2004.3 -> 2005.0 upgrade script.
 	# It can be removed after 2004.3 has been purged from portage.
 	use amd64 && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 pkg_postinst() {
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
index 8fdb2a2299f9..d0740536032a 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild,v 1.9 2005/05/03 05:12:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild,v 1.10 2005/05/16 22:23:15 vapier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -1079,11 +1079,14 @@ pkg_preinst() {
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}/$(get_libdir)/tls ] && use nptlonly ; then
-		addwrite /${ROOT}/$(get_libdir)/
+	if [[ -d ${ROOT}/$(get_libdir)/tls ]] && use nptlonly ; then
+		addwrite "${ROOT}"/$(get_libdir)/
 		ewarn "nptlonly in USE, removing /${ROOT}/$(get_libdir)/tls..."
-		rm -rf /${ROOT}/$(get_libdir)/tls || die
+		rm -r "${ROOT}"/$(get_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 pkg_postinst() {
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index 63f5792426de..3ec256416b68 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.50 2005/04/22 23:04:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.51 2005/05/16 22:23:15 vapier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -1054,11 +1054,14 @@ pkg_preinst() {
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}/$(get_libdir)/tls ] && use nptlonly ; then
-		addwrite /${ROOT}/$(get_libdir)/
+	if [[ -d ${ROOT}/$(get_libdir)/tls ]] && use nptlonly ; then
+		addwrite "${ROOT}"/$(get_libdir)/
 		ewarn "nptlonly in USE, removing /${ROOT}/$(get_libdir)/tls..."
-		rm -rf /${ROOT}/$(get_libdir)/tls || die
+		rm -r "${ROOT}"/$(get_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 pkg_postinst() {
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index 42d432abbf8a..6d4aff1aabf7 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.46 2005/05/16 03:03:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.47 2005/05/16 22:23:15 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -278,11 +278,14 @@ toolchain-glibc_pkg_preinst() {
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}$(alt_libdir)/tls ] && ! { want_nptl && want_linuxthreads; }; then
-		addwrite /${ROOT}$(alt_libdir)/
+	if [[ -d ${ROOT}$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
+		addwrite "${ROOT}"/$(alt_libdir)/
 		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -rf /${ROOT}$(alt_libdir)/tls || die
+		rm -r "${ROOT}"/$(alt_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 toolchain-glibc_src_install() {
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild
index 7a00c64418a9..48b2c568f24e 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.38 2005/04/29 16:20:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.39 2005/05/16 22:23:15 vapier Exp $
 
 KEYWORDS="~amd64 ~mips ~sparc ~x86 -ppc"
 
@@ -228,11 +228,14 @@ toolchain-glibc_pkg_preinst() {
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}$(alt_libdir)/tls ] && { use nptlonly || use !nptl; }; then
-		addwrite /${ROOT}$(alt_libdir)/
+	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && { use nptlonly || use !nptl; }; then
+		addwrite "${ROOT}"/$(alt_libdir)/
 		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -rf /${ROOT}$(alt_libdir)/tls || die
+		rm -r "${ROOT}"/$(alt_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 toolchain-glibc_src_install() {
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index 4b5ebf4e6e15..7b9f3e97cd88 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.8 2005/05/16 03:03:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.9 2005/05/16 22:23:15 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -286,11 +286,14 @@ toolchain-glibc_pkg_preinst() {
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}$(alt_libdir)/tls ] && ! { want_nptl && want_linuxthreads; }; then
-		addwrite /${ROOT}$(alt_libdir)/
+	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
+		addwrite "${ROOT}"/$(alt_libdir)/
 		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -rf /${ROOT}$(alt_libdir)/tls || die
+		rm -r "${ROOT}"/$(alt_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 toolchain-glibc_src_install() {
diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild
index 99eff0014350..be5a7da59773 100644
--- a/sys-libs/glibc/glibc-2.3.5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.14 2005/05/16 03:03:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.15 2005/05/16 22:23:15 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -282,11 +282,14 @@ toolchain-glibc_pkg_preinst() {
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
-	if [ -d /${ROOT}$(alt_libdir)/tls ] && ! { want_nptl && want_linuxthreads; }; then
-		addwrite /${ROOT}$(alt_libdir)/
+	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
+		addwrite "${ROOT}"/$(alt_libdir)/
 		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -rf /${ROOT}$(alt_libdir)/tls || die
+		rm -r "${ROOT}"/$(alt_libdir)/tls || die
 	fi
+
+	# Shouldnt need to keep this updated
+	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
 }
 
 toolchain-glibc_src_install() {