commit: 3182b302c03bd6e3c90606935cc168146b724ebb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 11:57:03 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 11:58:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3182b302
app-admin/salt: Update neutron/nova dependencies
Remove obsolete restriciton on neutron/nova dependencies, and more
importantly replace absolutely outrageous inline PYTHON_TARGETS use
which once again proves that the maintainer can't be bothered to read
documentation.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-admin/salt/salt-3006.9-r2.ebuild | 12 ++++--------
app-admin/salt/salt-3007.0-r1.ebuild | 14 ++++----------
app-admin/salt/salt-3007.1-r1.ebuild | 12 +++---------
app-admin/salt/salt-3007.1-r2.ebuild | 14 ++++----------
4 files changed, 15 insertions(+), 37 deletions(-)
diff --git a/app-admin/salt/salt-3006.9-r2.ebuild
b/app-admin/salt/salt-3006.9-r2.ebuild
index 03fbbd71d75e..2c10b17b189d 100644
--- a/app-admin/salt/salt-3006.9-r2.ebuild
+++ b/app-admin/salt/salt-3006.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova openssl portage profile redis selinux test raet
+ mongodb neutron nova openssl portage profile redis selinux test raet
+zeromq vim-syntax
"
@@ -79,12 +79,8 @@ RDEPEND="
redis? ( dev-python/redis[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
amd64? (
- nova? (
- $(python_gen_cond_dep
'>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_1{0..1})
- )
- neutron? (
- $(python_gen_cond_dep
'>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_1{0..1})
- )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
)
+ neutron? (
>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
)
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
diff --git a/app-admin/salt/salt-3007.0-r1.ebuild
b/app-admin/salt/salt-3007.0-r1.ebuild
index 308a2d0fcebc..1690cbdb34dd 100644
--- a/app-admin/salt/salt-3007.0-r1.ebuild
+++ b/app-admin/salt/salt-3007.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova portage profile redis selinux test raet
+ mongodb neutron nova portage profile redis selinux test raet
+zeromq vim-syntax
"
@@ -78,12 +78,8 @@ RDEPEND="
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
redis? ( dev-python/redis[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
- nova? (
- $(python_gen_cond_dep
'>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1})
- )
- neutron? (
- $(python_gen_cond_dep
'>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1})
- )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
vim-syntax? ( app-vim/salt-vim )
@@ -132,8 +128,6 @@ DOCS=( README.rst AUTHORS )
REQUIRED_USE="
|| ( raet zeromq )
test? ( cheetah genshi )
- nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
- neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
"
RESTRICT="
!test? ( test )
diff --git a/app-admin/salt/salt-3007.1-r1.ebuild
b/app-admin/salt/salt-3007.1-r1.ebuild
index 7f4b60bd59a6..97c3c18acbef 100644
--- a/app-admin/salt/salt-3007.1-r1.ebuild
+++ b/app-admin/salt/salt-3007.1-r1.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova portage profile redis selinux test raet
+ mongodb neutron nova portage profile redis selinux test raet
+zeromq vim-syntax
"
@@ -78,12 +78,8 @@ RDEPEND="
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
redis? ( dev-python/redis[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
- nova? (
- $(python_gen_cond_dep
'>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1})
- )
- neutron? (
- $(python_gen_cond_dep
'>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1})
- )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
vim-syntax? ( app-vim/salt-vim )
@@ -132,8 +128,6 @@ DOCS=( README.rst AUTHORS )
REQUIRED_USE="
|| ( raet zeromq )
test? ( cheetah genshi )
- nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
- neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
"
RESTRICT="
!test? ( test )
diff --git a/app-admin/salt/salt-3007.1-r2.ebuild
b/app-admin/salt/salt-3007.1-r2.ebuild
index c1f1fcf9bb51..adeb593b33a1 100644
--- a/app-admin/salt/salt-3007.1-r2.ebuild
+++ b/app-admin/salt/salt-3007.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="
cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova portage profile redis selinux test raet
+ mongodb neutron nova portage profile redis selinux test raet
+zeromq vim-syntax
"
@@ -78,12 +78,8 @@ RDEPEND="
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
redis? ( dev-python/redis[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
- nova? (
- $(python_gen_cond_dep
'>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1})
- )
- neutron? (
- $(python_gen_cond_dep
'>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1})
- )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
vim-syntax? ( app-vim/salt-vim )
@@ -132,8 +128,6 @@ DOCS=( README.rst AUTHORS )
REQUIRED_USE="
|| ( raet zeromq )
test? ( cheetah genshi )
- nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
- neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
"
RESTRICT="
!test? ( test )
