Ignore test failures with Jython. Update HOMEPAGE. Fix dependencies. Set PYTHON_MODNAME. Improve src_test(). Simplify src_install(). Patch by Arfrever. Backported from python overlay

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

3 files changed, 42 insertions, 34 deletions

diff --git a/dev-python/pymongo/ChangeLog b/dev-python/pymongo/ChangeLog
index 06d4c4568462..43c121b4bdc2 100644
--- a/dev-python/pymongo/ChangeLog
+++ b/dev-python/pymongo/ChangeLog
@@ -1,6 +1,11 @@
 # 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.5 2011/08/06 16:23:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/ChangeLog,v 1.6 2011/08/08 18:24:42 hwoarang Exp $
+
+  08 Aug 2011; Markos Chandras <hwoarang@gentoo.org> pymongo-1.11-r1.ebuild:
+  Ignore test failures with Jython. Update HOMEPAGE. Fix dependencies. Set
+  PYTHON_MODNAME. Improve src_test(). Simplify src_install(). Patch by
+  Arfrever. Backported from python overlay
 
   06 Aug 2011; Markos Chandras <hwoarang@gentoo.org> ChangeLog:
   Restore Changelog history
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index f53ef356f503..401724fefc4f 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -4,24 +4,24 @@ Hash: SHA512
 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
-EBUILD pymongo-1.11-r1.ebuild 1450 RMD160 9124a4ac5b35595d0a4853bfb81b4f6b6b89f7b9 SHA1 6ad0a2d5329070d901fe27dd6dd1944603509b05 SHA256 a5d088b89f4db480c9a2993ddb78e10dd117b98f253c8a51d30acc13ba6d9f95
+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 946 RMD160 75a2a4f3c3970206927e73a7f80a73d534c21de2 SHA1 a1fdaef7b3eea44ef476b2d01368ae3033a5acc1 SHA256 e6fd29445b2b94e917bbaddbc80705c3dbc5d08b780f4571a2701c6d63c2121c
+MISC ChangeLog 1213 RMD160 4aa6075f766bfa4c6f4fc58fccd7eb31b0bb6950 SHA1 f3709d9c228c61bb3e3afc5f6c670f66f35fcdf6 SHA256 971708cfcff7a2bd206bff1cf1331e5980eae6feec5406da6d60bb2f0c140195
 MISC metadata.xml 694 RMD160 1d6d2af4cdf7c49941e76d513bf8d8dd5901b644 SHA1 63cd5ef490540b63c4ff109293aee3050b8704e4 SHA256 dd920b33859be9feb702c513e64c29c4b8bbede22f011c6e9ddf4301d555533e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOPWpyAAoJEPqDWhW0r/LCAhQQAILhUKuRd84Um3IFJ+JQVsHy
-xXXreFIYHXg+JmkUjo36rkubmWkk5/K5pjQlSqchRqy99SGmz1ddI8ExXiZ2b7z0
-uSPRHMgAe2Nvdi5MysENLcVgc6tIIs1FvCtbmEr9CL35LN6Hs0YjgAQNeL3iJk7U
-gFUYmjCWFaGGeFHaKZGAKnIh4aIw1c/GR4umCjQioWwhz9gmpz9gNxfKYAN6Xke1
-76o0Q0j8XSMCaReo0YldA7/yEsFPCSTwPkTMj67FV69POSk7GQfj0h0ZAwU+oktI
-nMcgs4OvI9vnQlCu2WcOSZ7QnrwgxKH6FP4MCo74At/X91oM075eCl7lRpHg6E65
-i40N4C2CKgAuCr1dKNGEg9sLsu5HSG2UZtL0WRJtUELM2fo7xh9vm7Yn0GzZpHp/
-QHaBXlYvmm+kzCt4nA7WpVKaaCH0C3VFQveuerrKjkCmESJfemy81pTiKCJWvdRJ
-2G0jgM1ItUxVSvtqkBlod5w7WpHVkBvgBAexx1nzzu1RUgqTCWFBnY5PuDHi5+jM
-gweNlAZnf53xoBhmqIzkR9xy0uWTy0Uztq89ZEWlMYcFbzIINkGjP7ryNJE+DOT6
-r69ELFJccFxP1nuJK5C1+Y6h+sbl8gVxVB7/bvKrJ0Nb7PeqjhLDnyIthCvnWA6M
-aog64+APW+2OU8nupadZ
-=/cTI
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pymongo/pymongo-1.11-r1.ebuild b/dev-python/pymongo/pymongo-1.11-r1.ebuild
index 9b1332bdfda0..f18967ceb0dd 100644
--- a/dev-python/pymongo/pymongo-1.11-r1.ebuild
+++ b/dev-python/pymongo/pymongo-1.11-r1.ebuild
@@ -1,55 +1,58 @@
 # 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-r1.ebuild,v 1.1 2011/07/06 14:30:30 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-1.11-r1.ebuild,v 1.2 2011/08/08 18:24:42 hwoarang 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"
+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 test"
+IUSE="doc mod_wsgi"
 
-RDEPEND="|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 >=dev-python/celementtree-1.0.5 )"
+RDEPEND="dev-db/mongodb"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
-	doc?  ( dev-python/sphinx )
-	test? ( dev-db/mongodb )"
+	doc? ( dev-python/sphinx )"
 
-pkg_setup() {
-	if use test; then
-		ewarn "WARNING: You need a running instance of mongod in order to test this package !"
-		sleep 3
-	fi
-}
+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 "building docs failed"
+		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
-	local myopts=""
-	use mod_wsgi && myopts="--no_ext"
-
-	distutils_src_install ${myopts}
+	distutils_src_install $(use mod_wsgi && echo --no_ext)
 
 	if use doc; then
 		dohtml -r html/* || die "Error installing docs"