proper gnuconfig/uclibc lovin

3 files changed, 15 insertions, 32 deletions

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index fa35661aefb8..a09e107dfa9f 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -9,8 +9,8 @@ MD5 2b2c98cc29af812434da4f33ffa37901 db-3.2.9-r7.ebuild 4354
 MD5 b4e14b6f195b9dfba88ebf9197b4899d db-4.2.52_p2.ebuild 2767
 MD5 2610991dd48952fcccdff291615da976 db-4.0.14-r2.ebuild 2122
 MD5 f4fb5b01541980d1272802f3462495bb db-4.0.14-r3.ebuild 2370
-MD5 8379fdb69d1f2b41d554fb0f13b7ed7c db-4.1.25_p1-r4.ebuild 2923
-MD5 614efe97c52640e9d6fa811f34295ecd db-4.1.25_p1-r3.ebuild 2658
+MD5 cfbe0dddb4ddc9f6d5ced93783c65af0 db-4.1.25_p1-r4.ebuild 2702
+MD5 aca049c24337020e49ec1f5e89d5ca93 db-4.1.25_p1-r3.ebuild 2439
 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
 MD5 1570fff7e312929ed8b70ff24e8f828b db-1.85-r2.ebuild 1429
 MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
@@ -36,7 +36,7 @@ MD5 8515e61281acd8588b8a79db1eba76a3 files/digest-db-1.85-r2 119
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBPkE4HTu7gpaalycRAhwpAKDALExyoTuS9Rgx3atcnqR/kePw1gCdGtSy
-r87zivEiTkh0hxpyfdLAqqI=
-=vDxn
+iD8DBQFBQE52HTu7gpaalycRApFdAJ4mlszbYx+kxM4vtUoPhoOksudumQCaAzWR
+fSvB/2UogwJ0z2s6YrN/68s=
+=+My8
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.1.25_p1-r3.ebuild b/sys-libs/db/db-4.1.25_p1-r3.ebuild
index d6b82886bd42..19a16bf3b384 100644
--- a/sys-libs/db/db-4.1.25_p1-r3.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.24 2004/09/01 18:24:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.25 2004/09/09 12:36:33 vapier Exp $
 
 inherit eutils gnuconfig db
 
@@ -46,26 +46,16 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-jarlocation.patch
 
 	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
-
+	epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
+	gnuconfig_update "${S}/../dist"
 }
 
 src_compile() {
 	addwrite /proc/self/maps
 
-	# Mips needs a gnuconfig update so obscure things like mips64 are known
-	# db-4.1.25_p1 extracts to ${WORKDIR}/db-4.1.25, so we need to strip the _p1
-	if use mips; then
-		einfo "Updating config.{guess,sub} for mips"
-		local OLDS="${S}"
-		S="${S}/../dist"
-		gnuconfig_update
-		S="${OLDS}"
-	fi
-
-
 	local myconf="--enable-rpc"
 
-	use amd64 &&  myconf="${myconf} --with-mutex=x86/gcc-assembly"
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
 	use java \
 		&& myconf="${myconf} --enable-java" \
diff --git a/sys-libs/db/db-4.1.25_p1-r4.ebuild b/sys-libs/db/db-4.1.25_p1-r4.ebuild
index e6894752520c..213f85db39f3 100644
--- a/sys-libs/db/db-4.1.25_p1-r4.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.6 2004/09/01 18:24:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.7 2004/09/09 12:36:33 vapier Exp $
 
 inherit eutils gnuconfig db
 
@@ -47,25 +47,18 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
 	epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
+	gnuconfig_update "${S}/../dist"
 }
 
 src_compile() {
 	addwrite /proc/self/maps
 
-	# Mips needs a gnuconfig update so obscure things like mips64 are known
-	# db-4.1.25_p1 extracts to ${WORKDIR}/db-4.1.25, so we need to strip the _p1
-	if use mips || use uclibc  ; then
-		einfo "Updating config.{guess,sub} for mips or uclibc"
-		local OLDS="${S}"
-		S="${S}/../dist"
-		gnuconfig_update
-		S="${OLDS}"
-	fi
+	local myconf=""
 
+	# FIXME: dont tie this to uclibc anymore
 	use uclibc \
-		&& local myconf="--disable-rpc" \
-		|| local myconf="--enable-rpc"
-
+		&& myconf="${myconf} --disable-rpc" \
+		|| myconf="${myconf} --enable-rpc"
 	use uclibc \
 		&& myconf="${myconf} --disable-cxx" \
 		|| myconf="${myconf} --enable-cxx"