From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3912D13829C for ; Fri, 3 Jun 2016 16:44:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C9CC254023; Fri, 3 Jun 2016 16:44:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AADB4254023 for ; Fri, 3 Jun 2016 16:44:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5624340D3A for ; Fri, 3 Jun 2016 16:44:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5887D984 for ; Fri, 3 Jun 2016 16:44:00 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1464971445.8139c4bd4ce61c3ff87483e913d444264572095e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage/portage-2.2.8-r2.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8139c4bd4ce61c3ff87483e913d444264572095e X-VCS-Branch: master Date: Fri, 3 Jun 2016 16:44:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 154ddff5-a6a1-4753-935e-118e66d61d99 X-Archives-Hash: bc2c6fc426077fefdb3d5f063df1b59e commit: 8139c4bd4ce61c3ff87483e913d444264572095e Author: Michał Górny gentoo org> AuthorDate: Fri Jun 3 14:49:46 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jun 3 16:30:45 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8139c4bd sys-apps/portage: Clean up old Python impls from the compat ebuild sys-apps/portage/portage-2.2.8-r2.ebuild | 42 ++++++-------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/sys-apps/portage/portage-2.2.8-r2.ebuild b/sys-apps/portage/portage-2.2.8-r2.ebuild index 7559568..7d29fe9 100644 --- a/sys-apps/portage/portage-2.2.8-r2.ebuild +++ b/sys-apps/portage/portage-2.2.8-r2.ebuild @@ -6,9 +6,8 @@ # syntax support) which also requires EAPI 2. EAPI=2 PYTHON_COMPAT=( - pypy2_0 - python3_2 python3_3 python3_4 - python2_6 python2_7 + python3_3 python3_4 + python2_7 ) inherit eutils multilib @@ -17,7 +16,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SLOT="0" -IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr" +IUSE="build doc epydoc +ipc linguas_ru python2 python3 selinux xattr" for _pyimpl in ${PYTHON_COMPAT[@]} ; do IUSE+=" python_targets_${_pyimpl}" @@ -27,20 +26,13 @@ unset _pyimpl # Import of the io module in python-2.6 raises ImportError for the # thread module if threading is disabled. python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] ) - !pypy2_0? ( !python2? ( !python3? ( - || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) - ) ) ) - pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) - python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )" + !python3? ( >=dev-lang/python-2.7[ssl] )" python_dep="${python_dep_ssl//\[ssl\]}" python_dep="${python_dep//,ssl}" python_dep="${python_dep//ssl,}" python_dep="${python_dep} - python_targets_pypy2_0? ( virtual/pypy:2.0 ) - python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) - python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) " @@ -71,9 +63,8 @@ RDEPEND="${python_dep} >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python]