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 B45631381F3 for ; Sat, 14 Sep 2013 22:16:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B014E0B7D; Sat, 14 Sep 2013 22:16: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 A7503E0B7D for ; Sat, 14 Sep 2013 22:16:35 +0000 (UTC) Received: from mail-ie0-x235.google.com (mail-ie0-x235.google.com [IPv6:2607:f8b0:4001:c03::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id CE5A933EABE for ; Sat, 14 Sep 2013 22:16:34 +0000 (UTC) Received: by mail-ie0-f181.google.com with SMTP id tp5so5228005ieb.12 for ; Sat, 14 Sep 2013 15:16:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=UHmMSS1sEI8+Rre7ppoMDFAAa4CP3bv2MTt/0cgDBNM=; b=dVhwMXxUWLs47DPwt2sP/bD8sxoVRjUw/5dIlABMXxJlK/mpImCOS36FekI1lZZ1bG B9b1sf/x/kEWWwbljacgdoM+9tALfDhXfR74KGm/2fjIyjMBh+1sZkpREHJ5u/oP7p89 4aNuQvikyU3SKH+IJTU0qSDJwsRtzUXOyEN3Og58/YrIGc1QEI6Tg3/KakuNyeIdf3zJ +DtmviWLL/2OUp46usMOjnKawiqzVEqjUHY8x4aBNPJST7TMekII0DNGXBwVjHimr/YI Qvr1H6SwU24hI40adOrLCm8fovtMS+cm6mo4h6T3f/gLT0L+wsi4x1wlDJVoq05ZsdyA LReg== 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 MIME-Version: 1.0 X-Received: by 10.50.55.65 with SMTP id q1mr3832856igp.4.1379196993128; Sat, 14 Sep 2013 15:16:33 -0700 (PDT) Received: by 10.64.62.148 with HTTP; Sat, 14 Sep 2013 15:16:33 -0700 (PDT) In-Reply-To: <1379098729-2801-6-git-send-email-mgorny@gentoo.org> References: <1379098729-2801-1-git-send-email-mgorny@gentoo.org> <1379098729-2801-6-git-send-email-mgorny@gentoo.org> Date: Sat, 14 Sep 2013 18:16:33 -0400 Message-ID: Subject: [gentoo-python] Re: [PATCH 5/8] distutils-r1: disable sub-root merging. From: Mike Gilbert To: =?UTF-8?B?TWljaGHFgiBHw7Nybnk=?= Cc: gentoo-python , Gentoo Python Project Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a1dbdea5-dda6-4527-836d-b8f7ade6d63a X-Archives-Hash: fe43f996ef51fd2602d3c6cbb4beb379 On Fri, Sep 13, 2013 at 2:58 PM, Micha=C5=82 G=C3=B3rny = wrote: > 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.e= class > 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=3D${D}/_${EPYTHON} > - [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=3D${D} > - flags+=3D( --root=3D"${root}" ) > + flags+=3D( --root=3D"${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 li= kely." > 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 > I believe this patch causes a race condition which causes java-config's ebuild to fail. running install_data running install_egg_info Writing /tmp/portage/dev-java/java-config-2.2.0/image/usr/lib64/python2.7/s= ite-packages/java_config- 2.2.0-py2.7.egg-info error: /tmp/portage/dev-java/java-config-2.2.0/image//usr/share/java-config= -2/config/: File exists