Update non-multilib amd64 patch for glibc-2.4 #125793 by Jean Bréfort and cut out some old code

Package-Manager: portage-2.1_pre5-r4

4 files changed, 49 insertions, 21 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index f4be21dfa688..e492de67b875 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.434 2006/03/10 23:54:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.435 2006/03/11 09:21:48 vapier Exp $
+
+  11 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/2.4/glibc-gentoo-libdir.patch, glibc-2.4.ebuild:
+  Update non-multilib amd64 patch for glibc-2.4 #125793 by Jean Bréfort.
 
 *glibc-2.4 (10 Mar 2006)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d25226704078..438e199363b9 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f7a4229b2216d2fc0060080b13ad67a8 ChangeLog 90393
-RMD160 0cca4d70e5d94ab9021449dbc497c3e4e30e9aff ChangeLog 90393
-SHA256 bfef6de509aebb65b45153219103db04a49fde419bc0b32e53f136ed2d5734a4 ChangeLog 90393
+MD5 16bc1ad4e8791df419e47fb7bda5e59d ChangeLog 90576
+RMD160 54c91d574fac5772e834c2285bf32a6d56e7ceb6 ChangeLog 90576
+SHA256 4aa71f42006e6f4222491e76a12104dd015351e282cf7b387cb4b6a7df2835fc ChangeLog 90576
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -289,6 +289,9 @@ SHA256 34bb6a47b634bb19506f13b652ad24a9e8644369cdb7729d9ea32edcec969370 files/2.
 MD5 394baa59e2aac7cbc649a77f386c000d files/2.3.6/host.conf 937
 RMD160 8e5e0f24d65fa744c3d182344808766609cb2619 files/2.3.6/host.conf 937
 SHA256 0d30aa973b76d6b2c1bc947046978bd0a6f61d7aaf495caf361d14d16a932348 files/2.3.6/host.conf 937
+MD5 818c7dc9314e97d36d4dff5efb480066 files/2.4/glibc-gentoo-libdir.patch 991
+RMD160 b68d1bb0fdbff82922905fff6a5d49301fa85c34 files/2.4/glibc-gentoo-libdir.patch 991
+SHA256 2358695c5c0a1e324ebb9c4941fb043e07b5c98cca6ab0685e5412524f2b359c files/2.4/glibc-gentoo-libdir.patch 991
 MD5 bed7cbcac1e8582deda43664e5b3f19c files/digest-glibc-2.2.5-r10 290
 RMD160 d1e6a3360e9cbf8e1dbe6589ed8524ac2eae4e86 files/digest-glibc-2.2.5-r10 290
 SHA256 4f8f80b5f5795862c929f18b12a5aec45e12ca1352b5f58a8399a62db791dfc7 files/digest-glibc-2.2.5-r10 290
@@ -418,16 +421,16 @@ SHA256 f41912c160b24e166391e32106846e9ad0509215034101c521cf559bbe7e38dd glibc-2.
 MD5 de12b8950c10db441f5c5229a7809e76 glibc-2.3.6.ebuild 40698
 RMD160 335e0e0dd2e2891a761eaf2014aaeb4f2615f276 glibc-2.3.6.ebuild 40698
 SHA256 4ff27f682df4b31ef7b2aebe576e1b781ec1df566a0e0bfc899a603dd5cba723 glibc-2.3.6.ebuild 40698
