From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E02F6138331 for ; Wed, 9 May 2018 15:26:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36BAEE0951; Wed, 9 May 2018 15:26:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0DF32E0957 for ; Wed, 9 May 2018 15:26:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC968335C2C for ; Wed, 9 May 2018 15:26:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B6C442 for ; Wed, 9 May 2018 15:26: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: <1525879551.e87d2721975e85a3d2372f2807618e3f1ebda301.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/scons/scons-3.0.1.ebuild X-VCS-Directories: dev-util/scons/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e87d2721975e85a3d2372f2807618e3f1ebda301 X-VCS-Branch: master Date: Wed, 9 May 2018 15:26: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: 79ffdbe6-59fc-42e4-b67e-36b1bedabf0a X-Archives-Hash: 8c15c012dd7ccd70b55581c7655f90d8 commit: e87d2721975e85a3d2372f2807618e3f1ebda301 Author: Michał Górny gentoo org> AuthorDate: Wed May 9 15:13:59 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 9 15:25:51 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87d2721 dev-util/scons: Use git directory structure for workdir Reuse the same directory structure as used in SCons git to make user patch application easier. dev-util/scons/scons-3.0.1.ebuild | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dev-util/scons/scons-3.0.1.ebuild b/dev-util/scons/scons-3.0.1.ebuild index 99e628bd103..1a6f2c59360 100644 --- a/dev-util/scons/scons-3.0.1.ebuild +++ b/dev-util/scons/scons-3.0.1.ebuild @@ -21,25 +21,36 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="doc test" +S=${WORKDIR}/${P}/src + src_unpack() { + # use the git directory structure, but put pregenerated release + # inside src/ subdirectory to make our life easier if use test; then unpack "${P}.gh.tar.gz" - mv "${P}" "${P}-full" || die + rm -r "${P}/src" || die + else + mkdir "${P}" || die fi + + cd "${P}" || die unpack "${P}.tar.gz" + mv "${P}" src || die } -python_prepare_all() { +src_prepare() { + # apply patches relatively to top directory + cd "${WORKDIR}/${P}" || die + distutils-r1_src_prepare + # remove half-broken, useless custom commands # and fix manpage install location sed -i -e '/cmdclass/,/}$/d' \ - -e '/data_files/s:man/:share/man/:' setup.py || die - - distutils-r1_python_prepare_all + -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die } python_test() { - cd "${WORKDIR}/${P}-full" || die + cd "${WORKDIR}/${P}" || die "${EPYTHON}" runtest.py -as \ -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \ --builddir "${BUILD_DIR}/lib" ||