dev-db/mongodb: fix PythonHasVersionUsage, PythonAnyMismatchedDepHasVersionCheck

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-10-15 15:35:49 +01:00
parent c25641690e
commit d098b10501
5 changed files with 53 additions and 43 deletions

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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() {