From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 10 Nov 2005 04:21:46 +0000 (+0000)
Subject: fix assert.h so xorg builds, fix arm asm string functions, fix dl_fini ordering ... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=edc6a7dc83069dd4a8f01239ca3890d760b58bfd;p=gentoo.git

fix assert.h so xorg builds, fix arm asm string functions, fix dl_fini ordering #98187, and implement the round functions so imlib2 works #111518
---

diff --git a/sys-libs/uclibc/files/digest-uclibc-0.9.27-r1 b/sys-libs/uclibc/files/digest-uclibc-0.9.27-r1
index 52c1e1585a9c..0386e393beea 100644
--- a/sys-libs/uclibc/files/digest-uclibc-0.9.27-r1
+++ b/sys-libs/uclibc/files/digest-uclibc-0.9.27-r1
@@ -1,4 +1,4 @@
-MD5 6250bd6524283bd8e7bc976d43a46ec0 uClibc-0.9.27.tar.bz2 1693895
 MD5 ab2fed54aff1801b1cd4fbfdb1403a82 uClibc-0.9.27-cvs-update-20050114.patch.bz2 839
-MD5 afeb95e839ad27f2d0177cb749d1f530 uClibc-0.9.27-patches-1.4.tar.bz2 18874
+MD5 ca1868b347a0128fd06122f60fea007f uClibc-0.9.27-patches-1.5.tar.bz2 23312
+MD5 6250bd6524283bd8e7bc976d43a46ec0 uClibc-0.9.27.tar.bz2 1693895
 MD5 d75b2239b4e27c3c9cbed1c8f6eabba6 uClibc-locale-030818.tgz 236073
diff --git a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
index d2eff5c2a137..8a331ed4fc67 100644
--- a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27-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/uclibc/uclibc-0.9.27-r1.ebuild,v 1.9 2005/09/05 07:35:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.10 2005/11/10 04:21:46 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -25,7 +25,7 @@ fi
 
 MY_P=${P/ucl/uCl}
 SVN_VER="20050114"
-PATCH_VER="1.4"
+PATCH_VER="1.5"
 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
@@ -74,6 +74,7 @@ alt_rprefix() {
 }
 
 pkg_setup() {
+	[[ -n ${UCLIBC_AND_GLIBC} ]] && return 0
 	if ! built_with_use ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then
 		eerror "You previously built uclibc with USE=-nls."
 		eerror "You cannot generate locale data with this"