commit: 59a57bc85a8e9f85097ab41478c385ba00510997
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Jun 7 21:15:54 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 14:19:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a57bc8
dev-util/scons: 3.0.5-r1 repair src_unpack() to fix Docbook tests
Now after the unpacking of scons github package (scons*.gh.tar.gz for test env)
no files are removed from "/src" directory to store files that
are necessary for some Docbook tests (*.xsl, *.xml, *.ent etc)
and for additional Scons env tests (some *.py files within 'engine' directory).
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/scons/scons-3.0.5-r1.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dev-util/scons/scons-3.0.5-r1.ebuild
b/dev-util/scons/scons-3.0.5-r1.ebuild
index e4524ab4aba..5dba6c1f8da 100644
--- a/dev-util/scons/scons-3.0.5-r1.ebuild
+++ b/dev-util/scons/scons-3.0.5-r1.ebuild
@@ -43,14 +43,11 @@ src_unpack() {
# inside src/ subdirectory to make our life easier
if use test; then
unpack "${P}.gh.tar.gz"
- rm -r "${P}/src" || die
else
- mkdir "${P}" || die
+ mkdir -p "${P}"/src || die
fi
- cd "${P}" || die
- unpack "${P}.tar.gz"
- mv "${P}" src || die
+ tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" ||
die
}
src_prepare() {
