diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2005-03-27 20:13:20 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2005-03-27 20:13:20 +0000 |
| commit | c6f5aada06ff1d68c1f2a48f98f50d5249dd44f1 (patch) | |
| tree | af725be4b2e6e5a75aad415f92b9943b78e200bb /sys-libs | |
| parent | Bump. Patch usage closes bug #85559. Purged two old ebuilds. (diff) | |
| download | gentoo-2-c6f5aada06ff1d68c1f2a48f98f50d5249dd44f1.tar.gz gentoo-2-c6f5aada06ff1d68c1f2a48f98f50d5249dd44f1.tar.bz2 gentoo-2-c6f5aada06ff1d68c1f2a48f98f50d5249dd44f1.zip | |
Fix java1.5 compilation for db-3.2
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/db/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/db/db-3.2.9-r10.ebuild | 5 | ||||
| -rw-r--r-- | sys-libs/db/files/db-3.2.9-java15.patch | 15 |
3 files changed, 25 insertions, 3 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/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(); |