Index: glibc-2.7-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r1.ebuild,v
retrieving revision 1.10
diff -u -r1.10 glibc-2.7-r1.ebuild
--- glibc-2.7-r1.ebuild	10 Mar 2008 15:22:13 -0000	1.10
+++ glibc-2.7-r1.ebuild	19 Mar 2008 11:03:16 -0000
@@ -24,7 +24,6 @@
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER:-2.6.20}
 
 IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}
@@ -51,6 +50,8 @@
 	fi
 fi
 
+[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=2.6.20
+
 is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
Index: files/eblits/src_test.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v
retrieving revision 1.2
diff -u -r1.2 src_test.eblit
--- files/eblits/src_test.eblit	6 Aug 2007 09:50:08 -0000	1.2
+++ files/eblits/src_test.eblit	19 Mar 2008 11:03:16 -0000
@@ -17,6 +17,10 @@
 
 	setup_env
 
+	if use hppa ; then
+		export TIMEOUTFACTOR=5
+	fi
+
 	if [[ -z ${OABI} ]] && has_multilib_profile ; then
 		OABI=${ABI}
 		einfo "Testing multilib glibc for ABIs: $(get_install_abis)"