From d0144749c22f5bfa5bc158ae14fc89b6cd5b17af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 12 Jan 2020 15:56:36 +0100 Subject: [PATCH] app-admin/salt: Remove Python 2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- app-admin/salt/metadata.xml | 1 - app-admin/salt/salt-2018.3.4.ebuild | 9 +++------ app-admin/salt/salt-2019.2.0-r1.ebuild | 9 +++------ app-admin/salt/salt-2019.2.2.ebuild | 9 +++------ 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml index 00b55f2c20e0..e27805465b7e 100644 --- a/app-admin/salt/metadata.xml +++ b/app-admin/salt/metadata.xml @@ -34,7 +34,6 @@ backbone of cloud and data center management. Add support for package state enforcement using sys-apps/portage Add support for the new RAET transport. Support returning data to a redis database. - Use timelib to parse english textual date descriptions. Add support for the zeromq transport. diff --git a/app-admin/salt/salt-2018.3.4.ebuild b/app-admin/salt/salt-2018.3.4.ebuild index e3e8f3743f3e..53dc802d2e11 100644 --- a/app-admin/salt/salt-2018.3.4.ebuild +++ b/app-admin/salt/salt-2018.3.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit eutils systemd distutils-r1 @@ -23,8 +23,8 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova" +IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax" RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] @@ -58,10 +58,8 @@ RDEPEND="sys-apps/pciutils mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] ) redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] ) 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}] ) @@ -76,7 +74,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/timelib[$(python_gen_usedep 'python2*')] >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] diff --git a/app-admin/salt/salt-2019.2.0-r1.ebuild b/app-admin/salt/salt-2019.2.0-r1.ebuild index e1f7d05b2dfb..b20f9a0c39cf 100644 --- a/app-admin/salt/salt-2019.2.0-r1.ebuild +++ b/app-admin/salt/salt-2019.2.0-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit eutils systemd distutils-r1 @@ -23,8 +23,8 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova" +IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax" RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] @@ -58,10 +58,8 @@ RDEPEND="sys-apps/pciutils mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] ) redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] ) 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}] ) @@ -77,7 +75,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/timelib[$(python_gen_usedep 'python2*')] >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] diff --git a/app-admin/salt/salt-2019.2.2.ebuild b/app-admin/salt/salt-2019.2.2.ebuild index ab00a4d5d798..909935cd7f6b 100644 --- a/app-admin/salt/salt-2019.2.2.ebuild +++ b/app-admin/salt/salt-2019.2.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit eutils systemd distutils-r1 @@ -23,8 +23,8 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova" +IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax" RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] @@ -58,10 +58,8 @@ RDEPEND="sys-apps/pciutils mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] ) redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] ) 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}] ) @@ -78,7 +76,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/timelib[$(python_gen_usedep 'python2*')] >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] -- 2.26.2