From 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 22 Apr 2018 14:25:03 +0100 Subject: gentoo resync : 22.04.2018 --- dev-util/scons/Manifest | 5 ++-- .../scons/files/scons-2.5.1-respect-path.patch | 34 ++++++++++++++++++++++ dev-util/scons/scons-2.5.1.ebuild | 11 ++++--- dev-util/scons/scons-3.0.0.ebuild | 11 ++++--- 4 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 dev-util/scons/files/scons-2.5.1-respect-path.patch (limited to 'dev-util/scons') diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index 1e0ca9880516..70ddf1caaed1 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -1,3 +1,4 @@ +AUX scons-2.5.1-respect-path.patch 1351 BLAKE2B e7bb7662394d6f5c6354b1616f5d4f36d65da8404916aea72c95bae5cfd9e1e3fb4286dc912ae55ba8c0863599223d68b3935ce18f5144f77006e6244e97f7f4 SHA512 6cc0d3b6dd711804f90af9b275e08071e6b0bb370e59aa5caadf3e192e096708f90b373de6ffba2ddaaffce0e2b5013df06f4e9259452bfcca8adcfa6b485618 DIST scons-2.4.1-user.html 1110981 BLAKE2B 3c2c7c3bb283e18e63b5dfe64928c2821ceb74ac6d5f4c4fc08f0ceb98ef25f6114308d02d65be0ee8231e367556bdce0f76f1f37bb9d3c1ab813a653fda2f54 SHA512 e73caa3daedb5da419a417dbec73a3958da162311e9ad09a7d5e9d6989686b24cf5c1b34fdb1d547a43de1da36e99566e6c367fde05af032a2d1000a7e12270c DIST scons-2.4.1-user.pdf 2527773 BLAKE2B 16c9a90fd57af7552f8d05fcf018ed99b76d29c148169dee4fd610aa40e439448f5a7a6e8ba8d72830a605a26141927f5dcd1643f99a1bfe9433d87350e96569 SHA512 d53d41e51096d1923e168054d335da1498e9ca338e39aef7985967f839656d368b65a8b979dac701ca1c529deeff4a79f402f058d23ef4e658f849ce0784eb45 DIST scons-2.4.1.tar.gz 638990 BLAKE2B 44084dd396d8cbe63da59aed706cda7342bbe51dd4f78bd324ad6ce822ae45b9da1099400e1dfeafdb2e4e8f1906e88be423598cc2c2915a1544f37285b31297 SHA512 bd0830719dfc0c2e8620ec767ee6342af74a170cd895acda2995761eafe52e1efa9471626fcaedb0dd9a779ef9bb9b4306bd6cd3c2a5bd7bd2500018b40653e0 @@ -8,6 +9,6 @@ DIST scons-3.0.0-user.html 1111001 BLAKE2B 99a4994b161522535386ea7c0b60755653e78 DIST scons-3.0.0-user.pdf 2376928 BLAKE2B fed5b4b43f4ce387f6ed0a7ca9017e087ba9bd341bcf02e93c223f4fe1e60935b70dcee73e048e206ccc663bd9413231e05266656623c32d97536116e1a5db88 SHA512 826653a8d6700b8faab6e22451fbf0839b2d639db1492334fbcec39f224d19b2d076f49d6cb167c085e8285e4b7022329042d805066922c2edb20db3322816a4 DIST scons-3.0.0.tar.gz 630418 BLAKE2B c700ebf316932993540c52735af5ae9a2044a35cf2a1c7324d213059f16e0cd45370432fa32b96fd2e4f328add97ff8d608f73da85ae0b952fd97ba0a727b876 SHA512 e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90 -EBUILD scons-2.5.1.ebuild 1719 BLAKE2B 258da3a327f8f95e98dede99382d9fbb994434c115c966a235f86dcba66b5e709dc87559956b7e217c8d5ec6c3d698ccc0d161dd83a8319bdff3e38333c0f64e SHA512 fec9d529f7f4f069b4953f5a67f9840d8081a9005cd29b745bd66b4997f5d1bf3492e6b457296e57bfb8b3a9f1d8f646530ce25abf7f8df0efe04d81ed8588fe -EBUILD scons-3.0.0.ebuild 1745 BLAKE2B d70c095a6dc1b176b838d2f2b837f8c2ae10f91effaa66695161d2c5b318b5f7e9787cd692b8e3f382c9a1f9e44aa53e5ba1f058075be94fa9bfb513eb11d031 SHA512 f9431d9fde567661f8e3e3d101cda45be797ee2f24276c7d3b91a47bee6bf15222bfc61b213e56ac27ad18ad0038188b583f167aa85c626cc92e21fe0c593970 +EBUILD scons-2.5.1.ebuild 1605 BLAKE2B 1a5d63a7464e304f8e58ddc3d1d762d1fc78ce9c1793ba03fa46cac0a7db7a0416744c6174e5dcb392eb2832b4d784c95223a698f99606fa7c221ee49c03c09b SHA512 ec381c8ac9873e0b911259819adca2570ea8cfe0934ab32ef904daa1c9aaa7024d0285f4d1c7cf023feb537fee0d5fef72ceb97b4015a3f39627ba7f7ec6441b +EBUILD scons-3.0.0.ebuild 1632 BLAKE2B a1b05948db16f43bc0c110cb656135c74718e8030ab19525a4b7171ab849b41349250c2cebb9fb28797314408a3a5bf2714850848c037d1f6ba7c5cf55a63ff9 SHA512 ee359a5e18e383be4bc121bd3b7e0b8bbf8460d6be1cf25b76c26e525f56846f093ff2377430122a5a1abdef3470d9a55670f928488f62815974f92a05a4dca4 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6 diff --git a/dev-util/scons/files/scons-2.5.1-respect-path.patch b/dev-util/scons/files/scons-2.5.1-respect-path.patch new file mode 100644 index 000000000000..d5da07bc980b --- /dev/null +++ b/dev-util/scons/files/scons-2.5.1-respect-path.patch @@ -0,0 +1,34 @@ +Clang/LLVM is installed in an "odd" location (/usr/lib/llvm//bin/) +which is added to PATH. Since we cannot know upfront, it's wrong +to hardcode the PATH at the time of installation else we'd break after a +Clang update. Since Clang is the primary compiler on Darwin, just +extract the relevant path on each invocation. + +--- a/engine/SCons/Platform/posix.py ++++ b/engine/SCons/Platform/posix.py +@@ -87,9 +87,15 @@ + pspawn = piped_env_spawn + # Note that this means that 'escape' is no longer used + ++ with open('@GENTOO_PORTAGE_EPREFIX@/etc/profile.env', 'r') as f: ++ for l in f: ++ if "export PATH=" in l: ++ path = l.split('=')[1].strip("'") ++ break ++ + if 'ENV' not in env: + env['ENV'] = {} +- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin' ++ env['ENV']['PATH'] = path + env['OBJPREFIX'] = '' + env['OBJSUFFIX'] = '.o' + env['SHOBJPREFIX'] = '$OBJPREFIX' +@@ -104,7 +110,7 @@ + env['LIBSUFFIXES'] = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ] + env['PSPAWN'] = pspawn + env['SPAWN'] = spawn +- env['SHELL'] = 'sh' ++ env['SHELL'] = '@GENTOO_PORTAGE_EPREFIX@/bin/sh' + env['ESCAPE'] = escape + env['TEMPFILE'] = TempFileMunge + env['TEMPFILEPREFIX'] = '@' diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild index fda9ae0c18fb..72a65de61155 100644 --- a/dev-util/scons/scons-2.5.1.ebuild +++ b/dev-util/scons/scons-2.5.1.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 pypy ) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 +inherit distutils-r1 prefix DESCRIPTION="Extensible Python-based build utility" HOMEPAGE="http://www.scons.org/" @@ -15,14 +15,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc" #PATCHES=( ) 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 + # bug #361061 + if use prefix ; then + eapply "${FILESDIR}"/scons-2.5.1-respect-path.patch + eprefixify engine/SCons/Platform/posix.py + fi # and make sure the build system doesn't "force" /usr/local/ :( sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die diff --git a/dev-util/scons/scons-3.0.0.ebuild b/dev-util/scons/scons-3.0.0.ebuild index 976a1a92deb0..48fee1a5c385 100644 --- a/dev-util/scons/scons-3.0.0.ebuild +++ b/dev-util/scons/scons-3.0.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 python3_5 python3_6 pypy ) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 +inherit distutils-r1 prefix DESCRIPTION="Extensible Python-based build utility" HOMEPAGE="http://www.scons.org/" @@ -21,8 +21,11 @@ IUSE="doc" #PATCHES=( ) 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 + # bug #361061 + if use prefix ; then + eapply "${FILESDIR}"/scons-2.5.1-respect-path.patch + eprefixify engine/SCons/Platform/posix.py + fi # and make sure the build system doesn't "force" /usr/local/ :( sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die -- cgit v1.2.3