From d098b1050128dddb20a0c01f7d276dd176e51c4a Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 15 Oct 2022 15:35:49 +0100 Subject: [PATCH] dev-db/mongodb: fix PythonHasVersionUsage, PythonAnyMismatchedDepHasVersionCheck Signed-off-by: Sam James --- dev-db/mongodb/mongodb-4.2.17-r2.ebuild | 20 +++++++++++--------- dev-db/mongodb/mongodb-4.4.10-r1.ebuild | 20 +++++++++++--------- dev-db/mongodb/mongodb-4.4.8-r1.ebuild | 20 +++++++++++--------- dev-db/mongodb/mongodb-4.4.8-r2.ebuild | 20 +++++++++++--------- dev-db/mongodb/mongodb-5.0.5-r2.ebuild | 16 +++++++++------- 5 files changed, 53 insertions(+), 43 deletions(-) diff --git a/dev-db/mongodb/mongodb-4.2.17-r2.ebuild b/dev-db/mongodb/mongodb-4.2.17-r2.ebuild index 38de0c7238c01..a0cb6465d2899 100644 --- a/dev-db/mongodb/mongodb-4.2.17-r2.ebuild +++ b/dev-db/mongodb/mongodb-4.2.17-r2.ebuild @@ -40,6 +40,10 @@ RDEPEND="acct-group/mongodb )" DEPEND="${RDEPEND} ${PYTHON_DEPS} + sys-libs/ncurses:0= + sys-libs/readline:0= + debug? ( dev-util/valgrind )" +BDEPEND=" $(python_gen_any_dep ' test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) >=dev-util/scons-2.5.0[${PYTHON_USEDEP}] @@ -47,9 +51,7 @@ DEPEND="${RDEPEND} dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-util/valgrind )" +" PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )" PATCHES=( @@ -64,14 +66,14 @@ S="${WORKDIR}/${MY_P}" python_check_deps() { if use test; then - has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 - has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 + python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 + python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 fi - has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && - has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + python_has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && + python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && + python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" } pkg_pretend() { diff --git a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild index b9453637a5b95..b7037132f4ff6 100644 --- a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild +++ b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild @@ -40,6 +40,10 @@ RDEPEND="acct-group/mongodb )" DEPEND="${RDEPEND} ${PYTHON_DEPS} + sys-libs/ncurses:0= + sys-libs/readline:0= + debug? ( dev-util/valgrind )" +BDEPEND=" $(python_gen_any_dep ' test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) >=dev-util/scons-3.1.1[${PYTHON_USEDEP}] @@ -47,9 +51,7 @@ DEPEND="${RDEPEND} dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-util/valgrind )" +" PDEPEND="tools? ( >=app-admin/mongo-tools-100 )" PATCHES=( @@ -66,14 +68,14 @@ S="${WORKDIR}/${MY_P}" python_check_deps() { if use test; then - has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 - has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 + python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 + python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 fi - has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && - has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" && + python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && + python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" } pkg_pretend() { diff --git a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild index a7187fb6e81f7..73317c768011e 100644 --- a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild +++ b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild @@ -40,6 +40,10 @@ RDEPEND="acct-group/mongodb )" DEPEND="${RDEPEND} ${PYTHON_DEPS} + sys-libs/ncurses:0= + sys-libs/readline:0= + debug? ( dev-util/valgrind )" +BDEPEND=" $(python_gen_any_dep ' test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) >=dev-util/scons-3.1.1[${PYTHON_USEDEP}] @@ -47,9 +51,7 @@ DEPEND="${RDEPEND} dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-util/valgrind )" +" PDEPEND="tools? ( >=app-admin/mongo-tools-100 )" PATCHES=( @@ -64,14 +66,14 @@ S="${WORKDIR}/${MY_P}" python_check_deps() { if use test; then - has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 - has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 + python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 + python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 fi - has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && - has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" && + python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && + python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" } pkg_pretend() { diff --git a/dev-db/mongodb/mongodb-4.4.8-r2.ebuild b/dev-db/mongodb/mongodb-4.4.8-r2.ebuild index 57be06bccab24..f248164e7ebc1 100644 --- a/dev-db/mongodb/mongodb-4.4.8-r2.ebuild +++ b/dev-db/mongodb/mongodb-4.4.8-r2.ebuild @@ -40,6 +40,10 @@ RDEPEND="acct-group/mongodb )" DEPEND="${RDEPEND} ${PYTHON_DEPS} + sys-libs/ncurses:0= + sys-libs/readline:0= + debug? ( dev-util/valgrind )" +BDEPEND=" $(python_gen_any_dep ' test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) >=dev-util/scons-3.1.1[${PYTHON_USEDEP}] @@ -47,9 +51,7 @@ DEPEND="${RDEPEND} dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-util/valgrind )" +" PDEPEND="tools? ( >=app-admin/mongo-tools-100 )" PATCHES=( @@ -64,14 +66,14 @@ S="${WORKDIR}/${MY_P}" python_check_deps() { if use test; then - has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 - has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 + python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 + python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 fi - has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && - has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" && + python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && + python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" } pkg_pretend() { diff --git a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild index 0dcc771e11a42..d0b26e5aafbf8 100644 --- a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild +++ b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild @@ -44,15 +44,17 @@ RDEPEND="acct-group/mongodb )" DEPEND="${RDEPEND} ${PYTHON_DEPS} + sys-libs/ncurses:0= + sys-libs/readline:0= + debug? ( dev-util/valgrind )" +BDEPEND=" $(python_gen_any_dep ' >=dev-util/scons-3.1.1[${PYTHON_USEDEP}] dev-python/cheetah3[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') - sys-libs/ncurses:0= - sys-libs/readline:0= - debug? ( dev-util/valgrind )" +" PDEPEND=" mongosh? ( app-admin/mongosh-bin ) tools? ( >=app-admin/mongo-tools-100 ) @@ -72,10 +74,10 @@ PATCHES=( S="${WORKDIR}/${MY_P}" python_check_deps() { - has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && - has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && - has_version "dev-python/psutil[${PYTHON_USEDEP}]" && - has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" && + python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && + python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" } pkg_pretend() {