sync glibc-2.3.5-r1+ ebuilds

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

4 files changed, 18 insertions, 35 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d1b2bd6c4dcd..d9d463db6474 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -6,13 +6,13 @@ MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
 MD5 d4685f67b36e4a0c1fc0db8516523d2e glibc-2.3.4.20040808-r1.ebuild 27749
-MD5 0d87c5f0377915e8b63e3c56271dac98 glibc-2.3.5-r1.ebuild 40043
+MD5 269871cad4b94349d275862fcbfe533a glibc-2.3.5-r1.ebuild 39969
 MD5 a789e9155b746cc1c16da9a7604a0fb2 glibc-2.3.4.20040619-r2.ebuild 21400
 MD5 b93ff1f1ad8baa0a062abb18f22d63f9 glibc-2.3.4.20041102-r2.ebuild 41373
-MD5 7961595ad6923cae6c691284bc6197fc glibc-2.3.5.20050722.ebuild 40669
+MD5 73fc10b9878bccc90533b031bbfb7996 glibc-2.3.5.20050722.ebuild 40400
 MD5 f8bf77d5057759d82db6401f9ff5211c glibc-2.2.5-r10.ebuild 4523
 MD5 e5c30ea961ed5d60c6c4b7ee1fc240ae glibc-2.3.2-r12.ebuild 22495
-MD5 92d5b705d7c612b13dc13246c7a12d1d glibc-2.3.5.20050421.ebuild 40252
+MD5 65203448f3153faa1943b035e7c18e5f glibc-2.3.5.20050421.ebuild 40178
 MD5 cdbe2c23324cb303ee28f52927bd64f2 glibc-2.3.4.20050125-r1.ebuild 39566
 MD5 9ce86529dbae9cec9b1b3c319255729c ChangeLog 82971
 MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
@@ -135,7 +135,7 @@ MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDMNI2gIKl8Uu19MoRAiBVAJsHNiUgCzimH6eVMfFpc3qspf3mHgCcDmv3
-AToS09XnN3pyvVZGMdwMElI=
-=a2TM
+iD8DBQFDMkr8gIKl8Uu19MoRAk8WAJ9YtKH4NxEu4WuM6vE/kYFlIITKsgCeNdLC
+HoPkEbiAUKHnyJycE/p2M2A=
+=XnRg
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index 3b816c97ec96..79e99d068bc5 100644
--- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-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.5-r1.ebuild,v 1.31 2005/09/21 03:23:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.32 2005/09/22 06:10:29 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -185,11 +185,8 @@ toolchain-glibc_src_unpack() {
 	# infopages else it does not help much (mtimes change if there is a change
 	# to them with branchupdate)
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd "${WORKDIR}"
-		unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-
 		cd "${S}"
-		epatch "${WORKDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
+		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 
 		# Snapshot date patch
 		einfo "Patching version to display snapshot date ..."
@@ -789,9 +786,8 @@ want_tls() {
 			esac
 		;;
 		x86)
-			case ${CTARGET/-*} in
-				i486|i586|i686)	return 0 ;;
-			esac
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
 		;;
 	esac
 
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index 91a7b7146f5a..e4b9afa8bd3e 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.36 2005/09/16 10:18:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.37 2005/09/22 06:10:29 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -186,11 +186,8 @@ toolchain-glibc_src_unpack() {
 	# infopages else it does not help much (mtimes change if there is a change
 	# to them with branchupdate)
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd "${WORKDIR}"
-		unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-
 		cd "${S}"
-		epatch "${WORKDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
+		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 
 		# Snapshot date patch
 		einfo "Patching version to display snapshot date ..."
@@ -789,9 +786,8 @@ want_tls() {
 			esac
 		;;
 		x86)
-			case ${CTARGET/-*} in
-				i486|i586|i686)	return 0 ;;
-			esac
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
 		;;
 	esac
 
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index 239d3b26a136..cf8ed6500709 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050722.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.20050722.ebuild,v 1.16 2005/09/21 02:16:31 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.17 2005/09/22 06:10:29 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -68,11 +68,7 @@ is_crosscompile() {
 
 GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
 
-# Don't set this to :-, - allows us to override BRANCH_UPDATE to be empty:
-#
-#   ${parameter:-word}
-#     Use  Default Values.  If parameter is unset or null, the expansion of
-#     word is substituted.
+# Don't set this to :-, - allows BRANCH_UPDATE=""
 BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)}
 
 # (Recent snapshots fails with 2.6.5 and earlier with NPTL)
@@ -190,10 +186,6 @@ toolchain-glibc_src_unpack() {
 	# infopages else it does not help much (mtimes change if there is a change
 	# to them with branchupdate)
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd "${WORKDIR}"
-		# Why is it being unpacked first??
-		#unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-
 		cd "${S}"
 		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 
@@ -797,9 +789,8 @@ want_tls() {
 			esac
 		;;
 		x86)
-			case ${CTARGET/-*} in
-				i486|i586|i686)	return 0 ;;
-			esac
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
 		;;
 	esac