diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2023-03-21 13:26:50 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2023-03-21 13:43:58 +0100 |
| commit | 54590fb2caabe3e8901c5427b4c31e66cb6c5d87 (patch) | |
| tree | 2070d6adbf3f0485909012663214c53d9f46bb79 /dev-util/scons | |
| parent | sci-chemistry/chemical-mime-data: Add forgotten patch (diff) | |
| download | gentoo-54590fb2caabe3e8901c5427b4c31e66cb6c5d87.tar.gz gentoo-54590fb2caabe3e8901c5427b4c31e66cb6c5d87.tar.bz2 gentoo-54590fb2caabe3e8901c5427b4c31e66cb6c5d87.zip | |
dev-util/scons: Fix merging sdist with GitHub archive
The ebuild originally unpacked the sdist tarball inside the GitHub
archive. However, this stopped working correctly once upstream moved
the source code from "src" subdirectory to the top directory. Update
the ebuild to merge sources again.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-util/scons')
| -rw-r--r-- | dev-util/scons/scons-4.5.1-r2.ebuild (renamed from dev-util/scons/scons-4.5.1.ebuild) | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/dev-util/scons/scons-4.5.1.ebuild b/dev-util/scons/scons-4.5.1-r2.ebuild index 87c03687ce2a..a266b560941a 100644 --- a/dev-util/scons/scons-4.5.1.ebuild +++ b/dev-util/scons/scons-4.5.1-r2.ebuild @@ -29,7 +29,6 @@ SRC_URI=" -> ${P}.gh.tar.gz ) " -S="${WORKDIR}/${P}/src" LICENSE="MIT" SLOT="0" @@ -44,30 +43,27 @@ BDEPEND=" ) " -PATCHES=( - # support env passthrough for Gentoo ebuilds - "${FILESDIR}"/scons-4.1.0-env-passthrough.patch - # respect CC, CXX, C*FLAGS, LDFLAGS by default - "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch -) - src_unpack() { - # use the git directory structure, but put pregenerated release - # inside src/ subdirectory to make our life easier + # use the git directory structure, then unpack the pypi tarball + # on top of it to make our life easier if use test; then unpack "${P}.gh.tar.gz" else - mkdir -p "${P}"/src || die + mkdir -p "${P}" || die fi - tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die + tar -C "${P}" --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die } src_prepare() { - # apply patches relatively to top directory - cd "${WORKDIR}/${P}" || die distutils-r1_src_prepare + # TODO: rebase the patches <4.5.1-r2 is gone + # support env passthrough for Gentoo ebuilds + eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch + # respect CC, CXX, C*FLAGS, LDFLAGS by default + eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch + if use test; then local remove_tests=( # TODO: does not respect PATH? @@ -90,6 +86,11 @@ src_prepare() { test/Fortran/F77PATH.py test/Fortran/FORTRANPATH.py test/Fortran/gfortran.py + # TODO, these seem to be caused by our patches + test/Repository/include.py + test/Repository/multi-dir.py + test/Repository/variants.py + test/virtualenv/activated/option/ignore-virtualenv.py ) if ! use amd64 && ! use x86 ; then |