-MD5 1c2b146e4623d57d8b141167e9d4c428 glibc-2.4.ebuild 43107
-RMD160 a1572fa9003bc6b06798fec0a434eab9a17dcb81 glibc-2.4.ebuild 43107
-SHA256 7332318cc20bfef6a7f13d22b9a572e7809382c26ad4af45e14d721c4c35d6b2 glibc-2.4.ebuild 43107
+MD5 f6432d7625b2efa3229c5b39f309aae9 glibc-2.4.ebuild 42636
+RMD160 14ff50bc326cc7785e7ff1034b668383565caf9b glibc-2.4.ebuild 42636
+SHA256 0455b3a7ac068ee568d752fa396ecd194fce4833021b965413017e5c7532d24a glibc-2.4.ebuild 42636
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEEpRB2+ySkm8kpY0RAqR6AJ9hFFLBTByEk04jB81jaCahulqKQQCgtTzs
-xa0nE6H9we6mC77dOaxz89E=
-=HtPE
+iD8DBQFEEpcW2+ySkm8kpY0RAhJXAKCRoFvIB1Atm5k7RSWMDPNqLqq5BACdEgDl
+LqpuCpte1d7t9wC8e0CuZpI=
+=3o+t
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/2.4/glibc-gentoo-libdir.patch b/sys-libs/glibc/files/2.4/glibc-gentoo-libdir.patch
new file mode 100644
index 000000000000..f263746774f6
--- /dev/null
+++ b/sys-libs/glibc/files/2.4/glibc-gentoo-libdir.patch
@@ -0,0 +1,28 @@
+--- glibc-2.4/sysdeps/unix/sysv/linux/configure
++++ glibc-2.4/sysdeps/unix/sysv/linux/configure
+@@ -224,23 +224,12 @@
+ # in /lib and /etc.
+ case "$prefix" in
+ /usr | /usr/)
+-  # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
+-  # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
+-  # and libc_cv_localedir.
+-  test -n "$libc_cv_slibdir" || \
+-  case $machine in
+-  sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64)
+-    libc_cv_slibdir="/lib64"
++  libc_cv_slibdir="/@GENTOO_LIBDIR@"
+     if test "$libdir" = '${exec_prefix}/lib'; then
+-      libdir='${exec_prefix}/lib64';
++      libdir='${exec_prefix}/@GENTOO_LIBDIR@'
+       # Locale data can be shared between 32bit and 64bit libraries
+       libc_cv_localedir='${exec_prefix}/lib/locale'
+     fi
+-    ;;
+-  *)
+-    libc_cv_slibdir="/lib"
+-    ;;
+-  esac
+   # Allow the user to override the path with --sysconfdir
+   if test $sysconfdir = '${prefix}/etc'; then
+     libc_cv_sysconfdir=/etc
diff --git a/sys-libs/glibc/glibc-2.4.ebuild b/sys-libs/glibc/glibc-2.4.ebuild
index d71336c60341..14ae3141064d 100644
--- a/sys-libs/glibc/glibc-2.4.ebuild
+++ b/sys-libs/glibc/glibc-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4.ebuild,v 1.2 2006/03/11 09:09:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4.ebuild,v 1.3 2006/03/11 09:21:48 vapier Exp $
 
 # TODO:
 #  - fix warning from glibc build system:
@@ -57,7 +57,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-omitfp profile"
+IUSE="nls pic build nptl nptlonly hardened userlocales multilib selinux glibc-omitfp profile"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -924,7 +924,6 @@ glibc_do_configure() {
 	popd > /dev/null
 
 	use nls || myconf="${myconf} --disable-nls"
-	use erandom || myconf="${myconf} --disable-dev-erandom"
 	myconf="${myconf} $(use_enable hardened stackguard-randomization)"
 	if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then
 		myconf="${myconf} --enable-old-ssp-compat"
@@ -1148,12 +1147,7 @@ src_unpack() {
 	setup_env
 
 	case $(tc-arch) in
-		hppa)
-			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 2000-all-2.3.2-propolice-guard-functions-v3.patch"
-			use hardened || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6490_hppa_hardened-disable__init_arrays.patch"
-		;;
 		mips)
-			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch 6640_mips_unistd_h-fixes.patch"
 			use_multilib \
 				&& GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \
 				|| GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
@@ -1190,7 +1184,6 @@ src_unpack() {
 	else
 		echo "yes" > "${T}"/.ssp.compat
 	fi
-	#epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
 
 	case $(tc-arch) in
 		#alpha)
@@ -1200,8 +1193,8 @@ src_unpack() {
 		amd64)
 			if ! has_multilib_profile && ! is_crosscompile; then
 				# CONF_LIBDIR support
-				epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
-				sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
+				epatch "${FILESDIR}"/2.4/glibc-gentoo-libdir.patch
+				sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" "${S}"/sysdeps/unix/sysv/linux/configure
 			fi
 		;;
 		ppc64)