Version bump. Run tests in ${T}/tests-${PYTHON_ABI} directories instead of /tmp/z-Berkeley_DB.

Package-Manager: portage-15511-svn/cvs/Linux x86_64

4 files changed, 110 insertions, 2 deletions

diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog
index 54d006330f4b..b5332544cd20 100644
--- a/dev-python/bsddb3/ChangeLog
+++ b/dev-python/bsddb3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/bsddb3
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.47 2010/01/10 18:32:49 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.48 2010/03/01 21:22:16 arfrever Exp $
+
+*bsddb3-4.8.3 (01 Mar 2010)
+
+  01 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +bsddb3-4.8.3.ebuild, +files/bsddb3-4.8.3-BSDDB_TEST_PATH.patch:
+  Version bump. Run tests in ${T}/tests-${PYTHON_ABI} directories
+  instead of /tmp/z-Berkeley_DB.
 
   10 Jan 2010; nixnut <nixnut@gentoo.org> bsddb3-4.8.1.ebuild:
   ppc stable #296027
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index df7c1ca5fc61..0e06d3199671 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,6 +1,9 @@
+AUX bsddb3-4.8.3-BSDDB_TEST_PATH.patch 874 RMD160 9265dcd63bd4b42144191a193abec53a06e85d46 SHA1 04f156cef3f5f2c9b44677e5f8ebe2c7cc1a1489 SHA256 941b48186ada873f3e7b90638d29a72f0655f70851414396f2fa7a082396d582
 DIST bsddb3-4.8.1.tar.gz 210610 RMD160 110ec91c2cf159e7d27668c7ef1bcd941e83114c SHA1 6417e76e7b86bad6e1eebb16822aea172582982e SHA256 59d0069735a966278818ed2a6932fc9fd2a63703eb5a035b5c2a8a6384f97c38
 DIST bsddb3-4.8.2.tar.gz 185575 RMD160 dc83421efb4afbd52c155a113fe1fcfa85a5b15a SHA1 61f4ee702cbd72ff5388b38ee7d334d6bb5c42f3 SHA256 0abbecd85ea21f9438e8f1d355966a7bc678f94b2af59719b5df47c92711c583
+DIST bsddb3-4.8.3.tar.gz 195212 RMD160 1797139bc943307fca049ac0a6575a0a209d1e29 SHA1 3dfc28e78e2b0113e85efebef7ade8ab2ca1fa7d SHA256 f5690e3a3725f6841c76bab85a88c06b5186420c4437f230b1f763377352cd0e
 EBUILD bsddb3-4.8.1.ebuild 1458 RMD160 d1697873f38e0563c79db3576d1165a7ff073ac7 SHA1 cb8014215d2068e8869f2b20c7fe59e6b4383146 SHA256 44e45be06c198ebc848a982fd7d63206a35224a77c33fa270b8589af9ee44867
 EBUILD bsddb3-4.8.2.ebuild 1538 RMD160 cf2da1b1c75d4b8108c2f184f6e2863ecbdb4016 SHA1 1ebd70c29c70d44885c21f04574c06e1fa4635e6 SHA256 6c0e6873d0f39b9594703e1fe11fdbbb2a0ff4cd6f4009820a687f23a825eca0
