dev-python/pymongo: Drop deprecated usage of DISTUTILS_NO_PARALLEL_BUILD and QA fixes

Add missing die
ADd missing PYTHON_USEDEP

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/dev-python/pymongo/pymongo-2.6.3.ebuild b/dev-python/pymongo/pymongo-2.6.3.ebuild
index 7eb0fbf491039abd2ceebd869a8a7270ba828336..9050b51bf4b0641e3a1b2a91ca4591b3d3daddbb 100644 (file)
--- a/dev-python/pymongo/pymongo-2.6.3.ebuild
+++ b/dev-python/pymongo/pymongo-2.6.3.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
        doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
        test? ( dev-python/nose[${PYTHON_USEDEP}] )
-       kerberos? ( dev-python/pykerberos )"
+       kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )"
 DISTUTILS_IN_SOURCE_BUILD=1
 
 reqcheck() {
@@ -49,20 +49,13 @@ python_compile_all() {
        fi
 }
 
-src_test() {
+python_test() {
        # Yes, we need TCP/IP for that...
        local DB_IP=127.0.0.1
        local DB_PORT=27000
 
        export DB_IP DB_PORT
 
-       # 1.5G of disk space per run.
-       local DISTUTILS_NO_PARALLEL_BUILD=1
-
-       distutils-r1_src_test
-}
-
-python_test() {
        local dbpath=${TMPDIR}/mongo.db
        local logpath=${TMPDIR}/mongod.log
 
@@ -108,11 +101,11 @@ python_test() {
        fi
        DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-       mongod --dbpath "${dbpath}" --shutdown
+       mongod --dbpath "${dbpath}" --shutdown || die
 
        [[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-       rm -rf "${dbpath}"
+       rm -rf "${dbpath}" || die
 }
 
 python_install() {

diff --git a/dev-python/pymongo/pymongo-2.7.2.ebuild b/dev-python/pymongo/pymongo-2.7.2.ebuild
index 122dca44f1d546dd0bc0a33bc5d00b011f948e8d..4909993c630a57bb2e375c7ff118ae12bd00ddfc 100644 (file)
--- a/dev-python/pymongo/pymongo-2.7.2.ebuild
+++ b/dev-python/pymongo/pymongo-2.7.2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~hppa x86"
 IUSE="doc kerberos test"
 
 RDEPEND="
-       kerberos? ( dev-python/pykerberos )
+       kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
 "
 DEPEND="
        ${RDEPEND}
@@ -55,20 +55,13 @@ python_compile_all() {
        fi
 }
 
-src_test() {
+python_test() {
        # Yes, we need TCP/IP for that...
        local DB_IP=127.0.0.1
        local DB_PORT=27000
 
        export DB_IP DB_PORT
 
-       # 1.5G of disk space per run.
-       local DISTUTILS_NO_PARALLEL_BUILD=1
-
-       distutils-r1_src_test
-}
-
-python_test() {
        local dbpath=${TMPDIR}/mongo.db
        local logpath=${TMPDIR}/mongod.log
 
@@ -114,11 +107,11 @@ python_test() {
        fi
        DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-       mongod --dbpath "${dbpath}" --shutdown
+       mongod --dbpath "${dbpath}" --shutdown || die
 
        [[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-       rm -rf "${dbpath}"
+       rm -rf "${dbpath}" || die
 }
 
 python_install_all() {

diff --git a/dev-python/pymongo/pymongo-2.8.1.ebuild b/dev-python/pymongo/pymongo-2.8.1.ebuild
index 059bdf55ecaf85db201d6a9a6c9f41ca7a70f509..de75b074f33325c95a85c49cb4b5ce5efbca0348 100644 (file)
--- a/dev-python/pymongo/pymongo-2.8.1.ebuild
+++ b/dev-python/pymongo/pymongo-2.8.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc kerberos test"
 
 RDEPEND="
-       kerberos? ( dev-python/pykerberos )
+       kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
 "
 DEPEND="
        ${RDEPEND}
@@ -55,20 +55,13 @@ python_compile_all() {
        fi
 }
 
-src_test() {
+python_test() {
        # Yes, we need TCP/IP for that...
        local DB_IP=127.0.0.1
        local DB_PORT=27000
 
        export DB_IP DB_PORT
 
-       # 1.5G of disk space per run.
-       local DISTUTILS_NO_PARALLEL_BUILD=1
-
-       distutils-r1_src_test
-}
-
-python_test() {
        local dbpath=${TMPDIR}/mongo.db
        local logpath=${TMPDIR}/mongod.log
 
@@ -114,11 +107,11 @@ python_test() {
        fi
        DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-       mongod --dbpath "${dbpath}" --shutdown
+       mongod --dbpath "${dbpath}" --shutdown || die
 
        [[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-       rm -rf "${dbpath}"
+       rm -rf "${dbpath}" || die
 }
 
 python_install_all() {

diff --git a/dev-python/pymongo/pymongo-3.0.3.ebuild b/dev-python/pymongo/pymongo-3.0.3.ebuild
index 84c8bd5f65d25d4e58ebf779b64497dc3a528389..de75b074f33325c95a85c49cb4b5ce5efbca0348 100644 (file)
--- a/dev-python/pymongo/pymongo-3.0.3.ebuild
+++ b/dev-python/pymongo/pymongo-3.0.3.ebuild
@@ -18,13 +18,14 @@ KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc kerberos test"
 
 RDEPEND="
-       kerberos? ( dev-python/pykerberos )
+       kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
 "
 DEPEND="
        ${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
        doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
        test? (
+               dev-python/nose[${PYTHON_USEDEP}]
                >=dev-db/mongodb-2.6.0
        )
 "
@@ -54,20 +55,13 @@ python_compile_all() {
        fi
 }
 
-src_test() {
+python_test() {
        # Yes, we need TCP/IP for that...
        local DB_IP=127.0.0.1
        local DB_PORT=27000
 
        export DB_IP DB_PORT
 
-       # 1.5G of disk space per run.
-       local DISTUTILS_NO_PARALLEL_BUILD=1
-
-       distutils-r1_src_test
-}
-
-python_test() {
        local dbpath=${TMPDIR}/mongo.db
        local logpath=${TMPDIR}/mongod.log
 
@@ -113,11 +107,11 @@ python_test() {
        fi
        DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
 
-       mongod --dbpath "${dbpath}" --shutdown
+       mongod --dbpath "${dbpath}" --shutdown || die
 
        [[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
 
-       rm -rf "${dbpath}"
+       rm -rf "${dbpath}" || die
 }
 
 python_install_all() {