diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index c2d67e54822a9..5b2aeaffa0115 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -1,9 +1,3 @@ -DIST scons-2.3.0-user.html 1006588 SHA256 64b52ed0ccad52ee7d57188934ee4326ddd8dd387d8283445367265084be8db4 SHA512 42dd7604548aa2f859c8fad8ea802e69a2e139b5a53804a0d855868d056194497653a7124d46a25eba6cdb6339dc16288311faefe8f5240dfa1c210260f27e6c WHIRLPOOL 6f5a164621e5a46f1ab256f6a4db192a9b1bda0de292859b7fc22f1feb31e1c47ca0281ee558b49d807b1224cd89028b4b6799a5abcd125cd440a1e9e00c817f -DIST scons-2.3.0-user.pdf 2268686 SHA256 9b8eb3ed9ad40b375628417d39823042939c8f52f32d0f76c796107870a98c11 SHA512 ae94950bec28d88f83d01590db18ce776146d20dcfa756b0ce2f582f4c729c75eb4f7c57584f624bb653fb43dbf34c972f6a0dcc36aa1b338403885e2d177798 WHIRLPOOL 41dd9909f0b110f2dfd9369ac3f44b5b6a3ff5ae99d3caabb3aa0a92084b92d4b03c45923a8e52cfe18a4ca4f0184e4ddaa57545a6cac6a9ade42f748bc1d8f3 -DIST scons-2.3.0.tar.gz 599514 SHA256 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b SHA512 a7e88bb70b8b269337689fb4afd9563359f6ace37857bbd9824c9e40e43cac8b1e00468d8652bb9b46e410f6b161cb8c9006dd1fd9265756be153846a5e0fd65 WHIRLPOOL 948cc117fe40ab36f3862fab8322268dcb95ecbcde0397d684f31f5deedbbcff3f880d7af336710f237031df350eddcde81a044133b7b61bf5088c4c62ec70cf -DIST scons-2.3.4-user.html 1078749 SHA256 d2cab40df012d1fcf5f7e79d0fc097d5acd2c9ae1659db787a4b5786980f7355 SHA512 75d93d93831bde615cb028dac31184394d4a2478ade5730e0f82ad0ded0a4e868f7981d047ec4b7037e97ea6cfb4fa52d51cb161e64938b21bb96fd3fa373038 WHIRLPOOL 835f2492c0ae6cfec058b0556a79c2f15c6c09cf46faae1e2678dabf30247d6b9d6b9b525105f5abd7ce77d03b473cdb2ba149cdc2114944722ef25d7464dce2 -DIST scons-2.3.4-user.pdf 2456751 SHA256 ecd1a17b01d00768fef580274bb51fc7bbd2400460d5c0112850d068bd7be381 SHA512 f1a2e329c54f415605f6de1661dcea390789a10844cd36a26c56eab754cfddb0da3617f3552fb9b3a9d19f404870821a68a6f167630af08ebf1f7fac417cdee6 WHIRLPOOL 287a9db662b8a877369883aa110115cb0f2416da9404b3f2ca46a5fdebddbd67c1004b6490f1fb2894de2b22202aa396181a313ac12c7a2ef7a383a4145d204b -DIST scons-2.3.4.tar.gz 621953 SHA256 4b57d72066fed3b6ff65a7dd9f73633c9b1c09f87520e9b3aae84b3e4864b441 SHA512 a7d6d5e175d119f6a247e69ddbd0a18c4f10752e20eaedb6bb1d67c6d5f0a79cdb9efdf2a573045f3dbc33519b8267951afff55f587c39639db1fe704cf5e0d2 WHIRLPOOL fe285a8a82f1360c1a1a1b6eda1bb001f88c2c723ddaeaab03d54a0b17d4571d96327be9fba6c92e9d98c48ca0bb88793c65625b79abe75a23d834058c84c410 DIST scons-2.3.5-user.html 1280097 SHA256 2724fe17e3901f6c70dc190e7a215a86e3c103f90393588480f0adb7c2c9a9bb SHA512 e2c80beacd03f4071e33f8084e499e54c8529e68ec02b972d0d0944b6e096437fd70f59339ebba652cc5539475e1b4eb8b80e4a3d188413ca5181af9ae5b70d3 WHIRLPOOL d73ef9a5f1cbf9a0cf70124b224a50b7d4ca5d7a35bddb6b88f3fa14ba5fbee1e2721ad9179698b5cd45f24bf91815bc15e4c0d40d21b34a761ec68243a1fc74 DIST scons-2.3.5-user.pdf 2505997 SHA256 4e157b75b49b6e15f339811102b8e3e8af761ed197a6fe0df01c535ecb16f758 SHA512 137ab2d3b1cab6821f2d8a8fde33406e2a7d46a4c26eec9de1073d3c03f49e1d485ae7884ed3cd2e41a0e3d2ef457e103d782dc1deb01a280c48e4f5e7e68f1e WHIRLPOOL f5394cc86930ec60259af01232948cd10aa7c240bf75262d622a94f0b2311bdc70835921b8ff7a5e2091adc035ce56ad1c0b69c22def1305082af3f6a3aaf802 DIST scons-2.3.5.tar.gz 631619 SHA256 8a8993e1914801ace5ce83c92bf4c43127669750e9dec8eb93574e57729e9c42 SHA512 aad0213d70c06b02d647a4de4a4fdcd9970e7bda6f3ba0b33e9ba05677af617302b3a557e7cb13560c9057c3b11fbc27cf5e8e7511297058ad9599a04c8381a3 WHIRLPOOL 545d759d0d3ecd54b706712030b5091f1c56f8a3762118c4fd2d27aae9a407e59bffa81ca3592369467a2561eeba867c2a3f91f4652ee34afd4514b06627fd7f diff --git a/dev-util/scons/files/scons-1.2.0-popen.patch b/dev-util/scons/files/scons-1.2.0-popen.patch deleted file mode 100644 index 23063cffd0c5f..0000000000000 --- a/dev-util/scons/files/scons-1.2.0-popen.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- engine/SCons/compat/__init__.py (revision 2695) -+++ engine/SCons/compat/__init__.py (working copy) -@@ -167,11 +167,17 @@ - del shlex - import_as('_scons_shlex', 'shlex') - --try: -- import subprocess --except ImportError: -- # Pre-2.4 Python has no subprocess module. -- import_as('_scons_subprocess', 'subprocess') -+#try: -+# import subprocess -+#except ImportError: -+# # Pre-2.4 Python has no subprocess module. -+# import_as('_scons_subprocess', 'subprocess') -+ -+# Import subprocess unconditionally to avoid possible race conditions in -+# the official subprocess API. If there are API versions without known -+# problems, we can version-check and use the original subprocess module -+# in these cases. -+import_as('_scons_subprocess', 'subprocess') - - import sys - try: - - ---- engine/SCons/compat/_scons_subprocess.py (revision 2695) -+++ engine/SCons/compat/_scons_subprocess.py (working copy) -@@ -581,13 +581,19 @@ - class object: - pass - -+import thread -+lock = thread.allocate_lock() -+ - class Popen(object): - def __init__(self, args, bufsize=0, executable=None, - stdin=None, stdout=None, stderr=None, - preexec_fn=None, close_fds=False, shell=False, - cwd=None, env=None, universal_newlines=False, - startupinfo=None, creationflags=0): -- """Create new Popen instance.""" -+ """Create new Popen instance. -+ Popen is not thread-safe and is therefore protected with a lock. -+ """ -+ lock.acquire() - _cleanup() - - self._child_created = False -@@ -655,6 +661,7 @@ - self.stderr = os.fdopen(errread, 'rU', bufsize) - else: - self.stderr = os.fdopen(errread, 'rb', bufsize) -+ lock.release() - - - def _translate_newlines(self, data): diff --git a/dev-util/scons/files/scons-install-scripts.patch b/dev-util/scons/files/scons-install-scripts.patch deleted file mode 100644 index 1e28ca72e5996..0000000000000 --- a/dev-util/scons/files/scons-install-scripts.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/setup.py b/src/setup.py ---- a/src/setup.py -+++ b/src/setup.py -@@ -81,6 +81,7 @@ - import distutils.command.install_lib - import distutils.command.install_scripts - import distutils.command.build_scripts -+from distutils.util import convert_path - - _install = distutils.command.install.install - _install_data = distutils.command.install_data.install_data -@@ -303,7 +304,7 @@ - else: - create_version_script = self.do_nothing - -- inputs = self.get_inputs() -+ inputs = [os.path.join(self.build_dir, os.path.basename(convert_path(script))) for script in self.get_inputs()] - bat_scripts = [x for x in inputs if x[-4:] == '.bat'] - non_bat_scripts = [x for x in inputs if x[-4:] != '.bat'] - diff --git a/dev-util/scons/scons-2.3.0.ebuild b/dev-util/scons/scons-2.3.0.ebuild deleted file mode 100644 index 9ab42d306b29b..0000000000000 --- a/dev-util/scons/scons-2.3.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="http://www.scons.org/" -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 )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/scons-1.2.0-popen.patch" - "${FILESDIR}/${PN}-2.1.0-jython.patch" - ) - - # https://bugs.gentoo.org/show_bug.cgi?id=361061 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die - # and make sure the build system doesn't "force" /usr/local/ :( - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install \ - --standard-lib \ - --no-version-script \ - --install-data "${EPREFIX}"/usr/share -} - -python_install_all() { - local DOCS=( {CHANGES,README,RELEASE}.txt ) - distutils-r1_python_install_all - - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} - -src_install() { - distutils-r1_src_install - - # Build system does not use build_scripts properly. - # http://scons.tigris.org/issues/show_bug.cgi?id=2891 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time} -} diff --git a/dev-util/scons/scons-2.3.4.ebuild b/dev-util/scons/scons-2.3.4.ebuild deleted file mode 100644 index c0a47a14efb1a..0000000000000 --- a/dev-util/scons/scons-2.3.4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="http://www.scons.org/" -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 )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc" - -PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" ) - -python_prepare_all() { - # https://bugs.gentoo.org/show_bug.cgi?id=361061 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die - # and make sure the build system doesn't "force" /usr/local/ :( - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install \ - --standard-lib \ - --no-version-script \ - --install-data "${EPREFIX}"/usr/share -} - -python_install_all() { - local DOCS=( {CHANGES,README,RELEASE}.txt ) - distutils-r1_python_install_all - - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} - -src_install() { - distutils-r1_src_install - - # Build system does not use build_scripts properly. - # http://scons.tigris.org/issues/show_bug.cgi?id=2891 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time} -}