version bump to work with db-4.2, peg bsddb3-4.1 at db-4.0 and bsddb3-4.2 at db-4.2 and add patches to change references to version specific include files and libraries. removed sparc and ppc keyword for bsdb3-4.2.4.

9 files changed, 112 insertions, 36 deletions

diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog
index 919632395502..3b2852249ccd 100644
--- a/dev-python/bsddb3/ChangeLog
+++ b/dev-python/bsddb3/ChangeLog
@@ -1,6 +1,15 @@
 # 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.8 2003/11/01 14:25:24 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.9 2004/02/13 10:06:01 liquidx Exp $
+
+*bsddb3-4.2.4 (13 Feb 2004)
+
+  13 Feb 2004; Alastair Tse <liquidx@gentoo.org> bsddb3-3.4.0.ebuild,
+  bsddb3-4.1.3.ebuild, bsddb3-4.2.4.ebuild, files/bsddb3-4.1.3-db4.0.patch,
+  files/bsddb3-4.2.4-db4.2.patch:
+  version bump to work with db-4.2, peg bsddb3-4.1 at db-4.0 and bsddb3-4.2 at
+  db-4.2 and add patches to change references to version specific include files
+  and libraries.
 
   01 Nov 2003; Jason Wever <weeve@gentoo.org> bsddb3-3.4.0-r1.ebuild,
   bsddb3-3.4.0.ebuild, bsddb3-4.1.3.ebuild:
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 0ae3d0aae7bb..38106e88f34d 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,9 +1,12 @@
 MD5 747f90b371baa09280e01fdb090e8c8a ChangeLog 1214
 MD5 6862ce0bbe395a23d95efc4e6eab23dc bsddb3-3.4.0-r1.ebuild 713
 MD5 b71da150233cf7532db13fb46b3683d0 bsddb3-3.4.0.ebuild 595
-MD5 f45b1c88487d834e040c9d52c70bc5be bsddb3-4.1.3.ebuild 679
+MD5 798257a870fd41ac37d5016cc674e0b1 bsddb3-4.1.3.ebuild 735
+MD5 310d4cec4b14a716fc257f8fb34169e2 bsddb3-4.2.4.ebuild 658
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 bed99cc82d215b74251a47487d672d7b files/bsddb3-3.4.0-db3.patch 480
+MD5 479200184de9b7dd27f0c877ed257251 files/bsddb3-4.1.3-db4.0.patch 833
 MD5 fda9c6c3eaa5d24eb3053e1c5cb68cda files/digest-bsddb3-3.4.0 64
 MD5 fda9c6c3eaa5d24eb3053e1c5cb68cda files/digest-bsddb3-3.4.0-r1 64
 MD5 9505fe6263c8c1d042f80d802f25c038 files/digest-bsddb3-4.1.3 64
