commit: 63a7c8554a8fa194520266c6a1ff752005c25ce1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 20:26:43 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:37:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a7c855
www-apps/netbox: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
www-apps/netbox/netbox-2.5.11.ebuild | 46 +++++++++++++++---------------
www-apps/netbox/netbox-2.5.12.ebuild | 46 +++++++++++++++---------------
www-apps/netbox/netbox-2.6.1.ebuild | 54 +++++++++++++++++++-----------------
www-apps/netbox/netbox-2.6.4.ebuild | 54 +++++++++++++++++++-----------------
www-apps/netbox/netbox-2.6.5.ebuild | 54 +++++++++++++++++++-----------------
www-apps/netbox/netbox-2.6.6.ebuild | 54 +++++++++++++++++++-----------------
www-apps/netbox/netbox-2.6.7.ebuild | 54 +++++++++++++++++++-----------------
www-apps/netbox/netbox-2.6.8.ebuild | 54 +++++++++++++++++++-----------------
www-apps/netbox/netbox-2.7.2.ebuild | 54 +++++++++++++++++++-----------------
9 files changed, 244 insertions(+), 226 deletions(-)
diff --git a/www-apps/netbox/netbox-2.5.11.ebuild
b/www-apps/netbox/netbox-2.5.11.ebuild
index 12b9bd32830..64de819ea05 100644
--- a/www-apps/netbox/netbox-2.5.11.ebuild
+++ b/www-apps/netbox/netbox-2.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,27 +17,29 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
- >=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ ')
webhooks? ( dev-python/django-rq )"
DEPEND="${RDEPEND}"
diff --git a/www-apps/netbox/netbox-2.5.12.ebuild
b/www-apps/netbox/netbox-2.5.12.ebuild
index 12b9bd32830..64de819ea05 100644
--- a/www-apps/netbox/netbox-2.5.12.ebuild
+++ b/www-apps/netbox/netbox-2.5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,27 +17,29 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
- >=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ ')
webhooks? ( dev-python/django-rq )"
DEPEND="${RDEPEND}"
diff --git a/www-apps/netbox/netbox-2.6.1.ebuild
b/www-apps/netbox/netbox-2.6.1.ebuild
index f9a76d886c5..04c487ccf5f 100644
--- a/www-apps/netbox/netbox-2.6.1.ebuild
+++ b/www-apps/netbox/netbox-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
- >=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- <dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
- webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ <dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ webhooks? (
>=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+ ')"
DEPEND="${RDEPEND}"
PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.4.ebuild
b/www-apps/netbox/netbox-2.6.4.ebuild
index 24d3873dc16..a060ba59442 100644
--- a/www-apps/netbox/netbox-2.6.4.ebuild
+++ b/www-apps/netbox/netbox-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
- >=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- <dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
- webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ <dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ webhooks? (
>=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+ ')"
DEPEND="${RDEPEND}"
PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.5.ebuild
b/www-apps/netbox/netbox-2.6.5.ebuild
index 4416e86bdee..c9b078880e5 100644
--- a/www-apps/netbox/netbox-2.6.5.ebuild
+++ b/www-apps/netbox/netbox-2.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
- >=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- <dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
- webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ <dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ webhooks? (
>=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+ ')"
DEPEND="${RDEPEND}"
PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.6.ebuild
b/www-apps/netbox/netbox-2.6.6.ebuild
index 4416e86bdee..c9b078880e5 100644
--- a/www-apps/netbox/netbox-2.6.6.ebuild
+++ b/www-apps/netbox/netbox-2.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
- >=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- <dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
- webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ <dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ webhooks? (
>=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+ ')"
DEPEND="${RDEPEND}"
PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.7.ebuild
b/www-apps/netbox/netbox-2.6.7.ebuild
index 5058c620813..748180d6cc2 100644
--- a/www-apps/netbox/netbox-2.6.7.ebuild
+++ b/www-apps/netbox/netbox-2.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
- >=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- <dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
- webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ <dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ webhooks? (
>=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+ ')"
DEPEND="${RDEPEND}"
PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.8.ebuild
b/www-apps/netbox/netbox-2.6.8.ebuild
index 62bd2ebdc37..233c4920008 100644
--- a/www-apps/netbox/netbox-2.6.8.ebuild
+++ b/www-apps/netbox/netbox-2.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
- >=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- <dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
- webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ <dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ webhooks? (
>=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+ ')"
DEPEND="${RDEPEND}"
PATCHES=(
diff --git a/www-apps/netbox/netbox-2.7.2.ebuild
b/www-apps/netbox/netbox-2.7.2.ebuild
index f80801767e3..0ebfe2a208b 100644
--- a/www-apps/netbox/netbox-2.7.2.ebuild
+++ b/www-apps/netbox/netbox-2.7.2.ebuild
@@ -19,32 +19,34 @@ RDEPEND="
acct-group/netbox
acct-user/netbox
${PYTHON_DEPS}
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- >=dev-python/django-cacheops-4.2[${PYTHON_USEDEP}]
- >=dev-python/django-cors-headers-3.2.1[${PYTHON_USEDEP}]
- >=dev-python/django-debug-toolbar-2.1[${PYTHON_USEDEP}]
- >=dev-python/django-filter-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/django-prometheus-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/django-rq-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/django-tables2-2.2.1[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/django-timezone-field-4.0[${PYTHON_USEDEP}]
- >=dev-python/djangorestframework-3.10.3[${PYTHON_USEDEP}]
- >=dev-python/drf-yasg-1.17.0[${PYTHON_USEDEP},validation]
- >=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
- <dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
- >=dev-python/pillow-7.0.0[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8.4[${PYTHON_USEDEP}]
- >=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.9.4[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
- >=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )"
+ $(python_gen_cond_dep '
+ >=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cacheops-4.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-cors-headers-3.2.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-debug-toolbar-2.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-filter-2.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-prometheus-1.1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-rq-2.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-tables2-2.2.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-taggit-1.2.0[${PYTHON_MULTI_USEDEP}]
+
>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/django-timezone-field-4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/djangorestframework-3.10.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/drf-yasg-1.17.0[${PYTHON_MULTI_USEDEP},validation]
+ >=dev-python/jinja-2.10.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+ <dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-7.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycryptodome-3.9.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pyyaml-5.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/redis-py-3.3.11[${PYTHON_MULTI_USEDEP}]
+ www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+ ldap? (
>=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+ ')"
DEPEND="${RDEPEND}"
PATCHES=(
