From b2400384b49e4d2f3d6cc53dca3fa37b9f202fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 22 Dec 2015 23:42:47 +0100 Subject: [PATCH] sys-apps/portage: Make use of the new python_gen_impl_dep function --- sys-apps/portage/portage-2.2.20.1.ebuild | 3 +-- sys-apps/portage/portage-2.2.23.ebuild | 3 +-- sys-apps/portage/portage-2.2.24.ebuild | 3 +-- sys-apps/portage/portage-2.2.25.ebuild | 3 +-- sys-apps/portage/portage-2.2.26.ebuild | 3 +-- sys-apps/portage/portage-9999.ebuild | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sys-apps/portage/portage-2.2.20.1.ebuild b/sys-apps/portage/portage-2.2.20.1.ebuild index 9b1a31093768b..2fc8e95917205 100644 --- a/sys-apps/portage/portage-2.2.20.1.ebuild +++ b/sys-apps/portage/portage-2.2.20.1.ebuild @@ -9,7 +9,6 @@ PYTHON_COMPAT=( python3_3 python3_4 python2_7 ) -# Note: substituted below PYTHON_REQ_USE='bzip2(+)' inherit distutils-r1 multilib @@ -22,7 +21,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 SLOT="0" IUSE="build doc epydoc +ipc linguas_ru selinux xattr" -DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch diff --git a/sys-apps/portage/portage-2.2.23.ebuild b/sys-apps/portage/portage-2.2.23.ebuild index 43cb079e8c28e..c310cb5779ed2 100644 --- a/sys-apps/portage/portage-2.2.23.ebuild +++ b/sys-apps/portage/portage-2.2.23.ebuild @@ -9,7 +9,6 @@ PYTHON_COMPAT=( python3_3 python3_4 python3_5 python2_7 ) -# Note: substituted below PYTHON_REQ_USE='bzip2(+)' inherit distutils-r1 multilib @@ -22,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s SLOT="0" IUSE="build doc epydoc +ipc linguas_ru selinux xattr" -DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch diff --git a/sys-apps/portage/portage-2.2.24.ebuild b/sys-apps/portage/portage-2.2.24.ebuild index c22c8f2554a23..9878152820fb8 100644 --- a/sys-apps/portage/portage-2.2.24.ebuild +++ b/sys-apps/portage/portage-2.2.24.ebuild @@ -9,7 +9,6 @@ PYTHON_COMPAT=( python3_3 python3_4 python3_5 python2_7 ) -# Note: substituted below PYTHON_REQ_USE='bzip2(+)' inherit distutils-r1 multilib @@ -22,7 +21,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh spar SLOT="0" IUSE="build doc epydoc +ipc linguas_ru selinux xattr" -DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch diff --git a/sys-apps/portage/portage-2.2.25.ebuild b/sys-apps/portage/portage-2.2.25.ebuild index 43cb079e8c28e..c310cb5779ed2 100644 --- a/sys-apps/portage/portage-2.2.25.ebuild +++ b/sys-apps/portage/portage-2.2.25.ebuild @@ -9,7 +9,6 @@ PYTHON_COMPAT=( python3_3 python3_4 python3_5 python2_7 ) -# Note: substituted below PYTHON_REQ_USE='bzip2(+)' inherit distutils-r1 multilib @@ -22,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s SLOT="0" IUSE="build doc epydoc +ipc linguas_ru selinux xattr" -DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch diff --git a/sys-apps/portage/portage-2.2.26.ebuild b/sys-apps/portage/portage-2.2.26.ebuild index 9473c2c5b4e0f..0b2f97d69b71a 100644 --- a/sys-apps/portage/portage-2.2.26.ebuild +++ b/sys-apps/portage/portage-2.2.26.ebuild @@ -9,7 +9,6 @@ PYTHON_COMPAT=( python3_3 python3_4 python3_5 python2_7 ) -# Note: substituted below PYTHON_REQ_USE='bzip2(+)' inherit distutils-r1 multilib @@ -22,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s SLOT="0" IUSE="build doc epydoc +ipc linguas_ru selinux xattr" -DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index f69e62f70f260..7ef56c98d2ef1 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -9,7 +9,6 @@ PYTHON_COMPAT=( python3_3 python3_4 python3_5 python2_7 ) -# Note: substituted below PYTHON_REQ_USE='bzip2(+)' inherit distutils-r1 git-r3 multilib @@ -22,7 +21,7 @@ KEYWORDS="" SLOT="0" IUSE="build doc epydoc +ipc linguas_ru selinux xattr" -DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch