Version bump.

(Portage version: 14278-svn/cvs/Linux x86_64)

4 files changed, 24 insertions, 113 deletions

diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog
index 45833b4bcbf4..8448dc0ad672 100644
--- a/dev-python/bsddb3/ChangeLog
+++ b/dev-python/bsddb3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/bsddb3
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.38 2009/08/01 23:01:02 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.39 2009/09/17 19:38:01 arfrever Exp $
+
+*bsddb3-4.8.0 (17 Sep 2009)
+
+  17 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -bsddb3-4.5.0.ebuild, -bsddb3-4.7.5.ebuild, -bsddb3-4.7.6-r1.ebuild,
+  +bsddb3-4.8.0.ebuild:
+  Version bump.
 
 *bsddb3-4.7.6-r1 (01 Aug 2009)
 
diff --git a/dev-python/bsddb3/bsddb3-4.5.0.ebuild b/dev-python/bsddb3/bsddb3-4.5.0.ebuild
deleted file mode 100644
index 88f80a7d699f..000000000000
--- a/dev-python/bsddb3/bsddb3-4.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.5.0.ebuild,v 1.4 2007/07/11 06:19:47 mr_bones_ Exp $
-
-NEED_PYTHON=2.1
-
-inherit distutils db-use multilib
-
-DESCRIPTION="Python bindings for BerkeleyDB"
-HOMEPAGE="http://pybsddb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pybsddb/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
-IUSE="doc"
-
-DEPEND=">=sys-libs/db-4.0"
-
-src_compile() {
-	sed -i \
-		-e "s/dblib = 'db'/dblib = '$(db_libname)'/" \
-		setup.py
-	distutils_src_compile \
-		"--berkeley-db=/usr" \
-		"--berkeley-db-incdir=$(db_includedir)" \
-		"--berkeley-db-libdir=/usr/$(get_libdir)"
-}
-
-src_install() {
-	DOCS="TODO.txt"
-	distutils_src_install
-	use doc && dohtml -r docs/*
-}
-
-src_test() {
-	"${python}" test.py || die "tests failed"
-}
diff --git a/dev-python/bsddb3/bsddb3-4.7.5.ebuild b/dev-python/bsddb3/bsddb3-4.7.5.ebuild
deleted file mode 100644
index 819c6d87b130..000000000000
--- a/dev-python/bsddb3/bsddb3-4.7.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.7.5.ebuild,v 1.2 2009/05/24 18:26:20 maekke Exp $
-
-EAPI="1"
-
-NEED_PYTHON=2.5
-
-inherit distutils db-use multilib
-
-DESCRIPTION="Python bindings for BerkeleyDB"
-HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm"
-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="doc"
-
-RDEPEND=">=sys-libs/db-4.6"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	local DB_VER
-	if 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 "building docs failed"
-	fi
-}
-
-src_install() {
-	DOCS="TODO.txt"
-	distutils_src_install
-
-	distutils_python_version
-	rm -rf "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/tests"
-
-	use doc && dohtml -r html/*
-}
-
-src_test() {
-	distutils_python_version
-	"${python}" test.py || die "tests failed"
-}
diff --git a/dev-python/bsddb3/bsddb3-4.7.6-r1.ebuild b/dev-python/bsddb3/bsddb3-4.8.0.ebuild
index ed2a0c9cb5fc..8271f220a76d 100644
--- a/dev-python/bsddb3/bsddb3-4.7.6-r1.ebuild
+++ b/dev-python/bsddb3/bsddb3-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.7.6-r1.ebuild,v 1.1 2009/08/01 23:01:02 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.8.0.ebuild,v 1.1 2009/09/17 19:38:01 arfrever Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ SUPPORT_PYTHON_ABIS="1"
 
 inherit db-use distutils multilib
 
-DESCRIPTION="Python bindings for BerkeleyDB"
+DESCRIPTION="Python bindings for Berkeley DB"
 HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm"
 SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
@@ -21,9 +21,13 @@ RDEPEND=">=sys-libs/db-4.6"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"
 
+DOCS="TODO.txt"
+
 src_compile() {
 	local DB_VER
-	if has_version sys-libs/db:4.7; then
+	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"
@@ -44,21 +48,19 @@ src_compile() {
 	fi
 }
 
-src_install() {
-	DOCS="TODO.txt"
-	distutils_src_install
-
-	distutils_python_version
-	rm -rf "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/tests"
-
-	use doc && dohtml -r html/*
-}
-
 src_test() {
 	tests() {
 		rm -fr /tmp/z-Berkeley_DB
 		python_set_build_dir_symlink
-		"${python}" test.py
+		"$(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/*
+}