Stabilize, add a few minor bugfixes, and add support for USE=savedconfig.

(Portage version: 2.1_pre3-r1)

3 files changed, 27 insertions, 8 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index 05250d661daa..7cc879e8c07f 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/uclibc
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.14 2005/11/25 22:20:41 solar Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.15 2006/01/27 01:05:51 vapier Exp $
+
+  27 Jan 2006; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.28.ebuild:
+  Stabilize, add a few minor bugfixes, and add support for USE=savedconfig.
 
   25 Nov 2005; <solar@gentoo.org> uclibc-0.9.28.ebuild:
   - the __uClibc_start_main is becoming a problem for users thus we need to
diff --git a/sys-libs/uclibc/files/digest-uclibc-0.9.28 b/sys-libs/uclibc/files/digest-uclibc-0.9.28
index 3159c1262a41..cb777e041c0f 100644
--- a/sys-libs/uclibc/files/digest-uclibc-0.9.28
+++ b/sys-libs/uclibc/files/digest-uclibc-0.9.28
@@ -1,3 +1,3 @@
-MD5 c546948abd2c1e3f8cbb01caae248537 uClibc-0.9.28-patches-1.2.tar.bz2 19862
+MD5 3417111406babbddc09ff481be858692 uClibc-0.9.28-patches-1.3.tar.bz2 22522
 MD5 1ada58d919a82561061e4741fb6abd29 uClibc-0.9.28.tar.bz2 1763847
 MD5 d75b2239b4e27c3c9cbed1c8f6eabba6 uClibc-locale-030818.tgz 236073
diff --git a/sys-libs/uclibc/uclibc-0.9.28.ebuild b/sys-libs/uclibc/uclibc-0.9.28.ebuild
index a9723d1a18ab..fdf90df221ea 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.16 2005/12/29 12:30:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.17 2006/01/27 01:05:51 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -21,7 +21,7 @@ fi
 
 MY_P=uClibc-${PV}
 SVN_VER=""
-PATCH_VER="1.2"
+PATCH_VER="1.3"
 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
@@ -37,8 +37,8 @@ LICENSE="LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
-KEYWORDS="-* ~arm ~m68k -mips ~ppc sh ~sparc ~x86"
-IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen userlocales wordexp"
+KEYWORDS="-* arm m68k -mips ppc sh sparc x86"
+IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen savedconfig userlocales wordexp"
 RESTRICT="nostrip"
 
 RDEPEND=""
@@ -320,6 +320,22 @@ src_unpack() {
 		echo "UCLIBC_BUILD_NOW=n" >> .config
 	fi
 
+	# Allow users some custom control over the config
+	if use savedconfig ; then
+		[[ -r .config ]] && rm .config
+		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
+			configfile=${ROOT}/etc/${PN}/${CTARGET}/${conf}.config
+			einfo "Checking existence of ${configfile} ..."
+			[[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
+			if [[ -r ${configfile} ]] ; then
+				cp "${configfile}" "${S}"/.config
+				einfo "Found your ${configfile} and using it."
+				einfo "Note that this feature is *totally unsupported*."
+				break
+			fi
+		done
+	fi
+
 	# setup build and run paths
 	local cross=${CTARGET}-
 	type -p ${cross}ar > /dev/null || cross=""