Stabilize an old 4.1 ebuild, and add support for a 1.5 jdk to the older 4.{0,1} packages

7 files changed, 52 insertions, 23 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 44f081ed7702..f967fbb228f0 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,14 @@
 # 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.104 2004/10/01 14:33:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.105 2004/11/30 19:37:20 pauldv Exp $
+
+  30 Nov 2004; Paul de Vrieze <pauldv@gentoo.org>
+  +files/db-4.1.25-java.patch, db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild,
+  db-4.1.25_p1-r3.ebuild, db-4.1.25_p1-r4.ebuild:
+  Fix compilation with 1.5 jdk's by renaming some enum local variable
+
+  30 Nov 2004; Paul de Vrieze <pauldv@gentoo.org> db-4.1.25_p1-r4.ebuild:
+  Stabilize on x86
 
   01 Oct 2004; Simon Stelling <blubb@gentoo.org> db-4.1.25_p1-r3.ebuild,
   db-4.1.25_p1-r4.ebuild, db-4.2.52_p2.ebuild:
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 32964c75cc0c..f0b633c1ae35 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,32 +1,33 @@
 MD5 11591551af9db13d79b97061d0eb61a0 ChangeLog 16514
 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 c23a9c3d9f2696211bf97f99e1fcd028 db-4.0.14-r2.ebuild 2166
+MD5 1598464071f2f5db56a5611d21c19d55 db-4.0.14-r3.ebuild 2414
+MD5 4e141bb0fca2eb18faaac6f6ec641c0c db-4.1.25_p1-r3.ebuild 2496
+MD5 fae5cebd45a7a9029d1d69540ca723f8 db-4.1.25_p1-r4.ebuild 2759
+MD5 f3db8cf5807090698c572eae328a874f db-4.2.52_p1.ebuild 2773
 MD5 807d2a0f3fef77a761023adb537d09a8 db-4.2.52_p2.ebuild 2782
-MD5 2610991dd48952fcccdff291615da976 db-4.0.14-r2.ebuild 2122
-MD5 f4fb5b01541980d1272802f3462495bb db-4.0.14-r3.ebuild 2370
-MD5 7eb8682b7ac606b40613a41334d56333 db-4.1.25_p1-r4.ebuild 2716
-MD5 b4ee2f94a926ae9e3d2fc85c74715406 db-4.1.25_p1-r3.ebuild 2452
 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
-MD5 a906ac8db13e79c362aa2fe374739208 db-1.85-r2.ebuild 1432
-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 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
-MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
-MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
-MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
+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 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
-MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
+MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
+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 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
+MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+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-r4 118
+MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
 MD5 8515e61281acd8588b8a79db1eba76a3 files/digest-db-1.85-r2 119
diff --git a/sys-libs/db/db-4.0.14-r2.ebuild b/sys-libs/db/db-4.0.14-r2.ebuild
index 7a834f40f082..4a9c32c55961 100644
--- a/sys-libs/db/db-4.0.14-r2.ebuild
+++ b/sys-libs/db/db-4.0.14-r2.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.0.14-r2.ebuild,v 1.23 2004/09/03 18:24:07 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r2.ebuild,v 1.24 2004/11/30 19:37:20 pauldv Exp $
 
 IUSE="tcltk java doc"
 
@@ -25,6 +25,7 @@ src_unpack() {
 	# libpthread, but does not do so ...
 	# <azarah@gentoo.org> (23 Feb 2003)
 	cd ${WORKDIR}/${P}; epatch ${FILESDIR}/${P}-fix-dep-link.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
 }
 
 src_compile() {
diff --git a/sys-libs/db/db-4.0.14-r3.ebuild b/sys-libs/db/db-4.0.14-r3.ebuild
index ad015e6e99c3..a0dad6be0e27 100644
--- a/sys-libs/db/db-4.0.14-r3.ebuild
+++ b/sys-libs/db/db-4.0.14-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.0.14-r3.ebuild,v 1.8 2004/06/24 23:03:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r3.ebuild,v 1.9 2004/11/30 19:37:20 pauldv Exp $
 
 IUSE="tcltk java doc"
 
@@ -28,6 +28,7 @@ src_unpack() {
 	# libpthread, but does not do so ...
 	# <azarah@gentoo.org> (23 Feb 2003)
 	cd ${WORKDIR}/${P}; epatch ${FILESDIR}/${P}-fix-dep-link.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
 
 	cd ${WORKDIR} ; epatch ${FILESDIR}/${P}-jarlocation.patch
 }
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 982521017f2e..1b3e3da1e1e7 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.27 2004/11/12 15:01:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.28 2004/11/30 19:37:20 pauldv Exp $
 
 inherit eutils gnuconfig db
 
@@ -47,6 +47,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
 	epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
 	gnuconfig_update "${S}/../dist"
 }
 
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 447e826649ea..f0a4424ae591 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.9 2004/11/12 15:01:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.10 2004/11/30 19:37:20 pauldv Exp $
 
 inherit eutils gnuconfig db
 
@@ -27,7 +27,7 @@ done
 
 LICENSE="DB"
 SLOT="4.1"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
 IUSE="tcltk java doc uclibc"
 
 DEPEND="tcltk? ( dev-lang/tcl )
@@ -47,6 +47,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
 	epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
 	gnuconfig_update "${S}/../dist"
 }
 
diff --git a/sys-libs/db/files/db-4.1.25-java.patch b/sys-libs/db/files/db-4.1.25-java.patch
new file mode 100644
index 000000000000..652d2d5d2001
--- /dev/null
+++ b/sys-libs/db/files/db-4.1.25-java.patch
@@ -0,0 +1,16 @@
+diff -urN db-4.1.25.orig/java/src/com/sleepycat/db/DbEnv.java db-4.1.25/java/src/com/sleepycat/db/DbEnv.java
+--- db-4.1.25.orig/java/src/com/sleepycat/db/DbEnv.java	2002-08-30 20:12:26.000000000 +0200
++++ db-4.1.25/java/src/com/sleepycat/db/DbEnv.java	2004-11-30 19:54:37.979221908 +0100
+@@ -78,9 +78,9 @@
+     //
+     /*package*/ void _notify_dbs()
+     {
+-        Enumeration enum = dblist_.elements();
+-        while (enum.hasMoreElements()) {
+-            Db db = (Db)enum.nextElement();
++        Enumeration myEnum = dblist_.elements();
++        while (myEnum.hasMoreElements()) {
++            Db db = (Db)myEnum.nextElement();
+             db._notify_dbenv_close();
+         }
+         dblist_.removeAllElements();