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 296DA58973 for ; Sat, 6 Feb 2016 09:58:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2401021C011; Sat, 6 Feb 2016 09:58:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8AD621C00D for ; Sat, 6 Feb 2016 09:58:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C67F9340B54 for ; Sat, 6 Feb 2016 09:58:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FF758F1 for ; Sat, 6 Feb 2016 09:58:01 +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: <1454752655.1da06d27b3cf22ad067478e8f23c15f571804e17.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-python/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-eselect/eselect-python/eselect-python-99999999.ebuild X-VCS-Directories: app-eselect/eselect-python/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1da06d27b3cf22ad067478e8f23c15f571804e17 X-VCS-Branch: master Date: Sat, 6 Feb 2016 09:58:01 +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: 528d8579-b2d5-4921-92e8-108f5d752d9a X-Archives-Hash: d0bf105d5c32a9247cf1d98aff3655df commit: 1da06d27b3cf22ad067478e8f23c15f571804e17 Author: Michał Górny gentoo org> AuthorDate: Sat Jan 30 11:32:48 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 6 09:57:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da06d27 app-eselect/eselect-python: Updated for wrappers' move to python-exec .../eselect-python/eselect-python-99999999.ebuild | 45 ++-------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild index 4e6988a..53ed376 100644 --- a/app-eselect/eselect-python/eselect-python-99999999.ebuild +++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,11 +20,7 @@ SLOT="0" IUSE="" RDEPEND=">=app-admin/eselect-1.2.3 - >=dev-lang/python-exec-2.1:2 - !=dev-lang/python-exec-2.3" src_prepare() { [[ ${PV} == "99999999" ]] && eautoreconf @@ -32,36 +28,7 @@ src_prepare() { src_install() { keepdir /etc/env.d/python - emake DESTDIR="${D}" install || die - - local f - for f in python{,2,3}; do - # can't use symlinks here since random stuff - # loves to do readlink on sys.executable... - newbin "${EPREFIX}/usr/lib/python-exec/python-exec2" "${f}" - done - for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do - dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" - done -} - -pkg_preinst() { - local py - - # Copy python[23] selection from the old format (symlink) - for py in 2 3; do - # default to none - declare -g "PREV_PYTHON${py}"= - - if [[ -L ${EROOT}/usr/bin/python${py} ]]; then - local target=$(readlink "${EROOT}/usr/bin/python${py}") - - # check if it's actually old eselect symlink - if [[ ${target} == python?.? ]]; then - declare -g "PREV_PYTHON${py}=${target}" - fi - fi - done + emake DESTDIR="${D}" install } pkg_postinst() { @@ -72,11 +39,7 @@ pkg_postinst() { fi for py in 2 3; do - local pyvar=PREV_PYTHON${py} - if [[ -n ${!pyvar} ]]; then - einfo "Setting Python${py} to ${!pyvar}" - eselect python set "--python${py}" "${!pyvar}" - elif has_version "=dev-lang/python-${py}*"; then + if has_version "=dev-lang/python-${py}*"; then eselect python update "--python${py}" --if-unset fi done