From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD468158020 for ; Sat, 15 Oct 2022 14:39:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02E63E08F1; Sat, 15 Oct 2022 14:39:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D687BE08F1 for ; Sat, 15 Oct 2022 14:39:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4E2D340DA8 for ; Sat, 15 Oct 2022 14:39:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C33A5D6 for ; Sat, 15 Oct 2022 14:39:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665844748.d098b1050128dddb20a0c01f7d276dd176e51c4a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mongodb/mongodb-4.2.17-r2.ebuild dev-db/mongodb/mongodb-4.4.10-r1.ebuild dev-db/mongodb/mongodb-4.4.8-r1.ebuild dev-db/mongodb/mongodb-4.4.8-r2.ebuild dev-db/mongodb/mongodb-5.0.5-r2.ebuild X-VCS-Directories: dev-db/mongodb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d098b1050128dddb20a0c01f7d276dd176e51c4a X-VCS-Branch: master Date: Sat, 15 Oct 2022 14:39:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d6d8b08d-b77f-4f52-aac4-ba1baa259b39 X-Archives-Hash: f91db50ad4742a4c34bc27491ae7518c commit: d098b1050128dddb20a0c01f7d276dd176e51c4a Author: Sam James gentoo org> AuthorDate: Sat Oct 15 14:35:49 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 15 14:39:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d098b105 dev-db/mongodb: fix PythonHasVersionUsage, PythonAnyMismatchedDepHasVersionCheck Signed-off-by: Sam James gentoo.org> 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 38de0c7238c0..a0cb6465d289 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 b9453637a5b9..b7037132f4ff 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 a7187fb6e81f..73317c768011 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 57be06bccab2..f248164e7ebc 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 0dcc771e11a4..d0b26e5aafbf 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() {