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@gentoo.org>

diff --git a/dev-db/mongodb/mongodb-3.6.13.ebuild b/dev-db/mongodb/mongodb-3.6.13.ebuild
index 2b4b44431d61d305c9b0fbc42745b26d265f44c7..079b57dc336913cddf0339e8d3316377f87a2b7a 100644 (file)
--- 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 b8820e9405342bd5bd070fbdfe04186999d98975..72abd68bc8a69ca1734867d5334248670b98ce80 100644 (file)
--- 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 e6fa03c39c265eddc46b5a5b6de256f7d29a4484..8a9dd647e46bd79f14f11eccf245f11224cd3bb9 100644 (file)
--- 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 bb2a9fb04dc32ed9aa3d2452994b9bb9f9327848..516f202bc7f0b9fdf588fa66f0373d91310e28f3 100644 (file)
--- 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() {