commit: d2350b062f2e91b6afbf94836569ba6038528293
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 16:11:14 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 16:21:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2350b06
dev-util/scons: Remove tests (and test deps) in <4
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/scons/Manifest | 2 --
dev-util/scons/scons-3.1.1.ebuild | 39 ++++-----------------------------------
dev-util/scons/scons-3.1.2.ebuild | 39 ++++-----------------------------------
3 files changed, 8 insertions(+), 72 deletions(-)
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 0cb81b03bfa..b311313687e 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,10 +1,8 @@
DIST scons-3.1.1-user.html 1134061 BLAKE2B
de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8
SHA512
bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
DIST scons-3.1.1-user.pdf 2564248 BLAKE2B
702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4
SHA512
0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
-DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B
cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6
SHA512
3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
DIST scons-3.1.1.tar.gz 663878 BLAKE2B
095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711
SHA512
2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
DIST scons-3.1.2-user.html 1126908 BLAKE2B
38e7695b6ef1e79b3eed4455fbe84ec1587be3f21c1c90cfa6602b344c52c704f021ed8e611abaf2e24ca06c5116e79fb78ca724c9920186cce35feccbac899d
SHA512
a13ed1157f6aad25acbad6e1e3d2c0a16a14dd1d5fa369ba27777ca30eeb31ce37c735c1870c80f7343f0f98a4305fe1ef7c2b679cf2cb9c0d6670f34a3aeba8
DIST scons-3.1.2-user.pdf 2557502 BLAKE2B
1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321
SHA512
9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
-DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B
63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a
SHA512
b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
DIST scons-3.1.2.tar.gz 668298 BLAKE2B
14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203
SHA512
bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
DIST scons-4.0.1-user.html 1415152 BLAKE2B
1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2
SHA512
f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7
DIST scons-4.0.1-user.pdf 2468804 BLAKE2B
f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314
SHA512
0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
diff --git a/dev-util/scons/scons-3.1.1.ebuild
b/dev-util/scons/scons-3.1.1.ebuild
index dc4b2fd819f..822bd62dd62 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -13,21 +13,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
doc? (
http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf ->
${P}-user.pdf
http://www.scons.org/doc/${PV}/HTML/${PN}-user.html ->
${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz ->
${P}.gh.tar.gz )"
+ )"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc
x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/libxml2[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- )
-"
+IUSE="doc"
+RESTRICT="test"
S=${WORKDIR}/${P}/src
@@ -39,14 +31,7 @@ PATCHES=(
)
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"
- else
- mkdir -p "${P}"/src || die
- fi
-
+ mkdir -p "${P}"/src || die
tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" ||
die
}
@@ -61,22 +46,6 @@ src_prepare() {
-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
}
-python_test() {
- # set variable from escons() of scons-util.eclass to make
env-passthrough patch work within test env
- local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
- # unset some env variables to pass appropriate tests
- unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -a --passed \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib"
-
- # runtest.py script returns "0" if all tests are passed
- # and returns "2" if there are any tests with "no result"
- # (i.e. in case if some tools are not installed or it's Windows
specific tests)
- [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
python_install_all() {
local DOCS=( {CHANGES,README,RELEASE}.txt )
distutils-r1_python_install_all
diff --git a/dev-util/scons/scons-3.1.2.ebuild
b/dev-util/scons/scons-3.1.2.ebuild
index ef2605a2b11..8cd85f931c7 100644
--- a/dev-util/scons/scons-3.1.2.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -17,21 +17,13 @@ SRC_URI="
doc? (
https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf ->
${P}-user.pdf
https://www.scons.org/doc/${PV}/HTML/${PN}-user.html ->
${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz ->
${P}.gh.tar.gz )"
+ )"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc
x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/libxml2[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- )
-"
+IUSE="doc"
+RESTRICT="test"
S=${WORKDIR}/${P}/src
@@ -43,14 +35,7 @@ PATCHES=(
)
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"
- else
- mkdir -p "${P}"/src || die
- fi
-
+ mkdir -p "${P}"/src || die
tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" ||
die
}
@@ -65,22 +50,6 @@ src_prepare() {
-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
}
-python_test() {
- # set variable from escons() of scons-util.eclass to make
env-passthrough patch work within test env
- local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
- # unset some env variables to pass appropriate tests
- unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -a --passed \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib"
-
- # runtest.py script returns "0" if all tests are passed
- # and returns "2" if there are any tests with "no result"
- # (i.e. in case if some tools are not installed or it's Windows
specific tests)
- [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
python_install_all() {
local DOCS=( {CHANGES,README,RELEASE}.txt )
distutils-r1_python_install_all
