[patch] Diff against the original ebuild

pymongo-r1.diff (text/plain), 3.78 KB, created by Michał Górny on 2013-02-06 15:20:49 UTC

--- pymongo-2.4.2.ebuild	2013-01-25 11:45:44.000000000 +0100
+++ pymongo-2.4.2-r1.ebuild	2013-02-06 16:11:08.238457879 +0100
@@ -2,13 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.4.2.ebuild,v 1.1 2013/01/25 10:45:44 ultrabug Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
-DISTUTILS_SRC_TEST="nosetests"
-PYTHON_TESTS_RESTRICTED_ABIS="3.*"
-inherit distutils
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit check-reqs distutils-r1
 
 DESCRIPTION="Python driver for MongoDB"
 HOMEPAGE="http://github.com/mongodb/mongo-python-driver http://pypi.python.org/pypi/pymongo"
@@ -17,22 +15,37 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/$
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc mod_wsgi"
+IUSE="doc mod_wsgi test"
 
 RDEPEND="dev-db/mongodb"
 DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-PYTHON_MODNAME="bson gridfs pymongo"
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
 
-src_compile() {
-	distutils_src_compile
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+python_compile_all() {
+	distutils-r1_python_compile_all
 
 	if use doc; then
-		einfo "Generation of documentation"
-		mkdir html
-		sphinx-build doc html || die "Generation of documentation failed"
+		mkdir html || die
+		sphinx-build doc html || die
 	fi
 }
 
@@ -42,20 +55,72 @@ distutils_src_test_pre_hook() {
 }
 
 src_test() {
-	distutils_src_test
-	killall -u "$(id -nu)" mongod
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27017
+
+	export DB_IP DB_PORT
+
+	# 1.5G of disk space per run.
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+
+	distutils-r1_src_test
 }
 
-src_install() {
+python_test() {
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} --nounixsocket \
+			--logpath "${logpath}" --fork \
+			|| die "Unable to start mongod for tests."
+
+		# Now we need to check if the server actually started...
+		if mongo --norc --host ${DB_IP} --port ${DB_PORT} </dev/null &>/dev/null; then
+			# yay!
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	nosetests || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}"
+}
+
+python_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)
+	distutils-r1_python_install $(use mod_wsgi && echo --no_ext)
+}
 
-	if use doc; then
-		dohtml -r html/* || die "Error installing docs"
-	fi
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {