Version bump, drop old

Package-Manager: portage-2.1.10.9/cvs/Linux x86_64

5 files changed, 74 insertions, 119 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/Manifest b/dev-python/pymongo/Manifest
index 401724fefc4f..a8a2f7f8f62b 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,27 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST pymongo-1.10.1.tar.gz 155538 RMD160 4cd4db696f26c5d567cb0900918a69a94a5a11cf SHA1 0a09393d55fd7a3715dd07f76cec4e8367eb573f SHA256 00487874097c4fda18f57964633fb206d4910121093ae0c5a4478be542cbcf22
 DIST pymongo-1.11.tar.gz 158625 RMD160 e19187d161c67e3b97bccf8c0ce37c3eac0098c1 SHA1 273d4651e7c07c216bb6c48671bcd6f25f5c55e5 SHA256 3969282dbf4616de48ebb3ced00844f86dd7e99bc7b738c2ef78af4b448f8b38
-EBUILD pymongo-1.10.1.ebuild 1167 RMD160 1cdca6996bc6be43fd7f7110241f0859219a4bc0 SHA1 bcccc7416f102cb315ca10a891b4abf078fcb158 SHA256 0a7e834b705e201ae7b631aac650988e92179675ec8f77f3763af4c32b63fe21
+DIST pymongo-2.0.1.tar.gz 171745 RMD160 b6c1b6bdcd8165e6d8e124c2fbcd316b392e49e2 SHA1 864b839f71e28f3f37b6b375c8c13c7a4cca1ee1 SHA256 608b0a1ab378a6f0a74035f6a0e05c00903d47139784b00c56fe47665bfd685c
 EBUILD pymongo-1.11-r1.ebuild 1593 RMD160 4404292823f8e5819bf2a583b45b0f3eb7d34f9b SHA1 0757140060fab6fd8806dcf9f00e44755cad5889 SHA256 98f4be795e88f871ae5d5b365fffbb526a34986f6aa7aa681d64e994f2ac6f9b
-EBUILD pymongo-1.11.ebuild 1165 RMD160 5d12688d99176c5c6fc4e388e1012b90dc5bb3aa SHA1 d81a8d34243433a099c72c0c2235ecb19a522e2b SHA256 e24a3543078f87e9162da58546bcecbdf12e75843feb198bf01b29f499603601
-MISC ChangeLog 1213 RMD160 4aa6075f766bfa4c6f4fc58fccd7eb31b0bb6950 SHA1 f3709d9c228c61bb3e3afc5f6c670f66f35fcdf6 SHA256 971708cfcff7a2bd206bff1cf1331e5980eae6feec5406da6d60bb2f0c140195
+EBUILD pymongo-2.0.1.ebuild 1591 RMD160 b0b314f485b4635996e54bf9746c213a7daa8f5e SHA1 8ff548fd729360cc57cad1df4a8b9ffafcdb8609 SHA256 793a83d3e5c7d82abbea98950bc88ba52c6a1ebdcfed862c1eef55fcf48ecb5a
+MISC ChangeLog 1387 RMD160 a45064308ebb1e5ccc2c0f9dfbb2aa0ec68bf0f7 SHA1 f4cdc029e31e9c1d04adf3b8ddef6c2cfaed9201 SHA256 f5912767afcab552b27df638e29e2e412a53aecc75e258d4769c135b3f8187e5
 MISC metadata.xml 694 RMD160 1d6d2af4cdf7c49941e76d513bf8d8dd5901b644 SHA1 63cd5ef490540b63c4ff109293aee3050b8704e4 SHA256 dd920b33859be9feb702c513e64c29c4b8bbede22f011c6e9ddf4301d555533e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOQCnLAAoJEPqDWhW0r/LCgTgQAJny98vyVB3WD6ouWCPvV7xP
-Gwncv5RgzOf3u+Djpf1kTeGcxjyfJlVnxXLECJHk17kcWYipnQk/dB6jyiVu5iQg
-qFw5/M5GIZYG7CCWyRTgjP2s1UgBzhtQejYy0ge/N7gyvt254C5zprLzPqAPd23T
-x5n4lEFBj7G74Sm4TN6kBAFiFrIPBJzy7a7901ajYyIwaEu3f7dsJAV3aHkJVVkb
-745OOS4staby/4w3z93OIK03bEM/tFRU9GDNDrUUUJjmv+2gE/Q/6sAK/PzYr928
-m7HL9OAhzit+ZwTXrCit8foddNC6ozTJUDFgBm0iMppWKaEv80pIPZC19J+YCHhI
-xmK83f01rzeVdP4EyAJNWroHCWMLI+Xozc7BTAEeqtnUoNM+Z0LqG+UfZOaR9Wvn
-pKXf2R0b2tL+7inT+VPz17DL9TfVAoppCZ0rqiJD1CBfXbzzC+KBUxJSoYiAXBEU
-em2Qp0C46ZVa1zPnds8P33Z9wrN50A5+jzNwNSIvn2WbiOFbGroCNcw8EnrQC6pi
-tjYLSyAGRZscVRhwQ/1cFArmcFrZeKJIbEuOY4pKMKqybrRJ0F28L9fNkKj7lzbe
-0/F8Pjirx71FX/10oVITd5uA57pKGySA4nm4UQc0wkiLWgKbdDcs1UvDjF+P/lRE
-GIwsN7B5IDN1LWN0OOiV
-=zm2q
+iF4EAREIAAYFAk5OL18ACgkQKiQSS7ZY+hMSMwEAoRav/301C9A6dMqnQh4yAuj6
+lnyyNp6IHbxlQSctFGcA/ie9KSLA2ooUYtPAj1iEbqbWjpHAMYLUV/DfwVCYuFLk
+=hOEk
 -----END PGP SIGNATURE-----
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
+}