import a bunch of fixes by psm

Package-Manager: portage-2.0.51-r15

2 files changed, 16 insertions, 22 deletions

diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 7a49532a0ee9..18d5a71d4a2f 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,7 +1,7 @@
 MD5 c9800c105dd5709742b374c335560842 ChangeLog 8488
 MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
 MD5 a4612f199b26df52b09c0055f5672567 uclibc-0.9.26-r7.ebuild 7862
-MD5 bfc0102c633a8b0082bc69b2f4cf1bdf uclibc-0.9.27.ebuild 10277
+MD5 2e016d5a851f50f8ef7711ae1ac168c3 uclibc-0.9.27.ebuild 10245
 MD5 042cbe1dee4ebf4352b56ab42e22c1d9 uclibc-0.9.26-r8.ebuild 10248
 MD5 6fb9166cb9a919ce76e4ebd58f74fec5 files/0.9.26-r8-cvs.patch 1184
 MD5 8801c8a97f025fb426cba64a5b9a4501 files/digest-uclibc-0.9.27 229
diff --git a/sys-libs/uclibc/uclibc-0.9.27.ebuild b/sys-libs/uclibc/uclibc-0.9.27.ebuild
index b65f0064b7fa..2cc9e23f6c65 100644
--- a/sys-libs/uclibc/uclibc-0.9.27.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27.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/uclibc/uclibc-0.9.27.ebuild,v 1.7 2005/02/20 03:08:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27.ebuild,v 1.8 2005/02/21 02:22:12 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -17,20 +17,19 @@ if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
 	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
 fi
 
-# To make a new CVS_VER we do.
+# To make a new SVN_VER we do.
 # wget -O - http://uclibc.org/downloads/snapshots/uClibc-`date +%Y%m%d`.tar.bz2 | tar jxf -
-# tar jxf /usr/portage/distfiles/uClibc-0.9.26.tar.bz2
-# diff -urN --exclude .cvsignore --exclude CVS uClibc-0.9.26 uClibc | bzip2 - > uClibc-0.9.26-cvs-update-`date +%Y%m%d`.patch.bz2
-# rm -rf uClibc-0.9.26-cvs-update-`date +%Y%m%d`.patch.bz2  uClibc uClibc-0.9.26
+# tar jxf /usr/portage/distfiles/uClibc-0.9.27.tar.bz2
+# diff -urN --exclude .svn uClibc-0.9.27 uClibc | bzip2 - > uClibc-0.9.27-svn-update-`date +%Y%m%d`.patch.bz2
+# rm -rf uClibc-0.9.27-svn-update-`date +%Y%m%d`.patch.bz2  uClibc uClibc-0.9.27
 
 MY_P=${P/ucl/uCl}
-# only CVS_VER >= 20041117 is supported
-CVS_VER="20050114"
+SVN_VER="20050114"
 PATCH_VER="1.0"
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="http://www.uclibc.org/"
 SRC_URI="http://www.kernel.org/pub/linux/libs/uclibc/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-cvs-update-${CVS_VER}.patch.bz2
+	mirror://gentoo/${MY_P}-cvs-update-${SVN_VER}.patch.bz2
 	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="LGPL-2"
@@ -120,8 +119,8 @@ src_unpack() {
 
 	########## PATCHES ##########
 
-	[[ -n ${CVS_VER} ]] && \
-		epatch ${WORKDIR}/${MY_P}-cvs-update-${CVS_VER}.patch
+	[[ -n ${SVN_VER} ]] && \
+		epatch ${WORKDIR}/${MY_P}-cvs-update-${SVN_VER}.patch
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
@@ -166,6 +165,7 @@ src_unpack() {
 	done
 	echo "UCLIBC_HAS_FULL_RPC=y" >> .config
 	echo "PTHREADS_DEBUG_SUPPORT=y" >> .config
+	echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config
 
 	#if use nls ; then
 	#	sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config
@@ -259,11 +259,7 @@ src_compile() {
 		emake -j1 ${makeopts} utils || die "could not make utils"
 	fi
 
-	if ! use build ; then
-		if ! hasq maketest $RESTRICT ; then
-			src_test
-		fi
-	fi
+	! use build && ! hasq test $RESTRICT && src_test
 }
 
 src_test() {
@@ -284,6 +280,10 @@ src_install() {
 	# scsi is uclibc's own directory since cvs 20040212
 	rm -r "${D}"$(alt_prefix)/include/{asm,linux,asm-generic}
 
+	# clean up misc cruft
+	find "${D}"$(alt_prefix)/include -type d '(' -name CVS -o -name .svn ')' | xargs rm -r
+	find "${D}"$(alt_prefix)/include -type f -name .cvsignore | xargs rm -f
+
 	# Make sure we install the sys-include symlink so that when 
 	# we build a 2nd stage cross-compiler, gcc finds the target 
 	# system headers correctly.  See gcc/doc/gccinstall.info
@@ -320,12 +320,6 @@ if [[ ${CHOST} == *-uclibc ]] ; then
 		echo "UTC" > "${ROOT}"/etc/TZ
 	fi
 
-	if [[ ! -e ${ROOT}/etc/ld.so.conf ]] ; then
-		[[ -d ${ROOT}/usr/X11R6/lib ]] \
-			&& echo "/usr/X11R6/lib" > "${ROOT}"/etc/ld.so.conf \
-			|| > "${ROOT}"/etc/ld.so.conf
-	fi
-
 	if [[ ${ROOT} == "/" ]] ; then
 		# update cache before reloading init
 		/sbin/ldconfig