From f65763f5f15533610b04b6f16449ed1d9bc8fbda Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 18 Nov 2021 14:53:12 +0100 Subject: [PATCH] dev-util/scons: Sync with gentoo It's from gentoo commit 39e07482d0eab4dcab3ff5046d8f0a0089fedc0b. --- .../portage-stable/dev-util/scons/ChangeLog | 370 ------------------ .../portage-stable/dev-util/scons/Manifest | 48 +-- .../scons/files/scons-1.2.0-popen.patch | 58 --- .../scons/files/scons-2.1.0-jython.patch | 13 - .../files/scons-4.0.0-respect-cc-etc-r1.patch | 88 +++++ .../files/scons-4.1.0-env-passthrough.patch | 41 ++ .../scons/files/scons-install-scripts.patch | 20 - .../dev-util/scons/metadata.xml | 8 +- .../dev-util/scons/scons-2.3.0.ebuild | 56 --- .../dev-util/scons/scons-2.3.1-r1.ebuild | 55 --- .../dev-util/scons/scons-2.3.1.ebuild | 56 --- .../dev-util/scons/scons-2.3.2.ebuild | 53 --- .../dev-util/scons/scons-2.3.4.ebuild | 53 --- .../dev-util/scons/scons-4.1.0-r1.ebuild | 98 +++++ 14 files changed, 238 insertions(+), 779 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-1.2.0-popen.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-2.1.0-jython.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.1.0-env-passthrough.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-install-scripts.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/scons/scons-4.1.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-util/scons/ChangeLog deleted file mode 100644 index 4f10b9f839..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/ChangeLog +++ /dev/null @@ -1,370 +0,0 @@ -# ChangeLog for dev-util/scons -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.157 2015/04/08 17:54:03 mgorny Exp $ - - 08 Apr 2015; Michał Górny scons-2.3.0.ebuild, - scons-2.3.1-r1.ebuild, scons-2.3.1.ebuild: - Drop old Python implementations - - 13 Jan 2015; Mike Gilbert scons-2.3.4.ebuild: - Keyword ~amd64-fbsd, tested by Yutah SATOH on bug 488434. - -*scons-2.3.4 (11 Oct 2014) - - 11 Oct 2014; Ian Delaney +scons-2.3.4.ebuild, - scons-2.3.2.ebuild: - drop py2.6 add pypy, bump - -*scons-2.3.2 (09 Jul 2014) - - 09 Jul 2014; Patrick Lauer +scons-2.3.2.ebuild: - Bump - - 10 Jun 2014; Mike Frysinger scons-2.3.0.ebuild: - Mark arm64/m68k/s390/sh stable. - - 23 Apr 2014; Mike Gilbert scons-2.3.0.ebuild: - Revert arm64 stable keyword. - - 22 Apr 2014; Mike Gilbert -scons-2.2.0.ebuild, - scons-2.3.0.ebuild: - Move arm64 keyword forward and drop old version. - -*scons-2.3.1-r1 (22 Apr 2014) - - 22 Apr 2014; Mike Gilbert +scons-2.3.1-r1.ebuild: - Drop scons-1.2.0-popen.patch, bug 507850 by Álvaro. - - 19 Mar 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for alpha, wrt bug #498868 - - 18 Mar 2014; Tim Harder -scons-2.0.1.ebuild, - -scons-2.0.1-r1.ebuild, -scons-2.1.0.ebuild, -scons-2.2.0-r1.ebuild: - Remove old. - -*scons-2.3.1 (18 Mar 2014) - - 18 Mar 2014; Tim Harder +scons-2.3.1.ebuild: - Version bump. - - 14 Mar 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for ppc64, wrt bug #498868 - - 22 Feb 2014; Markus Meier scons-2.3.0.ebuild: - arm stable, bug #498868 - - 02 Feb 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for ppc, wrt bug #498868 - - 27 Jan 2014; Akinori Hattori scons-2.3.0.ebuild: - ia64 stable wrt bug #498868 - - 26 Jan 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for sparc, wrt bug #498868 - - 26 Jan 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for x86, wrt bug #498868 - - 23 Jan 2014; Chema Alonso scons-2.3.0.ebuild: - Stable for amd64 wrt bug #498868 - - 22 Jan 2014; Jeroen Roovers scons-2.3.0.ebuild: - Stable for HPPA (bug #498868). - - 21 Jan 2014; Mike Frysinger scons-2.2.0-r1.ebuild, - scons-2.2.0.ebuild, scons-2.3.0.ebuild: - Add arm64 love. - - 19 Oct 2013; Mike Frysinger scons-2.3.0.ebuild: - Add m68k/s390/sh love. - - 09 Sep 2013; Michał Górny scons-2.2.0-r1.ebuild, - scons-2.3.0.ebuild: - Call python_replicate_script in outer src_install() to avoid implementation- - specific environment. - - 07 Sep 2013; Mike Gilbert scons-2.3.0.ebuild: - Revert previous change; wrong shebangs get installed. - - 07 Sep 2013; Mike Gilbert - +files/scons-install-scripts.patch, scons-2.3.0.ebuild: - Fix script installation in setup.py. - - 05 Sep 2013; Michał Górny scons-2.2.0-r1.ebuild: - Clean up PYTHON_COMPAT from old implementations. - -*scons-2.3.0 (28 Aug 2013) - - 28 Aug 2013; Tim Harder +scons-2.3.0.ebuild: - Version bump. - - 21 Feb 2013; Zac Medico scons-2.2.0-r1.ebuild: - Add ~arm-linux keyword. - - 06 Feb 2013; Michał Górny scons-2.2.0-r1.ebuild: - Fix race condition in installing scripts, bug #455878. - -*scons-2.2.0-r1 (06 Feb 2013) - - 06 Feb 2013; Michał Górny +scons-2.2.0-r1.ebuild: - Migrate to distutils-r1. - - 07 Oct 2012; Fabian Groffen scons-2.2.0.ebuild: - Setup a valid path, EPREFIX does NOT end in / - - 29 Sep 2012; Raúl Porcel scons-2.2.0.ebuild: - alpha/ia64/sparc stable wrt #434294 - - 19 Sep 2012; Jeroen Roovers scons-2.2.0.ebuild: - Stable for HPPA (bug #434294). - - 18 Sep 2012; Johannes Huber scons-2.2.0.ebuild: - Stable for x86, wrt bug #434294 - - 13 Sep 2012; Agostino Sarubbo scons-2.2.0.ebuild: - Stable for amd64, wrt bug #434294 - - 13 Sep 2012; Anthony G. Basile scons-2.2.0.ebuild: - stable arm, bug #434294 - - 12 Sep 2012; Anthony G. Basile scons-2.2.0.ebuild: - stable ppc ppc64, bug #434294 - - 08 Sep 2012; Tim Harder metadata.xml: - Remove redundant maintainer from metadata. - - 08 Aug 2012; Tim Harder scons-2.2.0.ebuild: - Simplify documentation installation. - -*scons-2.2.0 (08 Aug 2012) - - 08 Aug 2012; Tim Harder +scons-2.2.0.ebuild: - Version bump. - - 06 Aug 2012; Patrick Lauer scons-2.1.0.ebuild: - Fixing jython for 2.1.0 too - - 02 Aug 2012; Jesus Rivero scons-2.0.1.ebuild, - scons-2.0.1-r1.ebuild: - Bumped to EAPI 4 and added threads(+) to PYTHON_USE_WITH - - 02 Aug 2012; Patrick Lauer scons-2.1.0.ebuild: - Restricting jython - - 18 Mar 2012; Raúl Porcel scons-2.1.0.ebuild: - alpha/ia64/sparc stable wrt #401831 - - 20 Feb 2012; Patrick Lauer scons-2.0.1-r1.ebuild, - scons-2.0.1.ebuild, scons-2.1.0.ebuild: - Restricting pypy #403805 - - 13 Feb 2012; Markus Meier scons-2.1.0.ebuild: - arm stable, bug #401831 - - 13 Feb 2012; Kacper Kowalik scons-2.1.0.ebuild: - ppc64 stable wrt #401831 - - 10 Feb 2012; Patrick Lauer scons-2.1.0.ebuild: - Changing python deps in preparation for 2.4 removal - - 08 Feb 2012; Jeff Horelick scons-2.1.0.ebuild: - x86 stable per bug 401831 - - 08 Feb 2012; Jeroen Roovers scons-2.1.0.ebuild: - Stable for HPPA (bug #401831). - - 05 Feb 2012; Mike Gilbert scons-2.0.1.ebuild: - Inherit multilib. - - 04 Feb 2012; Agostino Sarubbo scons-2.1.0.ebuild: - Stable for amd64, wrt bug #401831 - - 01 Feb 2012; Brent Baude scons-2.1.0.ebuild: - Marking scons-2.1.0 ppc for bug 401831 - - 21 Nov 2011; Mike Frysinger scons-2.0.1.ebuild: - Mark arm stable. - - 11 Nov 2011; Markos Chandras - +files/scons-2.1.0-jython.patch, scons-2.1.0.ebuild: - Fix building with Jython. Patch by Arfrever. - -*scons-2.1.0 (02 Oct 2011) - - 02 Oct 2011; Tim Harder +scons-2.1.0.ebuild: - Version bump (fixes bug #361413). - - 24 Sep 2011; Fabian Groffen scons-2.0.1-r1.ebuild: - Prevent the buildsystem from forcing installation into /usr/local on Darwin - - 29 Aug 2011; Fabian Groffen scons-2.0.1-r1.ebuild: - Fix hardcoded paths to refer to those from the Prefix first, by Asfand Yar - Qazi, bug #361061 - - 24 Aug 2011; Markos Chandras scons-2.0.1-r1.ebuild: - Set PYTHON_MODNAME. Patch by Arfrever. - - 20 Jul 2011; Jeremy Olexa scons-2.0.1-r1.ebuild: - Fix paths for Gentoo Prefix, bug 375735 - -*scons-2.0.1-r1 (19 Jul 2011) - - 19 Jul 2011; Jesus Rivero +scons-2.0.1-r1.ebuild: - Python related improvements. Closes bug #367049. Thanks to Mike Gilbert - - 29 Jan 2011; Fabian Groffen scons-2.0.1.ebuild: - Transfer Prefix keywords - - 27 Dec 2010; Arfrever Frehtes Taifersar Arahesis - -scons-1.3.0_p20100501.ebuild: - Delete. - - 27 Dec 2010; Brent Baude scons-2.0.1.ebuild: - Marking scons-2.0.1 ppc64 for bug 339531 - - 19 Nov 2010; Markus Meier scons-2.0.1.ebuild: - add ~arm, bug #343791 - - 24 Oct 2010; Raúl Porcel scons-2.0.1.ebuild: - alpha/ia64/sparc stable wrt #339531 - - 21 Oct 2010; Jeroen Roovers scons-2.0.1.ebuild: - Stable for HPPA (bug #339531). - - 20 Oct 2010; Brent Baude scons-2.0.1.ebuild: - stable ppc, bug 339531 - - 10 Oct 2010; Pawel Hajdan jr scons-2.0.1.ebuild: - x86 stable wrt bug #339531 - - 06 Oct 2010; Markos Chandras scons-2.0.1.ebuild: - Stable on amd64 wrt bug #339531 - - 13 Sep 2010; Arfrever Frehtes Taifersar Arahesis - -scons-1.2.0-r1.ebuild, -scons-1.2.0_p20091224.ebuild, - -files/scons-1.2.0-links.patch: - Delete. - -*scons-2.0.1 (29 Aug 2010) - - 29 Aug 2010; Jesus Rivero +scons-2.0.1.ebuild: - Version bump. Thanks again to Johan. Closes bug #326867 - - 22 Aug 2010; Jeroen Roovers scons-1.3.0_p20100501.ebuild: - Stable for HPPA (bug #326241). - - 13 Aug 2010; Joseph Jezak - scons-1.3.0_p20100501.ebuild: - Marked ppc stable for bug #326241. - - 18 Jul 2010; Samuli Suominen - scons-1.3.0_p20100501.ebuild: - ppc64 stable wrt #326241 - - 18 Jul 2010; Raúl Porcel - scons-1.3.0_p20100501.ebuild: - alpha/ia64/sparc stable wrt #326241 - - 10 Jul 2010; Christian Faulhammer - scons-1.3.0_p20100501.ebuild: - stable x86, bug 326241 - - 06 Jul 2010; Markos Chandras - scons-1.3.0_p20100501.ebuild: - Stable on amd64 wrt bug #326241 - - 25 Jun 2010; Arfrever Frehtes Taifersar Arahesis - scons-1.3.0_p20100501.ebuild: - Use Python 2. - -*scons-1.3.0_p20100501 (19 May 2010) - - 19 May 2010; Krzysztof Pawlik - +scons-1.3.0_p20100501.ebuild: - Version bump. - - 08 Feb 2010; Peter Volkov scons-1.2.0-r1.ebuild, - scons-1.2.0_p20091224.ebuild: - Add inherit eutils for epatch. - - 08 Jan 2010; Dirkjan Ochtman - scons-1.2.0_p20091224.ebuild: - Replace incorrect usage of P by PN-PV (bug 300076). - -*scons-1.2.0_p20091224 (04 Jan 2010) - - 04 Jan 2010; Dirkjan Ochtman - +scons-1.2.0_p20091224.ebuild: - Bump to 1.2.0.d20091224. Thanks to Johan Bergstroem for the patch. - - 12 Apr 2009; Brent Baude scons-1.2.0-r1.ebuild: - stable ppc64, bug 264537 - - 11 Apr 2009; nixnut scons-1.2.0-r1.ebuild: - ppc stable #264537 - - 10 Apr 2009; Raúl Porcel scons-1.2.0-r1.ebuild: - ia64/sparc stable wrt #264537 - - 08 Apr 2009; Jeroen Roovers scons-1.2.0-r1.ebuild: - Stable for HPPA (bug #264537). - - 07 Apr 2009; Tobias Klausmann scons-1.2.0-r1.ebuild: - Stable on alpha, bug #264537 - - 05 Apr 2009; Markus Meier scons-1.2.0-r1.ebuild: - amd64/x86 stable, bug #264537 - -*scons-1.2.0-r1 (07 Mar 2009) - - 07 Mar 2009; Jesus Rivero -scons-1.2.0.ebuild, - +scons-1.2.0-r1.ebuild: - Version bump. Added threads use dep. Close bug #261156. Removed old - version. - -*scons-1.2.0 (15 Jan 2009) - - 15 Jan 2009; Sébastien Fabbro - +files/scons-1.2.0-links.patch, +files/scons-1.2.0-popen.patch, - metadata.xml, +scons-1.2.0.ebuild: - Version bump and updated description - - 02 Dec 2008; Brent Baude scons-1.0.0.ebuild: - stable ppc64, bug 242766 - - 27 Oct 2008; Jeroen Roovers scons-1.0.0.ebuild: - Stable for HPPA (bug #242766). - - 25 Oct 2008; nixnut scons-1.0.0.ebuild: - Stable on ppc wrt bug 242766 - - 21 Oct 2008; Raúl Porcel scons-1.0.0.ebuild: - alpha/ia64/sparc stable wrt #242766 - - 19 Oct 2008; Markus Meier scons-1.0.0.ebuild: - amd64/x86 stable, bug #242766 - -*scons-1.0.0 (19 Aug 2008) - - 19 Aug 2008; Jesus Rivero scons-0.97.ebuild, - -scons-0.98.3.ebuild, -scons-0.98.4.ebuild, -scons-0.98.5.ebuild, - +scons-1.0.0.ebuild: - Version bump. Removed old versions. Fixed 0.97 ebuild and this closes bug - #107013 - -*scons-0.98.5 (19 Jul 2008) - - 19 Jul 2008; Ali Polatel +scons-0.98.5.ebuild: - Version bump. - - 14 Jun 2008; Zac Medico scons-0.97.ebuild, - scons-0.98.3.ebuild, scons-0.98.4.ebuild: - Bug #226505 - For compatibity with phase execution order in - >=portage-2.1.5, call has_version inside pkg_preinst instead of - pkg_postinst. - -*scons-0.98.4 (29 May 2008) - - 29 May 2008; Ali Polatel -scons-0.96.1.ebuild, - -scons-0.96.94.ebuild, +scons-0.98.4.ebuild: - Version bump. Drop old. diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/scons/Manifest index 097312f90b..669ad9a328 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/Manifest @@ -1,44 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX scons-1.2.0-popen.patch 1826 SHA256 84a3bc1ba70fe60cc483d0186703b303daeb7bed246f21e3db9227c255afd312 SHA512 de295b2211f4fbea9a33f55eb944d8f076699ac55601169af1151a51eb1bd70ece4cd6b1b589e280ac85ff700880d7e1d9ebb0face1ae96683d50d470e938f81 WHIRLPOOL bf9c3511474e1f2e14f1492ff440248a6ba8ee4bdecf003b2d16796dd444e51873dd8545428abb87e9fd0694d050fe8964eda983520c9138391d5f369035d1a6 -AUX scons-2.1.0-jython.patch 427 SHA256 f973254e500325334c44f7db86daec87954aa47287c8aa92146a91ed172eb97a SHA512 5ffe6ee08e2dbf7dfb92e67a2b4ac75a5566a34680dbe86eae749c67709e8ddf585ddbd4549c0151c022567f171240c329cc546ce3d0bfb76efd2c8bd6f185e1 WHIRLPOOL 3316c6f83c5792cbc4e58d721a57df972eba0dcc90a0bea4fcc0222affd014662b11b06cc6699d4e6fa1bc41468318b82b33f47a6e4d20a5ff7194fde79e5173 -AUX scons-install-scripts.patch 746 SHA256 0cffda0fe6912a41e78fc2f209824bb7eb7453ab6e83f518cb1033093457ed80 SHA512 3d15660f955c3e46ea36a7b6b17dc4522601d0c673ec5aec716a6fc30ca0b9af285d540084378227178d45c371f386d0b3ac7861c37f53be0e344b2ca025fe18 WHIRLPOOL 36be6c43fea6b40777f43693573c187e98e4d3999bf5298ac83f012142554e1106e6d102e3213eebd694513337a56b1e0d2de98444bf91cc41a6917005e5a6d1 -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.1-user.html 1234565 SHA256 17e617d5b5f7e43e70966c78148976f7e81bd2b5eb1530f447e3e8bc0cdaf86f SHA512 4b74a5099e23ec5d1e2714e6a0957697b703bbea3d7d0229d8925a5061c24ee1ae7bc2476e5e66fe4cacee5819c03e313d40b80b76e4ee6b7ccb65d4a461e5de WHIRLPOOL 39d7b70b743f410aac95880c533470bf967f534ef79cadc0ab925f3e9126200eaf8f4390729e3638d3a27ba133346f61e8ff510207eef6eef25355fa06a54cd1 -DIST scons-2.3.1-user.pdf 2408501 SHA256 3e2023f8dd1551963815c80f09a45658874174fc6373bb4918f8291f1b622478 SHA512 07ff05308e202541ae1c6538b94641fb0401da15c419854d51f855b177d71021938856307fc12e84db02bee720e2589a9ed2a2c725fd4e0c88fd111ea0862ed2 WHIRLPOOL b4b42e83b2f1ba7c584bdb06eeb3d868ce878c3295d490b4d60b9250c20b7eb55e63c8bde42eaa4c57a432b74a845de034ccbfb0d5fb51f7af72de8137acb7f9 -DIST scons-2.3.1.tar.gz 499037 SHA256 091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba120201 SHA512 207fd0df949d1130afecc168a3b643fee2a17c53c3f9704260bbd2e462fdf24fd6606d7269ceaa664d5b5989cac34d6b9a5a460dfd0d6b69e651cfd85a0d45d2 WHIRLPOOL 8c828ca32bd03fe4cdd768a22ec97740b7fe165692f2c101c73e4fc96884642f80a7ba5531402638b415b8b9250dc12cad3337d0d087a391314aa2b6a564077a -DIST scons-2.3.2-user.html 1078088 SHA256 ea552cd4b966ceed46fefea6e297f13bcc6b35ce4a80b54d7bb5fabf7a1276fd SHA512 43ddb9f405bc09f08eedf2e321a2e4e4b36fcbcf30dab35f64a4e81e2b29f336a934251e72d0a8eefdc4e220396a1ac48d7a8178664ab4fe90b11343fc93331f WHIRLPOOL 83e049feca4e03ea3e6e1c96c6029696e03480309df5bf745589129b0582f1f55d12f6b3e0b090cecd25886c8451fe9ed7cf0ccde1b315e8942ac3a47b1aaa55 -DIST scons-2.3.2-user.pdf 2455822 SHA256 8d6320f22a38f7171d9ba69b92c643c6fb47d82768926c18328df221da4ec482 SHA512 a0120ad74b9f9b70f763c1cb8c5bede2086c478f8d3fe665332c3624e19b77a17b826731b23d5cf46c6b55e0b0f54fc8727c8d8b74de40aa92f8f1e493788082 WHIRLPOOL 85555bae9ab59cfb7c95e0e555a35d56146eac1011988aa2905fc070cf9adf0440bba52c2b0ce9fe4a37ef16f825721d3c838e1460239b712d78df7c4c26ff19 -DIST scons-2.3.2.tar.gz 621932 SHA256 f993320c5e9515e6567fcce73df0a7a8808414bf1223c69123d3dcf339a449d4 SHA512 90e6fb38cb39e030f0b77cf46f76a4ffef141d991087bd22a9bd0d012d568375b32084437e408c22bda54fa5517f294522ddd718838fef2598d892576cc2ae38 WHIRLPOOL 1d62de977b18bbe5f821c1b3b90e20d57772760a0e69d261be4bdec9ab5e9869debae779bfa686424bd839e35737f9f2feb82ddfaf639532c3152971c925b83e -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 -EBUILD scons-2.3.0.ebuild 1866 SHA256 c13ed46b447b04f91433d731863b11aac026dad6e377d54b3538ccb17a41c9c2 SHA512 2a061ef501f3d1387f2674bf0a97f6674b1117a5c8f5e6f3b08782cc8e3aee4fc3a81f4de1debb1d79fb2c44905e04f717b2a3234ff8ac1cfe1e7229ba80c45e WHIRLPOOL 731392636f2e2d16f70b04e9573ad50b089c13f1e1c4080e9d7dbabf3183734c9a74204dc8f25ba12d3b3440414a09d04543e9e21cc526b5a77d268d12b76fe0 -EBUILD scons-2.3.1-r1.ebuild 1841 SHA256 dd86cc71ae6bca30a14e558e1fcbf2e69214fb1a3927288a7fe7830f37788a31 SHA512 ee6b076d5c8b422569d6ac6e3283e591a64bac1475a029d00d3a9959e96da60665bc055c30ab0f3a956a4014d56051c2f25d730512cd09bd051935eba1ef41ad WHIRLPOOL 5a6f1c4d6e5693b0713f8abf3d73377a9d40068e43f1e49d72ed6456de7ee6ae5d808f573fb5b80fcb0a3748b30499d813c55d48511359302d7b6ffa788b9294 -EBUILD scons-2.3.1.ebuild 1878 SHA256 b27b0c2319c720fcecc89245b9612fd1bfe103002b4c81a5e17e7565c66efcc7 SHA512 77010d1f2ab5a1f5fbc089dbf17904bae6db540ff401a986ed8a2984014ad8b0a5eab4744c16215cc9dd528369db14b5f9ade249098e69d3d3ce6b08ebce5a50 WHIRLPOOL c14a92a2766852884e06ecdae287268d167bf650ff851afbc90f549a8c17ff8d6f1ef5d51e850a499ee12d28042ab760ca8ea8493a1575d2d91da81ebd732d50 -EBUILD scons-2.3.2.ebuild 1834 SHA256 821659ef0954f46ea7c74fb9829c7d250c8411983edb438152efe3b59bbbb206 SHA512 0985b2a670caf5b2d2b02fa41ea826425d139cba100bde85de1c62ccb37c9491b8bed8a176f74f16319800dce3024bdc65ad7b217c27a1c72bbb4c8073f8c113 WHIRLPOOL b5ab480c24cda357e9c24c46aa5c9fdecdc7fb0d7607c2cfe4b3a4f54190ff7b5ec9b8a9968a6b3d2f9f65bc52a55acdc3a3933d17b02e67aa6ebdb48d840948 -EBUILD scons-2.3.4.ebuild 1846 SHA256 819d9ad22759bd9d13a0f0e113b6f09427bf6b5fe3406acd650e1827cd13914d SHA512 dee61d6ef78bd1449e2288ed64a16732a59504f6b7c63e199c7a0cad2537a83e5220c070cc88f172c6b0af2961d90bd9949e588955e91122aca849aad06a71ef WHIRLPOOL e2bef83446561e2e12a0b136ff76dfcd32d715f6b5668578e9354fc8b9b9b723ade8d836426e2151508f3471871f2b61a0a6f6f9b2ba3af6e6ce79a2b4eadc74 -MISC ChangeLog 12427 SHA256 bf80768b6ed45cc6d8f5a758b848a475333895c00e0a6fb93045b7a8415d302d SHA512 222f23b0b97246314f8c0942d7bea4c19109b272521e801fb62b8e5c3f1dc90e9173e61591722f57a4f58e9d8d83afbe52e9861f2b7b96e7f2b786eac9ca6c33 WHIRLPOOL 216352b091f2e56dede98169c7a54683ca37d25f433bf8be087311f1157106472cff812d0156afa6e89b8121344f12e31e1f19db6df38e832a95057b5ed47371 -MISC metadata.xml 533 SHA256 75dd06130ca8c5457cbc43bcf13b21ed278d34a36ab14f7663a884d1f4b4b4b2 SHA512 eb16f3b83d19d094367b3972bbe8d72bc787639847faea4e40c2d7fa59d302568f0419681594a26c48d9974ef5c7119530ba7fd30918c5a4d89b05395cd6e6d8 WHIRLPOOL 5caafc86d4d8ccc6265b323220c87b8a93e67e634123d1435e08116a71cb0ea8ede52edc172cfc0f69ac047593f2ee5fb5695551bf6863899bd5b21f1d13f13d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQJ8BAEBCABmBQJVJWtSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/aMP/R1zu0sroQ3BP9X4KLcE+Jlj -ArmABTrA/jxZaCgtcCDsQ5snmfNaTddp0bJ+x5c10afM2Njpn15kdxb40MtLbR2s -jY6WvsthAKsYGKWy5qUllZZrjhKtggmBTcSQIFrgWM9OgGscKbmZwBkVwHoxE6LP -f/oX36elLxkN9P05j3MY+4V6SX2OSwmCzQtutKhMMqGHI/Ec3Mb3VbTjRK7pdgLw -uw67/jpeYDOlvHO2WT0ZrqVLLO8XGGhjjmTLA9BiHoK4NdjMZemOjg0ZsI3q668X -T87a7NPGl+cqM7RYbbhWRpVD/5Rl0hR4njrlktR52ad25yLRM3BBomcVgdRT+e0o -oaaBkFdKGmYaZQk7oDUUOPERSkCzVqglrkNPRaFsYW0nVqq7NNe+upXaZRs6zM+s -kxPKCdrXG1GcmM1/zf0k7LzA8WcFjp7Bs1Acg6+fPd8p2N+51FmSK+cFYxrFBHig -PJ1Ll/q3opQdZGvFp16TQIdAd6n4oeJY0NXIRuBjTCGdGu6imh69S395MYONx8jd -O38SU/8OdSgoxKv4jc+SDmgHmTc7El/3e1U+mIia4mM3BF2y3RTgAk1ckGMGYUbN -WcL4aULdpwlhb9CWp/t0xKptjXPliV4P/KVimgZiaakSTFHGH65i1azeAOQ13VTw -pDzHSU1fypdnN7GcTsb2 -=ZeTs ------END PGP SIGNATURE----- +DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be +DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7 +DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44 +DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-1.2.0-popen.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-1.2.0-popen.patch deleted file mode 100644 index 23063cffd0..0000000000 --- a/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-2.1.0-jython.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-2.1.0-jython.patch deleted file mode 100644 index ca04e12031..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-2.1.0-jython.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://scons.tigris.org/issues/show_bug.cgi?id=2791 - ---- setup.py -+++ setup.py -@@ -325,7 +325,7 @@ - self.copy_scons(src, scons_version_bat) - - # --- distutils copy/paste --- -- if os.name == 'posix': -+ if hasattr(os, 'chmod'): - # Set the executable bits (owner, group, and world) on - # all the scripts we just installed. - for file in self.get_outputs(): diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch new file mode 100644 index 0000000000..d187a17ae6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch @@ -0,0 +1,88 @@ +From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 10 May 2018 08:01:08 +0200 +Subject: [PATCH] posix: Also force common toolchain vars for Gentoo + +--- + src/SCons/Platform/posix.py | 20 ++++++++++++++++++++ + src/SCons/Tool/cc.py | 3 ++- + src/SCons/Tool/cxx.py | 3 ++- + src/SCons/Tool/link.py | 3 ++- + 4 files changed, 26 insertions(+), 3 deletions(-) + +diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py +index 739310a1..ef7528e0 100644 +--- a/src/SCons/Platform/posix.py ++++ b/src/SCons/Platform/posix.py +@@ -95,6 +95,26 @@ def generate(env): + if 'ENV' in env: + new_env.update(env['ENV']) + env['ENV'] = new_env ++ ++ # Furthermore, force common compiler/linker variables as well ++ envvar_mapping = { ++ 'AR': 'AR', ++ 'AS': 'AS', ++ 'ASFLAGS': 'ASFLAGS', ++ 'CC': 'CC', ++ 'CXX': 'CXX', ++ 'CFLAGS': 'CFLAGS', ++ 'CXXFLAGS': 'CXXFLAGS', ++ 'CPPFLAGS': 'CPPFLAGS', ++ 'LDFLAGS': 'LINKFLAGS', ++ } ++ ++ for envvar, toolvar in envvar_mapping.items(): ++ if toolvar not in env and envvar in env['ENV']: ++ val = env['ENV'][envvar] ++ if toolvar.endswith('FLAGS'): ++ val = SCons.Util.CLVar(val) ++ env[toolvar] = val + else: + if 'ENV' not in env: + env['ENV'] = {} +diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py +index 590ec5fd..5f9229a0 100644 +--- a/src/SCons/Tool/cc.py ++++ b/src/SCons/Tool/cc.py +@@ -80,7 +80,8 @@ def generate(env): + + if 'CC' not in env: + env['CC'] = env.Detect(compilers) or compilers[0] +- env['CFLAGS'] = SCons.Util.CLVar('') ++ if 'CFLAGS' not in env: ++ env['CFLAGS'] = SCons.Util.CLVar('') + env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' + env['SHCC'] = '$CC' + env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS') +diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py +index 430851c8..ca5ab563 100644 +--- a/src/SCons/Tool/cxx.py ++++ b/src/SCons/Tool/cxx.py +@@ -74,7 +74,8 @@ def generate(env): + + if 'CXX' not in env: + env['CXX'] = env.Detect(compilers) or compilers[0] +- env['CXXFLAGS'] = SCons.Util.CLVar('') ++ if 'CXXFLAGS' not in env: ++ env['CXXFLAGS'] = SCons.Util.CLVar('') + env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' + env['SHCXX'] = '$CXX' + env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') +diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py +index 5adc6ca2..a12ea8ed 100644 +--- a/src/SCons/Tool/link.py ++++ b/src/SCons/Tool/link.py +@@ -318,7 +318,8 @@ def generate(env): + + env['SMARTLINK'] = smart_link + env['LINK'] = "$SMARTLINK" +- env['LINKFLAGS'] = SCons.Util.CLVar('') ++ if 'LINKFLAGS' not in env: ++ env['LINKFLAGS'] = SCons.Util.CLVar('') + + # __RPATH is only set to something ($_RPATH typically) on platforms that support it. + env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' +-- +2.20.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.1.0-env-passthrough.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.1.0-env-passthrough.patch new file mode 100644 index 0000000000..06ec2f2176 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.1.0-env-passthrough.patch @@ -0,0 +1,41 @@ +From fb07dc4b4fa178b0c424c5f400b18669abd8960e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 9 May 2018 17:04:49 +0200 +Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1 + +Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default +of wiping the environment and resetting PATH to default, and instead +pass all variables through. +--- + SCons/Platform/posix.py | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py +index 4c9f8f9ba..fbc81196d 100644 +--- a/src/SCons/Platform/posix.py ++++ b/src/SCons/Platform/posix.py +@@ -82,9 +82,18 @@ def generate(env): + pspawn = piped_env_spawn + # Note that this means that 'escape' is no longer used + +- if 'ENV' not in env: +- env['ENV'] = {} +- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' ++ # Force pass-through of environment variables in Gentoo builds ++ import os ++ if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False): ++ new_env = os.environ.copy() ++ if 'ENV' in env: ++ new_env.update(env['ENV']) ++ env['ENV'] = new_env ++ else: ++ if 'ENV' not in env: ++ env['ENV'] = {} ++ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' ++ + env['OBJPREFIX'] = '' + env['OBJSUFFIX'] = '.o' + env['SHOBJPREFIX'] = '$OBJPREFIX' +-- +2.30.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-install-scripts.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-install-scripts.patch deleted file mode 100644 index 1e28ca72e5..0000000000 --- a/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-util/scons/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/scons/metadata.xml index 29b501638b..979bab55bc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/metadata.xml @@ -1,7 +1,10 @@ - python + + mgorny@gentoo.org + Michał Górny + SCons is a make replacement providing a range of enhanced features such as automated dependency generation and built in @@ -9,4 +12,7 @@ as well as the features it provides itself SCons allows you to use the full power of Python to control compilation. + + scons + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.0.ebuild deleted file mode 100644 index 6d1570c696..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.0.ebuild,v 1.19 2015/04/08 17:54:03 mgorny Exp $ - -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/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1-r1.ebuild deleted file mode 100644 index e656fcddee..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.1-r1.ebuild,v 1.2 2015/04/08 17:54:03 mgorny Exp $ - -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}/${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/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1.ebuild deleted file mode 100644 index 527737e4c4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.1.ebuild,v 1.2 2015/04/08 17:54:03 mgorny Exp $ - -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/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.2.ebuild deleted file mode 100644 index c1cb57a716..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.2.ebuild,v 1.2 2014/10/11 15:50:57 idella4 Exp $ - -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 ~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} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.4.ebuild deleted file mode 100644 index 240a3cd94c..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.4.ebuild,v 1.2 2015/01/13 22:00:49 floppym Exp $ - -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} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-4.1.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-4.1.0-r1.ebuild new file mode 100644 index 0000000000..3f27b8197d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-4.1.0-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Extensible Python-based build utility" +HOMEPAGE="https://www.scons.org/" +SRC_URI=" + https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz + 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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/libxml2[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + ) +" + +S=${WORKDIR}/${P}/src + +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.0.0-respect-cc-etc-r1.patch +) + +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 + + tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die +} + +src_prepare() { + # apply patches relatively to top directory + cd "${WORKDIR}/${P}" || die + distutils-r1_src_prepare + + # manpage install is completely broken + sed -i -e '/build\/doc\/man/d' src/setup.cfg || die + + if use test; then + local remove_tests=( + # TODO: does not respect PATH? + test/Clang + # broken + test/DVIPDF/DVIPDFFLAGS.py + test/Java/swig-dependencies.py + test/Java/multi-step.py + ) + rm -r "${remove_tests[@]}" || die + fi +} + +python_test() { + local -x COLUMNS=80 + # 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)")" + + # 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() { + distutils-r1_python_install_all + + doman *.1 + use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} +}