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 0A62B1381F3 for ; Sat, 1 Dec 2012 10:52:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCA3D21C01B; Sat, 1 Dec 2012 10:52:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41A5721C01B for ; Sat, 1 Dec 2012 10:52:43 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C27B33D95C for ; Sat, 1 Dec 2012 10:52:42 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 2315B2167F; Sat, 1 Dec 2012 10:52:41 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog distutils-r1.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121201105241.2315B2167F@flycatcher.gentoo.org> Date: Sat, 1 Dec 2012 10:52:41 +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: 95f37377-fee4-4c4f-ba11-aeaa9e97a20c X-Archives-Hash: b873c71e7a759bc4811f4999fb7c4557 mgorny 12/12/01 10:52:41 Modified: ChangeLog distutils-r1.eclass Log: Use intermediate-root install. Revision Changes Path 1.535 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.535&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.535&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.534&r2=1.535 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.534 retrieving revision 1.535 diff -u -r1.534 -r1.535 --- ChangeLog 1 Dec 2012 10:51:48 -0000 1.534 +++ ChangeLog 1 Dec 2012 10:52:40 -0000 1.535 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.534 2012/12/01 10:51:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.535 2012/12/01 10:52:40 mgorny Exp $ + + 01 Dec 2012; Michał Górny distutils-r1.eclass: + Use intermediate-root install. 01 Dec 2012; Michał Górny distutils-r1.eclass: Make distutils-r1_rename_scripts private. Rename all matching executables 1.22 eclass/distutils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.21&r2=1.22 Index: distutils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- distutils-r1.eclass 1 Dec 2012 10:51:48 -0000 1.21 +++ distutils-r1.eclass 1 Dec 2012 10:52:40 -0000 1.22 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.21 2012/12/01 10:51:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.22 2012/12/01 10:52:40 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -297,9 +297,14 @@ local PYTHONDONTWRITEBYTECODE export PYTHONDONTWRITEBYTECODE - esetup.py install "${flags[@]}" --root="${D}" "${@}" + local root=${D}/_${EPYTHON} - _distutils-r1_rename_scripts "${D}" + esetup.py install "${flags[@]}" --root="${root}" "${@}" + _distutils-r1_rename_scripts "${root}" + + # merge + cp -a -l -n "${root}"/* "${D}"/ || die "Merging ${EPYTHON} image failed." + rm -rf "${root}" } # @FUNCTION: distutils-r1_python_install_all