-MISC ChangeLog 6327 RMD160 895a383ac1154a3e2aee369dfebb5d1004412e2a SHA1 c99879143d3b26099c89dfb47802eccae4821718 SHA256 69896695e93696c9e45552432eaa2dff1cdd89a9ced8c3b0c8f665717beba8bf
+EBUILD bsddb3-4.8.3.ebuild 1652 RMD160 58637030c88dc54aa3e1ac6d97bbfa09e4e12a22 SHA1 6b209e42d6b7f0d3d9706b706a70746e85f0dd60 SHA256 bce0f44b6b1ee2545edb5484aa6249980590854269dc32f20324e86910d42aab
+MISC ChangeLog 6598 RMD160 9b26ad31699312afefdc9be49f731e379199a8c5 SHA1 a546d37893f751b26bd09b24de35d6ee86a78413 SHA256 647cf7bd3940bc667c7aee953cc58842022fd091987f358c597361cc197f602b
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/bsddb3/bsddb3-4.8.3.ebuild b/dev-python/bsddb3/bsddb3-4.8.3.ebuild
new file mode 100644
index 000000000000..a2b60f12b9fa
--- /dev/null
+++ b/dev-python/bsddb3/bsddb3-4.8.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.8.3.ebuild,v 1.1 2010/03/01 21:22:16 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit db-use distutils eutils multilib
+
+DESCRIPTION="Python bindings for Berkeley DB"
+HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm http://pypi.python.org/pypi/bsddb3"
+SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+# Documentation missing in >=4.8.2 tarball.
+# IUSE="doc"
+
+RDEPEND=">=sys-libs/db-4.6"
+DEPEND="${RDEPEND}"
+#	doc? ( dev-python/sphinx )
+
+DOCS="TODO.txt"
+
+src_prepare() {
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/${P}-BSDDB_TEST_PATH.patch"
+}
+
+src_compile() {
+	local DB_VER
+	if has_version sys-libs/db:4.8; then
+		DB_VER="4.8"
+	elif has_version sys-libs/db:4.7; then
+		DB_VER="4.7"
+	else
+		DB_VER="4.6"
+	fi
+
+	sed -i \
+		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
+		setup2.py setup3.py || die "sed failed"
+
+	distutils_src_compile \
+		"--berkeley-db=/usr" \
+		"--berkeley-db-incdir=$(db_includedir ${DB_VER})" \
+		"--berkeley-db-libdir=/usr/$(get_libdir)"
+
+#	if use doc; then
+#		mkdir html
+#		sphinx-build docs html || die "Generation of documentation failed"
+#	fi
+}
+
+src_test() {
+	tests() {
+		python_set_build_dir_symlink
+		BSDDB_TEST_PATH="${T}/tests-${PYTHON_ABI}" "$(PYTHON)" test.py
+	}
+	python_execute_function tests
+}
+
+src_install() {
+	distutils_src_install
+
+	rm -fr "${D}"usr/lib*/python*/site-packages/${PN}/tests
+
+#	use doc && dohtml -r html/*
+}
diff --git a/dev-python/bsddb3/files/bsddb3-4.8.3-BSDDB_TEST_PATH.patch b/dev-python/bsddb3/files/bsddb3-4.8.3-BSDDB_TEST_PATH.patch
new file mode 100644
index 000000000000..b4b6ee633b7b
--- /dev/null
+++ b/dev-python/bsddb3/files/bsddb3-4.8.3-BSDDB_TEST_PATH.patch
@@ -0,0 +1,26 @@
+--- Lib/bsddb/test/test_all.py
++++ Lib/bsddb/test/test_all.py
+@@ -528,7 +528,9 @@
+ 
+ # This path can be overriden via "set_test_path_prefix()".
+ import os, os.path
+-get_new_path.prefix=os.path.join(os.sep,"tmp","z-Berkeley_DB")
++get_new_path.prefix=os.environ.get("BSDDB_TEST_PATH")
++if get_new_path.prefix is None:
++    get_new_path.prefix=os.path.join(os.sep,"tmp","z-Berkeley_DB")
+ get_new_path.num=0
+ 
+ def get_test_path_prefix() :
+--- Lib3/bsddb/test/test_all.py
++++ Lib3/bsddb/test/test_all.py
+@@ -528,7 +528,9 @@
+ 
+ # This path can be overriden via "set_test_path_prefix()".
+ import os, os.path
+-get_new_path.prefix=os.path.join(os.sep,"tmp","z-Berkeley_DB")
++get_new_path.prefix=os.environ.get("BSDDB_TEST_PATH")
++if get_new_path.prefix is None:
++    get_new_path.prefix=os.path.join(os.sep,"tmp","z-Berkeley_DB")
+ get_new_path.num=0
+ 
+ def get_test_path_prefix() :