Added clean hppa patches. Seems not to suffer of the -r8 problems

5 files changed, 32 insertions, 9 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index b324dacda10c..1bb0c948e6d5 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.106 2003/11/19 02:56:44 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.107 2003/11/19 04:39:08 gmsoft Exp $
 
 *glibc-2.3.2-r9 (18 Nov 2003)
 
+  19 Nov 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r9.ebuild :
+  Added clean hppa patches. Seems not to suffer of the -r8 problems.
+
   18 Nov 2003; Guy Martin <gmsoft@gentoo.org> glibc-2.3.2-r9.ebuild :
   Removed hppa stuff. New patching method should come shortly.
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 1121b824bc73..8018ae19862f 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,11 +1,11 @@
-MD5 5917261838b8fc4fe7f252d2ba75fec2 ChangeLog 23003
+MD5 4b9c5355584988a1fdc99a8afa4163e8 ChangeLog 23004
 MD5 8ed2bf1fdf0fa74a7a40ac1bbf9b1786 glibc-2.2.5-r9.ebuild 10003
 MD5 4dd6a7760b1e06c798d72a1f22d49729 glibc-2.3.1-r5.ebuild 10876
 MD5 2d20c306db480448c6f63e56b5982b79 glibc-2.3.2-r2.ebuild 17907
 MD5 886f5f85437a7bdc2b093a8be503eab7 glibc-2.3.2-r3.ebuild 17301
-MD5 3b6a779f415518699bd605ec415c497a glibc-2.3.2-r7.ebuild 17581
+MD5 4762cd7d1608529c8e8d3aca4e9e2ca2 glibc-2.3.2-r7.ebuild 17581
 MD5 68d1760ff9a4410a4fd159b3de9cb4a5 glibc-2.3.2-r8.ebuild 17047
-MD5 268426c3d6320af7bfb61e2d307ebd5a glibc-2.3.2-r9.ebuild 18393
+MD5 eac2192ff886e6059489c3037b759f13 glibc-2.3.2-r9.ebuild 18393
 MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r5 141
 MD5 ab42c21ee076dc4627576d2434a7e33f files/digest-glibc-2.3.2-r3 143
 MD5 3c4500d97857f0613d408e7eaa930ec1 files/digest-glibc-2.3.2-r2 234
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.2-r9 b/sys-libs/glibc/files/digest-glibc-2.3.2-r9
index ca81b3586520..07e3a8d0f559 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.2-r9
+++ b/sys-libs/glibc/files/digest-glibc-2.3.2-r9
@@ -1,3 +1,4 @@
 MD5 ede969aad568f48083e413384f20753c glibc-2.3.2.tar.bz2 13377170
 MD5 894b8969cfbdf787c73e139782167607 glibc-linuxthreads-2.3.2.tar.bz2 216310
 MD5 29fe849eca3e5aa2a2eb9e4055d93748 glibc-2.3.2-branch-update-20031115.patch.bz2 1692480
+MD5 c7c27c0821245d98a0568a475c08f4e9 glibc-2.3.2-hppa-patches-p1.tar.bz2 18793
diff --git a/sys-libs/glibc/glibc-2.3.2-r7.ebuild b/sys-libs/glibc/glibc-2.3.2-r7.ebuild
index af72056aea32..a6ff30a376bc 100644
--- a/sys-libs/glibc/glibc-2.3.2-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r7.ebuild,v 1.5 2003/11/19 02:56:44 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r7.ebuild,v 1.6 2003/11/19 04:39:09 gmsoft Exp $
 
 IUSE="nls pic build nptl"
 
@@ -351,7 +351,7 @@ src_unpack() {
 		cd ${WORKDIR}
 		unpack ${P}-hppa-patches-p1.tar.bz2
 		cd ${S}
-		EPATCH_EXCLUDE="010_hppa_misc.patch 030_hppa_sysdep1.patch 040_hppa_sysdep2.patch 050_hppa_sysdep3.patch"
+		EPATCH_EXCLUDE="010* 030* 040* 050*"
 		#EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${P}-hppa-patches/
 		#Small workaround for bug 33636
 		for i in $EPATCH_EXCLUDE
diff --git a/sys-libs/glibc/glibc-2.3.2-r9.ebuild b/sys-libs/glibc/glibc-2.3.2-r9.ebuild
index c04ec020cb89..110290eb3951 100644
--- a/sys-libs/glibc/glibc-2.3.2-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r9.ebuild,v 1.2 2003/11/18 22:32:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r9.ebuild,v 1.3 2003/11/19 04:39:09 gmsoft Exp $
 
 IUSE="nls pic build nptl"
 
@@ -50,10 +50,11 @@ SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${MY_PV}.tar.bz2
 	ftp://sources.redhat.com/pub/glibc/snapshots/glibc-${MY_PV}.tar.bz2
 	http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${MY_PV}.tar.bz2
 	ftp://sources.redhat.com/pub/glibc/snapshots/glibc-linuxthreads-${MY_PV}.tar.bz2
-	mirror://gentoo/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+	mirror://gentoo/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2
+	hppa? ( mirror://gentoo/${P}-hppa-patches-p1.tar.bz2 )"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
-KEYWORDS="~x86 ~sparc ~amd64 -hppa ~alpha"
+KEYWORDS="~x86 ~sparc ~amd64 ~hppa ~alpha"
 SLOT="2.2"
 LICENSE="LGPL-2"
 
@@ -373,6 +374,24 @@ src_unpack() {
 		cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-ia64-LOAD_ARGS-fixup.patch
 	fi
 
+	if [ "${ARCH}" = "hppa" ]
+	then
+		cd ${WORKDIR}
+		unpack ${P}-hppa-patches-p1.tar.bz2
+		cd ${S}
+		EPATCH_EXCLUDE="010* 020* 030* 040* 050* 055*"
+		for i in ${EPATCH_EXCLUDE}
+		do
+			rm -f ${WORKDIR}/${P}-hppa-patches/$i
+		done
+		for i in ${WORKDIR}/${P}-hppa-patches/*
+		do
+			einfo Applying `basename $i`...
+			patch -p1 < $i
+		done
+		einfo Applying glibc23-07-hppa-atomicity.dpatch...
+		patch -p 1 < ${FILESDIR}/2.3.1/glibc23-07-hppa-atomicity.dpatch
+	fi
 
 	# Fix permissions on some of the scripts
 	chmod u+x ${S}/scripts/*.sh