+MD5 72d6a2d3e135d9e4ed16fac296a9a803 files/digest-bsddb3-4.2.4 64
diff --git a/dev-python/bsddb3/bsddb3-3.4.0.ebuild b/dev-python/bsddb3/bsddb3-3.4.0.ebuild
deleted file mode 100644
index 47be2595d959..000000000000
--- a/dev-python/bsddb3/bsddb3-3.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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.ebuild,v 1.7 2003/11/01 14:25:24 weeve 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 ~sparc"
-IUSE=""
-
-DEPEND="virtual/python
-	=sys-libs/db-3*"
-
-S="${WORKDIR}/${P}"
-
-mydoc="README.txt TODO.txt"
-
-src_install() {
-	distutils_src_install
-	dohtml docs/*
-}
-
diff --git a/dev-python/bsddb3/bsddb3-4.1.3.ebuild b/dev-python/bsddb3/bsddb3-4.1.3.ebuild
index 8542607a3e2a..da3a581375fc 100644
--- a/dev-python/bsddb3/bsddb3-4.1.3.ebuild
+++ b/dev-python/bsddb3/bsddb3-4.1.3.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.1.3.ebuild,v 1.5 2003/11/01 14:25:24 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.1.3.ebuild,v 1.6 2004/02/13 10:06:01 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"
+LICENSE="BSD"
+
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
 IUSE=""
 
 DEPEND="virtual/python
-	=sys-libs/db-4*"
+	=sys-libs/db-4.0*"
 
-S="${WORKDIR}/${P}"
+DOCS="README.txt TODO.txt"
 
-mydoc="README.txt TODO.txt"
+src_unpack() {
+	unpack ${A}
+	cd ${S}; epatch ${FILESDIR}/${P}-db4.0.patch
+}
 
 src_compile() {
 	distutils_src_compile "--berkeley-db=/usr"
diff --git a/dev-python/bsddb3/bsddb3-4.2.4.ebuild b/dev-python/bsddb3/bsddb3-4.2.4.ebuild
new file mode 100644
index 000000000000..48c6e8290f34
--- /dev/null
+++ b/dev-python/bsddb3/bsddb3-4.2.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.2.4.ebuild,v 1.1 2004/02/13 10:06:01 liquidx Exp $
+
+inherit distutils
+
+DESCRIPTION="Python bindings for BerkelyDB"
+HOMEPAGE="http://pybsddb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pybsddb/${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~x86" # ~ppc ~sparc"
+IUSE=""
+
+DEPEND="virtual/python
+	=sys-libs/db-4.2*"
+
+DOCS="README.txt TODO.txt"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}; epatch ${FILESDIR}/${P}-db4.2.patch
+}	
+
+src_compile() {
+	distutils_src_compile "--berkeley-db=/usr"
+}
+
+src_install() {
+	distutils_src_install "--berkeley-db=/usr"
+	dohtml docs/*
+}
+
diff --git a/dev-python/bsddb3/files/bsddb3-4.1.3-db4.0.patch b/dev-python/bsddb3/files/bsddb3-4.1.3-db4.0.patch
new file mode 100644
index 000000000000..6b7c86a0aad9
--- /dev/null
+++ b/dev-python/bsddb3/files/bsddb3-4.1.3-db4.0.patch
@@ -0,0 +1,26 @@
+--- setup.py.old	2004-02-13 09:45:59.291327848 +0000
++++ setup.py	2004-02-13 09:49:39.189898184 +0000
+@@ -70,11 +70,11 @@
+ 
+     # figure out from the base setting where the lib and .h are
+     if not incdir:
+-        incdir = os.path.join(BERKELEYDB_DIR, 'include')
++        incdir = os.path.join(BERKELEYDB_DIR, 'include/db4')
+     if not libdir:
+         libdir = os.path.join(BERKELEYDB_DIR, 'lib')
+-    if not '-ldb' in LIBS:
+-        libname = ['db']
++    if not '-ldb-4.0' in LIBS:
++        libname = ['db-4.0']
+     else:
+         libname = []
+     utils = []
+@@ -93,7 +93,7 @@
+     fp = os.popen('ldd %s 2>&1' % sys.executable)
+     results = fp.read()
+     status = fp.close()
+-    if not status and results.find('libdb.') >= 0:
++    if not status and results.find('libdb-4.0.') >= 0:
+         static = 1
+ 
+     if static:
diff --git a/dev-python/bsddb3/files/bsddb3-4.2.4-db4.2.patch b/dev-python/bsddb3/files/bsddb3-4.2.4-db4.2.patch
new file mode 100644
index 000000000000..7b601f3cba90
--- /dev/null
+++ b/dev-python/bsddb3/files/bsddb3-4.2.4-db4.2.patch
@@ -0,0 +1,26 @@
+--- setup.py.old	2004-02-13 09:53:33.220320152 +0000
++++ setup.py	2004-02-13 09:54:06.966190000 +0000
+@@ -75,11 +75,11 @@
+ 
+     # figure out from the base setting where the lib and .h are
+     if not incdir:
+-        incdir = os.path.join(BERKELEYDB_DIR, 'include')
++        incdir = os.path.join(BERKELEYDB_DIR, 'include/db4.2')
+     if not libdir:
+         libdir = os.path.join(BERKELEYDB_DIR, 'lib')
+-    if not '-ldb' in LIBS:
+-        libname = ['db']
++    if not '-ldb-4.2' in LIBS:
++        libname = ['db-4.2']
+     else:
+         libname = []
+     utils = []
+@@ -98,7 +98,7 @@
+     fp = os.popen('ldd %s 2>&1' % sys.executable)
+     results = fp.read()
+     status = fp.close()
+-    if not status and results.find('libdb.') >= 0:
++    if not status and results.find('libdb-4.2.') >= 0:
+         static = 1
+ 
+     if static:
diff --git a/dev-python/bsddb3/files/digest-bsddb3-3.4.0 b/dev-python/bsddb3/files/digest-bsddb3-3.4.0
deleted file mode 100644
index f6508a3a2493..000000000000
--- a/dev-python/bsddb3/files/digest-bsddb3-3.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e433307b4ee1dd7be4fa1177b8be575a bsddb3-3.4.0.tar.gz 473854
diff --git a/dev-python/bsddb3/files/digest-bsddb3-4.2.4 b/dev-python/bsddb3/files/digest-bsddb3-4.2.4
new file mode 100644
index 000000000000..364dcb216cce
--- /dev/null
+++ b/dev-python/bsddb3/files/digest-bsddb3-4.2.4
@@ -0,0 +1 @@
+MD5 e7cf57b849e63e0a2dd791d9ad5a377a bsddb3-4.2.4.tar.gz 508095