Fix java1.5 compilation for db-3.2

Package-Manager: portage-2.0.51.19

4 files changed, 48 insertions, 35 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 08b85f422747..48c0d8007cca 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.115 2005/03/19 23:54:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.116 2005/03/27 20:13:20 pauldv Exp $
+
+  27 Mar 2005; Paul de Vrieze <pauldv@gentoo.org>
+  +files/db-3.2.9-java15.patch, db-3.2.9-r10.ebuild:
+  Add a java 1.5 patch from bug #84770. Also bump all architectures that were 
+  not stable on this ebuild. It has not changed much since months and the 
+  instable keywords were added a very long time ago.
 
   19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> db-1.85-r2.ebuild:
   Stable on alpha.
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index da626feb16e3..cfb084d091dc 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,44 +1,35 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b44aeca1f68f90e025f65dcc7eed02b5 db-4.0.14-r2.ebuild 2230
-MD5 edd94e9c5cdd3727dc7cc572950284ce ChangeLog 18395
-MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
+MD5 1cf06ad4ae33f242d245d1a373eb1b34 ChangeLog 18706
+MD5 15e26e1303761aa1b814d1d46f930d74 db-1.85-r1.ebuild 1435
 MD5 3d914ddfa4c2949f7da3f0086e6829f9 db-1.85-r2.ebuild 1466
-MD5 93ff8f8055e81613c4b2d0c2a65fe310 db-4.0.14-r3.ebuild 2479
-MD5 b2617c873d45a8b607ccc26e16881836 db-4.1.25_p1-r4.ebuild 2697
+MD5 ac0ae1d69995cc2893f980ba0d1c0d0f db-3.2.9-r10.ebuild 4292
 MD5 c7d2cb46737828d602a76a07c422b204 db-3.2.9-r7.ebuild 4436
-MD5 20a2959278e3f7aab07353a8688f042c db-3.2.9-r10.ebuild 4254
-MD5 15e26e1303761aa1b814d1d46f930d74 db-1.85-r1.ebuild 1435
+MD5 b44aeca1f68f90e025f65dcc7eed02b5 db-4.0.14-r2.ebuild 2230
+MD5 93ff8f8055e81613c4b2d0c2a65fe310 db-4.0.14-r3.ebuild 2479
 MD5 d5f713e2e97a27168f5cdc5a0b37c5f4 db-4.1.25_p1-r3.ebuild 2552
+MD5 b2617c873d45a8b607ccc26e16881836 db-4.1.25_p1-r4.ebuild 2697
 MD5 741524071da690cce92723361fcffbad db-4.2.52_p1.ebuild 2839
 MD5 be99d774b023a0afa16a1c535fe83236 db-4.2.52_p2.ebuild 2785
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
+MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
 MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
-MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
-MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
+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 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
-MD5 69bde9765bf0a2d6c55a253eb0e53190 files/digest-db-1.85-r2 120
-MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
 MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
-MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
-MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
-MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
-MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
+MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
+MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
-MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
+MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
 MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
-MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
+MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
+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 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 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCPLvJugEuf3OQ0akRAoxeAJ9Z2MzRIuwEyaJYFuHVjg1YTDCqUgCff43n
-SakOWeuyWFqFU7KUc5Prxf4=
-=L0dU
------END PGP SIGNATURE-----
+MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
+MD5 69bde9765bf0a2d6c55a253eb0e53190 files/digest-db-1.85-r2 120
+MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
+MD5 fa494e61698001c02f2b6a192acfaf99 files/db-3.2.9-java15.patch 598
diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild
index fee30029ee07..f8e86763e209 100644
--- a/sys-libs/db/db-3.2.9-r10.ebuild
+++ b/sys-libs/db/db-3.2.9-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.17 2005/01/30 19:39:20 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.18 2005/03/27 20:13:20 pauldv Exp $
 
 inherit gnuconfig libtool eutils db
 
@@ -12,7 +12,7 @@ LICENSE="DB"
 SLOT="3"
 # This ebuild is to be the compatibility ebuild for when db4 is put
 # in the tree.
-KEYWORDS="x86 ppc ~sparc ~mips alpha arm ~hppa ia64 ppc64 s390 ~amd64"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa ia64 ppc64 s390 amd64"
 IUSE="doc java"
 
 RDEPEND="virtual/libc"
@@ -56,6 +56,7 @@ src_unpack() {
 	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
 
 	epatch ${FILESDIR}/${P}-jarlocation.patch
+	epatch ${FILESDIR}/db-3.2.9-java15.patch
 	cd ${S}
 	gnuconfig_update
 }
diff --git a/sys-libs/db/files/db-3.2.9-java15.patch b/sys-libs/db/files/db-3.2.9-java15.patch
new file mode 100644
index 000000000000..5482831e317a
--- /dev/null
+++ b/sys-libs/db/files/db-3.2.9-java15.patch
@@ -0,0 +1,15 @@
+--- db-3.2.9/java/src/com/sleepycat/db/DbEnv.java.orig	2005-03-10 18:30:19.705147736 +0000
++++ db-3.2.9/java/src/com/sleepycat/db/DbEnv.java	2005-03-10 18:03:07.930215232 +0000
+@@ -78,9 +78,9 @@
+     //
+     /*package*/ void _notify_dbs()
+     {
+-        Enumeration enum = dblist_.elements();
+-        while (enum.hasMoreElements()) {
+-            Db db = (Db)enum.nextElement();
++        Enumeration en = dblist_.elements();
++        while (en.hasMoreElements()) {
++            Db db = (Db)en.nextElement();
+             db._notify_dbenv_close();
+         }
+         dblist_.removeAllElements();