Version bump, drop old

(Portage version: 2.1.10.9/cvs/Linux x86_64)

4 files changed, 67 insertions, 101 deletions

diff --git a/dev-python/pymongo/ChangeLog b/dev-python/pymongo/ChangeLog
index 43c121b4bdc2..c6fe38cd5a7b 100644
--- a/dev-python/pymongo/ChangeLog
+++ b/dev-python/pymongo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pymongo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/ChangeLog,v 1.6 2011/08/08 18:24:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/ChangeLog,v 1.7 2011/08/19 09:39:34 ultrabug Exp $
+
+*pymongo-2.0.1 (19 Aug 2011)
+
+  19 Aug 2011; Ultrabug <ultrabug@gentoo.org> -pymongo-1.10.1.ebuild,
+  -pymongo-1.11.ebuild, +pymongo-2.0.1.ebuild:
+  Version bump, drop old.
 
   08 Aug 2011; Markos Chandras <hwoarang@gentoo.org> pymongo-1.11-r1.ebuild:
   Ignore test failures with Jython. Update HOMEPAGE. Fix dependencies. Set
diff --git a/dev-python/pymongo/pymongo-1.10.1.ebuild b/dev-python/pymongo/pymongo-1.10.1.ebuild
deleted file mode 100644
index d95ab5d038c1..000000000000
--- a/dev-python/pymongo/pymongo-1.10.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-1.10.1.ebuild,v 1.3 2011/04/26 10:03:14 ultrabug Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="http://github.com/mongodb/mongo-python-driver"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 >=dev-python/celementtree-1.0.5 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc?  ( dev-python/sphinx )
-	test? ( dev-db/mongodb )"
-
-pkg_setup() {
-	if use test; then
-		ewarn "WARNING: You need a running instance of mongod in order to test this package !"
-		sleep 3
-	fi
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		mkdir html
-		sphinx-build doc html || die "building docs failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r html/* || die "Error installing docs"
-	fi
-}
diff --git a/dev-python/pymongo/pymongo-1.11.ebuild b/dev-python/pymongo/pymongo-1.11.ebuild
deleted file mode 100644
index 83248bfe9fc2..000000000000
--- a/dev-python/pymongo/pymongo-1.11.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-1.11.ebuild,v 1.1 2011/05/12 09:22:56 ultrabug Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="http://github.com/mongodb/mongo-python-driver"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 >=dev-python/celementtree-1.0.5 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc?  ( dev-python/sphinx )
-	test? ( dev-db/mongodb )"
-
-pkg_setup() {
-	if use test; then
-		ewarn "WARNING: You need a running instance of mongod in order to test this package !"
-		sleep 3
-	fi
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		mkdir html
-		sphinx-build doc html || die "building docs failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r html/* || die "Error installing docs"
-	fi
-}
diff --git a/dev-python/pymongo/pymongo-2.0.1.ebuild b/dev-python/pymongo/pymongo-2.0.1.ebuild
new file mode 100644
index 000000000000..5455cd2eb66d
--- /dev/null
+++ b/dev-python/pymongo/pymongo-2.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.0.1.ebuild,v 1.1 2011/08/19 09:39:34 ultrabug Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="http://github.com/mongodb/mongo-python-driver http://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc mod_wsgi"
+
+RDEPEND="dev-db/mongodb"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+
+PYTHON_MODNAME="bson gridfs pymongo"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		mkdir html
+		sphinx-build doc html || die "Generation of documentation failed"
+	fi
+}
+
+distutils_src_test_pre_hook() {
+	mkdir -p "${T}/tests-${PYTHON_ABI}/mongo.db"
+	mongod --dbpath "${T}/tests-${PYTHON_ABI}/mongo.db" --fork --logpath "${T}/tests-${PYTHON_ABI}/mongo.log"
+}
+
+src_test() {
+	distutils_src_test
+	killall -u "$(id -nu)" mongod
+}
+
+src_install() {
+	# Maintainer note:
+	# In order to work with mod_wsgi, we need to disable the C extension.
+	# See [1] for more information.
+	# [1] http://api.mongodb.org/python/current/faq.html#does-pymongo-work-with-mod-wsgi
+	distutils_src_install $(use mod_wsgi && echo --no_ext)
+
+	if use doc; then
+		dohtml -r html/* || die "Error installing docs"
+	fi
+}