Update patch to be cross-compile friendly.

4 files changed, 35 insertions, 21 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index bd3f017233df..55e350d0aa6e 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,9 @@
 # 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.107 2004/12/08 15:51:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.108 2004/12/14 02:33:36 vapier Exp $
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org> db-1.85-r2.ebuild:
+  Update patch to be cross-compile friendly.
 
   08 Dec 2004; Simon Stelling <blubb@gentoo.org>
   +files/db-4.2-libtool.patch, db-4.2.52_p2.ebuild:
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 696b910f49ea..06e2d89bdcd0 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,34 +1,44 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d0190f2fcc0cd796b91be7886f404b28 ChangeLog 17236
 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
+MD5 f3db8cf5807090698c572eae328a874f db-4.2.52_p1.ebuild 2773
 MD5 254b3560983fe477d0db2097f609f9ba db-3.2.9-r7.ebuild 4348
+MD5 e044406264c76b10911a47353dc30175 db-4.2.52_p2.ebuild 2837
 MD5 0f6d49f985018ac3ddf80d36eea24f72 db-4.0.14-r2.ebuild 2164
 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 a3699e31e901b11f1ac8d3314475e0dc db-4.1.25_p1-r3.ebuild 2496
 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
-MD5 e044406264c76b10911a47353dc30175 db-4.2.52_p2.ebuild 2837
-MD5 7919184a2a9a4920a17a1b34fa3b6709 ChangeLog 17120
+MD5 aa4631336b2cd28169027f0f9347b8f2 db-1.85-r2.ebuild 1443
 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
-MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 69bde9765bf0a2d6c55a253eb0e53190 files/digest-db-1.85-r2 120
 MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
-MD5 8515e61281acd8588b8a79db1eba76a3 files/digest-db-1.85-r2 119
+MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
+MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
+MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
 MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
 MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
-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 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
+MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
 MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBvlEbroRuSHgZdywRAppjAKCHYWrKB5Bab9sZ2Yk1Arfhrz5ERgCcCjXr
+DygRlxqkJJMcoTRRl5WKPLQ=
+=PEuL
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-1.85-r2.ebuild b/sys-libs/db/db-1.85-r2.ebuild
index 33cfcaf8b446..130d8a7901cc 100644
--- a/sys-libs/db/db-1.85-r2.ebuild
+++ b/sys-libs/db/db-1.85-r2.ebuild
@@ -1,17 +1,17 @@
 # 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-1.85-r2.ebuild,v 1.4 2004/11/12 14:53:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.5 2004/12/14 02:33:36 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="db 1.85 -- required for RPM 4.0 to compile; that's about it."
 HOMEPAGE="http://www.sleepycat.com/"
 SRC_URI="http://www.sleepycat.com/update/snapshot/db.${PV}.tar.gz
-		 mirror://gentoo/db.${PV}.patch.gz"
+	mirror://gentoo/${P}.patch.bz2"
 
 LICENSE="DB"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -21,15 +21,16 @@ S=${WORKDIR}/db.${PV}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${DISTDIR}/db.${PV}.patch.gz
+	epatch ${WORKDIR}/${P}.patch
 }
 
 src_compile() {
 	cd ${S}/PORT/linux
-	make ${MAKEOPTS} OORG="${CFLAGS}" prefix=/usr || die
+	tc-export CC AR RANLIB
+	emake OORG="${CFLAGS}" prefix=/usr || die
 }
 
-src_install () {
+src_install() {
 	cd ${S}/PORT/linux
 
 	newlib.a libdb.a libdb1.a || die "newlib.a failed"
diff --git a/sys-libs/db/files/digest-db-1.85-r2 b/sys-libs/db/files/digest-db-1.85-r2
index d9711499dffd..617fd6a1bee9 100644
--- a/sys-libs/db/files/digest-db-1.85-r2
+++ b/sys-libs/db/files/digest-db-1.85-r2
@@ -1,2 +1,2 @@
 MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz 270953
-MD5 8c9ba7727f3e8ab164805885171e3052 db.1.85.patch.gz 16756
+MD5 8fb6e2d39bc77fc8521401522ceeebaf db-1.85.patch.bz2 15277