1 |
commit: 1a0d8929be7eaf212a2542e340f5fc227a134b43 |
2 |
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 20 16:18:45 2020 +0000 |
4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 20 16:20:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0d8929 |
7 |
|
8 |
dev-db/mongodb: version bump, add test dep fix #722630 |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org> |
12 |
|
13 |
dev-db/mongodb/Manifest | 1 + |
14 |
dev-db/mongodb/mongodb-4.2.3-r1.ebuild | 10 ++++------ |
15 |
.../mongodb/{mongodb-4.2.3-r1.ebuild => mongodb-4.2.6.ebuild} | 10 ++++------ |
16 |
3 files changed, 9 insertions(+), 12 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest |
19 |
index fc2f7104f2b..911edc7240f 100644 |
20 |
--- a/dev-db/mongodb/Manifest |
21 |
+++ b/dev-db/mongodb/Manifest |
22 |
@@ -9,3 +9,4 @@ DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46 |
23 |
DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106 |
24 |
DIST mongodb-src-r4.2.2.tar.gz 60991680 BLAKE2B afd31a60929ebfe9c02abee92fd4814c178b03e4e88e10069003fd3e1813481e9cc967e8b4d15b87b0fe703df7fa42a70f60db33cf84ecbf1decfd6657e28ba1 SHA512 30f1e20fbe45ca136869f3fd7e54f1cd65d1544c0693b9945a0036a50257cfc12915a17bf79267500496b5acf3cfa24f406114ea7180b7abee89cd62de5eec80 |
25 |
DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69 |
26 |
+DIST mongodb-src-r4.2.6.tar.gz 61671088 BLAKE2B 7f2b6240b05639d2bbe37ea148cbb225b30813879f71a5fc3c135ef7debd58edf75abe925d00f9ff96dc6a75a525b4504e25254b0046326069c05bb1dfd60827 SHA512 117c910807a8363aab6b899b436a4b06564b6e53abfa7f0fe6e01c1e242401ab5a3634d9edc5e0a5e2d548a480c90b70ac492eb199b3f2476d9045a78e376af8 |
27 |
|
28 |
diff --git a/dev-db/mongodb/mongodb-4.2.3-r1.ebuild b/dev-db/mongodb/mongodb-4.2.3-r1.ebuild |
29 |
index 71eeff3756b..2e49123287f 100644 |
30 |
--- a/dev-db/mongodb/mongodb-4.2.3-r1.ebuild |
31 |
+++ b/dev-db/mongodb/mongodb-4.2.3-r1.ebuild |
32 |
@@ -42,12 +42,11 @@ RDEPEND="acct-group/mongodb |
33 |
DEPEND="${RDEPEND} |
34 |
${PYTHON_DEPS} |
35 |
$(python_gen_any_dep ' |
36 |
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
37 |
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/pymongo[${PYTHON_USEDEP}] ) |
38 |
>=dev-util/scons-2.5.0[${PYTHON_USEDEP}] |
39 |
dev-python/cheetah3[${PYTHON_USEDEP}] |
40 |
dev-python/psutil[${PYTHON_USEDEP}] |
41 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
42 |
- virtual/python-typing[${PYTHON_USEDEP}] |
43 |
') |
44 |
sys-libs/ncurses:0= |
45 |
sys-libs/readline:0= |
46 |
@@ -63,15 +62,14 @@ S="${WORKDIR}/${MY_P}" |
47 |
|
48 |
python_check_deps() { |
49 |
if use test; then |
50 |
- has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || |
51 |
- return 1 |
52 |
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 |
53 |
+ has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 |
54 |
fi |
55 |
|
56 |
has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && |
57 |
has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && |
58 |
has_version "dev-python/psutil[${PYTHON_USEDEP}]" && |
59 |
- has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" && |
60 |
- has_version "virtual/python-typing[${PYTHON_USEDEP}]" |
61 |
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" |
62 |
} |
63 |
|
64 |
pkg_pretend() { |
65 |
|
66 |
diff --git a/dev-db/mongodb/mongodb-4.2.3-r1.ebuild b/dev-db/mongodb/mongodb-4.2.6.ebuild |
67 |
similarity index 94% |
68 |
copy from dev-db/mongodb/mongodb-4.2.3-r1.ebuild |
69 |
copy to dev-db/mongodb/mongodb-4.2.6.ebuild |
70 |
index 71eeff3756b..b88bcf9c846 100644 |
71 |
--- a/dev-db/mongodb/mongodb-4.2.3-r1.ebuild |
72 |
+++ b/dev-db/mongodb/mongodb-4.2.6.ebuild |
73 |
@@ -42,12 +42,11 @@ RDEPEND="acct-group/mongodb |
74 |
DEPEND="${RDEPEND} |
75 |
${PYTHON_DEPS} |
76 |
$(python_gen_any_dep ' |
77 |
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
78 |
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) |
79 |
>=dev-util/scons-2.5.0[${PYTHON_USEDEP}] |
80 |
dev-python/cheetah3[${PYTHON_USEDEP}] |
81 |
dev-python/psutil[${PYTHON_USEDEP}] |
82 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
83 |
- virtual/python-typing[${PYTHON_USEDEP}] |
84 |
') |
85 |
sys-libs/ncurses:0= |
86 |
sys-libs/readline:0= |
87 |
@@ -63,15 +62,14 @@ S="${WORKDIR}/${MY_P}" |
88 |
|
89 |
python_check_deps() { |
90 |
if use test; then |
91 |
- has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || |
92 |
- return 1 |
93 |
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1 |
94 |
+ has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 |
95 |
fi |
96 |
|
97 |
has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" && |
98 |
has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && |
99 |
has_version "dev-python/psutil[${PYTHON_USEDEP}]" && |
100 |
- has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" && |
101 |
- has_version "virtual/python-typing[${PYTHON_USEDEP}]" |
102 |
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" |
103 |
} |
104 |
|
105 |
pkg_pretend() { |