app-admin/salt: Remove Python 2

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 00b55f2c20e01007679b6a534c992413887422c1..e27805465b7e2ed533c9d3a5f307fe757e02f2b0 100644 (file)
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -34,7 +34,6 @@ backbone of cloud and data center management.
     <flag name="portage">Add support for package state enforcement using sys-apps/portage</flag>
     <flag name="raet">Add support for the new RAET transport.</flag>
     <flag name="redis">Support returning data to a redis database.</flag>
-    <flag name="timelib">Use timelib to parse english textual date descriptions.</flag>
     <flag name="zeromq">Add support for the zeromq transport.</flag>
   </use>
   <upstream>

diff --git a/app-admin/salt/salt-2018.3.4.ebuild b/app-admin/salt/salt-2018.3.4.ebuild
index e3e8f3743f3eaf72c70db6e7ff8012a36b4b6766..53dc802d2e11e6329d3eb01073b793410985b775 100644 (file)
--- 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 e1f7d05b2dfba655580627b9bde3923e3a8bf36f..b20f9a0c39cfa89f03f5962ebc3c30fdd32bab16 100644 (file)
--- 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 ab00a4d5d7980798e61e5a6c83b3a357c4337314..909935cd7f6b751a3b6fa7f2557b60fb1acb3679 100644 (file)
--- 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}]