db4 compat fixes

5 files changed, 58 insertions, 2 deletions

diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog
index be9c035dcf8e..0b12d8901419 100644
--- a/dev-python/bsddb3/ChangeLog
+++ b/dev-python/bsddb3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/bsddb3
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.5 2003/05/21 12:12:40 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.6 2003/06/01 01:31:09 liquidx Exp $
+
+*bsddb3-3.4.0-r1 (01 Jun 2003)
+
+  01 Jun 2003; Alastair Tse <liquidx@gentoo.org> bsddb3-3.4.0-r1.ebuild,
+  files/bsddb3-3.4.0-db3.patch:
+  make it compile with db-3 versioned libs in the presence of db-4
 
 *bsddb3-4.1.3 (21 May 2003)
 
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 8f445f3e7a85..ef867256f876 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,8 @@
-MD5 4364974e952062960f9ad0df79553abb ChangeLog 697
+MD5 096cd483984f131858cb0a5aecd48af8 ChangeLog 902
 MD5 7defbff88bb36b70f14b547b60499fbe bsddb3-3.4.0.ebuild 588
 MD5 26d3ea1572a9c8a69e5436258bec66fc bsddb3-4.1.3.ebuild 675
+MD5 13735f8de9263cc4f43baf9ec18200e3 bsddb3-3.4.0-r1.ebuild 707
 MD5 fda9c6c3eaa5d24eb3053e1c5cb68cda files/digest-bsddb3-3.4.0 64
 MD5 9505fe6263c8c1d042f80d802f25c038 files/digest-bsddb3-4.1.3 64
+MD5 fda9c6c3eaa5d24eb3053e1c5cb68cda files/digest-bsddb3-3.4.0-r1 64
+MD5 10855e691666e663dacdf0ef9c8b92ff files/bsddb3-3.4.0-db3.patch 476
diff --git a/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild b/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..387e7c0f0f1e
--- /dev/null
+++ b/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild,v 1.1 2003/06/01 01:31:09 liquidx Exp $
+
+inherit distutils
+
+DESCRIPTION="Python bindings for BerkelyDB"
+HOMEPAGE="http://pybsddb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pybsddb/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND="virtual/python
+	=sys-libs/db-3*"
+
+S="${WORKDIR}/${P}"
+
+DOCS="README.txt TODO.txt"
+
+src_unpack() {
+	unpack ${A}
+	einfo "Applying ${P}-db3.patch"
+	cd ${S}; patch -p0 < ${FILESDIR}/${P}-db3.patch
+}
+
+src_install() {
+	distutils_src_install
+	dohtml docs/*
+}
+
diff --git a/dev-python/bsddb3/files/bsddb3-3.4.0-db3.patch b/dev-python/bsddb3/files/bsddb3-3.4.0-db3.patch
new file mode 100644
index 000000000000..c39f4cf177ce
--- /dev/null
+++ b/dev-python/bsddb3/files/bsddb3-3.4.0-db3.patch
@@ -0,0 +1,13 @@
+--- setup.py	2002-07-08 00:54:26.000000000 +0100
++++ setup.py	2003-06-01 02:02:16.000000000 +0100
+@@ -68,8 +68,8 @@
+     # figure out from the base setting where the lib and .h are
+     if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include')
+     if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib')
+-    if not '-ldb' in LIBS:
+-        libname = ['db']
++    if not '-ldb-3' in LIBS:
++        libname = ['db-3']
+     else:
+         libname = []
+     utils = []
diff --git a/dev-python/bsddb3/files/digest-bsddb3-3.4.0-r1 b/dev-python/bsddb3/files/digest-bsddb3-3.4.0-r1
new file mode 100644
index 000000000000..f6508a3a2493
--- /dev/null
+++ b/dev-python/bsddb3/files/digest-bsddb3-3.4.0-r1
@@ -0,0 +1 @@
+MD5 e433307b4ee1dd7be4fa1177b8be575a bsddb3-3.4.0.tar.gz 473854