berdb, why dont you love me? what did amd64 ever do to you? see bug #48558 for more information

3 files changed, 26 insertions, 21 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 038a33b3f21d..7e5c3e7729e8 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.87 2004/04/15 20:40:15 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.88 2004/04/22 09:48:02 lv Exp $
+
+  22 Apr 2004; Travis Tilley <lv@gentoo.org> db-4.1.25_p1-r3.ebuild:
+  added fix for bug #48558
 
 *db-4.2.52_p2 (15 Apr 2004)
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 2085eaf09d5d..6259e61d7029 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,31 +1,31 @@
 MD5 a4882f7506a0f084e1c71cb8a7b3fcdd db-3.3.11.ebuild 2408
-MD5 d23bb9a64830aa173a4f7f8bc8687a9a db-4.0.14-r2.ebuild 2132
 MD5 ce0e75e9646a539b758d77ef13b88c47 db-4.0.14-r3.ebuild 2379
-MD5 b5fd885ce291016920acb0898f0d5f95 db-4.2.52_p1.ebuild 2772
 MD5 0273bf0e102feaab825a47e581fda1e4 db-3.2.9-r10.ebuild 4152
-MD5 4aeab686bc74c08edbee1f6689bb16ca db-4.2.52_p2.ebuild 2752
 MD5 a000cb32992cba2dc4955e4d06a2ac68 db-1.85-r1.ebuild 1407
+MD5 d23bb9a64830aa173a4f7f8bc8687a9a db-4.0.14-r2.ebuild 2132
+MD5 4aeab686bc74c08edbee1f6689bb16ca db-4.2.52_p2.ebuild 2752
+MD5 a2ac53a6695028058e99c12ef24485cf db-4.1.25_p1-r3.ebuild 2650
+MD5 7b2aed1f7e6a8857d3fbee953e845c3f db-3.2.9-r7.ebuild 4371
 MD5 4af227b6910e010fae7d526216f6679d db-3.2.9-r9.ebuild 3512
+MD5 966bb0187466532f82cc159f1939811c ChangeLog 14208
 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
-MD5 d457d7f8756b0c942522de9189dd2c52 ChangeLog 14115
-MD5 69f5afa96c9f2e18c0d637fa4f860715 db-4.1.25_p1-r3.ebuild 2589
-MD5 7b2aed1f7e6a8857d3fbee953e845c3f db-3.2.9-r7.ebuild 4371
-MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
-MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
-MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
+MD5 b5fd885ce291016920acb0898f0d5f95 db-4.2.52_p1.ebuild 2772
+MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
+MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
+MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
+MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r9 61
 MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
 MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r9 61
+MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
+MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
+MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
 MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
 MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
-MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
-MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
-MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
+MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
+MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
 MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
-MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
-MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
-MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
-MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
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 e39441801448..93ea9ed5a362 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 Technologies, Inc.
 # 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.19 2004/03/22 04:04:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.20 2004/04/22 09:48:02 lv Exp $
 
 IUSE="tcltk java doc"
 
@@ -68,6 +68,8 @@ src_compile() {
 
 	local myconf="--enable-rpc"
 
+	use amd64 &&  myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
 	use java \
 		&& myconf="${myconf} --enable-java" \
 		|| myconf="${myconf} --disable-java"