| 1 |
commit: 44b41f4bb8ef2afe864b4ea19e2d0433b4050ae2 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 21 15:07:27 2020 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 21 15:08:18 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b41f4b |
| 7 |
|
| 8 |
net-analyzer/netdata: Use python-single-r1 instead of python-r1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/710242 |
| 11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
net-analyzer/netdata/netdata-1.20.0.ebuild | 13 +++++++------ |
| 15 |
net-analyzer/netdata/netdata-9999.ebuild | 13 +++++++------ |
| 16 |
2 files changed, 14 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-analyzer/netdata/netdata-1.20.0.ebuild b/net-analyzer/netdata/netdata-1.20.0.ebuild |
| 19 |
index 2e1eb0f4a27..38d285c386e 100644 |
| 20 |
--- a/net-analyzer/netdata/netdata-1.20.0.ebuild |
| 21 |
+++ b/net-analyzer/netdata/netdata-1.20.0.ebuild |
| 22 |
@@ -4,7 +4,7 @@ |
| 23 |
EAPI=7 |
| 24 |
PYTHON_COMPAT=( python{3_6,3_7} ) |
| 25 |
|
| 26 |
-inherit autotools fcaps linux-info python-r1 systemd |
| 27 |
+inherit autotools fcaps linux-info python-single-r1 systemd |
| 28 |
|
| 29 |
if [[ ${PV} == *9999 ]] ; then |
| 30 |
EGIT_REPO_URI="https://github.com/netdata/${PN}.git" |
| 31 |
@@ -63,15 +63,15 @@ RDEPEND=" |
| 32 |
) |
| 33 |
python? ( |
| 34 |
${PYTHON_DEPS} |
| 35 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
| 36 |
+ $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') |
| 37 |
mysql? ( |
| 38 |
|| ( |
| 39 |
- dev-python/mysqlclient[${PYTHON_USEDEP}] |
| 40 |
- dev-python/mysql-python[${PYTHON_USEDEP}] |
| 41 |
+ $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') |
| 42 |
+ $(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]') |
| 43 |
) |
| 44 |
) |
| 45 |
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
| 46 |
- tor? ( net-libs/stem[${PYTHON_USEDEP}] ) |
| 47 |
+ postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) |
| 48 |
+ tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) |
| 49 |
) |
| 50 |
xen? ( |
| 51 |
app-emulation/xen-tools |
| 52 |
@@ -85,6 +85,7 @@ FILECAPS=( |
| 53 |
) |
| 54 |
|
| 55 |
pkg_setup() { |
| 56 |
+ use python && python-single-r1_pkg_setup |
| 57 |
linux-info_pkg_setup |
| 58 |
} |
| 59 |
|
| 60 |
|
| 61 |
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild |
| 62 |
index 2e1eb0f4a27..38d285c386e 100644 |
| 63 |
--- a/net-analyzer/netdata/netdata-9999.ebuild |
| 64 |
+++ b/net-analyzer/netdata/netdata-9999.ebuild |
| 65 |
@@ -4,7 +4,7 @@ |
| 66 |
EAPI=7 |
| 67 |
PYTHON_COMPAT=( python{3_6,3_7} ) |
| 68 |
|
| 69 |
-inherit autotools fcaps linux-info python-r1 systemd |
| 70 |
+inherit autotools fcaps linux-info python-single-r1 systemd |
| 71 |
|
| 72 |
if [[ ${PV} == *9999 ]] ; then |
| 73 |
EGIT_REPO_URI="https://github.com/netdata/${PN}.git" |
| 74 |
@@ -63,15 +63,15 @@ RDEPEND=" |
| 75 |
) |
| 76 |
python? ( |
| 77 |
${PYTHON_DEPS} |
| 78 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
| 79 |
+ $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') |
| 80 |
mysql? ( |
| 81 |
|| ( |
| 82 |
- dev-python/mysqlclient[${PYTHON_USEDEP}] |
| 83 |
- dev-python/mysql-python[${PYTHON_USEDEP}] |
| 84 |
+ $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') |
| 85 |
+ $(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]') |
| 86 |
) |
| 87 |
) |
| 88 |
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
| 89 |
- tor? ( net-libs/stem[${PYTHON_USEDEP}] ) |
| 90 |
+ postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) |
| 91 |
+ tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) |
| 92 |
) |
| 93 |
xen? ( |
| 94 |
app-emulation/xen-tools |
| 95 |
@@ -85,6 +85,7 @@ FILECAPS=( |
| 96 |
) |
| 97 |
|
| 98 |
pkg_setup() { |
| 99 |
+ use python && python-single-r1_pkg_setup |
| 100 |
linux-info_pkg_setup |
| 101 |
} |
Archives