commit: c3e899a031dcf1645d64e64e4f2c47b43f5c3983
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 07:16:25 2019 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 07:16:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e899a0
dev-db/mongodb: migrate to python-any-r1, fix #692080
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
dev-db/mongodb/mongodb-3.6.13.ebuild | 14 ++++++++------
dev-db/mongodb/mongodb-3.6.8.ebuild | 16 +++++++++-------
dev-db/mongodb/mongodb-4.0.10.ebuild | 14 ++++++++------
dev-db/mongodb/mongodb-4.0.12.ebuild | 14 ++++++++------
4 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/dev-db/mongodb/mongodb-3.6.13.ebuild
b/dev-db/mongodb/mongodb-3.6.13.ebuild
index 2b4b44431d6..079b57dc336 100644
--- a/dev-db/mongodb/mongodb-3.6.13.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.13.ebuild
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
CHECKREQS_DISK_USR="512M"
CHECKREQS_MEMORY="1024M"
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1
scons-utils systemd toolchain-funcs user
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1
scons-utils systemd toolchain-funcs user
MY_P=${PN}-src-r${PV/_rc/-rc}
@@ -38,14 +38,16 @@ RDEPEND=">=app-arch/snappy-1.1.3
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ $(python_gen_any_dep '
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ')
sys-libs/ncurses:0=
sys-libs/readline:0=
debug? ( dev-util/valgrind )
test? (
- dev-python/pymongo[${PYTHON_USEDEP}]
+ $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
)"
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
@@ -73,7 +75,7 @@ pkg_setup() {
enewgroup mongodb
enewuser mongodb -1 -1 /var/lib/${PN} mongodb
- python-single-r1_pkg_setup
+ python-any-r1_pkg_setup
}
src_prepare() {
diff --git a/dev-db/mongodb/mongodb-3.6.8.ebuild
b/dev-db/mongodb/mongodb-3.6.8.ebuild
index b8820e94053..72abd68bc8a 100644
--- a/dev-db/mongodb/mongodb-3.6.8.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
CHECKREQS_DISK_USR="512M"
CHECKREQS_MEMORY="1024M"
-inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils
python-single-r1 scons-utils systemd toolchain-funcs user
+inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils
python-any-r1 scons-utils systemd toolchain-funcs user
MY_P=${PN}-src-r${PV/_rc/-rc}
@@ -38,14 +38,16 @@ RDEPEND=">=app-arch/snappy-1.1.3
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ $(python_gen_any_dep '
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ')
sys-libs/ncurses:0=
sys-libs/readline:0=
debug? ( dev-util/valgrind )
test? (
- dev-python/pymongo[${PYTHON_USEDEP}]
+ $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
)"
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
@@ -73,7 +75,7 @@ pkg_setup() {
enewgroup mongodb
enewuser mongodb -1 -1 /var/lib/${PN} mongodb
- python-single-r1_pkg_setup
+ python-any-r1_pkg_setup
}
src_prepare() {
diff --git a/dev-db/mongodb/mongodb-4.0.10.ebuild
b/dev-db/mongodb/mongodb-4.0.10.ebuild
index e6fa03c39c2..8a9dd647e46 100644
--- a/dev-db/mongodb/mongodb-4.0.10.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.10.ebuild
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
CHECKREQS_DISK_USR="512M"
CHECKREQS_MEMORY="1024M"
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1
scons-utils systemd toolchain-funcs user
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1
scons-utils systemd toolchain-funcs user
MY_P=${PN}-src-r${PV/_rc/-rc}
@@ -38,14 +38,16 @@ RDEPEND=">=app-arch/snappy-1.1.3
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ $(python_gen_any_dep '
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ')
sys-libs/ncurses:0=
sys-libs/readline:0=
debug? ( dev-util/valgrind )
test? (
- dev-python/pymongo[${PYTHON_USEDEP}]
+ $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
)"
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
@@ -73,7 +75,7 @@ pkg_setup() {
enewgroup mongodb
enewuser mongodb -1 -1 /var/lib/${PN} mongodb
- python-single-r1_pkg_setup
+ python-any-r1_pkg_setup
}
src_prepare() {
diff --git a/dev-db/mongodb/mongodb-4.0.12.ebuild
b/dev-db/mongodb/mongodb-4.0.12.ebuild
index bb2a9fb04dc..516f202bc7f 100644
--- a/dev-db/mongodb/mongodb-4.0.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.12.ebuild
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
CHECKREQS_DISK_USR="512M"
CHECKREQS_MEMORY="1024M"
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1
scons-utils systemd toolchain-funcs user
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1
scons-utils systemd toolchain-funcs user
MY_P=${PN}-src-r${PV/_rc/-rc}
@@ -38,14 +38,16 @@ RDEPEND=">=app-arch/snappy-1.1.3
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ $(python_gen_any_dep '
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ')
sys-libs/ncurses:0=
sys-libs/readline:0=
debug? ( dev-util/valgrind )
test? (
- dev-python/pymongo[${PYTHON_USEDEP}]
+ $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
)"
PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
@@ -73,7 +75,7 @@ pkg_setup() {
enewgroup mongodb
enewuser mongodb -1 -1 /var/lib/${PN} mongodb
- python-single-r1_pkg_setup
+ python-any-r1_pkg_setup
}
src_prepare() {
