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 7CCBD1381F3 for ; Fri, 13 Sep 2013 18:58:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BBAEE0AB9; Fri, 13 Sep 2013 18:58:36 +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 AFC14E0AB9 for ; Fri, 13 Sep 2013 18:58:35 +0000 (UTC) Received: from pomiot.lan (host-81.219.110.26.devs.futuro.pl [81.219.110.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 4A1BB33ECC0; Fri, 13 Sep 2013 18:58:33 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-python@lists.gentoo.org Cc: python@gentoo.org, =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-python] [PATCH 5/8] distutils-r1: disable sub-root merging. Date: Fri, 13 Sep 2013 20:58:46 +0200 Message-Id: <1379098729-2801-6-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1379098729-2801-1-git-send-email-mgorny@gentoo.org> References: <1379098729-2801-1-git-send-email-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Discussions centering around the Python ecosystem in Gentoo Linux X-BeenThere: gentoo-python@gentoo.org X-BeenThere: gentoo-python@lists.gentoo.org X-Archives-Salt: f440eff6-dde3-4329-8338-468bcc4d3e04 X-Archives-Hash: 4029a964ee45fbb1c0c3eae2efb98d80 The sub-roots are no longer necessary since we're installing scripts to per-impl directories initially. --- gx86/eclass/distutils-r1.eclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass index 7102c58..5fcb55e 100644 --- a/gx86/eclass/distutils-r1.eclass +++ b/gx86/eclass/distutils-r1.eclass @@ -476,9 +476,7 @@ distutils-r1_python_install() { addpredict "$(python_get_sitedir)" addpredict /usr/lib/portage/pym - local root=${D}/_${EPYTHON} - [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D} - flags+=( --root="${root}" ) + flags+=( --root="${D}" ) if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then local PYTHON_SCRIPTDIR @@ -488,13 +486,12 @@ distutils-r1_python_install() { esetup.py install "${flags[@]}" "${@}" - if [[ -d ${root}$(python_get_sitedir)/tests ]]; then + if [[ -d ${D}$(python_get_sitedir)/tests ]]; then die "Package installs 'tests' package, file collisions likely." fi if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then - _distutils-r1_wrap_scripts "${root}" - multibuild_merge_root "${root}" "${D}" + _distutils-r1_wrap_scripts "${D}" fi } -- 1.8.3.2