#57654

4 files changed, 33 insertions, 7 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 7231e85b8da9..bd3f017233df 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.106 2004/12/01 15:21:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.107 2004/12/08 15:51:41 blubb Exp $
+
+  08 Dec 2004; Simon Stelling <blubb@gentoo.org>
+  +files/db-4.2-libtool.patch, db-4.2.52_p2.ebuild:
+  added Andy Lutomirski's patch and marked ~amd64, see bug #57654
 
   01 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> db-4.1.25_p1-r4.ebuild:
   Stable on sparc
@@ -425,7 +429,7 @@
   15 Jul 2002; Mark Guertin <gerk@gentoo.org>
   Added ppc to keywords
 
-  1 Feb 2002; José Alberto Suárez López <bass@gentoo.org> Changelog db-1.85-r1.ebuild :
+  1 Feb 2002; José Alberto Suárez López <bass@gentoo.org> Changelog db-1.85-r1.ebuild :
 
   Fixed an error with the source url.
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 10728d8f27c4..696b910f49ea 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,4 +1,3 @@
-MD5 1d06fe977379394b66f7df526103b964 ChangeLog 16952
 MD5 4821c0f36864a874b10e6c23e64a0545 db-1.85-r1.ebuild 1403
 MD5 a906ac8db13e79c362aa2fe374739208 db-1.85-r2.ebuild 1432
 MD5 787ed8ad7a393781ec77e81cdfde8260 db-3.2.9-r10.ebuild 4154
@@ -8,12 +7,14 @@ MD5 968165523d174efb458433c6defbc202 db-4.0.14-r3.ebuild 2412
 MD5 a3699e31e901b11f1ac8d3314475e0dc db-4.1.25_p1-r3.ebuild 2496
 MD5 804e43d2e89df80fed28f3e3533036b3 db-4.1.25_p1-r4.ebuild 2761
 MD5 f3db8cf5807090698c572eae328a874f db-4.2.52_p1.ebuild 2773
-MD5 807d2a0f3fef77a761023adb537d09a8 db-4.2.52_p2.ebuild 2782
 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
+MD5 e044406264c76b10911a47353dc30175 db-4.2.52_p2.ebuild 2837
+MD5 7919184a2a9a4920a17a1b34fa3b6709 ChangeLog 17120
 MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
 MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
 MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
 MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
+MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
 MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
 MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
 MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
@@ -30,4 +31,4 @@ MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
 MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
 MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
+MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
diff --git a/sys-libs/db/db-4.2.52_p2.ebuild b/sys-libs/db/db-4.2.52_p2.ebuild
index ddb911520522..d2739277dbc4 100644
--- a/sys-libs/db/db-4.2.52_p2.ebuild
+++ b/sys-libs/db/db-4.2.52_p2.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.2.52_p2.ebuild,v 1.10 2004/10/01 14:33:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.11 2004/12/08 15:51:41 blubb Exp $
 
 IUSE="tcltk java doc"
 
@@ -30,7 +30,7 @@ done
 HOMEPAGE="http://www.sleepycat.com"
 SLOT="4.2"
 LICENSE="DB"
-KEYWORDS="~x86 ~sparc ~ia64 ~ppc"
+KEYWORDS="~x86 ~sparc ~ia64 ~ppc ~amd64"
 
 DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
 	java? ( virtual/jdk )"
@@ -46,6 +46,7 @@ src_unpack() {
 		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch
+	epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
 
 	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
 
diff --git a/sys-libs/db/files/db-4.2-libtool.patch b/sys-libs/db/files/db-4.2-libtool.patch
new file mode 100644
index 000000000000..a4a9db7f4557
--- /dev/null
+++ b/sys-libs/db/files/db-4.2-libtool.patch
@@ -0,0 +1,20 @@
+--- ./dist/configure.orig	2004-09-22 22:58:48.421632944 -0700
++++ ./dist/configure	2004-09-22 23:02:55.068136976 -0700
+@@ -5657,7 +5657,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `"$LD" -v 2>&1 </dev/null` in
++case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+   ;;
+@@ -11135,7 +11135,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `"$LD" -v 2>&1 </dev/null` in
++case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+   ;;