sys-apps/portage: Remove obsolete python_gen_cond_dep

Fixes: 0a2c520e735f ("sys-apps/portage: Drop py2")
Reported-by: Matt Turner <mattst88@gentoo.org>
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Zac Medico <zmedico@gentoo.org>

diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild
index 49902cf1a58f128594f3bc805ba2a74630680fc3..63e4b6aac1816616de2991f99410fe8b3f10e004 100644 (file)
--- a/sys-apps/portage/portage-2.3.69.ebuild
+++ b/sys-apps/portage/portage-2.3.69.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
                app-shells/bash:0[readline]
                >=app-admin/eselect-1.2
                $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-                       python{2_7,3_5} pypy)
+                       python3_5)
                rsync-verify? (
                        >=app-portage/gemato-14[${PYTHON_USEDEP}]
                        >=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -55,8 +55,6 @@ RDEPEND="
        selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
        xattr? ( kernel_linux? (
                >=sys-apps/install-xattr-0.3
-               $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-                       python2_7 pypy)
        ) )
        !<app-admin/logrotate-3.8.0
        !<app-portage/repoman-2.3.10"

diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild
index 9a5f7d08584d6234443d4b04949dcb1aaaa81162..b0a1b2c9a46a82f93e495bb7695498c777a74d0b 100644 (file)
--- a/sys-apps/portage/portage-2.3.79.ebuild
+++ b/sys-apps/portage/portage-2.3.79.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
                app-shells/bash:0[readline]
                >=app-admin/eselect-1.2
                $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-                       python{2_7,3_5} pypy)
+                       python3_5)
                rsync-verify? (
                        >=app-portage/gemato-14[${PYTHON_USEDEP}]
                        >=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -55,8 +55,6 @@ RDEPEND="
        selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
        xattr? ( kernel_linux? (
                >=sys-apps/install-xattr-0.3
-               $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-                       python2_7 pypy)
        ) )
        !<app-admin/logrotate-3.8.0
        !<app-portage/gentoolkit-0.4.6

diff --git a/sys-apps/portage/portage-2.3.89-r1.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild
index 4aaaed7db0e20f8056150da551aaf157d1715fee..aa0ae262ab85f6c6a2145178d096ab21e22d9e1e 100644 (file)
--- a/sys-apps/portage/portage-2.3.89-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.89-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
                app-shells/bash:0[readline]
                >=app-admin/eselect-1.2
                $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-                       python{2_7,3_5} pypy)
+                       python3_5)
                rsync-verify? (
                        >=app-portage/gemato-14[${PYTHON_USEDEP}]
                        >=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -59,8 +59,6 @@ RDEPEND="
        selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
        xattr? ( kernel_linux? (
                >=sys-apps/install-xattr-0.3
-               $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-                       python2_7 pypy)
        ) )
        !<app-admin/logrotate-3.8.0
        !<app-portage/gentoolkit-0.4.6

diff --git a/sys-apps/portage/portage-2.3.94.ebuild b/sys-apps/portage/portage-2.3.94.ebuild
index aa35e924a823d6f59d0d48941a931d179983c1ac..b157506f61ee574b4008738b567602a7d1e0160a 100644 (file)
--- a/sys-apps/portage/portage-2.3.94.ebuild
+++ b/sys-apps/portage/portage-2.3.94.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
                app-shells/bash:0[readline]
                >=app-admin/eselect-1.2
                $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-                       python{2_7,3_5} pypy)
+                       python3_5)
                rsync-verify? (
                        >=app-portage/gemato-14[${PYTHON_USEDEP}]
                        >=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -59,8 +59,6 @@ RDEPEND="
        selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
        xattr? ( kernel_linux? (
                >=sys-apps/install-xattr-0.3
-               $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-                       python2_7 pypy)
        ) )
        !<app-admin/logrotate-3.8.0
        !<app-portage/gentoolkit-0.4.6

diff --git a/sys-apps/portage/portage-2.3.95.ebuild b/sys-apps/portage/portage-2.3.95.ebuild
index aa35e924a823d6f59d0d48941a931d179983c1ac..b157506f61ee574b4008738b567602a7d1e0160a 100644 (file)
--- a/sys-apps/portage/portage-2.3.95.ebuild
+++ b/sys-apps/portage/portage-2.3.95.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
                app-shells/bash:0[readline]
                >=app-admin/eselect-1.2
                $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-                       python{2_7,3_5} pypy)
+                       python3_5)
                rsync-verify? (
                        >=app-portage/gemato-14[${PYTHON_USEDEP}]
                        >=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -59,8 +59,6 @@ RDEPEND="
        selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
        xattr? ( kernel_linux? (
                >=sys-apps/install-xattr-0.3
-               $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-                       python2_7 pypy)
        ) )
        !<app-admin/logrotate-3.8.0
        !<app-portage/gentoolkit-0.4.6

diff --git a/sys-apps/portage/portage-2.3.96-r1.ebuild b/sys-apps/portage/portage-2.3.96-r1.ebuild
index 9267d9bd83e3209d2a814c40921503f51bac14fd..4e0264ebf1e3283805113fd643127c97a08ac9d7 100644 (file)
--- a/sys-apps/portage/portage-2.3.96-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.96-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
                app-shells/bash:0[readline]
                >=app-admin/eselect-1.2
                $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-                       python{2_7,3_5} pypy)
+                       python3_5)
                rsync-verify? (
                        >=app-portage/gemato-14[${PYTHON_USEDEP}]
                        >=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -59,8 +59,6 @@ RDEPEND="
        selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
        xattr? ( kernel_linux? (
                >=sys-apps/install-xattr-0.3
-               $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-                       python2_7 pypy)
        ) )
        !<app-admin/logrotate-3.8.0
        !<app-portage/gentoolkit-0.4.6

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 1ee606fe3c2224f526c4b62879b6d613d7fa8e9d..cf5c6e3b5fddf67a2fb3f6839134244321c20dd2 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
                app-shells/bash:0[readline]
                >=app-admin/eselect-1.2
                $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-                       python{2_7,3_5} pypy)
+                       python3_5)
                rsync-verify? (
                        >=app-portage/gemato-14[${PYTHON_USEDEP}]
                        >=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -60,8 +60,6 @@ RDEPEND="
        selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
        xattr? ( kernel_linux? (
                >=sys-apps/install-xattr-0.3
-               $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-                       python2_7 pypy)
        ) )
        !<app-admin/logrotate-3.8.0"
 PDEPEND="