Skip to content

Commit

Permalink
app-admin/salt: Clean <=py3.8 leftovers
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
mgorny committed Nov 15, 2022
1 parent e67246c commit 8fcceac
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 45 deletions.
17 changes: 2 additions & 15 deletions app-admin/salt/salt-3002.9-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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(-)]
Expand Down Expand Up @@ -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
:
}
17 changes: 2 additions & 15 deletions app-admin/salt/salt-3003.5-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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(-)]
Expand Down Expand Up @@ -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
:
}
17 changes: 2 additions & 15 deletions app-admin/salt/salt-3004.2-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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(-)]
Expand Down Expand Up @@ -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
:
}

0 comments on commit 8fcceac

Please sign in to comment.