commit: 8fcceac282a29098fb8504f2f000b38efb08ec44
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 18:00:36 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 18:16:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcceac2
app-admin/salt: Clean <=py3.8 leftovers
Remove python_gen_cond_dep from an ancient era of libvirt-python not
supporting newer Python implementations, as well as obsolete postinst
messages.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-admin/salt/salt-3002.9-r1.ebuild | 17 ++---------------
app-admin/salt/salt-3003.5-r2.ebuild | 17 ++---------------
app-admin/salt/salt-3004.2-r2.ebuild | 17 ++---------------
3 files changed, 6 insertions(+), 45 deletions(-)
diff --git a/app-admin/salt/salt-3002.9-r1.ebuild
b/app-admin/salt/salt-3002.9-r1.ebuild
index 2fa91367775a..e5ddadf4d133 100644
--- a/app-admin/salt/salt-3002.9-r1.ebuild
+++ b/app-admin/salt/salt-3002.9-r1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
<dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libvirt? (
- $(python_gen_cond_dep
'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
@@ -184,18 +184,5 @@ python_test() {
}
pkg_postinst() {
- if use python_targets_python3_8; then
- if use nova; then
- ewarn "Salt's nova functionality will not work with
python3.8 since"
- ewarn "dev-python/python-novaclient does not support it
yet"
- fi
- if use neutron; then
- ewarn "Salt's neutron functionality will not work with
python3.8 since"
- ewarn "dev-python/python-neutronclient does not support
it yet"
- fi
- if use libvirt; then
- ewarn "Salt's libvirt functionality will not work with
python3.8 since"
- ewarn "dev-python/libvirt-python does not support it
yet"
- fi
- fi
+ :
}
diff --git a/app-admin/salt/salt-3003.5-r2.ebuild
b/app-admin/salt/salt-3003.5-r2.ebuild
index 3cd254df3aa9..6c24958787ad 100644
--- a/app-admin/salt/salt-3003.5-r2.ebuild
+++ b/app-admin/salt/salt-3003.5-r2.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
<dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libvirt? (
- $(python_gen_cond_dep
'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
@@ -193,18 +193,5 @@ python_test() {
}
pkg_postinst() {
- if use python_targets_python3_8; then
- if use nova; then
- ewarn "Salt's nova functionality will not work with
python3.8 since"
- ewarn "dev-python/python-novaclient does not support it
yet"
- fi
- if use neutron; then
- ewarn "Salt's neutron functionality will not work with
python3.8 since"
- ewarn "dev-python/python-neutronclient does not support
it yet"
- fi
- if use libvirt; then
- ewarn "Salt's libvirt functionality will not work with
python3.8 since"
- ewarn "dev-python/libvirt-python does not support it
yet"
- fi
- fi
+ :
}
diff --git a/app-admin/salt/salt-3004.2-r2.ebuild
b/app-admin/salt/salt-3004.2-r2.ebuild
index 1e3ce475d192..8657b4a8139f 100644
--- a/app-admin/salt/salt-3004.2-r2.ebuild
+++ b/app-admin/salt/salt-3004.2-r2.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
<dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libvirt? (
- $(python_gen_cond_dep
'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
@@ -193,18 +193,5 @@ python_test() {
}
pkg_postinst() {
- if use python_targets_python3_8; then
- if use nova; then
- ewarn "Salt's nova functionality will not work with
python3.8 since"
- ewarn "dev-python/python-novaclient does not support it
yet"
- fi
- if use neutron; then
- ewarn "Salt's neutron functionality will not work with
python3.8 since"
- ewarn "dev-python/python-neutronclient does not support
it yet"
- fi
- if use libvirt; then
- ewarn "Salt's libvirt functionality will not work with
python3.8 since"
- ewarn "dev-python/libvirt-python does not support it
yet"
- fi
- fi
+ :
}
